git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make our event loop compatible to my new twisted reactor core
[enigma2.git]
/
data
/
keymap.xml
diff --git
a/data/keymap.xml
b/data/keymap.xml
index 221f1552e707972439461af63a6d0a72db7ee972..24c36a8f52759054217a323c196e6a8e341b1b9e 100644
(file)
--- a/
data/keymap.xml
+++ b/
data/keymap.xml
@@
-86,6
+86,10
@@
<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
</map>
<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
</map>
+ <map context="MenuActions">
+ <key id="KEY_MENU" mapto="menu" flags="mr" />
+ </map>
+
<map context="InfobarShowHideActions">
<key id="KEY_OK" mapto="toggleShow" flags="m" />
<key id="KEY_EXIT" mapto="hide" flags="m" />
<map context="InfobarShowHideActions">
<key id="KEY_OK" mapto="toggleShow" flags="m" />
<key id="KEY_EXIT" mapto="hide" flags="m" />
@@
-93,6
+97,7
@@
<map context="InfobarActions">
<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
<map context="InfobarActions">
<key id="KEY_VIDEO" mapto="showMovies" flags="m" />
+ <key id="KEY_RADIO" mapto="showRadio" flags="m" />
</map>
<map context="InfobarAudioSelectionActions">
</map>
<map context="InfobarAudioSelectionActions">
@@
-157,10
+162,10
@@
<key id="KEY_UP" mapto="up" flags="m" />
<key id="KEY_DOWN" mapto="down" flags="m" />
<key id="KEY_UP" mapto="up" flags="m" />
<key id="KEY_DOWN" mapto="down" flags="m" />
+ <key id="KEY_VIDEO" mapto="movieList" flags="m" />
</map>
<map context="MoviePlayerActions">
</map>
<map context="MoviePlayerActions">
- <key id="KEY_VIDEO" mapto="leavePlayer" flags="m" />
<key id="KEY_TV" mapto="leavePlayer" flags="m" />
</map>
<key id="KEY_TV" mapto="leavePlayer" flags="m" />
</map>
@@
-195,6
+200,15
@@
<key id="KEY_0" mapto="0" flags="m" />
</map>
<key id="KEY_0" mapto="0" flags="m" />
</map>
+ <map context="ContextMenuActions">
+ <key id="KEY_MENU" mapto="contextMenu" flags="m" />
+ </map>
+
+ <map context="TvRadioActions">
+ <key id="KEY_TV" mapto="keyTV" flags="m" />
+ <key id="KEY_RADIO" mapto="keyRadio" flags="m" />
+ </map>
+
<map context="EPGSelectActions">
<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
<key id="KEY_YELLOW" mapto="yellow" flags="m" />
<map context="EPGSelectActions">
<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
<key id="KEY_YELLOW" mapto="yellow" flags="m" />
@@
-252,7
+266,4
@@
<map context="StandbyActions">
<key id="KEY_POWER" mapto="power" flags="m" />
</map>
<map context="StandbyActions">
<key id="KEY_POWER" mapto="power" flags="m" />
</map>
- <map context="ContextMenuActions">
- <key id="KEY_MENU" mapto="contextMenu" flags="m" />
- </map>
</keymap>
</keymap>