diff options
| author | Sascha Woo <sascha.woo@gmail.com> | 2014-07-20 01:25:43 +0200 |
|---|---|---|
| committer | Sascha Woo <sascha.woo@gmail.com> | 2014-07-20 01:25:43 +0200 |
| commit | a5d9fe0dc91f0b8b2c783829cf2db70f80937e42 (patch) | |
| tree | 03998b6ecdcd66adb1ec08f5b8a72d012b5ad729 /system | |
| parent | df7efe8881332e66cc72737ebc11f3cda897fa74 (diff) | |
| parent | 458b66e7ea851790b537a5dc02bc31ed9d40166d (diff) | |
Merge pull request #5060 from xhaggi/pvr-setting-displaychannelinfo
[pvr] unify channel info settings + show channel info after channel switch from within channel osd
Diffstat (limited to 'system')
| -rw-r--r-- | system/settings/settings.xml | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml index 3e8118bfe4..0b5e1a1209 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1091,40 +1091,17 @@ </category> <category id="pvrmenu" label="19181" help="36211"> <group id="1"> - <setting id="pvrmenu.infoswitch" type="boolean" label="19178" help="36212"> - <level>1</level> - <default>true</default> - <control type="toggle" /> - </setting> - <setting id="pvrmenu.infotimeout" type="boolean" parent="pvrmenu.infoswitch" label="19179" help="36213"> - <level>2</level> - <default>true</default> - <control type="toggle" /> - <dependencies> - <dependency type="enable"> - <condition setting="pvrmenu.infoswitch" operator="is">true</condition> - </dependency> - </dependencies> - </setting> - <setting id="pvrmenu.infotime" type="integer" parent="pvrmenu.infoswitch" label="19184" help="36215"> + <setting id="pvrmenu.displaychannelinfo" type="integer" label="19178" help="36212"> <level>2</level> - <default>5</default> + <default>0</default> <constraints> - <minimum>1</minimum> + <minimum label="351">0</minimum> <step>1</step> - <maximum>10</maximum> + <maximum>15</maximum> </constraints> <control type="spinner" format="string"> <formatlabel>14045</formatlabel> </control> - <dependencies> - <dependency type="enable"> - <and> - <condition setting="pvrmenu.infoswitch" operator="is">true</condition> - <condition setting="pvrmenu.infotimeout" operator="is">true</condition> - </and> - </dependency> - </dependencies> </setting> <setting id="pvrmenu.closechannelosdonswitch" type="boolean" label="19229" help="36214"> <level>2</level> |