Skip to content

Commit

Permalink
Remove theme references to the defunct Set Recording Priorities screen.
Browse files Browse the repository at this point in the history 
This should have been done in SHA1:f8cb433b .
  • Loading branch information
@gigem
gigem committed Jan 31, 2013
1 parent 3bb0d2c commit a2ccb9f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 29 deletions.
10 changes: 5 additions & 5 deletions mythtv/themes/MythCenter-wide/menu-ui.xml
View file
Expand Up @@ -361,17 +361,17 @@
</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>
</state>
<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" />
Expand Down Expand Up @@ -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" />
Expand Down
10 changes: 5 additions & 5 deletions mythtv/themes/MythCenter/menu-ui.xml
View file
Expand Up @@ -354,17 +354,17 @@
</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>
</state>
<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" />
Expand Down Expand Up @@ -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" />
Expand Down
26 changes: 8 additions & 18 deletions mythtv/themes/Terra/menu-ui.xml
View file
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion mythtv/themes/button_types.txt
View file
Expand Up @@ -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
Expand Down

0 comments on commit a2ccb9f

Please sign in to comment.