(get/set)android-db.sh added

diff --git a/howto-export-android-sqlite-to-db.sql.sh b/get-android-db.sh
similarity index 100%
rename from howto-export-android-sqlite-to-db.sql.sh
rename to get-android-db.sh

diff --git a/howto-import-db.sql-into-android.sql.sh b/howto-import-db.sql-into-android.sql.sh
deleted file mode 100644 (file)
index 1fbdd38..0000000
--- a/howto-import-db.sql-into-android.sql.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo '.read db.sql'|sqlite3 db
-adb push /data/data/eu.nothing2do.diarymobile/files/db

diff --git a/mainwindow.cpp b/mainwindow.cpp
index af4a4040a93b12de99c225e33d1dfd559a0dc3db..c9a217b728801dda5b702bdc6411340e1fb15782 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -18,7 +18,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
     qDebug()<<"begin of MainWindows";
     conf=new QSettings(QString("FwF"), QString("diary-mobile"), this);
-    if (conf->allKeys().size()==0)firstrun();
+    if (conf->allKeys().size()==0){
+        first=1;
+        firstrun();
+    }
     texte=new QLineEdit();
     screen=new QWidget(this);
     vbox=new QVBoxLayout(screen);
@@ -38,6 +41,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     setCentralWidget(screen);
     createMenuBar();
     connectDB();
+    if(first)createDB();
     statusBar()->addPermanentWidget(label);
     menuBar()->hide();
     start();
@@ -139,7 +143,7 @@ void MainWindow::action(const QString & a){
     if (a.split(QString(" "))[0]==QString("set")){
         conf->setValue(QString(a.split(QString(" "))[1]), a.split(QString(" "))[2]);
     }
-    else if(a.split(QString(" "))[0]==QString("sql ")){
+    else if(a.split(QString(" "))[0]==QString("sql")){
         exec(a.mid(4));
     }
     else getButtons(a);
@@ -211,9 +215,6 @@ void MainWindow::debug(int col){
         q->next();
     }
 }
-/*QString MainWindow::getText(const QString &a){
-    return widget.value(a)->text();
-}*/
 void MainWindow::connectDB(){
     db = QSqlDatabase::addDatabase("QSQLITE");
     //db = QSqlDatabase::addDatabase("QPSQL");
@@ -297,15 +298,16 @@ void MainWindow::createDB(){
 
 }
 void MainWindow::addButtonDB(){
-    QString cmd="insert into ui (keyword, label, action) values ('";
-    QString key=QInputDialog::getText(this, QString("keyword"), QString("Entrez votre mot clé"), QLineEdit::Normal, label->text());
-    if (key=="")key="default";
+    QString cmd="insert into ui (keyword, label, action) values ('", cur=(label->text());
     QString view=QInputDialog::getText(this, QString("label"), QString("Entrez le label"));
     if (view=="")view="default";
-    QString action=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, label->text());
-    if(action=="")action="begin";
+    QString key=QInputDialog::getText(this, QString("keyword"), QString("Entrez le nom de la page"), QLineEdit::Normal, cur);
+    cur.chop(1);
+    QString action=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, cur+"_"+view);
+
     QString a=cmd+key+"', '"+view+"', '"+action+"');";
     exec(a);
+    getButtons(label->text());
 }
 void MainWindow::getButtons(const QString &a){
     QString tmp("select label,action from ui where keyword like '%"+a+"%';");

diff --git a/mainwindow.h b/mainwindow.h
index 4f741ac697ab3f08ed2dc220b117b8fc4ee595ee..4d444ce5219d296b53f85763f091cd0bf95a7a09 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -84,6 +84,7 @@ public slots:
 signals:
 
 private:
+    bool first;
     QWidget *screen;
     QGridLayout *grid;
     QVBoxLayout * vbox;

diff --git a/set-android-db.sh b/set-android-db.sh
new file mode 100755 (executable)
index 0000000..bce6d81
--- /dev/null
+++ b/set-android-db.sh
@@ -0,0 +1,2 @@
+echo '.read ui.sql'|sqlite3 db
+adb push db /sdcard/db

diff --git a/ui.sql b/ui.sql
index 1e5c16442f6af7bb352d8a802f228e1fb4ff052c..c94263cf8ecafa2bb9513c8b0400464bcd89cfb6 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -1,31 +1,41 @@
-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('f-aurelie','discours','f-a-discours');
-            INSERT INTO ui ('keyword', 'label', 'action') VALUES('f-a-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('f-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', 'l-odysseum');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('l-odysseum', 'subway', 'l-o-subway');
-            INSERT INTO ui ('keyword', 'label', 'action') VALUES('l-o-subway', 'julie', 'l-o-s-julie');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('l-odysseum', 'oliver''s pub', 'l-o-oliver');
-            INSERT INTO ui ('keyword', 'label', 'action') VALUES('l-o-oliver', 'valentine', 'l-o-opub-val');
-                INSERT INTO ui ('keyword', 'label', 'action') VALUES('l-o-opub-val', 's''enerve quand je lui demande ce qu''elle veut', 'begin');
---config buttons
-INSERT INTO ui ('keyword', 'label', 'action') VALUES('begin', 'config', 'config');
-    INSERT INTO ui ('keyword', 'label', 'action') VALUES('config', 'max column', 'c-maxc');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-maxc', '3', 'set maxcolumn 3');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-maxc', '4', 'set maxcolumn 4');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-maxc', '5', 'set maxcolumn 5');
-    INSERT INTO ui ('keyword', 'label', 'action') VALUES('config', 'host', 'c-host');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-host', '127.0.0.1', 'set host 127.0.0.1');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-host', 'ssh.alwaysdata.com', 'set host ssh.alwaysdata.com');
-    INSERT INTO ui ('keyword', 'label', 'action') VALUES('config', 'port', 'c-port');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-port', '5432', 'set port 5432');
-    INSERT INTO ui ('keyword', 'label', 'action') VALUES('config', 'user', 'c-user');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-user', 'android', 'set user android');
-    INSERT INTO ui ('keyword', 'label', 'action') VALUES('config', 'password', 'c-pass'); -- I highly discourage to set pass in a public zone !
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-pass', '123', 'set pass 123'); -- "
-    INSERT INTO ui ('keyword', 'label', 'action') VALUES('config', 'database', 'c-db');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-db', 'chat', 'set database chat');
-        INSERT INTO ui ('keyword', 'label', 'action') VALUES('c-db', 'chien', 'set database chien');
+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE ui(keyword text, label text, action text);
+INSERT INTO "ui" VALUES('begin','fille','fille');
+INSERT INTO "ui" VALUES('fille','aurelie','f-aurelie');
+INSERT INTO "ui" VALUES('f-aurelie','discours','f-a-discours');
+INSERT INTO "ui" VALUES('f-a-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('f-audrey','elle se moque de moi, méchante ;-)','begin');
+INSERT INTO "ui" VALUES('begin','lieu','lieu');
+INSERT INTO "ui" VALUES('lieu','odysseum','l-odysseum');
+INSERT INTO "ui" VALUES('l-odysseum','subway','l-o-subway');
+INSERT INTO "ui" VALUES('l-o-subway','julie','l-o-s-julie');
+INSERT INTO "ui" VALUES('l-odysseum','oliver''s pub','l-o-oliver');
+INSERT INTO "ui" VALUES('l-o-oliver','valentine','l-o-opub-val');
+INSERT INTO "ui" VALUES('l-o-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','c-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');
+CREATE TABLE raw(date timestamp, texte text);
+COMMIT;
+