Changeset 92

Timestamp:

Oct 7, 2020, 5:00:30 AM (5 years ago)

Author:

Gregg Young

Message:

Clean up Gotcha! Quiet's ini file by removing the snapshot entries. #ifdef out some more code from Gotcha! Quiet which is unneeded (setting the size and position of an object window is a useless waste of code)

Location:

trunk

Files:

• gotcha.cpp (modified) (6 diffs)
• mainwin.cpp (modified) (2 diffs)
• settings.cpp (modified) (1 diff)
• settings.h (modified) (2 diffs)

trunk/gotcha.cpp

@@ -156 +156 @@
     pset->pForceSaveFile = pset->QueryForceSaveFile();
     pset->bSerialCapture = pset->SerialCapture ();
-
+#ifndef _QUIET_
     // check cmd line args and if "-a" found take screenshot and exit
     if (CheckCmdlineArgs (argc, argv))
@@ -168 +168 @@
         exit (0);
     }
-
+#endif
     SetIdlePriority(pset->QueryFlag(SEI_IDLEPRIORITY));
 
@@ -175 +175 @@
 #ifndef _QUIET_
     hwndSnapshot = CreateSnapshotWindow ();
-#endif
     SWP swp;
     USHORT us[7];
@@ -183 +182 @@
     WinSetWindowPos (hwndFrame, HWND_DESKTOP, swp.x,swp.y, 0,0,
                      SWP_SHOW | SWP_MOVE);
-
+#endif
     
 #ifdef _QUIET_
@@ -206 +205 @@
     else
         WinShowWindow (hwndSnapshot, TRUE);
-#endif
+
     WinSetWindowPos (hwndFrame, NULLHANDLE, 0,0, 0,0, SWP_SHOW);
     WinSetWindowPos (WinWindowFromID (hwndFrame, FID_CLIENT), NULLHANDLE,
                      0,0, 0,0, SWP_SHOW);
+#endif
 
     g_phelp = new Helper(hwndFrame);
@@ -234 +234 @@
     WinQueryWindowPos (hwndSnapshot, &swp);
     pset->SetWindowData (&swp);
-#endif
+
     // save size, etc. of main window
     WinQueryWindowPos (hwndFrame, &swp);
     pset->SetWindowData (&swp, FALSE);
-
+#endif
     // goodbye windows!
 #ifndef _QUIET_

trunk/mainwin.cpp

@@ -574 +574 @@
     case UM_CAPTURE:
         usState = STATE_WAITFORHIDE2;
+#ifndef _QUIET_
         if (pset->SSWHide () && WinIsWindowVisible (hwndSnapshot))
             WinShowWindow (hwndSnapshot, FALSE);
         else
+#endif
             WinSendMsg (hwnd, UM_CAPTURE2, 0,0);
         return MRESULT (FALSE);
@@ -605 +607 @@
             {
                 WinStopTimer (hab, hwnd, ulTimer);
+#ifndef _QUIET_
                 if (! WinIsWindowVisible (hwndSnapshot) && pset->SnapshotWindow ())
                     WinShowWindow (hwndSnapshot, TRUE);
-
+#endif
                 if (hbm)
                 {

trunk/settings.cpp

@@ -67 +67 @@
     new THTH_SEF (SEI_SERIALCAPTURE, "Extras", "SerialCapture", FALSE),
     new THTH_SEL (SEI_SERIALTIME, "Extras", "SerialTime", 10),
-
+#ifdef _QUIET_
+    new THTH_SEL (SEI_SSWCAPTURETYPE, "Extras", "CaptureType", CAP_SCREEN),
+    new THTH_SEF (SEI_SNAPSHOTWINDOW, "Snapshot", NULL, NULL),
+#else
     new THTH_SEF (SEI_SNAPSHOTWINDOW, "Snapshot", "Enable", FALSE),
     new THTH_SEL (SEI_SSWCAPTURETYPE, "Snapshot", "CaptureType", CAP_SCREEN),
     new THTH_SEF (SEI_SSWHIDE, "Snapshot", "Hide", TRUE),
     new THTH_SEF (SEI_SSWALWAYSONTOP, "Snapshot", "AlwaysOnTop", TRUE),
-
+#endif
     new THTH_SEF (SEI_IDLEPRIORITY, "Extras", "IdlePriority", FALSE),
 
     new THTH_SEB (SEI_SWP, "Window", "SWP", &swpDef, sizeof (swpDef)),
     new THTH_SEB (SEI_US, "Window", "US", &ausDef, sizeof (ausDef)),
-
+#ifndef _QUIET_
     new THTH_SEB (SEI_SWPSSW, "Snapshot", "SWP", &swpDefSSW, sizeof (swpDefSSW)),
     new THTH_SEB (SEI_USSSW, "Snapshot", "US", &ausDefSSW, sizeof (ausDefSSW)),
-
+#endif
     new THTH_SES (SEI_LANGUAGE,     "Language", "Program", PSZ_DEFAULTLANGUAGEMOD),
     new THTH_SES (SEI_LANGUAGEHELP, "Language", "Help", PSZ_DEFAULTLANGUAGEHELP),

trunk/settings.h

@@ -96 +96 @@
     USHORT QueryDelayTime (VOID) { return QueryLong (SEI_DELAYTIME); }
     VOID   SetDelayTime (USHORT us) { SetLong (SEI_DELAYTIME, us); }
-
+#ifndef _QUIET_
     BOOL   SnapshotWindow (VOID) { return QueryFlag (SEI_SNAPSHOTWINDOW); }
     VOID   SnapshotWindow (BOOL f) { SetFlag (SEI_SNAPSHOTWINDOW, f); }
@@ -105 +105 @@
     BOOL   SSWAlwaysOnTop (VOID) { return QueryFlag (SEI_SSWALWAYSONTOP); }
     VOID   SSWAlwaysOnTop (BOOL f) { SetFlag  (SEI_SSWALWAYSONTOP, f); }
-
+#endif
     BYTE   QuerySSWCaptureType (VOID) { return QueryLong (SEI_SSWCAPTURETYPE); }
     VOID   SetSSWCaptureType (BYTE b) { SetLong (SEI_SSWCAPTURETYPE, b); }