diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-05-27 11:36:01 +0200 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-05-27 11:36:01 +0200 |
| commit | 51e789a04f758941668b095fd8b051db2ce58281 (patch) | |
| tree | 2880f280e7f1006f7df12508e3b871c54442d304 /data | |
| parent | 8e60bdc64c73787b8e7955a6a99ad5afe4a071ef (diff) | |
| parent | 26a9b45a2a0e746739b8fa2ef339dbd716257a0c (diff) | |
| download | enigma2-51e789a04f758941668b095fd8b051db2ce58281.tar.gz enigma2-51e789a04f758941668b095fd8b051db2ce58281.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'data')
| -rw-r--r-- | data/keymap.xml | 6 | ||||
| -rw-r--r-- | data/setup.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/keymap.xml b/data/keymap.xml index 8f708698..036ea467 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -332,7 +332,7 @@ <map context="InfobarTimeshiftActions"> <device name="dreambox remote control (native)"> - <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" /> + <key id="KEY_YELLOW" mapto="timeshiftStart" flags="b" /> <key id="KEY_TV" mapto="timeshiftStop" flags="m" /> </device> <device name="dreambox advanced remote control (native)"> @@ -351,7 +351,7 @@ <map context="InfobarTimeshiftActivateActions"> <device name="dreambox remote control (native)"> <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" /> - <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" /> + <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="b" /> </device> <device name="dreambox advanced remote control (native)"> <key id="KEY_PREVIOUSSONG" mapto="timeshiftActivateEnd" flags="m" /> @@ -412,7 +412,7 @@ </device> <device name="dreambox advanced remote control (native)"> <key id="KEY_0" mapto="toggleMark" flags="m" /> - <key id="KEY_YELLOW" mapto="toggleMark" flags="m" /> + <key id="KEY_YELLOW" mapto="toggleMark" flags="b" /> </device> <device name="dreambox ir keyboard"> <key id="KEY_TAB" mapto="toggleMark" flags="m" /> diff --git a/data/setup.xml b/data/setup.xml index 583850da..d8d58369 100644 --- a/data/setup.xml +++ b/data/setup.xml @@ -98,7 +98,7 @@ <item text="Brightness">config.osd.bright</item> <item text="Contrast">config.osd.contrast</item> </setup> - <setup key="lcd" title="Display Setup"> + <setup key="lcd" title="Display Setup" requires="FrontpanelDisplay"> <item level="0" text="Brightness">config.lcd.bright</item> <item level="0" text="Contrast">config.lcd.contrast</item> <item level="0" text="Standby">config.lcd.standby</item> |