mistake ...

diff --git a/diary-mobile-android.pro b/diary-mobile.pro
similarity index 100%
rename from diary-mobile-android.pro
rename to diary-mobile.pro

diff --git a/mainwindow.cpp b/mainwindow.cpp
index dc7c49b839056ecfbf537a1e8c529b846b310830..32f584a58dcb7c042058076e940768a7373784cb 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -220,7 +220,7 @@ void MainWindow::createMenuBar(){
     EditMenu->addAction(trUtf8("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(trUtf8("Ctrl+D", "Buttons|Add")));
     EditMenu->addAction(trUtf8("Sa&v buttons"), this, SLOT(savButtons()), QKeySequence(trUtf8("Ctrl+V", "Buttons|Save")));
     EditMenu->addAction(trUtf8("&Edit buttons"), this, SLOT(chooseButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Buttons|&Edit")));
-    EditMenu->addAction(trUtf8("&Edit buttons by ID"), this, SLOT(editButtonById()), QKeySequence(trUtf8("Ctrl+I", "Buttons|Edit by &id")));
+    //EditMenu->addAction(trUtf8("&Edit buttons by ID"), this, SLOT(editButtonById()), QKeySequence(trUtf8("Ctrl+I", "Buttons|Edit by &id")));
     EditMenu->addAction(trUtf8("&View/Hide menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "Buttons|View menu")));
     menuBar()->addMenu(EditMenu);
     HelpMenu=new QMenu(QString("&Help"));
@@ -306,12 +306,12 @@ void MainWindow::firstrun(){
     conf->setValue(QString("maxcolumn"), QVariant(2));
     conf->setValue(QString("maxline"), QVariant(5));
     conf->setValue(QString("SQLsettings"), QVariant("connect_timeout=10000"));
-    conf->setValue(QString("button"), QVariant("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
+    conf->setValue(QString("button"), QVariant("background-color: yellow;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
     conf->setValue(QString("menu"), QVariant(1));
-    conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/ui.sql"));
-    conf->setValue(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/raw"));
-    conf->setValue(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/ui.sql"));
-    conf->setValue(QString("start"), QVariant("begin"));
+    conf->setValue(QString("download"), QVariant("http://gaby:sha1sum@www.nothing2do.eu/diary/ui.sql"));
+    conf->setValue(QString("uploadRAW"), QVariant("ftp://nothing2do.eu_diary:200386@ftp.alwaysdata.com/raw"));
+    conf->setValue(QString("uploadUi"), QVariant("ftp://nothing2do.eu_diary:200386@ftp.alwaysdata.com/ui.sql"));
+    conf->setValue(QString("start"), QVariant("Montpellier"));
     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;"));
@@ -324,8 +324,8 @@ void MainWindow::firstrun(){
     conf->setValue(QString("updatebuttons"), QVariant("update ui set keyword=?, label=?, action=? 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("volumdown"), QVariant("config"));
-    conf->setValue(QString("volumup"), QVariant("config"));
+    conf->setValue(QString("volumdown"), QVariant("back"));
+    conf->setValue(QString("volumup"), QVariant("Montpellier"));
     qDebug()<<"firstrun() finished";
 }
 QString &MainWindow::get(int row, int column){
@@ -376,8 +376,8 @@ void MainWindow::entry(){
 }
 void MainWindow::createDB(){
     qDebug()<<"createDB()";
-    exec(QList<QString>({"create table ui(id INTEGER PRIMARY KEY AUTOINCREMENT,keyword text, label text, action text);"}));
-    exec(QList<QString>({"create table raw(date timestamp, texte text);"}));
+    exec(QList<QString>({"create table ui(id INTEGER PRIMARY KEY AUTOINCREMENT, keyword text, label text, action text);"}));
+    exec(QList<QString>({"create table raw(id INTEGER PRIMARY KEY AUTOINCREMENT, date timestamp, texte text);"}));
 }
 void MainWindow::addButtonDB(){
     qDebug()<<"addButtonDB()";
@@ -394,11 +394,11 @@ void MainWindow::addButtonDB(){
 }
 void MainWindow::getButtons(const QString &b){
     QString a=b;
-    if(b[0]!='-')way.append(a);
+    if((b[0]!='-')&&(b[0]!='+'))way.append(a);
     else a.remove(0, 1);
 
     qDebug()<<"getButtons("<<a<<") way.size()"<<way.size();
-    flush();
+    if(b[0]!='+')flush();
     if(updatelocker.tryLock(60000))updatelocker.unlock();
     else{qDebug()<<"updatelocker is locked more than 1mn";}
     QString c="%"+a+"%";
@@ -497,7 +497,7 @@ void MainWindow::back(){
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
     //static bool accepted=true;
-    event->setAccepted(true);
+    event->accept();
     int k=event->key();
     qDebug()<<"key pressed="<<k;
     if(k==Qt::Key_Back){
@@ -563,39 +563,6 @@ void MainWindow::readButtons(const QByteArray &in){
         qDebug()<<"q->exec() : "<<q->exec()<<" lastError()="<<q->lastError();
 
     };
-
-    /*QDomDocument a("buttons");
-    if (!a.setContent(in)){
-            qDebug()<<"a.setcontent failed";
-            return;
-    }
-    QDomElement root = a.documentElement();
-    QDomNode n = root.firstChild();
-    QList<QString> cmd;
-    while(!n.isNull()) {
-        QDomNode e = n.firstChild();
-        //if((cmd.size()<1)&&(n.isText()))e.toText().nodeValue();
-        qDebug()<<"n.nodeName()="<<n.nodeName()<<" e.nodevalue="<<qPrintable(e.nodeValue());
-        if(n.nodeName()=="sql"){
-            cmd.insert(0, e.nodeValue());
-            qDebug()<<"cmd[0]="<<cmd[0];
-            }
-        else if(n.nodeName()=="b"){
-            QDomNode f=e.firstChild();
-            while(!f.isNull()){
-                qDebug()<<"f.nodeName()="<<f.nodeName()<<" e.nodeValue()="<<qPrintable(e.nodeValue())<<" e.nodeType()="<<e.nodeType();
-                f=f.nextSibling();
-            }
-        }
-        while(!e.isNull()){
-            qDebug()<<"e.nodeName = "<<e.nodeName()<<" e.nodevalue="<<e.nodeValue();
-
-            e=e.nextSibling();
-
-            }
-        n=n.nextSibling();
-        }*/
-
     db.commit();
     flush();
     emit datafilled();
@@ -662,7 +629,7 @@ void MainWindow::getButtons(){
     const QString a=QInputDialog::getText(this, QString("getButtons"), QString("Entrez le mots-clé : "));
     getButtons(a);
 }
-void MainWindow::insertbutton(const QString & keyword, const QString & label, const QString & action){
+void MainWindow::insertButton(const QString & keyword, const QString & label, const QString & action){
     QList<QString> tmp;
     tmp.append(conf->value(QString("testbuttons")).toString());
     tmp.append(label);
@@ -681,3 +648,23 @@ void MainWindow::insertbutton(const QString & keyword, const QString & label, co
 
     }
 }
+void MainWindow::removeButton(const QString & keyword, const QString & label, const QString &action){
+    QList<QString> tmp;
+    tmp.append(conf->value(QString("testbuttons")).toString());
+    tmp.append(label);
+    tmp.append(action);
+    exec(tmp);
+    q->first();
+    int count=0;
+    QString key=keyword, id=q->value(0).toString();
+    while(q->isValid()){
+        count++;
+        QString cur=q->value(1).toString();
+        if(key!=cur)key=key+" "+cur;
+        q->next();
+    }
+    if(count==1)exec(QList<QString>({conf->value(QString("deletebuttons")).toString(), id}));
+    else{exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), key, label, action, id}));
+
+    }
+}

diff --git a/mainwindow.h b/mainwindow.h
index ac7caa7def6b8207dee927c3e6301e36df0632e1..70023c3809ce008f475dbd73f3c8abb55d6838ab 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -93,7 +93,8 @@ public:
     void keyReleaseEvent(QKeyEvent *event);
     explicit MainWindow(QWidget *parent = 0);
     virtual ~MainWindow();
-    void insertbutton(const QString &, const QString &, const QString &);
+    void insertButton(const QString &, const QString &, const QString &);
+    void removeButton(const QString &, const QString &, const QString &);
     // Note that this will only have an effect on Symbian and Fremantle.
     void setOrientation(ScreenOrientation orientation);