Changeset 1128

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

Files:

• cfgmgr.cmd (modified) (5 diffs)
• dll/mainwnd.c (modified) (3 diffs)
• dll/mainwnd2.c (modified) (2 diffs)

trunk/cfgmgr.cmd

@@ -14 +14 @@
            /UNATTENDED
                    Runs without user interaction/confirmation
+
+           /TOOLBARSONLY
+                   Process toolbar-related files only
 
    If CFGMGR.CMD is run without parameters, it will install a default
@@ -56 +59 @@
    if cfg.operation = 'INSTALL' then
       if file_exists \= '' then
-         do
-            if cfg.defaults = 1 then
-               if FilesAreDifferent(cfg.file.f.default, cfg.file.f.name) = 1 then
-                  do
-                     if cfg.unattended = 0 then
-                        do
-                           user_choice = PromptForReplaceOption(f)
-                           if user_choice == 'Q' then
-                              signal NormalExit
-                           if user_choice == 'N' then
-                              iterate
-                        end
-                     /* unattended = 1 or user_choice = 'Y' */
-                     cfg.errorcode = CfgAction( 'RESETTODEFAULT', f )
-                  end
+         if (cfg.toolbarsonly = 0 | cfg.file.f.toolbar = 1) then
+            do
+               if cfg.defaults = 1 then
+                  if FilesAreDifferent(cfg.file.f.default, cfg.file.f.name) = 1 then
+                     do
+                        if cfg.unattended = 0 then
+                           do
+                              user_choice = PromptForReplaceOption(f)
+                              if user_choice == 'Q' then
+                                 signal NormalExit
+                              if user_choice == 'N' then
+                                 iterate
+                           end
+                        /* unattended = 1 or user_choice = 'Y' */
+                        cfg.errorcode = CfgAction( 'RESETTODEFAULT', f )
+                     end
+                  else
+                     nop
                else
-                  nop
-            else
-               if (cfg.file.f.toolbar = 1) & (cfg.unattended = 1) then
-                  call Ticket267Fix cfg.file.f.name
-         end
+                  if (cfg.file.f.toolbar = 1) & (cfg.unattended = 1) then
+                     call Ticket267Fix cfg.file.f.name
+            end
+         else
+            nop
       else
         cfg.errorcode = CfgAction( 'INSTALLDEFAULT', f )
@@ -166 +172 @@
    cfg.defaults      = 0
    cfg.unattended    = 0
+   cfg.toolbarsonly  = 0
    cfg.actionmethod  = 'COPY'       /* The default method of backing up and restoring */
    cfg.backupdir     = '.\User_Config_Backup'
@@ -323 +330 @@
          when param = '/DEFAULTS' then
             cfg.defaults = 1
+         when param = '/TOOLBARSONLY' then
+            cfg.toolbarsonly = 1
          otherwise
             cfg.errorcode = 2
@@ -570 +579 @@
         call SysIni inifile, 'FM/3', 'LastToolbar', LastToolbar
       end
-   if SysIni(inifile, 'FM/3', 'FM2Shudown.Toolbar') = 'ERROR:' then
+   if SysIni(inifile, 'FM/3', 'FM2Shutdown.Toolbar') = 'ERROR:' then
                 call SysIni inifile, 'FM/3', 'FM2Shutdown.Toolbar', LastToolbar
+   if SysIni(inifile, 'FM/4', 'Toolbar') = 'ERROR:' then
+                call SysIni inifile, 'FM/4', 'Toolbar', LastToolbar
 return
 

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);