Changeset 21

Timestamp:

Feb 27, 2018, 7:48:51 PM (7 years ago)

Author:

Gregg Young

Message:

Updated resources with gif, jbig and raw removed: Added settings and Help button in English resources

Location:

trunk

Files:

• czech/gotrescz.rc (modified) (1 diff)
• deutsch/gotresde.rc (modified) (1 diff)
• english/gotresen.rc (modified) (9 diffs)
• id.h (modified) (1 diff)
• portbras/gotresbr.rc (modified) (1 diff)

trunk/czech/gotrescz.rc

@@ -312 +312 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
-    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
-    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"
 

trunk/deutsch/gotresde.rc

@@ -267 +267 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
-    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
-    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"
 

trunk/english/gotresen.rc

@@ -36 +36 @@
 /*     "Thorsten Thielen",     /* Translator's name */
 /*     "English",              /* Language to be used for online help */
-/*     "english",              /* Name of the help file */
+/*     "Gotcha_en",              /* Name of the help file */
 }
 
@@ -57 +57 @@
 BEGIN
    "a",    WID_PB_ABOUT, CHAR, ALT
+   VK_F1,  WID_PB_ABOUT, VIRTUALKEY, ALT 
    "e",    WID_PB_SETTINGS, CHAR, ALT
-/*   VK_F1,  WID_PB_ABOUT, VIRTUALKEY */
+   "h"     HM_GENERAL_HELP, CHAR, ALT /* Also F1*/
 
    "c",    WID_RB_CLIPBOARD, CHAR, ALT
    "f",    WID_RB_FILE, CHAR, ALT
 
-   "h",    WID_CB_HIDEWINDOW, CHAR, ALT
+   "g",    WID_CB_HIDEWINDOW, CHAR, ALT
    "d",    WID_CB_DELAYEDCAPTURE, CHAR, ALT
 
@@ -77 +78 @@
 WINDOWTEMPLATE ID_DLG_MAIN
 BEGIN
-    FRAME   PSZ_NAMEVERSION, ID_DLG_MAIN, 98, 66, 200, 70,
+    FRAME   PSZ_NAMEVERSION, ID_DLG_MAIN, 98, 66, 200, 85,
             FS_NOBYTEALIGN | FS_DLGBORDER | NOT WS_VISIBLE,
             FCF_TITLEBAR | FCF_SYSMENU | FCF_AUTOICON | FCF_TASKLIST | FCF_MINBUTTON
     BEGIN          /* Please do NOT try to translate the "thth.wc..." ;-)*/
-        WINDOW          "", FID_CLIENT, 0, 0, 200, 70, "thth.wc.gotcha.main",
+        WINDOW          "", FID_CLIENT, 0, 0, 200, 85, "thth.wc.gotcha.main",
                         FS_NOBYTEALIGN | NOT WS_VISIBLE
         BEGIN
-            GROUPBOX        "Save image to ...", WID_TEST, 4, 36, 90, 30
-            AUTORADIOBUTTON "~Clipboard", WID_RB_CLIPBOARD, 10, 48, 78, 10, WS_TABSTOP
-            AUTORADIOBUTTON "~File", WID_RB_FILE, 10, 38, 78, 10, WS_TABSTOP
-            GROUPBOX        "Capture ...", WID_NIL, 100, 4, 96, 62
-            PUSHBUTTON      "~Screen", WID_PB_SCREEN, 104, 44, 88, 12
-            PUSHBUTTON      "Screen ~region", WID_PB_SCREENREGION, 104, 32, 88, 12
-            PUSHBUTTON      "~Window", WID_PB_WINDOW, 104, 20, 88, 12
-            PUSHBUTTON      "Window ~interior", WID_PB_WINDOWINTERIOR, 104, 8, 88, 12
-            GROUPBOX        "Options", WID_NIL, 4, 4, 90, 30
-            AUTOCHECKBOX    "~Hide Gotcha!", WID_CB_HIDEWINDOW, 10, 16, 78, 10
-            AUTOCHECKBOX    "~Delayed capt.", WID_CB_DELAYEDCAPTURE, 10, 6, 78, 10
+            GROUPBOX        "Save image to ...", WID_TEST, 4, 51, 90, 30
+            AUTORADIOBUTTON "~Clipboard", WID_RB_CLIPBOARD, 10, 63, 78, 10, WS_TABSTOP
+            AUTORADIOBUTTON "~File", WID_RB_FILE, 10, 53, 78, 10, WS_TABSTOP
+            GROUPBOX        "Capture ...", WID_NIL, 100, 19, 96, 62
+            PUSHBUTTON      "~Screen", WID_PB_SCREEN, 104, 59, 88, 12 
+            PUSHBUTTON      "Screen ~region", WID_PB_SCREENREGION, 104, 47, 88, 12
+            PUSHBUTTON      "~Window", WID_PB_WINDOW, 104, 35, 88, 12
+            PUSHBUTTON      "Window ~interior", WID_PB_WINDOWINTERIOR, 104, 23, 88, 12
+            GROUPBOX        "Options", WID_NIL, 4, 19, 90, 30
+            AUTOCHECKBOX    "Hide ~Gotcha!", WID_CB_HIDEWINDOW, 10, 31, 48, 10
+            AUTOCHECKBOX    "~Delayed capture", WID_CB_DELAYEDCAPTURE, 10, 21, 58, 10
+            PUSHBUTTON      "~Help", HM_GENERAL_HELP, 104, 4, 88, 12             
+            PUSHBUTTON      "S~ettings", WID_PB_SETTINGS, 4, 4, 88, 12
         END
     END
