From 167f73954dfa68052596409b677ced6ca0e8ec7c Mon Sep 17 00:00:00 2001
From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sat, 4 Jan 2014 16:05:35 +0100
Subject: [PATCH] fix (try to fix) bug

---
 mainwindow.cpp | 27 ++++++++++++++-------------
 mainwindow.h   |  2 +-
 ui.sql         |  4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index d6220f2..c129986 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -24,8 +24,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     grid=new QGridLayout(screen);
     screen->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     signalmap=new QSignalMapper(this);
-    connect(signalmap, SIGNAL(mapped(const QString &)),
-                 this, SLOT(action(const QString &)));
+    qDebug()<<"connect1 : "<<connect(signalmap, SIGNAL(mapped(const QString &)), this, SLOT(action(const QString &)));
     label=new QLabel(conf->value(QString("start")).toString());
     setCentralWidget(screen);
     createMenuBar();
@@ -42,7 +41,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 }
 void MainWindow::start(){
     way.clear();
-    getButtons(conf->value(QString("start"), QVariant("begin")).toString());
+    getButtons(conf->value(QString("start")).toString());
 }
 MainWindow::~MainWindow()
 {
@@ -124,12 +123,12 @@ CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){
     int maxl=conf->value(QString("maxline")).toInt();
     grid->addWidget(a, grid->count()/maxc, grid->count()%maxc, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
     //QObject::connect(a, SIGNAL(pressed()), signalmap, SLOT(map()));
-    QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map()));
+    qDebug()<<"connect2 : "<<QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map()));
     signalmap->setMapping(a, key);
-    if(grid->count()==maxc*maxl){
+    /*if(grid->count()==maxc*maxl){
         grid->addWidget(new CLabel(QString("next")), maxc, maxl, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
         return NULL;
-    };
+    };*/
     return a;
 }
 void MainWindow::action(const QString &a){
@@ -154,6 +153,7 @@ void MainWindow::action(const QString &a){
         b+=a.remove(0,4);
         entry(b);
     }
+    else if(a=="quit")quit();
     else if(a.split(QString(" "))[0]=="setfile"){
         conf->setValue(a.split(QString(" "))[1], QFileDialog::getSaveFileName(this, QString("get file"), conf->value(a.split(QString(" "))[1]).toString()));
     }
@@ -280,8 +280,6 @@ int MainWindow::exec(const QList<QString> & a){
 
     QSqlError b=q->lastError();
     db.commit();
-    qDebug()<<"exec finish";
-
     if (b.isValid())qDebug()<<"SQL error->exec() :"<<b.text();
     if(q->isSelect())return q->size();
     else return 0;
@@ -343,10 +341,12 @@ void MainWindow::getButtons(const QString &a){
     int labCol = 0;//r.indexOf("label");
     int actCol = 1;//r.indexOf("action");
     QMutexLocker locker(&sql);
+    int i=0;
     while(q->next()){
         addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString()));
+        i++;
     };
-    qDebug()<<"end getButtons";
+    qDebug()<<"end getButtons : "<<i<<" button(s)";
 }
 void MainWindow::editButtonDB(){
     /*flush();
@@ -362,7 +362,7 @@ void MainWindow::editButtonDB(){
     }*/
 }
 void MainWindow::updateUi(){
-    qDebug()<<"updateUi() : "<<conf->value(QString("update")).toString();
+    qDebug()<<"updateUi() : "<<conf->value(QString("download")).toString();
     QUrl update(conf->value(QString("download")).toString());
     m = new FileDownloader(update, this);
     connect(m, SIGNAL(downloaded()), SLOT(writeUpdate()));
@@ -442,13 +442,14 @@ void MainWindow::writeUpdate(){
         int b=m->downloadedData().split('\n').at(i).count('$');
         qDebug()<<i<<"th line, "<<b<<" delimiter";
         for(int j=0; j<b+1; j++){
-            q->bindValue(j, m->downloadedData().split('\n').at(i).split('$').at(j));
-            qDebug()<<"bind "<<j<<" and "<< m->downloadedData().split('\n').at(i).split('$').at(j);
+            q->bindValue(j, QString(m->downloadedData().split('\n').at(i).split('$').at(j)));
+            qDebug()<<"bind "<<j<<" and "<< QString(m->downloadedData().split('\n').at(i).split('$').at(j));
         }
         qDebug()<<"q->exec() : "<<q->exec();
     };
     //qDebug()<<"q->exec() : "<<q->exec();
-    q->exec(QString("COMMIT;"));
+    //q->exec(QString("COMMIT;"));
+    db.commit();
     QFile c(conf->value(QString("buttonfile")).toString());
     c.open(QIODevice::Append);
     c.write(m->downloadedData());
diff --git a/mainwindow.h b/mainwindow.h
index f05e7dd..e490cf3 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -122,7 +122,7 @@ public slots:
 signals:
 
 private:
-    QMutex sql;
+    QMutex sql,update;
     QWidget *screen;
     QGridLayout *grid;
     QLabel *label;
diff --git a/ui.sql b/ui.sql
index c29b0ad..2f52d26 100644
--- a/ui.sql
+++ b/ui.sql
@@ -1,4 +1,4 @@
-INSERT INTO 'ui' (keyword, label, action) VALUES(?, ?, ?);
+INSERT INTO ui (keyword, label, action) VALUES(?, ?, ?);
 begin$new$new
 begin$fille$fille
 begin$config$config
@@ -7,7 +7,7 @@ lieu$oliver's pub$oliver's pub
 oliver's pub fille$audrey$audrey zanella
 audrey zanella$Pourquoi vous me prenez pour un perver ?$begi-olive-audre-perver
 begi-lie-olive-audre-perver$"On ne te prends pas pour un perver."$begi-olive-audre-perve-non
-begi-lie-olive-audre-perve-non$Pourquoi vous refusez qu''on se voit hors d''ici alors ?$begi-olive-audre-perve-non-hors
+begi-lie-olive-audre-perve-non$Pourquoi vous refusez qu'on se voit hors d'ici alors ?$begi-olive-audre-perve-non-hors
 config$max column$setint maxcolumn
 config$host$settext host
 config$port$setint port
-- 
2.45.1