Changeset 51 for trunk

Timestamp:

Apr 7, 2018, 10:04:50 PM (8 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.

Location:

trunk

Files:

• mainwin.cpp (modified) (16 diffs)
• settings.cpp (modified) (7 diffs)

trunk/mainwin.cpp

@@ -159 +159 @@
     switch (msg)
     {
+#ifndef _QUIET_
     case WM_CREATE:
+#else
+    case WM_INITDLG:
+#endif
         {
 #ifdef _DOLOGDEBUG_
             LogDebug( "MainWin:WindowProcedure: WM_CREATE" );
 #endif
+#ifndef _QUIET_
             USHORT   usResID = WinQueryWindowUShort (hwnd, QWS_ID);
 
@@ -177 +182 @@
                              rcl.yTop - rcl.yBottom,
                              SWP_SHOW | SWP_MOVE | SWP_SIZE | SWP_ZORDER);
-        }
+#endif
+        }
+#ifdef _QUIET_
+        WinSendDlgItemMsg (hwnd, WID_CB_HIDEWINDOW, BM_SETCHECK,
+                           MPFROMLONG (TRUE), MPFROMLONG (0));
+        WinSendDlgItemMsg (hwnd, WID_CB_DELAYEDCAPTURE, BM_SETCHECK,
+                           MPFROMLONG (pset->DelayedCapture ()),
+                           MPFROMLONG (0));
+        WinSetFocus( WinWindowFromID (g_hwndPage0, WID_RB_FILE), FALSE );
+        return MRESULT (FALSE);
+#else
         break;
+#endif
 
     case WM_QUIT:
@@ -210 +226 @@
                                          BM_QUERYCHECK, 0, 0));
             pset->HideWindow (f);
-
+#ifndef _QUIET_
             f = BOOL (WinSendDlgItemMsg (hwnd, WID_CB_DELAYEDCAPTURE,
                                          BM_QUERYCHECK, 0, 0));
             pset->DelayedCapture (f);
+#endif
         }
         return MRESULT (FALSE);
@@ -221 +238 @@
         return MRESULT (FALSE);
 
+#ifndef _QUIET_
     case WM_PAINT:
         {
@@ -237 +255 @@
         }
         break;
+#endif
 
     case WM_COMMAND:
@@ -244 +263 @@
         if (usState != STATE_IDLE)
         {
+            //Attempt to open settings probably a hang
+            if (SHORT1FROMMP (mp1) == WID_PB_SETTINGS) {
+                WinSendMsg (hwnd, UM_ABORT, 0,0);
+                pset->Dialog ();
+            }
             // this means ESC was pressed
-            if (SHORT1FROMMP (mp1) == DID_CANCEL)
-                WinSendMsg (hwnd, UM_ABORT, 0,0);
+            else if (SHORT1FROMMP (mp1) == DID_CANCEL)
+                WinSendMsg (hwnd, UM_ABORT, MPFROMLONG(1),0);
             return MRESULT (FALSE);
         }
@@ -344 +368 @@
 
         case WID_PB_EXIT:
-            WinSendMsg (hwnd, WM_CLOSE, 0,0);
+            WinSendMsg (WinWindowFromID (hwndFrame, FID_CLIENT),
+                        WM_CLOSE, 0,0);
             break;
 
@@ -371 +396 @@
 #endif
         }
-        else {
+        /*else {
             SWP     swp;
             CHAR    ach[32] = {0};
@@ -386 +411 @@
                 return MRESULT (FALSE);
             }
-        }
+        } */
 #ifndef _QUIET_
         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW)) {
@@ -419 +444 @@
 
         case CAP_SCREENREGION:
+#ifdef _QUIET_
+            WinSetFocus(HWND_DESKTOP, hwnd);
+#endif
             if (DoTracking (&rcl))
             {
@@ -429 +457 @@
                                 MPFROMHWND (HWND_DESKTOP));
                 if (rc == 2)
-                    WinSendMsg (hwnd, UM_ABORT, 0,0);
+                    WinSendMsg (hwnd, UM_ABORT, MPFROMLONG(1),0);
                 if (rc == 3) {
                     pset->Dialog ();
@@ -443 +471 @@
         case CAP_WINDOWINT:
             fInterior = TRUE;
+#ifdef _QUIET_
+            WinSetFocus(HWND_DESKTOP, hwnd);
+#endif
             StartSelection (hwnd);
             break;
@@ -448 +479 @@
         case CAP_WINDOW:
             fInterior = FALSE;
+#ifdef _QUIET_
+            WinSetFocus(HWND_DESKTOP, hwnd);
+#endif
             StartSelection (hwnd);
             break;
@@ -525 +559 @@
     case WM_TIMER:
         ulCountdown --;
-
-        if( ulCountdown % 20 == 0 ) {
-            WinSendMsg (hwndSnapshot, UM_COUNTDOWN, MPFROMLONG (ulCountdown), 0);
-
-            if (pset->DelayCountdown () && !pset->SerialCapture ())
-                DoCountdown (ulCountdown);
-        }
+       
+        if( ulCountdown % 20 == 0 )
+            WinSendMsg (hwndSnapshot, UM_COUNTDOWN,
+                        MPFROMLONG (ulCountdown), 0);
+        if (pset->DelayCountdown () && !pset->SerialCapture ())
+            DoCountdown (ulCountdown);
 
         if (ulCountdown == 0)
@@ -593 +626 @@
 
     case UM_ABORT:
-        DosBeep (75, 200);
+        if (LONGFROMMP(mp1) != 1)
+            DosBeep (75, 200);
         WinSendMsg (hwnd, UM_CLEANUP, 0,0);
         return MRESULT (FALSE);
@@ -631 +665 @@
     LogDebug( "MainWin:WindowProcedure:WinDefWindowProc->0x%04x", msg );
 #endif
-    return WinDefWindowProc (hwnd, msg, mp1, mp2);
+    if (hwnd ==  g_hwndPage0)
+        return WinDefDlgProc (hwnd, msg, mp1, mp2);
+    else
+        return WinDefWindowProc (hwnd, msg, mp1, mp2);
 }
 

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