git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unify the two update plugins and add a menu to the new unified plugin
[enigma2.git]
/
data
/
keymap.xml
diff --git
a/data/keymap.xml
b/data/keymap.xml
index f2fae39b31c825dcc517c5be92109a01ed2dc8b5..e21e70dbdc83739c4f22c100f65fe61a93287ab3 100644
(file)
--- a/
data/keymap.xml
+++ b/
data/keymap.xml
@@
-76,7
+76,8
@@
<key id="KEY_RIGHT" mapto="zapDown" flags="mr" />
<key id="KEY_UP" mapto="switchChannelUp" flags="mr" />
<key id="KEY_DOWN" mapto="switchChannelDown" flags="mr" />
<key id="KEY_RIGHT" mapto="zapDown" flags="mr" />
<key id="KEY_UP" mapto="switchChannelUp" flags="mr" />
<key id="KEY_DOWN" mapto="switchChannelDown" flags="mr" />
-
+ <key id="KEY_PREVIOUS" mapto="historyBack" flags="mr" />
+ <key id="KEY_NEXT" mapto="historyNext" flags="mr" />
<key id="BTN_0" mapto="zapUp" flags="mr" />
<key id="BTN_1" mapto="zapDown" flags="mr" />
</map>
<key id="BTN_0" mapto="zapUp" flags="mr" />
<key id="BTN_1" mapto="zapDown" flags="mr" />
</map>
@@
-97,13
+98,6
@@
<key id="KEY_EXIT" mapto="back" flags="m" />
</map>
<key id="KEY_EXIT" mapto="back" flags="m" />
</map>
- <map context="MinuteInputActions">
- <key id="KEY_UP" mapto="up" flags="mr" />
- <key id="KEY_DOWN" mapto="down" flags="mr" />
- <key id="KEY_OK" mapto="ok" flags="m" />
- <key id="KEY_EXIT" mapto="cancel" flags="m" />
- </map>
-
<map context="InfobarMenuActions">
<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
</map>
<map context="InfobarMenuActions">
<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
</map>
@@
-180,6
+174,10
@@
<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
</map>
<key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
</map>
+ <map context="MovieSelectionActions">
+ <key id="KEY_MENU" mapto="contextMenu" flags="m" />
+ </map>
+
<map context="InfobarMovieListActions">
<key id="KEY_UP" mapto="up" flags="m" />
<key id="KEY_DOWN" mapto="down" flags="m" />
<map context="InfobarMovieListActions">
<key id="KEY_UP" mapto="up" flags="m" />
<key id="KEY_DOWN" mapto="down" flags="m" />
@@
-189,6
+187,12
@@
<map context="MoviePlayerActions">
<key id="KEY_TV" mapto="leavePlayer" flags="m" />
</map>
<map context="MoviePlayerActions">
<key id="KEY_TV" mapto="leavePlayer" flags="m" />
</map>
+
+ <map context="InfobarCueSheetActions">
+ <key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
+ <key id="KEY_PLAYPAUSE" mapto="toggleMark" flags="m" />
+ <key id="KEY_NEXTSONG" mapto="jumpNextMark" flags="m" />
+ </map>
<map context="ChannelSelectBaseActions">
<key id="KEY_RED" mapto="showAllServices" flags="m" />
<map context="ChannelSelectBaseActions">
<key id="KEY_RED" mapto="showAllServices" flags="m" />
@@
-218,8
+222,8
@@
<map context="EPGSelectActions">
<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
<map context="EPGSelectActions">
<key id="KEY_GREEN" mapto="timerAdd" flags="m" />
- <key id="KEY_YELLOW" mapto="yellow" flags="m" />
- <key id="KEY_BLUE" mapto="blue" flags="m" />
+ <key id="KEY_YELLOW" mapto="yellow" flags="m
r
" />
+ <key id="KEY_BLUE" mapto="blue" flags="m
r
" />
<key id="KEY_INFO" mapto="info" flags="m" />
</map>
<key id="KEY_INFO" mapto="info" flags="m" />
</map>