From 917e7e159209a3ae0b371f2567e8a126b6226b5e Mon Sep 17 00:00:00 2001
From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Thu, 15 May 2014 14:45:32 +0200
Subject: [PATCH] few fix (and "cancel")

---
 mainwindow.cpp | 38 +++++++++++++++++++++++++-------------
 mainwindow.h   |  2 +-
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6c8331f..490a29c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -143,13 +143,13 @@ void MainWindow::action(const QString &a){
     }
     else if(b[0]==QString("settext")){
         bool ok;
-        QString a=QInputDialog::getText(this, "setText", b[1], QLineEdit::Normal, conf->value(b[1]).toString(), *ok);
-        if(ok)conf->setValue(b[1], a);
+        QString e=QInputDialog::getText(this, "setText", b[1], QLineEdit::Normal, conf->value(b[1]).toString(), &ok);
+        if(ok)conf->setValue(b[1], e);
     }
     else if(b[0]==QString("setint")){
         bool ok;
-        QString a=QInputDialog::getInt(this, "setInt", b[1] , conf->value(QString(b[1])).toInt(), 0, 100, 1, *ok);
-        if(ok)conf->setValue(b[1], a);
+        QString e=QInputDialog::getInt(this, "setInt", b[1] , conf->value(QString(b[1])).toInt(), 0, 100, 1, &ok);
+        if(ok)conf->setValue(b[1], e);
     }
     else if(b[0]==QString("start")){
         getButtons(conf->value(QString("start")).toString());
@@ -174,7 +174,9 @@ void MainWindow::action(const QString &a){
         }
     }
     else if(b[0]=="setfile"){
-        conf->setValue(b[1], QFileDialog::getSaveFileName(this, QString("get file"), conf->value(b[1]).toString()));
+        bool ok;
+        QString e=QFileDialog::getSaveFileName(this, QString("get file"), conf->value(b[1]).toString());
+        if(ok)conf->setValue(b[1], e);
     }
     else if(b[0]==QString("box")){
         QMessageBox::information(this, QString("box"), c);
@@ -191,8 +193,14 @@ void MainWindow::action(const QString &a){
     }
         
     else if(b[0]==QString("edit")){
-        const QString a=QInputDialog::getText(this, QString("ID"), QString("Entrez l'ID du bouton à éditez"), QLineEdit::Normal, b[1]);
-        editButtonDB(a);
+        QString e;
+        bool ok;
+        if(b.size()<=1){
+            e=QInputDialog::getText(this, QString("ID"), QString("Entrez l'ID du bouton à éditez"), QLineEdit::Normal, QString(""), &ok);
+            if(ok)editButtonDB(e);
+            }
+        else editButtonDB(b[1]);
+
     }
     else getButtons(a);
 }
@@ -434,9 +442,13 @@ void MainWindow::editButtonDB(const QString & a){
     qDebug()<<"a="<<a;
     exec(QList<QString>({conf->value(QString("editbuttons")).toString(), a}));
     if(q->isSelect())q->first();
-    const QString keyword=QInputDialog::getText(this, "keyword", "new keyword", QLineEdit::Normal, q->value(1).toString());
-    const QString label=QInputDialog::getText(this, "label", "new label", QLineEdit::Normal, q->value(2).toString());
-    const QString action=QInputDialog::getText(this, "action", "new action", QLineEdit::Normal, q->value(3).toString());
+    bool ok;
+    const QString keyword=QInputDialog::getText(this, "keyword", "new keyword", QLineEdit::Normal, q->value(1).toString(), &ok);
+    if(!ok)return;
+    const QString label=QInputDialog::getText(this, "label", "new label", QLineEdit::Normal, q->value(2).toString(), &ok);
+    if(!ok)return;
+    const QString action=QInputDialog::getText(this, "action", "new action", QLineEdit::Normal, q->value(3).toString(), &ok);
+    if(!ok)return;
     if((keyword=="")||(label=="")||(action=="")){
         exec(QList<QString>({conf->value(QString("deletebuttons")).toString(), a}));
         return;
@@ -444,10 +456,10 @@ void MainWindow::editButtonDB(const QString & a){
     exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), keyword, label, action, a}));
 
 }
-void MainWindow::editButtonById(){
+/*void MainWindow::editButtonById(){
     const QString a=QInputDialog::getText(this, QString("editButtonById"), QString("Entrez l'ID : "));
     editButtonDB(a);
-}
+}*/
 void MainWindow::downloadUi(){
     qDebug()<<"updateUi() : "<<conf->value(QString("download")).toString();
     download(conf->value(QString("download")).toString());
@@ -649,7 +661,7 @@ void MainWindow::savButtons(){
     connect(rep, SIGNAL(finished()), this, SLOT(Uisent()));
 }
 void MainWindow::Uisent(){
-    qDebug()<<"Uisend";
+    qDebug()<<"Uisent";
     QMessageBox::information(this, "Uisent", "savbuttons finish");
 }
 void MainWindow::resetRAW(){
diff --git a/mainwindow.h b/mainwindow.h
index 8359ee3..12303bd 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -121,7 +121,7 @@ private slots:
     void writeDB();
     void chooseButtonDB();
     void chooseButtonDB(const QString &);
-    void editButtonById();
+    //void editButtonById();
     void editButtonDB(const QString &);
     void getButtons(const QString &);
     void getButtons();
-- 
2.45.1