PATCH: [ 1362882 ] Remove option for autoclosing compare statepane

diff --git a/Src/Changes.txt b/Src/Changes.txt
index baea182..043235b 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -1,3 +1,8 @@
+2005-11-22 Kimmo
+ PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
+  Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
+  Src/Languages: *.rc resource.h
+
 2005-11-22 Perry
  PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
   Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 0ddb9fd..78f7f7d 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -665,21 +665,19 @@ BEGIN
                     7,17,206,10
     CONTROL         "&Desabilitar Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
-    CONTROL         "Automatically verify paths in Open-dialog",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+    CONTROL         "&Automatically verify paths in Open-dialog",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
-    CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    WS_TABSTOP,7,47,206,10
+    CONTROL         "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge allows hiding some common messageboxes. Press button to make all messageboxes visible again.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 8f68c3d..730adfb 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -664,22 +664,19 @@ BEGIN
                     17,206,10
     CONTROL         "&Çàáðàíè Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Close compare Statepane automatically",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
-    CONTROL         "Automatically verify paths in Open-dialog",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+    CONTROL         "&Automatically verify paths in Open-dialog",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
-    CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    WS_TABSTOP,7,47,206,10
+    CONTROL         "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge allows hiding some common messageboxes. Press button to make all messageboxes visible again.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Bulgarian/resource.h
+++ b/Src/Languages/Bulgarian/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 1d16452..5175a6d 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -664,21 +664,19 @@ BEGIN
                     7,17,211,10
     CONTROL         "Inhabilita la pantalla de &benvinguda",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Tanca la subfinestra d'estat de comparació automàticament",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "T&anca les finestres amb ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "&Verifica els trajectes automàticament al diàleg d'Obrir",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,229,10
+                    WS_TABSTOP,7,47,229,10
     CONTROL         "&Permet d'executar només una instància",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Permet múltiples finestres de comparació per",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Permet múltiples finestres de comparació per",IDC_STATIC,7,72,221,37
     CONTROL         "Comparació de &carpetes",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Comparació de &fitxers",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el botó per a fer visibles tots els quadres de missatges altre cop.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index c774646..1c2ed96 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -660,21 +660,19 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
     CONTROL         "Í£ÓÃÆô¶¯ÆÁÄ»(&D)",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,100,10
-    CONTROL         "×Ô¶¯¹Ø±Õ¶Ô±È½á¹û´°(&C)",IDC_CMPPANE_AUTOCLOSE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "ESC¹Ø±Õ´°¿Ú(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "ÔÚ¡°´ò¿ª¡±¶Ô»°¿òÖÐ×Ô¶¯Ñé֤·¾¶",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "Ö»ÔÊÐíÔËÐÐÒ»¸öʵÀý(&A)",IDC_SINGLE_INSTANCE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "ÔÊÐí¶à¸ö¶Ô±È´°¿Ú",IDC_STATIC,7,82,221,37
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "ÔÊÐí¶à¸ö¶Ô±È´°¿Ú",IDC_STATIC,7,72,221,37
     CONTROL         "Îļþ¼Ð¶Ô±È(&F)",IDC_MULTIDOC_DIRCMP,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Îļþ¶Ô±È(&E)",IDC_MULTIDOC_FILECMP,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "ÖØÖÃ",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "ÖØÖÃ",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge ÔÊÐíÄúÒþ²ØһЩÏûÏ¢Ìáʾ¡£\nµã»÷´Ë°´Å¥ÒÔʹËùÓÐÒþ²ØµÄÏûÏ¢ÌáʾÖØÐÂÏÔʾ¡£",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 98a9e54..c2961a1 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -658,21 +658,19 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
     CONTROL         "°±¥Î¤Þ¤Hª`¥Øªº¿Ã¹õ(&D)",IDC_DISABLE_SPLASH,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,27,100,10
