Ticket #3642: localAction_over_jumppoint_v1.diff

libs/libmythui/mythmainwindow.cpp

@@ -125 +125 @@
     QString destination;
     QString description;
     bool exittomain;
+    QString localAction;
 };
 
 struct MHData
@@ -755 +756 @@
     actions.clear();
     int keynum = d->TranslateKeyNum(e);
 
+    QStringList localActions;
+    if (allowJumps && (d->jumpMap.count(keynum) > 0) && 
+        (d->jumpMap[keynum]->localAction != "") &&
+        (d->keyContexts[context]) &&
+        (d->keyContexts[context]->GetMapping(keynum, localActions)))
+    {
+        if (localActions.contains(d->jumpMap[keynum]->localAction))
+            allowJumps = false;
+    }
+
     if (allowJumps && d->jumpMap.count(keynum) > 0 && 
             !d->jumpMap[keynum]->exittomain && d->exitmenucallback == NULL)
     {
@@ -973 +984 @@
 void MythMainWindow::RegisterJump(const QString &destination, 
                                   const QString &description,
                                   const QString &key, void (*callback)(void),
-                                  bool exittomain)
+                                  bool exittomain, QString localAction)
 {
     QString keybind = key;
 
@@ -994 +1005 @@
         {
             QString inskey = keybind;
 
+#if MODIFIED_DBCHECK_CPP_TO_ADD_NEW_COLUMN
             query.prepare("INSERT INTO jumppoints (destination, description, "
-                          "keylist, hostname) VALUES ( :DEST, :DESC, :KEYLIST, "
-                          ":HOST );");
+                              "keylist, hostname, localaction) "
+                          "VALUES ( :DEST, :DESC, :KEYLIST, :HOST, "
+                              ":LOCALACTION );");
             query.bindValue(":DEST", destination);
             query.bindValue(":DESC", description);
             query.bindValue(":KEYLIST", inskey);
             query.bindValue(":HOST", gContext->GetHostName());
+            query.bindValue(":LOCALACTION", localAction);
 
             if (!query.exec() || !query.isActive())
             {
                 MythContext::DBError("Insert Jump Point", query);
             }
+#endif
         }
     }
 
-    JumpData jd = { callback, destination, description, exittomain };
+    JumpData jd =
+        { callback, destination, description, exittomain, localAction };
     d->destinationMap[destination] = jd;
 
     BindJump(destination, keybind); 
@@ -1607 +1623 @@
     return d->uiScreenRect;
 }
 
+/* vim: set expandtab tabstop=4 shiftwidth=4: */

libs/libmythui/mythmainwindow.h

@@ -39 +39 @@
 #define GET_KEY(a, b) GetMythMainWindow()->GetKey(a, b)
 #define REG_JUMP(a, b, c, d) GetMythMainWindow()->RegisterJump(a, b, c, d)
 #define REG_JUMPEX(a, b, c, d, e) GetMythMainWindow()->RegisterJump(a, b, c, d, e)
+#define REG_JUMPLOC(a, b, c, d, e) GetMythMainWindow()->RegisterJump(a, b, c, d, true, e)
 #define REG_MEDIA_HANDLER(a, b, c, d, e, f) GetMythMainWindow()->RegisterMediaHandler(a, b, c, d, e, f)
 #define REG_MEDIAPLAYER(a,b,c) GetMythMainWindow()->RegisterMediaPlugin(a, b, c)
 
@@ -76 +77 @@
     void BindJump(const QString &destination, const QString &key);
     void RegisterJump(const QString &destination, const QString &description,
                       const QString &key, void (*callback)(void),
-                      bool exittomain = true);
+                      bool exittomain = true, QString localAction = "");
     void RegisterMediaHandler(const QString &destination,
                               const QString &description, const QString &key,
                               void (*callback)(MythMediaDevice* mediadevice),

programs/mythfrontend/main.cpp

@@ -782 +782 @@
 {
     REG_JUMP("Reload Theme", "", "", reloadTheme);
     REG_JUMP("Main Menu", "", "", gotoMainMenu);
-    REG_JUMP("Program Guide", "", "", startGuide);
-    REG_JUMP("Program Finder", "", "", startFinder);
+    REG_JUMPLOC("Program Guide", "", "", startGuide, "GUIDE");
+    REG_JUMPLOC("Program Finder", "", "", startFinder, "FINDER");
     //REG_JUMP("Search Listings", "", "", startSearch);
     REG_JUMP("Manage Recordings / Fix Conflicts", "", "", startManaged);
     REG_JUMP("Program Recording Priorities", "", "", startProgramRecPriorities);