@@ -110 +113 @@
         LTEXT           "Copyright (c) 1998-2007 Thorsten Thielen", WID_NIL, 42, 44, 
                         202, 8
-        LTEXT           "e-Mail: thth@c2226.de", WID_NIL, 42, 32, 202, 8
-        LTEXT           "WWW: http://www.c2226.de/programs/gotcha", WID_NIL, 42, 13, 232, 17, DT_WORDBREAK
+        LTEXT           "Copyright (c) 2018 The Netlabs Gotcha Group", WID_NIL, 
+                        42, 32, 202, 8  
+        LTEXT           "WWW: http://trac.netlabs.org/gotcha", WID_NIL, 42, 13, 232, 17, DT_WORDBREAK
         LTEXT           "English translation: Thorsten Thielen", WID_NIL,
                         42, 4, 202, 8
@@ -159 +163 @@
         DEFPUSHBUTTON   "~Ok", WID_PB_OK, 5, 4, 60, 14
         PUSHBUTTON      "~Undo", WID_PB_UNDO, 70, 4, 60, 14
-        PUSHBUTTON      "Help", WID_PB_HELP, 215, 4, 60, 14, BS_HELP | 
+        PUSHBUTTON      "~Help", WID_PB_HELP, 215, 4, 60, 14, BS_HELP | 
                         BS_NOPOINTERFOCUS
     END
@@ -180 +184 @@
         GROUPBOX        "Image file ~format", WID_NIL, 5, 5, 240, 44, DT_MNEMONIC
         LISTBOX         WID_LB_FILEFORMAT, 11, 9, 228, 30, LS_NOADJUSTPOS
-/*        AUTORADIOBUTTON "1.2 (What Windoze calls ""OS/2 format"")", WID_RB_BMF12, 11, 
-                        29, 208, 10, WS_TABSTOP | WS_GROUP
-        AUTORADIOBUTTON "1.6 (Windoze format)", WID_RB_BMF16, 11, 19, 208, 10, 
-                        WS_TABSTOP
-        AUTORADIOBUTTON "2.0 (Full OS/2 format)", WID_RB_BMF20, 11, 9, 208, 10, 
-                        WS_TABSTOP */
+
     END
 END
@@ -202 +201 @@
         GROUPBOX        "Options", WID_NIL, 5, 5, 220, 50
         AUTOCHECKBOX    "Always on ~top of all windows", WID_CB_SSWALWAYSONTOP, 13, 35, 204, 10
-        AUTOCHECKBOX    "~Hide when doing a capture", WID_CB_SSWHIDE, 13, 25, 204, 10
+        AUTOCHECKBOX    "Hide ~Gotcha during capture", WID_CB_SSWHIDE, 13, 25, 204, 10
     END
 END
@@ -250 +249 @@
 {
     IDS_QUIETMODE                      " (quiet mode)"
-    IDS_SETTINGS                       "~Settings...\tALT+E"
-    IDS_PRODUCTINFORMATION             "Product information\tALT+A"
+    IDS_SETTINGS                       "~Settings\tALT+e"
+    IDS_PRODUCTINFORMATION             "Product information\tALT+a"
     IDS_HEADER_ERROR                   "ERROR"
     IDS_ERROR_COULDNOTRETRIEVEHEADER   "Could not retrieve bitmap info header (0x%08lx)"
@@ -281 +280 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
-    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
-    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"
 
     IDS_SNAPLABEL                      "Snap!"
-    IDS_GENERALHELP                    "Gotcha! ~help..."
+    IDS_GENERALHELP                    "Gotcha! ~help\tF1"
 }

trunk/id.h

@@ -157 +157 @@
 #define IDS_BMF_PBM                         29
 #define IDS_BMF_JP2                         30
-#define IDS_BMF_JBG                         31
-#define IDS_BMF_RAW                         32
-#define IDS_BMF_DIB                         33
+#define IDS_BMF_DIB                         31
 #define IDS_SNAPLABEL                       34
 #define IDS_GENERALHELP                     35

trunk/portbras/gotresbr.rc

@@ -276 +276 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
-    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
-    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"