diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-10-12 23:06:10 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-10-12 23:06:10 +0200 |
| commit | 1f8ab286ff814c027468ac6c73ed61d9f6c13074 (patch) | |
| tree | 714888e81d2d63fa084f1b38489d06871ca81b8a /data | |
| parent | 5128198769b3220d23a000a8841e9224f3bf86f8 (diff) | |
| parent | 5f8883ca9bab4cd9c3996d818dfb3caee11ecab7 (diff) | |
| download | enigma2-1f8ab286ff814c027468ac6c73ed61d9f6c13074.tar.gz enigma2-1f8ab286ff814c027468ac6c73ed61d9f6c13074.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'data')
| -rwxr-xr-x | data/keymap.xml | 2 | ||||
| -rwxr-xr-x | data/skin_default.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/keymap.xml b/data/keymap.xml index e207c3c9..25538f87 100755 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -586,7 +586,7 @@ <key id="KEY_RED" mapto="disableTimer" flags="mr" /> <key id="KEY_YELLOW" mapto="toggleAsk" flags="mr" /> <key id="KEY_GREEN" mapto="toggleAction" flags="mr" /> - <!--key id="KEY_BLUE" mapto="settings" flags="mr" /--> + <key id="KEY_BLUE" mapto="useServiceTime" flags="mr" /> </map> <map context="CiSelectionActions"> diff --git a/data/skin_default.xml b/data/skin_default.xml index df07e4d7..582a169b 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -893,16 +893,16 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget source="introduction" render="Label" position="0,370" size="560,30" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" /> </screen> <!-- Sleeptimer edit --> - <screen name="SleepTimerEdit" position="center,center" size="500,200" title="Sleep Timer"> + <screen name="SleepTimerEdit" position="center,center" size="500,240" title="Sleep Timer"> <widget name="current_status" position="40,40" size="400,30" valign="center" font="Regular;20" /> <widget name="red" pixmap="skin_default/buttons/button_red.png" position="10,88" size="12,12" alphatest="on" /> <widget name="green" pixmap="skin_default/buttons/button_green.png" position="10,128" size="12,12" alphatest="on" /> <widget name="yellow" pixmap="skin_default/buttons/button_yellow.png" position="10,168" size="12,12" alphatest="on" /> - <widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,168" size="12,12" alphatest="on" /> + <widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,208" size="12,12" alphatest="on" /> <widget name="red_text" position="40,80" size="400,30" valign="center" font="Regular;20" /> <widget name="green_text" position="40,120" size="400,30" valign="center" font="Regular;20" /> <widget name="yellow_text" position="40,160" size="400,30" valign="center" font="Regular;20" /> - <widget name="blue_text" position="40,200" size="400,30" valign="center" font="Regular;20" /> + <widget name="blue_text" position="40,200" size="450,30" valign="center" font="Regular;20" /> <widget name="pretext" position="15,10" size="235,25" font="Regular;19" /> <widget name="input" position="260,10" size="40,25" font="Regular;19" /> <widget name="aftertext" position="305,10" size="100,25" font="Regular;19" /> |