some cosmetic modification

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
deleted file mode 100644 (file)
index 324fdf4..0000000
--- a/android/AndroidManifest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<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: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: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: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: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: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:resource="@layout/splash" android:name="android.app.splash_screen"/>
-            <!-- Splash screen -->
-        </activity>
-    </application>
-    <!-- %%INSERT_USES_SDK%% -->
-    <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 f535fa83a44953939c2c8282f81f6a523dc71195..b040e4cfb7ec277a341d22f3a96f0a7f6fb53c93 100644 (file)
--- a/diary-mobile-android.pro
+++ b/diary-mobile-android.pro
@@ -23,34 +23,8 @@ CONFIG += mobility
 MOBILITY = 
 QMAKE_CXXFLAGS += -fpermissive
 
-ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+#ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 OTHER_FILES += \
-    android/AndroidManifest.xml \
+#    android/AndroidManifest.xml \
     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 9e1b2128b426fdcbd82d48cbe683f6ccc079588d..2134c5af5d4c2541510803718b7704448c3f1b61 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -44,7 +44,7 @@ MainWindow::MainWindow(QWidget *parent)
     label=new QLabel("Save locally");
     setCentralWidget(screen);
     createMenuBar();
-    connectdb();
+    connectDB();
     statusBar()->addPermanentWidget(label);
     toggleMenu();
     start();
@@ -161,6 +161,7 @@ void MainWindow::lsconfig(){
 
 }
 void MainWindow::quit(){
+    qDebug()<<"quit()";
     conf->sync();
     db.commit();
     db.close();
@@ -201,13 +202,13 @@ void MainWindow::action(const QString & a){
 void MainWindow::createMenuBar(){
     FileMenu=new QMenu(QString("&File"), this);
     FileMenu->addAction(tr("&Start..."), this, SLOT(start()),QKeySequence(tr("Ctrl+S", "Start")));
-    FileMenu->addAction(tr("&Connect"), this, SLOT(connectdb()),QKeySequence(tr("Ctrl+C", "Connect")));
+    FileMenu->addAction(tr("&Connect"), this, SLOT(connectDB()),QKeySequence(tr("Ctrl+C", "Connect")));
     FileMenu->addAction(tr("&Quit..."), this, SLOT(quit()),QKeySequence(tr("Ctrl+Q", "Quit")));
     menuBar()->addMenu(FileMenu);
     EditMenu=new QMenu(QString("&Edit"));
     EditMenu->addAction(tr("Co&nfig"), this, SLOT(lsconfig()), QKeySequence(tr("Ctrl+N", "Edit|Co&nfig")));
-    EditMenu->addAction(tr("C&reate database"), this, SLOT(createdb()), QKeySequence(tr("Ctrl+R", "Edit|Database")));
-    EditMenu->addAction(tr("A&dd buttons"), this, SLOT(addButton()), QKeySequence(tr("Ctrl+D", "Add buttons")));
+    EditMenu->addAction(tr("C&reate database"), this, SLOT(createDB()), QKeySequence(tr("Ctrl+R", "Edit|Database")));
+    EditMenu->addAction(tr("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(tr("Ctrl+D", "Add buttons")));
     menuBar()->addMenu(EditMenu);
     HelpMenu=new QMenu(QString("&Help"));
     HelpMenu->addAction(tr("About Qt"), qApp, SLOT(aboutQt()), QKeySequence(tr("ctrl+H", "About Qt")));
@@ -291,7 +292,7 @@ void MainWindow::TCPerrors(QAbstractSocket::SocketError a){
 QString MainWindow::getText(const QString &a){
     return widget.value(a)->text();
 }
-void MainWindow::connectdb(){
+void MainWindow::connectDB(){
     db = QSqlDatabase::addDatabase("QSQLITE");
     //db = QSqlDatabase::addDatabase("QPSQL");
     //db.setHostName(host); useless with SQLite
@@ -313,7 +314,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("database"), QVariant("db"));
     conf->setValue(QString("password"), QVariant("pass"));
     conf->setValue(QString("file"), QVariant("diary.txt"));
-    createdb();
+    createDB();
 }
 QString &MainWindow::get(int row, int column){
     q->seek(row);
@@ -368,14 +369,14 @@ int MainWindow::entry(){
     if (b.isValid())qDebug()<<"q->lastError():"<<b.text();
     texte->clear();
 }
-int MainWindow::createdb(){
+int MainWindow::createDB(){
     exec(QString("create table ui(keyword text, label text, action text);"));
     exec(QString("create table raw(date timestamp, texte text);"));
     exec(QString("insert into ui (keyword, label, action) values ('begin', 'fille', 'fille');"));
     exec(QString("insert into ui (keyword, label, action) values ('fille', 'aurelie', 'f-aurelie');"));
     exec(QString("insert into ui (keyword, label, action) values ('f-aurelie', 'discours', 'f-a-discours');"));
 }
-void MainWindow::addButton(){
+void MainWindow::addButtonDB(){
     QString cmd="insert into ui (keyword, label, action) values ('";
     QString key=QInputDialog::getText(this, QString("keyword"), QString("Entrez votre mot clé"));
     if (key=="")key="default";
@@ -386,7 +387,7 @@ void MainWindow::addButton(){
     QString a=cmd+key+"', '"+label+"', '"+action+"');";
     qDebug()<<"exec("<<a<<")";
     exec(a);
-};
+}
 void MainWindow::getButtons(const QString &a){
     QString tmp("select label,action from ui where keyword like '%"+a+"%';");
     exec(tmp);

diff --git a/mainwindow.h b/mainwindow.h
index f0571bd7d6baa9de2a670c9a2e971bc21c4f5fa5..8046a21b2a3e72573f4323163e776fe77cd82cb4 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -78,15 +78,15 @@ private slots:
     void connected();
     void TCPerrors(QAbstractSocket::SocketError);
     QString getText(const QString &);
-    void connectdb();
+    void connectDB();
     void firstrun();
     QString &get(int, int);
     int alias(const QString &);
     int alias(const QString &, int &);
     int exec(const QString &);
     int entry();
-    int createdb();
-    void addButton();
+    int createDB();
+    void addButtonDB();
     void getButtons(const QString &);
 public slots: