forgetting

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 1f3b5fee826149116106eef6ecc9bcaecb7161f3..2b4b76af30de115641bf0496bea1008bb5625186 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,39 +1,43 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:versionCode="1" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionName="1.0" package="eu.nothing2do.diarymobile">
-    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon" android:label="diary-mobile-android">
-        <activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:screenOrientation="unspecified" android:label="@string/app_name">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.01" package="eu.nothing2do.diarymobile" 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:name="android.app.lib_name" android:value="diary-mobile-android"/>
+            <meta-data android:value="diary-mobile-android" 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: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"/>
             <!-- Splash screen -->
         </activity>
     </application>
-    <supports-screens android:anyDensity="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"/>
+    <supports-screens android:normalScreens="true" android:smallScreens="true" android:largeScreens="true" android:anyDensity="true"/>
     <!-- %%INSERT_PERMISSIONS -->
     <!-- %%INSERT_FEATURES -->
+    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.STATUS_BAR"/>
     <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/diary-mobile-android.pro b/diary-mobile-android.pro
index 627c759c3e92e10ad5e03d8d12ed75316fc30a01..62f5c959802c5f74f0b87dc8c2526d79e81782e8 100644 (file)
--- a/diary-mobile-android.pro
+++ b/diary-mobile-android.pro
@@ -27,7 +27,6 @@ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 OTHER_FILES += \
     android/AndroidManifest.xml \
-    ui.sql \
-    android/AndroidManifest.xml
+    ui.sql
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c9a217b728801dda5b702bdc6411340e1fb15782..83a74d70d23d83015f6469ac2da060112bb75faa 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -22,11 +22,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
         first=1;
         firstrun();
     }
-    texte=new QLineEdit();
     screen=new QWidget(this);
+    grid=new QGridLayout();
+    texte=new QLineEdit();
     vbox=new QVBoxLayout(screen);
     hbox=new QHBoxLayout();
-    grid=new QGridLayout();
     ok=new CLabel("ok");
     ok->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     connect(ok, SIGNAL(released()), this, SLOT(entry()));
@@ -41,9 +41,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     setCentralWidget(screen);
     createMenuBar();
     connectDB();
-    if(first)createDB();
+    //createDB();
     statusBar()->addPermanentWidget(label);
-    menuBar()->hide();
+    menuBar()->show();
     start();
 }
 void MainWindow::start(){
@@ -123,28 +123,30 @@ void MainWindow::quit(){
     qApp->quit();
 }
 CLabel* MainWindow::addWidget(const QString &key, CLabel * a){
-
+    qDebug()<<"addWidget("<<key<<")";
     //widget.insert(key, a);
     int maxc=conf->value(QString("maxcolumn")).toInt();
     grid->addWidget(a, grid->count()/maxc, grid->count()%maxc, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
+    //QObject::connect(a, SIGNAL(pressed()), signalmap, SLOT(map()));
     QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map()));
+
     signalmap->setMapping(a, key);
     return a;
 }
-/*void MainWindow::remWidget(const QString & a){
-    QObject::disconnect(widget.value(a), SIGNAL(released()), signalmap, SLOT(map()));
-    grid->removeWidget(widget.value(a));
-    //widget.remove(a);
-}*/
 void MainWindow::action(const QString & a){
     qDebug()<<"action("<<a<<")";
     label->setText(a);
     flush();
     if (a.split(QString(" "))[0]==QString("set")){
         conf->setValue(QString(a.split(QString(" "))[1]), a.split(QString(" "))[2]);
+        start();
     }
     else if(a.split(QString(" "))[0]==QString("sql")){
         exec(a.mid(4));
+        start();
+    }
+    else if(a.split(QString(" "))[0]==QString("edit")){
+
     }
     else getButtons(a);
 }
@@ -188,7 +190,8 @@ CLabel::CLabel( const QString& text, QWidget * parent ) : QLabel(parent)
     setWordWrap(true);
     setLineWidth(5);
     setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;");
