Changeset 965 for trunk/dll

Timestamp:

Feb 19, 2008, 8:51:19 PM (18 years ago)

Author:

John Small

Message:

Changes made to support having the "State at FM/2 close" accessible through
the States combo box.

Location:

trunk/dll

Files:

• mainwnd.c (modified) (2 diffs)
• walkem.c (modified) (2 diffs)

trunk/dll/mainwnd.c

@@ -46 +46 @@
   16 Jan 08 SHL Add sync updates toggle
   16 Jan 08 GKY Fix changing background color on toolbar
-  xx Jan 08 JBS Ticket 150: fix/improve save and restore of dir cnr state at FM/2 close/reopen
   17 Jan 08 GKY Add presparam save & restore for individual directory containers
+  19 Jan 08 JBS Ticket 150: fix/improve save and restore of dir cnr state at FM/2 close/reopen
   19 Jan 08 GKY Rework Utilities menu
   05 Feb 08 SHL Restore no-prescan drives if restoring named state
   14 Feb 08 SHL Rework to support settings menu conditional cascade
   15 Feb 08 SHL Rework ResizeChildren to honor fNoTreeGap and resize drive tree better
+  19 Feb 08 JBS Stop deleting "State at last FM/2 Close" from INI file so it be accessed from States combo box.
 
 ***********************************************************************/
@@ -2980 +2981 @@
   fIsShutDownState = strcmp(pszStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0;
   // Delete saved state if restored saved state or internally saved state
-  fDeleteState = fIsShutDownState ||
+  fDeleteState = /* fIsShutDownState || */
                  strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)) == 0;
 

trunk/dll/walkem.c

@@ -24 +24 @@
   11 Nov 07 GKY Cancel now directly closes dialog even if directory path text has changed
   20 Jan 08 GKY Walk & walk2 dialogs now save and restore size and position
+  19 Feb 08 JBS Add "State at last FM/2 close" to the states combo box
 
 ***********************************************************************/
@@ -89 +90 @@
                  MPFROMP(pld->path));
     }
+    WinSendMsg(hwndStatelist,
+               LM_INSERTITEM,
+               MPFROM2SHORT(LIT_SORTASCENDING, 0),
+               MPFROMP(GetPString(IDS_SHUTDOWNSTATE)));
     WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
   }