[SCM] kodi-pvr-hts/master: [settings] refactor settings dialog

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4236fa5302c6944601dd38f8b7a36ed551e803c9
Author: Glenn-1990 <g_christiaensen at msn.com>
Date:   Tue Dec 15 14:46:44 2015 +0100

    [settings] refactor settings dialog

diff --git a/pvr.hts/resources/language/resource.language.en_gb/strings.po b/pvr.hts/resources/language/resource.language.en_gb/strings.po
index 7eeed44..9bc7adf 100644
--- a/pvr.hts/resources/language/resource.language.en_gb/strings.po
+++ b/pvr.hts/resources/language/resource.language.en_gb/strings.po
@@ -54,7 +54,15 @@ msgctxt "#30008"
 msgid "Advanced settings"
 msgstr ""
 
-#empty strings from id 30009 to 30049
+msgctxt "#30009"
+msgid "Streaming settings"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Timer settings"
+msgstr ""
+
+#empty strings from id 300011 to 30049
 
 msgctxt "#30050"
 msgid "Auto recordings"
@@ -305,11 +313,11 @@ msgstr ""
 #empty strings from id 30457 to 30499
 
 msgctxt "#30500"
-msgid "Streaming"
+msgid "Streaming profile"
 msgstr ""
 
 msgctxt "#30501"
-msgid "Streaming profile to use"
+msgid "Profile to use (empty = default)"
 msgstr ""
 
 #. Check streaming profile validity during startup
diff --git a/pvr.hts/resources/settings.xml b/pvr.hts/resources/settings.xml
index d4b4fd7..a680619 100644
--- a/pvr.hts/resources/settings.xml
+++ b/pvr.hts/resources/settings.xml
@@ -9,12 +9,8 @@
 	<setting id="connect_timeout" type="slider" option="int" range="1,60" label="30006" default="10" />
 	<setting id="response_timeout" type="slider" option="int" range="1,60" label="30007" default="5" />
   </category>
-
-  <category label="30008">
-    <setting label="30050" type="lsep"/>
-    <setting id="autorec_approxtime" type="enum" label="30051" lvalues="30052|30053" default="0"/>
-    <setting id="autorec_maxdiff" enable="eq(-1,1)"  type="slider" option="int" range="0,5,120" label="30054" default="15" />
-    
+  
+  <category label="30009">
     <setting label="30500" type="lsep"/>
     <setting id="streaming_profile" type="text" label="30501" default="" />
 
@@ -22,12 +18,12 @@
     <setting id="pretuner_enabled" type="bool" label="30403" default="false" />
     <setting id="total_tuners" enable="eq(-1,true)" type="slider" option="int" range="2,1,10" label="30401"  default="2" />
     <setting id="pretuner_closedelay" enable="eq(-2,true)" type="slider" option="int" range="5,5,60" label="30402" default="10" />
-    
-    <setting label="30100" type="lsep"/>
-    <setting id="epg_async" type="bool" label="30101" default="false"/>
-    
-    <setting label="30200" type="lsep"/>
-    <setting id="trace_debug" type="bool" label="30201" default="false"/>
+  </category>
+  
+  <category label="30010">
+    <setting label="30050" type="lsep"/>
+    <setting id="autorec_approxtime" type="enum" label="30051" lvalues="30052|30053" default="0"/>
+    <setting id="autorec_maxdiff" enable="eq(-1,1)"  type="slider" option="int" range="0,5,120" label="30054" default="15" />
     
     <setting label="30058" type="lsep"/>
     <setting id="dvr_priority" type="enum" label="30055" lvalues="30351|30352|30353|30354|30355" default="2"/>
@@ -35,4 +31,11 @@
     <setting id="dvr_dubdetect" type="enum" label="30057" lvalues="30356|30357|30358|30359|30360|30361" default="0"/>
   </category>
   
+  <category label="30008">
+    <setting label="30100" type="lsep"/>
+    <setting id="epg_async" type="bool" label="30101" default="false"/>
+    
+    <setting label="30200" type="lsep"/>
+    <setting id="trace_debug" type="bool" label="30201" default="false"/>
+  </category>
 </settings>

-- 
kodi-pvr-hts packaging