Ticket #6318: recGroup-cycle.patch

programs/mythfrontend/playbackbox.cpp

@@ -345 +345 @@
     }
 
     // recording group stuff
+    m_recGroupIdx = -1;
     m_recGroupType.clear();
     m_recGroupType[m_recGroup] = (displayCat) ? "category" : "recgroup";
     if (m_groupnameAsAllProg)
@@ -1428 +1429 @@
         m_titleList << tr("LiveTV");
     m_titleList << sortedList.values();
 
+    // Populate list of recording groups
+    if (m_progCache)
+    {
+        QString current_recGroup;
+        QString name;
+
+        m_recGroups.clear();
+        m_recGroupIdx = -1;
+
+        m_recGroups.append("All Programs");
+
+        MSqlQuery query(MSqlQuery::InitCon());
+
+        query.prepare("SELECT distinct recgroup from recorded WHERE "
+                      "deletepending = 0 ORDER BY recgroup");
+        if (query.exec())
+        {
+            while (query.next())
+            {
+                name = query.value(0).toString();
+                if (name != "Deleted" && name != "LiveTV")
+                    m_recGroups.append(name);
+            }
+
+            if (m_recGroups.contains(m_recGroup))
+                current_recGroup = m_recGroup;
+            else if (m_recGroupIdx >= 0 && m_recGroupIdx < m_recGroups.size())
+                current_recGroup = m_recGroups[m_recGroupIdx];
+            else
+                current_recGroup = "All Programs";
+
+            if ((m_recGroupIdx = m_recGroups.indexOf(current_recGroup)) < 0)
+                m_recGroupIdx = 0;
+        }
+    }
+
     updateGroupList();
     updateUsage();
 
@@ -3147 +3184 @@
             m_viewMask = m_viewMaskToggle(m_viewMask, VIEW_TITLES);
             m_connected = FillList(true);
         }
+        else if (action == "PAGERIGHT")
+        {
+            if (m_recGroupIdx >= 0 && !m_recGroups.empty())
+            {
+                if (++m_recGroupIdx >= m_recGroups.size())
+                    m_recGroupIdx = 0;
+                displayRecGroup(m_recGroups[m_recGroupIdx]);
+            }
+        }
+        else if (action == "PAGELEFT")
+        {
+            if (m_recGroupIdx >= 0 && !m_recGroups.empty())
+            {
+                if (--m_recGroupIdx < 0)
+                    m_recGroupIdx = m_recGroups.size() - 1;
+                displayRecGroup(m_recGroups[m_recGroupIdx]);
+            }
+        }
         else if (action == "CHANGERECGROUP")
             showGroupFilter();
         else if (action == "CHANGEGROUPVIEW")

programs/mythfrontend/playbackbox.h

@@ -373 +373 @@
     int                 m_progsInDB;  ///< total number of recordings in DB
     bool                m_isFilling;
 
+    QStringList         m_recGroups;
+    int                 m_recGroupIdx;
+
     // Other state
     /// Program currently selected for deletion
     ProgramInfo *m_delItem;