[ 690176 ] Cmdline param for ESC closing

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index f785767..0286fda 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -177,7 +177,6 @@ BEGIN
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
     VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, ALT, NOINVERT
     VK_END,         ID_LASTDIFF,            VIRTKEY, ALT, NOINVERT
-    VK_ESCAPE,      ID_APP_EXIT,            VIRTKEY, NOINVERT
     VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
     VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
     VK_HOME,        ID_FIRSTDIFF,           VIRTKEY, ALT, NOINVERT

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 9c8f0be..c6f2fee 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -140,7 +140,6 @@ BEGIN
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
     VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, ALT, NOINVERT
     VK_END,         ID_LASTDIFF,            VIRTKEY, ALT, NOINVERT
-    VK_ESCAPE,      ID_APP_EXIT,            VIRTKEY, NOINVERT
     VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
     VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
     VK_HOME,        ID_FIRSTDIFF,           VIRTKEY, ALT, NOINVERT

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 9993c0e..0e7ae05 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -142,16 +142,18 @@ BEGIN
     "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
     VK_BACK,        ID_EDIT_UNDO,           VIRTKEY, ALT, NOINVERT
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
-    VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, NOINVERT
+    VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, ALT, NOINVERT
+    VK_END,         ID_LASTDIFF,            VIRTKEY, ALT, NOINVERT
     VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
     VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
+    VK_HOME,        ID_FIRSTDIFF,           VIRTKEY, ALT, NOINVERT
     VK_INSERT,      ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
     VK_INSERT,      ID_EDIT_PASTE,          VIRTKEY, SHIFT, NOINVERT
-    VK_TAB,         ID_NEXTDIFF,            VIRTKEY, NOINVERT
-    VK_TAB,         ID_PREVDIFF,            VIRTKEY, SHIFT, NOINVERT
-    VK_UP,          ID_PREVDIFF,            VIRTKEY, NOINVERT
+    VK_LEFT,        ID_R2L,                 VIRTKEY, ALT, NOINVERT
+    VK_RETURN,      ID_CURDIFF,             VIRTKEY, ALT, NOINVERT
+    VK_RIGHT,       ID_L2R,                 VIRTKEY, ALT, NOINVERT
+    VK_UP,          ID_PREVDIFF,            VIRTKEY, ALT, NOINVERT
     "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
-    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
 END
 
 

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index e0a330e..bdb8370 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -141,16 +141,18 @@ BEGIN
     "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
     VK_BACK,        ID_EDIT_UNDO,           VIRTKEY, ALT, NOINVERT
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
-    VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, NOINVERT
+    VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, ALT, NOINVERT
+    VK_END,         ID_LASTDIFF,            VIRTKEY, ALT, NOINVERT
     VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
     VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
+    VK_HOME,        ID_FIRSTDIFF,           VIRTKEY, ALT, NOINVERT
     VK_INSERT,      ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
     VK_INSERT,      ID_EDIT_PASTE,          VIRTKEY, SHIFT, NOINVERT
-    VK_TAB,         ID_NEXTDIFF,            VIRTKEY, NOINVERT
-    VK_TAB,         ID_PREVDIFF,            VIRTKEY, SHIFT, NOINVERT
-    VK_UP,          ID_PREVDIFF,            VIRTKEY, NOINVERT
+    VK_LEFT,        ID_R2L,                 VIRTKEY, ALT, NOINVERT
+    VK_RETURN,      ID_CURDIFF,             VIRTKEY, ALT, NOINVERT
+    VK_RIGHT,       ID_L2R,                 VIRTKEY, ALT, NOINVERT
+    VK_UP,          ID_PREVDIFF,            VIRTKEY, ALT, NOINVERT
     "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
-    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
 END
 
 

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 06c765b..b419b7b 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -191,7 +191,6 @@ BEGIN
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
     VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, ALT, NOINVERT
     VK_END,         ID_LASTDIFF,            VIRTKEY, ALT, NOINVERT
-    VK_ESCAPE,      ID_APP_EXIT,            VIRTKEY, NOINVERT
     VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
     VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
     VK_HOME,        ID_FIRSTDIFF,           VIRTKEY, ALT, NOINVERT

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index e743f43..9751973 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -190,7 +190,6 @@ BEGIN
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
     VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, ALT, NOINVERT
     VK_END,         ID_LASTDIFF,            VIRTKEY, ALT, NOINVERT
-    VK_ESCAPE,      ID_APP_EXIT,            VIRTKEY, NOINVERT
     VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
     VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
     VK_HOME,        ID_FIRSTDIFF,           VIRTKEY, ALT, NOINVERT

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 179376c..1c3fc42 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -74,6 +74,7 @@ CMergeApp::CMergeApp()
 {
        // TODO: add construction code here,
        // Place all significant initialization in InitInstance
+       m_bEscCloses = FALSE;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -193,6 +194,9 @@ BOOL CMergeApp::InitInstance()
 
                        if (!_tcsicmp(pszParam, _T("r")))
                                recurse=TRUE;
+
+                       if (!_tcsicmp(pszParam, _T("e")))
+                               m_bEscCloses = TRUE;
                }
                else
                {
@@ -337,6 +341,16 @@ BOOL SelectFile(CString& path, LPCTSTR root_path /*=NULL*/,
 
 BOOL CMergeApp::PreTranslateMessage(MSG* pMsg)
 {
+       // Check if we got 'ESC pressed' -message
+       if ((pMsg->message == WM_KEYDOWN) && (pMsg->wParam == VK_ESCAPE)) 
+       {
+               if (m_bEscCloses)
+               {
+                       AfxGetMainWnd()->PostMessage(WM_CLOSE);
+                       return FALSE;
+               }
+       }
+
        // CG: The following lines were added by the Splash Screen component.
        if (CSplashWnd::PreTranslateAppMessage(pMsg))
                return TRUE;

diff --git a/Src/Merge.h b/Src/Merge.h
index 12cb687..0185d0f 100644 (file)
--- a/Src/Merge.h
+++ b/Src/Merge.h
@@ -72,6 +72,8 @@ public:
        afx_msg void OnViewLanguage();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
+private:
+       BOOL m_bEscCloses;
 };
 
 extern CMergeApp theApp;

diff --git a/Src/Merge.rc b/Src/Merge.rc
index b0335e2..ff9b8a0 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -193,7 +193,6 @@ BEGIN
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
     VK_DOWN,        ID_NEXTDIFF,            VIRTKEY, ALT, NOINVERT
     VK_END,         ID_LASTDIFF,            VIRTKEY, ALT, NOINVERT
-    VK_ESCAPE,      ID_APP_EXIT,            VIRTKEY, NOINVERT
     VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
     VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
     VK_HOME,        ID_FIRSTDIFF,           VIRTKEY, ALT, NOINVERT

diff --git a/Src/readme.txt b/Src/readme.txt
index 5c6cb0e..dd2fd77 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -5,6 +5,13 @@
  [ 687574 ] Navigate in directory view
   WinMerge:
    DirView.cpp DirView.h
+ [ 690176 ] Cmdline param for ESC closing
+   (and updated all obsolete French & German accelerators as well)
+  WinMerge:
+   Merge.cpp Merge.h Merge.rc
+  Languages:
+   Czech\MergeCzech.rc Dutch\MergeDutch.rc French\MergeFrench.rc
+   German\MergeGerman.rc Italian\MergeItalian.rc Spanish\MergeSpanish.rc
 
 2003-02-18 Christian
   Removed annoying SourceSafe path from Merge.dsp