Merge [16408],[16409] from trunk. Closes #4586

git-svn-id: http://svn.mythtv.org/svn/branches/release-0-21-fixes@16410 7dbf422c-18fa-0310-86e9-fd20926502f2
MythTV · Mar 6, 2008 · 084f875 · 084f875
1 parent 3798b78
commit 084f875
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -14,7 +14,7 @@ using namespace std;
 #define MINIMUM_DBMS_VERSION 5
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1212";
+const QString currentDatabaseVersion = "1213";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -3561,7 +3561,22 @@ thequery,
 };
 
         if (!performActualUpdate(updates, "1212", dbver))
-	    return false;
+        return false;
+    }
+
+    if (dbver == "1212")
+    {
+        const QString updates[] = {
+"DELETE FROM keybindings WHERE action LIKE 'MENU%' AND context='TV Playback';"
+"DELETE FROM keybindings WHERE action='TEXTEXIT' AND context='TV Playback';"
+"DELETE FROM keybindings WHERE action='SIGNALMON' AND context='TV Playback' "
+"   AND keylist='F7';"
+"UPDATE keybindings SET context='TV Playback' WHERE context='ITV Menu';",
+""
+};
+
+        if (!performActualUpdate(updates, "1213", dbver))
+        return false;
     }
 
 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22

diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -413,11 +413,20 @@ void TV::InitKeys(void)
     REG_KEY("TV Playback", "JUMPPREV", "Jump to previously played recording", "");
     REG_KEY("TV Playback", "JUMPREC", "Display menu of recorded programs to jump to", "");
     REG_KEY("TV Playback", "VIEWSCHEDULED", "Display scheduled recording list", "");
-    REG_KEY("TV Playback", "SIGNALMON", "Monitor Signal Quality", "F7");
+    REG_KEY("TV Playback", "SIGNALMON", "Monitor Signal Quality", "Alt+F7");
     REG_KEY("TV Playback", "JUMPTODVDROOTMENU", "Jump to the DVD Root Menu", "");
     REG_KEY("TV Playback", "EXITSHOWNOPROMPTS","Exit Show without any prompts", "");
     REG_KEY("TV Playback", "SCREENSHOT","Save screenshot of current video frame", "");
 
+    /* Interactive Television keys */
+    REG_KEY("TV Playback", "MENURED",    "Menu Red",    "F2");
+    REG_KEY("TV Playback", "MENUGREEN",  "Menu Green",  "F3");
+    REG_KEY("TV Playback", "MENUYELLOW", "Menu Yellow", "F4");
+    REG_KEY("TV Playback", "MENUBLUE",   "Menu Blue",   "F5");
+    REG_KEY("TV Playback", "TEXTEXIT",   "Menu Exit",   "F6");
+    REG_KEY("TV Playback", "MENUTEXT",   "Menu Text",   "F7");
+    REG_KEY("TV Playback", "MENUEPG",    "Menu EPG",    "F12");
+
     /* Editing keys */
     REG_KEY("TV Editing", "CLEARMAP", "Clear editing cut points", "C,Q,Home");
     REG_KEY("TV Editing", "INVERTMAP", "Invert Begin/End cut points", "I");
@@ -445,14 +454,6 @@ void TV::InitKeys(void)
     REG_KEY("Teletext Menu", "TOGGLEBACKGROUND","Toggle Background", "F7");
     REG_KEY("Teletext Menu", "REVEAL",      "Reveal hidden Text",    "F8");
 
-    /* Interactive Television keys */
-    REG_KEY("ITV Menu", "MENURED",    "Menu Red",    "F2");
-    REG_KEY("ITV Menu", "MENUGREEN",  "Menu Green",  "F3");
-    REG_KEY("ITV Menu", "MENUYELLOW", "Menu Yellow", "F4");
-    REG_KEY("ITV Menu", "MENUBLUE",   "Menu Blue",   "F5");
-    REG_KEY("ITV Menu", "TEXTEXIT",   "Menu Exit",   "F6");
-    REG_KEY("ITV Menu", "MENUTEXT",   "Menu Text",   "F7");
-    REG_KEY("ITV Menu", "MENUEPG",    "Menu EPG",    "F12");
 /*
   keys already used:
 
@@ -2651,7 +2652,7 @@ void TV::ProcessKeypress(QKeyEvent *e)
     {
         QStringList itv_actions;
         if (gContext->GetMainWindow()->TranslateKeyPress(
-                "ITV Menu", e, itv_actions))
+                "TV Playback", e, itv_actions))
         for (uint i = 0; i < itv_actions.size(); i++)
         {
             if (activenvp->ITVHandleAction(itv_actions[i]))