removeButton() now remove buttons !

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c20deb96dcc1a96484c16da71d854aee11dbe198..b55446b461a2f14586fcc5ce621c7146b34283f7 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -370,7 +370,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("testbuttons"), QVariant("select id,keyword from ui where label=? and action=?;"));
     conf->setValue(QString("volumdown"), QVariant("back"));
     conf->setValue(QString("volumup"), QVariant("Montpellier"));
-    conf->setValue(QString("askkeyword"), QVariant(0));
+    conf->setValue(QString("askkeyword"), QVariant(1));
     qDebug()<<"firstrun() finished";
 }
 QString &MainWindow::get(int row, int column){
@@ -482,18 +482,21 @@ void MainWindow::editButtonDB(const QString & a){
     exec(QList<QString>({conf->value(QString("editbuttons")).toString(), a}));
     if(q->isSelect())q->first();
     bool ok;
-    const QString keyword=QInputDialog::getText(this, "keyword", "new keyword", QLineEdit::Normal, q->value(1).toString(), &ok);
+    QString keyword=q->value(1).toString();
+    QString label=q->value(2).toString();
+    QString action=q->value(3).toString();
+    const QString tmpkeyword=QInputDialog::getText(this, "keyword", "new keyword", QLineEdit::Normal, keyword, &ok);
     if(!ok)return;
-    const QString label=QInputDialog::getText(this, "label", "new label", QLineEdit::Normal, q->value(2).toString(), &ok);
+    const QString tmplabel=QInputDialog::getText(this, "label", "new label", QLineEdit::Normal, label, &ok);
     if(!ok)return;
-    const QString action=QInputDialog::getText(this, "action", "new action", QLineEdit::Normal, q->value(3).toString(), &ok);
+    const QString tmpaction=QInputDialog::getText(this, "action", "new action", QLineEdit::Normal, action, &ok);
     if(!ok)return;
-    if((keyword=="")||(label=="")||(action=="")){
+    if((tmpkeyword=="")||(tmplabel=="")||(tmpaction=="")){
         //exec(QList<QString>({conf->value(QString("deletebuttons")).toString(), a}));
         removeButton(keyword, label, action);
         return;
         }
-    exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), keyword, label, action, a}));
+    exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), tmpkeyword, tmplabel, tmpaction, a}));
 
 }
 void MainWindow::downloadUi(){
@@ -693,7 +696,8 @@ void MainWindow::insertButton(const QString & keyword, const QString & label, co
 
     }
 }
-void MainWindow::removeButton(const QString & keyword, const QString &label, const QString &action){
+void MainWindow::removeButton(const QString & keyword, const QString & label, const QString & action){
+    qDebug()<<"keyword="<<keyword<<" label="<<label<<" action="<<action;
     QList<QString> tmp;
     tmp.append(conf->value(QString("testbuttons")).toString());
     tmp.append(label);
@@ -707,6 +711,7 @@ void MainWindow::removeButton(const QString & keyword, const QString &label, con
         cur=q->value(1).toString();
         key=key+" "+cur;
     }
+    qDebug()<<"key="<<key<<" keyword="<<keyword;
     if(key==keyword)exec(QList<QString>({conf->value(QString("deletebutton")).toString(), id}));
     else{
         key.replace(keyword, QString(""));