add "config" to begin

diff --git a/README.md b/README.md
index 46f57b9192b6baf206e137e8312abe8f9c8f61d7..fcf7f3a128b11733ef3778b703e17e827b344979 100644 (file)
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@ ftp://[user]:[pass]@[hostname]/[filename]
 
 todo :
 
-connect to postgresql server, restore DB from url, add autoupdate feature, and ...
+add autoupdate feature, and ...

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 04e6a32af22e490568effba6508492718153299e..8e551ba7acf95a716b0faeb1e467e7ac02c8a90b 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,12 +1,16 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:versionName="0.1" xmlns:android="http://schemas.android.com/apk/res/android" package="eu.nothing2do.diarymobile" android:versionCode="1" android:installLocation="auto">
-    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:largeHeap="true" android:icon="@drawable/icon" android:label="diary-mobile-android">
-        <activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:screenOrientation="unspecified" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:label="@string/app_name">
+<manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
+                  android:name="org.qtproject.qt5.android.bindings.QtActivity"
+                  android:label="@string/app_name"
+                  android:screenOrientation="unspecified"
+                  android:launchMode="singleTop">
             <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.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
             <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"/>
@@ -22,20 +26,27 @@
             <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"/>
+            <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:name="android.app.splash_screen" android:resource="@layout/splash"/>-->
+            <!--
+            <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>
+            -->
             <!-- Splash screen -->
         </activity>
     </application>
-    <supports-screens android:largeScreens="true" android:anyDensity="true" android:normalScreens="true" android:smallScreens="true"/>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+
+    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
+         Remove the comment if you do not require these default permissions. -->
     <!-- %%INSERT_PERMISSIONS -->
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
     <!-- %%INSERT_FEATURES -->
-    <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="17"/>
-    <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.h b/mainwindow.h
index b29115fdd634538309c644f66609efd4c6d04e2b..84fa400c6605797cacb7880f46c22a954cd9a41a 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -115,7 +115,9 @@ private slots:
     void createDB();
     void addButtonDB();
     void writeDB();
-    void editButtonDB();
+    void chooseButtonDB();
+    void chooseButtonDB(const QString &);
+    void editButtonDB(const QString &);
     void getButtons(const QString &);
     void getButtons();
     void downloadUi();

diff --git a/ui.sql b/ui.sql
index 5183a0cb7a0fa0a3e868cb31d766de40bda94ceb..e4beea6eb0db93faefd848af6bd2f26b40bc8f27 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -1,4 +1,5 @@
 INSERT INTO ui (keyword,label,action) VALUES(?,?,?);
+begin$config$config
 menuback$config$config
 menuback$help$main help
 config$max column$setint maxcolumn