From 2fd5db83aa46d6a757fe4b33c2b45851bd00c48b Mon Sep 17 00:00:00 2001
From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Fri, 24 Jan 2014 13:57:45 +0100
Subject: [PATCH] some tweaks (now, context is filled at runtime, not stored
 into database)

---
 mainwindow.cpp | 89 ++++++++++++++++++++------------------------------
 mainwindow.h   |  8 ++---
 2 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9c6642b..4bdb868 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,3 +1,4 @@
+
 #include "mainwindow.h"
 //#include "ui_mainwindow.h"
 #include "mainwindow.h"
@@ -105,16 +106,6 @@ void MainWindow::showExpanded()
 #else
     show();
 #endif
-}
-void MainWindow::lsconfig(){
-    flush();
-    QStringList tmp=conf->allKeys();
-    for(int a=0; a<tmp.size();a++){
-        //CLabel * b=new CLabel(tmp[a]);
-        addWidget(tmp[a], new CLabel(tmp[a]));
-    }
-
-
 }
 void MainWindow::quit(){
     qDebug()<<"quit()";
@@ -126,10 +117,10 @@ void MainWindow::quit(){
 }
 CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){
     qDebug()<<"addWidget("<<key<<")";
-
+    // I want to adjust the text size
     int maxc=conf->value(QString("maxcolumn")).toInt();
     int maxl=conf->value(QString("maxline")).toInt();
-    grid->addWidget(a, grid->count()/maxc, grid->count()%maxc, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
+    grid->addWidget(a, grid->count()/maxc, grid->count()%maxc, 1, 1, Qt::AlignJustify| Qt::AlignVCenter | Qt::AlignHCenter);
     //QObject::connect(a, SIGNAL(pressed()), signalmap, SLOT(map()));
     QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map()));
     signalmap->setMapping(a, key);
@@ -147,17 +138,9 @@ void MainWindow::action(const QString &a){
         conf->setValue(a.split(QString(" "))[1], QInputDialog::getInt(this, "setInt", a.split(QString(" "))[1] , conf->value(QString(a.split(QString(" "))[1])).toInt()));
     }
     else if(a.split(QString(" "))[0]=="new"){
-        QString b="";
-        for(int c=0;c<way.size()-2;c++){
-            b+=way[c];
-            b+=" ";
-        };
-        b+=way.last();
-        b+=", ";
-        b+=a.remove(0,4);
+        QString b=a.remove(0,4);
         entry(b);
     }
-    else if(a=="viewdata")qDebug()<<data;
     else if(a=="nothing")return;
     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()));
@@ -178,7 +161,7 @@ void MainWindow::createMenuBar(){
     EditMenu->addAction(trUtf8("Sa&v buttons"), this, SLOT(savButtons()), QKeySequence(trUtf8("Ctrl+V", "Buttons|Save")));
     EditMenu->addAction(trUtf8("&Edit buttons"), this, SLOT(editButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Buttons|&Edit")));
     EditMenu->addAction(trUtf8("&View/Hide menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "Buttons|View menu")));
-    EditMenu->addAction(trUtf8("Reset database"), this, SLOT(resetDB()), QKeySequence(trUtf8("Ctrl+Z", "Buttons|ResetDB")));
+    EditMenu->addAction(trUtf8("Reset database"), this, SLOT(resetUi()), QKeySequence(trUtf8("Ctrl+Z", "Buttons|ResetDB")));
     menuBar()->addMenu(EditMenu);
     HelpMenu=new QMenu(QString("&Help"));
     HelpMenu->addAction(tr("About Qt"), qApp, SLOT(aboutQt()), QKeySequence(tr("ctrl+H", "About Qt")));
@@ -203,7 +186,7 @@ void MainWindow::flush(){
     }
     //widget.clear();
 }
-CLabel::CLabel( const QString& text, const QString & style, QWidget * parent ) : QLabel(parent)
+CLabel::CLabel( const QString& text, const QRect & dim, const QString & style, QWidget * parent ) : QLabel(parent)
 {
     m_style=style;
     setText(text);
@@ -275,7 +258,7 @@ QString &MainWindow::get(int row, int column){
     return tmp;
 }
 int MainWindow::exec(const QList<QString> & a){
-    qDebug()<<"exec("<<a[0]<<")";
+    qDebug()<<"exec("<<a[0]<<") size="<<a.size();
     q->prepare(a[0]);
     for (int j=1; j<a.size(); j++){
         q->bindValue(j-1, a[j]);
@@ -290,19 +273,31 @@ int MainWindow::exec(const QList<QString> & a){
     else return 0;
 }
 void MainWindow::entry(const QString &a){
-    QString label, time=QDateTime::currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss")), entry="";
+    QString label, time=QDateTime::currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss")), entry, context;
     bool ok=0;
-    if(a=="")label=time+" : ";
-    else label=time+", "+a+" : ";
+    for(int b=0; b<way.size()-1;b++){
+        qDebug()<<"way["<<b<<"]="<<way[b];
+        context.append(way[b]);
+        context.append(" ");
+    }
+    context.append(way[way.size()-1]);
+    qDebug()<<"context="<<context;
+    if(a=="")label=time+" "+context+" : ";
+    else label=time+" "+context+", "+a+" : ";
     entry=QInputDialog::getText(this, QString("nouvelle entrée"), label, QLineEdit::Normal, "", &ok);
     if(ok==0)return;
-    QString c=label+entry;
+    QString c;
+    qDebug()<<"c="<<c<<" context="<<context<<" entry="<<entry<<" a="<<a;
+    if(a=="")c=context+" : "+entry;
+    else c=context+", "+a+" : "+entry;
+    qDebug()<<"c="<<c;
     QFile fichier(conf->value(QString("file")).toString());
     fichier.open(QIODevice::Append | QIODevice::Text);
     QTextStream flux(&fichier);
-    flux << c << endl;
+    flux << label << c << endl;
     fichier.close();
     QList<QString> d({"INSERT INTO raw (date, texte) VALUES (:date, :txt);"});
+    qDebug()<<"c="<<c;
     d.append(time);
     d.append(c);
     exec(d);
@@ -322,48 +317,40 @@ void MainWindow::addButtonDB(){
     bool ok=0;
     cmd.append("insert into ui (label, keyword, action) values (:label, :keyword, :action)");
     QString cur=way.last();
-    QString a="", b, c=QInputDialog::getText(this, QString("label"), QString("Entrez son label"),QLineEdit::Normal, QString(), &ok);
+    QString a, b, c=QInputDialog::getText(this, QString("label"), QString("Entrez son label"),QLineEdit::Normal, QString(), &ok);
     if ((c=="")||(ok==0))return;
     cmd.append(c);
-    for(int i=0;i<way.size(); i++){
-        a+=way[i];
-        a.chop(1);
-        a+="_";
-        qDebug()<<"a="<<a<<" i="<<i;
-    }
     b=QInputDialog::getText(this, QString("keyword"), QString("Entrez ses mots clé (no limit !)"), QLineEdit::Normal, cur, &ok);
     if ((b=="")||(ok==0))return;
     cmd.append(b);
-    a=QInputDialog::getText(this, QString("action"), QString("Entrez son action"), QLineEdit::Normal, a+c, &ok);
+    a=QInputDialog::getText(this, QString("action"), QString("Entrez son action"), QLineEdit::Normal, c, &ok);
     if ((a=="")||(ok==0))return;
     cmd.append(a);
     exec(cmd);
     data.append(c).append('$').append(b).append('$').append(a).append('\n');
     savButtons();
-    //getButtons(way.last());
     return;
 }
 void MainWindow::getButtons(const QString &a){
-    qDebug()<<"getButtons("<<a<<") wait for update end (10s)";
+    qDebug()<<"getButtons("<<a<<") way.size()"<<way.size();
     flush();
-    if(updatelocker.tryLock(10000))updatelocker.unlock();
-    else{qDebug()<<"updatelocker is locked more than 10s";}
+    if(updatelocker.tryLock(60000))updatelocker.unlock();
+    else{qDebug()<<"updatelocker is locked more than 1mn";}
     way.append(a);
     QString b="%"+a+"%";
     QList<QString> tmp({"select label,action from ui where keyword like ?;", b});
-    //label->setText(QString::number(way.size()));
     label->setText(a);
-
     exec(tmp);
     int labCol = 0;//r.indexOf("label");
     int actCol = 1;//r.indexOf("action");
-    //QMutexLocker locker(&sql);
     int i=0;
+    QRect rect;
+    qDebug()<<"bcl to add buttons";
     while(q->next()){
-        addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), conf->value(QString("button")).toString()));
+        addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), rect, conf->value(QString("button")).toString()));
         i++;
     };
-    qDebug()<<"end getButtons : "<<i<<" button(s)";
+    qDebug()<<"end getButtons : "<<i<<" button(s) way.size()"<<way.size();
 }
 void MainWindow::editButtonDB(){
     /*flush();
@@ -394,16 +381,12 @@ void MainWindow::sendUi(){
     connect(rep, SIGNAL(finished()), this, SLOT(datasend()));
 }
 void MainWindow::back(){
-    flush();
-    if(!way.isEmpty()){
+    if(way.size()-1>0){
+        flush();
         for(int i=0; i<way.size(); i++){
             addWidget(QString(way[i]), new CLabel(QString(way[i])));
         }
     }
-    /*if(!way.isEmpty()){
-        way.removeLast();
-        getButtons(way.last());
-    }*/
     else QMessageBox::information(this, QString("Erreur"), QString("Vous êtes déja au départ."));
 
 }
@@ -491,7 +474,7 @@ void MainWindow::datasend(){
 
     QMessageBox::information(this, "update", texte);
 }
-void MainWindow::resetDB(){
+void MainWindow::resetUi(){
     exec(QList<QString>({"delete from ui;"}));
 
 }
diff --git a/mainwindow.h b/mainwindow.h
index 9dabd5d..110c41c 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -63,7 +63,7 @@ Q_OBJECT
     QString m_style;
 
 public:
-    explicit CLabel(const QString& text ="default", const QString &style="background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;", QWidget * parent = 0 );
+    explicit CLabel(const QString& text ="default",const QRect & =QRect(0,0,1,1), const QString &style="background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;",QWidget * parent = 0 );
     ~CLabel();
     void SetTextToLabel(const QString &);
 signals:
@@ -100,7 +100,7 @@ private slots:
     void back();
     void start();
     void quit();
-    void lsconfig();
+
     void action(const QString &);
     void createMenuBar();
     void toggleMenu();
@@ -120,7 +120,7 @@ private slots:
     void sendUi();
     void savButtons();
     void readButtons(const QByteArray &);
-    void resetDB();
+    void resetUi();
 public slots:
 
 signals:
@@ -139,7 +139,7 @@ private:
     QList<QString> way;
     QSqlDatabase db;
     QSqlQuery *q;
-    //QSqlRecord r;
+    QSqlRecord r;
     FileDownloader * m;
     QNetworkAccessManager *net;
     QNetworkReply * rep;
-- 
2.45.1