Changeset 1488 for trunk/dll/misc.c

Timestamp:

Dec 22, 2009, 12:42:55 AM (16 years ago)

Author:

Gregg Young

Message:

Fixed commands so reordering them in commands.dat no longer changes their ID or hot key assignment; added 20 new hot keys; the environment information is now used when executing a command; some code clean up in command.c; added CheckExecutibleFlags to systemf.c the eliminate repetative code in assoc.c, command.c & cmdline.c

File:

• trunk/dll/misc.c (modified) (3 diffs)

trunk/dll/misc.c

@@ -63 +63 @@
   22 Jul 09 GKY Check if drives support EAs add driveflag for this
   22 Jul 09 GKY Allow .LONGNAME to be displayed for FAT drives.
+  21 Dec 09 GKY Allow command menu reorder without changing the "ID" or hot key for a command.
+                Added load_inicommand to load the IDs from the ini file.
 
 ***********************************************************************/
@@ -1320 +1322 @@
                                   MPVOID, MPVOID);
     WinSendMsg(mit.hwndSubMenu, MM_DELETEITEM, MPFROMSHORT(-1), MPVOID);
-    //for (x = 0; x < numitems; x++)
     info = cmdhead;
     while (info) {
       WinSendMsg(mit.hwndSubMenu, MM_DELETEITEM,
                  MPFROMSHORT((SHORT) (info->ID)), MPVOID);
+      x++;
       info = info->next;
+    }
+    while (numitems != MIT_ERROR) { // Delete items that were deleted from commands since the ID is gone
+      numitems = (SHORT) WinSendMsg(mit.hwndSubMenu, MM_ITEMIDFROMPOSITION,
+                                    MPFROMSHORT((SHORT) 1), MPVOID);
+      WinSendMsg(mit.hwndSubMenu, MM_DELETEITEM,
+                 MPFROMSHORT(numitems), MPVOID);
     }
     if (hwndCnr && cmdhead) {
@@ -1332 +1340 @@
       while (info) {
 
-        CHAR s[CCHMAXPATH + 24];
+        CHAR s[CCHMAXPATH + 24];
 
         sprintf(s,
-                "%s {%i} %s%s",
+                "%s {%i} %s%s%s",
                 info->title, info->ID,
-                info->HotKeyID ? "\tCtrl + " : NullStr,
-                info->HotKeyID && info->HotKeyID > 4310 ? "Shift + " : NullStr);
+                info->HotKeyID && info->HotKeyID < IDM_COMMANDNUM20 ? "\tCtrl + " : NullStr,
+                info->HotKeyID && info->HotKeyID > IDM_COMMANDNUM19 ? "\tAlt + " : NullStr,
+                info->HotKeyID && ((info->HotKeyID > IDM_COMMANDNUM9 &&
+                                   info->HotKeyID < IDM_COMMANDNUM20) ||
+                info->HotKeyID > IDM_COMMANDNUM29) ? "Shift + " : NullStr);
         if (info->HotKeyID)
           sprintf(&s[strlen(s)], "%d",
-                  (((info->HotKeyID - 4301) % 10) + 1) == 10 ? 0 :
-                  ((info->HotKeyID - 4301) % 10) + 1);
-        mi.id = info->ID; //IDM_COMMANDSTART + x;
+                  (((info->HotKeyID - IDM_COMMANDNUM0) % 10) + 1) == 10 ? 0 :
+                   ((info->HotKeyID - IDM_COMMANDNUM0) % 10) + 1);
+        mi.id = info->ID; 
         mi.afAttribute = (info->flags & ONCE ? MIA_CHECKED : 0) |
                          (info->flags & PROMPT ? MIA_FRAMED : 0);
         mi.afStyle = MIS_TEXT;
-        if (!(x % 24) && x && info->next)
+        if (!(x % 20) && x && info->next)
           mi.afStyle |= MIS_BREAK;
         WinSendMsg(mit.hwndSubMenu, MM_INSERTITEM, MPFROMP(&mi), MPFROMP(s));