[hotkey] update key_text

openhdf · Aug 16, 2016 · d63b693 · d63b693
1 parent d47368d
commit d63b693
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/data/keymap.ntr b/data/keymap.ntr
@@ -781,8 +781,7 @@
 		<key id="KEY_RADIO" mapto="radio_long" flags="l" />
 		<key id="KEY_TV" mapto="showTv" flags="b" />
 		<key id="KEY_TV" mapto="showTv_long" flags="l" />
-		<key id="KEY_TEXT" mapto="texter" flags="b" />
-		<key id="KEY_TEXT" mapto="texter_long" flags="l" />
+		<key id="KEY_TEXT" mapto="text" flags="m" />
 		<key id="KEY_HELP" mapto="helpshow" flags="b" />
 		<key id="KEY_HELP" mapto="helpshow_long" flags="l" />
 		<key id="KEY_SUBTITLE" mapto="subtitle" flags="b" />

diff --git a/data/keymap.u80 b/data/keymap.u80
@@ -771,8 +771,7 @@
 		<key id="KEY_RADIO" mapto="radio_long" flags="l" />
 		<key id="KEY_TV" mapto="showTv" flags="b" />
 		<key id="KEY_TV" mapto="showTv_long" flags="l" />
-		<key id="KEY_TEXT" mapto="texter" flags="b" />
-		<key id="KEY_TEXT" mapto="texter_long" flags="l" />
+		<key id="KEY_TEXT" mapto="text" flags="m" />
 		<key id="KEY_HELP" mapto="helpshow" flags="b" />
 		<key id="KEY_HELP" mapto="helpshow_long" flags="l" />
 		<key id="KEY_SUBTITLE" mapto="subtitle" flags="b" />

diff --git a/data/keymap.usr b/data/keymap.usr
@@ -832,8 +832,7 @@
 		<key id="KEY_RADIO" mapto="radio_long" flags="l" />
 		<key id="KEY_TV" mapto="showTv" flags="b" />
 		<key id="KEY_TV" mapto="showTv_long" flags="l" />
-		<key id="KEY_TEXT" mapto="texter" flags="b" />
-		<key id="KEY_TEXT" mapto="texter_long" flags="l" />
+		<key id="KEY_TEXT" mapto="text" flags="m" />
 		<key id="KEY_HELP" mapto="helpshow" flags="b" />
 		<key id="KEY_HELP" mapto="helpshow_long" flags="l" />
 		<key id="KEY_SUBTITLE" mapto="subtitle" flags="b" />

diff --git a/data/keymap.xml b/data/keymap.xml
@@ -890,8 +890,7 @@
 		<key id="KEY_RADIO" mapto="radio_long" flags="l" />
 		<key id="KEY_TV" mapto="showTv" flags="b" />
 		<key id="KEY_TV" mapto="showTv_long" flags="l" />
-		<key id="KEY_TEXT" mapto="texter" flags="b" />
-		<key id="KEY_TEXT" mapto="texter_long" flags="l" />
+		<key id="KEY_TEXT" mapto="text" flags="m" />
 		<key id="KEY_HELP" mapto="helpshow" flags="b" />
 		<key id="KEY_HELP" mapto="helpshow_long" flags="l" />
 		<key id="KEY_SUBTITLE" mapto="subtitle" flags="b" />

diff --git a/data/keymap.xpe b/data/keymap.xpe
@@ -899,8 +899,7 @@
 		<key id="KEY_RADIO" mapto="radio_long" flags="l" />
 		<key id="KEY_TV" mapto="showTv" flags="b" />
 		<key id="KEY_TV" mapto="showTv_long" flags="l" />
-		<key id="KEY_TEXT" mapto="texter" flags="b" />
-		<key id="KEY_TEXT" mapto="texter_long" flags="l" />
+		<key id="KEY_TEXT" mapto="text" flags="m" />
 		<key id="KEY_HELP" mapto="helpshow" flags="b" />
 		<key id="KEY_HELP" mapto="helpshow_long" flags="l" />
 		<key id="KEY_SUBTITLE" mapto="subtitle" flags="b" />

diff --git a/lib/python/Screens/Hotkey.py b/lib/python/Screens/Hotkey.py
@@ -15,7 +15,7 @@
 from Components.Label import Label
 import os
 
-updateversion = "05.07.2016"
+updateversion = "16.08.2016"
 
 def getHotkeys():
 	return [(_("OK long"), "okbutton_long", "Infobar/openInfoBarEPG"),
@@ -117,8 +117,7 @@ def getHotkeys():
 	(_("Stop long"), "stop_long", "Infobar/stopTimeshift"),
 	(_("Subtitle"), "subtitle", "Infobar/subtitleSelection"),
 	(_("Subtitle long"), "subtitle_long", "Infobar/subserviceSelection"),
-	(_("Teletext"), "texter", "Infobar/startTeletext"),
-	(_("Teletext long"), "texter_long", ""),
+	(_("Teletext"), "text", "Infobar/startTeletext"),
 	(_("Timer"), "timer", "Module/Screens.TimerEdit/TimerEditList"),
 	(_("Timer long"), "timer_long", "Module/Screens.PowerTimerEdit/PowerTimerEditList"),
 	(_("Timeshift"), "timeshift", "Infobar/startTimeshift"),