Ticket #1771: PlayBoxAllOrdering.patch

programs/mythfrontend/playbackbox.cpp

@@ -172 +172 @@
     formatTime         = gContext->GetSetting("TimeFormat", "h:mm AP");
     recGroup           = gContext->GetSetting("DisplayRecGroup","All Programs");
     listOrder          = gContext->GetNumSetting("PlayBoxOrdering", 1);
+    allOrder           = gContext->GetNumSetting("PlayBoxAllOrdering", 1);
     groupnameAsAllProg = gContext->GetNumSetting("DispRecGroupAsAllProg", 0);
     arrowAccel         = gContext->GetNumSetting("UseArrowAccels", 1);
     inTitle            = gContext->GetNumSetting("PlaybackBoxStartInTitle", 0);
@@ -1377 +1378 @@
     bool LiveTVInAllPrograms = gContext->GetNumSetting("LiveTVInAllPrograms",0);
 
     vector<ProgramInfo *> *infoList;
-    infoList = RemoteGetRecordedList(listOrder == 0 || type == Delete);
+    infoList = RemoteGetRecordedList(allOrder == 0 || type == Delete);
     if (infoList)
     {
         sortedList[""] = "";
@@ -1517 +1518 @@
         {
             p = l->at(i);
 
-            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

@@ -670 +670 @@
     return gc;
 }
 
+static HostCheckBox *PlayBoxAllOrdering()
+{
+    HostCheckBox *gc = new HostCheckBox("PlayBoxAllOrdering");
+    gc->setLabel(QObject::tr("All Programs: List Newest Recording First"));
+    gc->setValue(true);
+    gc->setHelpText(QObject::tr("When enabled, the most recent recording "
+                    "will be listed first in the 'All Programs' or 'Default' "
+                    "section of the 'Watch Recordings' screen, otherwise "
+                    "the oldest recording will be listed first."));
+    return gc;
+}
+
 static HostComboBox *PlayBoxEpisodeSort()
 {
     HostComboBox *gc = new HostComboBox("PlayBoxEpisodeSort");
@@ -3266 +3278 @@
     VerticalConfigurationGroup* pbox = new VerticalConfigurationGroup(false);
     pbox->setLabel(QObject::tr("View Recordings"));
     pbox->addChild(PlayBoxOrdering());
+    pbox->addChild(PlayBoxAllOrdering());
     pbox->addChild(PlayBoxEpisodeSort());
     pbox->addChild(GeneratePreviewPixmaps());
     pbox->addChild(PreviewPixmapOffset());

programs/mythfrontend/playbackbox.h

@@ -294 +294 @@
     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