17.0: sync toolkit with en-US rev106924:3c38673c4b1c
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Wed, 26 Sep 2012 02:11:54 +0900
changeset 831 64652ab9a56f86bdb5457a66c87b73f079408d33
parent 830 1e62dae14d83b40ee24cc0f9af5f75650d9fb85f
child 832 fcb1d5bae0747836dff02b04d8916d772d231bdf
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs17
17.0: sync toolkit with en-US rev106924:3c38673c4b1c
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global-platform/unix/platformKeys.properties
toolkit/chrome/global-platform/win/platformKeys.properties
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key - open up arrow symbol (ctrl-e)
 VK_SHIFT=\u21e7
 
 #the command key - clover leaf symbol (ctrl-q)
 VK_META=\u2318
 
+#the win key - never generated by native key event
+VK_WIN=win
+
 #the option/alt key - splitting tracks symbol (ctrl-g)
 VK_ALT=\u2325
 
 #the control key. hat symbol (ctrl-f)
 VK_CONTROL=\u2303
 
 #the separator character used between modifiers (none on Mac OS)
 MODIFIER_SEPARATOR=
--- a/toolkit/chrome/global-platform/unix/platformKeys.properties
+++ b/toolkit/chrome/global-platform/unix/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT	= Shift
 
 #the command key
 VK_META		= Meta
 
+#the win key (Super key and Hyper keys are mapped to DOM Win key)
+VK_WIN		= Win
+
 #the alt key
 VK_ALT		= Alt
 
 #the control key
 VK_CONTROL	= Ctrl
 
 #the separator character used between modifiers 
 MODIFIER_SEPARATOR = +
--- a/toolkit/chrome/global-platform/win/platformKeys.properties
+++ b/toolkit/chrome/global-platform/win/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT	= Shift
 
 #the command key
 VK_META		= Meta
 
+#the win key
+VK_WIN		= Win
+
 #the alt key
 VK_ALT		= Alt
 
 #the control key
 VK_CONTROL	= Ctrl
 
 #the separator character used between modifiers 
 MODIFIER_SEPARATOR = +