Changeset 1122 for trunk/dll/tools.c

Timestamp:

Aug 27, 2008, 6:28:12 PM (17 years ago)

Author:

John Small

Message:

Ticket 267 changes: fix typos, standardize on "Toolbar" over "Toolbox"
and improve/correct wording related to toolbars and toolbar files.

File:

• trunk/dll/tools.c (modified) (8 diffs)

trunk/dll/tools.c

@@ -118 +118 @@
   }
   if (!filename || !*filename)
-    filename = (*lasttoolbox) ? lasttoolbox : "CMDS.TLS";
+    filename = (*lasttoolbar) ? lasttoolbar : "CMDS.TLS";
   if (*filename)
     fname = searchpath(filename);
@@ -125 +125 @@
   if (fname && *fname) {
     filename = fname;
-    strcpy(lasttoolbox, filename);
+    strcpy(lasttoolbar, filename);
     fp = _fsopen(filename, "r", SH_DENYWR);
     if (fp) {
@@ -187 +187 @@
 
   if (!filename)
-    filename = lasttoolbox;
+    filename = lasttoolbar;
   if (*filename)
     fname = searchpath(filename);
@@ -193 +193 @@
     filename = fname;
   else {
-    if (*lasttoolbox)
-      filename = lasttoolbox;
+    if (*lasttoolbar)
+      filename = lasttoolbar;
     else
       filename = "FM3TOOLS.TLS";
@@ -205 +205 @@
     filename = "FM3TOOLS.TLS";
   if (toolhead && filename && *filename) {
-    strcpy(lasttoolbox, filename);
-    PrfWriteProfileString(fmprof, FM3Str, "LastToolBox", filename);
+    strcpy(lasttoolbar, filename);
+    PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", filename);
   }
   if (!toolhead) {
@@ -911 +911 @@
     else {
       WinSetWindowULong(hwnd, QWL_USER, FALSE);
-      WinSetWindowText(hwnd, GetPString(IDS_LOADTOOLBOXTITLETEXT));
+      WinSetWindowText(hwnd, GetPString(IDS_LOADTOOLBARTITLETEXT));
     }
     WinSendDlgItemMsg(hwnd,
@@ -960 +960 @@
     WinSetDlgItemText(hwnd,
                       SVBTN_CURRENT,
-                      (*lasttoolbox) ? lasttoolbox : "FM3TOOLS.DAT");
+                      (*lasttoolbar) ? lasttoolbar : "FM3TOOLS.DAT");
     break;
 
@@ -1018 +1018 @@
         CHAR temptools[CCHMAXPATH];
 
-        strcpy(temptools, lasttoolbox);
+        strcpy(temptools, lasttoolbar);
         if (fToolsChanged)
           save_tools(NULL);
         WinQueryDlgItemText(hwnd,
-                            SVBTN_ENTRY, sizeof(lasttoolbox), lasttoolbox);
-        if (*lasttoolbox) {
-          if (!strchr(lasttoolbox, '.'))
-            strcat(lasttoolbox, ".TLS");
-        }
-        if (saving && *lasttoolbox)
+                            SVBTN_ENTRY, sizeof(lasttoolbar), lasttoolbar);
+        if (*lasttoolbar) {
+          if (!strchr(lasttoolbar, '.'))
+            strcat(lasttoolbar, ".TLS");
+        }
+        if (saving && *lasttoolbar)
           save_tools(NULL);
         else {
           if (!load_tools(NULL)) {
-            strcpy(lasttoolbox, temptools);
+            strcpy(lasttoolbar, temptools);
             if (!load_tools(NULL)) {
-              *lasttoolbox = 0;
+              *lasttoolbar = 0;
               load_tools(NULL);
             }
           }
         }
-        PrfWriteProfileString(fmprof, FM3Str, "LastToolBox", lasttoolbox);
+        PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
       }
       WinDismissDlg(hwnd, 1);