-    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+
 
 }
 CLabel::~CLabel()
@@ -197,13 +200,13 @@ CLabel::~CLabel()
 void CLabel::mousePressEvent ( QMouseEvent * event )
 {
     switch(event->button()){
-        case Qt::LeftButton:setStyleSheet("background-color: red;border-style: inset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");emit pressed();break;
+        case Qt::LeftButton:setStyleSheet("background-color: red;border-style: inset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;");emit pressed();break;
     }
 }
 void CLabel::mouseReleaseEvent( QMouseEvent * event )
 {
     switch(event->button()){
-        case Qt::LeftButton:setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");emit released();break;
+        case Qt::LeftButton:setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;");emit released();break;
 
     }
 }
@@ -239,7 +242,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("password"), QVariant("pass"));
     conf->setValue(QString("file"), QVariant("diary.txt"));
     conf->setValue(QString("maxcolumn"), QVariant(4));
-    conf->setValue(QString("SQLsettings"), QVariant("requiressl=1 connect_timeout=10000)"));
+    conf->setValue(QString("SQLsettings"), QVariant("requiressl=1 connect_timeout=10000"));
     conf->setValue(QString("button"), QVariant("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
 }
 QString &MainWindow::get(int row, int column){
@@ -248,9 +251,8 @@ QString &MainWindow::get(int row, int column){
     return tmp;
 }
 int MainWindow::exec(const QString & a){
-    qDebug()<<"exec("<<a<<")";
     q->prepare(a);
-    q->exec();
+    qDebug()<<"exec("<<a<<")="<<q->exec();
     QSqlError b=q->lastError();
     if (b.isValid())qDebug()<<"SQL error->exec() :"<<b.text();
     return q->size();
@@ -295,10 +297,14 @@ void MainWindow::entry(){
 void 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');"));
+    exec(QString("INSERT INTO 'ui' (keyword, label, action) VALUES('f-a-discours','discours un peu plus long que la moyenne pour voir se qui va se passer','begin');"));
 }
 void MainWindow::addButtonDB(){
-    QString cmd="insert into ui (keyword, label, action) values ('", cur=(label->text());
+    qDebug()<<"addButtonDB()";
+    QString cmd="insert into ui (keyword, label, action) values ('", cur=label->text();
     QString view=QInputDialog::getText(this, QString("label"), QString("Entrez le label"));
     if (view=="")view="default";
     QString key=QInputDialog::getText(this, QString("keyword"), QString("Entrez le nom de la page"), QLineEdit::Normal, cur);
@@ -307,26 +313,28 @@ void MainWindow::addButtonDB(){
 
     QString a=cmd+key+"', '"+view+"', '"+action+"');";
     exec(a);
+    flush();
     getButtons(label->text());
 }
 void MainWindow::getButtons(const QString &a){
-    QString tmp("select label,action from ui where keyword like '%"+a+"%';");
+    QString tmp="select label,action from ui where keyword like '%"+a+"%';";
     exec(tmp);
-    //r=q->record();
-    //qDebug()<<"nmb of col : "<<r.count();
     int labCol = 0;//r.indexOf("label");
     int actCol = 1;//r.indexOf("action");
-    //q->first();
     while(q->next()){
         addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString()));
-    }
+    };
 }
 void MainWindow::editButtonDB(){
     flush();
-    exec(QString("select distinct keyword from ui"));
+    exec(QString("select label from ui where keyword like '"+label->text())+"';");
     while (q->next()) {
-        QString key=QString("sql select label from ui where keyword='"+q->value(0).toString()+"';");
+        //QString key=QString("sql select keyword,label,action from ui where keyword like '"+q->value(0).toString()+"';");
+        qDebug()<<q->value(0).toString();
+        addWidget(QString("sql select keyword,label,action from ui where keyword like '"+q->value(0).toString()+"';"), new CLabel(q->value(0).toString()));
+    }
+    flush();
+    while (q->next()){
 
-        addWidget(key, new CLabel(q->value(0).toString()));
     }
 }