Ticket #6318: recGroup-ui-v2.patch

programs/mythfrontend/playbackbox.cpp

@@ -408 +408 @@
     if (!LoadWindowFromXML("recordings-ui.xml", "watchrecordings", this))
         return false;
 
+    m_recgroupList  = dynamic_cast<MythUIButtonList *> (GetChild("recgroups"));
     m_groupList     = dynamic_cast<MythUIButtonList *> (GetChild("groups"));
     m_recordingList = dynamic_cast<MythUIButtonList *> (GetChild("recordings"));
 
@@ -436 +437 @@
     m_groupList->SetLCDTitles(tr("Groups"));
     m_recordingList->SetLCDTitles(tr("Recordings"), "titlesubtitle|shortdate|starttime");
 
+    if (m_recgroupList)
+        m_recgroupList->SetCanTakeFocus(false);
+
     if (!m_player && !m_recGroupPassword.isEmpty())
         displayRecGroup(m_recGroup);
     else if (gContext->GetNumSetting("QueryInitialFilter", 0) == 1)
@@ -817 +821 @@
     }
 }
 
+/*
+ * \fn PlaybackBox::updateRecGroupList(void)
+ * \brief called when the list of recording groups may have changed
+ */
+void PlaybackBox::updateRecGroupList(void)
+{
+    if (m_recGroupIdx < 0 || !m_recgroupList)
+        return;
+
+    m_recgroupList->Reset();
+
+    QStringList::iterator it;
+    int idx;
+    MythUIButtonListItem *item = NULL;
+    QString name;
+    QString state;
+
+    for (it = m_recGroups.begin(), idx = 0;
+         it != m_recGroups.end(); ++it, ++idx)
+    {
+        name = (*it).simplified();
+        if (name == "All Programs")
+            name = "All";
+
+        item = new MythUIButtonListItem(m_recgroupList, "",
+                                        qVariantFromValue(name.toLower()));
+
+        if (idx == m_recGroupIdx)
+            m_recgroupList->SetItemCurrent(item);
+
+        item->SetText(name);
+    }
+}
+
 void PlaybackBox::updateGroupList()
 {
     m_groupList->Reset();
@@ -1030 +1068 @@
     m_progLists.clear();
     m_recordingList->Reset();
     m_groupList->Reset();
+    if (m_recgroupList)
+        m_recgroupList->Reset();
     // Clear autoDelete for the "all" list since it will share the
     // objects with the title lists.
     m_progLists[""] = ProgramList(false);
@@ -1490 +1530 @@
         }
     }
 
+    updateRecGroupList();
     updateGroupList();
     updateUsage();
 
@@ -3321 +3362 @@
                 deleteSelected(m_recordingList->GetItemCurrent());
             else if (action == "PLAYBACK")
                 playSelected(m_recordingList->GetItemCurrent());
-            else if (action == "INFO")
+            else if (action == "MENU2")
                 showActionsSelected();
             else if (action == "DETAILS")
                 details();

programs/mythfrontend/playbackbox.h

@@ -307 +307 @@
     QString testImageFiles(QString &testDirectory,
                            QString &seriesID, QString &titleIn);
 
+    void updateRecGroupList();
     void updateGroupList();
     void updateIcons(const ProgramInfo *pginfo = NULL);
     void updateUsage();
@@ -318 +319 @@
 
     void HandlePreviewEvent(const ProgramInfo &evinfo);
 
+    MythUIButtonList *m_recgroupList;
     MythUIButtonList *m_groupList;
     MythUIButtonList *m_recordingList;