Fix a bogus warning message on the Channel Recording Priorities screen

This also changes the name of the text area to 'nochannels_warning'. The old name 'norecordings_info' is still accepted but is depreciated.
MythTV · Apr 21, 2013 · b4751aa · b4751aa
1 parent 03b9213
commit b4751aa
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 24 deletions.
diff --git a/mythtv/programs/mythfrontend/channelrecpriority.cpp b/mythtv/programs/mythfrontend/channelrecpriority.cpp
@@ -333,11 +333,14 @@ void ChannelRecPriority::updateList()
             m_channelList->SetItemCurrent(item);
     }
 
-    MythUIText *norecordingText = dynamic_cast<MythUIText*>
-                                                (GetChild("norecordings_info"));
+    // this textarea name is depreciated use 'nochannels_warning' instead
+    MythUIText *noChannelsText = dynamic_cast<MythUIText*>(GetChild("norecordings_info"));
 
-    if (norecordingText)
-        norecordingText->SetVisible(m_channelData.isEmpty());
+    if (!noChannelsText)
+        noChannelsText = dynamic_cast<MythUIText*>(GetChild("nochannels_warning"));
+
+    if (noChannelsText)
+        noChannelsText->SetVisible(m_channelData.isEmpty());
 }
 
 

diff --git a/mythtv/themes/MythCenter-wide/schedule-ui.xml b/mythtv/themes/MythCenter-wide/schedule-ui.xml
@@ -706,12 +706,10 @@
             <area>700,618,400,30</area>
         </textarea>
 
-        <textarea name="norecordings_info">
+        <textarea name="nochannels_warning">
             <area>0,210,1280,70</area>
             <font>basemedium</font>
-            <value>You Haven't Scheduled Any Programs To Be Recorded\n
-                To schedule a recording, exit this screen and
-                select 'Program Guide' or 'Program Finder'</value>
+            <value>You haven't defined any channels</value>
             <multiline>yes</multiline>
             <align>allcenter</align>
         </textarea>

diff --git a/mythtv/themes/MythCenter/schedule-ui.xml b/mythtv/themes/MythCenter/schedule-ui.xml
@@ -621,12 +621,10 @@
             <area>360,515,400,30</area>
         </textarea>
 
-        <textarea name="norecordings_info">
+        <textarea name="nochannels_warning">
             <area>0,110,800,70</area>
             <font>basemedium</font>
-            <value>You Haven't Scheduled Any Programs To Be Recorded\n
-                To schedule a recording, exit this screen and
-                select 'Program Guide' or 'Program Finder'</value>
+            <value>You haven't defined any channels</value>
             <multiline>yes</multiline>
             <align>allcenter</align>
         </textarea>

diff --git a/mythtv/themes/Terra/schedule-ui.xml b/mythtv/themes/Terra/schedule-ui.xml
@@ -482,14 +482,12 @@
             <area>660,585,400,30</area>
         </textarea>
 
-        <textarea name="norecordings_info">
+        <textarea name="nochannels_warning">
             <area>0,210,1280,70</area>
             <font>basemedium</font>
             <multiline>yes</multiline>
             <align>allcenter</align>
-            <value>You Haven't Scheduled Any Programs To Be Recorded\n
-                To schedule a recording, exit this screen and
-                select 'Program Guide' or 'Program Finder'</value>
+            <value>You haven't defined any channels</value>
         </textarea>
 
         <textarea name="helptext" from="basetextarea">

diff --git a/mythtv/themes/default-wide/schedule-ui.xml b/mythtv/themes/default-wide/schedule-ui.xml
@@ -701,12 +701,10 @@
             <area>660,585,400,30</area>
         </textarea>
 
-        <textarea name="norecordings_info">
+        <textarea name="nochannels_warning">
             <area>0,210,1280,70</area>
             <font>basemedium</font>
-            <value>You Haven't Scheduled Any Programs To Be Recorded\n
-                To schedule a recording, exit this screen and
-                select 'Program Guide' or 'Program Finder'</value>
+            <value>You haven't defined any channels</value>
             <multiline>yes</multiline>
             <align>allcenter</align>
         </textarea>

diff --git a/mythtv/themes/default/schedule-ui.xml b/mythtv/themes/default/schedule-ui.xml
@@ -634,12 +634,10 @@
             <area>360,515,400,30</area>
         </textarea>
 
-        <textarea name="norecordings_info">
+        <textarea name="nochannels_warning">
             <area>0,110,800,70</area>
             <font>basemedium</font>
-            <value>You Haven't Scheduled Any Programs To Be Recorded\n
-                To schedule a recording, exit this screen and
-                select 'Program Guide' or 'Program Finder'</value>
+            <value>You haven't defined any channels</value>
             <multiline>yes</multiline>
             <align>allcenter</align>
         </textarea>