[PVR] Removed "Group timers" option that makes no sense anymore with …

…separated timer/rules window
xbmc · Dec 15, 2015 · 16f5280 · 16f5280
1 parent d151211
commit 16f5280
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 20 deletions.
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -3599,11 +3599,7 @@ msgctxt "#841"
 msgid "Only this"
 msgstr ""
 
-#. Label of the option to switch between hierarchical and flat timer view (in confluence sideblade).
-#: skin.confluence
-msgctxt "#842"
-msgid "Group timers"
-msgstr ""
+#empty string with id 842
 
 #. Label for a context menu entry to activate a currently inactive timer
 #: xbmc/pvr/windows/GUIWindowPVRTimers.cpp

diff --git a/addons/skin.confluence/720p/IncludesPVR.xml b/addons/skin.confluence/720p/IncludesPVR.xml
@@ -230,13 +230,6 @@
 					<visible>Window.IsActive(TVRecordings) | Window.IsActive(RadioRecordings)</visible>
 				</control>
 				<control type="radiobutton" id="8">
-					<description>Group timers</description>
-					<textwidth>235</textwidth>
-					<include>ButtonCommonValues</include>
-					<label>842</label>
-					<visible>Window.IsActive(TVTimers) | Window.IsActive(RadioTimers)</visible>
-				</control>
-				<control type="radiobutton" id="9">
 					<description>Hide disabled timers</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
@@ -1628,10 +1628,6 @@
     </category>
     <category id="pvrtimers" label="" help="">
       <group id="1">
-        <setting id="pvrtimers.timertypefilter" type="boolean" label="" help="">
-          <level>4</level>
-          <default>true</default>
-        </setting>
         <setting id="pvrtimers.hidedisabledtimers" type="boolean" label="" help="">
           <default>false</default>
           <level>4</level>

diff --git a/xbmc/pvr/windows/GUIWindowPVRBase.h b/xbmc/pvr/windows/GUIWindowPVRBase.h
@@ -28,8 +28,7 @@
 #define CONTROL_BTNGROUPITEMS             5
 #define CONTROL_BTNSHOWHIDDEN             6
 #define CONTROL_BTNSHOWDELETED            7
-#define CONTROL_BTNTIMERTYPEFILTER        8
-#define CONTROL_BTNHIDEDISABLEDTIMERS     9
+#define CONTROL_BTNHIDEDISABLEDTIMERS     8
 #define CONTROL_BTNCHANNELGROUPS          28
 #define CONTROL_BTNFILTERCHANNELS         31
 

diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
@@ -258,7 +258,6 @@ const std::string CSettings::SETTING_PVRPARENTAL_ENABLED = "pvrparental.enabled"
 const std::string CSettings::SETTING_PVRPARENTAL_PIN = "pvrparental.pin";
 const std::string CSettings::SETTING_PVRPARENTAL_DURATION = "pvrparental.duration";
 const std::string CSettings::SETTING_PVRCLIENT_MENUHOOK = "pvrclient.menuhook";
-const std::string CSettings::SETTING_PVRTIMERS_TIMERTYPEFILTER = "pvrtimers.timertypefilter";
 const std::string CSettings::SETTING_PVRTIMERS_HIDEDISABLEDTIMERS = "pvrtimers.hidedisabledtimers";
 const std::string CSettings::SETTING_MUSICLIBRARY_SHOWCOMPILATIONARTISTS = "musiclibrary.showcompilationartists";
 const std::string CSettings::SETTING_MUSICLIBRARY_DOWNLOADINFO = "musiclibrary.downloadinfo";

diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h
@@ -215,7 +215,6 @@ class CSettings : public CSettingCreator, public CSettingControlCreator
   static const std::string SETTING_PVRPARENTAL_PIN;
   static const std::string SETTING_PVRPARENTAL_DURATION;
   static const std::string SETTING_PVRCLIENT_MENUHOOK;
-  static const std::string SETTING_PVRTIMERS_TIMERTYPEFILTER;
   static const std::string SETTING_PVRTIMERS_HIDEDISABLEDTIMERS;
   static const std::string SETTING_MUSICLIBRARY_SHOWCOMPILATIONARTISTS;
   static const std::string SETTING_MUSICLIBRARY_DOWNLOADINFO;