Package Manager: fixed HotKeys (thanks to w3seek) *shamed*

svn path=/trunk/; revision=14592

diff --git a/rosapps/packmgr/gui/generic.rc b/rosapps/packmgr/gui/generic.rc
index 2548649..8aaed69 100644 (file)
--- a/rosapps/packmgr/gui/generic.rc
+++ b/rosapps/packmgr/gui/generic.rc
@@ -22,3 +22,13 @@ IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp"
 13 ICON DISCARDABLE "res/update.ico"\r
 14 ICON DISCARDABLE "res/uninstall.ico"\r
 \r
 13 ICON DISCARDABLE "res/update.ico"\r
 14 ICON DISCARDABLE "res/uninstall.ico"\r
 \r

+/* HotKeys */\r
+\r
+IDR_HOTKEYS ACCELERATORS DISCARDABLE \r
+BEGIN\r
+    "1",   2,   VIRTKEY, CONTROL\r
+    "2",   3,   VIRTKEY, CONTROL\r
+    "3",   4,   VIRTKEY, CONTROL\r
+    "4",   5,   VIRTKEY, CONTROL\r
+    "0",   1,   VIRTKEY, CONTROL\r
+END\r

diff --git a/rosapps/packmgr/gui/main.cpp b/rosapps/packmgr/gui/main.cpp
index eb06779..7e33cca 100644 (file)
--- a/rosapps/packmgr/gui/main.cpp
+++ b/rosapps/packmgr/gui/main.cpp
@@ -67,8 +67,11 @@ int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, in
        // Start getting messages\r
        while(GetMessage(&msg,NULL,0,0))\r
        {\r
        // Start getting messages\r
        while(GetMessage(&msg,NULL,0,0))\r
        {\r

-         TranslateMessage(&msg);\r
-         DispatchMessage(&msg);\r
+               if(!TranslateAccelerator(hwnd, hHotKeys, &msg))\r
+               {\r
+                       TranslateMessage(&msg);\r
+                       DispatchMessage(&msg);\r
+               }\r

        }\r
        \r
        // Close our handle\r
        }\r
        \r
        // Close our handle\r


@@ -152,11 +155,7 @@ void InitControls (HWND hwnd)
        ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(10))); \r
 \r
        // Setup Hotkeys\r
        ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(10))); \r
 \r
        // Setup Hotkeys\r

-       RegisterHotKey(hwnd, 1, MOD_CONTROL, VK_1);\r
-       RegisterHotKey(hwnd, 2, MOD_CONTROL, VK_2);\r
-       RegisterHotKey(hwnd, 3, MOD_CONTROL, VK_3);\r
-       RegisterHotKey(hwnd, 4, MOD_CONTROL, VK_4);\r
-       RegisterHotKey(hwnd, 0, MOD_CONTROL, VK_0);\r
+       hHotKeys = LoadAccelerators (hinst, MAKEINTRESOURCE(IDR_HOTKEYS));\r

 }\r
 \r
 // Set the Icons\r
 }\r
 \r
 // Set the Icons\r

diff --git a/rosapps/packmgr/gui/main.h b/rosapps/packmgr/gui/main.h
index 93451f9..0a82ae2 100644 (file)
--- a/rosapps/packmgr/gui/main.h
+++ b/rosapps/packmgr/gui/main.h
@@ -19,6 +19,7 @@ int selected, splitter_pos = 50;
 \r
 pTree tree;\r
 HMENU hPopup;\r
 \r
 pTree tree;\r
 HMENU hPopup;\r

+HACCEL hHotKeys;\r

 HWND hTBar, hTree, hEdit, hStatus;\r
 HTREEITEM nodes [MAXNODES];\r
 \r
 HWND hTBar, hTree, hEdit, hStatus;\r
 HTREEITEM nodes [MAXNODES];\r
 \r

diff --git a/rosapps/packmgr/gui/resource.h b/rosapps/packmgr/gui/resource.h
index 90aa5f7..b52531e 100644 (file)
--- a/rosapps/packmgr/gui/resource.h
+++ b/rosapps/packmgr/gui/resource.h
@@ -12,3 +12,4 @@
 #define IDC_STATUS2            0x111 \r
 #define IDC_CANCEL             0x112 \r
 #define IDC_TSTATUS            0x113 \r
 #define IDC_STATUS2            0x111 \r
 #define IDC_CANCEL             0x112 \r
 #define IDC_TSTATUS            0x113 \r

+#define IDR_HOTKEYS            0x114\r