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
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
"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
"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
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
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
{
// TODO: add construction code here,
// Place all significant initialization in InitInstance
+ m_bEscCloses = FALSE;
}
/////////////////////////////////////////////////////////////////////////////
if (!_tcsicmp(pszParam, _T("r")))
recurse=TRUE;
+
+ if (!_tcsicmp(pszParam, _T("e")))
+ m_bEscCloses = TRUE;
}
else
{
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;
afx_msg void OnViewLanguage();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
+private:
+ BOOL m_bEscCloses;
};
extern CMergeApp theApp;
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
[ 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