now, I send the database entirely (the ui table + the raw)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 0e2a9be29d30898092704de8b01f2427c76f4a20..04e6a32af22e490568effba6508492718153299e 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,39 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:versionName="0.1" package="eu.nothing2do.diarymobile" android:versionCode="1" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
-    <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:screenOrientation="unspecified" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
+<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">
             <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: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: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: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"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
             <!-- 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: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"/>
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+            <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"/>
             <!-- 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"/>
+            <!-- <meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/>-->
             <!-- Splash screen -->
         </activity>
     </application>
-    <supports-screens android:normalScreens="true" android:smallScreens="true" android:anyDensity="true" android:largeScreens="true"/>
+    <supports-screens android:largeScreens="true" android:anyDensity="true" android:normalScreens="true" android:smallScreens="true"/>
     <!-- %%INSERT_PERMISSIONS -->
     <!-- %%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"/>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1f11598ee08875a13853a0fa6379e31e6cad257a..631e436acff5ae25bc7c4c5d3274a02e4faeabac 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -109,7 +109,7 @@ void MainWindow::showExpanded()
 void MainWindow::quit(){
     qDebug()<<"quit()";
     conf->setValue(QString("menu"), menuBar()->isVisible());
-    savButtons();
+    //savButtons();
     db.commit();
     db.close();
     qApp->quit();
@@ -151,14 +151,14 @@ void MainWindow::createMenuBar(){
     FileMenu->addAction(trUtf8("&Start..."), this, SLOT(start()),QKeySequence(trUtf8("Ctrl+S", "File|Start")));
     FileMenu->addAction(trUtf8("&Back"), this, SLOT(back()),QKeySequence(trUtf8("Ctrl+B", "File|Back")));
     FileMenu->addAction(trUtf8("&Download"), this, SLOT(updateUi()),QKeySequence(trUtf8("Ctrl+W", "File|Downlad")));
-    FileMenu->addAction(trUtf8("Up&load"), this, SLOT(sendUi()),QKeySequence(trUtf8("Ctrl+L", "File|Upload")));
+    FileMenu->addAction(trUtf8("Up&load"), this, SLOT(sendDB()),QKeySequence(trUtf8("Ctrl+L", "File|Upload")));
     FileMenu->addAction(trUtf8("Reset Ui"), this, SLOT(resetUi()), QKeySequence(trUtf8("Ctrl+Z", "File|ResetUi")));
     FileMenu->addAction(trUtf8("&Quit..."), this, SLOT(quit()),QKeySequence(trUtf8("Ctrl+Q", "File|Quit")));
     menuBar()->addMenu(FileMenu);
     EditMenu=new QMenu(QString("&Buttons"));
     EditMenu->addAction(trUtf8("C&reate Database"), this, SLOT(createDB()), QKeySequence(trUtf8("Ctrl+R", "Buttons|CreateDB")));
     EditMenu->addAction(trUtf8("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(trUtf8("Ctrl+D", "Buttons|Add")));
-    EditMenu->addAction(trUtf8("Sa&v buttons"), this, SLOT(savButtons()), QKeySequence(trUtf8("Ctrl+V", "Buttons|Save")));
+    //EditMenu->addAction(trUtf8("Sa&v buttons"), this, SLOT(savButtons()), QKeySequence(trUtf8("Ctrl+V", "Buttons|Save")));
     EditMenu->addAction(trUtf8("&Edit buttons"), this, SLOT(editButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Buttons|&Edit")));
     EditMenu->addAction(trUtf8("&View/Hide menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "Buttons|View menu")));
     menuBar()->addMenu(EditMenu);
@@ -309,7 +309,7 @@ void MainWindow::addButtonDB(){
     bool ok=0;
     cmd.append("insert into ui (label, keyword, action) values (:label, :keyword, :action)");
     QString cur=way.last();
-    QString a, b, c=QInputDialog::getText(this, QString("label"), QString("Entrez son label"),QLineEdit::Normal, QString(), &ok);
+    QString a, b, c=QInputDialog::getText(this, QString("label"), QString("Entrez son label"),QLineEdit::Normal, QString(""), &ok);
     if ((c=="")||(ok==0))return;
     cmd.append(c);
     b=QInputDialog::getText(this, QString("keyword"), QString("Entrez ses mots clé (no limit !)"), QLineEdit::Normal, cur, &ok);
@@ -320,7 +320,7 @@ void MainWindow::addButtonDB(){
     cmd.append(a);
     exec(cmd);
     data.append(c).append('$').append(b).append('$').append(a).append('\n');
-    savButtons();
+    //savButtons();
     return;
 }
 void MainWindow::getButtons(const QString &a){
@@ -363,11 +363,13 @@ void MainWindow::updateUi(){
     m = new FileDownloader(update, this);
     connect(m, SIGNAL(downloaded()), SLOT(writeUpdate()));
 }
-void MainWindow::sendUi(){
-    qDebug()<<"sendUi() : "<<conf->value(QString("upload")).toString();
+void MainWindow::sendDB(){
+    qDebug()<<"sendDB() : "<<conf->value(QString("upload")).toString();
     QUrl upload(conf->value(QString("upload")).toString());
     net=new QNetworkAccessManager(this);
-    rep=net->put(QNetworkRequest(upload), data);
+    QFile b(conf->value(QString("database")).toString());
+    b.open(QIODevice::ReadOnly);
+    rep=net->put(QNetworkRequest(upload), b.readAll());
     qDebug()<<"net->put : "<<rep;
     //rep=net->put(QNetworkRequest(upload),data);
     connect(rep, SIGNAL(finished()), this, SLOT(datasend()));
@@ -388,14 +390,14 @@ void MainWindow::back(){
 }
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
-    static bool accepted=true;
-    event->setAccepted(accepted); // don't close my Top Level Widget !
+    //static bool accepted=true;
+    //event->setAccepted(accepted); // don't close my Top Level Widget !
     int k=event->key();
     qDebug()<<"key pressed="<<k;
     if (k==Qt::Key_Back)
     {
         back();
-        accepted=false;// close the app next time when the user press back button
+        //accepted=false;// close the app next time when the user press back button
     }
 
 }
@@ -437,17 +439,10 @@ void MainWindow::writeUpdate(){
     q->exec("BEGIN TRANSACTION;");
     readButtons(m->downloadedData());
 }
-void MainWindow::savButtons(){
-    qDebug()<<"savButtons";
-    QFile b(conf->value(QString("buttonfile")).toString());
-    b.open(QIODevice::WriteOnly);
-    b.write(data);
-    b.close();
-}
 void MainWindow::readButtons(const QByteArray &in){
     int a=in.count('\n');
-    qDebug()<<"first line : "<<in.split('\n').at(0);
     QString d=in.split('\n').at(0);
+    qDebug()<<"first line : "<<d;
     for(int i=1; i<a; i++){
         q->prepare(d);
         int b=in.split('\n').at(i).count('$');
@@ -456,7 +451,8 @@ void MainWindow::readButtons(const QByteArray &in){
             q->bindValue(j, QString(in.split('\n').at(i).split('$').at(j)));
             qDebug()<<"bind "<<j<<" and "<< QString(in.split('\n').at(i).split('$').at(j));
         }
-        qDebug()<<"q->exec() : "<<q->exec();
+        qDebug()<<"q->exec() : "<<q->exec()<<" lastError()="<<q->lastError();
+
     };
     db.commit();
     data=in;

diff --git a/mainwindow.h b/mainwindow.h
index 4099296a338b422b67c34d92eae6fafcc382c21e..a3d08ee90f70048a0330ea556c234e8b6bb1a601 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -117,8 +117,8 @@ private slots:
     void getButtons(const QString &);
     void updateUi();
     void writeUpdate();
-    void sendUi();
-    void savButtons();
+    void sendDB();
+    //void savButtons();
     void readButtons(const QByteArray &);
     void resetUi();
 public slots: