diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-05-27 18:48:09 +0200 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-06-09 10:06:27 +0200 |
| commit | 6e09f26f57500f8acfe5bcf28faa930849d457a2 (patch) | |
| tree | c0e81998094a32e3beb0580bb65f6d059fc115d1 /data/skin_default.xml | |
| parent | 2d2dba6c413197b6b86f140a2986c15b03e62517 (diff) | |
| download | enigma2-6e09f26f57500f8acfe5bcf28faa930849d457a2.tar.gz enigma2-6e09f26f57500f8acfe5bcf28faa930849d457a2.zip | |
more experimenting on vobsubs
Diffstat (limited to 'data/skin_default.xml')
| -rwxr-xr-x | data/skin_default.xml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/data/skin_default.xml b/data/skin_default.xml index edf61357..9f70e0d0 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -62,8 +62,13 @@ <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 --> +<<<<<<< HEAD <screen name="AudioSelection" position="center,center" size="560,330" title="Audio"> <widget name="config" position="50,10" size="500,110" scrollbarMode="showOnDemand" /> +======= + <screen name="AudioSelection" position="center,center" size="520,330" title="Audio"> + <widget name="config" position="50,10" size="460,110" scrollbarMode="showOnDemand" /> +>>>>>>> more experimenting on vobsubs <widget source="key_red" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="10,10" size="35,25" alphatest="on"> <convert type="ConditionalShowHide" /> @@ -78,6 +83,7 @@ <convert type="ConditionalShowHide" /> </widget> +<<<<<<< HEAD <widget source="key_red" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="10,10" size="35,25" alphatest="on"> <convert type="ConditionalShowHide" /> @@ -96,10 +102,16 @@ <widget source="streams" render="Listbox" scrollbarMode="showOnDemand" position="10,120" size="540,200" zPosition="3" transparent="1" > +======= + <ePixmap pixmap="skin_default/div-h.png" position="10,112" size="500,2" /> + + <widget source="streams" render="Listbox" scrollbarMode="showOnDemand" position="10,120" size="500,200" zPosition="3" transparent="1" > +>>>>>>> more experimenting on vobsubs <convert type="TemplatedMultiContent"> {"templates": {"default": (25, [ MultiContentEntryText(pos = (0, 0), size = (35, 25), font = 0, flags = RT_HALIGN_LEFT, text = 1), # key, +<<<<<<< HEAD <convert type="TemplatedMultiContent"> {"templates": {"default": (25, [ @@ -125,6 +137,19 @@ } </convert> </widget> +======= + MultiContentEntryText(pos = (40, 0), size = (55, 25), font = 0, flags = RT_HALIGN_LEFT, text = 2), # number, + MultiContentEntryText(pos = (100, 0), size = (120, 25), font = 0, flags = RT_HALIGN_LEFT, text = 3), # description, + MultiContentEntryText(pos = (230, 0), size = (200, 25), font = 0, flags = RT_HALIGN_LEFT, text = 4), # language, + MultiContentEntryText(pos = (440, 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 = (120, 25), font = 0, flags = RT_HALIGN_LEFT, text = 3), # description, + MultiContentEntryText(pos = (230, 0), size = (200, 25), font = 0, flags = RT_HALIGN_LEFT, text = 4), # language, + MultiContentEntryText(pos = (440, 4), size = (60, 25), font = 1, flags = RT_HALIGN_RIGHT, text = 5), # selection, +>>>>>>> more experimenting on vobsubs ], False, "showNever") }, "fonts": [gFont("Regular", 20), gFont("Regular", 16)], |