PATCH: [ 905115 ] Put deleted files to Recycle Bin

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index e94b4b4..21a6104 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -24,6 +24,7 @@
 #include "OutputDlg.h"
 #include "paths.h"
 #include "CShellFileOp.h"
+#include "OptionsDef.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -362,8 +363,12 @@ void CDirView::PerformActionList(ActionList & actionList)
                break;
        }
        
-       // TODO: option for putting deleted items into recycle bin!
        int operFlags = FOF_NOCONFIRMMKDIR | FOF_MULTIDESTFILES;
+       
+       // Check option and enable putting deleted items to Recycle Bin
+       if (mf->m_options.GetInt(OPT_USE_RECYCLE_BIN) == TRUE)
+               operFlags |= FOF_ALLOWUNDO;
+
        fileOp.SetOperationFlags(operation, this, operFlags);
        
        // Add files/directories

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 04981fd..16100f4 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -426,15 +426,14 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Geral"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Ajustes",IDC_STATIC,7,7,250,51
     CONTROL         "&Guardar cópia de segurança do arquivo original",
                     IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,19,206,10
+                    7,17,206,10
     CONTROL         "Posicionar a&utomaticamente na primeira diferença",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,206,10
+                    7,17,206,10
     CONTROL         "&Desabilitar Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -583,17 +582,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registro"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 6c516e6..917614a 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -427,14 +427,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Ajustos",IDC_STATIC,7,7,285,51
     CONTROL         "&Guarda còpia del fitxer original",IDC_BACKUP_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,206,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
     CONTROL         "&Desplaça automàticament fins la primera diferència",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,211,10
+                    7,17,211,10
     CONTROL         "Inhabilita la pantalla de &benvinguda",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -582,17 +581,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registre"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Afegeix menú contextual a l'explorador del Windows",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,222,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Navega...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "&Editor extern:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "N&avega...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Navega...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&Editor extern:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "N&avega...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index df3f75d..a808809 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -420,13 +420,12 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "³£¹æ"
 FONT 9, "ËÎÌå"
 BEGIN
-    GROUPBOX        "³£¹æÑ¡Ïî",IDC_STATIC,7,7,221,51
     CONTROL         "±¸·ÝԭʼÎļþ(&B)",IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,17,19,83,10
+                    WS_TABSTOP,7,7,83,10
     CONTROL         "×Ô¶¯¹ö¶¯µ½µÚÒ»¸ö²»Í¬(&S)",IDC_SCROLL_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,30,129,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
     CONTROL         "Í£ÓÃÒýÈËעĿµÄÆÁÄ»(&D)",IDC_DISABLE_SPLASH,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,17,41,100,10
+                    WS_TABSTOP,7,27,100,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG FIXED IMPURE  0, 0, 213, 111
@@ -568,17 +567,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "怬"
+CAPTION "System"
 FONT 9, "ËÎÌå", 0, 0, 0x1
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 29f3d88..b41bfce 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -421,13 +421,12 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "¤@¯ë"
 FONT 9, "·s²Ó©úÅé"
 BEGIN
-    GROUPBOX        "³]©w",IDC_STATIC,7,7,221,51
     CONTROL         "³Æ¥÷­ì©lªºÀÉ®×(&B)",IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,17,19,83,10
+                    WS_TABSTOP,7,7,83,10
     CONTROL         "¦Û°Ê¦a±²°Ê¨ì²Ä¤@­Ó¤£¦P(&S)",IDC_SCROLL_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,30,129,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
     CONTROL         "°±¥Î¤Þ¤Hª`¥Øªº¿Ã¹õ(&D)",IDC_DISABLE_SPLASH,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,17,41,100,10
+                    WS_TABSTOP,7,27,100,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -569,17 +568,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "µn¿ý"
+CAPTION "System"
 FONT 9, "·s²Ó©úÅé", 0, 0, 0x1
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index a28f9bc..1c61519 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -429,13 +429,12 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Nastavení",IDC_STATIC,7,7,221,51
     CONTROL         "&Zálohovat originální soubory",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,202,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
     CONTROL         "Automatický &skok na první rozdíl",IDC_SCROLL_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,129,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -583,17 +582,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registry"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index ea9ed93..230246a 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -427,13 +427,12 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generelt"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Indstillinger",IDC_STATIC,7,7,245,51
     CONTROL         "&Backup originale filer",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,81,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,81,10
     CONTROL         "Automatisk &scroll til første forskel",IDC_SCROLL_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,117,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,117,10
     CONTROL         "&Fjern Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,79,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,79,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 162
@@ -580,17 +579,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registreringer"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 82e5f65..a6b24ed 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -428,14 +428,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Algemeen"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Instellingen",IDC_STATIC,7,7,233,51
     CONTROL         "&Reservekopie orginele bestand",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,114,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Automatisch naar eerste verschil gaan",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,136,10
+                    7,17,136,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,87,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -583,17 +582,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registry"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index ade6488..6bb3840 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -428,15 +428,14 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Général"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Paramètres :",IDC_STATIC,7,7,233,51
     CONTROL         "Crée un &backup des fichiers originaux",
                     IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,19,145,10
+                    7,7,145,10
     CONTROL         "&Défile automatiquement jusqu'à la première différence",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,183,10
+                    7,17,183,10
     CONTROL         "&Sans Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,80,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,80,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -583,17 +582,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Base de registre"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Intégrer à l'explorateur Windows",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "Programme &WinMerge:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Parcourir...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "Editeur externe:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Parcourir...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "Programme &WinMerge:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Parcourir...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "Editeur externe:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Parcourir...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index e057c50..da20b32 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -435,14 +435,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Einstellungen",IDC_STATIC,7,7,245,51
     CONTROL         "&Sicherheitskopie der Originaldatei",IDC_BACKUP_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,121,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
     CONTROL         "Anzeige automatisch auf den ersten Unterschied &positionieren",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,210,10
+                    7,17,210,10
     CONTROL         "Startbildschirm &deaktivieren",IDC_DISABLE_SPLASH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,100,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -590,17 +589,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registrierung"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "Zum Explorer-Kontextmenü &hinzufügen",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge Programm:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Suchen...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "Externer Editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Suchen...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge Programm:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Suchen...",IDC_WINMERGE_PATH_BROWSE,179,29,40,14
+    LTEXT           "Externer Editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Suchen...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 12bcb81..d711e1f 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -425,14 +425,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Impostazioni",IDC_STATIC,7,7,221,51
     CONTROL         "&Esegui il backup del file originale",IDC_BACKUP_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,118,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,118,10
     CONTROL         "&Visualizza automaticamente la prima differenza",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,161,10
+                    7,17,161,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,87,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -580,17 +579,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registry"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index fa3c8fe..2718c6f 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -394,13 +394,12 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "ÀϹÝ"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "¼³Á¤",IDC_STATIC,7,7,221,51
     CONTROL         "¿øº» ÆÄÀÏ ¹é¾÷(&B)",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,75,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,75,10
     CONTROL         "óÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î ÀÚµ¿ ½ºÄÚ·Ñ(&S)",IDC_SCROLL_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,129,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
     CONTROL         "½ºÇ÷¡½¬ È­¸é »ç¿ë ¾ÈÇÔ(&D)",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,98,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,98,10
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 111
@@ -548,17 +547,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156
 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "·¹Áö½ºÆ®¸®"
+CAPTION "System"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 2390cde..3c9d716 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -427,14 +427,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generelt"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Innstillinger",IDC_STATIC,7,7,251,51
     CONTROL         "&Backup originale filer",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,81,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,81,10
     CONTROL         "Automatisk &scroll til første forskjell",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,117,10
+                    7,17,117,10
     CONTROL         "&Fjern oppstartsbilde",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,79,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,79,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 162
@@ -581,17 +580,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registreringer"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 3f6fed0..8b2b444 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -426,15 +426,14 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ogólne"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Opcje",IDC_STATIC,7,7,233,51
     CONTROL         "&Kopia zapasowa oryginalu",
                     IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,19,145,10
+                    7,7,145,10
     CONTROL         "Przejdz automatycznie do pierwszej róznicy",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,183,10
+                    7,17,183,10
     CONTROL         "&Wylacz ekran powitalny",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,100,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,100,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -581,17 +580,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOGEX  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Rejesty"
+CAPTION "System"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index b805a17..d47702d 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -433,14 +433,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Îñíîâíûå"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Íàñòðîéêè",IDC_STATIC,7,7,276,51
     CONTROL         "&Äåëàòü ðåçåðâíóþ êîïèþ îðèãèíàëà",IDC_BACKUP_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,140,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
     CONTROL         "Àâòîìàòè÷åñêè &óñòàíîâèòü íà ïåðâîå îòëè÷èå",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,180,10
+                    7,17,206,10
     CONTROL         "Îòêëþ÷èòü &çàñòàâêó",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,95,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -589,18 +588,20 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Ðååñòð"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "Äîáàâèòü â &êîíòåêñòíîå ìåíþ ïðîâîäíèêà",
                     IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,6,167,10
-    LTEXT           "Ïóòü äî &WinMerge:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Îáçîð...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "Âíåøíèé ðåäàêòîð:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Îáçîð...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    WS_TABSTOP,7,17,167,10
+    LTEXT           "Ïóòü äî &WinMerge:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Îáçîð...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "Âíåøíèé ðåäàêòîð:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Îáçîð...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 271, 170

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index eae8fc2..5eb695b 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -428,13 +428,12 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hlavné nastavenia"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Nastavenie",IDC_STATIC,7,7,233,51
     CONTROL         "&Zálohova\9d originálne súbory",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,202,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
     CONTROL         "Automatický &skok na prvý rozdiel",IDC_SCROLL_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,129,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
     CONTROL         "&Nezobrazuj spú\9a\9dací banner",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,105,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -582,17 +581,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registre"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index bcb2eb8..091b9ed 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -426,14 +426,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Opciones",IDC_STATIC,7,7,243,51
     CONTROL         "&Guardar el archivo original",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,98,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
     CONTROL         "Moverse automaticamente a la primera diferencia",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,175,10
+                    7,17,206,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -581,17 +580,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registry"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 0cb0c24..8e497d0 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -421,19 +421,18 @@ BEGIN
     LTEXT           "&Versionsstyringssystem:",IDC_STATIC,10,22,75,10
 END
 
-IDD_PROPPAGE_LARGE DIALOGEX 0, 0, 259, 157
+IDD_PROPPAGE_LARGE DIALOGEX 0, 0, 259, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generellt"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Inställningar",IDC_STATIC,7,7,245,51
     CONTROL         "&Gör backup på originalfiler",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,98,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
     CONTROL         "Rulla automati&skt till första skillnaden",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,131,10
+                    7,17,206,10
     CONTROL         "&Visa inte Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,91,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 162
@@ -580,18 +579,20 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registret"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "Lägg till i Utforskarens popup-meny",
                     IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Bläddra...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
+                    WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Bläddra...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
     LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Bläddra...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Bläddra...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index cd58e0d..c3ca13a 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -161,6 +161,7 @@ CMainFrame::CMainFrame()
 
        m_options.SetRegRootKey(_T("Thingamahoochie\\WinMerge\\"));
 
+       // Initialise options (name, default value)
        m_options.InitOption(OPT_SHOW_UNIQUE_LEFT, TRUE);
        m_options.InitOption(OPT_SHOW_UNIQUE_RIGHT, TRUE);
        m_options.InitOption(OPT_SHOW_DIFFERENT, TRUE);
@@ -176,6 +177,8 @@ CMainFrame::CMainFrame()
        m_options.InitOption(OPT_AUTOMATIC_RESCAN, FALSE);
        m_options.InitOption(OPT_ALLOW_MIXED_EOL, FALSE);
 
+       m_options.InitOption(OPT_USE_RECYCLE_BIN, TRUE);
+
        m_bShowErrors = TRUE;
        m_nVerSys = theApp.GetProfileInt(_T("Settings"), _T("VersionSystem"), 0);
        m_strVssProjectBase = theApp.GetProfileString(_T("Settings"), _T("VssProject"), _T(""));
@@ -979,6 +982,7 @@ void CMainFrame::OnOptions()
        filter.m_sPattern = m_sPattern;
        regpage.m_strEditorPath = m_sExtEditorPath;
        regpage.GetContextRegValues();
+       regpage.m_bUseRecycleBin = m_options.GetInt(OPT_USE_RECYCLE_BIN);
     compage.m_compareMethod = m_nCompMethod;
        compage.m_nIgnoreWhite = diffOptions.nIgnoreWhitespace;
        compage.m_bIgnoreCase = diffOptions.bIgnoreCase;
@@ -999,6 +1003,7 @@ void CMainFrame::OnOptions()
                m_options.SaveOption(OPT_SCROLL_TO_FIRST, gen.m_bScroll);
 
                theApp.m_bDisableSplash = gen.m_bDisableSplash;
+               m_options.SaveOption(OPT_USE_RECYCLE_BIN, regpage.m_bUseRecycleBin);
 
                diffOptions.nIgnoreWhitespace = compage.m_nIgnoreWhite;
                diffOptions.bIgnoreBlankLines = compage.m_bIgnoreBlankLines;

diff --git a/Src/Merge.rc b/Src/Merge.rc
index bf70554..8bd6fd6 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -427,14 +427,13 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Settings",IDC_STATIC,7,7,221,51
     CONTROL         "&Backup original file",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
     CONTROL         "Automatically &scroll to first difference",
-                    IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,30,206,10
+                    IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
+                    17,206,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,206,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -582,17 +581,19 @@ END
 
 IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE  0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Registry"
+CAPTION "System"
 FONT 8, "MS Sans Serif"
 BEGIN
+    CONTROL         "&Put deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,114,10
     CONTROL         "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,167,10
-    LTEXT           "&WinMerge executable:",IDC_STATIC,7,19,167,8
-    EDITTEXT        IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,29,50,14
-    LTEXT           "External editor:",IDC_STATIC,7,50,167,8
-    EDITTEXT        IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_EXT_EDITOR_BROWSE,179,60,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,167,10
+    LTEXT           "&WinMerge executable:",IDC_STATIC,7,30,167,8
+    EDITTEXT        IDC_WINMERGE_PATH,7,40,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_WINMERGE_PATH_BROWSE,179,40,50,14
+    LTEXT           "&External editor:",IDC_STATIC,7,61,167,8
+    EDITTEXT        IDC_EXT_EDITOR_PATH,7,71,167,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "B&rowse...",IDC_EXT_EDITOR_BROWSE,179,71,50,14
 END
 
 IDD_GENERATE_PATCH DIALOG DISCARDABLE  0, 0, 340, 180

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
index 97a4a93..b49a505 100644 (file)
--- a/Src/OptionsDef.h
+++ b/Src/OptionsDef.h
@@ -24,4 +24,6 @@ const TCHAR OPT_SCROLL_TO_FIRST[] =  _T("Settings/ScrollToFirst");
 const TCHAR OPT_AUTOMATIC_RESCAN[] = _T("Settings/AutomaticRescan");
 const TCHAR OPT_ALLOW_MIXED_EOL[] = _T("Settings/AllowMixedEOL");
 
+const TCHAR OPT_USE_RECYCLE_BIN[] = _T("Settings/UseRecycleBin");
+
 #endif // _OPTIONS_DEF_H_
\ No newline at end of file

diff --git a/Src/PropRegistry.cpp b/Src/PropRegistry.cpp
index f936749..96994d6 100644 (file)
--- a/Src/PropRegistry.cpp
+++ b/Src/PropRegistry.cpp
@@ -4,7 +4,7 @@
 //    it under the terms of the GNU General Public License as published by
 //    the Free Software Foundation; either version 2 of the License, or (at
 //    your option) any later version.
-//    
+//
 //    This program is distributed in the hope that it will be useful, but
 //    WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14,7 +14,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 /////////////////////////////////////////////////////////////////////////////
-/** 
+/**
  * @file  PropRegistry.cpp
  *
  * @brief CPropRegistry implementation file
@@ -49,7 +49,8 @@ CPropRegistry::CPropRegistry()
        : CPropertyPage(CPropRegistry::IDD)
 {
        //{{AFX_DATA_INIT(CPropRegistry)
-               // NOTE: the ClassWizard will add member initialization here
+       m_bContextAdded = FALSE;
+       m_bUseRecycleBin = TRUE;
        //}}AFX_DATA_INIT
 }
 
@@ -60,6 +61,7 @@ void CPropRegistry::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_EXPLORER_CONTEXT, m_bContextAdded);
        DDX_Text(pDX, IDC_WINMERGE_PATH, m_strPath);
        DDX_Text(pDX, IDC_EXT_EDITOR_PATH, m_strEditorPath);
+       DDX_Check(pDX, IDC_USE_RECYCLE_BIN, m_bUseRecycleBin);
        //}}AFX_DATA_MAP
 }
 
@@ -74,13 +76,13 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CPropRegistry message handlers
 
-BOOL CPropRegistry::OnInitDialog() 
+BOOL CPropRegistry::OnInitDialog()
 {
        CPropertyPage::OnInitDialog();
-       
+
        GetContextRegValues();
        UpdateData(FALSE);
-       
+
        return TRUE;  // return TRUE unless you set the focus to a control
                      // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -94,7 +96,7 @@ void CPropRegistry::GetContextRegValues()
 
        // This will be bit mask, although now there is only one bit defined
        DWORD dwContextEnabled = reg.ReadDword(f_RegValueEnabled, 0);
-       
+
        if (dwContextEnabled & 0x1)
                m_bContextAdded = TRUE;
 
@@ -109,7 +111,7 @@ void CPropRegistry::OnAddToExplorer()
        CRegKeyEx reg;
        if (reg.Open(HKEY_CURRENT_USER, f_RegDir) != ERROR_SUCCESS)
                return;
-       
+
        // This will be bit mask, although now there is only one bit defined
        DWORD dwContextEnabled = reg.ReadDword(f_RegValueEnabled, 0);
 
@@ -136,8 +138,8 @@ void CPropRegistry::SaveMergePath()
 /// Open file browse dialog to locate WinMerge.exe or bat file
 void CPropRegistry::OnBrowsePath()
 {
-       CString s;           
-                   
+       CString s;
+
        VERIFY(s.LoadString(IDS_PROGRAMFILES));
        DWORD flags = OFN_NOTESTFILECREATE | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
        CFileDialog pdlg(TRUE, NULL, _T(""), flags, s);
@@ -146,7 +148,7 @@ void CPropRegistry::OnBrowsePath()
        pdlg.m_ofn.lpstrTitle = (LPCTSTR)title;
 
        if (pdlg.DoModal() == IDOK)
-               m_strPath = pdlg.GetPathName(); 
+               m_strPath = pdlg.GetPathName();
 
        UpdateData(FALSE);
 }
@@ -154,7 +156,7 @@ void CPropRegistry::OnBrowsePath()
 /// Open file browse dialog to locate editor
 void CPropRegistry::OnBrowseEditor()
 {
-       CString s;           
+       CString s;
        VERIFY(s.LoadString(IDS_PROGRAMFILES));
        DWORD flags = OFN_NOTESTFILECREATE | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
        CFileDialog pdlg(TRUE, NULL, _T(""), flags, s);
@@ -163,7 +165,7 @@ void CPropRegistry::OnBrowseEditor()
        pdlg.m_ofn.lpstrTitle = (LPCTSTR)title;
 
        if (pdlg.DoModal() == IDOK)
-               m_strEditorPath = pdlg.GetPathName(); 
+               m_strEditorPath = pdlg.GetPathName();
 
        UpdateData(FALSE);
 }
\ No newline at end of file

diff --git a/Src/PropRegistry.h b/Src/PropRegistry.h
index f0d0e79..c1d8d8c 100644 (file)
--- a/Src/PropRegistry.h
+++ b/Src/PropRegistry.h
@@ -14,7 +14,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 /////////////////////////////////////////////////////////////////////////////
-/** 
+/**
  * @file  PropRegistry.h
  *
  * @brief Declaration file CPropRegistry
@@ -47,6 +47,7 @@ public:
        BOOL m_bContextAdded;
        CString m_strPath;
        CString m_strEditorPath;
+       BOOL    m_bUseRecycleBin;
        //}}AFX_DATA
 
        // Overrides

diff --git a/Src/readme.txt b/Src/readme.txt
index 69d756d..d85923c 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,9 @@
+2004-02-27 Kimmo
+ PATCH: [ 905115 ] Put deleted files to Recycle Bin
+  Also added option to disable it in "System" options
+  DirActions.cpp MainFrm.cpp Merge.rc OptionsDef.h PropRegistry.cpp
+  PropRegistry.h resource.h
+
 2004-02-26 Kimmo
  PATCH: [ 903670 ] Copy Folder (and convert to CShellFileOp)
   Src: DirActions.cpp DirView.h MainFrm.cpp MainFrm.h

diff --git a/Src/resource.h b/Src/resource.h
index b6b7850..87116e4 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -299,6 +299,7 @@
 #define IDS_COLHDR_NDIFFS               1114
 #define IDS_COLHDR_NSDIFFS              1115
 #define IDC_COMPAREMETHODCOMBO          1116
+#define IDC_USE_RECYCLE_BIN             1117
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503