From e0685a924f12bce05cb3900a5d6920177983c624 Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Sun, 15 Jun 2014 19:59:24 +0200 Subject: [PATCH] I've added the init file (a bunch of SQL command to create DB, and populate, if you want) --- diary-mobile_en_EN.ts | 292 +++++++++++++++++++++--------------------- diary-mobile_fr_FR.ts | 289 +++++++++++++++++++++++++---------------- mainwindow.cpp | 115 ++++++++--------- mainwindow.h | 13 +- 4 files changed, 391 insertions(+), 318 deletions(-) diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts index d2b3237..f461889 100644 --- a/diary-mobile_en_EN.ts +++ b/diary-mobile_en_EN.ts @@ -4,513 +4,513 @@ MainWindow - + first button file - - Enter the URL to download the first buttons file - - - - - + + get file title to ask file - + box box title to show a text - + set - + Enter ID of button to edit - + Ctrl+S File|Start - + Ctrl+B File|Back - + Ctrl+L File|Upload - + Ctrl+Q File|Quit - - Ctrl+D - Buttons|Add + + New entry + + + + + ctrl+H + Help|About Qt + + + + + &View/Hide menu + File|View/Hide menu + + + + + &Data + top menu + + + + + &Download + Data|Downlad - + + Ctrl+W + Data|Downlad + + + + A&dd - Buttons|Add + Data|Add - - Ctrl+V - Buttons|Save + + Ctrl+D + Data|Add - + Sa&v - Buttons|Sav + Data|Sav + + + + + Ctrl+V + Data|Save - + Reset - Buttons|Reset + Data|Reset - - Ctrl+E - Buttons|&Edit + + Ctrl+Z + Data|Reset - - New entry + + &Edit + Data|Edit - - ctrl+H - Help|About Qt + + Ctrl+E + Data|&Edit - + Ctrl+R Help|CreateDB - + C&reate Database Hack|Create - + Download sql Hack|download sql - + label Title of box where ask for new button's label - + Enter his label his/her/?they? I've forget my school lesson - + keyword Title of box where ask for new button's keyword - + Enter they keyword (no limit !) - + action Title of box where ask for new button's action - + Enter his action - + Ctrl+T File|View menu - + + Enter the URL to download the init file + + + + Variable's name ? text to ask value's name before changing it (set) - - + + Error title if action("set") has too much value - - + + Too much value in button's action text if action("set") has too much value - + variable text change title to warn about variable content change - - + + value of - - + + Variable's name ? text to ask value's name before changing it (setint) - + variable integer change title to warn about variable content change - + Value of - + choice title of box who ask multiple choice - + Please choose an action. text to ask multiple choice - + variable file change title to warn about variable content change - + Error title if action("edit") has too much value - + Too much value in button's action text if action("edit") has too much value - + URL title to download a custom file from URL - + Enter the URL of the file label to download a custom file - - + + File title to write a file downloaded from URL - - + + Enter the name of the file label to write the downloaded data - + Error title of box if action("read" has too much (or too "less") value - + Bad number of value text of box if action("read") has too much (or too "less") value - + &File top menu - + &Start File|Start - + &Back File|Back - - &View/Hide menu - File|View/Hide - - - - + sendRAW File|SendRAW - + Reset RAW File|resetRAW - + Ctrl+E File|Reset - + &Quit File|Quit - - &Buttons - top menu - - - - - &Download - Buttons|Downlad - - - - - &Edit - Buttons|Edit - - - - + &Hack top menu - + New entry Hack|Entry - + Action Hack|Action - + About Qt Hack|About Qt - + + upload + pop-up title when data has been sent + + + + tmp URL Title of box where ask for button file's URL - + Enter URL Label of box where ask for button file's URL - + action Title of box where ask for a custom action - + Enter your action Label of box where ask for custom action - - Ctrl+W - Buttons|Downlad - - - - - Ctrl+Z - Buttons|Reset - - - - - chooseButtonDB + + Enter the keyword : - - Enter the keyword : + + chooseDB - + keyword Title of box where ask for button's keyword - + new keyword question to get new button's keyword - + label Title of box where ask for button's label - + new label question to get new button's label - + action Title of box where ask for button's action - + new action question to get new button's action - + RAWsent message title when data has been send - + sendRAW finish message text when data has been send - + Upload finish : pop-up when data has been sent - - uploadDB - pop-up title when data has been sent - - - - + Uisent pop-up title when buttons has been sent - + savbuttons finish pop-up text when buttons has been sent - + Enter the keyword : ask keyword to get buttons - + getButtons title to ask keyword fot getbuttons - + writeFile pop-up title when file has been written - + File written : diff --git a/diary-mobile_fr_FR.ts b/diary-mobile_fr_FR.ts index 796f33c..9c46d5a 100644 --- a/diary-mobile_fr_FR.ts +++ b/diary-mobile_fr_FR.ts @@ -4,14 +4,13 @@ MainWindow - + first button file Premier fichier de bouton - Enter the URL to download the first buttons file - Entrez l'URL pour télécharger vos boutons + Entrez l'URL pour télécharger vos boutons choice @@ -22,25 +21,25 @@ choisissez une action - - + + get file title to ask file choisissez un fichier - + box box title to show a text info - + set définir - + Enter ID of button to edit Entrez l'ID du bouton à éditer @@ -53,7 +52,7 @@ &Départ - + Ctrl+S File|Start Ctrl+D @@ -63,59 +62,56 @@ &Retour - + Ctrl+B File|Back Ctrl+R - &View/Hide menu File|View/Hide - Voir/Cacher le menu + Voir/Cacher le menu - + sendRAW File|SendRAW Envoyer les données - + Reset RAW File|resetRAW Réinitialiser les donnés - + Ctrl+E File|Reset Ctrl+E - + &Quit File|Quit &Quitter - &Buttons top menu - Boutons + Boutons - Ctrl+W Buttons|Downlad - Ctrl+D + Ctrl+D sendRAW Envoyer les données - + Ctrl+L File|Upload Ctrl+L @@ -135,7 +131,7 @@ &Quitter - + Ctrl+Q File|Quit Ctrl+Q @@ -149,251 +145,326 @@ A&jouter un boutons - Ctrl+D Buttons|Add - Ctrl+D + Ctrl+D Sa&v buttons Sauvegardez les boutons - Ctrl+V Buttons|Save - Ctrl+V + Ctrl+V &Edit buttons &Editer les boutons - Ctrl+E Buttons|&Edit - Ctrl+E + Ctrl+E &View/Hide menu Voir/Cacher le menu - + + Enter the URL to download the init file + Entrez l'URL pour téléchargez le fichier d'initialisation + + + Variable's name ? text to ask value's name before changing it (set) Nom de la variable - - + + Error title if action("set") has too much value Erreur - - + + Too much value in button's action text if action("set") has too much value Trop de mots dans l'action du bouton - + variable text change title to warn about variable content change changement du contenu de la variable - - + + value of Valeur de - - + + Variable's name ? text to ask value's name before changing it (setint) Nom de la variable ? - + variable integer change title to warn about variable content change changement de valeur - + Value of Valeur de - + choice title of box who ask multiple choice Choix - + Please choose an action. text to ask multiple choice Choisissez une action - + variable file change title to warn about variable content change changement de valeur - + Error title if action("edit") has too much value Erreur - + Too much value in button's action text if action("edit") has too much value Trop de mots dans l'action du bouton - + URL title to download a custom file from URL Source - + Enter the URL of the file label to download a custom file Entrez l'URL des données - - + + File title to write a file downloaded from URL Fichier - - + + Enter the name of the file label to write the downloaded data Entrez le nom du fichier - + Error title of box if action("read" has too much (or too "less") value Erreur - + Bad number of value text of box if action("read") has too much (or too "less") value Mauvais "nombre" de mot - + &File top menu &Fichier - + &Start File|Start &Départ - + &Back File|Back &Retour - + Ctrl+T File|View menu Ctrl+M - + + &View/Hide menu + File|View/Hide menu + Voir/Cacher le menu + + + + &Data + top menu + Données + + + &Download - Buttons|Downlad + Data|Downlad &Téléchargement - + + Ctrl+W + Data|Downlad + Ctrl+T + + + A&dd - Buttons|Add + Data|Add Nouveau - + + Ctrl+D + Data|Add + Nouveau + + + Sa&v - Buttons|Sav + Data|Sav Sauvegardez - + + Ctrl+V + Data|Save + Ctrl+V + + + Reset - Buttons|Reset + Data|Reset Remise à zéro - + + Ctrl+Z + Data|Reset + Ctrl+Z + + + + &Edit + Data|Edit + Edition + + + + Ctrl+E + Data|&Edit + Ctrl+E + + + &Download + Buttons|Downlad + &Téléchargement + + + A&dd + Buttons|Add + Nouveau + + + Sa&v + Buttons|Sav + Sauvegardez + + + Reset + Buttons|Reset + Remise à zéro + + &Edit Buttons|Edit - Editer + Editer - + &Hack top menu &Hack - + New entry Hack|Entry Nouvelle entrée - + Action Hack|Action Action - + About Qt Hack|About Qt A propos de Qt - + + upload + pop-up title when data has been sent + Envoie + + + tmp URL Title of box where ask for button file's URL URL temporaire - + Enter URL Label of box where ask for button file's URL Entrez l'URL - + action Title of box where ask for a custom action action - + Enter your action Label of box where ask for custom action Entrez votre action @@ -403,7 +474,7 @@ Aide - + New entry Nouvelle entrée @@ -416,7 +487,7 @@ A propos de Qt - + ctrl+H Help|About Qt Ctrl+A @@ -426,54 +497,54 @@ C&réer une base de donné - + Ctrl+R Help|CreateDB Ctrl+R - + C&reate Database Hack|Create C&réer une base de donné - + Download sql Hack|download sql Télécharger un fichier sql - + label Title of box where ask for new button's label Etiquette - + Enter his label his/her/?they? I've forget my school lesson Entrez son étiquette - + keyword Title of box where ask for new button's keyword mot-clé - + Enter they keyword (no limit !) Entrez les mots clé (no limit !) - + action Title of box where ask for new button's action action - + Enter his action Entrez son action @@ -499,10 +570,9 @@ Remise à zéro - Ctrl+Z Buttons|Reset - Ctrl+Z + Ctrl+Z &Edit @@ -517,107 +587,110 @@ Télécharger un fichier sql - chooseButtonDB - chooseButtonDB + chooseButtonDB - + Enter the keyword : Entrez le mot-clé : - + + chooseDB + choisirBD + + + keyword Title of box where ask for button's keyword mot-clé - + new keyword question to get new button's keyword nouveau mot-clé - + label Title of box where ask for button's label étiquette - + new label question to get new button's label nouvel étiquette - + action Title of box where ask for button's action action - + new action question to get new button's action nouvelle action - + RAWsent message title when data has been send RAWsent - + sendRAW finish message text when data has been send données envoyées - + Upload finish : pop-up when data has been sent Upload finit : - uploadDB pop-up title when data has been sent - uploadDB + uploadDB - + Uisent pop-up title when buttons has been sent Envoyé - + savbuttons finish pop-up text when buttons has been sent boutons sauvegardés sur le serveur - + Enter the keyword : ask keyword to get buttons Entrez le mot-clé : - + getButtons title to ask keyword fot getbuttons getBoutons - + writeFile pop-up title when file has been written fichier - + File written : Fichier écrit : diff --git a/mainwindow.cpp b/mainwindow.cpp index 3c57947..1794053 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -65,10 +65,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) screen->show(); if((conf->value(QString("first")).toInt()==1)){ qDebug()<<"second"; - QString ser=QInputDialog::getText(this, trUtf8("first button file"), trUtf8("Enter the URL to download the first buttons file"), QLineEdit::Normal, conf->value(QString("download")).toString()); - if(ser!="")conf->setValue(QString("download"), ser); - createDB(); - downloadData(); + bool ok; + QString ser=QInputDialog::getText(this, trUtf8("init file"), trUtf8("Enter the URL to download the init file"), QLineEdit::Normal, conf->value(QString("init")).toString(), &ok); + if((ok)&&(ser!=""))conf->setValue(QString("init"), ser); + else qApp->quit(); + downSQL(ser); conf->setValue(QString("first"), 2); }; statusBar()->addPermanentWidget(label); @@ -222,7 +223,7 @@ void MainWindow::action(const QString &a){ if(ok)action(e); } else if(b[0]==QString("sav")){ - send(c); + sav(c); } else if(b[0]==QString("back")){ if(way.size()>1){ @@ -328,8 +329,8 @@ void MainWindow::action(const QString &a){ lastprint=QString("-hist"); for(int i=0; ivalue(QString("button")).toString())); - addWidget(QString("rm %1").arg(i), new CLabel(QString("del"), conf->value(QString("button")).toString())); + addWidget(wi, new CLabel(wi, *conf)); + addWidget(QString("rm %1").arg(i), new CLabel(QString("del"), *conf)); } } @@ -371,7 +372,7 @@ void MainWindow::createMenuBar(){ menuBar()->addMenu(FileMenu); EditMenu=new QMenu(trUtf8("&Data", "top menu")); EditMenu->addAction(trUtf8("&Download", "Data|Downlad"), this, SLOT(downloadData()),QKeySequence(trUtf8("Ctrl+W", "Data|Downlad"))); - EditMenu->addAction(trUtf8("A&dd", "Data|Add"), this, SLOT(addDataDB()), QKeySequence(trUtf8("Ctrl+D", "Data|Add"))); + EditMenu->addAction(trUtf8("A&dd", "Data|Add"), this, SLOT(addDB()), QKeySequence(trUtf8("Ctrl+D", "Data|Add"))); EditMenu->addAction(trUtf8("Sa&v", "Data|Sav"), this, SLOT(savData()), QKeySequence(trUtf8("Ctrl+V", "Data|Save"))); EditMenu->addAction(trUtf8("Reset", "Data|Reset"), this, SLOT(reset()), QKeySequence(trUtf8("Ctrl+Z", "Data|Reset"))); EditMenu->addAction(trUtf8("&Edit", "Data|Edit"), this, SLOT(chooseDB()), QKeySequence(trUtf8("Ctrl+E", "Data|&Edit"))); @@ -403,14 +404,15 @@ void MainWindow::flush(){ } //widget.clear(); } -CLabel::CLabel( const QString& text, const QString & style, QWidget * parent ) : QLabel(parent) +CLabel::CLabel( const QString& text, const QSettings & set, QWidget * parent ) : QLabel(parent) { - m_style=style; + m_style=set.value(QString("button")).toString(); setText(text); setWordWrap(true); setLineWidth(5); - setStyleSheet(style); + setStyleSheet(m_style); setScaledContents(1); + setting=&set; } CLabel::~CLabel() { @@ -418,13 +420,13 @@ CLabel::~CLabel() void CLabel::mousePressEvent (QMouseEvent * event ) { switch(event->button()){ - case Qt::LeftButton:setStyleSheet(m_style.replace(QString("border-style: outset"), QString("border-style: inset")));emit pressed();break; + case Qt::LeftButton:setStyleSheet(m_style.replace(setting->value(QString("buttonbefore")).toString(), setting->value(QString("buttonafter")).toString()));emit pressed();break; } } void CLabel::mouseReleaseEvent( QMouseEvent * event ) { switch(event->button()){ - case Qt::LeftButton:setStyleSheet(m_style.replace(QString("border-style: inset"), QString("border-style: outset")));emit released();break; + case Qt::LeftButton:setStyleSheet(m_style.replace(setting->value(QString("buttonafter")).toString(), setting->value(QString("buttonbefore")).toString()));emit released();break; } } @@ -465,7 +467,8 @@ void MainWindow::firstrun(){ conf->setValue(QString("buttonbefore"), QVariant("border-style: outset")); conf->setValue(QString("buttonafter"), QVariant("border-style: inset")); conf->setValue(QString("menu"), QVariant(0)); - conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/ui.sql+")); + conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/"+conf->value(QString("filebuttons")).toString())); + conf->setValue(QString("init"), QVariant("http://www.nothing2do.eu/init")); conf->setValue(QString("userftp"), QVariant("")); conf->setValue(QString("hostftp"), QVariant("")); conf->setValue(QString("passftp"), QVariant("")); @@ -473,19 +476,17 @@ void MainWindow::firstrun(){ conf->setValue(QString("restore"), QVariant("http://www.abc.de/db")); conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db")); conf->setValue(QString("selectbuttons"), QVariant("select keyword,label,action from ui order by label;")); - conf->setValue(QString("columnbuttons"), QVariant(3)); conf->setValue(QString("sqlbuttons"), QVariant("INSERT INTO ui (keyword,label,action) VALUES(?,?,?);")); conf->setValue(QString("selectraw"), QVariant("select date,texte from raw order by date;")); - conf->setValue(QString("columnraw"), QVariant(2)); conf->setValue(QString("menuback"), QVariant("-menuback")); conf->setValue(QString("choosebuttons"), QVariant("select id,label from ui where keyword like ? order by label;")); conf->setValue(QString("addbuttons"), QVariant("insert into ui (label, keyword, action) values (:label, :keyword, :action)")); conf->setValue(QString("getbuttons"), QVariant("select label,action from ui where keyword like ? order by label;")); conf->setValue(QString("editbuttons"), QVariant("select id,keyword,label,action from ui where id=?;")); conf->setValue(QString("updatebuttons"), QVariant("update ui set keyword=?, label=?, action=? where id=?;")); - conf->setValue(QString("deletebutton"), QVariant("delete from ui where id=?")); + conf->setValue(QString("deletebuttons"), QVariant("delete from ui where id=?")); conf->setValue(QString("testbuttons"), QVariant("select id,keyword from ui where label=? and action=?;")); - conf->setValue(QString("changekey"), QVariant("select keyword,label,action,id from ui where keyword like ?;")); + conf->setValue(QString("changekeyword"), QVariant("select keyword,label,action,id from ui where keyword like ?;")); conf->setValue(QString("volumdown"), QVariant("back")); conf->setValue(QString("volumup"), QVariant("begin")); conf->setValue(QString("askkeyword"), QVariant(0)); @@ -588,7 +589,7 @@ void MainWindow::get(const QString & d, const QString &b){ else{qDebug()<<"updatelocker is locked more than 1mn";} QString c="%"+a+"%"; - QList tmp({conf->value(QString("getbuttons")).toString(), c}); + QList tmp({conf->value(QString("get")+d).toString(), c}); label->setText(a); exec(tmp); int labCol = 0;//r.indexOf("label"); @@ -596,7 +597,7 @@ void MainWindow::get(const QString & d, const QString &b){ int i=0; qDebug()<<"bcl to add buttons"; while(q->next()){ - addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), conf->value(QString("button")).toString())); + addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), *conf)); i++; }; grid->update(); @@ -618,7 +619,7 @@ void MainWindow::chooseDB(const QString & b){ qDebug()<<"exec()="<({conf->value(QString("choose"+a)).toString(), c})); while (q->next()) { const QString action="edit "+q->value(0).toString(); - addWidget(action, new CLabel(q->value(1).toString(), conf->value(QString("button")).toString())); + addWidget(action, new CLabel(q->value(1).toString(), *conf)); } } void MainWindow::chooseDB(const QString & a,const QString & b){ @@ -627,12 +628,13 @@ void MainWindow::chooseDB(const QString & a,const QString & b){ qDebug()<<"exec()="<({conf->value(QString("choose"+a)).toString(), c})); while (q->next()) { const QString action="edit "+q->value(0).toString(); - addWidget(action, new CLabel(q->value(1).toString(), conf->value(QString("button")).toString())); + addWidget(action, new CLabel(q->value(1).toString(), *conf)); } } void MainWindow::editDB(const QString & a, const QString & b){ - qDebug()<<"a="<({conf->value(QString("edit")+a).toString(), b})); + QString tmp=conf->value(QString("edit")+a).toString(); + qDebug()<<"a="<({conf->value(QString("deletebuttons")).toString(), a})); - remove(b, keyword, label, action); + remove(a, keyword, label, action); return; } exec(QList({conf->value(QString("update")+a).toString(), tmpkeyword, tmplabel, tmpaction, b})); @@ -693,7 +694,7 @@ void MainWindow::RAWsent(){ void MainWindow::back(){ if(!((video)&&(playlist))){ get(QString("buttons"),conf->value(QString("menuback")).toString()); - }else if(label->text()==conf->value(QString("menuback")).toString())get(QString("buttons"),way.takeLast()); + }else if(QString("-")+label->text()==conf->value(QString("menuback")).toString())get(QString("buttons"),way.takeLast()); else{ get(QString("buttons"), QString("+video")); } @@ -811,8 +812,9 @@ void MainWindow::sav(const QString & a){ QFile b(conf->value(tmp).toString()); b.open(QIODevice::WriteOnly|QIODevice::Text); QTextStream c(&b); - int d=conf->value(QString("column")+a).toInt()-1; - QString sep=conf->value(QString("sep")+a).toString(); + //int d=conf->value(QString("column")+a).toInt()-1; + int d=q->record().count()-1; + QString sep=conf->value(QString("sepcol")+a).toString(); qDebug()<<"d="<next()) { for (int i=0; i({conf->value(QString("delete")+a).toString(), id})); + if((key==QString(" ").repeated(key.size()))||(key==keyword))exec(QList({conf->value(QString("delete")+a).toString(), id})); else{ key.replace(keyword, QString("")); exec(QList({conf->value(QString("updatebuttons")).toString(), key, label, action, id})); @@ -949,39 +953,13 @@ void MainWindow::readData(){ read(QString("buttons"), m->downloadedData()); m->disconnect(m, SIGNAL(downloaded()),this, SLOT(readData())); } -void MainWindow::send(const QString & a){ - QString t="select"+a; - exec(QList ({conf->value(t).toString()})); - t="file"+a; - QFile tmp(conf->value(t).toString()); - tmp.open(QIODevice::WriteOnly|QIODevice::Text); - QTextStream b(&tmp); - t="column"+a; - int c=conf->value(t).toInt()-1; - t="sep"+a; - QString sep=conf->value(t).toString(); - while (q->next()) { - for (int i=0; ivalue(i).toString()<value(c).toString()<<"\n"; - } - tmp.close(); - t="file"+a; - QUrl upload(QString("ftp://")+conf->value(QString("userftp")).toString()+QString(":")+conf->value(QString("passftp")).toString()+QString("@")+conf->value(QString("hostftp")).toString()+QString("/")+conf->value(t).toString()); - net=new QNetworkAccessManager(this); - tmp.open(QIODevice::ReadOnly | QIODevice::Text); - rep=net->put(QNetworkRequest(upload), tmp.readAll()); - qDebug()<<"net->put : "<({conf->value(QString("changekey")).toString(), a})); + exec(QList({conf->value(QString("changekeyword")).toString(), a})); QString key; while(q->next()){ key=get(c); @@ -997,7 +975,7 @@ void MainWindow::mass(int c, const QString & a, const QString & b){ } get(QString("buttons"), lastprint); } -void MainWindow::addDataDB(){ +void MainWindow::addDB(){ addDB(QString("buttons")); } void MainWindow::savData(){ @@ -1006,3 +984,22 @@ void MainWindow::savData(){ void MainWindow::reset(){ reset(QString("ui")); } +QSettings & MainWindow::getSettings(){ + return *conf; +} +void MainWindow::downSQL(const QString & a){ + download(a); + connect(m, SIGNAL(downloaded()), SLOT(readSQL())); +} +void MainWindow::readSQL(){ + disconnect(m, SIGNAL(downloaded())); + qDebug()<<"readSQL"; + QByteArray in=m->downloadedData(); + q->exec("PRAGMA foreign_keys=OFF;"); + q->exec("BEGIN TRANSACTION;");// these 2 line is SQLite specific + int b=in.count('\n'); + for(int i=0;iexec(in.split('\n').at(i)); + } + emit datafilled(); +} diff --git a/mainwindow.h b/mainwindow.h index deb6fcd..bfd2af7 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -95,9 +95,10 @@ class CLabel : public QLabel { Q_OBJECT QString m_style; + QSettings * setting; public: - explicit CLabel(const QString& text,const QString &style,QWidget * parent = 0 ); + explicit CLabel(const QString&, const QSettings &, QWidget * parent = 0 ); ~CLabel(); void SetTextToLabel(const QString &); signals: @@ -128,13 +129,15 @@ public: // Note that this will only have an effect on Symbian and Fremantle. void setOrientation(ScreenOrientation orientation); - + QSettings & getSettings(); void showExpanded(); const CLabel* addWidget(const QString &, const CLabel *); void resizeEvent(QResizeEvent *); - void send(const QString &); + void sav(const QString &); void mass(int, const QString &, const QString &); + void downSQL(const QString &); private slots: + void readSQL(); void tmpdown(); void readData(); void play(); @@ -160,7 +163,7 @@ private slots: void entry(); void createDB(); void addDB(const QString &); - void addDataDB(); + void addDB(); void writeDB(); void chooseDB(); void chooseDB(const QString &); @@ -176,7 +179,7 @@ private slots: void sendRAW(); void RAWsent(); void Uisent(); - void sav(const QString &); + //void sav(const QString &); //void savButtons(); void savData(); void read(const QString &, const QByteArray &); -- 2.45.1