From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sun, 8 Dec 2013 13:19:34 +0000 (+0100)
Subject: added content to ui.sql (and cleaned a little)
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=938414cb85c36e00256af82a11059f41b24f3b09;p=diary-mobile.git

added content to ui.sql (and cleaned a little)
---

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
new file mode 100644
index 0000000..1f3b5fe
--- /dev/null
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest android:versionCode="1" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionName="1.0" package="eu.nothing2do.diarymobile">
+    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon" android:label="diary-mobile-android">
+        <activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:screenOrientation="unspecified" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+            <meta-data android:name="android.app.lib_name" android:value="diary-mobile-android"/>
+            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+            <meta-data android:name="android.app.repository" android:value="default"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+            <!-- Deploy Qt libs as part of package -->
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
+            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+            <!-- Run with local libs -->
+            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
+            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
+            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
+            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
+            <!--  Messages maps -->
+            <meta-data android:name="android.app.ministro_not_found_msg" android:value="@string/ministro_not_found_msg"/>
+            <meta-data android:name="android.app.ministro_needed_msg" android:value="@string/ministro_needed_msg"/>
+            <meta-data android:name="android.app.fatal_error_msg" android:value="@string/fatal_error_msg"/>
+            <!--  Messages maps -->
+            <!-- Splash screen -->
+            <meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/>
+            <!-- Splash screen -->
+        </activity>
+    </application>
+    <supports-screens android:anyDensity="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"/>
+    <!-- %%INSERT_PERMISSIONS -->
+    <!-- %%INSERT_FEATURES -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+</manifest>
diff --git a/diary-mobile-android.pro b/diary-mobile-android.pro
index b040e4c..4a9e8c8 100644
--- a/diary-mobile-android.pro
+++ b/diary-mobile-android.pro
@@ -28,3 +28,6 @@ QMAKE_CXXFLAGS += -fpermissive
 OTHER_FILES += \
 #    android/AndroidManifest.xml \
     ui.sql \
+    android/AndroidManifest.xml
+
+ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7f52a5b..7616e48 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -14,8 +14,7 @@
 #define MAXLINE 5 // !!!
 
 
-MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent)
+MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
     conf=new QSettings(QString("FwF"), QString("diary-mobile"), this);
     if (conf->allKeys().size()==0)firstrun();
@@ -26,7 +25,7 @@ MainWindow::MainWindow(QWidget *parent)
     grid=new QGridLayout();
     ok=new CLabel("ok");
     ok->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    connect(ok, SIGNAL(clicked()), this, SLOT(entry()));
+    connect(ok, SIGNAL(released()), this, SLOT(entry()));
     hbox->addWidget(texte);
     hbox->addWidget(ok);
     vbox->addLayout(hbox);
@@ -41,7 +40,7 @@ MainWindow::MainWindow(QWidget *parent)
     file=conf->value(QString("file"), QVariant("diary.txt")).toString();
     connect(signalmap, SIGNAL(mapped(const QString &)),
                  this, SLOT(action(const QString &)));
-    label=new QLabel("Save locally");
+    label=new QLabel("page name");
     setCentralWidget(screen);
     createMenuBar();
     connectDB();
