Changeset 51 for trunk/settings.cpp

Timestamp:

Apr 7, 2018, 10:04:50 PM (7 years ago)

Author:

Gregg Young

Message:

Save setting only if OK is selected; Prevent hang where a selected "window" has focus a steals the mouse/keyboard input from Gotcha Quiet; Change the Gotcha Quiet main window from a WINDOW to a DIALOG; Turn off the beep on abort for cases where the user aborted the capture (still beeps if something failed) Dialog proc changes for Gotcha Quiet dialog reorganization.

File:

• trunk/settings.cpp (modified) (7 diffs)

trunk/settings.cpp

@@ -219 +219 @@
         }
 #ifndef _QUIET_
-//#if 0
         // open and assign dialogs to pages
         hwndPage[0] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page1Procedure,
@@ -263 +262 @@
     WinSendDlgItemMsg (g_hwndPage0, WID_RB_FILE, BM_CLICK,
                        MPFROMSHORT (TRUE), 0);
-    WinSendDlgItemMsg (g_hwndPage0, WID_CB_HIDEWINDOW, BM_SETCHECK,
-                       MPFROMLONG (TRUE), MPFROMLONG (0));
+    //WinSendDlgItemMsg (g_hwndPage0, WID_CB_HIDEWINDOW, BM_SETCHECK,
+    //                   MPFROMLONG (TRUE), MPFROMLONG (0));
     //WinSetFocus (WinWindowFromID (hwndDlg, WID_PB_OK), TRUE);
-    //WinSetFocus( hwndPage[0], TRUE );
+    //WinSetFocus( hwndPage[0], FALSE );
 #ifdef _QUIET_
     if (HACCEL haccel = WinLoadAccelTable (hab, GETMODULE, 1)) {
         int rc = WinSetAccelTable (hab, haccel, hwndDlg);
-        _PmpfF(( " Acceltable %i", rc));
-    }
-#endif
-    WinSetActiveWindow( HWND_DESKTOP, hwndPage[0] );
+    }
+#endif
+    WinSetActiveWindow( HWND_DESKTOP, hwndDlg );
 #ifdef _DOLOGDEBUG_
     LogDebug( "Dialog: checkpoint 7" );
@@ -355 +353 @@
             break;
 
+        case WID_PB_ABOUT:
+            AboutBox (hwnd);
+            break;
+
         case DID_CANCEL:
             {
@@ -636 +638 @@
 
     case WM_COMMAND:
+
+        if( SHORT1FROMMP( mp1 ) == WID_PB_OK) {
+            saveum = TRUE;
+            WinSendMsg ( g_hwndSettingsDialog, WM_CLOSE, 0,0);
+        }
         if( SHORT1FROMMP( mp1 ) == DID_CANCEL )
             WinPostMsg( g_hwndSettingsDialog, msg, mp1, mp2 );
@@ -657 +664 @@
         pset->AdjustButton (hwnd, WID_CB_DELAYCOUNTDOWN,
                             pset->DelayCountdown ());
+        pset->AdjustButton (hwnd, WID_CB_DELAYEDCAPTURE,
+                            pset->DelayedCapture ());
 
         // init delay time sb
@@ -728 +737 @@
             pset->DelayCountdown(WinQueryButtonCheckstate
                                  (hwnd, WID_CB_DELAYCOUNTDOWN));
+            pset->DelayedCapture (WinQueryButtonCheckstate
+                                  (hwnd,WID_CB_DELAYEDCAPTURE));
 #endif
         // get ssw capture type
@@ -781 +792 @@
                 WinShowWindow (hwndSnapshot, TRUE);
             break;
+        case WID_CB_DELAYEDCAPTURE:
+
+            WinSendDlgItemMsg (g_hwndPage0, WID_CB_DELAYEDCAPTURE, BM_SETCHECK,
+                               MPFROMLONG (WinQueryButtonCheckstate
+                                           (hwnd,WID_CB_DELAYEDCAPTURE)),
+                               MPFROMLONG (0));
+            WinSendDlgItemMsg (WinWindowFromID(hwndFrame, FID_CLIENT),
+                               WID_CB_DELAYEDCAPTURE, BM_SETCHECK,
+                               MPFROMLONG (WinQueryButtonCheckstate
+                                           (hwnd,WID_CB_DELAYEDCAPTURE)),
+                               MPFROMLONG (0));
+            break;
         }
         return MRESULT (FALSE);