Ticket #13234: 20180315_1936_menus_and_bookmark.patch

mythtv/libs/libmythtv/tv_actions.h

@@ -31 +31 @@
 #define ACTION_VIEWSCHEDULED     "VIEWSCHEDULED"
 #define ACTION_PREVRECORDED      "PREVRECORDED"
 #define ACTION_SIGNALMON         "SIGNALMON"
+#define ACTION_SETBOOKMARK       "SETBOOKMARK"
+#define ACTION_TOGGLEBOOKMARK    "TOGGLEBOOKMARK"
 
 /* Navigation */
 #define ACTION_JUMPPREV             "JUMPPREV"

mythtv/libs/libmythtv/tv_play.cpp

@@ -600 +600 @@
     REG_KEY("TV Frontend", ACTION_LISTRECORDEDEPISODES, QT_TRANSLATE_NOOP("MythControls",
             "List recorded episodes"), "");
 
+    // Bookmarks - Instead of SELECT to add or toggle,
+    // Use separate bookmark actions. This code is to convert users
+    // who may already be using SELECT. If they are not already using
+    // this frontend then nothing will be assigned to bookmark actions.
+    QString bkmKeys;
+    QString togBkmKeys;
+    // Check if this is a new frontend - if PAUSE returns
+    // "?" then frontend is new, never used before, so we will not assign
+    // any default bookmark keys
+    QString testKey = GetMythMainWindow()->GetKey("TV Playback", ACTION_PAUSE);
+    if (testKey != "?")
+    {
+        int alternate = gCoreContext->GetNumSetting("AltClearSavedPosition",0);
+        QString selectKeys = GetMythMainWindow()->GetKey("Global", ACTION_SELECT);
+        if (selectKeys != "?")
+        {
+            if (alternate)
+                togBkmKeys = selectKeys;
+            else
+                bkmKeys = selectKeys;
+        }
+    }
+    REG_KEY("TV Playback", ACTION_SETBOOKMARK, QT_TRANSLATE_NOOP("MythControls",
+            "Add Bookmark"), bkmKeys);
+    REG_KEY("TV Playback", ACTION_TOGGLEBOOKMARK, QT_TRANSLATE_NOOP("MythControls",
+            "Toggle Bookmark"), togBkmKeys);
     REG_KEY("TV Playback", "BACK", QT_TRANSLATE_NOOP("MythControls",
             "Exit or return to DVD menu"), "Esc");
     REG_KEY("TV Playback", ACTION_MENUCOMPACT, QT_TRANSLATE_NOOP("MythControls",
@@ -607 +633 @@
     REG_KEY("TV Playback", ACTION_CLEAROSD, QT_TRANSLATE_NOOP("MythControls",
             "Clear OSD"), "Backspace");
     REG_KEY("TV Playback", ACTION_PAUSE, QT_TRANSLATE_NOOP("MythControls",
-            "Pause"), "P");
+            "Pause"), "P,Space");
     REG_KEY("TV Playback", ACTION_SEEKFFWD, QT_TRANSLATE_NOOP("MythControls",
             "Fast Forward"), "Right");
     REG_KEY("TV Playback", ACTION_SEEKRWND, QT_TRANSLATE_NOOP("MythControls",
@@ -5043 +5069 @@
     bool isdvd  = state == kState_WatchingDVD;
     bool isdisc = isdvd || state == kState_WatchingBD;
 
-    if (has_action(ACTION_SELECT, actions))
+    if (has_action(ACTION_SETBOOKMARK, actions))
+    {
+        if (!islivetv || !CommitQueuedInput(ctx))
+        {
+            ctx->LockDeletePlayer(__FILE__, __LINE__);
+            SetBookmark(ctx, false);
+            ctx->UnlockDeletePlayer(__FILE__, __LINE__);
+        }
+    }
+    if (has_action(ACTION_TOGGLEBOOKMARK, actions))
     {
         if (!islivetv || !CommitQueuedInput(ctx))
         {
             ctx->LockDeletePlayer(__FILE__, __LINE__);
-            SetBookmark(ctx, db_toggle_bookmark && ctx->player->GetBookmark());
+            SetBookmark(ctx, ctx->player->GetBookmark());
             ctx->UnlockDeletePlayer(__FILE__, __LINE__);
         }
     }
@@ -11065 +11100 @@
             DoQueueTranscode(actx, "Medium Quality");
         else if (action == "QUEUETRANSCODE_LOW")
             DoQueueTranscode(actx, "Low Quality");
+        else if (action == ACTION_TOGGLEBOOKMARK
+                || action == ACTION_SETBOOKMARK)
+            ActivePostQHandleAction(actx, QStringList(action));
+        else if (action == ACTION_JUMPBKMRK)
+        {
+            bool isDVD = actx->buffer && actx->buffer->IsDVD();
+            bool isMenuOrStill = actx->buffer && actx->buffer->IsInDiscMenuOrStillFrame();
+            ActiveHandleAction(actx, QStringList(ACTION_JUMPBKMRK), isDVD, isMenuOrStill);
+        }
         else
         {
             LOG(VB_GENERAL, LOG_ERR, LOC +

mythtv/programs/mythfrontend/globalsettings.cpp

@@ -1657 +1657 @@
     return gc;
 }
 
-static HostCheckBoxSetting *AltClearSavedPosition()
-{
-    HostCheckBoxSetting *gc = new HostCheckBoxSetting("AltClearSavedPosition");
-
-    gc->setLabel(PlaybackSettings::tr("Alternate clear and save bookmark"));
-
-    gc->setValue(true);
-
-    gc->setHelpText(PlaybackSettings::tr("During playback the SELECT key "
-                                         "(Enter or Space) will alternate "
-                                         "between \"Bookmark Saved\" and "
-                                         "\"Bookmark Cleared\". If disabled, "
-                                         "the SELECT key will save the current "
-                                         "position for each keypress."));
-    return gc;
-}
-
 static HostCheckBoxSetting *UseProgStartMark()
 {
     HostCheckBoxSetting *gc = new HostCheckBoxSetting("UseProgStartMark");
@@ -4017 +4000 @@
     general->addChild(AudioReadAhead());
     general->addChild(JumpToProgramOSD());
     general->addChild(ClearSavedPosition());
-    general->addChild(AltClearSavedPosition());
     general->addChild(UseProgStartMark());
     general->addChild(AutomaticSetWatched());
     general->addChild(ContinueEmbeddedTVPlay());

mythtv/programs/mythfrontend/progdetails.cpp

@@ -137 +137 @@
         QString action = actions[i];
         handled = true;
 
-        if (action == "INFO")
+        if (action == "INFO" || action == "SELECT")
         {
             m_infoList.Toggle();
             updatePage();

mythtv/programs/mythfrontend/videodlg.cpp

@@ -2472 +2472 @@
     m_menuPopup = new MythDialogBox(menu, m_popupStack, "videomenupopup");
 
     if (m_menuPopup->Create())
+    {
         m_popupStack->AddScreen(m_menuPopup);
+        connect(m_menuPopup, SIGNAL(Closed(QString,int)), SLOT(popupClosed(QString,int)));
+    }
     else
         delete m_menuPopup;
 }
@@ -2536 +2539 @@
     m_menuPopup = new MythDialogBox(menu, m_popupStack, "videomenupopup");
 
     if (m_menuPopup->Create())
+    {
         m_popupStack->AddScreen(m_menuPopup);
+        connect(m_menuPopup, SIGNAL(Closed(QString,int)), SLOT(popupClosed(QString,int)));
+    }
     else
         delete m_menuPopup;
 }
 
+// Switch from the display menu to the actions menu on second
+// menu press
+
+void VideoDialog::popupClosed(QString which, int result)
+{
+    m_menuPopup = NULL;
+
+    if (result == -2)
+    {
+        if (which == "display")
+            VideoMenu();
+    }
+}
+
 /** \fn VideoDialog::CreateViewMenu()
  *  \brief Create a  MythMenu for MythVideo Views.
  *  \return MythMenu.

mythtv/programs/mythfrontend/videodlg.h

@@ -112 +112 @@
     MythMenu* CreateSettingsMenu();
     MythMenu* CreateMetadataBrowseMenu();
 
+    void popupClosed(QString which, int reason);
+
     void PromptToScan();
 
     void ChangeFilter();

mythtv/themes/default/menu_playback.xml

@@ -175 +175 @@
   <menu text="Navigate">
     <item action="JUMPFFWD" XXXtext="Jump Ahead" />
     <item action="JUMPRWND" XXXtext="Jump Back" />
+    <item action="SETBOOKMARK" XXXtext="Set Bookmark" />
+    <item action="TOGGLEBOOKMARK" XXXtext="Toggle Bookmark" />
+    <item action="JUMPBKMRK" XXXtext="Jump to Bookmark" />
     <menu text="Commercial Auto-Skip">
       <itemlist actiongroup="TOGGLECOMMSKIP" current="active" />
       <!-- Alternatively: