Move the Recording Profiles editor into mythtv-setup where it belongs…

…. This constantly gets overlooked because it's not in the right place, especially by users who chose to use a third party frontend.
MythTV · Mar 4, 2012 · 4edcda6 · 4edcda6
1 parent d7c8dfb
commit 4edcda6
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 37 deletions.
diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
@@ -36,7 +36,6 @@ using namespace std;
 #include "globalsettings.h"
 #include "audiogeneralsettings.h"
 #include "grabbersettings.h"
-#include "profilegroup.h"
 #include "playgroup.h"
 #include "networkcontrol.h"
 #include "dvdringbuffer.h"
@@ -910,11 +909,6 @@ static void TVMenuCallback(void *data, QString &selection)
     {
         startKeysSetup();
     }
-    else if (sel == "settings recording")
-    {
-        ProfileGroupEditor editor;
-        editor.exec();
-    }
     else if (sel == "settings playgroup")
     {
         PlayGroupEditor editor;

diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp
@@ -38,6 +38,7 @@
 #include "mythsystemevent.h"
 #include "expertsettingseditor.h"
 #include "commandlineparser.h"
+#include "profilegroup.h"
 
 using namespace std;
 
@@ -101,6 +102,11 @@ static void SetupMenuCallback(void* data, QString& selection)
         CardInputEditor cie;
         cie.exec();
     }
+    else if (sel == "recording profile")
+    {
+        ProfileGroupEditor editor;
+        editor.exec();
+    }
     else if (sel == "channel editor")
     {
         MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();

diff --git a/mythtv/programs/mythtv-setup/setup.xml b/mythtv/programs/mythtv-setup/setup.xml
@@ -12,33 +12,40 @@
      <action>CAPTURE CARDS</action>
    </button>
 
+    <button>
+        <type>TV_SETTINGS_RECORDING_PROFILES</type>
+        <text>3. Recording Profiles</text>
+        <description>Configure the recording and transcoding quality (where applicable)</description>
+        <action>RECORDING PROFILE</action>
+    </button>
+
    <button>
      <type>SETUP_VIDEO_SOURCES</type>
-     <text>3. Video sources</text>
+     <text>4. Video sources</text>
      <action>VIDEO SOURCES</action>
    </button>
 
    <button>
      <type>SETUP_INPUT_CONNECTIONS</type>
-     <text>4. Input connections</text>
+     <text>5. Input connections</text>
      <action>CARD INPUTS</action>
    </button>
 
    <button>
      <type>SETUP_CHANNEL_EDITOR</type>
-     <text>5. Channel Editor</text>
+     <text>6. Channel Editor</text>
      <action>CHANNEL EDITOR</action>
    </button>
 
    <button>
      <type>SETUP_STORAGE_GROUPS</type>
-     <text>6. Storage Directories</text>
+     <text>7. Storage Directories</text>
      <action>STORAGE GROUPS</action>
    </button>
 
    <button>
      <type>SETUP_SYSTEM_EVENTS</type>
-     <text>7. System Events</text>
+     <text>8. System Events</text>
      <action>SYSTEMEVENTEDITOR</action>
    </button>
 

diff --git a/mythtv/themes/DVR/tv_settings.xml b/mythtv/themes/DVR/tv_settings.xml
@@ -42,13 +42,6 @@
       <action>SETTINGS CHANNELGROUPS</action>
     </button>
 
-    <button>
-        <type>TV_SETTINGS_RECORDING_PROFILES</type>
-        <text>Recording Profiles</text>
-        <description> </description>
-        <action>SETTINGS RECORDING</action>
-    </button>
-
     <button>
         <type>TV_SETTINGS_RECPRIORITIES</type>
         <text>Recording Priorities</text>

diff --git a/mythtv/themes/classic/tv_settings.xml b/mythtv/themes/classic/tv_settings.xml
@@ -42,12 +42,6 @@
       <action>SETTINGS CHANNELGROUPS</action>
     </button>
 
-    <button>
-        <type>TV_SETTINGS_RECORDING_PROFILES</type>
-        <text>Recording Profiles</text>
-        <action>SETTINGS RECORDING</action>
-    </button>
-
     <button>
         <type>TV_SETTINGS_RECPRIORITIES</type>
         <text>Recording Priorities</text>

diff --git a/mythtv/themes/defaultmenu/tv_settings.xml b/mythtv/themes/defaultmenu/tv_settings.xml
@@ -43,13 +43,6 @@
       <action>SETTINGS CHANNELGROUPS</action>
     </button>
 
-    <button>
-        <type>TV_SETTINGS_RECORDING_PROFILES</type>
-        <text>Recording Profiles</text>
-        <description>Change the quality of your recordings</description>
-        <action>SETTINGS RECORDING</action>
-    </button>
-
     <button>
         <type>TV_SETTINGS_RECPRIORITIES</type>
         <text>Recording Priorities</text>

diff --git a/mythtv/themes/mediacentermenu/tv_settings.xml b/mythtv/themes/mediacentermenu/tv_settings.xml
@@ -42,12 +42,6 @@
       <action>SETTINGS CHANNELGROUPS</action>
     </button>
 
-    <button>
-        <type>TV_SETTINGS_RECORDING_PROFILES</type>
-        <text>Recording Profiles</text>
-        <action>SETTINGS RECORDING</action>
-    </button>
-
     <button>
         <type>TV_SETTINGS_RECPRIORITIES</type>
         <text>Recording Priorities</text>