Ticket #11496: previous-scheduled.diff

mythtv/programs/mythfrontend/schedulecommon.cpp

@@ -99 +99 @@
 }
 
 /**
+*  \brief Show the previous recordings for this recording rule
+*/
+void ScheduleCommon::ShowPrevious(RecordingInfo *recinfo) const
+{
+    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+    ProgLister *pl = new ProgLister(mainStack, recinfo->GetRecordingRuleID(),
+                                    recinfo->GetTitle());
+    if (pl->Create())
+        mainStack->AddScreen(pl);
+    else
+        delete pl;
+}
+
+/**
+*  \brief Show the previous recordings for this recording rule
+*/
+void ScheduleCommon::ShowPrevious(ProgramInfo *pginfo) const
+{
+    if (!pginfo)
+        return;
+
+    RecordingInfo ri(*pginfo);
+
+    ShowPrevious(&ri);
+}
+
+/**
 *  \brief Creates a dialog for editing the recording status,
 *         blocking until user leaves dialog.
 */

mythtv/programs/mythfrontend/schedulecommon.h

@@ -25 +25 @@
     void ShowUpcoming(const QString &title, const QString &seriesid) const;
     void ShowUpcoming(ProgramInfo *pginfo) const;
     void ShowUpcomingScheduled(ProgramInfo *pginfo) const;
+    void ShowPrevious(RecordingInfo *recinfo) const;
+    void ShowPrevious(ProgramInfo *pginfo) const;
     void EditRecording(ProgramInfo *pginfo);
     void EditScheduled(ProgramInfo *pginfo);
     void EditScheduled(RecordingInfo *recinfo);

mythtv/programs/mythfrontend/scheduleeditor.cpp

@@ -606 +606 @@
     if (m_recordingRule->m_type == kTemplateRecord)
         return;
 
-    QString title;
-    if (m_recInfo)
-        title = m_recInfo->GetTitle();
-    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-    ProgLister *pl = new ProgLister(mainStack, m_recordingRule->m_recordID,
-                                    title);
-    if (pl->Create())
-        mainStack->AddScreen(pl);
-    else
-        delete pl;
+    ShowPrevious(m_recInfo);
 }
 
 void ScheduleEditor::showUpcomingByRule(void)

mythtv/programs/mythfrontend/viewscheduled.cpp

@@ -168 +168 @@
             upcoming();
         else if (action == "VIEWSCHEDULED")
             upcomingScheduled();
+        else if (action == "PREVIOUS")
+            previous();
         else if (action == "DETAILS" || action == "INFO")
             details();
         else if (action == "1")
@@ -214 +216 @@
         menuPopup->AddButton(tr("Program Details"));
         menuPopup->AddButton(tr("Upcoming by title"));
         menuPopup->AddButton(tr("Upcoming scheduled"));
+        menuPopup->AddButton(tr("Previously scheduled"));
         menuPopup->AddButton(tr("Custom Edit"));
         menuPopup->AddButton(tr("Delete Rule"));
         menuPopup->AddButton(tr("Show Cards"));
@@ -606 +609 @@
     //EmbedTVWindow();
 }
 
+void ViewScheduled::previous()
+{
+    MythUIButtonListItem *item = m_schedulesList->GetItemCurrent();
+    if (!item)
+        return;
+
+    ProgramInfo *pginfo = qVariantValue<ProgramInfo*>(item->GetData());
+
+    ShowPrevious(pginfo);
+
+    //FIXME:
+    //EmbedTVWindow();
+}
+
 void ViewScheduled::details()
 {
     MythUIButtonListItem *item = m_schedulesList->GetItemCurrent();
@@ -742 +759 @@
             {
                 upcomingScheduled();
             }
+            else if (resulttext == tr("Previously scheduled"))
+            {
+                previous();
+            }
             else if (resulttext == tr("Custom Edit"))
             {
                 customEdit();

mythtv/programs/mythfrontend/viewscheduled.h

@@ -46 +46 @@
     void deleteRule();
     void upcoming();
     void upcomingScheduled();
+    void previous();
     void details();
     void selected(MythUIButtonListItem *);
     void updateInfo(MythUIButtonListItem *);