From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Fri, 13 Dec 2013 11:37:27 +0000 (+0100)
Subject: I've added file to remember howto create buttons on computer and howto get into my... 
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=1ecbdecb005d79d6c403e661daa638447a33bd6a;p=diary-mobile.git

I've added file to remember howto create buttons on computer and howto get into my phone
---

diff --git a/db.sql b/db.sql
new file mode 100644
index 0000000..2210289
--- /dev/null
+++ b/db.sql
@@ -0,0 +1,9 @@
+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE ui(keyword text, label text, action text);
+INSERT INTO "ui" VALUES('begin','olìver'' s','begi-oliver ');
+INSERT INTO "ui" VALUES('begi-oliver ','audrey','begi-opub-audrey');
+INSERT INTO "ui" VALUES('begi-opub-audrey ','tu as un copain, vraiment ?','begi-opub-audre-raison ');
+INSERT INTO "ui" VALUES('begin','course','begi-x');
+CREATE TABLE raw(date timestamp, texte text);
+COMMIT;
diff --git a/howto-export-android-sqlite-to-db.sql.sh b/howto-export-android-sqlite-to-db.sql.sh
new file mode 100755
index 0000000..edf723d
--- /dev/null
+++ b/howto-export-android-sqlite-to-db.sql.sh
@@ -0,0 +1,2 @@
+adb pull /data/data/eu.nothing2do.diarymobile/files/db
+echo '.dump' | sqlite3 db > db.sql
diff --git a/howto-import-db.sql-into-android.sql.sh b/howto-import-db.sql-into-android.sql.sh
new file mode 100644
index 0000000..1fbdd38
--- /dev/null
+++ b/howto-import-db.sql-into-android.sql.sh
@@ -0,0 +1,2 @@
+echo '.read db.sql'|sqlite3 db
+adb push /data/data/eu.nothing2do.diarymobile/files/db
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 418008f..b7146f4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -239,6 +239,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("file"), QVariant("diary.txt"));
     conf->setValue(QString("maxcolumn"), QVariant(4));
     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;"));
 }
 QString &MainWindow::get(int row, int column){
     q->seek(row);
@@ -274,7 +275,7 @@ int MainWindow::alias(const QString & a){
 void MainWindow::entry(){
     QDateTime v;
     QString a=v.currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss"))+" "+texte->text();
-    QFile fichier(file);
+    QFile fichier(conf->value(QString("file")).toString());
     fichier.open(QIODevice::Append | QIODevice::Text);
     QTextStream flux(&fichier);
     flux << a << endl;
@@ -299,17 +300,17 @@ 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 label=QInputDialog::getText(this, QString("label"), QString("Entrez le label"));
-    if (label=="")label="default";
-    QString action=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"));
+    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 a=cmd+key+"', '"+label+"', '"+action+"');";
+    QString a=cmd+key+"', '"+view+"', '"+action+"');";
     exec(a);
 }
 void MainWindow::getButtons(const QString &a){
     QString tmp("select label,action from ui where keyword like '%"+a+"%';");
     exec(tmp);
-    //r=q->record();r
+    //r=q->record();
     //qDebug()<<"nmb of col : "<<r.count();
     int labCol = 0;//r.indexOf("label");
     int actCol = 1;//r.indexOf("action");
diff --git a/mainwindow.h b/mainwindow.h
index ab43631..9521cf5 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -29,7 +29,7 @@ public:
     explicit CLabel( const QString& text ="default", QWidget * parent = 0 );
     ~CLabel();
 signals:
-    //void clicked();
+    void clicked();
     void pressed();
     void released();
 private slots: