diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-05-25 10:43:10 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 23:14:02 +0200 |
| commit | 46fd0ceb0b4850ffa9f2f3e1efd42b914eeef748 (patch) | |
| tree | 833bd543359a31ee4473068c82b8457479852f6d /data | |
| parent | 441ac3dbbc2c5dfd21b09b00f6d376a115ac32a5 (diff) | |
| download | enigma2-46fd0ceb0b4850ffa9f2f3e1efd42b914eeef748.tar.gz enigma2-46fd0ceb0b4850ffa9f2f3e1efd42b914eeef748.zip | |
experimentally merge audio + subtitle streams selection dialogs into one
Diffstat (limited to 'data')
| -rwxr-xr-x | data/menu.xml | 1 | ||||
| -rwxr-xr-x | data/skin_default.xml | 47 |
2 files changed, 43 insertions, 5 deletions
diff --git a/data/menu.xml b/data/menu.xml index 6507bfe3..6e103542 100755 --- a/data/menu.xml +++ b/data/menu.xml @@ -17,7 +17,6 @@ <item text="Network setup" entryID="network_setup">self.openSetup("network")</item>--> <!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>--> <!--<item text="Radio"><code>print "radio mode"</code></item>--> - <item level="0" text="Subtitles" entryID="subtitle_selection" weight="40"><screen module="Subtitles" screen="Subtitles" /></item> <item level="0" text="Timer" entryID="timer_edit"><screen module="TimerEdit" screen="TimerEditList" /></item> <item level="1" text="VCR scart" entryID="scart_switch" requires="ScartSwitch"><code>self.session.scart.VCRSbChanged(3)</code></item> diff --git a/data/skin_default.xml b/data/skin_default.xml index 8e0c1562..5c40c7d0 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -62,8 +62,47 @@ <widget name="statuspic" pixmaps="skin_default/buttons/button_green.png,skin_default/buttons/button_green_off.png" position="130,380" zPosition="10" size="15,16" transparent="1" alphatest="on"/> </screen> <!-- Audio selection --> - <screen name="AudioSelection" position="center,center" size="300,170" title="Audio"> - <widget name="tracks" position="20,10" size="260,150" scrollbarMode="showOnDemand" /> + <screen name="AudioSelection" position="center,center" size="420,330" title="Audio"> + <widget name="config" position="50,10" size="360,110" scrollbarMode="showOnDemand" /> + + <widget source="key_red" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="10,10" size="35,25" alphatest="on"> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="key_green" render="Pixmap" pixmap="skin_default/buttons/key_green.png" position="10,35" size="35,25" alphatest="on"> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="key_yellow" render="Pixmap" pixmap="skin_default/buttons/key_yellow.png" position="10,60" size="35,25" alphatest="on"> + <convert type="ConditionalShowHide" /> + </widget> + <widget source="key_blue" render="Pixmap" pixmap="skin_default/buttons/key_blue.png" position="10,85" size="35,25" alphatest="on"> + <convert type="ConditionalShowHide" /> + </widget> + + <ePixmap pixmap="skin_default/div-h.png" position="10,112" zPosition="10" size="360,2" /> + + <widget source="streams" render="Listbox" scrollbarMode="showOnDemand" position="10,120" size="400,200" zPosition="3" transparent="1" > + <convert type="TemplatedMultiContent"> + {"templates": + {"default": (25, [ + MultiContentEntryText(pos = (0, 0), size = (35, 25), font = 0, flags = RT_HALIGN_LEFT, text = 1), # key, + MultiContentEntryText(pos = (40, 0), size = (55, 25), font = 0, flags = RT_HALIGN_LEFT, text = 2), # number, + MultiContentEntryText(pos = (100, 0), size = (80, 25), font = 0, flags = RT_HALIGN_LEFT, text = 3), # description, + MultiContentEntryText(pos = (190, 0), size = (140, 25), font = 0, flags = RT_HALIGN_LEFT, text = 4), # language, + MultiContentEntryText(pos = (340, 4), size = (60, 25), font = 1, flags = RT_HALIGN_RIGHT, text = 5), # selection, + ], True, "showNever"), + "notselected": (25, [ + MultiContentEntryText(pos = (0, 0), size = (35, 25), font = 0, flags = RT_HALIGN_LEFT, text = 1), # key, + MultiContentEntryText(pos = (40, 0), size = (55, 25), font = 0, flags = RT_HALIGN_LEFT, text = 2), # number, + MultiContentEntryText(pos = (100, 0), size = (80, 25), font = 0, flags = RT_HALIGN_LEFT, text = 3), # description, + MultiContentEntryText(pos = (190, 0), size = (140, 25), font = 0, flags = RT_HALIGN_LEFT, text = 4), # language, + MultiContentEntryText(pos = (340, 4), size = (60, 25), font = 1, flags = RT_HALIGN_RIGHT, text = 5), # selection, + ], False, "showNever") + }, + "fonts": [gFont("Regular", 20), gFont("Regular", 16)], + "itemHeight": 25 + } + </convert> + </widget> </screen> <!-- Bouquet selector --> <screen name="BouquetSelector" position="center,center" size="300,240" title="Choose bouquet"> @@ -941,9 +980,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) </widget> </screen> <!-- Subtitle selection --> - <screen name="Subtitles" position="center,center" size="380,285" title="Subtitle selection"> +<!-- <screen name="Subtitles" position="center,center" size="380,285" title="Subtitle selection"> <widget name="config" position="10,10" zPosition="1" size="360,275" scrollbarMode="showOnDemand" /> - </screen> + </screen>--> <!-- Subtitle area --> <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" /> <!-- TextBox --> |