"Flatten" the Setup Menus in the default menu theme.

Move "Edit Keys" under Setup, remove the random vestigal MythMusic menu item. Having this be two layers deep was a little random and silly. Let's see how we like this.
MythTV · Jan 28, 2011 · 57adc5d · 57adc5d
1 parent f042fa0
commit 57adc5d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/mythtv/themes/defaultmenu/main_settings.xml b/mythtv/themes/defaultmenu/main_settings.xml
@@ -8,6 +8,13 @@
         <action>SETTINGS MAINGENERAL</action>
     </button>
 
+    <button>
+        <type>SETUP_KEYS</type>
+        <text>Edit Keys</text>
+        <description>Change MythTV key bindings.</description>
+        <action>SETUP_KEYS</action>
+    </button>
+
     <button>
         <type>SETTINGS_APPEARANCE</type>
         <text>Appearance</text>

diff --git a/mythtv/themes/defaultmenu/mainmenu.xml b/mythtv/themes/defaultmenu/mainmenu.xml
@@ -39,9 +39,9 @@
 
     <button>
         <type>MENU_UTILITIES_SETUP</type>
-        <text>Utilities / Setup</text>
+        <text>Setup</text>
         <description>Configure MythTV and plugins</description>
-        <action>MENU util_menu.xml</action>
+        <action>MENU main_settings.xml</action>
     </button>
 
 </mythmenu>
diff --git a/mythtv/themes/defaultmenu/util_menu.xml b/mythtv/themes/defaultmenu/util_menu.xml
@@ -9,13 +9,6 @@
         <depends>mythmusic</depends>
     </button>
 
-    <button>
-        <type>SETUP_KEYS</type>
-        <text>Edit Keys</text>
-        <description>Change MythTV key bindings.</description>
-        <action>SETUP_KEYS</action>
-    </button>
-
     <button>
         <type>SETUP_MENU</type>
         <text>Setup</text>