Ticket #6813: 032-watchrec.sort.1.patch

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -60 +60 @@
 
 const uint PlaybackBox::previewGeneratorMaxRunning = 2;
 
+static int comp_title(ProgramInfo *a, ProgramInfo *b)
+{
+    if (a->sortTitle == b->sortTitle)
+    {
+        return (a->recstartts < b->recstartts ? 1 : -1);
+    }
+    else
+        return (a->sortTitle < b->sortTitle ? 1 : -1);
+}
+
+static int comp_title_rev(ProgramInfo *a, ProgramInfo *b)
+{
+    return comp_title(b, a);
+}
+
 static int comp_programid(ProgramInfo *a, ProgramInfo *b)
 {
     if (a->programid == b->programid)
@@ -246 +261 @@
       drawListBounds(0, 0, 0, 0),       drawInfoBounds(0, 0, 0, 0),
       drawGroupBounds(0, 0, 0, 0),      drawUsageBounds(0, 0, 0, 0),
       drawVideoBounds(0, 0, 0, 0),      blackholeBounds(0, 0, 0, 0),
-      drawCurGroupBounds(0, 0, 0, 0),
+      drawCurGroupBounds(0, 0, 0, 0),   drawSortOrderBounds(0, 0, 0, 0),
       // General popup support
       popup(NULL),                      expectingPopup(false),
       // Recording Group popup support
@@ -308 +323 @@
     if (!drawTransPixmap)
         drawTransPixmap = new QPixmap();
 
+    episodeSort = gContext->GetSetting("PlayBoxEpisodeSort", "Date");
+
     bool displayCat  = gContext->GetNumSetting("DisplayRecGroupIsCategory", 0);
     int  initialFilt = gContext->GetNumSetting("QueryInitialFilter", 0);
 
@@ -597 +614 @@
         drawUsageBounds = area;
     if (name.lower() == "cur_group")
         drawCurGroupBounds = area;
+    if (name.lower() == "sortorder_info")
+        drawSortOrderBounds = area;
 
 }
 
@@ -707 +726 @@
         updateUsage(&p);
     }
 
+    if (r.intersects(drawSortOrderBounds) && !paintSkipUpdate)
+    {
+        updateSortOrder(&p);
+    }
+
     if (r.intersects(drawVideoBounds) && !paintSkipUpdate)
     {
         updateVideo(&p);
@@ -776 +800 @@
     }
 }
 
+void PlaybackBox::updateSortOrder(QPainter *p)
+{
+    QRect pr = drawSortOrderBounds;
+    QPixmap pix(pr.size());
+    pix.fill(this, pr.topLeft());
+    QPainter tmp(&pix);
+
+    LayerSet *container = theme->GetSet("sortorder_info");
+    if (container)
+    {
+        UITextType *type = (UITextType *)container->GetType("sortorder");
+        if (type)
+        {
+            QString newtag = "(2) " + episodeSort;
+            type->SetText(tr(newtag));
+        }
+    }
+
+    if (container)
+    {
+        container->Draw(&tmp, 4, 0);
+        container->Draw(&tmp, 5, 0);
+        container->Draw(&tmp, 6, 0);
+        container->Draw(&tmp, 7, 0);
+        container->Draw(&tmp, 8, 0);
+    }
+
+    tmp.end();
+    p->drawPixmap(pr.topLeft(), pix);
+}
+
 
 void PlaybackBox::updateGroupInfo(QPainter *p, QRect& pr,
                                   QPixmap& pix, QString cont_name)
@@ -1852 +1907 @@
             if (p->title == "")
                 p->title = tr("_NO_TITLE_");
 
+            // Set sortTitle
+            QString tmptitle = p->title;
+            QString tmpsubtitle = p->subtitle;
+            tmptitle.remove(QRegExp("^(The |A |An )"));
+            tmpsubtitle.remove(QRegExp("^(The |A |An )"));
+            p->sortTitle = tmptitle + " - " + tmpsubtitle;
+
             if ((((p->recgroup == recGroup) ||
                   ((recGroup == "All Programs") &&
                    (p->recgroup != "Deleted") &&
@@ -1974 +2036 @@
         return 0;
     }
 
-    QString episodeSort = gContext->GetSetting("PlayBoxEpisodeSort", "Date");
-
     if (episodeSort == "OrigAirDate")
     {
         QMap<QString, ProgramList>::Iterator Iprog;
@@ -2018 +2078 @@
             }
         }
     }
+    else if (episodeSort == "Title")
+    {
+        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_title_rev);
+                else
+                    Iprog.data().Sort(comp_title);
+            }
+        }
+    }
 
     if (progLists[watchGroupLabel].count() > 1)
     {
@@ -2278 +2352 @@
                             if (oldprogramid > p->programid)
                                 break;
                         }
-                        else
+                        else if (episodeSort == "Date")
                         {
                             if (oldstartts > p->recstartts)
                                 break;
                         }
+                        else
+                        {
+                            if (oldsTitle > sTitle)
+                                break;
+                        }
                     }
                     else
                     {
@@ -2296 +2375 @@
                             if (oldprogramid < p->programid)
                                 break;
                         }
-                        else
+                        else if (episodeSort == "Date")
                         {
                             if (oldstartts < p->recstartts)
                                 break;
                         }
+                        else
+                        {
+                            if (oldsTitle > sTitle)
+                                break;
+                        }
                     }
                 }
             }
@@ -4269 +4353 @@
             exitWin();
         else if (action == "1" || action == "HELP")
             showIconHelp();
+        else if (action == "2")
+        {
+            // Update Sort Order
+            if (episodeSort == "OrigAirDate") {
+                episodeSort = "Id";
+            } else if (episodeSort == "Id") {
+                episodeSort = "Title";
+            } else if (episodeSort == "Title") {
+                episodeSort = "Date";
+            } else { /* (episodeSort == "Date") */
+                episodeSort = "OrigAirDate";
+            }
+
+            connected = FillList(true); 
+            paintSkipUpdate = false;
+            update(drawTotalBounds);
+        }
         else if (action == "MENU")
             showMenu();
         else if (action == "NEXTFAV")

mythtv/programs/mythfrontend/playbackbox.h

@@ -332 +332 @@
     void updateShowTitles(QPainter *);
     void updateInfo(QPainter *);
     void updateUsage(QPainter *);
+    void updateSortOrder(QPainter *);
     void updateProgramInfo(QPainter *p, QRect& pr, QPixmap& pix);
     void updateCurGroup(QPainter *p);
     void updateGroupInfo(QPainter *p, QRect& pr, QPixmap& pix,
@@ -347 +348 @@
     QString             formatShortDate;
     QString             formatLongDate;
     QString             formatTime;
+
+    QString             episodeSort;
     /// titleView controls showing titles in group list
     bool                titleView;
     /// useCategories controls showing categories in group list
@@ -401 +404 @@
     QRect               drawVideoBounds;
     QRect               blackholeBounds;
     QRect               drawCurGroupBounds;
+    QRect               drawSortOrderBounds;
 
     // Popup support //////////////////////////////////////////////////////////
     // General popup support