Changeset 1125 for trunk/dll/mainwnd.c

Timestamp:

Aug 27, 2008, 6:35:43 PM (17 years ago)

Author:

John Small

Message:

Ticket 259: Support saving and restoring a toolbar with DirCnr states.

File:

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

trunk/dll/mainwnd.c

@@ -107 +107 @@
 static BOOL RestoreDirCnrState(HWND hwndClient, PSZ pszStateName, BOOL noview);
 static VOID DeletePresParams(PSZ pszKeyroot);
+static VOID BuildTools(HWND hwndT, BOOL resize);
 
 static MRESULT EXPENTRY MainObjectWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
@@ -1291 +1292 @@
                     (PVOID) (SHORT1FROMMP(mp1) == IDM_SAVETOOLS) ?
                     "TRUE" : NULL))
-        BuildTools(hwndToolback, TRUE);
+        PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
       break;
     }
@@ -1410 +1411 @@
 }
 
-VOID BuildTools(HWND hwndT, BOOL resize)
+static VOID BuildTools(HWND hwndT, BOOL resize)
 {
   TOOL *tool;
@@ -1420 +1421 @@
   henum = WinBeginEnumWindows(hwndT);
   while ((hwndTool = WinGetNextWindow(henum)) != NULLHANDLE)
-    WinDestroyWindow(hwndTool);
+    if (!WinDestroyWindow(hwndTool))
+      Runtime_Error(pszSrcFile, __LINE__, "Unable to destroy toolbar button");
   WinEndEnumWindows(henum);
   if (!fToolbar) {
@@ -2565 +2567 @@
     return 0;
 
+  case UM_SETUP2:  /* Used to load a new a toolbar */
+    BuildTools(hwnd, TRUE);
+    return 0;
+
   case WM_CHORD:
     {
@@ -2584 +2590 @@
     if (WinDlgBox(HWND_DESKTOP,
                   hwnd, ToolIODlgProc, FM3ModHandle, SVBTN_FRAME, MPVOID))
-      BuildTools(hwnd, TRUE);
+      PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
     return MRFROMSHORT(TRUE);
 
@@ -2832 +2838 @@
   fIsShutDownState = strcmp(pszStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0;
   sprintf(szPrefix, "%s.", pszStateName);
+
+  sprintf(szKey, "%sToolbar", szPrefix);
+  PrfWriteProfileString(fmprof, FM3Str, szKey, lasttoolbar);
 
   henum = WinBeginEnumWindows(hwndClient);
@@ -3059 +3068 @@
   fDeleteState = strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)) == 0;
 
+  size = (ULONG)0;
+  sprintf(szKey, "%sToolbar", szPrefix);
+  if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
+  {
+    if (fToolsChanged)
+      save_tools(NULL);
+    PrfQueryProfileData(fmprof, FM3Str, szKey, lasttoolbar, &size);
+    PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
+    load_tools(NULL);
+    PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
+  }
   size = sizeof(SWP);
   sprintf(szKey, "%sMySizeLastTime", szPrefix);
@@ -5107 +5127 @@
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER), SHORT1FROMMP(mp1),
                  &fTextTools, TRUE, "TextTools");
-    BuildTools(hwndToolback, TRUE);
+    PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
     PostMsg(WinQueryWindow(hwnd, QW_PARENT), WM_UPDATEFRAME,
             MPFROMLONG(FCF_SIZEBORDER), MPVOID);
@@ -5115 +5135 @@
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER), SHORT1FROMMP(mp1),
                  &fToolTitles, TRUE, "ToolTitles");
-    BuildTools(hwndToolback, TRUE);
+    PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
     PostMsg(WinQueryWindow(hwnd, QW_PARENT), WM_UPDATEFRAME,
             MPFROMLONG(FCF_SIZEBORDER), MPVOID);
@@ -5201 +5221 @@
 
   case IDM_CREATETOOL:
-    BuildTools(hwndToolback, TRUE);
+    PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
     break;
 
@@ -5207 +5227 @@
     SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER),
                  IDM_TOOLSUBMENU, &fToolbar, TRUE, "Toolbar");
-    BuildTools(hwndToolback, TRUE);
+    PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
     WinShowWindow(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                   MAIN_TOOLS), fToolbar);
@@ -5398 +5418 @@
             load_tools(NULL);
           else {
-            strcpy(lasttoolbox,
+            strcpy(lasttoolbar,
                    quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART]);
-            PrfWriteProfileString(fmprof, FM3Str, "LastToolBox", lasttoolbox);
+            PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
           }
-          BuildTools(hwndToolback, TRUE);
+          PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
         }
       }
@@ -5716 +5736 @@
      * start up some initial children
      */
-    load_tools(NULL);
-    BuildTools(hwndToolback, TRUE);
     WinShowWindow(WinQueryWindow(hwnd, QW_PARENT), TRUE);
     PostMsg(MainObjectHwnd, UM_SETUP2, mp1, mp2);
@@ -5768 +5786 @@
                           SWP_ZORDER | SWP_ACTIVATE);
       }
-      ResizeTools(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                  MAIN_TOOLS));
+//       ResizeTools(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+//                                MAIN_TOOLS));
     }
     PostMsg(MainObjectHwnd, UM_SETUP3, mp1, mp2);
@@ -5780 +5798 @@
       PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszStatename), MPVOID);
       if (!add_setup(pszStatename))
-              save_setups();
+        save_setups();
+    } else {
+      load_tools(NULL);
+      PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
     }
     PostMsg(MainObjectHwnd, UM_SETUP4, mp1, mp2);
@@ -6037 +6058 @@
           if (!foundit) {
             thisone = FALSE;
-            p = strrchr(lasttoolbox, '\\');
+            p = strrchr(lasttoolbar, '\\');
             if (!p)
-              p = lasttoolbox;
+              p = lasttoolbar;
             else
               p++;
@@ -6062 +6083 @@
         priority_bumped();
       }
-      WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBOXTEXT));
+      WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBARTEXT));
     }
     return 0;
@@ -6270 +6291 @@
               load_tools(path);
               PrfWriteProfileString(fmprof,
-                                    FM3Str, "LastToolBox", lasttoolbox);
-              BuildTools(hwndToolback, TRUE);
-              WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBOXTEXT));
+                                    FM3Str, "LastToolbar", lasttoolbar);
+              PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
+              WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBARTEXT));
             }
             else if (SHORT1FROMMP(mp1) == MAIN_SETUPLIST) {