From 3338a7eb5f61f8620655d65bd1d12a402e433ebb Mon Sep 17 00:00:00 2001
From: Stuart Morgan <smorgan@mythtv.org>
Date: Sun, 24 Jul 2011 18:02:04 +0100
Subject: [PATCH] Fix display of recording start date in MythCenter

---
 mythtv/libs/libmyth/programinfo.cpp             |  6 ++++--
 mythtv/themes/MythCenter-wide/recordings-ui.xml | 16 ++++++++--------
 mythtv/themes/MythCenter/recordings-ui.xml      |  8 ++++----
 mythtv/themes/default-wide/recordings-ui.xml    |  4 ++--
 mythtv/themes/default/recordings-ui.xml         |  4 ++--
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
index 7810c08cad1..699ea984f2f 100644
--- a/mythtv/libs/libmyth/programinfo.cpp
+++ b/mythtv/libs/libmyth/programinfo.cpp
@@ -1386,9 +1386,11 @@ void ProgramInfo::ToMap(InfoMap &progMap,
     else // if (IsRecording())
     {
         progMap["starttime"] = MythDateTimeToString(startts, kTime);
-        progMap["startdate"] = MythDateTimeToString(startts, kDateShort);
+        progMap["startdate"] = MythDateTimeToString(startts, kDateFull | kSimplify);
+        progMap["shortstartdate"] = MythDateTimeToString(startts, kDateShort);
         progMap["endtime"] = MythDateTimeToString(endts, kTime);
-        progMap["enddate"] = MythDateTimeToString(endts, kDateShort);
+        progMap["enddate"] = MythDateTimeToString(endts, kDateFull | kSimplify);
+        progMap["shortenddate"] = MythDateTimeToString(endts, kDateShort);
         progMap["recstarttime"] = MythDateTimeToString(recstartts, kTime);
         progMap["recstartdate"] = MythDateTimeToString(recstartts, kDateShort);
         progMap["recendtime"] = MythDateTimeToString(recendts, kTime);
diff --git a/mythtv/themes/MythCenter-wide/recordings-ui.xml b/mythtv/themes/MythCenter-wide/recordings-ui.xml
index a5b99889ff8..a6a9e416d8a 100644
--- a/mythtv/themes/MythCenter-wide/recordings-ui.xml
+++ b/mythtv/themes/MythCenter-wide/recordings-ui.xml
@@ -129,11 +129,11 @@
                         <area>32,2,656,28</area>
                         <align>vcenter</align>
                     </textarea>
-                    <textarea name="shortdate" from="titlesubtitle">
+                    <textarea name="shortstartdate" from="titlesubtitle">
                         <area>634,2,120,28</area>
                         <align>right,vcenter</align>
                     </textarea>
-                    <textarea name="starttime" from="shortdate">
+                    <textarea name="starttime" from="shortstartdate">
                         <area>760,2,114,28</area>
                         <align>right,vcenter</align>
                     </textarea>
@@ -171,11 +171,11 @@
                         <font state="running">basesmall_running_selected</font>
                         <align>vcenter</align>
                     </textarea>
-                    <textarea name="shortdate" from="titlesubtitle">
+                    <textarea name="shortstartdate" from="titlesubtitle">
                         <area>634,2,120,28</area>
                         <align>right,vcenter</align>
                     </textarea>
-                    <textarea name="starttime" from="shortdate">
+                    <textarea name="starttime" from="shortstartdate">
                         <area>760,2,114,28</area>
                         <align>right,vcenter</align>
                     </textarea>
@@ -452,11 +452,11 @@
                         <area>32,2,656,28</area>
                         <align>vcenter</align>
                     </textarea>
-                    <textarea name="shortdate" from="titlesubtitle">
+                    <textarea name="shortstartdate" from="titlesubtitle">
                         <area>634,2,120,28</area>
                         <align>right,vcenter</align>
                     </textarea>
-                    <textarea name="filesize_str" from="shortdate">
+                    <textarea name="filesize_str" from="shortstartdate">
                         <area>760,2,114,28</area>
                         <align>right,vcenter</align>
                     </textarea>
@@ -494,11 +494,11 @@
                         <font state="running">basesmall_running_selected</font>
                         <align>vcenter</align>
                     </textarea>
-                    <textarea name="shortdate" from="titlesubtitle">
+                    <textarea name="shortstartdate" from="titlesubtitle">
                         <area>634,2,120,28</area>
                         <align>right,vcenter</align>
                     </textarea>
-                    <textarea name="filesize_str" from="shortdate">
+                    <textarea name="filesize_str" from="shortstartdate">
                         <area>760,2,114,28</area>
                         <align>right,vcenter</align>
                     </textarea>
diff --git a/mythtv/themes/MythCenter/recordings-ui.xml b/mythtv/themes/MythCenter/recordings-ui.xml
index 8ae5358a44c..da2ee854f89 100644
--- a/mythtv/themes/MythCenter/recordings-ui.xml
+++ b/mythtv/themes/MythCenter/recordings-ui.xml
@@ -100,12 +100,12 @@
                         <area>15,1,370,24</area>
                         <font>basesmallboldblue</font>
                     </textarea>
-                    <textarea name="shortdate" from="titlesubtitle">
+                    <textarea name="shortstartdate" from="titlesubtitle">
                         <area>340,1,100,24</area>
                         <align>right</align>
                         <font>basesmallboldblue</font>
                     </textarea>
-                    <textarea name="starttime" from="shortdate">
+                    <textarea name="starttime" from="shortstartdate">
                         <area>450,1,95,24</area>
                         <align>right</align>
                         <font>basesmallboldblue</font>
@@ -131,12 +131,12 @@
                         <font>basesmallbold</font>
                         <font state="normal">basesmalllightgrey</font>
                     </textarea>
-                    <textarea name="shortdate" from="titlesubtitle">
+                    <textarea name="shortstartdate" from="titlesubtitle">
                         <area>340,1,100,24</area>
                         <align>right</align>
                         <font>basesmallbold</font>
                     </textarea>
-                    <textarea name="starttime" from="shortdate">
+                    <textarea name="starttime" from="shortstartdate">
                         <area>450,1,95,24</area>
                         <align>right</align>
                         <font>basesmallbold</font>
diff --git a/mythtv/themes/default-wide/recordings-ui.xml b/mythtv/themes/default-wide/recordings-ui.xml
index 285b417a4a7..508f82d2972 100644
--- a/mythtv/themes/default-wide/recordings-ui.xml
+++ b/mythtv/themes/default-wide/recordings-ui.xml
@@ -83,11 +83,11 @@
                     <textarea name="titlesubtitle" from="buttontext">
                         <area>35,-2,652,28</area>
                     </textarea>
-                    <textarea name="shortdate" from="titlesubtitle">
+                    <textarea name="shortstartdate" from="titlesubtitle">
                         <area>635,-2,120,28</area>
                         <align>right</align>
                     </textarea>
-                    <textarea name="starttime" from="shortdate">
+                    <textarea name="starttime" from="shortstartdate">
                         <area>761,-2,114,28</area>
                         <align>right</align>
                     </textarea>
diff --git a/mythtv/themes/default/recordings-ui.xml b/mythtv/themes/default/recordings-ui.xml
index 511836004c6..fb19e45f5d0 100644
--- a/mythtv/themes/default/recordings-ui.xml
+++ b/mythtv/themes/default/recordings-ui.xml
@@ -83,11 +83,11 @@
                     <textarea name="titlesubtitle" from="buttontext">
                         <area>32,1,328,24</area>
                     </textarea>
-                    <textarea name="shortdate" from="titlesubtitle">
+                    <textarea name="shortstartdate" from="titlesubtitle">
                         <area>365,1,100,24</area>
                         <align>right</align>
                     </textarea>
-                    <textarea name="starttime" from="shortdate">
+                    <textarea name="starttime" from="shortstartdate">
                         <area>465,1,80,24</area>
                         <align>right</align>
                     </textarea>