Ticket #6813: 033-showwatched.1.patch

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -324 +324 @@
         drawTransPixmap = new QPixmap();
 
     episodeSort = gContext->GetSetting("PlayBoxEpisodeSort", "Date");
+    showWatched = gContext->GetNumSetting("ShowWatched", 1);
 
     bool displayCat  = gContext->GetNumSetting("DisplayRecGroupIsCategory", 0);
     int  initialFilt = gContext->GetNumSetting("QueryInitialFilter", 0);
@@ -810 +811 @@
     LayerSet *container = theme->GetSet("sortorder_info");
     if (container)
     {
+        UITextType *type1 = (UITextType *)container->GetType("showwatched");
+        if (type1)
+        {
+            QString newtag = "(4) ";
+            if (showWatched)
+               newtag += "Hide Watched";
+            else
+               newtag += "Show Watched";
+            type1->SetText(tr(newtag));
+        }
+
         UITextType *type = (UITextType *)container->GetType("sortorder");
         if (type)
         {
@@ -1914 +1926 @@
             tmpsubtitle.remove(QRegExp("^(The |A |An )"));
             p->sortTitle = tmptitle + " - " + tmpsubtitle;
 
-            if ((((p->recgroup == recGroup) ||
+            if ((showWatched || (! (p->programflags & FL_WATCHED))) &&
+               ( (((p->recgroup == recGroup) ||
                   ((recGroup == "All Programs") &&
                    (p->recgroup != "Deleted") &&
                    (p->recgroup != "LiveTV" || LiveTVInAllPrograms))) &&
@@ -1922 +1935 @@
                 ((recGroupType[recGroup] == "category") &&
                  ((p->category == recGroup ) ||
                   ((p->category == "") && (recGroup == tr("Unknown")))) &&
-                 ( !recGroupPwCache.contains(p->recgroup))))
+                 ( !recGroupPwCache.contains(p->recgroup)))))
             {
                 if (viewMask != VIEW_NONE)
                     progLists[""].prepend(p);
@@ -4370 +4383 @@
             paintSkipUpdate = false;
             update(drawTotalBounds);
         }
+        else if (action == "4")
+        {
+            showWatched = ! showWatched;
+            gContext->SaveSetting("ShowWatched", (int)showWatched);
+            connected = FillList(true); 
+            paintSkipUpdate = false;
+            update(drawTotalBounds);
+        }
+
         else if (action == "MENU")
             showMenu();
         else if (action == "NEXTFAV")

mythtv/programs/mythfrontend/playbackbox.h

@@ -350 +350 @@
     QString             formatTime;
 
     QString             episodeSort;
+    bool                showWatched;
+    
     /// titleView controls showing titles in group list
     bool                titleView;
     /// useCategories controls showing categories in group list