Ticket #6318: recGroup-ui-v2.1.patch

programs/mythfrontend/playbackbox.cpp

@@ -434 +434 @@
 bool PlaybackBox::Create()
 {
     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"));
 
     m_noRecordingsText = dynamic_cast<MythUIText *> (GetChild("norecordings"));
 
@@ -450 +451 @@
     {
         VERBOSE(VB_IMPORTANT, "Theme is missing critical theme elements.");
         return false;
     }
 
+    if (m_recgroupList)
+        m_recgroupList->SetCanTakeFocus(false);
+
     connect(m_groupList, SIGNAL(itemSelected(MythUIButtonListItem*)),
             SLOT(updateRecList(MythUIButtonListItem*)));
     connect(m_groupList, SIGNAL(itemClicked(MythUIButtonListItem*)),
             SLOT(SwitchList()));
     connect(m_recordingList, SIGNAL(itemSelected(MythUIButtonListItem*)),
@@ -897 +901 @@
         usedProgress->SetTotal(m_freeSpaceTotal);
         usedProgress->SetUsed(m_freeSpaceUsed);
     }
 }
 
+/*
+ * \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();
 
     if (!m_titleList.isEmpty())
@@ -1165 +1203 @@
     m_progsInDB = 0;
     m_titleList.clear();
     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);
     m_progLists[""].setAutoDelete(false);
 
@@ -1627 +1667 @@
             if (m_recGroupIdx < 0)
                 m_recGroupIdx = 0;
         }
     }
 
+    updateRecGroupList();
     updateGroupList();
     updateUsage();
 
     if (m_currentItem)
     {

programs/mythfrontend/playbackbox.h

@@ -312 +312 @@
     bool loadArtwork(QString artworkFile, MythUIImage *image, QTimer *timer,
                      int delay = 500, bool resetImage = false);
     QString findArtworkFile(QString &seriesID, QString &titleIn,
                             QString imagetype, QString host);
 
+    void updateRecGroupList();
     void updateGroupList();
     void updateIcons(const ProgramInfo *pginfo = NULL);
     void updateUsage();
     void updateGroupInfo(const QString &groupname, const QString &grouplabel);
     void UpdateProgramInfo(MythUIButtonListItem *item, bool is_sel,
@@ -325 +326 @@
 
     void HandlePreviewEvent(const ProgramInfo &evinfo);
 
     void ShowMenu(void);
 
+    MythUIButtonList *m_recgroupList;
     MythUIButtonList *m_groupList;
     MythUIButtonList *m_recordingList;
 
     MythUIText *m_noRecordingsText;