remove qskineticscoller (and change name to diary-mobile)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 9d16874649221b4295d46c00e129230fe7c6b4ba..972a7e4ad67fef6ecc12a6fb7ceeda6d307db580 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,32 +1,31 @@
 <?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-android" android:icon="@drawable/icon">
-        <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">
+<manifest android:versionCode="1" android:versionName="0.2" package="eu.nothing2do.diarymobile" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
+    <application android:label="diary-mobile" android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:screenOrientation="unspecified" android:label="@string/app_name" android:launchMode="singleTop" 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.lib_name" android:value="diary-mobile-android"/>
+            <meta-data android:value="diary-mobile" android:name="android.app.lib_name"/>
             <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:value="default" android:name="android.app.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"/>
             <!-- Deploy Qt libs as part of package -->
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+            <meta-data android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --" android:name="android.app.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: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%% --"/>
+            <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"/>
             <!--  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"/>
             <!--  Messages maps -->
-
             <!-- Splash screen -->
             <!--
             <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>
@@ -34,18 +33,15 @@
             <!-- Splash screen -->
         </activity>
     </application>
-    <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="17"/>
-    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="17"/>
+    <supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="true" android:largeScreens="true"/>
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->
     <!-- %%INSERT_PERMISSIONS -->
-
     <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
          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.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
 </manifest>

diff --git a/diary-mobile-android.pro b/diary-mobile-android.pro
index a91eca3fb2678aa8d5f33b66b940c9cb1491a4fe..4d447ed274ed36134169795f0c6b5a742ead2857 100644 (file)
--- a/diary-mobile-android.pro
+++ b/diary-mobile-android.pro
@@ -8,16 +8,16 @@ QT       += core gui network sql
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = diary-mobile-android
+TARGET = diary-mobile
 TEMPLATE = app
 
 
 SOURCES += main.cpp\
         mainwindow.cpp \
-    QsKineticScroller.cpp
+#    QsKineticScroller.cpp
 
 HEADERS  += mainwindow.h \
-    QsKineticScroller.h
+#    QsKineticScroller.h
 
 #FORMS    += mainwindow.ui
 

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 65e7a3065c979f239c03915d7d81e3595d3fc314..016da8db8e6e99a1b06d8cf51e83820a51f6c9c8 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -15,7 +15,7 @@
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
     qDebug()<<"begin of MainWindows";
-    conf=new QSettings(QString("FwF"), QString("diary-mobile-android"), this);
+    conf=new QSettings(QString("FwF"), QString("diary-mobile"), this);
     if(conf->allKeys().size()==0){
         qDebug()<<"first";
         firstrun();
@@ -23,17 +23,16 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     };
     screen=new QWidget(this);
     screen->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-    scroll=new QScrollArea(screen);
+    /*scroll=new QScrollArea(screen);
     scroll->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
     scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scroll->setWidgetResizable(1);
-    grid=new QGridLayout(scroll);
-    scroll->show();
+    scroll->setWidgetResizable(1);*/
+    grid=new QGridLayout(screen);
+    //scroll->show();
     grid->setSizeConstraint(QLayout::SetMinimumSize);
-    ks=new QsKineticScroller(scroll);
-    ks->enableKineticScrollFor(scroll);
-
+    /*ks=new QsKineticScroller(scroll);
+    ks->enableKineticScrollFor(scroll);*/
     signalmap=new QSignalMapper(this);
     connect(signalmap, SIGNAL(mapped(const QString &)), this, SLOT(action(const QString &)));
     connect(this, SIGNAL(datafilled()), this, SLOT(start()));
@@ -384,7 +383,7 @@ void MainWindow::getButtons(const QString &b){
         i++;
     };
     grid->update();
-    scroll->updateGeometry();
+    //scroll->updateGeometry();
     screen->updateGeometry();
 
     qDebug()<<"end getButtons : "<<i<<" button(s) way.size()"<<way.size();

diff --git a/mainwindow.h b/mainwindow.h
index 86d4f85eed1555b523e6dc99dd5ea5a8df1fbf5f..4ab06c08a867d77572002795c0d98765e3170869 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -19,7 +19,7 @@
 #include <QMessageBox>
 //#include <QTableWidget>
 #include <QTextEdit>
-#include <QScrollArea>
+//#include <QScrollArea>
 #ifndef FILEDOWNLOADER_H
 #define FILEDOWNLOADER_H
 
@@ -28,7 +28,7 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QsKineticScroller.h>
+//#include <QsKineticScroller.h>
 class FileDownloader : public QObject
 {
     Q_OBJECT
@@ -135,8 +135,8 @@ public slots:
 signals:
     void datafilled();
 private:
-    QsKineticScroller * ks;
-    QScrollArea * scroll;
+    //QsKineticScroller * ks;
+    //QScrollArea * scroll;
     QMutex sql,updatelocker;
     QWidget *screen;
     QGridLayout *grid;

diff --git a/ui.sql b/ui.sql
index 5183a0cb7a0fa0a3e868cb31d766de40bda94ceb..e4beea6eb0db93faefd848af6bd2f26b40bc8f27 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -1,4 +1,5 @@
 INSERT INTO ui (keyword,label,action) VALUES(?,?,?);
+begin$config$config
 menuback$config$config
 menuback$help$main help
 config$max column$setint maxcolumn