few tweaks

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 188ef3f7219a9fea210fbe7ac22c62f898a1e614..556ec44c1d17cedaddd1483e56a23c779177b9f6 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -81,6 +81,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 }
 void MainWindow::start(){
     way.clear();
+    flush();
     getButtons(conf->value(QString("start")).toString());
 }
 MainWindow::~MainWindow()
@@ -350,12 +351,12 @@ void MainWindow::firstrun(){
     conf->setValue(QString("maxcolumn"), QVariant(2));
     conf->setValue(QString("maxline"), QVariant(5));
     conf->setValue(QString("SQLsettings"), QVariant("connect_timeout=10000"));
-    conf->setValue(QString("button"), QVariant("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
+    conf->setValue(QString("button"), QVariant("background-color: yellow;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
     conf->setValue(QString("menu"), QVariant(1));
-    conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/ui.sql"));
-    conf->setValue(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/raw"));
-    conf->setValue(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/ui.sql"));
-    conf->setValue(QString("start"), QVariant("begin"));
+    conf->setValue(QString("download"), QVariant("http://gaby:sha1sum@www.nothing2do.eu/diary/ui.sql"));
+    conf->setValue(QString("uploadRAW"), QVariant("ftp://nothing2do.eu_diary:200386@ftp.alwaysdata.com/raw"));
+    conf->setValue(QString("uploadUi"), QVariant("ftp://nothing2do.eu_diary:200386@ftp.alwaysdata.com/ui.sql"));
+    conf->setValue(QString("start"), QVariant("Montpellier"));
     conf->setValue(QString("restore"), QVariant("http://www.abc.de/db"));
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
     conf->setValue(QString("selectbuttons"), QVariant("select keyword,label,action from ui order by label;"));
@@ -370,7 +371,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("testbuttons"), QVariant("select id,keyword from ui where label=? and action=?;"));
     conf->setValue(QString("volumdown"), QVariant("back"));
     conf->setValue(QString("volumup"), QVariant("Montpellier"));
-    conf->setValue(QString("askkeyword"), QVariant(1));
+    conf->setValue(QString("askkeyword"), QVariant(0));
     conf->setValue(QString("sepcmd"), QVariant("!@!"));
     conf->setValue(QString("sepchc"), QVariant("!#!"));
     conf->setValue(QString("sqlval"), QVariant("?"));
@@ -615,7 +616,6 @@ void MainWindow::readButtons(const QByteArray &in){
 
     };
     db.commit();
-    flush();
     emit datafilled();
 }
 void MainWindow::datasent(){
@@ -686,13 +686,13 @@ void MainWindow::insertButton(const QString & keyword, const QString & label, co
     tmp.append(label);
     tmp.append(action);
     exec(tmp);
-    q->first();
-    int count=0;
+    if(!q->first()){qDebug()<<"q-first() don't work";
+    }
+    int count=1;
     QString key=keyword, id=q->value(0).toString();
-    while(q->isValid()){
+    while(q->next()){
         count++;
         key=key+" "+q->value(1).toString();
-        q->next();
     }
     if(count==0)exec(QList<QString>({conf->value(QString("addbuttons")).toString(), label, key, action}));
     else{exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), key, label, action, id}));