Changeset 1031 for trunk/dll

Timestamp:

Jun 28, 2008, 10:54:10 PM (17 years ago)

Author:

John Small

Message:

Ticket 227: Moved warning message string to fm2dll.str.

Location:

trunk/dll

Files:

• fm3dll.str (modified) (1 diff)
• fm3str.h (modified) (2 diffs)
• mainwnd.c (modified) (5 diffs)

trunk/dll/fm3dll.str

@@ -36 +36 @@
 Can't start %s %s
 Your Drag request exceeds the PM limit\n (For compatibility with 16 bit apps)\n The unprocessed objects are still selected in the\n source directory for additional processing\n See Drag & Drop in the help file for additional information
-
+\"%s\" is the state name used by \"Save directory container state\". Any changes to this state will last only until FM/2 closes or this setting is disabled. Proceed with this change?
  You are here --> x
 Move not allowed - forcing copy

trunk/dll/fm3str.h

@@ -18 +18 @@
   26 Nov 07 GKY Added new readonly in editor & ext path
   10 Feb 08 GKY Add strings to implement bubble help for bitmap menu items
+  28 Jun 08 JBS Add string for warning message for changing/deleting FN2SHUTDOWN state
 
 ***********************************************************************/
@@ -68 +69 @@
 #define IDS_CANTSTARTTEXT                                     35
 #define IDS_EXCEEDPMDRGLMT                                    36
+#define IDS_SHUTDOWNSTATE_WARNING                             37
 #define IDS_YOUAREHERETEXT                                    38
 #define IDS_FORCINGCOPYTEXT                                   39

trunk/dll/mainwnd.c

@@ -2974 +2974 @@
   CHAR szDir[CCHMAXPATH];
   CHAR szPrefix[STATE_NAME_MAX_BYTES + 2];
-  HWND hwndDir, hwndC, hwndPPSave = NULLHANDLE;
+  HWND hwndDir, hwndC, hwndDir0 = NULLHANDLE, hwndPPSave = NULLHANDLE;
   SWP swp, swpO, swpN;
   ULONG size, numsaves = 0, x;
@@ -3232 +3232 @@
                                       MPFROMP(szDir), MPFROMLONG(1));
           if (hwndDir) {
+
+            if (x == 0) {
+              hwndDir0 = hwndDir;
+            }
             hwndC = WinWindowFromID(hwndDir, FID_CLIENT);
             if (hwndC) {
@@ -3334 +3338 @@
                               swp.cy,
                               swp.fl | SWP_MOVE |
-                              SWP_SIZE | SWP_SHOW | SWP_ZORDER |
+                              SWP_SIZE | SWP_SHOW |  SWP_ZORDER |
                               SWP_ACTIVATE);
             else if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
@@ -3355 +3359 @@
        SavePresParams(hwndPPSave, "DirCnr");
        WinDestroyWindow(hwndPPSave);
+    }
+    if (hwndDir0) {
+      WinSetFocus(HWND_DESKTOP, hwndDir0);
     }
   }
@@ -4607 +4614 @@
           if (saymsg(MB_YESNO | MB_DEFBUTTON2 | MB_ICONASTERISK, hwnd,
               GetPString(IDS_WARNINGTEXT),
-              "\"%s\" is the state name used by \"Save directory container state\". Any changes to this state will last only until FM/2 closes or this setting is disabled. Proceed with this change?", szStateName) == MBID_NO)
+              GetPString(IDS_SHUTDOWNSTATE_WARNING), szStateName) == MBID_NO)
               fAbortOperation = TRUE;
         }