From 3520f77662499e8fbe43e66e70d24bebbb11cad8 Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Sun, 15 Apr 2018 21:31:55 +0200 Subject: [PATCH] added a quit action (into quit part of action()) --- mainwindow.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index f2a015e..f08bd1a 100644 --- 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;asize();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;tvalues(b[1])[t]; + if(old==QString(""))old=valeur->values(b[1])[t]; + else old=old+" "+valeur->values(b[1])[t]; } qDebug()<<"aa.size()=="<