new file, the png

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 863c908e9a4f061e64f11937b82e34c7708c24c5..d0950896ef60f9922ec890fd74aed086b345bb1c 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.01" package="eu.nothing2do.diarymobile" android:versionCode="1" android:installLocation="auto">
-    <application android:label="diary-mobile-android" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon" android:largeHeap="true">
-        <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: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">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -31,7 +31,7 @@
             <!-- Splash screen -->
         </activity>
     </application>
-    <supports-screens android:normalScreens="true" android:smallScreens="true" android:largeScreens="true" android:anyDensity="true"/>
+    <supports-screens android:largeScreens="true" android:anyDensity="true" android:normalScreens="true" android:smallScreens="true"/>
     <!-- %%INSERT_PERMISSIONS -->
     <!-- %%INSERT_FEATURES -->
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR"/>

diff --git a/jean_victor_balin_book.png b/jean_victor_balin_book.png
new file mode 100644 (file)
index 0000000..962ad3a
Binary files /dev/null and b/jean_victor_balin_book.png differ

diff --git a/mainwindow.cpp b/mainwindow.cpp
index d4c3028f5a35d60481a2f8adafc60e7504a1013d..4cea0f21b5bc2ba2e80b18a6fa461df99a700500 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -317,13 +317,13 @@ void MainWindow::addButtonDB(){
     bool ok=0;
     cmd.append("insert into ui (label, keyword, action) values (:label, :keyword, :action)");
     QString cur=way.last();
-    QString a=QInputDialog::getText(this, QString("label"), QString("Entrez le label"),QLineEdit::Normal, QString(), &ok);
-    if ((a=="")||(ok==0))a="default";
-    cmd.append(a);
+    QString a, b=QInputDialog::getText(this, QString("label"), QString("Entrez le label"),QLineEdit::Normal, QString(), &ok);
+    if ((b=="")||(ok==0))b="default";
+    cmd.append(b);
     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+" "+a);
+    a=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, cur+" "+b);
     cmd.append(a);
     exec(cmd);
     getButtons(way[way.size()-1]);

diff --git a/ui.sql b/ui.sql
index 16b8fafd561cf7042a4c38111bc99e90b06b48da..6ef13d2a6bd6d186f82f361237715a85b47869b7 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -28,7 +28,7 @@ INSERT INTO "ui" (keyword, label, action) VALUES('config','host','settext host '
 INSERT INTO "ui" (keyword, label, action) VALUES('config','port','setint port');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','user','settext user');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','password','settext pass');
-INSERT INTO "ui" (keyword, label, action) VALUES('config','database','settext db');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','database','settext database');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','filesave','settext file');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','SQLsettings', 'settext SQLsettings');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','button', 'settext button');