Changeset 1121

Timestamp:

Aug 27, 2008, 2:07:20 AM (17 years ago)

Author:

Gregg Young

Message:

Require unique ID plus text and help strings for all tools save toolbar on button delete. (Tickets 264, 266 & 272)

Location:

trunk/dll

Files:

• fm3dll.str (modified) (1 diff)
• fm3str.h (modified) (2 diffs)
• mainwnd.c (modified) (3 diffs)
• tools.c (modified) (5 diffs)

trunk/dll/fm3dll.str

@@ -101 +101 @@
                                             FM/2 mini-command line help
 Type "/OPEN path" to open a new Directory Container.\r\rType "/CLOSE path" to close a Directory Container.\r\rType "/FILTER filter" to filter a Directory Container.\r\rType "/KEEP" or "/NOKEEP" to set the type of cmd window (autoclose or not).\r\rType "/SAVE" or "/NOSAVE" to save (or not) cmd lines between sessions.\r\r[Up arrow] or [down arrow] or [+] button for listbox of previous command lines, then [Delete] to remove one or [Enter] to reuse.\r\rOr type a command to be executed (metastrings like %%a available.)\r\rDouble-click entry field to simulate hitting [Enter].\r\rF5 is the accelerator for this mini-command line.
-
-
+Some text is missing
+You need to provide both button text & help.
 8.Helvetica.Bold
 4.System VIO

trunk/dll/fm3str.h

@@ -21 +21 @@
   17 Jul 08 JBS "Renumbered" IDS_SHUTDOWNSTATE because its old numbers was "in use"
   24 Aug 08 GKY Add strings for limited/inadequate drive space checks
+  26 Aug 08 GKY Error strings for require unique ID plus text and help strings for all tools
 
 ***********************************************************************/
@@ -133 +134 @@
 #define IDS_FM2CMDHELPHDRTEXT                                 100
 #define IDS_FM2CMDHELPTEXT                                    101
+#define IDS_MISSINGTEXT                                       102
+#define IDS_TOOLHELPTEXTBLANK                                 103
 #define IDS_8HELVBOLDTEXT                                     104
 #define IDS_4SYSTEMVIOTEXT                                    105

trunk/dll/mainwnd.c

@@ -66 +66 @@
                 18 Jul 08 SHL Use new Fortify feature to avoid spurious reports
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
+  26 Aug 08 GKY Require unique ID plus text and help strings for all tools save toolbar on button delete
 
 ***********************************************************************/
@@ -1240 +1241 @@
       if (id)
         PostMsg(WinQueryWindow(hwnd, QW_PARENT), UM_SETUP,
-                MPFROM2SHORT(id, 0), MPVOID);
+                MPFROM2SHORT(id, 0), MPVOID);
       return 0;
 
@@ -2558 +2559 @@
         if (fToolTitles)
           WinShowWindow(WinWindowFromID(hwnd, id + 25000), FALSE);
-        ResizeTools(hwnd);
+        ResizeTools(hwnd);
+        save_tools(NULL);
       }
     }

trunk/dll/tools.c

@@ -20 +20 @@
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
   24 Aug 08 GKY Warn full drive on save of .DAT & .TLS files; prevent loss of existing file
+  26 Aug 08 GKY Require unique ID plus text and help strings for all tools save toolbar on button delete
 
 ***********************************************************************/
@@ -705 +706 @@
         CHAR help[81], text[81], idstr[7];
         BOOL invisible, dropable, separator, istext, myicon;
-        TOOL *tool;
-
+        TOOL *tool;
+        BOOL BadID = FALSE;
+
+        help[0] = text[0] = NULL;
         WinQueryDlgItemText(hwnd, ADDBTN_HELP, 80, help);
         WinQueryDlgItemText(hwnd, ADDBTN_TEXT, 80, text);
@@ -733 +736 @@
           xfree(tool->text, pszSrcFile, __LINE__);
           tool->text = NULL;
-          if (*help)
+          if (*help && *text && help && text) {
             tool->help = xstrdup(help, pszSrcFile, __LINE__);
-          if (*text)
-            tool->text = xstrdup(text, pszSrcFile, __LINE__);
+            tool->text = xstrdup(text, pszSrcFile, __LINE__);
+          }
+          else {
+            saymsg(MB_ENTER,
+                   hwnd,
+                   GetPString(IDS_MISSINGTEXT),
+                   GetPString(IDS_TOOLHELPTEXTBLANK));
+            WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, ADDBTN_HELP));
+            break;
+          }
           tool->flags = (((dropable) ? T_DROPABLE : 0) |
                          ((invisible) ? T_INVISIBLE : 0) |
@@ -753 +764 @@
         tool = toolhead;
         while (tool) {
-          if (tool->id == (USHORT) atoi(idstr) && tool != tool) {
+          if (tool->id == (USHORT) atoi(idstr)) { // && tool != tool) {
             saymsg(MB_ENTER,
                    hwnd,
@@ -759 +770 @@
                    GetPString(IDS_TOOLIDEXISTS));
             WinSetDlgItemText(hwnd, ADDBTN_ID, NullStr);
-            WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, ADDBTN_ID));
+            WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, ADDBTN_ID));
+            BadID =TRUE;
             break;
           }
           tool = tool->next;
-        }
+        }
+        if (BadID)
+          break;
         tool = xmallocz(sizeof(TOOL), pszSrcFile, __LINE__);
         if (tool) {