some minor modification (very)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 8e551ba7acf95a716b0faeb1e467e7ac02c8a90b..e239b5270a634d243eb6e131f1a452610162b89e 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,16 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?>
-<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">
+<?xml version="1.0"?>
+<manifest package="eu.nothing2do.diarymobile" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.2" android:versionCode="1" android:installLocation="auto">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="diary-mobile">
+        <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="-- %%INSERT_APP_LIB_NAME%% --"/>
+            <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"/>
@@ -38,7 +34,7 @@
             <!-- Splash screen -->
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
+    <uses-sdk android:targetSdkVersion="17"/>
     <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.
@@ -49,4 +45,6 @@
          Remove the comment if you do not require these default features. -->
     <!-- %%INSERT_FEATURES -->
 
+<uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 </manifest>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c22c272b8fbbfdda417175f8295902fae5ad045c..279e2d015a9d1d37b1dbbbb613d5e1ca26a62b61 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -439,7 +439,7 @@ void MainWindow::RAWsent(){
 void MainWindow::back(){
     flush();
     getButtons(conf->value(QString("menuback")).toString());
-    way.removeLast();
+    //way.removeLast();
     for(int i=0; i<way.size(); i++){
         addWidget(QString(way[i]), new CLabel(QString(way[i]), conf->value(QString("button")).toString()));
     }
@@ -540,7 +540,7 @@ void MainWindow::download(const QString & a){
     m = new FileDownloader(url, this);
 }
 void MainWindow::savButtons(){
-    exec(QList<QString> ({conf->value(QString("selectbuttons"), QVariant("select keyword,label,action from ui;")).toString()}));
+    exec(QList<QString> ({conf->value(QString("selectbuttons")).toString()}));
     QFile a(conf->value(QString("buttonfile"), QVariant("ui.sql")).toString());
     a.open(QIODevice::WriteOnly|QIODevice::Text);
     QTextStream b(&a);

diff --git a/mainwindow.h b/mainwindow.h
index 198c1e9a3e66982ecdd05d87c0551ece695a5210..2eb4b9782abefea183032e030b0f8d0c1c1e0134 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -135,7 +135,7 @@ public slots:
 signals:
     void datafilled();
 private:
-    QScrollArea * scroll;
+    //QScrollArea * scroll;
     QMutex sql,updatelocker;
     QWidget *screen;
     QGridLayout *grid;