PATCH: [ 913073 ] Option to automatically close compare pane

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 58d7b04..e7e9686 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -29,6 +29,7 @@
 #include "stdafx.h"
 #include "Merge.h"
 #include "DirView.h"
+#include "DirFrame.h"  // StatePane
 #include "DirDoc.h"
 #include "MainFrm.h"
 #include "resource.h"
@@ -138,6 +139,8 @@ BEGIN_MESSAGE_MAP(CDirView, CListViewEx)
        ON_COMMAND(ID_DIR_ZIP_RIGHT, OnCtxtDirZipRight)
        ON_COMMAND(ID_DIR_ZIP_BOTH, OnCtxtDirZipBoth)
        ON_COMMAND(ID_DIR_ZIP_BOTH_DIFFS_ONLY, OnCtxtDirZipBothDiffsOnly)
+       ON_COMMAND(ID_VIEW_DIR_STATEPANE, OnDirStatePane)
+       ON_UPDATE_COMMAND_UI(ID_VIEW_DIR_STATEPANE, OnUpdateDirStatePane)
        ON_COMMAND(ID_EDIT_SELECT_ALL, OnSelectAll)
        ON_UPDATE_COMMAND_UI(ID_EDIT_SELECT_ALL, OnUpdateSelectAll)
        //}}AFX_MSG_MAP
@@ -1488,6 +1491,13 @@ void CDirView::OnUpdateRefresh(CCmdUI* pCmdUI)
  */
 LRESULT CDirView::OnUpdateUIMessage(WPARAM wParam, LPARAM lParam)
 {
+       // Close compare pane when compare is ready
+       if (mf->m_options.GetInt(OPT_AUTOCLOSE_CMPPANE))
+       {
+               CDirFrame *pf = GetParentFrame();
+               pf->ShowProcessingBar(FALSE);
+       }
+
        CDirDoc * pDoc = GetDocument();
        ASSERT(pDoc);
 
@@ -1872,6 +1882,24 @@ CString CDirView::GenerateReport()
 }
 
 /**
+ * @brief Show directory compare statepane
+ */
+void CDirView::OnDirStatePane()
+{
+       CDirFrame *pf = GetParentFrame();
+       pf->ShowProcessingBar(TRUE);
+}
+
+/**
+ * @brief Enable menuitem for compare statepane
+ */
+void CDirView::OnUpdateDirStatePane(CCmdUI* pCmdUI)
+{
+       pCmdUI->Enable(TRUE);
+}
+
+
+/**
  * @brief Add special items for non-recursive compare
  * to directory view.
  *

diff --git a/Src/DirView.h b/Src/DirView.h
index 15a7e82..fe2d302 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -274,6 +274,8 @@ protected:
        afx_msg void OnCtxtDirZipBoth();
        afx_msg void OnCtxtDirZipBothDiffsOnly();
        afx_msg void OnUpdateCtxtDir(CCmdUI* pCmdUI);
+       afx_msg void OnDirStatePane();
+       afx_msg void OnUpdateDirStatePane(CCmdUI* pCmdUI);
        afx_msg void OnSelectAll();
        afx_msg void OnUpdateSelectAll(CCmdUI* pCmdUI);
        //}}AFX_MSG

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index e3314b3..4191747 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -164,6 +164,7 @@ BEGIN
         MENUITEM "Barra de &Ferramentas",       ID_VIEW_TOOLBAR
         MENUITEM "Barra de &Status",            ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Idioma...",                  ID_VIEW_LANGUAGE
     END
@@ -434,6 +435,8 @@ 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
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 2bd612b..2044beb 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -164,6 +164,7 @@ BEGIN
         MENUITEM "Barra d'ei&nes",              ID_VIEW_TOOLBAR
         MENUITEM "Barra d'est&at",              ID_VIEW_STATUS_BAR
         MENUITEM "Subfinest&ra de diferències", ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "Idio&ma...",                  ID_VIEW_LANGUAGE
     END
@@ -434,6 +435,8 @@ BEGIN
                     7,17,211,10
     CONTROL         "Inhabilita la pantalla de &benvinguda",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
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index a7c03c3..64735f6 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -161,6 +161,7 @@ BEGIN
         MENUITEM "¹¤¾ßÀ¸(&T)",                  ID_VIEW_TOOLBAR
         MENUITEM "״̬À¸(&S)",                  ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "ÓïÑÔ(&L)...",                 ID_VIEW_LANGUAGE
     END
@@ -426,6 +427,8 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,17,129,10
     CONTROL         "Í£ÓÃÒýÈËעĿµÄÆÁÄ»(&D)",IDC_DISABLE_SPLASH,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,27,100,10
+    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG FIXED IMPURE  0, 0, 213, 111

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 731b07f..ef234f7 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -162,6 +162,7 @@ BEGIN
         MENUITEM "¤u¨ã¦C(&T)",                  ID_VIEW_TOOLBAR
         MENUITEM "ª¬ºA¦C(&S)",                  ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "»y¨¥(&L)...",                 ID_VIEW_LANGUAGE
     END
@@ -427,6 +428,8 @@ 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         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index b69a341..84df35b 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -165,6 +165,7 @@ BEGIN
         MENUITEM "&Panel nástroju",             ID_VIEW_TOOLBAR
         MENUITEM "&Stavový rádek",              ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Jazyk...",                   ID_VIEW_LANGUAGE
     END
@@ -435,6 +436,8 @@ 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
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 15e9abd..2e25b41 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -164,6 +164,7 @@ BEGIN
         MENUITEM "&Værktøjslinje",              ID_VIEW_TOOLBAR
         MENUITEM "S&tatuslinje",                ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "S&prog...",                   ID_VIEW_LANGUAGE
     END
@@ -433,6 +434,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,117,10
     CONTROL         "&Fjern Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,79,10
+    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 162

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 3f13bbc..67406e2 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -165,6 +165,7 @@ BEGIN
         MENUITEM "&Werkbalk",                   ID_VIEW_TOOLBAR
         MENUITEM "&Status Balk",                ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Taal...",                    ID_VIEW_LANGUAGE
     END
@@ -435,6 +436,8 @@ BEGIN
                     7,17,136,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,87,10
+    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 8727b38..259b5c2 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -164,6 +164,7 @@ BEGIN
         MENUITEM "Barre d'&outils",             ID_VIEW_TOOLBAR
         MENUITEM "&Barre d'état",               ID_VIEW_STATUS_BAR
         MENUITEM "Détail des différences",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Langue...",                  ID_VIEW_LANGUAGE
     END
@@ -436,6 +437,8 @@ BEGIN
                     7,17,183,10
     CONTROL         "&Sans Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,80,10
+    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 1a509eb..faf4439 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -169,6 +169,7 @@ BEGIN
         MENUITEM "&Symbolleiste",               ID_VIEW_TOOLBAR
         MENUITEM "S&tatusleiste",               ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "Spra&che...",                 ID_VIEW_LANGUAGE
     END
@@ -442,6 +443,8 @@ BEGIN
                     7,17,210,10
     CONTROL         "Startbildschirm &deaktivieren",IDC_DISABLE_SPLASH,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,27,206,10
+    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 08daf27..5f539cc 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -163,6 +163,7 @@ BEGIN
         MENUITEM "Barra degli &strumenti",      ID_VIEW_TOOLBAR
         MENUITEM "&Barra di stato",             ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Lingua...",                  ID_VIEW_LANGUAGE
     END
@@ -432,6 +433,8 @@ BEGIN
                     7,17,161,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,87,10
+    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 6cfa16f..9b6b54c 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -129,6 +129,7 @@ BEGIN
         MENUITEM "Åø¹Ù(&T)",                    ID_VIEW_TOOLBAR
         MENUITEM "»óÅ ǥ½ÃÁÙ(&S)",             ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "¾ð¾î(&L)...",                 ID_VIEW_LANGUAGE
     END
@@ -400,6 +401,8 @@ 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         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 111

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 467ff88..5db4a00 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -164,6 +164,7 @@ BEGIN
         MENUITEM "&verktøylinje",               ID_VIEW_TOOLBAR
         MENUITEM "S&tatuslinje",                ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "S&pråk...",                   ID_VIEW_LANGUAGE
     END
@@ -434,6 +435,8 @@ BEGIN
                     7,17,117,10
     CONTROL         "&Fjern oppstartsbilde",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,79,10
+    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 162

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 192bf81..a4e35e3 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -153,6 +153,7 @@ BEGIN
         MENUITEM "Pokaz &unikatowe dla lewej",  ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Pokaz u&nikatowe dla prawej", ID_OPTIONS_SHOWUNIQUERIGHT
         MENUITEM "Pokaz pliki &binarne",        ID_OPTIONS_SHOWBINARIES
+        MENUITEM "Show S&kipped Files",         ID_OPTIONS_SHOWSKIPPED
         MENUITEM "Ukryj pliki *.B&AK",          ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Zmi&en czcionke...",          ID_VIEW_SELECTFONT
@@ -162,9 +163,10 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Pasek &narzedzi",             ID_VIEW_TOOLBAR
         MENUITEM "Pasek s&tanu",                ID_VIEW_STATUS_BAR
+        MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Jezyk...",                   ID_VIEW_LANGUAGE
-
     END
     POPUP "&Merge"
     BEGIN
@@ -434,6 +436,8 @@ BEGIN
                     7,17,183,10
     CONTROL         "&Wylacz ekran powitalny",IDC_DISABLE_SPLASH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,27,100,10
+    CONTROL         "&Close compare Statepane automatically",IDC_CMPPANE_AUTOCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 88247da..9ab6911 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -164,6 +164,7 @@ BEGIN
         MENUITEM "Ïà&íåëü èíñòðóìåíòîâ",        ID_VIEW_TOOLBAR
         MENUITEM "&Ñòðîêà ñîñòîÿíèÿ",           ID_VIEW_STATUS_BAR
         MENUITEM "Ïàíå&ëü ñðàâíåíèÿ",           ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&ßçûê...",                    ID_VIEW_LANGUAGE
     END
@@ -236,7 +237,6 @@ BEGIN
             MENUITEM "Ñëåâà íà ...",                ID_DIR_COPY_LEFT_TO_BROWSE
             MENUITEM "Ñïðàâà íàëåâî",               ID_DIR_COPY_RIGHT_TO_LEFT
             MENUITEM "Ñïðàâà íà ...",               ID_DIR_COPY_RIGHT_TO_BROWSE
-
         END
         POPUP "Óäàëèòü"
         BEGIN
@@ -440,6 +440,8 @@ BEGIN
                     7,17,206,10
     CONTROL         "Îòêëþ÷èòü &çàñòàâêó",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
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index a269fbc..6f91c78 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -164,6 +164,7 @@ BEGIN
         MENUITEM "&Panel nástrojov",            ID_VIEW_TOOLBAR
         MENUITEM "&Stavový riadok",             ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Jazyk...",                   ID_VIEW_LANGUAGE
     END
@@ -434,6 +435,8 @@ 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
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 4592eba..9bfa712 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -164,6 +164,7 @@ BEGIN
         MENUITEM "&Barra de Herramientas",      ID_VIEW_TOOLBAR
         MENUITEM "&Barra de Estado",            ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Idioma...",                  ID_VIEW_LANGUAGE
     END
@@ -433,6 +434,8 @@ BEGIN
                     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
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 4daed92..4212039 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -163,6 +163,7 @@ BEGIN
         MENUITEM "V&erktygsfält",               ID_VIEW_TOOLBAR
         MENUITEM "S&tatusfält",                 ID_VIEW_STATUS_BAR
         MENUITEM "Skillnadsfält",               ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "S&pråk...",                   ID_VIEW_LANGUAGE
     END
@@ -433,6 +434,8 @@ BEGIN
                     7,17,206,10
     CONTROL         "&Visa inte 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
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 162

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 3859bab..3f80fa6 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -183,6 +183,7 @@ CMainFrame::CMainFrame()
 
        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_CMP_IGNORE_WHITESPACE, 0);
        m_options.InitOption(OPT_CMP_IGNORE_BLANKLINES, FALSE);
@@ -998,7 +999,8 @@ void CMainFrame::OnOptions()
        vss.m_strPath = m_strVssPath;
        gen.m_bBackup = m_options.GetInt(OPT_CREATE_BACKUPS);
        gen.m_bScroll = m_options.GetInt(OPT_SCROLL_TO_FIRST);
-       gen.m_bDisableSplash = m_options.GetInt(OPT_DISABLE_SPLASH);;
+       gen.m_bDisableSplash = m_options.GetInt(OPT_DISABLE_SPLASH);
+       gen.m_bAutoCloseCmpPane = m_options.GetInt(OPT_AUTOCLOSE_CMPPANE);
        filter.m_bIgnoreRegExp = m_bIgnoreRegExp;
        filter.m_sPattern = m_sPattern;
        regpage.m_strEditorPath = m_options.GetString(OPT_EXT_EDITOR_CMD);
@@ -1022,8 +1024,8 @@ void CMainFrame::OnOptions()
                
                m_options.SaveOption(OPT_CREATE_BACKUPS, gen.m_bBackup);
                m_options.SaveOption(OPT_SCROLL_TO_FIRST, gen.m_bScroll);
-
                m_options.SaveOption(OPT_DISABLE_SPLASH, gen.m_bDisableSplash);
+               m_options.SaveOption(OPT_AUTOCLOSE_CMPPANE, gen.m_bAutoCloseCmpPane);
                m_options.SaveOption(OPT_USE_RECYCLE_BIN, regpage.m_bUseRecycleBin);
                regpage.SaveMergePath();
                sExtEditor = regpage.m_strEditorPath;

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 62eb5d1..1508a5b 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -84,10 +84,8 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Copy all diffs to other side...", 
                                                 ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
         MENUITEM "Copy all diffs from other side...", 
                                                 ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
-
         MENUITEM SEPARATOR
         MENUITEM "Undo",                        ID_UNDO
         MENUITEM SEPARATOR
@@ -166,6 +164,7 @@ BEGIN
         MENUITEM "&Toolbar",                    ID_VIEW_TOOLBAR
         MENUITEM "&Status Bar",                 ID_VIEW_STATUS_BAR
         MENUITEM "Diff &Pane",                  ID_VIEW_DETAIL_BAR
+        MENUITEM "Compa&re Statepane",          ID_VIEW_DIR_STATEPANE
         MENUITEM SEPARATOR
         MENUITEM "&Language...",                ID_VIEW_LANGUAGE
     END
@@ -230,13 +229,9 @@ BEGIN
         POPUP "&Copy"
         BEGIN
             MENUITEM "&Left to Right",              ID_DIR_COPY_LEFT_TO_RIGHT
-
             MENUITEM "L&eft to...",                 ID_DIR_COPY_LEFT_TO_BROWSE
-
             MENUITEM "&Right to Left",              ID_DIR_COPY_RIGHT_TO_LEFT
-
             MENUITEM "R&ight to...",                ID_DIR_COPY_RIGHT_TO_BROWSE
-
         END
         POPUP "&Delete"
         BEGIN
@@ -249,14 +244,12 @@ BEGIN
         BEGIN
             MENUITEM "with &Registered Application", ID_DIR_OPEN_LEFT
             MENUITEM "with &External Editor",       ID_DIR_OPEN_LEFT_WITHEDITOR
-
             MENUITEM "&with...",                    ID_DIR_OPEN_LEFT_WITH
         END
         POPUP "O&pen Right"
         BEGIN
             MENUITEM "with &Registered Application", ID_DIR_OPEN_RIGHT
             MENUITEM "with &External Editor",       ID_DIR_OPEN_RIGHT_WITHEDITOR
-
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
@@ -442,6 +435,8 @@ 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
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
index 289adc2..3cc7abd 100644 (file)
--- a/Src/OptionsDef.h
+++ b/Src/OptionsDef.h
@@ -31,6 +31,7 @@ const TCHAR OPT_TAB_TYPE[] = _T("Settings/TabType");
 
 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");
 
 // Color options
 // The difference color

diff --git a/Src/PropGeneral.cpp b/Src/PropGeneral.cpp
index 7b27bce..48197fd 100644 (file)
--- a/Src/PropGeneral.cpp
+++ b/Src/PropGeneral.cpp
@@ -42,6 +42,7 @@ CPropGeneral::CPropGeneral() : CPropertyPage(CPropGeneral::IDD)
        m_bBackup = FALSE;
        m_bScroll = FALSE;
        m_bDisableSplash = FALSE;
+       m_bAutoCloseCmpPane = FALSE;
        //}}AFX_DATA_INIT
 }
 
@@ -64,6 +65,7 @@ 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);
        //}}AFX_DATA_MAP
 }
 

diff --git a/Src/PropGeneral.h b/Src/PropGeneral.h
index b6cbe7b..3867deb 100644 (file)
--- a/Src/PropGeneral.h
+++ b/Src/PropGeneral.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file  PropGeneral.h
  *
  * @brief Declaration of CPropGeneral class
@@ -26,6 +26,7 @@ public:
        BOOL    m_bBackup;
        BOOL    m_bScroll;
        BOOL    m_bDisableSplash;
+       BOOL    m_bAutoCloseCmpPane;
        //}}AFX_DATA
 
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 7e3b985..7f16287 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -7,6 +7,10 @@
  RFE: [ 874366 ] Add goto line-number
   Show few lines of context above line scrolled to
   Src: MergeEditView.cpp
+ PATCH: [ 913073 ] Option to automatically close compare pane
+  Src: DirView.cpp DirView.h MainFrm.cpp Merge.rc OptionsDef.h
+   PropGeneral.cpp PropGeneral.cpp resource.h
+  Languages: *.rc resource.h
 
 2004-03-09 Kimmo
  PATCH: [ 912297 ] Splashscreen and syntax highlight options

diff --git a/Src/resource.h b/Src/resource.h
index 87ce249..2c7d580 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -303,6 +303,7 @@
 #define IDC_USE_RECYCLE_BIN             1117
 #define IDC_COLORDEFAULTS_BTN           1118
 #define IDC_COMPARE_DEFAULTS            1119
+#define IDC_CMPPANE_AUTOCLOSE           1120
 #define IDS_NUM_REPLACED                8501
 #define IDS_EDIT_TEXT_NOT_FOUND         8502
 #define IDS_LINE_STATUS_INFO_EOL        8503
@@ -546,6 +547,7 @@
 #define ID_DIR_ZIP_RIGHT                32861
 #define ID_DIR_ZIP_BOTH                 32862
 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY      32863
+#define ID_VIEW_DIR_STATEPANE           32864
 
 // Next default values for new objects
 //
@@ -553,8 +555,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1120
+#define _APS_NEXT_COMMAND_VALUE         32865
+#define _APS_NEXT_CONTROL_VALUE         1121
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif