Ticket #3642: translate-key-presses.diff

mythtv/libs/libmythtv/tv_play.cpp

@@ -2186 +2186 @@
     if (ignoreKeys)
     {
         if (!gContext->GetMainWindow()->TranslateKeyPress(
-                "TV Playback", e, actions))
+                "TV Playback", e, actions, true, QStringList() << "Program Guide"))
         {
             return;
         }
@@ -2264 +2264 @@
     }
 
     if (!gContext->GetMainWindow()->TranslateKeyPress(
-            "TV Playback", e, actions))
+            "TV Playback", e, actions, true, QStringList() << "Program Guide"))
     {
         return;
     }

mythtv/libs/libmythui/mythmainwindow.cpp

@@ -718 +718 @@
 
 bool MythMainWindow::TranslateKeyPress(const QString &context,
                                        QKeyEvent *e, QStringList &actions,
-                                       bool allowJumps)
+                                       bool allowJumps,
+                                       const QStringList &excludedJumpDestinations)
 {
     actions.clear();
     int keynum = d->TranslateKeyNum(e);
+    QString destination = "";
+    
+    // Create iterator to retrieve jump destination
+    QMap<int, JumpData*>::Iterator it;
+    it = d->jumpMap.find(keynum);
 
+    // Retrieve jump destination
+    if ( it != d->jumpMap.end())
+    {
+        JumpData *jd = it.data();
+        destination = jd->destination; 
+    }
+
     if (allowJumps && 
-        d->jumpMap.count(keynum) > 0 && d->exitmenucallback == NULL)
+        d->jumpMap.count(keynum) > 0 &&
+        d->exitmenucallback == NULL &&
+        excludedJumpDestinations.contains(destination) == 0)
     {
         d->exitingtomain = true;
         d->exitmenucallback = d->jumpMap[keynum]->callback;
@@ -893 +908 @@
     }
 }
 
-
 void MythMainWindow::BindJump(const QString &destination, const QString &key)
 {
     /* make sure the jump point exists */

mythtv/libs/libmythui/mythmainwindow.h

@@ -62 +62 @@
     MythScreenStack *GetMainStack();
 
     bool TranslateKeyPress(const QString &context, QKeyEvent *e, 
-                           QStringList &actions, bool allowJumps = true);
+                           QStringList &actions, bool allowJumps = true,
+                           const QStringList &excludedJumpDestinations = QStringList());
 
     void ClearKey(const QString &context, const QString &action);
     void BindKey(const QString &context, const QString &action,