Changeset 89

Timestamp:

Aug 24, 2020, 11:57:26 PM (5 years ago)

Author:

Gregg Young

Message:

Remove snapshot window stuff from Gotcha Quiet. Add strings and adjust code so the error caused by trying to open GQ twice can be translated

Location:

trunk

Files:

• NLS/en/goqresen.rc (modified) (4 diffs)
• gotcha.cpp (modified) (8 diffs)
• id.h (modified) (1 diff)
• settings.cpp (modified) (6 diffs)
• snapshot.cpp (modified) (2 diffs)

trunk/NLS/en/goqresen.rc

@@ -37 +37 @@
 /*     "English",              /* Language to be used for online help */
 /*     "Gotcha_en",              /* Name of the help file */
-}
-
-MENU IDM_SSWPOPUP
-{
-    SUBMENU  "~Capture",                 WID_CAPTURETYPE,MS_CONDITIONALCASCADE
-    {
-        MENUITEM "~Screen",              WID_SSWSCREEN
-        MENUITEM "Screen ~region",       WID_SSWSCREENREGION
-        MENUITEM "~Window",              WID_SSWWINDOW
-        MENUITEM "Window  ~interior",    WID_SSWWINDOWINT
-    }
-    MENUITEM "Hide when capturing",      WID_CB_SSWHIDE
-    MENUITEM "Always on top",            WID_CB_SSWALWAYSONTOP
-    MENUITEM SEPARATOR
-    MENUITEM "Close",                    WID_CB_SSWENABLE
 }
 
@@ -289 +274 @@
     IDS_MAINWIN                        "Gotcha!"
     IDS_PAGESAVE                       "Saving"
-    IDS_PAGESNAPSHOT                   "Snapshot"
     IDS_CAPTURE                        "Capture"
     IDS_PAGELANGUAGE                   "Language"
@@ -304 +288 @@
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"
 
-    IDS_SNAPLABEL                      "Snap!"
     IDS_GENERALHELP                    "Gotcha! ~help\tF1"
 
@@ -310 +293 @@
     IDS_CANCEL                "~Cancel"
     IDS_WISHCONTINUE          "Do you wish to continue?"
+    
+    IDS_ERROR_ALREADYRUNNING    "GOTCHA QUIET Already running"
+    IDS_ERROR_ALREADYRUNNINGMSG "Another instance of Gotcha Quiet is running. Open Gotcha Quiet's settings by pressing Alt+PrintScreen"
 }

trunk/gotcha.cpp

@@ -114 +114 @@
     HMQ hmq = WinCreateMsgQueue (hab, 0);
 
+    // Load settings move up here so the string table is available for the already running error
+    pset = new SETTINGS;
     //DisplayError("DEBUG", "%d", Version());
 #ifdef _QUIET_
@@ -127 +129 @@
     int rc;
     HMTX    hmtx     = NULLHANDLE;
-    // running multiple instances orphans all but the first closed hook unloaded
+    // running multiple instances orphans all but the first hook unloaded
     rc = DosOpenMutexSem("\\SEM32\\GOTCHA", &hmtx);
     if (!rc) { 
-        DisplayError("GOTCHA QUIET Already running",
-                     "Another instance of Gotcha Quiet is running. You can "
-                     "open Gotcha Quiet's settings using the Alt+PrintScreen "
-                     "key combination");
+        DisplayError(RSTR (IDS_ERROR_ALREADYRUNNING),
+                     RSTR (IDS_ERROR_ALREADYRUNNINGMSG));
         exit (0);
     }
@@ -147 +147 @@
     WinRegisterClass (hab, "thth.wc.gotcha.main", WindowProcedure, 0L,
                       sizeof (ULONG)*2L);
+#ifndef _QUIET_
     WinRegisterClass (hab, "thth.wc.gotcha.snapshot", wpSnapshot,
                       CS_SIZEREDRAW, sizeof (ULONG)*2L);
-
+#endif
     // load the settings
-    pset = new SETTINGS;
+    //pset = new SETTINGS;
 
     pset->idleSetInIni = pset->QueryFlag(SEI_IDLEPRIORITY);
@@ -175 +176 @@
     // create the windows
     hwndFrame = CreateMainWindow ();
+#ifndef _QUIET_
     hwndSnapshot = CreateSnapshotWindow ();
-
+#endif
     SWP swp;
     USHORT us[7];
@@ -196 +198 @@
     StartInputHook ();
 #endif
-
+#ifndef _QUIET_
     // position snapshot window
     pset->QueryWindowData (&swp, us);
@@ -207 +209 @@
     else
         WinShowWindow (hwndSnapshot, TRUE);
-
+#endif
     WinSetWindowPos (hwndFrame, NULLHANDLE, 0,0, 0,0, SWP_SHOW);
     WinSetWindowPos (WinWindowFromID (hwndFrame, FID_CLIENT), NULLHANDLE,
@@ -231 +233 @@
         pset->SetNumSaveDir (pset->pNumSaveDir);
     }
+#ifndef _QUIET_
     // save size, etc. of snapshot window
     WinQueryWindowPos (hwndSnapshot, &swp);
     pset->SetWindowData (&swp);
-
+#endif
     // save size, etc. of main window
     WinQueryWindowPos (hwndFrame, &swp);
@@ -240 +243 @@
 
     // goodbye windows!
+#ifndef _QUIET_
     WinDestroyWindow (hwndSnapshot);
+#endif
     WinDestroyWindow (hwndFrame);
 

trunk/id.h

@@ -167 +167 @@
 #define IDS_CANCEL                          38
 #define IDS_WISHCONTINUE                    39
+#define IDS_ERROR_ALREADYRUNNING            40
+#define IDS_ERROR_ALREADYRUNNINGMSG         41
 
 #define MAIN_HELP_TABLE                     1

trunk/settings.cpp

@@ -651 +651 @@
         LogDebug( "Page2Procedure: start UM_SETTINGS2DIALOG" );
 #endif
+#ifndef _QUIET_
         // set state of checkbuttons
         pset->AdjustButton (hwnd, WID_CB_SSWENABLE,
@@ -658 +659 @@
         pset->AdjustButton (hwnd, WID_CB_SSWALWAYSONTOP,
                             pset->SSWAlwaysOnTop ());
-#ifdef _QUIET_
+#else
 //#if 1
         pset->AdjustButton (hwnd, WID_CB_SERIALCAPTURE,
@@ -698 +699 @@
             break;
         }
-
+#ifndef _QUIET_
         // show or hide snapshot window
         if (! WinSendDlgItemMsg (hwnd, WID_CB_SSWENABLE,
@@ -705 +706 @@
         else
             WinShowWindow (hwndSnapshot, TRUE);
-
+#endif
 #ifdef _DOLOGDEBUG_
         LogDebug( "Page1Procedure: end UM_SETTINGS2DIALOG" );
@@ -785 +786 @@
         switch (SHORT1FROMMP (mp1))
         {
+#ifndef _QUIET_
         case WID_CB_SSWENABLE:
             if (! WinSendDlgItemMsg (hwnd, WID_CB_SSWENABLE,
@@ -792 +794 @@
                 WinShowWindow (hwndSnapshot, TRUE);
             break;
+#endif
         case WID_CB_DELAYEDCAPTURE:
 

trunk/snapshot.cpp

@@ -19 +19 @@
 
 // ** CreateSnapshotWindow ************************************************ /*FOLD00*/
-
+#ifndef _QUIET_
 HWND CreateSnapshotWindow (VOID)
 {
@@ -206 +206 @@
     return WinDefWindowProc (hwnd, msg, mp1, mp2);
 }
-
+#endif
 // ************************************************************************