Ticket #3740: upcoming.patch

mythtv/programs/mythfrontend/viewscheduled.cpp

@@ -58 +58 @@
         exit(FRONTEND_BUGGY_EXIT_NO_SELECTOR);
     }
 
-    updateBackground();
+    curView = -1;
+    fillViewList("time");
+
+    if (curView < 0)
+        QApplication::postEvent(this, new MythEvent("CHOOSE_VIEW"));
+
 
     inEvent = false;
     inFill = false;
@@ -70 +75 @@
     maxinput = 0;
     listPos  = 0;
     FillList();
+
+    updateBackground();
  
     setNoErase();
 
@@ -127 +134 @@
                 setShowAll(true);
             else if (action == "2")
                 setShowAll(false);
+
+            else if (action == "4")
+            {
+                if (viewList[curView] == "sort by time")
+                    curView = viewList.findIndex("reverse time");
+                else
+                    curView = viewList.findIndex("sort by time");
+
+                needFill = true;
+            }
+            else if (action == "5")
+            {
+                if (viewList[curView] == "sort by title")
+                    curView = viewList.findIndex("reverse title");
+                else
+                    curView = viewList.findIndex("sort by title");
+
+                needFill = true;
+            }
+
             else if (action == "PREVVIEW" || action == "NEXTVIEW")
                 setShowAll(!showAll);
             else if (action == "VIEWCARD")
@@ -254 +281 @@
     }
 }
 
+class pbTitleSort
+{
+    public:
+        pbTitleSort(bool reverseSort = false) {m_reverse = reverseSort;}
+
+        bool operator()(const ProgramInfo *a, const ProgramInfo *b)
+        {
+            if (a->sortTitle == b->sortTitle)
+            {
+                if (a->programid == b->programid)
+                    return (a->startts < b->startts);
+                else
+                    return (a->programid < b->programid);
+            }
+            else if (m_reverse)
+                return (a->sortTitle > b->sortTitle);
+            else
+                return (a->sortTitle < b->sortTitle);
+        }
+
+    private:
+        bool m_reverse;
+};
+
+class pbTimeSort
+{
+    public:
+        pbTimeSort(bool reverseSort = false) {m_reverse = reverseSort;}
+
+        bool operator()(const ProgramInfo *a, const ProgramInfo *b)
+        {
+            if (m_reverse)
+                return (a->startts > b->startts);
+            else
+                return (a->startts < b->startts);
+        }
+
+    private:
+        bool m_reverse;
+};
+
+
 void ViewScheduled::FillList(void)
 {
     inFill = true;
@@ -303 +372 @@
         }
     }
 
+    if (recList.count() > 0) {
+        // Sort the list
+        ProgramInfo *s = recList.first();
+        vector<ProgramInfo *> sortedList;
+        while (recList.count())
+        {
+            s = recList.take();
+            s->sortTitle = s->title;
+            s->sortTitle.remove(QRegExp("^(The |A |An )"));
+            sortedList.push_back(s);
+        }
+
+        if (viewList[curView] == "reverse time")
+            sort(sortedList.begin(), sortedList.end(), pbTimeSort(true));
+        else if (viewList[curView] == "sort by time")
+            sort(sortedList.begin(), sortedList.end(), pbTimeSort(false));
+        else if (viewList[curView] == "reverse title")
+            sort(sortedList.begin(), sortedList.end(), pbTitleSort(true));
+        else
+            sort(sortedList.begin(), sortedList.end(), pbTitleSort(false));
+
+        vector<ProgramInfo *>::iterator i = sortedList.begin();
+        for (; i != sortedList.end(); i++)
+            recList.append(*i);
+    }
+
     if (!callsign.isNull())
     {
         listPos = recList.count() - 1;
@@ -520 +615 @@
         UITextType *type = (UITextType *)container->GetType("showlevel");
         if (type)
         {
+            QString newtag;
+
+            if (viewList[curView] == "sort by time")
+                newtag += "+Time";
+            else if (viewList[curView] == "reverse time")
+                newtag += "-Time";
+            else if (viewList[curView] == "sort by title")
+                newtag += "+Title";
+            else if (viewList[curView] == "reverse title")
+                newtag += "-Title";
+
             if (showAll)
-                type->SetText(tr("All"));
+                newtag += " All";
             else
-                type->SetText(tr("Important"));
+                newtag += " Important";
+
+
+            type->SetText(tr(newtag));
         }
     }
 
@@ -676 +785 @@
         p->showDetails();
 }
 
+void ViewScheduled::fillViewList(const QString &view)
+{
+    viewList.clear();
+    viewTextList.clear();
+
+    viewList << "sort by time";
+    viewTextList << tr("Sort by Time");
+
+    viewList << "reverse time";
+    viewTextList << tr("Reverse Time");
+
+    viewList << "sort by title";
+    viewTextList << tr("Sort by Title");
+
+    viewList << "reverse title";
+    viewTextList << tr("Reverse Title");
+
+    curView = viewList.findIndex(view);
+
+    if (curView < 0)
+        curView = 0;
+}
+
 void ViewScheduled::selected()
 {
     ProgramInfo *p = recList[listPos];

mythtv/programs/mythfrontend/viewscheduled.h

@@ -70 +70 @@
     int listsize;
 
     bool showAll;
+    int curView;
+    QStringList viewList;
+    QStringList viewTextList;
+
+    MythPopupBox *choosePopup;
+    MythListBox *chooseListBox;
+    void fillViewList(const QString &view);
+
+
 
     bool inEvent;
     bool inFill;