diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/encoding.conf | 8 | ||||
| -rw-r--r-- | data/keymap.xml | 2 | ||||
| -rw-r--r-- | data/menu.xml | 12 | ||||
| -rw-r--r-- | data/setup.xml | 2 | ||||
| -rwxr-xr-x | data/skin_default.xml | 10 |
5 files changed, 20 insertions, 14 deletions
diff --git a/data/encoding.conf b/data/encoding.conf index 07c6b8a1..d9d115e0 100644 --- a/data/encoding.conf +++ b/data/encoding.conf @@ -13,6 +13,8 @@ bul ISO8859-5 0x4ff 0x1 0x407 0x1 0xbc6 0x3 #ASTRA 23.5° Cslink, Skylink +0xc85 0x3 +0xc89 0x3 0xc8f 0x3 0xbc7 0x3 0x436 0x1 #ASTRA 19.2° MTV Euro - MTV Networks @@ -22,7 +24,11 @@ bul ISO8859-5 12200 318 1500 318 400 318 -0x5dc 0x13e +13000 318 +12800 318 +11400 318 +1000 318 +7400 318 #Fallback encoding table for following transponders #TSID ONID ISO8859-X #0x447 0x1 ISO8859-9 diff --git a/data/keymap.xml b/data/keymap.xml index 264afccf..0865e416 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -475,6 +475,8 @@ <key id="KEY_MENU" mapto="input_date_time" flags="m" /> <key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" /> <key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" /> + <key id="KEY_NEXT" mapto="nextService" flags="m" /> + <key id="KEY_PREVIOUS" mapto="prevService" flags="m" /> </map> <map context="EventViewActions"> diff --git a/data/menu.xml b/data/menu.xml index 56b3ee65..86000531 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -35,7 +35,7 @@ <item text="Add to Bouquets"></item> <item text="Edit Bouquets"></item> </menu>--> - <menu level="0" text="Service Searching" entryID="service_searching_selection"> + <menu weight="0" level="0" text="Service Searching" entryID="service_searching_selection"> <id val="scan" /> <item text="Tuner configuration" entryID="tuner_setup"><screen module="Satconfig" screen="NimSelection" /></item> <item text="Default services lists" entryID="default_lists"><screen module="ScanSetup" screen="DefaultSatLists" /></item> @@ -46,7 +46,7 @@ <item text="Edit Transponder"></item> <item text="Satfinder"></item>--> </menu> - <menu level="0" text="System" entryID="system_selection"> + <menu weight="5" level="0" text="System" entryID="system_selection"> <id val="system" /> <item level="0" text="Language..." entryID="language_setup"><screen module="LanguageSelection" /></item> <item level="0" entryID="usage_setup"><setup id="usage" /></item> @@ -72,16 +72,16 @@ </menu>--> <item level="2" text="Timeshift path..." entryId="timeshift_path"><screen module="LocationBox" screen="TimeshiftLocationBox" /></item> </menu> - <item level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item> - <item level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item> + <item weight="10" level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item> + <item weight="15" level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item> <!--item level="0" text="Startwizard" entryID="startwizzard"><screen module="StartWizard" screen="StartWizard" /></item--> - <item level="0" text="Default settings" entryID="default_wizard"> + <item weight="20" level="0" text="Default settings" entryID="default_wizard"> <code> from Screens.DefaultWizard import DefaultWizard self.session.open(DefaultWizard, silent = False) </code> </item> - <item level="0" text="Factory reset" entryID="factory_reset"> + <item weight="25" level="0" text="Factory reset" entryID="factory_reset"> <code> from Screens.FactoryReset import FactoryReset def msgClosed(ret): diff --git a/data/setup.xml b/data/setup.xml index e2ab09b1..17301f23 100644 --- 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">config.av.generalAC3delay</item> + <item level="1" text="General PCM delay">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> diff --git a/data/skin_default.xml b/data/skin_default.xml index f99e1a76..67f8d163 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -172,9 +172,9 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) <widget name="bottom" position="10,230" size="430,25" font="Regular;23" /> </screen> <!-- Common interface - selection --> - <screen name="CiSelection" position="140,226" size="440,160" title="Common Interface"> + <screen name="CiSelection" position="140,226" size="440,185" title="Common Interface"> <widget name="text" position="10,10" size="430,25" font="Regular;23" /> - <widget name="entries" position="10,55" size="420,100" scrollbarMode="showOnDemand" /> + <widget name="entries" position="10,55" size="420,125" scrollbarMode="showOnDemand" /> </screen> <!-- Console --> <screen name="Console" position="90,95" size="560,430" title="Command execution..."> @@ -448,7 +448,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) <widget name="PositionGauge" position="15,138" size="396,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" /> <widget name="repeat" pixmaps="skin_default/icons/repeat_off.png,skin_default/icons/repeat_on.png" position="416,135" size="22,15" transparent="1" alphatest="on"/> <widget name="filelist" position="15,163" size="550,138" scrollbarMode="showOnDemand" /> - <widget name="playlist" position="15,314" size="550,154" scrollbarMode="showOnDemand" selectionDisabled="1" /> + <widget name="playlist" position="15,322" size="550,138" scrollbarMode="showOnDemand" selectionDisabled="1" /> <widget name="currenttext" position="0,0" size="0,0" /> <widget name="titletext" position="0,0" size="0,0" /> </screen> @@ -913,10 +913,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" /> <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" /> </screen> - <!-- Subservice selection --> - <screen name="SubserviceSelection" position="210,163" size="300,255" title="Subservices"> - <widget name="subservices" position="20,10" size="260,230" scrollbarMode="showOnDemand" /> - </screen> <!-- Subservice quickzap --> <screen name="SubservicesQuickzap" position="124,470" size="512,200" title="Subservices" backgroundColor="transparent" flags="wfNoBorder"> <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="450,0" zPosition="2" size="14,14" alphatest="on" > |