Merge commit 'origin/bug_478_Listbox_ScrollbarMode'

[vuplus_dvbapp] / data / setup.xml

diff --git a/data/setup.xml b/data/setup.xml
index eca3265..9425afd 100644 (file)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -13,6 +13,8 @@
                        <item level="0" text="TV System">config.av.tvsystem</item>
                        <item level="1" text="WSS on 4:3">config.av.wss</item>
                        <item level="1" text="AC3 default">config.av.defaultac3</item>
+                       <item level="1" text="General AC3 delay (ms)">config.av.generalAC3delay</item>
+                       <item level="1" text="General PCM delay (ms)">config.av.generalPCMdelay</item>
                        <item level="1" text="AC3 downmix" requires="CanDownmixAC3">config.av.downmix_ac3</item>
                        <item level="1" text="Auto scart switching" requires="ScartSwitch">config.av.vcrswitch</item>
                </setup>
@@ -22,6 +24,8 @@
                        <item level="0" text="Margin before record (minutes)">config.recording.margin_before</item>
                        <item level="0" text="Margin after record">config.recording.margin_after</item>
                        <item level="0" text="Show blinking clock in display during recording">config.usage.blinking_display_clock_during_recording</item>
+                       <item level="2" text="Show Message when Recording starts">config.usage.show_message_when_recording_starts</item>
+                       <item level="2" text="Load Length of Movies in Movielist">config.usage.load_length_of_movies_in_moviellist</item>
                        <item level="1" text="Show positioner movement">config.usage.showdish</item>
                        <item level="1" text="Enable multiple bouquets">config.usage.multibouquet</item>
                        <item level="1" text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
@@ -65,6 +69,7 @@
                        <item level="2" text="Behavior of 'pause' when paused">config.seek.on_pause</item>
                        <item level="2" text="Behavior of 0 key in PiP-mode">config.usage.pip_zero_button</item>
                        <item level="2" text="Alternative services tuner priority">config.usage.alternatives_priority</item>
+                       <item level="2" text="Limited character set for recording filenames">config.recording.ascii_filenames</item>
                </setup>
                <setup key="harddisk" title="Harddisk setup" >
                        <item level="0" text="Harddisk standby after">config.usage.hdd_standby</item>
@@ -94,11 +99,10 @@
                        <item text="Brightness">config.osd.bright</item>
                        <item text="Contrast">config.osd.contrast</item>
                </setup>
-               <setup key="lcd" title="Display Setup">
+               <setup key="lcd" title="Display Setup" requires="FrontpanelDisplay">
                        <item level="0" text="Brightness">config.lcd.bright</item>
                        <item level="0" text="Contrast">config.lcd.contrast</item>
                        <item level="0" text="Standby">config.lcd.standby</item>
-                       <item level="2" text="Invert display">config.lcd.invert</item>
                </setup>
                <setup key="satconfig" title="Sat / Dish Setup">
                        <item text="Tuner Slot">config.sat.tunerslot</item>