added a quit action (into quit part of action())

diff --git a/mainwindow.cpp b/mainwindow.cpp
index f2a015e3e9cfc3055b46a701e8f4d4ad3392c839..f08bd1a226ff345e7b5cf74ddbc067ace46f6f1c 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -86,7 +86,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     menuBar()->setVisible(conf->value(QString("menu")).toBool());
     //menuBar()->setVisible(true);
     d.lock();
-    //start();
+    start();
 }
 void MainWindow::start(){
     QString a=conf->value(QString("currenttype"), QString("buttons")).toString();
@@ -329,6 +329,8 @@ void MainWindow::action(const QString &a){
 
     }
     else if(b[0]==QString("quit")){
+        QString a(conf->value(QString("quit"), QString("")).toString());
+        action(a);
         quit();
     }
     else if(b[0]==QString("clear")){
@@ -471,11 +473,10 @@ void MainWindow::action(const QString &a){
             }else if(b[1]==QString("edit")){
                 flush();
                 for(int a=0;a<valeur->size();a++){
-                    addWidget(QString("val "+tmpkeys[a]+"#"), new CLabel(tmpkeys[a]+"#", *conf));
+                    addWidget(QString("val "+tmpkeys[a]+"#"), new CLabel(tmpkeys[a], *conf));
                     //if(deb)QMessageBox::information(this, QString("val"), QString(tmpkeys[a]+"=="+tmpvalues[a]));
                 }
-            }
-            else if(bs==2){
+            }else if(bs==2){
                 //QMessageBox::information(this, QString("val)"), QString(b[1]+"=="+valeur->value(b[1], QString("don't exist"))));
                 QString old;
                 if(tmpkeys.count(b[1])>0)old=valeur->value(b[1]);
@@ -502,7 +503,8 @@ void MainWindow::action(const QString &a){
                 else old="";
                 int tkc=tmpkeys.count(b[1]);
                 for(int t=1;t<tkc;t++){
-                    old=old+" "+valeur->values(b[1])[t];
+                    if(old==QString(""))old=valeur->values(b[1])[t];
+                    else old=old+" "+valeur->values(b[1])[t];
                 }
                 qDebug()<<"aa.size()=="<<aa.size()<<" b[1].size()=="<<b[1].size()<<" t=="<<t<<" old.size()="<<old.size()<<endl;
                 QString tmp=old+" "+aa.right(t);