Changeset 124 for trunk/NLS/en

Timestamp:

Aug 14, 2021, 7:04:39 PM (4 years ago)

Author:

Gregg Young

Message:

Changes to better sync the language page "about and the About dialog in Gotcha. Clean up About page layout in GQ; Make translation a little easier; Remove unused code.

Location:

trunk/NLS/en

Files:

• goqresen.rc (modified) (5 diffs)
• gotresen.rc (modified) (3 diffs)

trunk/NLS/en/goqresen.rc

@@ -43 +43 @@
 ACCELTABLE 1 LOADONCALL
 BEGIN
-   "a",    WID_PB_ABOUT, CHAR, ALT
-   VK_F1,  WID_PB_ABOUT, VIRTUALKEY, ALT
    "h"     HM_GENERAL_HELP, CHAR, ALT /* Also F1*/
    "o",    WID_PB_OK, CHAR, ALT
@@ -59 +57 @@
         WINDOW          "", FID_CLIENT, 0, 0, 200, 85, "thth.wc.gotcha.main",
                         FS_NOBYTEALIGN | NOT WS_VISIBLE         
-    END
-END
-
-DLGTEMPLATE ID_DLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "About Gotcha! Quiet", ID_DLG_ABOUT, 90, 56, 200, 80,
-            WS_VISIBLE, FCF_SYSMENU | FCF_TITLEBAR
-    BEGIN
-        ICON            1, 1000, 8, 58, 21, 16, WS_GROUP
-        LTEXT           PSZ_QNAMEVERSION, WID_NIL, 42, 64, 150, 9
-                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00C80A0AL
-        LTEXT           "Screen/window capture utility\n"
-                        "Copyright ž 1998-2007 Thorsten Thielen\n"
-                        "Copyright ž 2018-2021 The Netlabs Gotcha! team\n"
-                        "All rights reserved\n"
-                        "WWW: https://trac.netlabs.org/gotcha\n"
-                        "English translation: Thorsten Thielen", WID_NIL,
-                        42, 16, 150, 44, DT_WORDBREAK
-        DEFPUSHBUTTON   "Ok", WID_NIL, 79, 4, 42, 10
     END
 END
@@ -119 +98 @@
         DEFPUSHBUTTON   "~Ok", WID_PB_OK, 6, 4, 50, 14
         PUSHBUTTON      "~Undo", WID_PB_UNDO, 61, 4, 50, 14
-        PUSHBUTTON      "~Help", WID_PB_HELP, 171, 4, 50, 14, /*BS_HELP */
+        PUSHBUTTON      "~Help", WID_PB_HELP, 171, 4, 50, 14, 
     END
 END
@@ -220 +199 @@
             WS_VISIBLE
     BEGIN
-        LTEXT           PSZ_QNAMEVERSION, WID_NIL, 5, 77, 150, 8
-                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00C80A0AL
-        LTEXT           "Screen/window capture utility\n"
-                        "Copyright ž 1998-2007 Thorsten Thielen "
-                        "2018-2021 Netlabs Gotcha! team. All rights reserved.\n"
-                        "WWW: https://trac.netlabs.org/gotcha", WID_ST_COPYRIGHT,
-                         5, 38, 150, 40, DT_WORDBREAK
+        CTEXT           PSZ_QNAMEVERSION, WID_NIL, 10, 77, 180, 8
+                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00C80A0AL 
+        CTEXT           "", WID_ST_COPYRIGHT ,10, 69, 180, 8
+        CTEXT           "", WID_ST_COPYRIGHT1,10, 61, 180, 8
+        CTEXT           "", WID_ST_COPYRIGHT2,10, 53, 180, 8
+        CTEXT           "", WID_ST_COPYRIGHT3,10, 45, 180, 8
+        CTEXT           "", WID_ST_COPYRIGHT4,10, 37, 180, 8                                
 #if 0
         GROUPBOX        "Program", WID_ST_PROGRAM, 5, 5, 95, 46
         LISTBOX         WID_LB_LANGUAGES, 9, 9, 88, 34, LS_NOADJUSTPOS
-        /*GROUPBOX        "Online help", WID_ST_HELPFILE, 104, 5, 95, 46
-        LISTBOX         WID_LB_LANGUAGESHELP, 107, 9, 88, 34, LS_NOADJUSTPOS*/
         LTEXT           "Note: A restart is required for these settings to take effect",
                         WID_ST_LANGNOTE, 5, 50, 184, 8, DT_WORDBREAK // Must inable the WM_DESTROY code