@@ -166,17 +165,18 @@ CLabel* MainWindow::addWidget(const QString &key, CLabel * a){
 
     widget.insert(key, a);
     grid->addWidget(a, grid->count()/MAXCOLUMN, grid->count()%MAXCOLUMN, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
-    QObject::connect(a, SIGNAL(clicked()), signalmap, SLOT(map()));
+    QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map()));
     signalmap->setMapping(a, key);
     return a;
 }
 void MainWindow::remWidget(const QString & a){
-    QObject::disconnect(widget.value(a), SIGNAL(clicked()), signalmap, SLOT(map()));
+    QObject::disconnect(widget.value(a), SIGNAL(released()), signalmap, SLOT(map()));
     grid->removeWidget(widget.value(a));
     widget.remove(a);
 }
 void MainWindow::action(const QString & a){
     qDebug()<<"action("<<a<<")";
+    label->setText(a);
     flush();
     if (a=="host")choosehost();
     else if (a=="port")chooseport();
@@ -222,12 +222,11 @@ void MainWindow::flush(){
 void MainWindow::editConf(const QString & a){
     label=new QLabel(a);
     texte=new QLineEdit(conf->value(a).toString());
-    //texte=new QLineEdit(a);
     CLabel * button=new CLabel(QString("ok"));
     grid->addWidget(label, 1, 0);
     grid->addWidget(texte, 1, 1);
     grid->addWidget(button, 1,2);
-    connect(button, SIGNAL(clicked()), this, SLOT(confChanged()));
+    connect(button, SIGNAL(released()), this, SLOT(confChanged()));
 
 }
 void MainWindow::confChanged(){
@@ -249,13 +248,13 @@ CLabel::~CLabel()
 void CLabel::mousePressEvent ( QMouseEvent * event )
 {
     switch(event->button()){
-        case Qt::LeftButton:setStyleSheet("background-color: red;border-style: inset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");emit clicked();break;
+        case Qt::LeftButton:setStyleSheet("background-color: red;border-style: inset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");emit pressed();break;
     }
 }
 void CLabel::mouseReleaseEvent( QMouseEvent * event )
 {
     switch(event->button()){
-        case Qt::LeftButton:setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");emit releaseMouse();break;
+        case Qt::LeftButton:setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");emit released();break;
 
     }
 }
@@ -333,10 +332,7 @@ int MainWindow::alias(const QString & a){
     return 0;
 
 }
-int MainWindow::alias(const QString & a, int & b){
-
-}
-int MainWindow::entry(){
+void MainWindow::entry(){
     QDateTime v;
     QString a=v.currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss"))+" "+texte->text();
     QFile fichier(file);
@@ -355,12 +351,9 @@ int MainWindow::entry(){
     if (b.isValid())qDebug()<<"q->lastError():"<<b.text();
     texte->clear();
 }
-int MainWindow::createDB(){
+void MainWindow::createDB(){
     exec(QString("create table ui(keyword text, label text, action text);"));
     exec(QString("create table raw(date timestamp, texte text);"));
-    exec(QString("insert into ui (keyword, label, action) values ('begin', 'fille', 'fille');"));
-    exec(QString("insert into ui (keyword, label, action) values ('fille', 'aurelie', 'f-aurelie');"));
-    exec(QString("insert into ui (keyword, label, action) values ('f-aurelie', 'discours', 'f-a-discours');"));
 }
 void MainWindow::addButtonDB(){
     QString cmd="insert into ui (keyword, label, action) values ('";
@@ -369,7 +362,7 @@ void MainWindow::addButtonDB(){
     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"));
-
+    if(action=="")action="begin";
     QString a=cmd+key+"', '"+label+"', '"+action+"');";
     qDebug()<<"exec("<<a<<")";
     exec(a);
diff --git a/mainwindow.h b/mainwindow.h
index 66342fb..36b0579 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -29,7 +29,9 @@ public:
     explicit CLabel( const QString& text ="default", QWidget * parent = 0 );
     ~CLabel();
 signals:
-    void clicked();
+    //void clicked();
+    void pressed();
+    void released();
 private slots:
 
 protected:
@@ -82,10 +84,10 @@ private slots:
     void firstrun();
     QString &get(int, int);
     int alias(const QString &);
-    int alias(const QString &, int &);
+    //int alias(const QString &, int &);
     int exec(const QString &);
-    int entry();
-    int createDB();
+    void entry();
+    void createDB();
     void addButtonDB();
     void getButtons(const QString &);
 public slots:
@@ -102,13 +104,13 @@ private:
     CLabel *ok;
     QLabel *label;
     QSettings *conf;
-    QNetworkAccessManager *net;
+    //QNetworkAccessManager *net;
     QString host, user, tmp, password, servercert, database, file;
     QMenu *FileMenu, *EditMenu, *HelpMenu;
-    unsigned short int port;// j'ai lu les docs sur internet et 0<"unsigned short int"<65536
+    unsigned short int port;// j'ai lu les docs sur internet et 0<="unsigned short int"<65536
     QSignalMapper *signalmap;
     QMap<const QString, const CLabel*> widget;
-    QList<QString> way;
+    //QList<QString> way;
     QSqlDatabase db;
     QSqlQuery *q;
     //QSqlRecord r;
diff --git a/ui.sql b/ui.sql
index 9d205a9..f2f1719 100644
--- a/ui.sql
+++ b/ui.sql
@@ -1,6 +1,13 @@
-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 ('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-juli');
+        INSERT INTO ui ('keyword', 'label', 'action') VALUES('l-odysseum', 'oliver''s pub', 'l-o-op');
+            INSERT INTO ui ('keyword', 'label', 'action') VALUES('l-o-op', 'valentine', 'l-o-olive-val');
+                INSERT INTO ui ('keyword', 'label', 'action') VALUES('l-o-olive-val', 's''enerve quand je lui demande ce qu''elle veut', 'begin');