]> git.nothing2do.fr Git - diary-mobile.git/commitdiff
event is always accepted
authorNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Tue, 2 Jun 2015 12:43:45 +0000 (14:43 +0200)
committerNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Tue, 2 Jun 2015 12:43:45 +0000 (14:43 +0200)
mainwindow.cpp

index 3106c0ae5c1a40853a83bd7279603bc2671ad0c0..5c1a7a5f96ae4639757d712b94abc5e32676866b 100644 (file)
@@ -804,29 +804,41 @@ void MainWindow::back(){
 }
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
-    static bool accepted=true;
-    event->setAccepted(accepted);
+    //static bool accepted=true;
+
     int k=event->key();
     qDebug()<<"key pressed="<<k;
     
-    if /*(k==Qt::Key_Menu){
-        action(conf->value(QString("actionmenu")).toString());
-        accepted=false;
+    if (k==Qt::Key_Menu){
+        const QString a=conf->value(QString("actionmenu"), QString("")).toString();
+        if(a!=""){
+            action(a);
+            //accepted=false;
+            }
         }
-    else if*/(k==Qt::Key_Back){
-        action(conf->value(QString("menuback")).toString());
-        accepted=false;
+    else if(k==Qt::Key_Back){
+        const QString a=conf->value(QString("menuback"), QString("")).toString();
+        if(a!=""){
+            action(a);
+            //accepted=false;
+            }
         }
     else if(k==Qt::Key_VolumeDown){
         qDebug()<<"keyvolumdown";
         const QString a=conf->value(QString("volumdown")).toString();
-        accepted=false;
-        action(a);
+        if(a!=""){
+            action(a);
+            //accepted=false;
+            }
         }
     else if(k==Qt::Key_VolumeUp){
-        action(conf->value(QString("volumup")).toString());
-        accepted=false;
+        const QString a=conf->value(QString("volumup")).toString();
+        if(a!=""){
+            action(a);
+            //accepted=false;
+            }
         };
+    event->setAccepted(true);
 }
 void CLabel::SetTextToLabel(const QString& text)
 {