@@ -291 +268 @@
 STRINGTABLE
 {
-    LANG_COPYRIGHT  "Screen/window capture utility\nCopyright ž 1998-2007 Thorsten Thielen 2018-2021 The Netlabs Gotcha! team. All rights reserved.\nWWW: https://trac.netlabs.org/gotcha"
+    LANG_COPYRIGHT   "Screen/window capture utility"
+    LANG_COPYRIGHT1  "Copyright ž 1998-2007 Thorsten Thielen"
+    LANG_COPYRIGHT2  "Copyright ž 2018-2021 The Netlabs Gotcha! team"
+    LANG_COPYRIGHT3  "All rights reserved"
+    LANG_COPYRIGHT4  "WWW: https://trac.netlabs.org/gotcha"
     LANG_PROGRAM    "Program"
-    LANG_HELPFILE   "Online help"
     LANG_RESTART    "Note: A restart is required for these settings to take effect"
 }

trunk/NLS/en/gotresen.rc

@@ -112 +112 @@
         LTEXT           PSZ_NAMEVERSION, WID_NIL, 42, 64, 150, 9
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00C80A0AL
-        LTEXT           "Screen/window capture utility\n"
-                        "Copyright ž 1998-2007 Thorsten Thielen\n"
-                        "Copyright ž 2018-2021 The Netlabs Gotcha! team\n"
-                        "All rights reserved\n"
-                        "WWW: https://trac.netlabs.org/gotcha\n"
-                        "English translation: Thorsten Thielen", WID_NIL,
-                        42, 16, 150, 44, DT_WORDBREAK
+        LTEXT           "", WID_ST_COPYRIGHT ,42, 56, 150, 8
+        LTEXT           "", WID_ST_COPYRIGHT1,42, 48, 150, 8
+        LTEXT           "", WID_ST_COPYRIGHT2,42, 40, 150, 8
+        LTEXT           "", WID_ST_COPYRIGHT3,42, 32, 150, 8
+        LTEXT           "", WID_ST_COPYRIGHT4,42, 24, 150, 8
         DEFPUSHBUTTON   "Ok", WID_NIL, 79, 4, 42, 10
     END
@@ -229 +227 @@
     DIALOG  "", ID_DLG_SETTINGSPAGE4, 15, 15, 220, 120, NOT FS_DLGBORDER |
             WS_VISIBLE
-    BEGIN
-        LTEXT           PSZ_NAMEVERSION, WID_NIL, 5, 118, 150, 8
+    BEGIN // Text for this page is loaded from the string table below
+        LTEXT           PSZ_NAMEVERSION, WID_NIL, 10, 118, 180, 8
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00C80A0AL
-        LTEXT           "Screen/window capture utility\n"
-                        "Copyright ž 1998-2007 Thorsten Thielen\n"
-                        "2018-2021 Netlabs Gotcha! team. All rights reserved.\n"
-                        "WWW: https://trac.netlabs.org/gotcha", WID_ST_COPYRIGHT,
-                         5, 92, 190, 26, DT_WORDBREAK
-        GROUPBOX        "Language", WID_ST_PROGRAM, 5, 5, 95, 46
+        LTEXT           "", WID_ST_COPYRIGHT ,10, 110, 180, 8
+        LTEXT           "", WID_ST_COPYRIGHT1,10, 102, 180, 8
+        LTEXT           "", WID_ST_COPYRIGHT2,10, 94, 180, 8
+        LTEXT           "", WID_ST_COPYRIGHT3,10, 86, 180, 8
+        LTEXT           "", WID_ST_COPYRIGHT4,10, 78, 180, 8        
+        GROUPBOX        "", WID_ST_PROGRAM, 5, 5, 95, 46
         LISTBOX         WID_LB_LANGUAGES, 9, 9, 88, 34, LS_NOADJUSTPOS
-#if 0        
-        GROUPBOX        "Online help", WID_ST_HELPFILE, 104, 5, 95, 46
-        LISTBOX         WID_LB_LANGUAGESHELP, 107, 9, 88, 34, LS_NOADJUSTPOS
-#endif        
-        LTEXT           "Note: A restart is required for these settings to take effect",
-                        WID_ST_LANGNOTE, 5, 50, 184, 8, DT_WORDBREAK
+        LTEXT           "", WID_ST_LANGNOTE, 10, 50, 184, 8, DT_WORDBREAK
     END
 END
@@ -295 +288 @@
 STRINGTABLE
 {
-    LANG_COPYRIGHT  "Screen/window capture utility\nCopyright ž 1998-2007 Thorsten Thielen 2018-2021 Netlabs Gotcha! team. All rights reserved.\nWWW: https://trac.netlabs.org/gotcha"
+    LANG_COPYRIGHT   "Screen/window capture utility"
+    LANG_COPYRIGHT1  "Copyright (c) 1998-2007 Thorsten Thielen"
+    LANG_COPYRIGHT2  "Copyright (c) 2018-2021 The Netlabs Gotcha! team"
+    LANG_COPYRIGHT3  "All rights reserved"
+    LANG_COPYRIGHT4  "WWW: https://trac.netlabs.org/gotcha"
     LANG_PROGRAM    "Language"
-    LANG_HELPFILE   "Online help"
     LANG_RESTART    "Note: A restart is required for these settings to take effect"
 }