Changeset 55 for trunk/mainwin.cpp

Timestamp:

Jun 2, 2018, 12:45:45 AM (7 years ago)

Author:

Gregg Young

Message:

Update resources to get Gotcha! working in all languages; Reformat and update language tab in settings and about dialog; Clean up settings notebook formatting; Optimize turning PM print screen on and off. Fix screen region capture of its confirmation dialog. Move additional strings from code to the STRINGTABLE.

File:

• trunk/mainwin.cpp (modified) (8 diffs)

trunk/mainwin.cpp

@@ -23 +23 @@
 {
 #ifdef _QUIET_
-//#if 1
     hwndFrame = WinLoadDlg (HWND_OBJECT, NULLHANDLE, NULL, GETMODULE,
                             ID_DLG_MAIN, NULL);
@@ -331 +330 @@
             usCap = CAP_SCREEN;
 #ifdef _QUIET_
-//#if 1
             WinShowWindow (g_hwndSettingsDialog, FALSE);
             // WinSendMsg (g_hwndSettingsDialog, WM_CLOSE, 0,0); //Needs to go to the setting dialog
@@ -343 +341 @@
             usCap = CAP_SCREENREGION;
 #ifdef _QUIET_
-//#if 1
             WinShowWindow (g_hwndSettingsDialog, FALSE);
 #endif
@@ -352 +349 @@
             usCap = CAP_WINDOWINT;
 #ifdef _QUIET_
-//#if 1
             WinShowWindow (g_hwndSettingsDialog, FALSE);
 #endif
@@ -361 +357 @@
             usCap = CAP_WINDOW;
 #ifdef _QUIET_
-//#if 1
             WinShowWindow (g_hwndSettingsDialog, FALSE);
 #endif
@@ -450 +445 @@
             {
                 usState = STATE_WINDOWSELECTED;
-                int rc = saymsg2(1, hwnd,  "Capture", "Do you wish to continue?");
+                int rc = saymsg2(1, hwnd, RSTR(IDS_CAPTURE), RSTR(IDS_WISHCONTINUE));
                 
                 if (rc == 1)
+                    DosSleep(100); // Let the dialog close
                     WinPostMsg (hwnd, UM_WINDOWSELECTED,
                                 MPFROMHWND (HWND_DESKTOP),
@@ -460 +456 @@
                 if (rc == 3) {
                     pset->Dialog ();
+                    DosSleep(100); // Let the dialogs close
                     WinPostMsg (hwnd, UM_WINDOWSELECTED,
                                 MPFROMHWND (HWND_DESKTOP),
@@ -640 +637 @@
         WinStopTimer (hab, hwnd, ulTimer);
 #ifdef _QUIET_
-//#if 1
         // ? FIXME to give option to reshow window.
         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))