summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engel <dengel@mythtv.org>2013-01-31 16:29:48 (GMT)
committer David Engel <dengel@mythtv.org>2013-01-31 16:32:40 (GMT)
commita2ccb9f512c14ea294656ce2910461d1c7074114 (patch)
treeb07216f5e0aaa51a8bd488b4eafed358a08c4838
parent3bb0d2c7d129ee6dd489a67ffd396657db420d32 (diff)
Remove theme references to the defunct Set Recording Priorities screen.
This should have been done in SHA1:f8cb433b .
-rw-r--r--mythtv/themes/MythCenter-wide/menu-ui.xml10
-rw-r--r--mythtv/themes/MythCenter/menu-ui.xml10
-rw-r--r--mythtv/themes/Terra/menu-ui.xml26
-rw-r--r--mythtv/themes/button_types.txt2
4 files changed, 19 insertions, 29 deletions
diff --git a/mythtv/themes/MythCenter-wide/menu-ui.xml b/mythtv/themes/MythCenter-wide/menu-ui.xml
index 7fb08ca..987c686 100644
--- a/mythtv/themes/MythCenter-wide/menu-ui.xml
+++ b/mythtv/themes/MythCenter-wide/menu-ui.xml
@@ -361,7 +361,7 @@
</imagetype>
</state>
<state name="TV_MANUAL_SCHEDULE" from="TV_PROGRAM_GUIDE" />
- <state name="TV_RECPRIORITIES" from="DEFAULT">
+ <state name="TV_RECORDING_RULES" from="DEFAULT">
<imagetype name="watermark">
<filename>watermark/priority.png</filename>
</imagetype>
@@ -369,9 +369,9 @@
<state name="TV_CONFLICTS" from="TV_CUSTOM_RECORD" />
<!-- recpriorities_settings.xml -->
- <state name="TV_RECPRIORITIES_SETTINGS_GENERAL" from="TV_RECPRIORITIES" />
- <state name="TV_RECPRIORITIES_CHANNEL" from="TV_RECPRIORITIES" />
- <state name="TV_RECPRIORITIES_CUSTOM" from="TV_RECPRIORITIES" />
+ <state name="TV_RECPRIORITIES_SETTINGS_GENERAL" from="TV_RECORDING_RULES" />
+ <state name="TV_RECPRIORITIES_CHANNEL" from="TV_RECORDING_RULES" />
+ <state name="TV_RECPRIORITIES_CUSTOM" from="TV_RECORDING_RULES" />
<!-- setup.xml -->
<state name="SETUP_GENERAL" from="SETUP" />
@@ -413,7 +413,7 @@
<state name="TV_SETTINGS_PLAYBACK_OSD" from="TV" />
<state name="TV_SETTINGS_PLAYBACK_GROUPS" from="TV" />
<state name="TV_SETTINGS_RECORDING_PROFILES" from="TV_CUSTOM_RECORD" />
- <state name="TV_SETTINGS_RECPRIORITIES" from="TV_RECPRIORITIES" />
+ <state name="TV_SETTINGS_RECPRIORITIES" from="TV_RECORDING_RULES" />
<!-- tvmenu.xml -->
<state name="TV_WATCH_TV" from="TV" />
diff --git a/mythtv/themes/MythCenter/menu-ui.xml b/mythtv/themes/MythCenter/menu-ui.xml
index 60a5fc9..a806e3f 100644
--- a/mythtv/themes/MythCenter/menu-ui.xml
+++ b/mythtv/themes/MythCenter/menu-ui.xml
@@ -354,7 +354,7 @@
</imagetype>
</state>
<state name="TV_MANUAL_SCHEDULE" from="TV_PROGRAM_GUIDE" />
- <state name="TV_RECPRIORITIES" from="DEFAULT">
+ <state name="TV_RECORDING_RULES" from="DEFAULT">
<imagetype name="watermark">
<filename>watermark/priority.png</filename>
</imagetype>
@@ -362,9 +362,9 @@
<state name="TV_CONFLICTS" from="TV_CUSTOM_RECORD" />
<!-- recpriorities_settings.xml -->
- <state name="TV_RECPRIORITIES_SETTINGS_GENERAL" from="TV_RECPRIORITIES" />
- <state name="TV_RECPRIORITIES_CHANNEL" from="TV_RECPRIORITIES" />
- <state name="TV_RECPRIORITIES_CUSTOM" from="TV_RECPRIORITIES" />
+ <state name="TV_RECPRIORITIES_SETTINGS_GENERAL" from="TV_RECORDING_RULES" />
+ <state name="TV_RECPRIORITIES_CHANNEL" from="TV_RECORDING_RULES" />
+ <state name="TV_RECPRIORITIES_CUSTOM" from="TV_RECORDING_RULES" />
<!-- setup.xml -->
<state name="SETUP_GENERAL" from="SETUP" />
@@ -406,7 +406,7 @@
<state name="TV_SETTINGS_PLAYBACK_OSD" from="TV" />
<state name="TV_SETTINGS_PLAYBACK_GROUPS" from="TV" />
<state name="TV_SETTINGS_RECORDING_PROFILES" from="TV_CUSTOM_RECORD" />
- <state name="TV_SETTINGS_RECPRIORITIES" from="TV_RECPRIORITIES" />
+ <state name="TV_SETTINGS_RECPRIORITIES" from="TV_RECORDING_RULES" />
<!-- tvmenu.xml -->
<state name="TV_WATCH_TV" from="TV" />
diff --git a/mythtv/themes/Terra/menu-ui.xml b/mythtv/themes/Terra/menu-ui.xml
index e2d8fbe..e5c7f12 100644
--- a/mythtv/themes/Terra/menu-ui.xml
+++ b/mythtv/themes/Terra/menu-ui.xml
@@ -334,16 +334,11 @@
<filename>watermarks/stop_light.png</filename>
</imagetype>
</state>
- <state name="TV_RECPRIORITIES" from="TV">
- <!-- <imagetype name="icon">
- <filename>watermarks/priority.png</filename>
- </imagetype>-->
- </state>
<state name="TV_CONFLICTS" from="TV_CUSTOM_RECORD" />
- <state name="TV_RECPRIORITIES_SETTINGS_GENERAL" from="TV_RECPRIORITIES" />
- <state name="TV_RECPRIORITIES_CHANNEL" from="TV_RECPRIORITIES" />
- <state name="TV_RECPRIORITIES_CUSTOM" from="TV_RECPRIORITIES" />
+ <state name="TV_RECPRIORITIES_SETTINGS_GENERAL" from="TV_RECORDING_RULES" />
+ <state name="TV_RECPRIORITIES_CHANNEL" from="TV_RECORDING_RULES" />
+ <state name="TV_RECPRIORITIES_CUSTOM" from="TV_RECORDING_RULES" />
<state name="SETUP_GENERAL" from="SETUP" />
<state name="SETUP_SYSTEM_EVENTS" from="SETUP" />
@@ -394,7 +389,7 @@
<state name="TV_SETTINGS_PLAYBACK_GROUPS" from="TV" />
<state name="TV_SETTINGS_CHANNEL_GROUP" from="TV" />
<state name="TV_SETTINGS_RECORDING_PROFILES" from="TV_CUSTOM_RECORD" />
- <state name="TV_SETTINGS_RECPRIORITIES" from="TV_RECPRIORITIES" />
+ <state name="TV_SETTINGS_RECPRIORITIES" from="TV_RECORDING_RULES" />
<state name="TV_WATCH_TV" from="TV" />
<state name="TV_SCHEDULE_RECORDINGS" from="TV_MANUAL_SCHEDULE" />
@@ -745,16 +740,11 @@
<filename>watermarks/stop_light.png</filename>
</imagetype>
</state>
- <state name="TV_RECPRIORITIES" from="TV">
- <!-- <imagetype name="icon">
- <filename>watermarks/priority.png</filename>
- </imagetype>-->
- </state>
<state name="TV_CONFLICTS" from="TV_CUSTOM_RECORD" />
- <state name="TV_RECPRIORITIES_SETTINGS_GENERAL" from="TV_RECPRIORITIES" />
- <state name="TV_RECPRIORITIES_CHANNEL" from="TV_RECPRIORITIES" />
- <state name="TV_RECPRIORITIES_CUSTOM" from="TV_RECPRIORITIES" />
+ <state name="TV_RECPRIORITIES_SETTINGS_GENERAL" from="TV_RECORDING_RULES" />
+ <state name="TV_RECPRIORITIES_CHANNEL" from="TV_RECORDING_RULES" />
+ <state name="TV_RECPRIORITIES_CUSTOM" from="TV_RECORDING_RULES" />
<state name="SETUP_GENERAL" from="SETUP" />
<state name="SETUP_SYSTEM_EVENTS" from="SETUP" />
@@ -798,7 +788,7 @@
<state name="TV_SETTINGS_PLAYBACK_GROUPS" from="TV" />
<state name="TV_SETTINGS_CHANNEL_GROUP" from="TV" />
<state name="TV_SETTINGS_RECORDING_PROFILES" from="TV_CUSTOM_RECORD" />
- <state name="TV_SETTINGS_RECPRIORITIES" from="TV_RECPRIORITIES" />
+ <state name="TV_SETTINGS_RECPRIORITIES" from="TV_RECORDING_RULES" />
<state name="TV_WATCH_TV" from="TV" />
<state name="TV_SCHEDULE_RECORDINGS" from="TV_MANUAL_SCHEDULE" />
diff --git a/mythtv/themes/button_types.txt b/mythtv/themes/button_types.txt
index 925a1c7..998d105 100644
--- a/mythtv/themes/button_types.txt
+++ b/mythtv/themes/button_types.txt
@@ -61,7 +61,7 @@ main_settings.xml
manage_recordings.xml
1. TV_SCHEDULE_RECORDINGS
- 2. TV_RECPRIORITIES
+ 2. TV_RECORDING_RULES
3. TV_UPCOMING_RECORDINGS
4. TV_DELETE
5. TV_PREVIOUS