diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-01-25 16:15:44 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-01-25 16:15:44 +0000 |
| commit | 9bfa0ff587586c3bfe761200ca9fd890081024d4 (patch) | |
| tree | 39a3d5e32fe3ae96e35b532e3852e0e58554369e /data | |
| parent | 258cced121c935a4affa19561b461c3e46f1de8a (diff) | |
| download | enigma2-9bfa0ff587586c3bfe761200ca9fd890081024d4.tar.gz enigma2-9bfa0ff587586c3bfe761200ca9fd890081024d4.zip | |
many info handling changes (nownext/multi/single epg)
Diffstat (limited to 'data')
| -rw-r--r-- | data/button-fs8.png | 0 | ||||
| -rw-r--r-- | data/button-selected-fs8.png | 0 | ||||
| -rw-r--r-- | data/keymap.xml | 8 | ||||
| -rw-r--r-- | data/skin.xml | 26 |
4 files changed, 32 insertions, 2 deletions
diff --git a/data/button-fs8.png b/data/button-fs8.png new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/data/button-fs8.png diff --git a/data/button-selected-fs8.png b/data/button-selected-fs8.png new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/data/button-selected-fs8.png diff --git a/data/keymap.xml b/data/keymap.xml index 1e6fbd5a..f2fae39b 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -64,7 +64,7 @@ </map> <map context="InfobarEPGActions"> - <key id="KEY_INFO" mapto="showEPGList" flags="m" /> + <key id="KEY_INFO" mapto="showEventInfo" flags="m" /> </map> <map context="InfobarInstantRecord"> @@ -229,6 +229,12 @@ <key id="KEY_LEFT" mapto="prevEvent" flags="mr" /> <key id="KEY_RIGHT" mapto="nextEvent" flags="mr" /> <key id="KEY_GREEN" mapto="timerAdd" flags="m" /> + <key id="KEY_INFO" mapto="cancel" flags="m" /> + </map> + + <map context="EventViewEPGActions"> + <key id="KEY_YELLOW" mapto="openSingleServiceEPG" flags="m" /> + <key id="KEY_BLUE" mapto="openMultiServiceEPG" flags="m" /> </map> <map context="OkCancelActions"> diff --git a/data/skin.xml b/data/skin.xml index ec26d555..dc1d86b9 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -40,6 +40,9 @@ <!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />--> <widget name="menu" position="10,55" size="290,175" scrollbarMode="showOnDemand" /> </screen> + <screen name="BouquetSelector" position="210,150" size="300,195" title="Choose bouquet"> + <widget name="menu" position="10,10" size="280,175" scrollbarMode="showOnDemand" /> + </screen> <screen name="Scart" position="0,0" size="720,576"> </screen> <screen name="ServiceInfo" position="160,120" size="400,330" title="Serviceinfo"> @@ -268,14 +271,35 @@ <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" /> </screen> <screen name="EPGSelection" position="90,100" size="560,420" title="EPG Selection"> + <widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" /> + <widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" /> + <widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Regular;21" /> + <widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Regular;21" /> <widget name="list" position="0,40" size="560,375" scrollbarMode="showOnDemand" /> + </screen> + <screen name="EPGSelectionMulti" position="90,100" size="560,420" title="EPG Selection"> <widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" /> <widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" /> <widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Regular;21" /> <widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Regular;21" /> + <widget name="now_button" position="10,40" size="123,40" pixmap="/usr/share/enigma2/button-fs8.png" /> + <widget name="next_button" position="143,40" size="123,40" pixmap="/usr/share/enigma2/button-fs8.png" /> + <widget name="more_button" position="276,40" size="123,40" pixmap="/usr/share/enigma2/button-fs8.png" /> + <widget name="now_button_sel" position="10,40" size="123,40" pixmap="/usr/share/enigma2/button-selected-fs8.png" /> + <widget name="next_button_sel" position="143,40" size="123,40" pixmap="/usr/share/enigma2/button-selected-fs8.png" /> + <widget name="more_button_sel" position="276,40" size="123,40" pixmap="/usr/share/enigma2/button-selected-fs8.png" /> + <widget name="now_text" text="NOW" zPosition="2" position="10,40" size="123,40" transparent="1" halign="center" valign="center" font="Regular;21" /> + <widget name="next_text" text="NEXT" zPosition="2" position="143,40" size="123,40" transparent="1" halign="center" valign="center" font="Regular;21" /> + <widget name="more_text" text="MORE" zPosition="2" position="276,40" size="123,40" transparent="1" halign="center" valign="center" font="Regular;21" /> + <widget name="date" position="410,40" size="140,40" valign="center" halign="right" font="Regular;24" /> + <widget name="list" position="00,85" size="560,325" scrollbarMode="showOnDemand" /> </screen> <screen name="EventView" position="100,100" size="520,380" title="Eventview"> - <widget name="epg_description" position="10,5" size="500,335" font="Regular;22" /> + <widget name="key_red" position="0,0" size="130,30" backgroundColor="red" font="Regular;21" /> + <widget name="key_green" position="130,0" size="130,30" backgroundColor="green" font="Regular;21" /> + <widget name="key_yellow" position="260,0" size="130,30" backgroundColor="yellow" font="Regular;21" /> + <widget name="key_blue" position="390,0" size="130,30" backgroundColor="blue" font="Regular;21" /> + <widget name="epg_description" position="10,40" size="500,305" font="Regular;22" /> <widget name="datetime" position="10,345" size="130,30" font="Regular;22" /> <widget name="duration" position="140,345" size="100,30" font="Regular;22" /> <widget name="channel" position="240,345" size="270,30" font="Regular;22" /> |
