From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Tue, 5 Jul 2016 19:41:32 +0000 (+0200)
Subject: almost nothing
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=2c5eceb11bd485fa8c700a47f5df4dd1ddcebcf3;p=diary-mobile.git

almost nothing
---

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 9d6e77a..8332b85 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -34,7 +34,7 @@
             <!-- Splash screen -->
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7f1477d..1e9511b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -71,7 +71,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     setCentralWidget(screen);
     createMenuBar();
     connectDB();
-    showFullScreen();
+    screen->showFullScreen();
+    resizeEvent();
     if((conf->value(QString("first")).toInt()==1)){
         qDebug()<<"second";
         bool ok;
@@ -889,7 +890,7 @@ void MainWindow::back(){
 }
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
-    static bool accepted=false;
+    static bool accepted=true;
 
     int k=event->key();
     QString tmp;
@@ -897,8 +898,8 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
     qDebug()<<"key released="<<k;
     if(deb)QMessageBox::information(this, trUtf8("key released", "box title to debug keyReleaseEvent"), "key : "+tmp);
     if (k==Qt::Key_Menu){
-        const QString a=conf->value(QString("actionmenu")).toString();
-        if(a!="")accepted=true;
+        const QString a=conf->value(QString("actionmenu"), QString("")).toString();
+        if(a=="")accepted++;
         if(a!=lastprint){
             beforekey=lastprint;
             action(a);
@@ -907,7 +908,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
         };
     }else if(k==Qt::Key_Back){
         const QString a=conf->value(QString("menuback"), QString("")).toString();
-        if(a!="")accepted=true;
+        if(a!="")accepted++;
         if(a!=lastprint){
             beforekey=lastprint;
             action(a);
@@ -916,8 +917,8 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
         };
     }else if(k==Qt::Key_VolumeDown){
         qDebug()<<"keyvolumdown";
-        const QString a=conf->value(QString("volumdown")).toString();
-        if(a!="")accepted=true;
+        const QString a=conf->value(QString("volumdown"), QString("")).toString();
+        if(a!="")accepted++;
         if(a!=lastprint){
             beforekey=lastprint;
             action(a);
@@ -925,8 +926,8 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
             action(beforekey);
         };
     }else if(k==Qt::Key_VolumeUp){
-        const QString a=conf->value(QString("volumup")).toString();
-        if(a!="")accepted=true;
+        const QString a=conf->value(QString("volumup"), QString("")).toString();
+        if(a!="")accepted++;
         if(a!=lastprint){
             beforekey=lastprint;
             action(a);