It save entry into a text file and into sqlite database ... (and android

added by 5.2 rc1)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 7e4ac63651528562bbcd7bc707f6b89ddfde6a84..324fdf454892248e4c13a4e9187b6afbd83daa19 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,38 +1,39 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="eu.nothing2do.diary.mobile" android:versionCode="1" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.1.1">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.nothing2do.diary_mobile_android" android:versionName="0.1.1" android:versionCode="1">
     <application android:label="@string/app_name" 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|locale|fontScale|keyboard|keyboardHidden|navigation|screenSize">
+        <activity android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden|navigation|screenSize" android:label="@string/app_name" android:screenOrientation="unspecified" 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:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-            <meta-data android:name="android.app.repository" android:value="@string/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:name="android.app.lib_name" android:value="@string/app_lib_name"/>
+            <meta-data android:resource="@array/qt_sources" android:name="android.app.qt_sources_resource_id"/>
+            <!-- <meta-data android:value="@string/repository" android:name="android.app.repository"/> -->
+            <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"/>
+            <meta-data android:value="diary-mobile-android" android:name="android.app.lib_name"/>
             <!-- Deploy Qt libs as part of package -->
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/>
-            <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:value="0" android:name="android.app.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:name="android.app.use_local_qt_libs" android:value="1"/>
-            <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="@string/local_libs"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="@string/local_jars"/>
-            <meta-data android:name="android.app.static_init_classes" android:value="@string/init_classes"/>
+            <meta-data android:value="0" 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="" android:name="android.app.load_local_libs"/>
+            <meta-data android:value="" android:name="android.app.load_local_jars"/>
+            <meta-data android:value="" android:name="android.app.static_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:resource="@layout/splash" android:name="android.app.splash_screen"/>
             <!-- Splash screen -->
         </activity>
     </application>
     <!-- %%INSERT_USES_SDK%% -->
-    <supports-screens android:normalScreens="true" android:smallScreens="true" android:largeScreens="true" android:anyDensity="true"/>
-    <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="9"/>
+    <supports-screens android:largeScreens="true" android:anyDensity="true" android:smallScreens="true" android:normalScreens="true"/>
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 </manifest>

diff --git a/diary-mobile-android.pro b/diary-mobile-android.pro
index 419b4189ecd4bab7b4a83f3aaddeae4273fa96c6..f535fa83a44953939c2c8282f81f6a523dc71195 100644 (file)
--- a/diary-mobile-android.pro
+++ b/diary-mobile-android.pro
@@ -27,4 +27,30 @@ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 OTHER_FILES += \
     android/AndroidManifest.xml \
-    ui.sql
+    ui.sql \
+    android/src/org/qtproject/qt5/android/bindings/QtActivity.java \
+    android/src/org/qtproject/qt5/android/bindings/QtApplication.java \
+    android/src/org/kde/necessitas/ministro/IMinistro.aidl \
+    android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
+    android/res/values-zh-rTW/strings.xml \
+    android/res/layout/splash.xml \
+    android/res/values-pt-rBR/strings.xml \
+    android/res/values-de/strings.xml \
+    android/res/values-ru/strings.xml \
+    android/res/values-ms/strings.xml \
+    android/res/values-et/strings.xml \
+    android/res/values-rs/strings.xml \
+    android/res/values-fa/strings.xml \
+    android/res/values/strings.xml \
+    android/res/values-nl/strings.xml \
+    android/res/values-id/strings.xml \
+    android/res/values-nb/strings.xml \
+    android/res/values-ja/strings.xml \
+    android/res/values-pl/strings.xml \
+    android/res/values-ro/strings.xml \
+    android/res/values-zh-rCN/strings.xml \
+    android/res/values-it/strings.xml \
+    android/res/values-es/strings.xml \
+    android/res/values-fr/strings.xml \
+    android/res/values-el/strings.xml \
+    android/version.xml

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 95a2984bc95fd20bf447beb2e090cbfe2c0c1454..8d5a8a5f0497ec9dd5ae2ee15507da338f2782b2 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -49,7 +49,7 @@ MainWindow::MainWindow(QWidget *parent)
 }
 void MainWindow::start(){
     flush();
-    //connectdb();
+    connectdb();
 
     //exec(QString("select * from ui;"));
 
@@ -172,7 +172,8 @@ void MainWindow::lsconfig(){
 }
 void MainWindow::quit(){
     conf->sync();
-    //debug(0);
+    db.commit();
+    db.close();
     qApp->quit();
 }
 CLabel* MainWindow::addWidget(const QString &key, CLabel * a){
@@ -302,17 +303,18 @@ QString MainWindow::getText(const QString &a){
     return widget.value(a)->text();
 }
 void MainWindow::connectdb(){
-    //db = QSqlDatabase::addDatabase("QSQLITE");
-    db = QSqlDatabase::addDatabase("QPSQL");
+    db = QSqlDatabase::addDatabase("QSQLITE");
+    //db = QSqlDatabase::addDatabase("QPSQL");
     db.setHostName(host);
     db.setDatabaseName(database);
     db.setUserName(user);
     db.setPassword(password);
-    db.setConnectOptions(QString("requiressl=1 connect_timeout=10000"));//10sec*/
-    bool ok=db.open();
-    qDebug()<<"db.open() ? "<<ok<< ". Available drivers: " << QSqlDatabase::drivers();
+    db.setConnectOptions(QString("requiressl=1 connect_timeout=10000"));//10sec
+    qDebug()<<"db.open() ? "<<db.open()<< ". sqlite file : "<<db.databaseName();
     q=new QSqlQuery(db);
 
+
+
 }
 void MainWindow::firstrun(){
     conf->setValue(QString("host"), QVariant("127.0.0.1"));
@@ -364,12 +366,12 @@ int MainWindow::entry(){
     fichier.open(QIODevice::Append | QIODevice::Text);
     QTextStream flux(&fichier);
     flux << a << endl;
-    texte->clear();
     fichier.close();
-    qDebug()<<a;
-    /*q->prepare("INSERT INTO "+database+"raw (date, texte) VALUES (:date, :texte);");
+    qDebug()<<a<<" content added into file";
+    q->prepare("INSERT INTO raw (date, texte) VALUES (:date :texte);");
     q->bindValue(":date", v.currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss")));
     q->bindValue(":texte", texte->text());
-    q->exec();*/
+    q->exec();
+    texte->clear();
 
 }

diff --git a/mainwindow.h b/mainwindow.h
index 782597021bf13c49d0c865a37cc15fb523b807ab..5a7544034a51d7e7a9fb5a3914373ae5e8da2a0f 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -4,7 +4,7 @@
 #include <QMainWindow>
 //#include <QtGui> don't work since 5.1 (or 5.2)
 #include <QtNetwork/QtNetwork>
-#include <QtSql/QSqlDatabase>
+
 #include <QGridLayout>
 #include <QLabel>
 #include <QLineEdit>
@@ -12,8 +12,10 @@
 #include <QInputDialog>
 #include <QMenu>
 #include <QMenuBar>
+#include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
+#include <QtSql>
 #include <QMessageBox>
 //#include <QTableWidget>
 #include <QTextEdit>