Add a long-form description string for recording status to the Progra…

…mInfo map. This meant a minor modification to toDescription() so that we returned something sensible for programmes which weren't scheduled to record.
MythTV · Feb 15, 2012 · 2a74313 · 2a74313
1 parent 0ac5565
commit 2a74313
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 32 deletions.
diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
@@ -1528,6 +1528,9 @@ void ProgramInfo::ToMap(InfoMap &progMap,
 
     progMap["recstatus"] = ::toString(GetRecordingStatus(),
                                       GetRecordingRuleType());
+    progMap["recstatuslong"] = ::toDescription(GetRecordingStatus(),
+                                               GetRecordingRuleType(),
+                                               GetRecordingStartTime());
 
     if (IsRepeat())
     {
@@ -1609,7 +1612,8 @@ void ProgramInfo::ToMap(InfoMap &progMap,
         case kProgramInfoTypeRecording : // Fall through
         default :
             mediaType = "recording";
-            mediaTypeString = tr("Recording", "Recorded file, object not action");
+            mediaTypeString = QObject::tr("Recording",
+                                          "Recorded file, object not action");
     }
     progMap["mediatype"] = mediaType;
     progMap["mediatypestring"] = mediaTypeString;

diff --git a/mythtv/libs/libmyth/programtypes.cpp b/mythtv/libs/libmyth/programtypes.cpp
@@ -215,8 +215,12 @@ QString toString(RecStatusType recstatus, RecordingType rectype)
 }
 
 /// \brief Converts "recstatus" into a long human readable description.
-QString toDescription(RecStatusType recstatus, const QDateTime &recstartts)
+QString toDescription(RecStatusType recstatus, RecordingType rectype,
+                      const QDateTime &recstartts)
 {
+    if (rectype == kNotRecording)
+        return QObject::tr("This showing is not scheduled to record");
+
     QString message;
     QDateTime now = QDateTime::currentDateTime();
 

diff --git a/mythtv/libs/libmyth/programtypes.h b/mythtv/libs/libmyth/programtypes.h
@@ -99,7 +99,7 @@ typedef enum SkipTypes {
      * are just too many false positives from non-commercial cut scenes. */
     COMM_DETECT_2_ALL       = (COMM_DETECT_2_LOGO | COMM_DETECT_2_BLANK),
 
-    COMM_DETECT_PREPOSTROLL = 0x00000200,    
+    COMM_DETECT_PREPOSTROLL = 0x00000200,
     COMM_DETECT_PREPOSTROLL_ALL = (COMM_DETECT_PREPOSTROLL
                                    | COMM_DETECT_BLANKS
                                    | COMM_DETECT_SCENE)
@@ -144,7 +144,7 @@ typedef enum FlagMask {
 } ProgramFlag;
 
 typedef enum ProgramInfoType {
-    kProgramInfoTypeRecording = 0,    
+    kProgramInfoTypeRecording = 0,
     kProgramInfoTypeVideoFile,
     kProgramInfoTypeVideoDVD,
     kProgramInfoTypeVideoStreamingHTML,
@@ -227,7 +227,8 @@ typedef enum RecStatusTypes {
 MPUBLIC QString toUIState(RecStatusType);
 MPUBLIC QString toString(RecStatusType, uint id);
 MPUBLIC QString toString(RecStatusType, RecordingType);
-MPUBLIC QString toDescription(RecStatusType, const QDateTime &recstartts);
+MPUBLIC QString toDescription(RecStatusType, RecordingType,
+                              const QDateTime &recstartts);
 
 typedef enum AvailableStatusTypes {
     asAvailable = 0,

diff --git a/mythtv/programs/mythfrontend/schedulecommon.cpp b/mythtv/programs/mythfrontend/schedulecommon.cpp
@@ -9,7 +9,7 @@
 #include "programinfo.h"
 #include "remoteutil.h"
 
-// libmythtv 
+// libmythtv
 #include "recordinginfo.h"
 #include "tvremoteutil.h"
 
@@ -31,23 +31,23 @@ void ScheduleCommon::ShowDetails(ProgramInfo *pginfo) const
 {
     if (!pginfo)
         return;
-    
+
     MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
     ProgDetails *details_dialog  = new ProgDetails(mainStack, pginfo);
-    
+
     if (!details_dialog->Create())
     {
         delete details_dialog;
         return;
     }
-    
+
     mainStack->AddScreen(details_dialog);
 }
 
 /**
 *  \brief Show the upcoming recordings for this title
 */
-void ScheduleCommon::ShowUpcoming(const QString &title, 
+void ScheduleCommon::ShowUpcoming(const QString &title,
                                   const QString &seriesid) const
 {
     if (title.isEmpty())
@@ -106,7 +106,7 @@ void ScheduleCommon::EditRecording(ProgramInfo *pginfo)
 {
     if (!pginfo)
         return;
-    
+
     RecordingInfo ri(*pginfo);
 
     if (!ri.GetRecordingRuleID())
@@ -124,7 +124,7 @@ void ScheduleCommon::EditScheduled(ProgramInfo *pginfo)
 {
     if (!pginfo)
         return;
-    
+
     RecordingInfo ri(*pginfo);
     EditScheduled(&ri);
 }
@@ -167,10 +167,10 @@ void ScheduleCommon::MakeOverride(RecordingInfo *recinfo, bool startActive)
         return;
 
     RecordingRule *recrule = new RecordingRule();
-    
+
     if (!recrule->LoadByProgram(static_cast<ProgramInfo*>(recinfo)))
         LOG(VB_GENERAL, LOG_ERR, "Failed to load by program info");
-    
+
     if (!recrule->MakeOverride())
     {
         LOG(VB_GENERAL, LOG_ERR, "Failed to make Override");
@@ -195,21 +195,22 @@ void ScheduleCommon::MakeOverride(RecordingInfo *recinfo, bool startActive)
 void ScheduleCommon::ShowRecordingDialog(const RecordingInfo& recinfo)
 {
     QString message = recinfo.toString(ProgramInfo::kTitleSubtitle, " - ");
-    
+
     message += "\n\n";
-    message += toDescription(
-        recinfo.GetRecordingStatus(), recinfo.GetRecordingStartTime());
-
+    message += toDescription(recinfo.GetRecordingStatus(),
+                             recinfo.GetRecordingRuleType(),
+                             recinfo.GetRecordingStartTime());
+
     MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
     MythDialogBox *menuPopup = new MythDialogBox(message, popupStack,
                                                  "recOptionPopup", true);
-    
+
     if (menuPopup->Create())
     {
         menuPopup->SetReturnEvent(this, "schedulerecording");
 
         QDateTime now = QDateTime::currentDateTime();
-        
+
         if (recinfo.GetRecordingStartTime() < now &&
             recinfo.GetRecordingEndTime() > now)
         {
@@ -257,7 +258,7 @@ void ScheduleCommon::ShowRecordingDialog(const RecordingInfo& recinfo)
                                              qVariantFromValue(recinfo));
                     }
             }
-            
+
             if (recinfo.GetRecordingRuleType() != kOverrideRecord &&
                 recinfo.GetRecordingRuleType() != kDontRecord)
             {
@@ -270,7 +271,7 @@ void ScheduleCommon::ShowRecordingDialog(const RecordingInfo& recinfo)
                 {
                     menuPopup->AddButton(tr("Edit Options"),
                                          qVariantFromValue(recinfo));
-                    
+
                     if (recinfo.GetRecordingRuleType() != kSingleRecord &&
                         recinfo.GetRecordingRuleType() != kFindOneRecord)
                     {
@@ -279,7 +280,7 @@ void ScheduleCommon::ShowRecordingDialog(const RecordingInfo& recinfo)
                     }
                 }
             }
-            
+
             if (recinfo.GetRecordingRuleType() == kOverrideRecord ||
                 recinfo.GetRecordingRuleType() == kDontRecord)
             {
@@ -296,8 +297,8 @@ void ScheduleCommon::ShowRecordingDialog(const RecordingInfo& recinfo)
                                          qVariantFromValue(recinfo));
                 }
             }
-        }        
-        
+        }
+
         popupStack->AddScreen(menuPopup);
     }
     else
@@ -315,8 +316,9 @@ void ScheduleCommon::ShowNotRecordingDialog(const RecordingInfo& recinfo)
     QString message = recinfo.toString(ProgramInfo::kTitleSubtitle, " - ");
 
     message += "\n\n";
-    message += toDescription(
-        recinfo.GetRecordingStatus(), recinfo.GetRecordingStartTime());
+    message += toDescription(recinfo.GetRecordingStatus(),
+                             recinfo.GetRecordingRuleType(),
+                             recinfo.GetRecordingStartTime());
 
     if (recinfo.GetRecordingStatus() == rsConflict ||
         recinfo.GetRecordingStatus() == rsLaterShowing)
@@ -454,7 +456,7 @@ void ScheduleCommon::ShowNotRecordingDialog(const RecordingInfo& recinfo)
                                     qVariantFromValue(recinfo));
             }
         }
-        
+
         popupStack->AddScreen(menuPopup);
     }
     else
@@ -513,10 +515,10 @@ void ScheduleCommon::customEvent(QEvent *event)
         {
             if (!qVariantCanConvert<RecordingInfo>(dce->GetData()))
                 return;
-            
+
             RecordingInfo recInfo = qVariantValue<RecordingInfo>
                                                             (dce->GetData());
-            
+
             if (resulttext == tr("Reactivate"))
                 recInfo.ReactivateRecording();
             else if (resulttext == tr("Stop recording"))

diff --git a/mythtv/programs/mythfrontend/viewschedulediff.cpp b/mythtv/programs/mythfrontend/viewschedulediff.cpp
@@ -102,8 +102,9 @@ void ViewScheduleDiff::showStatus(MythUIButtonListItem *item)
 
     QString message = pi->toString(ProgramInfo::kTitleSubtitle, " - ");
     message += "\n\n";
-    message += toDescription(
-        pi->GetRecordingStatus(), pi->GetRecordingStartTime());
+    message += toDescription(pi->GetRecordingStatus(),
+                             pi->GetRecordingRuleType(),
+                             pi->GetRecordingStartTime());
 
     if (pi->GetRecordingStatus() == rsConflict ||
         pi->GetRecordingStatus() == rsLaterShowing)