Fix GlobalHotKey tutorial

Import/GacUI.Windows.cpp

@@ -13932,7 +13932,16 @@ WindowsInputService
 					return L"?";
 				}
 				GetKeyNameText((int)scanCode, name, sizeof(name)/sizeof(*name));
-				return name[0]?name:L"?";
+				if (name[0])
+				{
+					WString result = name;
+					vint index = predefinedKeys.Keys().IndexOf(result);
+					if (index != -1 && predefinedKeys.Values()[index] == code)
+					{
+						return result;
+					}
+				}
+				return WString::Unmanaged(L"?");
 			}
 
 			void WindowsInputService::InitializeKeyNames()
@@ -13952,6 +13961,13 @@ WindowsInputService
 				,isTimerEnabled(false)
 				,keyNames((vint)VKEY::KEY_MAXIMUM)
 			{
+#define INITIALIZE_KEY_NAME(NAME, TEXT)\
+				keyNames[(vint)VKEY::KEY_ ## NAME] = WString::Unmanaged(TEXT);\
+				if (!predefinedKeys.Keys().Contains(WString::Unmanaged(TEXT))) predefinedKeys.Add(WString::Unmanaged(TEXT), VKEY::KEY_ ## NAME);\
+
+				GUI_DEFINE_KEYBOARD_WINDOWS_NAME(INITIALIZE_KEY_NAME)
+#undef INITIALIZE_KEY_NAME
+
 				InitializeKeyNames();
 			}
 

Import/GacUI.Windows.h

@@ -2068,6 +2068,7 @@ namespace vl
 
 				collections::Array<WString>				keyNames;
 				collections::Dictionary<WString, VKEY>	keys;
+				collections::Dictionary<WString, VKEY>	predefinedKeys;
 
 				WString									GetKeyNameInternal(VKEY code);
 				void									InitializeKeyNames();

Import/GacUI.h

@@ -985,15 +985,15 @@ ITEM(F11,					L"F11")\
 ITEM(F12,					L"F12")\
 ITEM(NUMLOCK,				L"Pause")\
 ITEM(SCROLL,				L"Scroll Lock")\
-ITEM(BROWSER_HOME,			L"M")\
+ITEM(BROWSER_HOME,			L"BROWSER_HOME")\
-ITEM(VOLUME_MUTE,			L"D")\
+ITEM(VOLUME_MUTE,			L"VOLUME_MUTE")\
-ITEM(VOLUME_DOWN,			L"C")\
+ITEM(VOLUME_DOWN,			L"VOLUME_DOWN")\
-ITEM(VOLUME_UP,				L"B")\
+ITEM(VOLUME_UP,				L"VOLUME_UP")\
-ITEM(MEDIA_NEXT_TRACK,		L"P")\
+ITEM(MEDIA_NEXT_TRACK,		L"MEDIA_NEXT_TRACK")\
-ITEM(MEDIA_PREV_TRACK,		L"Q")\
+ITEM(MEDIA_PREV_TRACK,		L"MEDIA_PREV_TRACK")\
-ITEM(MEDIA_STOP,			L"J")\
+ITEM(MEDIA_STOP,			L"MEDIA_STOP")\
-ITEM(MEDIA_PLAY_PAUSE,		L"G")\
+ITEM(MEDIA_PLAY_PAUSE,		L"MEDIA_PLAY_PAUSE")\
-ITEM(LAUNCH_APP2,			L"F")\
+ITEM(LAUNCH_APP2,			L"LAUNCH_APP2")\
 ITEM(OEM_PLUS,				L"=")\
 ITEM(OEM_COMMA,				L",")\
 ITEM(OEM_MINUS,				L"-")\

Tutorial/GacUI_Controls/GlobalHotKey/GlobalHotKey.vcxproj

@@ -155,6 +155,9 @@
       <Project>{96c559ca-9718-4bec-a053-28a0ab6a8ca2}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Xml Include="UI\Resource.xml" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Tutorial/GacUI_Controls/GlobalHotKey/GlobalHotKey.vcxproj.filters

@@ -33,4 +33,9 @@
       <Filter>UI</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <Xml Include="UI\Resource.xml">
+      <Filter>Resource Files</Filter>
+    </Xml>
+  </ItemGroup>
 </Project>