I've to run ... It's late

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4fc7ad2e836e984e0735d17b5cc2466684a4d577..cd460d62a0e66400b53502e992e9c71d98c652e0 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -139,7 +139,7 @@ void MainWindow::action(const QString & a){
         start();
     }
     else if(a.split(QString(" "))[0]==QString("settext")){
-        conf->setValue(a.split(QString(" "))[1], QInputDialog::getText(this, "setText", "label", QLineEdit::Normal, conf->value(QString(a.split(QString(" "))[2])).toString()));
+        conf->setValue(a.split(QString(" "))[1], QInputDialog::getText(this, "setText", a.split(QString(" "))[1], QLineEdit::Normal, conf->value(QString(a.split(QString(" "))[1])).toString()));//conf->value(QString(a.split(QString(" ")).mid(2)))
     }
     else if(a.split(QString(" "))[0]==QString("setint")){
         conf->setValue(a.split(QString(" "))[1], QInputDialog::getInt(this, "setInt", a.split(QString(" "))[2] , conf->value(QString(a.split(QString(" "))[3])).toInt()));
@@ -148,6 +148,9 @@ void MainWindow::action(const QString & a){
         entry(a.remove(0, 4));
         start();
     }
+    else if(a.split(QString(" "))[0]=="setfile"){
+        conf->setValue(a.split(QString(" "))[1], QFileDialog::getSaveFileName(this, QString("get file"), QDir::homePath()));
+    }
     else getButtons(a);
 }
 void MainWindow::createMenuBar(){
@@ -249,7 +252,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("SQLsettings"), QVariant("requiressl=1 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("menu"), QVariant(1));
-    conf->setValue(QString("dbfile"), QVariant("ui.sql"));
+    conf->setValue(QString("sqlfile"), QVariant("ui.sql"));
     conf->setValue(QString("getsql"), QVariant("wget --no-check-certificate https://github.com/Nothing2Do/diary-mobile-android/raw/master/ui.sql"));
 }
 QString &MainWindow::get(int row, int column){

diff --git a/ui.sql b/ui.sql
index 7bfc0427e24d1cde17099dc4f6547abfc5cd5752..7f3e7cbfbae3bd1c60952b6163c044b2fb945e9c 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -1,39 +1,33 @@
 PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
-INSERT INTO "ui" VALUES('begin','fille','fille');
-INSERT INTO "ui" VALUES('fille','aurelie','f-aurelie');
-INSERT INTO "ui" VALUES('fill-aurelie','discours','f-a-discours');
-INSERT INTO "ui" VALUES('fill-aureli-discours','discours un peu plus long que la moyenne pour voir se qui va se passer','begin');
-INSERT INTO "ui" VALUES('fille','audrey','f-audrey');
-INSERT INTO "ui" VALUES('fill-audrey','elle se moque de moi, méchante ;-)','begin');
-INSERT INTO "ui" VALUES('begin','lieu','lieu');
-INSERT INTO "ui" VALUES('lieu','odysseum','lie-odysseum');
-INSERT INTO "ui" VALUES('lie-odysseum','subway','lieu-odysseu-subway');
-INSERT INTO "ui" VALUES('lie-odysseu-subway','julie','lie-odysseu-subwa-julie');
-INSERT INTO "ui" VALUES('lie-odysseum','oliver''s pub','lie-odysseu-oliver');
-INSERT INTO "ui" VALUES('lie-odysseu-oliver','valentine','l-o-opub-val');
-INSERT INTO "ui" VALUES('lie-odysseu-opub-val','s''enerve quand je lui demande ce qu''elle veut','begin');
-INSERT INTO "ui" VALUES('begin','olìver'' s','begi-oliver ');
-INSERT INTO "ui" VALUES('begi-oliver','audrey','begi-olive-audrey');
-INSERT INTO "ui" VALUES('begi-olive-audrey','Pourquoi vous me prenez pour un perver ?','begi-olive-audre-perver');
-INSERT INTO "ui" VALUES('begi-olive-audre-perver','"On ne te prends pas pour un perver."','begi-olive-audre-perve-non');
-INSERT INTO "ui" VALUES('begi-olive-audre-perve-non','Pourquoi vous refusez qu''on se voit hors d''ici alors ?','begi-olive-audre-perve-non-hors');
-INSERT INTO "ui" VALUES('begin','config','config');
-INSERT INTO "ui" VALUES('config','max column','c-maxc');
-INSERT INTO "ui" VALUES('c-maxc','3','set maxcolumn 3');
-INSERT INTO "ui" VALUES('c-maxc','4','set maxcolumn 4');
-INSERT INTO "ui" VALUES('c-maxc','5','set maxcolumn 5');
-INSERT INTO "ui" VALUES('config','host','settext host');
-INSERT INTO "ui" VALUES('c-host','127.0.0.1','set host 127.0.0.1');
-INSERT INTO "ui" VALUES('c-host','ssh.alwaysdata.com','set host ssh.alwaysdata.com');
-INSERT INTO "ui" VALUES('config','port','c-port');
-INSERT INTO "ui" VALUES('c-port','5432','set port 5432');
-INSERT INTO "ui" VALUES('config','user','c-user');
-INSERT INTO "ui" VALUES('c-user','android','set user android');
-INSERT INTO "ui" VALUES('config','password','c-pass');
-INSERT INTO "ui" VALUES('c-pass','123','set pass 123');
-INSERT INTO "ui" VALUES('config','database','c-db');
-INSERT INTO "ui" VALUES('c-db','chat','set database chat');
-INSERT INTO "ui" VALUES('c-db','chien','set database chien');
+INSERT INTO "ui" (keyword, label, action) VALUES('begin','fille','fille');
+INSERT INTO "ui" (keyword, label, action) VALUES('fille','aurelie','f-aurelie');
+INSERT INTO "ui" (keyword, label, action) VALUES('fill-aurelie','discours','f-a-discours');
+INSERT INTO "ui" (keyword, label, action) VALUES('fill-aureli-discours','discours un peu plus long que la moyenne pour voir se qui va se passer','begin');
+INSERT INTO "ui" (keyword, label, action) VALUES('fille','audrey','f-audrey');
+INSERT INTO "ui" (keyword, label, action) VALUES('fill-audrey','elle se moque de moi, méchante ;-)','begin');
+INSERT INTO "ui" (keyword, label, action) VALUES('begin','lieu','lieu');
+INSERT INTO "ui" (keyword, label, action) VALUES('lieu','odysseum','lie-odysseum');
+INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseum','subway','lieu-odysseu-subway');
+INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseu-subway','julie','lie-odysseu-subwa-julie');
+INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseum','oliver''s pub','lie-odysseu-oliver');
+INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseu-oliver','valentine','l-o-opub-val');
+INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseu-opub-val','s''enerve quand je lui demande ce qu''elle veut','begin');
+INSERT INTO "ui" (keyword, label, action) VALUES('begin','olìver'' s','begi-oliver ');
+INSERT INTO "ui" (keyword, label, action) VALUES('begi-oliver','audrey','begi-olive-audrey');
+INSERT INTO "ui" (keyword, label, action) VALUES('begi-olive-audrey','Pourquoi vous me prenez pour un perver ?','begi-olive-audre-perver');
+INSERT INTO "ui" (keyword, label, action) VALUES('begi-olive-audre-perver','"On ne te prends pas pour un perver."','begi-olive-audre-perve-non');
+INSERT INTO "ui" (keyword, label, action) VALUES('begi-olive-audre-perve-non','Pourquoi vous refusez qu''on se voit hors d''ici alors ?','begi-olive-audre-perve-non-hors');
+INSERT INTO "ui" (keyword, label, action) VALUES('begin','config','config');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','max column','setint maxc maxcolumn 3');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','host','settext host 127.0.0.1');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','port','setint port port 5432');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','user','settext user root');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','password','settext pass 123456789');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','database','settext db database');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','filesave','setfile file');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','SQLsettings', 'settext SQLsettings requiressl=1 connect_timeout=10000');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','button', 'settext button background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','fichier SQL', 'setfile sqlfile ui.sql');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','getSQL', 'settext getsql wget --no-check-certificate https://github.com/Nothing2Do/diary-mobile-android/raw/master/ui.sql');
 COMMIT;
-