-    CONTROL         "¦Û°Ê¦aÃö³¬¤ñ¸ûª¬ºAµ¡®Ø(&C)",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "«ö¤U ESC ®ÉÃö³¬µøµ¡(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "¦b¶}±Ò¹ï¸Ü²°¦Û°Ê¦aÅçÃÒ¸ô®|",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "­«³]",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "­«³]",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge ¤¹³\ÁôÂìY¨Ç¤@¯ë°T®§²°. «ö¤U«ö¶s¥iÅý©Ò¦³°T®§²°¬Ýªº¨ì.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 0b96b05..861c426 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -664,21 +664,19 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
-    CONTROL         "Automatically verify paths in Open-dialog",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+    CONTROL         "&Automatically verify paths in Open-dialog",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
-    CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    WS_TABSTOP,7,47,206,10
+    CONTROL         "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge allows hiding some common messageboxes. Press button to make all messageboxes visible again.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 2ba12bf..8c84e24 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -664,22 +664,19 @@ BEGIN
                     17,206,10
     CONTROL         "&Fjern Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Luk status panel automatisk",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "L&uk vinduer med ESC tasten",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "&Verificer automatisk stinavnene i åben dialogen",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge tillader at man kan afbryde nogle af de almindelige pop-up beskeder. Tryk på nulstil for at få dem allesammen til at dukke op igen.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 3087185..7607c3e 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -665,21 +665,19 @@ BEGIN
                     7,17,136,10
     CONTROL         "Splash Screen uitscha&kelen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,87,10
-    CONTROL         "Vergelijkingstatusvenster automatis&ch sluiten",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Vensters met ESC sl&uiten",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Paden automatisch controleren in het venster Openen",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge staat het verbergen van bepaalde berichtvensters toe. Klik op de knop om alle berichtvensters zichtbaar te maken.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 4cf694f..90e9012 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -666,21 +666,19 @@ BEGIN
                     7,17,183,10
     CONTROL         "&Sans page de garde",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,80,10
-    CONTROL         "Fermer automatiquement la fenêtre &récapitulative",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Fermer les fenêtres avec la &touche ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "&Vérifier automatiquement les chemins de la fenêtre-Ouvrir",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Permetre une seule instance en exécution",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Qualifier plusieurs fenêtres pour",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Qualifier plusieurs fenêtres pour",IDC_STATIC,7,72,221,37
     CONTROL         "comparaison de Répert&oires",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "comparaison de &Fichiers",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,192,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge permet de dissimuler certaines boîtes de message. Appuyer sur ce bouton pour les rendre visibles à nouveau.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 79e2a9d..460d85c 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -668,22 +668,19 @@ BEGIN
                     17,210,10
     CONTROL         "Startbildschirm &deaktivieren",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Vergleichszustand automatisch schliessen",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "Fenster mit &ESC schliessen",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "P&fade im Öffnen-Dialog automatisch überprüfen",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Nur eine Programm-Instanz zulassen",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Aktivieren mehrfacher Vergleichsfenster für",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Aktivieren mehrfacher Vergleichsfenster für",IDC_STATIC,7,72,221,37
     CONTROL         "&Ordnervergleich",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "D&ateivergleich",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Zurücksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Zurücksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge erlaubt das Verstecken von einigen häufigen Meldungen. Das Drücken der Schaltfläche macht alle Meldungen wieder sichtbar.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 911d98c..05dfe43 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -664,22 +664,19 @@ BEGIN
                     17,206,10
     CONTROL         "&Splash Screen letiltása",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "Az összehasonlító állapotablak automatikus &bezárása",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "Ablakok bezárása az &ESC billentyûvel",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Automatikus útvonalellenõrzés a &Megnyitás ablakban",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "Csak &egy példány futásának engedélyezése",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Többszörös összehasonlító ablakok engedélyezése:",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Többszörös összehasonlító ablakok engedélyezése:",IDC_STATIC,7,72,221,37
     CONTROL         "&Mappa összehasonlításkor",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "&Fájl összehasonlításkor",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Visszaállít",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Visszaállít",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "A WinMerge lehetõvé teszi néhány általánosságban látható üzenet elrejtését. Nyomd meg a gombot az üzenetek újbóli megjelenítéséhez.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Hungarian/resource.h b/Src/Languages/Hungarian/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Hungarian/resource.h
