Changeset 1128 for trunk/dll

Timestamp:

Aug 29, 2008, 4:03:23 PM (17 years ago)

Author:

John Small

Message:

Ticket 259: 1) Support save/restore of target dir with states (except FM2Shutdown)

2) Added separate toolbar setting for FM/2 Lite
3) Improved earlier changes for this ticket

Location:

trunk/dll

Files:

• mainwnd.c (modified) (3 diffs)
• mainwnd2.c (modified) (2 diffs)

trunk/dll/mainwnd.c

@@ -67 +67 @@
   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
+  27 Aug 08 JBS Ticket 259: Support saving/restoring toolbars with states
+  29 Aug 08 JBS Ticket 259: Support saving/restoring target directories with states (except the shutdown state)
 
 ***********************************************************************/
@@ -2839 +2841 @@
   sprintf(szPrefix, "%s.", pszStateName);
 
-  sprintf(szKey, "%sToolbar", szPrefix);
-  PrfWriteProfileString(fmprof, FM3Str, szKey, lasttoolbar);
+  if (*lasttoolbar) {
+    sprintf(szKey, "%sToolbar", szPrefix);
+    PrfWriteProfileString(fmprof, FM3Str, szKey, lasttoolbar);
+  }
+
+  if (*targetdir && !fIsShutDownState) {
+    sprintf(szKey, "%sTargetDir", szPrefix);
+    PrfWriteProfileString(fmprof, FM3Str, szKey, targetdir);
+  }
 
   henum = WinBeginEnumWindows(hwndClient);
@@ -3078 +3087 @@
     load_tools(NULL);
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
+  }
+  size = (ULONG)0;
+  sprintf(szKey, "%sTargetDir", szPrefix);
+  if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
+  {
+    PrfQueryProfileData(fmprof, FM3Str, szKey, targetdir, &size);
+    PrfWriteProfileString(fmprof, FM3Str, "TargetDir", targetdir);
+    SetTargetDir(NULL, TRUE);
   }
   size = sizeof(SWP);

trunk/dll/mainwnd2.c

@@ -24 +24 @@
   14 Feb 08 SHL Rework to support settings menu conditional cascade
   29 Feb 08 GKY Use xfree where appropriate
+  27 Aug 08 JBS Ticket 259: Support saving/restoring toolbars with states
 
 ***********************************************************************/
@@ -702 +703 @@
           strcpy(lasttoolbar,
                  quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART]);
-          PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
+//        PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
+          PrfWriteProfileString(fmprof, appname, "LastToolbar", lasttoolbar);
         }
         PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);