think to upload local change

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 836958529033c4a6e1c24ce9fe8a75b8f5dff8ae..77313ddd5aa4716f002254e2bbac2c7b8942d439 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,43 +1,39 @@
 <?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: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">
+<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">
             <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.lib_name" android:value="diary-mobile-android"/>
             <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.repository" android:value="default"/>
             <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.bundle_local_qt_libs" android:value="-- %%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: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"/>
+            <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%% --"/>
             <!--  Messages maps -->
-            <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"/>
+            <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"/>
             <!--  Messages maps -->
             <!-- Splash screen -->
             <meta-data android:resource="@layout/splash" android:name="android.app.splash_screen"/>
             <!-- Splash screen -->
         </activity>
     </application>
-    <supports-screens android:normalScreens="true" android:smallScreens="true" android:anyDensity="true" android:largeScreens="true"/>
+    <supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="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.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 </manifest>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 78312c714431394b4964312962b7a6e7b0efcade..0956420f7378c3c83e4be0b2b3410846f79d1b2d 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -249,6 +249,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("menu"), QVariant(1));
     //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"));
+    conf->setValue(QString("upload"), QVariant(""));
 }
 QString &MainWindow::get(int row, int column){
     q->seek(row);
@@ -362,10 +363,15 @@ void MainWindow::updateUi(){
     start();
 
 
+}
+void MainWindow::sendUi(){
+    qDebug()<<"sendUi() : "<<conf->value(QString("upload")).toString();
+    QUrl upload(conf->value(QString("upload")).toString());
+    /* I don't know how to use filedownloader class to upload */
 }
 void MainWindow::back(){
     bool ok;
-    int a=QInputDialog::getInt(this, QString("back()"), QString("Quel page ?"), way.size()-2, 0, way.size()-2, 1, &ok);
+    int a=QInputDialog::getInt(this, QString("back()"), QString("Quel page ?"), way.size()-2, 0, way.size()-1, 1, &ok);
     if(ok){
         getButtons(way[a]);
         qDebug()<<"retour : "<<a;
@@ -401,6 +407,7 @@ FileDownloader::FileDownloader(QUrl url, QObject *parent) : QObject(parent)
 
     QNetworkRequest request(url);
     m_WebCtrl.get(request);
+
 }
 FileDownloader::~FileDownloader()
 {
@@ -427,3 +434,4 @@ void MainWindow::writeUpdate(){
     }
     start();
 }
+

diff --git a/mainwindow.h b/mainwindow.h
index f0b7347558b52ad81a1ece9eafd5666794a46245..a40fe0965b7cf465e00bd4b9b7a08bcbe4cdbb8a 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -122,7 +122,7 @@ private slots:
     //void getButtons();
     void updateUi();
     void writeUpdate();
-
+    void sendUi();
 public slots:
 
 signals: