Ticket #6318: recGroup-ui-v4.patch

programs/mythfrontend/playbackbox.cpp

@@ -474 +474 @@
     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"));
 
@@ -491 +492 @@
         return false;
     }
 
+    if (m_recgroupList)
+        m_recgroupList->SetCanTakeFocus(false);
+
     connect(m_groupList, SIGNAL(itemSelected(MythUIButtonListItem*)),
             SLOT(updateRecList(MythUIButtonListItem*)));
     connect(m_groupList, SIGNAL(itemClicked(MythUIButtonListItem*)),
@@ -993 +997 @@
     }
 }
 
+/*
+ * \fn PlaybackBox::updateUIRecGroupList(void)
+ * \brief called when the list of recording groups may have changed
+ */
+void PlaybackBox::UpdateUIRecGroupList(void)
+{
+    if (m_recGroupIdx < 0 || !m_recgroupList || m_recGroups.size() < 2)
+        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::UpdateUIGroupList(const QStringList &groupPreferences)
 {
     m_groupList->Reset();
@@ -1235 +1273 @@
     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);
@@ -1678 +1718 @@
         }
     }
 
+    UpdateUIRecGroupList();
     UpdateUIGroupList(groupSelPref);
     UpdateUsageUI();
 

programs/mythfrontend/playbackbox.h

@@ -259 +259 @@
   private:
     bool UpdateUILists(void);
     void UpdateUIGroupList(const QStringList &groupPreferences);
+    void UpdateUIRecGroupList(void);
 
     void UpdateProgressBar(void);
 
@@ -323 +324 @@
     QString CreateProgramInfoString(const ProgramInfo &program) const;
 
   private:
+    MythUIButtonList *m_recgroupList;
     MythUIButtonList *m_groupList;
     MythUIButtonList *m_recordingList;