bug

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index d0950896ef60f9922ec890fd74aed086b345bb1c..836958529033c4a6e1c24ce9fe8a75b8f5dff8ae 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:installLocation="auto" android:versionCode="1" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.01" package="eu.nothing2do.diarymobile">
-    <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:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:screenOrientation="unspecified">
+<manifest android:versionName="0.1" xmlns:android="http://schemas.android.com/apk/res/android" package="eu.nothing2do.diarymobile" android:installLocation="auto" android:versionCode="1">
+    <application android:label="diary-mobile-android" android:name="org.qtproject.qt5.android.bindings.QtApplication">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:screenOrientation="unspecified" android:label="@string/app_name" android:name="org.qtproject.qt5.android.bindings.QtActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <meta-data android:value="diary-mobile-android" android:name="android.app.lib_name"/>
-            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+            <meta-data android:resource="@array/qt_sources" android:name="android.app.qt_sources_resource_id"/>
             <meta-data android:value="default" android:name="android.app.repository"/>
-            <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"/>
+            <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:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --" android:name="android.app.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"/>
+            <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: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"/>
@@ -27,16 +27,16 @@
             <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
             <!--  Messages maps -->
             <!-- Splash screen -->
-            <meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/>
+            <meta-data android:resource="@layout/splash" android:name="android.app.splash_screen"/>
             <!-- Splash screen -->
         </activity>
     </application>
-    <supports-screens android:largeScreens="true" android:anyDensity="true" android:normalScreens="true" android:smallScreens="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.EXPAND_STATUS_BAR"/>
+    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.STATUS_BAR"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4cea0f21b5bc2ba2e80b18a6fa461df99a700500..46ae7c8918666ae0cb624dc1b00f90e5230e3a49 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -145,7 +145,7 @@ void MainWindow::action(const QString &a){
         entry(a.remove(0, 4));
     }
     else if(a.split(QString(" "))[0]=="setfile"){
-        conf->setValue(a.split(QString(" "))[1], QFileDialog::getSaveFileName(this, QString("get file"), QDir::homePath()));
+        conf->setValue(a.split(QString(" "))[1], QFileDialog::getSaveFileName(this, QString("get file"), conf->value(a.split(QString(" "))[1]).toString()));
     }
     else getButtons(a);
 }
@@ -161,7 +161,7 @@ void MainWindow::createMenuBar(){
     EditMenu->addAction(trUtf8("C&reate database"), this, SLOT(createDB()), QKeySequence(trUtf8("Ctrl+R", "Edit|Database")));
     EditMenu->addAction(trUtf8("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(trUtf8("Ctrl+D", "Add buttons")));
     EditMenu->addAction(trUtf8("&Edit buttons"), this, SLOT(editButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Edit|&Edit button")));
-    EditMenu->addAction(trUtf8("&View menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "Edit|View menu")));
+    EditMenu->addAction(trUtf8("&View/Hide menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "Edit|View menu")));
     menuBar()->addMenu(EditMenu);
     HelpMenu=new QMenu(QString("&Help"));
     HelpMenu->addAction(tr("About Qt"), qApp, SLOT(aboutQt()), QKeySequence(tr("ctrl+H", "About Qt")));
@@ -247,7 +247,6 @@ 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("sqlfile"), QVariant("ui.sql"));
     //conf->setValue(QString("update"), QVariant("http://www.nothing2do.eu/ui.sql"));
     conf->setValue(QString("update"), QVariant("https://raw.github.com/Nothing2Do/diary-mobile-android/master/ui.sql"));
 }
@@ -323,7 +322,7 @@ void MainWindow::addButtonDB(){
     a=QInputDialog::getText(this, QString("keyword"), QString("Entrez le nom de la page où il siègera"), QLineEdit::Normal, cur);
     cmd.append(a);
     cur.chop(1);
-    a=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, cur+" "+b);
+    a=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, cur+" "+a);
     cmd.append(a);
     exec(cmd);
     getButtons(way[way.size()-1]);
@@ -422,10 +421,8 @@ void MainWindow::writeUpdate(){
     qDebug()<<"downloaded : "<<m->downloadedData().size()<<" byte";
     /* put newly downloaded sql file into database */
     int a=m->downloadedData().count('\n');
-    q->prepare(QString("delete from ui;"));
-    q->exec();
     for(int i=0; i<a; i++){
-        /*qDebug()<<"q->prepare("<<i<<") : "<< */q->prepare(m->downloadedData().split('\n').at(i));
+        q->prepare(m->downloadedData().split('\n').at(i));
         q->exec();
     }
     start();

diff --git a/ui.sql b/ui.sql
index 6ef13d2a6bd6d186f82f361237715a85b47869b7..ee147e477c3fc1ed87935c9f6254523945d8d818 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -1,5 +1,6 @@
 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','fille','fille');
 INSERT INTO "ui" (keyword, label, action) VALUES('begin','lieu','lieu');
@@ -33,6 +34,5 @@ INSERT INTO "ui" (keyword, label, action) VALUES('config','filesave','settext fi
 INSERT INTO "ui" (keyword, label, action) VALUES('config','SQLsettings', 'settext SQLsettings');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','button', 'settext button');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','fichier SQL', 'settext sqlfile');
-INSERT INTO "ui" (keyword, label, action) VALUES('config','getSQL', 'settext getsql');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','update', 'settext update');
 COMMIT;