aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorda-anda <da-anda@xbmc.org>2015-04-06 15:54:03 +0200
committerda-anda <da-anda@xbmc.org>2015-04-13 08:58:31 +0200
commit2e081dc77ae1028178c889d826a7f630377f9004 (patch)
tree37252e438a60d940097aa80d33dea95581fd2a71 /system
parent030b12a555f35b4970f5ce3656687c262724e7e0 (diff)
[settings] change logical order of some subtitle and EPG related settings
Diffstat (limited to 'system')
-rw-r--r--system/settings/settings.xml70
1 files changed, 35 insertions, 35 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 7fa80c4c2d..5baeb0d228 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -911,18 +911,6 @@
</category>
<category id="subtitles" label="287" help="36184">
<group id="1">
- <setting id="subtitles.languages" type="list[string]" label="24111" help="24112">
- <level>1</level>
- <default>English</default>
- <constraints>
- <options>iso6391languages</options>
- <delimiter>,</delimiter>
- <minimumitems>1</minimumitems>
- </constraints>
- <control type="list" format="string">
- <multiselect>true</multiselect>
- </control>
- </setting>
<setting id="locale.subtitlelanguage" type="string" label="286" help="36120">
<level>1</level>
<default>original</default>
@@ -931,6 +919,11 @@
</constraints>
<control type="list" format="string" />
</setting>
+ <setting id="subtitles.parsecaptions" type="boolean" label="24130" help="24131">
+ <level>1</level>
+ <default>false</default>
+ <control type="toggle" />
+ </setting>
</group>
<group id="2">
<setting id="subtitles.align" type="integer" label="21460" help="36192">
@@ -1034,6 +1027,18 @@
</setting>
</group>
<group id="4">
+ <setting id="subtitles.languages" type="list[string]" label="24111" help="24112">
+ <level>1</level>
+ <default>English</default>
+ <constraints>
+ <options>iso6391languages</options>
+ <delimiter>,</delimiter>
+ <minimumitems>1</minimumitems>
+ </constraints>
+ <control type="list" format="string">
+ <multiselect>true</multiselect>
+ </control>
+ </setting>
<setting id="subtitles.storagemode" type="integer" label="24115" help="24106">
<level>1</level>
<default>0</default>
@@ -1059,11 +1064,6 @@
<heading>657</heading>
</control>
</setting>
- <setting id="subtitles.parsecaptions" type="boolean" label="24130" help="24131">
- <level>1</level>
- <default>false</default>
- <control type="toggle" />
- </setting>
<setting id="subtitles.pauseonsearch" type="boolean" label="24105" help="24123">
<level>1</level>
<default>true</default>
@@ -1308,6 +1308,24 @@
<formatlabel>17999</formatlabel>
</control>
</setting>
+ <setting id="epg.selectaction" type="integer" label="22079" help="36424">
+ <level>1</level>
+ <default>2</default> <!-- EPG_SELECT_ACTION_INFO -->
+ <constraints>
+ <options>
+ <option label="36425">0</option> <!-- EPG_SELECT_ACTION_CONTEXT_MENU -->
+ <option label="36426">1</option> <!-- EPG_SELECT_ACTION_SWITCH -->
+ <option label="36427">2</option> <!-- EPG_SELECT_ACTION_INFO -->
+ <option label="36428">3</option> <!-- EPG_SELECT_ACTION_RECORD -->
+ </options>
+ </constraints>
+ <control type="list" format="string" />
+ </setting>
+ <setting id="epg.hidenoinfoavailable" type="boolean" label="19268" help="36224">
+ <level>2</level>
+ <default>true</default>
+ <control type="toggle" />
+ </setting>
</group>
<group id="2">
<setting id="epg.epgupdate" type="integer" label="19071" help="36221">
@@ -1322,19 +1340,6 @@
<formatlabel>14044</formatlabel>
</control>
</setting>
- <setting id="epg.selectaction" type="integer" label="22079" help="36424">
- <level>1</level>
- <default>2</default> <!-- EPG_SELECT_ACTION_INFO -->
- <constraints>
- <options>
- <option label="36425">0</option> <!-- EPG_SELECT_ACTION_CONTEXT_MENU -->
- <option label="36426">1</option> <!-- EPG_SELECT_ACTION_SWITCH -->
- <option label="36427">2</option> <!-- EPG_SELECT_ACTION_INFO -->
- <option label="36428">3</option> <!-- EPG_SELECT_ACTION_RECORD -->
- </options>
- </constraints>
- <control type="list" format="string" />
- </setting>
<setting id="epg.preventupdateswhileplayingtv" type="boolean" label="19230" help="36222">
<level>2</level>
<default>false</default>
@@ -1345,11 +1350,6 @@
<default>false</default>
<control type="toggle" />
</setting>
- <setting id="epg.hidenoinfoavailable" type="boolean" label="19268" help="36224">
- <level>2</level>
- <default>true</default>
- <control type="toggle" />
- </setting>
<setting id="epg.resetepg" type="action" label="19187" help="36225">
<level>1</level>
<control type="button" format="action" />