Changeset 1486 for trunk/dll/mainwnd.c

Timestamp:

Dec 17, 2009, 1:36:04 AM (16 years ago)

Author:

Gregg Young

Message:

Initial changes to commands handling. Allows you to reorder commands menu without breaking toolbars and changing hotkeys. Fixes the environment so it is used and so it is deleted if the command is deleted. Allows for user defined bitmaps in toolbars which are named based on the text or the the ID of the command.The new commands.dat will not be usable with earlier versions of FM/2

File:

• trunk/dll/mainwnd.c (modified) (4 diffs)

trunk/dll/mainwnd.c

@@ -1582 +1582 @@
       }
       if (!hwndTool) {
-        HBITMAP hbm = LoadBitmapFromFileNum(tool->id);
+        HBITMAP hbm = LoadBitmapFromFileIdentifier(tool->id, tool->text);
 
         if (hbm) {
@@ -5360 +5360 @@
           break;
         }
-        x = SHORT1FROMMP(mp1) - IDM_COMMANDSTART;
+        x = SHORT1FROMMP(mp1);// - IDM_COMMANDSTART;
         if (x >= 0) {
-          x++;
+          //x++;
           RunCommand(hwndCnr, x);
           if (fUnHilite) {
@@ -6013 +6013 @@
 
   case UM_ADDTOMENU:
-    AddToMenu((CHAR *)mp1, WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+    AddToMenu((
+               CHAR *)mp1, WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                             FID_MENU));
     return 0;
@@ -6351 +6352 @@
                                                  LM_QUERYSELECTION,
                                                  MPFROMSHORT(LIT_FIRST), MPVOID);
-              if (sSelect >= 0)
+              if (sSelect >= 0) {
+                CHAR s[CCHMAXPATH];
+                CHAR *p;
+
+                WinSendMsg(hwndCmdlist, LM_QUERYITEMTEXT,
+                           MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
+                p = strrchr(s, '}');
+                p = 0;
+                p = strrchr(s, '{');
+                p++;
                 WinPostMsg(hwnd,
                            WM_COMMAND,
-                           MPFROM2SHORT(IDM_COMMANDSTART + sSelect, 0),
-                           MPVOID);
-              WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
+                           MPFROM2SHORT(atol(p), 0), //IDM_COMMANDSTART + sSelect, 0),
+                           MPVOID);
+              }
+                WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
             }
           }