From 4951ac1b2721a4baf8f23cb4a8bb62cbd6efcb3d Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mythtv.org>
Date: Thu, 4 Jul 2013 12:14:09 +1000
Subject: [PATCH] Change theme widget names to be a bit more universal

Was too focused on playing music, a legacy from originally using the miniplayer theme
---
 .../libmythui/mythuinotificationcenter.cpp    | 10 +++----
 mythtv/themes/default/notification-ui.xml     | 28 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/mythtv/libs/libmythui/mythuinotificationcenter.cpp b/mythtv/libs/libmythui/mythuinotificationcenter.cpp
index 3e5e403284f..73ae45bac62 100644
--- a/mythtv/libs/libmythui/mythuinotificationcenter.cpp
+++ b/mythtv/libs/libmythui/mythuinotificationcenter.cpp
@@ -183,12 +183,12 @@ bool MythUINotificationScreen::Create(void)
 
     // The xml should contain an <imagetype> named 'coverart', if it doesn't
     // then we cannot display the image and may as well abort
-    m_artworkImage = dynamic_cast<MythUIImage*>(GetChild("coverart"));
+    m_artworkImage = dynamic_cast<MythUIImage*>(GetChild("image"));
     m_titleText     = dynamic_cast<MythUIText*>(GetChild("title"));
-    m_artistText    = dynamic_cast<MythUIText*>(GetChild("artist"));
-    m_albumText     = dynamic_cast<MythUIText*>(GetChild("album"));
-    m_formatText    = dynamic_cast<MythUIText*>(GetChild("info"));
-    m_timeText      = dynamic_cast<MythUIText*>(GetChild("time"));
+    m_artistText    = dynamic_cast<MythUIText*>(GetChild("origin"));
+    m_albumText     = dynamic_cast<MythUIText*>(GetChild("description"));
+    m_formatText    = dynamic_cast<MythUIText*>(GetChild("extra"));
+    m_timeText      = dynamic_cast<MythUIText*>(GetChild("progress_text"));
     m_progressBar   = dynamic_cast<MythUIProgressBar*>(GetChild("progress"));
 
     m_created = true;
diff --git a/mythtv/themes/default/notification-ui.xml b/mythtv/themes/default/notification-ui.xml
index d13ac1629fe..aae7c6d6396 100644
--- a/mythtv/themes/default/notification-ui.xml
+++ b/mythtv/themes/default/notification-ui.xml
@@ -28,22 +28,22 @@
             <font>baselarge</font>
         </textarea>
 
-        <textarea name="artist" from="basetextarea">
+        <textarea name="origin" from="basetextarea">
             <area>18,45,-10,30</area>
             <font>basesmall</font>
         </textarea>
 
-        <textarea name="album" from="basetextarea">
+        <textarea name="description" from="basetextarea">
             <area>18,75,-10,30</area>
             <font>basesmall</font>
         </textarea>
 
-        <textarea name="info" from="basetextarea">
+        <textarea name="extra" from="basetextarea">
             <area>18,105,300,30</area>
             <font>basesmall</font>
         </textarea>
 
-        <textarea name="time" from="basetextarea">
+        <textarea name="progress_text" from="basetextarea">
             <area>370,105,-10,30</area>
             <font>basesmall</font>
             <align>right</align>
@@ -72,7 +72,7 @@
             <area>0,0,100%,100%</area>
         </shape>
         
-        <imagetype name="coverart">
+        <imagetype name="image">
             <filename>damaged.png</filename>
             <area>18,18,144,144</area>
         </imagetype>
@@ -82,22 +82,22 @@
             <font>baselarge</font>
         </textarea>
         
-        <textarea name="artist" from="basetextarea">
+        <textarea name="origin" from="basetextarea">
             <area>170,45,-10,30</area>
             <font>basesmall</font>
         </textarea>
         
-        <textarea name="album" from="basetextarea">
+        <textarea name="description" from="basetextarea">
             <area>170,75,-10,30</area>
             <font>basesmall</font>
         </textarea>
         
-        <textarea name="info" from="basetextarea">
+        <textarea name="extra" from="basetextarea">
             <area>170,105,300,30</area>
             <font>basesmall</font>
         </textarea>
         
-        <textarea name="time" from="basetextarea">
+        <textarea name="progress_text" from="basetextarea">
             <area>370,105,-10,30</area>
             <font>basesmall</font>
             <align>right</align>
@@ -116,7 +116,7 @@
             <fill color="#000000"/>
         </shape>
 
-        <imagetype name="coverart">
+        <imagetype name="image">
             <filename>damaged.png</filename>
             <area>-1,-1,100%,100%</area>
             <preserveaspect>true</preserveaspect>
@@ -127,22 +127,22 @@
             <font>mysmall</font>
         </textarea>
 
-        <textarea name="artist" from="basetextarea">
+        <textarea name="origin" from="basetextarea">
             <area>170,45,-10,30</area>
             <font>myverysmall</font>
         </textarea>
 
-        <textarea name="album" from="basetextarea">
+        <textarea name="description" from="basetextarea">
             <area>170,75,-10,30</area>
             <font>myverysmall</font>
         </textarea>
 
-        <textarea name="info" from="basetextarea">
+        <textarea name="extra" from="basetextarea">
             <area>170,105,300,30</area>
             <font>myverysmall</font>
         </textarea>
 
-        <textarea name="time" from="basetextarea">
+        <textarea name="progress_text" from="basetextarea">
             <area>370,105,-10,30</area>
             <font>myverysmall</font>
             <align>right</align>