+++ b/Src/Languages/Hungarian/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index eafbd24..8039f9c 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -664,21 +664,19 @@ BEGIN
                     7,17,211,10
     CONTROL         "&Disattiva la schermata iniziale",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Chiudi automaticamente pannello di confronto rapido cartelle",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "C&hiudi finestra con ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Verifica &automaticamente i percorsi nella finestra Apri",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Permetti l'esecuzione di un'unica istanza del programma",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Attiva finestra di confronto multiplo per",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Attiva finestra di confronto multiplo per",IDC_STATIC,7,72,221,37
     CONTROL         "Confron&to di cartelle",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Confronto di &file",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Ripristina",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Ripristina",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante per rendere visibili nuovamente tutti i messaggi.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index b742003..6a683e2 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -665,22 +665,19 @@ BEGIN
                     17,206,10
     CONTROL         "\83X\83v\83\89\83b\83V\83\85\89æ\96Ê\82ð\94ñ\95\\8e¦(&D)",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "\8e©\93®\93I\82É\94ä\8ar\8fó\8bµ\83y\83C\83\93\82ð\95Â\82¶\82é(&C)",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "ESC\83L\81[\82Å\83E\83C\83\93\83h\83E\82ð\95Â\82¶\82é(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "\8aJ\82­\83_\83C\83A\83\8d\83O\82Å\8e©\93®\93I\82É\83p\83X\82ð\8c\9f\8d¸\82·\82é",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "\95¡\90\94\82Ì\83C\83\93\83X\83^\83\93\83X\82ð\8bN\93®\82µ\82È\82¢(&O)",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "\95¡\90\94\82Ì\94ä\8ar\83E\83C\83\93\83h\83E\82ð\97L\8cø",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "\95¡\90\94\82Ì\94ä\8ar\83E\83C\83\93\83h\83E\82ð\97L\8cø",IDC_STATIC,7,72,221,37
     CONTROL         "\83t\83H\83\8b\83_\94ä\8ar(&F)",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "\83t\83@\83C\83\8b\94ä\8ar(&E)",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "\83\8a\83Z\83b\83g",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "\83\8a\83Z\83b\83g",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge \82Í\81A\82¢\82­\82Â\82©\82Ì\8b¤\92Ê\83\81\83b\83Z\81[\83W\83{\83b\83N\83X\82ð\94ñ\95\\8e¦\82É\82Å\82«\82Ü\82·\81B \91S\82Ä\82Ì\83\81\83b\83Z\81[\83W\83{\83b\83N\83X\82ð\8dÄ\82Ñ\95\\8e¦\82³\82¹\82é\82É\82Í\81A\83{\83^\83\93\82ð\89\9f\89º\82µ\82Ä\82­\82¾\82³\82¢\81B",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Japanese/resource.h b/Src/Languages/Japanese/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Japanese/resource.h
+++ b/Src/Languages/Japanese/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 71c2539..464e100 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -664,22 +664,19 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
     CONTROL         "½ºÇ÷¡½¬ È­¸é »ç¿ë ¾ÈÇÔ(&D)",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,98,10
-    CONTROL         "µð·ºÅ丮 ºñ±³ °á°úâÀ» ÀÚµ¿À¸·Î ´Ý±â(&C)",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "ESC·Î ⠴ݱâ(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "¿­±â ´ëÈ­»óÀÚ¿¡¼­ ÀÚµ¿À¸·Î ¿Ã¹Ù¸¥ °æ·ÎÀÎÁö °Ë»ç",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "ÃʱâÈ­",IDC_RESET_ALL_MESSAGE_BOXES,179,132,50,13,NOT 
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "ÃʱâÈ­",IDC_RESET_ALL_MESSAGE_BOXES,179,122,50,13,NOT 
                     WS_TABSTOP
     LTEXT           "",IDC_STATIC,7,124,171,31
 END

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 4c67325..f783862 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -664,21 +664,19 @@ BEGIN
                     7,17,117,10
     CONTROL         "&Fjern oppstartsbilde",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,79,10
-    CONTROL         "&Lukk sammenligningsvindu automatisk",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "L&ukk vinduer med ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Verifiser stier automatisk i Åpne-dialoger",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Nullstill",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Nullstill",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge tillater skjuling av noen vanlig beskjedbokser. Klikk på knappen får å gjøre alle beskjedbokser synlig igjen.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index fa3d86f..8fbf01f 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -665,21 +665,19 @@ BEGIN
                     7,17,183,10
     CONTROL         "&Wy³¹cz ekran powitalny",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,100,10
-    CONTROL         "Zamknij &automatycznie panel porównania stanu",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Zam&knij okna klawiszem ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Automatycznie weryfikuj \9ccie¿ki w oknie Otwórz",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Resetuj",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Resetuj",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge pozwala ukryæ niektóre komunikaty. Naci\9cnij przycisk, aby wy\9cwietlaæ wszystkie komunikaty.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 4213478..257c020 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -674,22 +674,19 @@ BEGIN
                     17,206,10
     CONTROL         "Îòêëþ÷èòü &çàñòàâêó",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Çàêðûâàòü ïàíåëü ñîñòîÿíèÿ àâòîìàòè÷åñêè",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "Çà&êðûâàòü îêíà êëàâèøåé ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Àâòîìàòè÷åñêè ïðîâåðÿòü ïóòè â äèàëîãå îòðûòèÿ ôàéëîâ",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Ñáðîñ",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Ñáðîñ",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge ïîçâîëÿåò ñêðûâàòü íåêîòîðûå îáùèå ñîîáùåíèÿ. Íàæìèòå êíîïêó ""Ñáðîñ"", ÷òîáû âñå ñîîáùåíèÿ ñíîâà ñòàëè âèäíû.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index c8202a2..2440314 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -664,21 +664,19 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
     CONTROL         "&Nezobrazuj spú\9a\9dací banner",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
-    CONTROL         "Automatically verify paths in Open-dialog",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+    CONTROL         "&Automatically verify paths in Open-dialog",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
-    CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    WS_TABSTOP,7,47,206,10
+    CONTROL         "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge allows hiding some common messageboxes. Press button to make all messageboxes visible again.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 08bdf73..e11ccb9 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -663,21 +663,19 @@ BEGIN
                     7,17,206,10
     CONTROL         "&No mostrar pantalla de bienvenida",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Cerrar panel de comparación de directorios automáticamente",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "C&errar ventanas con ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "&Verificar rutas automáticamente en la ventana de apertura",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "M&ostrar",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "M&ostrar",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge permite ocultar algunas ventanas de mensaje habituales. Haga click en el botón para volver a mostrarlas de nuevo.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 8b2a4f9..27ac9d8 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -663,21 +663,19 @@ BEGIN
                     7,17,206,10
     CONTROL         "&Visa inte Startskärm",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Stäng jämför Statuspanel automatiskt",IDC_CMPPANE_AUTOCLOSE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "St&äng fönster med ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "Verifiera sökvägar i Öppna-dialogen",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "&Tillåt bara en upplaga att köra",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Starta flera jämförfönster för",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Starta flera jämförfönster för",IDC_STATIC,7,72,221,37
     CONTROL         "&Jämför kataloger",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Jäm&för filer",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Återstarta",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Återstarta",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge tillåter döljande av några vanliga meddelanderutor. Tryck på knappen för att göra alla meddelanderutor synliga igen.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index 9a2d68e..1ffa5cc 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -662,22 +662,19 @@ BEGIN
                     17,206,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Close compare Statepane automatically",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "&Automatically verify paths in Open-dialog",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge allows hiding some common messageboxes. Press button to make all messageboxes visible again.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/Languages/Turkish/resource.h b/Src/Languages/Turkish/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/Languages/Turkish/resource.h
+++ b/Src/Languages/Turkish/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 3605686..06f54f8 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -676,22 +676,19 @@ BEGIN
                     17,206,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
-    CONTROL         "&Close compare Statepane automatically",
-                    IDC_CMPPANE_AUTOCLOSE,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,37,206,10
     CONTROL         "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
     CONTROL         "&Automatically verify paths in Open-dialog",
                     IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,57,206,10
+                    WS_TABSTOP,7,47,206,10
     CONTROL         "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,206,10
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,82,221,37
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,72,221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,206,10
     CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,104,206,10
-    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,132,50,13,NOT
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,94,206,10
+    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,122,50,13,NOT
                     WS_TABSTOP
     LTEXT           "WinMerge allows hiding some common messageboxes. Press button to make all messageboxes visible again.",
                     IDC_STATIC,7,124,168,31

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
index 2e7ced9..e02d49f 100644 (file)
--- a/Src/OptionsDef.h
+++ b/Src/OptionsDef.h
@@ -42,7 +42,6 @@ const TCHAR OPT_BREAK_TYPE[] = _T("Settings/BreakType");
 
 const TCHAR OPT_EXT_EDITOR_CMD[] = _T("Settings/ExternalEditor");
 const TCHAR OPT_USE_RECYCLE_BIN[] = _T("Settings/UseRecycleBin");
-const TCHAR OPT_AUTOCLOSE_CMPPANE[] = _T("Settings/AutoCloseCmpPane");
 const TCHAR OPT_SINGLE_INSTANCE[] = _T("Settings/SingleInstance");
 const TCHAR OPT_MERGE_MODE[] = _T("Settings/MergingMode");
 const TCHAR OPT_CLOSE_WITH_ESC[] = _T("Settings/CloseWithEsc");

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
index a975602..a11f34e 100644 (file)
--- a/Src/OptionsInit.cpp
+++ b/Src/OptionsInit.cpp
@@ -54,7 +54,6 @@ void CMainFrame::OptionsInit()
 
        m_options.InitOption(OPT_EXT_EDITOR_CMD, _T(""));
        m_options.InitOption(OPT_USE_RECYCLE_BIN, true);
-       m_options.InitOption(OPT_AUTOCLOSE_CMPPANE, false);
        m_options.InitOption(OPT_SINGLE_INSTANCE, false);
        m_options.InitOption(OPT_MERGE_MODE, false);
        m_options.InitOption(OPT_UNREC_APPLYSYNTAX, false);

diff --git a/Src/PropGeneral.cpp b/Src/PropGeneral.cpp
index 88b15d6..1b8dc6f 100644 (file)
--- a/Src/PropGeneral.cpp
+++ b/Src/PropGeneral.cpp
@@ -50,7 +50,6 @@ CPropGeneral::CPropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(CPropGeneral
 , m_bBackup(FALSE)
 , m_bScroll(FALSE)
 , m_bDisableSplash(FALSE)
-, m_bAutoCloseCmpPane(FALSE)
 , m_bSingleInstance(FALSE)
 , m_bVerifyPaths(FALSE)
 , m_bCloseWindowWithEsc(TRUE)
@@ -78,7 +77,6 @@ void CPropGeneral::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_BACKUP_CHECK, m_bBackup);
        DDX_Check(pDX, IDC_SCROLL_CHECK, m_bScroll);
        DDX_Check(pDX, IDC_DISABLE_SPLASH, m_bDisableSplash);
-       DDX_Check(pDX, IDC_CMPPANE_AUTOCLOSE, m_bAutoCloseCmpPane);
        DDX_Check(pDX, IDC_SINGLE_INSTANCE, m_bSingleInstance);
        DDX_Check(pDX, IDC_VERIFY_OPEN_PATHS, m_bVerifyPaths);
        DDX_Check(pDX, IDC_ESC_CLOSES_WINDOW, m_bCloseWindowWithEsc);
@@ -102,7 +100,6 @@ void CPropGeneral::ReadOptions()
        m_bBackup = m_pOptionsMgr->GetBool(OPT_CREATE_BACKUPS);
        m_bScroll = m_pOptionsMgr->GetBool(OPT_SCROLL_TO_FIRST);
        m_bDisableSplash = m_pOptionsMgr->GetBool(OPT_DISABLE_SPLASH);
-       m_bAutoCloseCmpPane = m_pOptionsMgr->GetBool(OPT_AUTOCLOSE_CMPPANE);
        m_bSingleInstance = m_pOptionsMgr->GetBool(OPT_SINGLE_INSTANCE);
        m_bVerifyPaths = m_pOptionsMgr->GetBool(OPT_VERIFY_OPEN_PATHS);
        m_bCloseWindowWithEsc = m_pOptionsMgr->GetBool(OPT_CLOSE_WITH_ESC);
@@ -118,7 +115,6 @@ void CPropGeneral::WriteOptions()
        m_pOptionsMgr->SaveOption(OPT_CREATE_BACKUPS, m_bBackup == TRUE);
        m_pOptionsMgr->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll == TRUE);
        m_pOptionsMgr->SaveOption(OPT_DISABLE_SPLASH, m_bDisableSplash == TRUE);
-       m_pOptionsMgr->SaveOption(OPT_AUTOCLOSE_CMPPANE, m_bAutoCloseCmpPane == TRUE);
        m_pOptionsMgr->SaveOption(OPT_SINGLE_INSTANCE, m_bSingleInstance == TRUE);
        m_pOptionsMgr->SaveOption(OPT_VERIFY_OPEN_PATHS, m_bVerifyPaths == TRUE);
        m_pOptionsMgr->SaveOption(OPT_CLOSE_WITH_ESC, m_bCloseWindowWithEsc == TRUE);

diff --git a/Src/PropGeneral.h b/Src/PropGeneral.h
index 31753d9..12a5f48 100644 (file)
--- a/Src/PropGeneral.h
+++ b/Src/PropGeneral.h
@@ -34,7 +34,6 @@ public:
        BOOL  m_bBackup;
        BOOL  m_bScroll;
        BOOL  m_bDisableSplash;
-       BOOL  m_bAutoCloseCmpPane;
        BOOL  m_bSingleInstance;
        BOOL  m_bVerifyPaths;
        BOOL  m_bCloseWindowWithEsc;

diff --git a/Src/resource.h b/Src/resource.h
index edadf5d..87af4fb 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -205,7 +205,6 @@
 #define IDC_WMGOTO_TOLINE               1111
 #define IDC_WMGOTO_TODIFF               1112
 #define IDC_WMGOTO_PARAM                1113
-#define IDC_CMPPANE_AUTOCLOSE           1114
 #define IDC_OPEN_CONTRIBUTORS           1115
 #define IDC_COMPAREMETHODCOMBO          1116
 #define IDC_USE_RECYCLE_BIN             1117