add key www and directory to hotkey setup

openatv · Jan 8, 2015 · 47fb3b4 · 47fb3b4
1 parent eec62de
commit 47fb3b4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/data/keymap.ntr b/data/keymap.ntr
@@ -246,9 +246,9 @@
         <key id="KEY_ZOOM" mapto="ZoomInOut" flags="b" />
         <key id="KEY_ZOOM" mapto="ZoomOff" flags="l" />
         <key id="KEY_CONNECT" mapto="HarddiskSetup" flags="b" />
-        <key id="KEY_WWW" mapto="showWWW" flags="m" />
+        <key id="KEY_WWW" mapto="showWWW" flags="b" />
         <key id="KEY_SETUP" mapto="showSetup" flags="m" />
-        <key id="KEY_DIRECTORY" mapto="showPluginBrowser" flags="mm" />
+        <key id="KEY_DIRECTORY" mapto="showPluginBrowser" flags="b" />
         <key id="KEY_PVR" mapto="showMovies" flags="m" />
         <key id="KEY_PROG1" mapto="HarddiskSetup" flags="b" />
         <key id="KEY_OPEN" mapto="showMovies" flags="b" />
@@ -934,6 +934,10 @@
 		<key id="KEY_FILE" mapto="file_long" flags="l"/>
 		<key id="KEY_OPEN" mapto="open" flags="b"/>
 		<key id="KEY_OPEN" mapto="open_long" flags="l"/>
+		<key id="KEY_WWW" mapto="www" flags="b"/>
+        <key id="KEY_WWW" mapto="www_long" flags="l"/>
+        <key id="KEY_DIRECTORY" mapto="directory" flags="b"/>
+        <key id="KEY_DIRECTORY" mapto="directory_long" flags="l"/>
 		<key id="KEY_TIME" mapto="timeshift" flags="b"/>
 		<key id="KEY_SEARCH" mapto="search" flags="b"/>
 		<key id="KEY_RESTART" mapto="slow" flags="b"/>

diff --git a/data/keymap.u80 b/data/keymap.u80
@@ -830,6 +830,10 @@
 		<key id="KEY_FILE" mapto="file_long" flags="l"/>
 		<key id="KEY_OPEN" mapto="open" flags="b"/>
 		<key id="KEY_OPEN" mapto="open_long" flags="l"/>
+		<key id="KEY_WWW" mapto="www" flags="b"/>
+        <key id="KEY_WWW" mapto="www_long" flags="l"/>
+        <key id="KEY_DIRECTORY" mapto="directory" flags="b"/>
+        <key id="KEY_DIRECTORY" mapto="directory_long" flags="l"/>
 		<key id="KEY_TIME" mapto="timeshift" flags="b"/>
 		<key id="KEY_SEARCH" mapto="search" flags="b"/>
 		<key id="KEY_RESTART" mapto="slow" flags="b"/>

diff --git a/data/keymap.xml b/data/keymap.xml
@@ -248,9 +248,9 @@
 		<key id="KEY_ZOOM" mapto="ZoomInOut" flags="b" />
 		<key id="KEY_ZOOM" mapto="ZoomOff" flags="l" />
 		<key id="KEY_CONNECT" mapto="HarddiskSetup" flags="b" />
-		<key id="KEY_WWW" mapto="showWWW" flags="m" />
+		<key id="KEY_WWW" mapto="showWWW" flags="b" />
 		<key id="KEY_SETUP" mapto="showSetup" flags="m" />
-		<key id="KEY_DIRECTORY" mapto="showPluginBrowser" flags="mm" />
+		<key id="KEY_DIRECTORY" mapto="showPluginBrowser" flags="b" />
 		<key id="KEY_PVR" mapto="showMovies" flags="m" />
 		<key id="KEY_PROG1" mapto="HarddiskSetup" flags="b" />
 		<key id="KEY_OPEN" mapto="showMovies" flags="b" />
@@ -975,6 +975,10 @@
 		<key id="KEY_FILE" mapto="file_long" flags="l"/>
 		<key id="KEY_OPEN" mapto="open" flags="b"/>
 		<key id="KEY_OPEN" mapto="open_long" flags="l"/>
+		<key id="KEY_WWW" mapto="www" flags="b"/>
+        <key id="KEY_WWW" mapto="www_long" flags="l"/>
+        <key id="KEY_DIRECTORY" mapto="directory" flags="b"/>
+        <key id="KEY_DIRECTORY" mapto="directory_long" flags="l"/>
 		<key id="KEY_TIME" mapto="timeshift" flags="b"/>
 		<key id="KEY_SEARCH" mapto="search" flags="b"/>
 		<key id="KEY_RESTART" mapto="slow" flags="b"/>

diff --git a/lib/python/Screens/ButtonSetup.py b/lib/python/Screens/ButtonSetup.py
@@ -48,6 +48,10 @@
 	(_("File long"), "file_long", ""),
 	(_("Open"), "open", ""),
 	(_("Open long"), "open_long", ""),
+	(_("Www"), "www", ""),
+    (_("Www long"), "www_long", ""),
+    (_("Directory"), "directory", ""),
+    (_("Directory long"), "directory_long", ""),
 	(_("Back/Recall"), "back", ""),
 	(_("Back/Recall") + " " + _("long"), "back_long", ""),
 	(_("Home"), "home", ""),