Ticket #1771: PlayBoxAllOrdering5b.patch

programs/mythfrontend/playbackbox.cpp

@@ -169 +169 @@
     return sTitle;
 }
 
+static int comp_recordDate(ProgramInfo *a, ProgramInfo *b)
+{
+    if (a->startts.date() == b->startts.date())
+        return (a->recstartts < b->recstartts ? 1 : -1);
+    else
+        return (a->startts.date() < b->startts.date() ? 1 : -1);
+}
+
+static int comp_recordDate_rev(ProgramInfo *a, ProgramInfo *b)
+{
+    if (a->startts.date() == b->startts.date())
+        return (a->recstartts > b->recstartts ? 1 : -1);
+    else
+        return (a->startts.date() > b->startts.date() ? 1 : -1);
+}
+
 PlaybackBox::PlaybackBox(BoxType ltype, MythMainWindow *parent, 
                          const char *name)
     : MythDialog(parent, name),
@@ -265 +281 @@
     titleList << "";
     playList.clear();
 
+    // Split out sort order modes
+    // Done using a switch instead of a bit-map to maintain
+    // backward compatibility
+    switch (listOrder) {
+      case 0:
+        allOrder = 0;
+        break;
+      case 1:
+        allOrder = 1;
+        break;
+      case 2:
+        listOrder = 1;
+        allOrder = 0;
+        break;
+      case 3:
+        listOrder = 0;
+        allOrder = 1;
+        break;
+    }
+
     // recording group stuff
     recGroupType.clear();
     recGroupType[recGroup] = (displayCat) ? "category" : "recgroup";
@@ -1503 +1539 @@
     {
         clearProgramCache();
 
-        progCache = RemoteGetRecordedList(listOrder == 0 || type == Delete);
+        progCache = RemoteGetRecordedList(allOrder == 0 || type == Delete);
     }
 
     if (progCache)
@@ -1666 +1702 @@
             }
         }
     }
+    else if (episodeSort == "Date")
+    {
+        QMap<QString, ProgramList>::Iterator Iprog;
+        for (Iprog = progLists.begin(); Iprog != progLists.end(); ++Iprog)
+        {
+            if (!Iprog.key().isEmpty())
+            {
+                if (listOrder == 0 || type == Delete)
+                    Iprog.data().Sort(comp_recordDate_rev);
+                else
+                    Iprog.data().Sort(comp_recordDate);
+            }
+        }
+    }
+
     if (progLists[watchGroup].count() > 1)
     {
         QDateTime now = QDateTime::currentDateTime();
@@ -1869 +1920 @@
 
             if (oldtitle != watchGroup)
             {
-                if (listOrder == 0 || type == Delete)
+                if (titleIndex == 0)
                 {
-                    if (episodeSort == "OrigAirDate" && titleIndex > 0)
+                    if (allOrder == 0 || type == Delete)
                     {
-                        if (oldoriginalAirDate > p->originalAirDate)
+                        if (oldstartts > p->recstartts)
                             break;
                     }
-                    else if (episodeSort == "Id" && titleIndex > 0)
-                    {
-                        if (oldprogramid > p->programid)
-                            break;
+                    else {
+                        if (oldstartts < p->recstartts)
+                            break;  
                     }
-                    else 
-                    {
-                        if (oldstartts > p->recstartts)
-                            break;
-                    }
                 }
                 else
                 {
-                    if (episodeSort == "OrigAirDate" && titleIndex > 0)
+                    if (listOrder == 0 || type == Delete)
                     {
-                        if (oldoriginalAirDate < p->originalAirDate)
-                            break;
+                        if (episodeSort == "OrigAirDate")
+                        {
+                            if (oldoriginalAirDate > p->originalAirDate)
+                                break;
+                        }
+                        else if (episodeSort == "Id")
+                        {
+                            if (oldprogramid > p->programid)
+                                break;
+                        }
+                        else 
+                        {
+                            if (oldstartts > p->recstartts)
+                                break;
+                        }
                     }
-                    else if (episodeSort == "Id" && titleIndex > 0)
-                    {
-                        if (oldprogramid < p->programid)
-                            break;
-                    }
                     else
                     {
-                        if (oldstartts < p->recstartts)
-                            break;
+                        if (episodeSort == "OrigAirDate")
+                        {
+                            if (oldoriginalAirDate < p->originalAirDate)
+                                break;
+                        }
+                        else if (episodeSort == "Id")
+                        {
+                            if (oldprogramid < p->programid)
+                                break;
+                        }
+                        else
+                        {
+                            if (oldstartts < p->recstartts)
+                                break;
+                        }
                     }
                 }
             }

programs/mythfrontend/globalsettings.cpp

@@ -704 +704 @@
     return vcg;
 }
 
-static HostCheckBox *PlayBoxOrdering()
+static HostComboBox *PlayBoxOrdering()
 {
-    HostCheckBox *gc = new HostCheckBox("PlayBoxOrdering");
-    gc->setLabel(QObject::tr("List Newest Recording First"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("When enabled, the most recent recording "
-                    "will be listed first in the 'Watch Recordings' "
-                    "screen, otherwise the oldest recording will be "
-                    "listed first."));
+    HostComboBox *gc = new HostComboBox("PlayBoxOrdering");
+    gc->setLabel(QObject::tr("(sub)Title sort order"));
+    gc->addSelection(QObject::tr("Sort all sub-titles/multi-titles Ascending"), "0");
+    gc->addSelection(QObject::tr("Sort all sub-titles/multi-titles Descending"), "1");
+    gc->addSelection(QObject::tr("Sort sub-titles Descending, multi-titles Ascending"), "2");
+    gc->addSelection(QObject::tr("Sort sub-titles Ascending, multi-titles Descending"), "3");
+    gc->setValue(1);
+    gc->setHelpText(QObject::tr("Selects how to sort show episodes. "
+                                "Sub-titles refers to the episodes listed "
+                                "under a specific show title. "
+                                "multi-title refers to sections "
+                                "(e.g. \"All Programs\") which list "
+                                "multiple titles.  Sections in parentheses "
+                                "are not affected."));
     return gc;
 }
 

programs/mythfrontend/playbackbox.h

@@ -326 +326 @@
     bool                arrowAccel;
     /// if true keypress events are ignored  
     bool                ignoreKeyPressEvents;
+    /// allOrder controls the ordering of the "All Programs" list
+    int                 allOrder;
     /// listOrder controls the ordering of the recordings in the list
     int                 listOrder;
     /// Number of items in selector that can be shown on the screen at once