...

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 77313ddd5aa4716f002254e2bbac2c7b8942d439..0e2a9be29d30898092704de8b01f2427c76f4a20 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,39 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:versionName="0.1" package="eu.nothing2do.diarymobile" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:installLocation="auto">
-    <application android:label="diary-mobile-android" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon">
-        <activity android:screenOrientation="unspecified" android:label="@string/app_name" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
+<manifest android:versionName="0.1" package="eu.nothing2do.diarymobile" android:versionCode="1" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
+    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon" android:label="diary-mobile-android" android:largeHeap="true">
+        <activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name" android:screenOrientation="unspecified" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
             <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:value="diary-mobile-android" android:name="android.app.lib_name"/>
             <meta-data android:resource="@array/qt_sources" android:name="android.app.qt_sources_resource_id"/>
-            <meta-data android:name="android.app.repository" android:value="default"/>
+            <meta-data android:value="default" android:name="android.app.repository"/>
             <meta-data android:resource="@array/qt_libs" android:name="android.app.qt_libs_resource_id"/>
             <meta-data android:resource="@array/bundled_libs" android:name="android.app.bundled_libs_resource_id"/>
             <!-- 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:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --" android:name="android.app.bundle_local_qt_libs"/>
             <meta-data android:resource="@array/bundled_in_lib" android:name="android.app.bundled_in_lib_resource_id"/>
             <meta-data android:resource="@array/bundled_in_assets" android:name="android.app.bundled_in_assets_resource_id"/>
             <!-- 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%% --"/>
+            <meta-data android:value="-- %%USE_LOCAL_QT_LIBS%% --" android:name="android.app.use_local_qt_libs"/>
+            <meta-data android:value="/data/local/tmp/qt/" android:name="android.app.libs_prefix"/>
+            <meta-data android:value="-- %%INSERT_LOCAL_LIBS%% --" android:name="android.app.load_local_libs"/>
+            <meta-data android:value="-- %%INSERT_LOCAL_JARS%% --" android:name="android.app.load_local_jars"/>
+            <meta-data android:value="-- %%INSERT_INIT_CLASSES%% --" android:name="android.app.static_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"/>
+            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
             <!--  Messages maps -->
             <!-- Splash screen -->
             <meta-data android:resource="@layout/splash" android:name="android.app.splash_screen"/>
             <!-- Splash screen -->
         </activity>
     </application>
-    <supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="true" android:largeScreens="true"/>
+    <supports-screens android:normalScreens="true" android:smallScreens="true" android:anyDensity="true" android:largeScreens="true"/>
     <!-- %%INSERT_PERMISSIONS -->
     <!-- %%INSERT_FEATURES -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 </manifest>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 28f2b980a4145f1b65851aba6d64e9eaef6d78bd..2e1fe4f0332b7ae6b8941846b6ab0d2b470fc4b7 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -29,7 +29,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     signalmap=new QSignalMapper(this);
     connect(signalmap, SIGNAL(mapped(const QString &)),
                  this, SLOT(action(const QString &)));
-    label=new QLabel("begin");
+    label=new QLabel(conf->value(QString("start")).toString());
     setCentralWidget(screen);
     createMenuBar();
     connectDB();
@@ -45,7 +45,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 }
 void MainWindow::start(){
     way.clear();
-    getButtons(conf->value(QString("start"), QVariant("start")).toString());
+    getButtons(conf->value(QString("start"), QVariant("begin")).toString());
 }
 MainWindow::~MainWindow()
 {
@@ -142,12 +142,16 @@ void MainWindow::action(const QString &a){
         conf->setValue(a.split(QString(" "))[1], QInputDialog::getInt(this, "setInt", a.split(QString(" "))[1] , conf->value(QString(a.split(QString(" "))[1])).toInt()));
     }
     else if(a.split(QString(" "))[0]=="new"){
-        entry(a.remove(0, 4));
+        /*QString b=a.remove(0,4);*/
+        /*for(int c=1;c<way.size();c++){
+            b+=way[c];
+        }*/
+        entry(a.remove(0,4));
     }
     else if(a.split(QString(" "))[0]=="setfile"){
         conf->setValue(a.split(QString(" "))[1], QFileDialog::getSaveFileName(this, QString("get file"), conf->value(a.split(QString(" "))[1]).toString()));
     }
-    else getButtons(a);
+    getButtons(a);
 }
 void MainWindow::createMenuBar(){
     FileMenu=new QMenu(QString("&File"), this);
@@ -266,6 +270,7 @@ int MainWindow::exec(const QList<QString> & a){
     q->exec();
     QSqlError b=q->lastError();
     db.commit();
+    qDebug()<<"exec finish";
     if (b.isValid())qDebug()<<"SQL error->exec() :"<<b.text();
     if(q->isSelect())return q->size();
     else return 0;
@@ -291,7 +296,8 @@ int MainWindow::alias(const QString & a){
 void MainWindow::entry(const QString &a){
     QString time=QDateTime::currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss")), entry="";
     bool ok=0;
-    entry=QInputDialog::getText(this, QString("nouvelle entrée"), a, QLineEdit::Normal, "+", &ok);
+
+    entry=QInputDialog::getText(this, QString("nouvelle entrée"), a, QLineEdit::Normal, "", &ok);
     if((entry=="")||(ok==0))return;
     QString c=time+" "+entry;
     QFile fichier(conf->value(QString("file")).toString());
@@ -326,6 +332,12 @@ void MainWindow::addButtonDB(){
     cur.chop(1);
     a=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, cur+"-"+b);
     if ((a=="")||(ok==0))return;
+    if(a=="new"){
+        for(int c=0;c<way.size();c++){
+            a+=" ";
+            a+=way[c];
+        }
+    }
     cmd.append(a);
     exec(cmd);
     //getButtons(way[way.size()-1]);
@@ -335,8 +347,8 @@ void MainWindow::getButtons(const QString &a){
     qDebug()<<"getButtons("<<a<<")";
     flush();
     QList<QString> tmp({"select label,action from ui where keyword like :word;"});;
-    //label->setText(QString::number(way.size()));
-    label->setText(a);
+    label->setText(QString::number(way.size()));
+    //label->setText(a);
     way.append(a);
     tmp.append(a);
     exec(tmp);
@@ -345,6 +357,7 @@ void MainWindow::getButtons(const QString &a){
     while(q->next()){
         addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString()));
     };
+    qDebug()<<"end getButtons";
 }
 void MainWindow::editButtonDB(){
     /*flush();

diff --git a/ui.sql b/ui.sql
index 3fdeaca14ad708e1fdc3e9fa24a94059d226c474..6cc109bcb82083f90edefc2f91fefe560af4cd4b 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -2,6 +2,7 @@ PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
 delete from ui;
 INSERT INTO "ui" (keyword, label, action) VALUES('begin','new', 'new');
+INSERT INTO "ui" (keyword, label, action) VALUES('begin','config', 'config');
 INSERT INTO "ui" (keyword, label, action) VALUES('begin','lieu','lieu');
 INSERT INTO "ui" (keyword, label, action) VALUES('lieu', 'oliver''s pub', 'begi-lie-oliver');
 INSERT INTO "ui" (keyword, label, action) VALUES('begi-lie-oliver','audrey','begi-olive-audrey');