added conf(askkeyword)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2b7b32b0c8de5a226678f39dbdb5dc3e3043a952..c20deb96dcc1a96484c16da71d854aee11dbe198 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -166,10 +166,10 @@ void MainWindow::action(const QString &a){
     QStringList b=a.split(QString(" "));
     QString c=a;
     c.remove(0,4);
-    int part=a.count(QString("!q!"));
+    int part=a.count(QString("!@!"));
     if(part){
         for(int d=0; d<=part; d++){
-            action(c.split(QString("!q!"))[d]);
+            action(a.split(QString("!@!"))[d]);
         }
     }
     else if(b[0]==QString("set")){
@@ -193,7 +193,7 @@ void MainWindow::action(const QString &a){
     }
     else if(b[0]==QString("a/b")){
         bool ok;
-        QString e=QInputDialog::getItem(this, QString("choice"), QString("On vous offre un choix."), c.split(QString("!q!")), 0, 1, &ok);
+        QString e=QInputDialog::getItem(this, QString("choice"), QString("On vous offre un choix."), c.split(QString("!#!")), 0, 0, &ok);
         if(ok)action(e);
     }
     else if(b[0]==QString("back")){
@@ -370,6 +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));
     qDebug()<<"firstrun() finished";
 }
 QString &MainWindow::get(int row, int column){
@@ -388,8 +389,9 @@ int MainWindow::exec(const QList<QString> & a){
     QSqlError b=q->lastError();
     db.commit();
     if (b.isValid())qDebug()<<"SQL error :"<<b.text();
-    if(q->isValid())return 1;
-    else return 0;
+    if(q->isSelect())return q->size();
+    else if (q->isValid()) return 0;
+    else return -1;
 }
 void MainWindow::entry(const QString &a){
     QString label, time=QDateTime::currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss")), entry, context;
@@ -461,8 +463,9 @@ void MainWindow::getButtons(const QString &b){
     qDebug()<<"end getButtons : "<<i<<" button(s) way.size()"<<way.size();
 }
 void MainWindow::chooseButtonDB(){
-    const QString a=QInputDialog::getText(this, QString("chooseButtonDB"), QString("Entrez le mots-clé : "), QLineEdit::Normal, label->text());
-    //const QString a=label.text;
+    QString a;
+    if(conf->value(QString("askkeyword")).toBool())a=QInputDialog::getText(this, QString("chooseButtonDB"), QString("Entrez le mots-clé : "), QLineEdit::Normal, label->text());
+    else a=label->text();
     chooseButtonDB(a);
 }
 void MainWindow::chooseButtonDB(const QString & a){