From e5e3b2eab1c244137b5f4a939fcba5dff49b148e Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 15 Aug 2021 21:13:35 +0900 Subject: [PATCH] DirView.cpp: Sort MESSAGE_MAP in menu order --- Src/DirView.cpp | 339 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 182 insertions(+), 157 deletions(-) diff --git a/Src/DirView.cpp b/Src/DirView.cpp index ae3026e8b..19ab7f4e1 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -120,96 +120,208 @@ CDirView::~CDirView() } BEGIN_MESSAGE_MAP(CDirView, CListView) - ON_WM_CONTEXTMENU() //{{AFX_MSG_MAP(CDirView) + ON_WM_CONTEXTMENU() ON_WM_LBUTTONDBLCLK() + ON_WM_SIZE() + ON_WM_DESTROY() + ON_WM_CHAR() + ON_WM_KEYDOWN() + ON_WM_TIMER() + ON_MESSAGE(MSG_UI_UPDATE, OnUpdateUIMessage) + ON_COMMAND(ID_EDIT_COPY, OnEditCopy) + ON_COMMAND(ID_EDIT_CUT, OnEditCut) + ON_COMMAND(ID_EDIT_PASTE, OnEditPaste) + ON_COMMAND(ID_EDIT_UNDO, OnEditUndo) + ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo) + ON_UPDATE_COMMAND_UI(ID_FILE_SAVE, OnUpdateSave) + ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick) + ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged) + ON_NOTIFY_REFLECT(LVN_BEGINLABELEDIT, OnBeginLabelEdit) + ON_NOTIFY_REFLECT(LVN_ENDLABELEDIT, OnEndLabelEdit) + ON_NOTIFY_REFLECT(NM_CLICK, OnClick) + ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag) + ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw) + // [File] menu + ON_COMMAND(ID_FILE_LEFT_READONLY, OnReadOnly) + ON_COMMAND(ID_FILE_MIDDLE_READONLY, OnReadOnly) + ON_COMMAND(ID_FILE_RIGHT_READONLY, OnReadOnly) + ON_UPDATE_COMMAND_UI(ID_FILE_LEFT_READONLY, OnUpdateReadOnly) + ON_UPDATE_COMMAND_UI(ID_FILE_MIDDLE_READONLY, OnUpdateReadOnly) + ON_UPDATE_COMMAND_UI(ID_FILE_RIGHT_READONLY, OnUpdateReadOnly) + ON_COMMAND(ID_FILE_ENCODING, OnFileEncoding) + // [Edit] menu + ON_COMMAND(ID_EDIT_SELECT_ALL, OnSelectAll) + ON_UPDATE_COMMAND_UI(ID_EDIT_SELECT_ALL, OnUpdateSelectAll) + // [View] menu + ON_COMMAND(ID_OPTIONS_SHOWDIFFERENT, OnOptionsShowDifferent) + ON_COMMAND(ID_OPTIONS_SHOWIDENTICAL, OnOptionsShowIdentical) + ON_COMMAND(ID_OPTIONS_SHOWUNIQUELEFT, OnOptionsShowUniqueLeft) + ON_COMMAND(ID_OPTIONS_SHOWUNIQUEMIDDLE, OnOptionsShowUniqueMiddle) + ON_COMMAND(ID_OPTIONS_SHOWUNIQUERIGHT, OnOptionsShowUniqueRight) + ON_COMMAND(ID_OPTIONS_SHOWBINARIES, OnOptionsShowBinaries) + ON_COMMAND(ID_OPTIONS_SHOWSKIPPED, OnOptionsShowSkipped) + ON_COMMAND(ID_OPTIONS_SHOWDIFFERENTLEFTONLY, OnOptionsShowDifferentLeftOnly) + ON_COMMAND(ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY, OnOptionsShowDifferentMiddleOnly) + ON_COMMAND(ID_OPTIONS_SHOWDIFFERENTRIGHTONLY, OnOptionsShowDifferentRightOnly) + ON_COMMAND(ID_OPTIONS_SHOWMISSINGLEFTONLY, OnOptionsShowMissingLeftOnly) + ON_COMMAND(ID_OPTIONS_SHOWMISSINGMIDDLEONLY, OnOptionsShowMissingMiddleOnly) + ON_COMMAND(ID_OPTIONS_SHOWMISSINGRIGHTONLY, OnOptionsShowMissingRightOnly) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENT, OnUpdateOptionsShowdifferent) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWIDENTICAL, OnUpdateOptionsShowidentical) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUELEFT, OnUpdateOptionsShowuniqueleft) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUEMIDDLE, OnUpdateOptionsShowuniquemiddle) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUERIGHT, OnUpdateOptionsShowuniqueright) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWBINARIES, OnUpdateOptionsShowBinaries) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWSKIPPED, OnUpdateOptionsShowSkipped) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENTLEFTONLY, OnUpdateOptionsShowDifferentLeftOnly) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY, OnUpdateOptionsShowDifferentMiddleOnly) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENTRIGHTONLY, OnUpdateOptionsShowDifferentRightOnly) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWMISSINGLEFTONLY, OnUpdateOptionsShowMissingLeftOnly) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWMISSINGMIDDLEONLY, OnUpdateOptionsShowMissingMiddleOnly) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWMISSINGRIGHTONLY, OnUpdateOptionsShowMissingRightOnly) + ON_COMMAND(ID_VIEW_SHOWHIDDENITEMS, OnViewShowHiddenItems) + ON_UPDATE_COMMAND_UI(ID_VIEW_SHOWHIDDENITEMS, OnUpdateViewShowHiddenItems) + ON_COMMAND(ID_VIEW_TREEMODE, OnViewTreeMode) + ON_COMMAND(ID_VIEW_EXPAND_ALLSUBDIRS, OnViewExpandAllSubdirs) + ON_COMMAND(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnViewCollapseAllSubdirs) + ON_UPDATE_COMMAND_UI(ID_VIEW_TREEMODE, OnUpdateViewTreeMode) + ON_UPDATE_COMMAND_UI(ID_VIEW_EXPAND_ALLSUBDIRS, OnUpdateViewExpandAllSubdirs) + ON_UPDATE_COMMAND_UI(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnUpdateViewCollapseAllSubdirs) + ON_COMMAND(ID_SWAPPANES_SWAP12, (OnViewSwapPanes<0, 1>)) + ON_COMMAND(ID_SWAPPANES_SWAP23, (OnViewSwapPanes<1, 2>)) + ON_COMMAND(ID_SWAPPANES_SWAP13, (OnViewSwapPanes<0, 2>)) + ON_UPDATE_COMMAND_UI(ID_SWAPPANES_SWAP12, (OnUpdateViewSwapPanes<0, 1>)) + ON_UPDATE_COMMAND_UI(ID_SWAPPANES_SWAP23, (OnUpdateViewSwapPanes<1, 2>)) + ON_UPDATE_COMMAND_UI(ID_SWAPPANES_SWAP13, (OnUpdateViewSwapPanes<0, 2>)) + ON_COMMAND(ID_VIEW_DIR_STATISTICS, OnViewCompareStatistics) + ON_COMMAND(ID_REFRESH, OnRefresh) + ON_UPDATE_COMMAND_UI(ID_REFRESH, OnUpdateRefresh) + ON_COMMAND(ID_RESCAN, OnMarkedRescan) + // [Merge] menu or Context menu + ON_COMMAND_RANGE(ID_MERGE_COMPARE, ID_MERGE_COMPARE_IN_NEW_WINDOW, OnMergeCompare) + ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE, ID_MERGE_COMPARE_IN_NEW_WINDOW, OnUpdateMergeCompare) + ON_COMMAND(ID_FIRSTDIFF, OnFirstdiff) + ON_COMMAND(ID_LASTDIFF, OnLastdiff) + ON_COMMAND(ID_NEXTDIFF, OnNextdiff) + ON_COMMAND(ID_PREVDIFF, OnPrevdiff) + ON_COMMAND(ID_CURDIFF, OnCurdiff) + ON_UPDATE_COMMAND_UI(ID_FIRSTDIFF, OnUpdateFirstdiff) + ON_UPDATE_COMMAND_UI(ID_LASTDIFF, OnUpdateLastdiff) + ON_UPDATE_COMMAND_UI(ID_NEXTDIFF, OnUpdateNextdiff) + ON_UPDATE_COMMAND_UI(ID_PREVDIFF, OnUpdatePrevdiff) + ON_UPDATE_COMMAND_UI(ID_CURDIFF, OnUpdateCurdiff) ON_COMMAND_RANGE(ID_L2R, ID_R2L, OnDirCopy) ON_UPDATE_COMMAND_UI_RANGE(ID_L2R, ID_R2L, OnUpdateDirCopy) + ON_COMMAND(ID_MERGE_DELETE, OnDelete) + ON_UPDATE_COMMAND_UI(ID_MERGE_DELETE, OnUpdateDelete) + // [Tools] menu + ON_COMMAND(ID_TOOLS_CUSTOMIZECOLUMNS, OnCustomizeColumns) + ON_COMMAND(ID_TOOLS_GENERATEREPORT, OnToolsGenerateReport) + ON_COMMAND(ID_TOOLS_GENERATEPATCH, OnToolsGeneratePatch) + ON_MESSAGE(MSG_GENERATE_FLIE_COMPARE_REPORT, OnGenerateFileCmpReport) + // [Plugins] menu + ON_COMMAND(ID_OPEN_WITH_UNPACKER, OnOpenWithUnpacker) + ON_UPDATE_COMMAND_UI(ID_OPEN_WITH_UNPACKER, OnUpdateCtxtOpenWithUnpacker) + // [Help] menu + ON_COMMAND(ID_HELP, OnHelp) + // Context menu + // Context menu -> Compare Non-horizontally + ON_COMMAND(ID_MERGE_COMPARE_LEFT1_LEFT2, OnMergeCompare2) + ON_COMMAND(ID_MERGE_COMPARE_RIGHT1_RIGHT2, OnMergeCompare2) + ON_COMMAND(ID_MERGE_COMPARE_LEFT1_RIGHT2, OnMergeCompare2) + ON_COMMAND(ID_MERGE_COMPARE_LEFT2_RIGHT1, OnMergeCompare2) + ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_LEFT1_LEFT2, OnUpdateMergeCompare2) + ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_RIGHT1_RIGHT2, OnUpdateMergeCompare2) + ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_LEFT1_RIGHT2, OnUpdateMergeCompare2) + ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_LEFT2_RIGHT1, OnUpdateMergeCompare2) + ON_COMMAND(ID_MERGE_COMPARE_NONHORIZONTALLY, OnMergeCompareNonHorizontally) + // Context menu -> Compare As + ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_IMAGE, OnMergeCompareAs) + ON_COMMAND_RANGE(ID_UNPACKERS_FIRST, ID_UNPACKERS_LAST, OnMergeCompareAs) + ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_IMAGE, OnUpdateMergeCompare) + ON_UPDATE_COMMAND_UI(ID_NO_UNPACKER, OnUpdateNoUnpacker) + // Context menu -> Copy ON_COMMAND(ID_DIR_COPY_LEFT_TO_RIGHT, (OnCtxtDirCopy)) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_LEFT_TO_RIGHT, (OnUpdateCtxtDirCopy)) ON_COMMAND(ID_DIR_COPY_LEFT_TO_MIDDLE, (OnCtxtDirCopy)) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_LEFT_TO_MIDDLE, (OnUpdateCtxtDirCopy)) ON_COMMAND(ID_DIR_COPY_RIGHT_TO_LEFT, (OnCtxtDirCopy)) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_LEFT, (OnUpdateCtxtDirCopy)) ON_COMMAND(ID_DIR_COPY_RIGHT_TO_MIDDLE, (OnCtxtDirCopy)) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_MIDDLE, (OnUpdateCtxtDirCopy)) ON_COMMAND(ID_DIR_COPY_MIDDLE_TO_LEFT, (OnCtxtDirCopy)) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_MIDDLE_TO_LEFT, (OnUpdateCtxtDirCopy)) ON_COMMAND(ID_DIR_COPY_MIDDLE_TO_RIGHT, (OnCtxtDirCopy)) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_LEFT_TO_RIGHT, (OnUpdateCtxtDirCopy)) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_LEFT_TO_MIDDLE, (OnUpdateCtxtDirCopy)) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_LEFT, (OnUpdateCtxtDirCopy)) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_MIDDLE, (OnUpdateCtxtDirCopy)) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_MIDDLE_TO_LEFT, (OnUpdateCtxtDirCopy)) ON_UPDATE_COMMAND_UI(ID_DIR_COPY_MIDDLE_TO_RIGHT, (OnUpdateCtxtDirCopy)) + ON_COMMAND(ID_DIR_COPY_LEFT_TO_BROWSE, OnCtxtDirCopyTo) + ON_COMMAND(ID_DIR_COPY_MIDDLE_TO_BROWSE, OnCtxtDirCopyTo) + ON_COMMAND(ID_DIR_COPY_RIGHT_TO_BROWSE, OnCtxtDirCopyTo) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_LEFT_TO_BROWSE, OnUpdateCtxtDirCopyTo) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_MIDDLE_TO_BROWSE, OnUpdateCtxtDirCopyTo) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_BROWSE, OnUpdateCtxtDirCopyTo) + // Context menu -> Move + ON_COMMAND(ID_DIR_MOVE_LEFT_TO_BROWSE, OnCtxtDirMoveTo) + ON_COMMAND(ID_DIR_MOVE_MIDDLE_TO_BROWSE, OnCtxtDirMoveTo) + ON_COMMAND(ID_DIR_MOVE_RIGHT_TO_BROWSE, OnCtxtDirMoveTo) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_LEFT_TO_BROWSE, OnUpdateCtxtDirMoveTo) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_MIDDLE_TO_BROWSE, OnUpdateCtxtDirMoveTo) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_RIGHT_TO_BROWSE, OnUpdateCtxtDirMoveTo) + // Context menu -> Delete ON_COMMAND(ID_DIR_DEL_LEFT, OnCtxtDirDel) - ON_UPDATE_COMMAND_UI(ID_DIR_DEL_LEFT, OnUpdateCtxtDirDel) ON_COMMAND(ID_DIR_DEL_RIGHT, OnCtxtDirDel) - ON_UPDATE_COMMAND_UI(ID_DIR_DEL_MIDDLE, OnUpdateCtxtDirDel) ON_COMMAND(ID_DIR_DEL_MIDDLE, OnCtxtDirDel) - ON_UPDATE_COMMAND_UI(ID_DIR_DEL_RIGHT, OnUpdateCtxtDirDel) ON_COMMAND(ID_DIR_DEL_BOTH, OnCtxtDirDelBoth) - ON_UPDATE_COMMAND_UI(ID_DIR_DEL_BOTH, OnUpdateCtxtDirDelBoth) ON_COMMAND(ID_DIR_DEL_ALL, OnCtxtDirDelBoth) + ON_UPDATE_COMMAND_UI(ID_DIR_DEL_LEFT, OnUpdateCtxtDirDel) + ON_UPDATE_COMMAND_UI(ID_DIR_DEL_MIDDLE, OnUpdateCtxtDirDel) + ON_UPDATE_COMMAND_UI(ID_DIR_DEL_RIGHT, OnUpdateCtxtDirDel) + ON_UPDATE_COMMAND_UI(ID_DIR_DEL_BOTH, OnUpdateCtxtDirDelBoth) ON_UPDATE_COMMAND_UI(ID_DIR_DEL_ALL, OnUpdateCtxtDirDelBoth) + // Context menu -> Rename, Hide Items + ON_COMMAND(ID_DIR_ITEM_RENAME, OnItemRename) + ON_UPDATE_COMMAND_UI(ID_DIR_ITEM_RENAME, OnUpdateItemRename) + ON_COMMAND(ID_DIR_HIDE_FILENAMES, OnHideFilenames) + ON_UPDATE_COMMAND_UI(ID_DIR_HIDE_FILENAMES, OnUpdateHideFilenames) + // Context menu -> Open Left ON_COMMAND(ID_DIR_OPEN_LEFT, OnCtxtDirOpen) - ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT, OnUpdateCtxtDirOpen) + ON_COMMAND(ID_DIR_OPEN_LEFT_WITHEDITOR, OnCtxtDirOpenWithEditor) ON_COMMAND(ID_DIR_OPEN_LEFT_WITH, OnCtxtDirOpenWith) - ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT_WITH, OnUpdateCtxtDirOpenWith) ON_COMMAND(ID_DIR_OPEN_LEFT_PARENT_FOLDER, OnCtxtDirOpenParentFolder) + ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT, OnUpdateCtxtDirOpen) + ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT_WITHEDITOR, OnUpdateCtxtDirOpenWithEditor) + ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT_WITH, OnUpdateCtxtDirOpenWith) ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT_PARENT_FOLDER, OnUpdateCtxtDirOpenParentFolder) + // Context menu -> Open Middle ON_COMMAND(ID_DIR_OPEN_MIDDLE, OnCtxtDirOpen) - ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE, OnUpdateCtxtDirOpen) + ON_COMMAND(ID_DIR_OPEN_MIDDLE_WITHEDITOR, OnCtxtDirOpenWithEditor) ON_COMMAND(ID_DIR_OPEN_MIDDLE_WITH, OnCtxtDirOpenWith) + ON_COMMAND(ID_DIR_OPEN_MIDDLE_PARENT_FOLDER, OnCtxtDirOpenParentFolder) + ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE, OnUpdateCtxtDirOpen) + ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE_WITHEDITOR, OnUpdateCtxtDirOpenWithEditor) ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE_WITH, OnUpdateCtxtDirOpenWith) ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE_PARENT_FOLDER, OnUpdateCtxtDirOpenParentFolder) - ON_COMMAND(ID_DIR_OPEN_MIDDLE_PARENT_FOLDER, OnCtxtDirOpenParentFolder) + // Context menu -> Open Right ON_COMMAND(ID_DIR_OPEN_RIGHT, OnCtxtDirOpen) - ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT, OnUpdateCtxtDirOpen) + ON_COMMAND(ID_DIR_OPEN_RIGHT_WITHEDITOR, OnCtxtDirOpenWithEditor) ON_COMMAND(ID_DIR_OPEN_RIGHT_WITH, OnCtxtDirOpenWith) - ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT_WITH, OnUpdateCtxtDirOpenWith) ON_COMMAND(ID_DIR_OPEN_RIGHT_PARENT_FOLDER, OnCtxtDirOpenParentFolder) - ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT_PARENT_FOLDER, OnUpdateCtxtDirOpenParentFolder) - ON_COMMAND(ID_OPEN_WITH_UNPACKER, OnOpenWithUnpacker) - ON_UPDATE_COMMAND_UI(ID_OPEN_WITH_UNPACKER, OnUpdateCtxtOpenWithUnpacker) - ON_COMMAND(ID_DIR_OPEN_LEFT_WITHEDITOR, OnCtxtDirOpenWithEditor) - ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT_WITHEDITOR, OnUpdateCtxtDirOpenWithEditor) - ON_COMMAND(ID_DIR_OPEN_MIDDLE_WITHEDITOR, OnCtxtDirOpenWithEditor) - ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE_WITHEDITOR, OnUpdateCtxtDirOpenWithEditor) - ON_COMMAND(ID_DIR_OPEN_RIGHT_WITHEDITOR, OnCtxtDirOpenWithEditor) + ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT, OnUpdateCtxtDirOpen) ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT_WITHEDITOR, OnUpdateCtxtDirOpenWithEditor) - ON_COMMAND(ID_DIR_COPY_LEFT_TO_BROWSE, OnCtxtDirCopyTo) - ON_COMMAND(ID_DIR_COPY_MIDDLE_TO_BROWSE, OnCtxtDirCopyTo) - ON_COMMAND(ID_DIR_COPY_RIGHT_TO_BROWSE, OnCtxtDirCopyTo) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_LEFT_TO_BROWSE, OnUpdateCtxtDirCopyTo) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_MIDDLE_TO_BROWSE, OnUpdateCtxtDirCopyTo) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_BROWSE, OnUpdateCtxtDirCopyTo) - ON_WM_DESTROY() - ON_WM_CHAR() - ON_WM_KEYDOWN() - ON_COMMAND(ID_FIRSTDIFF, OnFirstdiff) - ON_UPDATE_COMMAND_UI(ID_FIRSTDIFF, OnUpdateFirstdiff) - ON_COMMAND(ID_LASTDIFF, OnLastdiff) - ON_UPDATE_COMMAND_UI(ID_LASTDIFF, OnUpdateLastdiff) - ON_COMMAND(ID_NEXTDIFF, OnNextdiff) - ON_UPDATE_COMMAND_UI(ID_NEXTDIFF, OnUpdateNextdiff) - ON_COMMAND(ID_PREVDIFF, OnPrevdiff) - ON_UPDATE_COMMAND_UI(ID_PREVDIFF, OnUpdatePrevdiff) - ON_COMMAND(ID_CURDIFF, OnCurdiff) - ON_UPDATE_COMMAND_UI(ID_CURDIFF, OnUpdateCurdiff) - ON_UPDATE_COMMAND_UI(ID_FILE_SAVE, OnUpdateSave) - ON_MESSAGE(MSG_UI_UPDATE, OnUpdateUIMessage) - ON_COMMAND(ID_REFRESH, OnRefresh) - ON_UPDATE_COMMAND_UI(ID_REFRESH, OnUpdateRefresh) - ON_WM_TIMER() - ON_UPDATE_COMMAND_UI(ID_STATUS_RIGHTDIR_RO, OnUpdateStatusRightRO) - ON_UPDATE_COMMAND_UI(ID_STATUS_MIDDLEDIR_RO, OnUpdateStatusMiddleRO) - ON_UPDATE_COMMAND_UI(ID_STATUS_LEFTDIR_RO, OnUpdateStatusLeftRO) - ON_COMMAND(ID_FILE_LEFT_READONLY, OnReadOnly) - ON_UPDATE_COMMAND_UI(ID_FILE_LEFT_READONLY, OnUpdateReadOnly) - ON_COMMAND(ID_FILE_MIDDLE_READONLY, OnReadOnly) - ON_UPDATE_COMMAND_UI(ID_FILE_MIDDLE_READONLY, OnUpdateReadOnly) - ON_COMMAND(ID_FILE_RIGHT_READONLY, OnReadOnly) - ON_UPDATE_COMMAND_UI(ID_FILE_RIGHT_READONLY, OnUpdateReadOnly) - ON_COMMAND(ID_TOOLS_CUSTOMIZECOLUMNS, OnCustomizeColumns) - ON_COMMAND(ID_TOOLS_GENERATEREPORT, OnToolsGenerateReport) - ON_COMMAND(ID_TOOLS_GENERATEPATCH, OnToolsGeneratePatch) - ON_MESSAGE(MSG_GENERATE_FLIE_COMPARE_REPORT, OnGenerateFileCmpReport) + ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT_WITH, OnUpdateCtxtDirOpenWith) + ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT_PARENT_FOLDER, OnUpdateCtxtDirOpenParentFolder) + // Context menu -> Copy Pathnames + ON_COMMAND(ID_DIR_COPY_PATHNAMES_LEFT, OnCopyPathnames) + ON_COMMAND(ID_DIR_COPY_PATHNAMES_MIDDLE, OnCopyPathnames) + ON_COMMAND(ID_DIR_COPY_PATHNAMES_RIGHT, OnCopyPathnames) + ON_COMMAND(ID_DIR_COPY_PATHNAMES_BOTH, OnCopyBothPathnames) + ON_COMMAND(ID_DIR_COPY_PATHNAMES_ALL, OnCopyBothPathnames) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_LEFT, OnUpdateCtxtDirCopy2) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_MIDDLE, OnUpdateCtxtDirCopy2) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_RIGHT, OnUpdateCtxtDirCopy2) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_BOTH, OnUpdateCtxtDirCopyBoth2) + ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_ALL, OnUpdateCtxtDirCopyBoth2) + // Context menu -> Zip ON_COMMAND(ID_DIR_ZIP_LEFT, OnCtxtDirZip) ON_COMMAND(ID_DIR_ZIP_MIDDLE, OnCtxtDirZip) ON_COMMAND(ID_DIR_ZIP_RIGHT, OnCtxtDirZip) @@ -222,27 +334,19 @@ BEGIN_MESSAGE_MAP(CDirView, CListView) ON_UPDATE_COMMAND_UI(ID_DIR_ZIP_BOTH, OnUpdateCtxtDirCopyBothTo) ON_UPDATE_COMMAND_UI(ID_DIR_ZIP_ALL, OnUpdateCtxtDirCopyBothTo) ON_UPDATE_COMMAND_UI(ID_DIR_ZIP_BOTH_DIFFS_ONLY, OnUpdateCtxtDirCopyBothDiffsOnlyTo) + // Context menu -> Left/Middle/Right Shell menu ON_COMMAND(ID_DIR_SHELL_CONTEXT_MENU_LEFT, OnCtxtDirShellContextMenu) ON_COMMAND(ID_DIR_SHELL_CONTEXT_MENU_MIDDLE, OnCtxtDirShellContextMenu) ON_COMMAND(ID_DIR_SHELL_CONTEXT_MENU_RIGHT, OnCtxtDirShellContextMenu) - ON_COMMAND(ID_EDIT_SELECT_ALL, OnSelectAll) - ON_UPDATE_COMMAND_UI(ID_EDIT_SELECT_ALL, OnUpdateSelectAll) + // Context menu -> Plugin settings ON_COMMAND_RANGE(ID_PREDIFFER_SETTINGS_NONE, ID_PREDIFFER_SETTINGS_SELECT, OnPluginSettings) ON_COMMAND_RANGE(ID_UNPACKER_SETTINGS_NONE, ID_UNPACKER_SETTINGS_SELECT, OnPluginSettings) ON_UPDATE_COMMAND_UI_RANGE(ID_PREDIFFER_SETTINGS_NONE, ID_PREDIFFER_SETTINGS_SELECT, OnUpdatePluginMode) ON_UPDATE_COMMAND_UI_RANGE(ID_UNPACKER_SETTINGS_NONE, ID_UNPACKER_SETTINGS_SELECT, OnUpdatePluginMode) - ON_COMMAND(ID_DIR_COPY_PATHNAMES_LEFT, OnCopyPathnames) - ON_COMMAND(ID_DIR_COPY_PATHNAMES_MIDDLE, OnCopyPathnames) - ON_COMMAND(ID_DIR_COPY_PATHNAMES_RIGHT, OnCopyPathnames) - ON_COMMAND(ID_DIR_COPY_PATHNAMES_BOTH, OnCopyBothPathnames) - ON_COMMAND(ID_DIR_COPY_PATHNAMES_ALL, OnCopyBothPathnames) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_LEFT, OnUpdateCtxtDirCopy2) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_MIDDLE, OnUpdateCtxtDirCopy2) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_RIGHT, OnUpdateCtxtDirCopy2) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_BOTH, OnUpdateCtxtDirCopyBoth2) - ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_ALL, OnUpdateCtxtDirCopyBoth2) + // Context menu -> Copy Filenames ON_COMMAND(ID_DIR_COPY_FILENAMES, OnCopyFilenames) ON_UPDATE_COMMAND_UI(ID_DIR_COPY_FILENAMES, OnUpdateCopyFilenames) + // Context menu -> Copy Items to Clipboard ON_COMMAND(ID_DIR_COPY_LEFT_TO_CLIPBOARD, OnCopyToClipboard) ON_COMMAND(ID_DIR_COPY_MIDDLE_TO_CLIPBOARD, OnCopyToClipboard) ON_COMMAND(ID_DIR_COPY_RIGHT_TO_CLIPBOARD, OnCopyToClipboard) @@ -253,91 +357,12 @@ BEGIN_MESSAGE_MAP(CDirView, CListView) ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_CLIPBOARD, OnUpdateCtxtDirCopy2) ON_UPDATE_COMMAND_UI(ID_DIR_COPY_BOTH_TO_CLIPBOARD, OnUpdateCtxtDirCopyBoth2) ON_UPDATE_COMMAND_UI(ID_DIR_COPY_ALL_TO_CLIPBOARD, OnUpdateCtxtDirCopyBoth2) - ON_COMMAND(ID_DIR_ITEM_RENAME, OnItemRename) - ON_UPDATE_COMMAND_UI(ID_DIR_ITEM_RENAME, OnUpdateItemRename) - ON_COMMAND(ID_DIR_HIDE_FILENAMES, OnHideFilenames) - ON_COMMAND(ID_DIR_MOVE_LEFT_TO_BROWSE, OnCtxtDirMoveTo) - ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_LEFT_TO_BROWSE, OnUpdateCtxtDirMoveTo) - ON_COMMAND(ID_DIR_MOVE_MIDDLE_TO_BROWSE, OnCtxtDirMoveTo) - ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_MIDDLE_TO_BROWSE, OnUpdateCtxtDirMoveTo) - ON_COMMAND(ID_DIR_MOVE_RIGHT_TO_BROWSE, OnCtxtDirMoveTo) - ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_RIGHT_TO_BROWSE, OnUpdateCtxtDirMoveTo) - ON_UPDATE_COMMAND_UI(ID_DIR_HIDE_FILENAMES, OnUpdateHideFilenames) - ON_WM_SIZE() - ON_COMMAND(ID_MERGE_DELETE, OnDelete) - ON_UPDATE_COMMAND_UI(ID_MERGE_DELETE, OnUpdateDelete) - ON_COMMAND(ID_RESCAN, OnMarkedRescan) + // Status bar ON_UPDATE_COMMAND_UI(ID_STATUS_DIFFNUM, OnUpdateStatusNum) - ON_COMMAND(ID_VIEW_SHOWHIDDENITEMS, OnViewShowHiddenItems) - ON_UPDATE_COMMAND_UI(ID_VIEW_SHOWHIDDENITEMS, OnUpdateViewShowHiddenItems) - ON_COMMAND_RANGE(ID_MERGE_COMPARE, ID_MERGE_COMPARE_IN_NEW_WINDOW, OnMergeCompare) - ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE, ID_MERGE_COMPARE_IN_NEW_WINDOW, OnUpdateMergeCompare) - ON_COMMAND(ID_MERGE_COMPARE_LEFT1_LEFT2, OnMergeCompare2) - ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_LEFT1_LEFT2, OnUpdateMergeCompare2) - ON_COMMAND(ID_MERGE_COMPARE_RIGHT1_RIGHT2, OnMergeCompare2) - ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_RIGHT1_RIGHT2, OnUpdateMergeCompare2) - ON_COMMAND(ID_MERGE_COMPARE_LEFT1_RIGHT2, OnMergeCompare2) - ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_LEFT1_RIGHT2, OnUpdateMergeCompare2) - ON_COMMAND(ID_MERGE_COMPARE_LEFT2_RIGHT1, OnMergeCompare2) - ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_LEFT2_RIGHT1, OnUpdateMergeCompare2) - ON_COMMAND(ID_MERGE_COMPARE_NONHORIZONTALLY, OnMergeCompareNonHorizontally) - ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_IMAGE, OnMergeCompareAs) - ON_COMMAND_RANGE(ID_UNPACKERS_FIRST, ID_UNPACKERS_LAST, OnMergeCompareAs) - ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_IMAGE, OnUpdateMergeCompare) - ON_UPDATE_COMMAND_UI(ID_NO_UNPACKER, OnUpdateNoUnpacker) - ON_COMMAND(ID_VIEW_TREEMODE, OnViewTreeMode) - ON_UPDATE_COMMAND_UI(ID_VIEW_TREEMODE, OnUpdateViewTreeMode) - ON_COMMAND(ID_VIEW_EXPAND_ALLSUBDIRS, OnViewExpandAllSubdirs) - ON_UPDATE_COMMAND_UI(ID_VIEW_EXPAND_ALLSUBDIRS, OnUpdateViewExpandAllSubdirs) - ON_COMMAND(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnViewCollapseAllSubdirs) - ON_UPDATE_COMMAND_UI(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnUpdateViewCollapseAllSubdirs) - ON_COMMAND(ID_SWAPPANES_SWAP12, (OnViewSwapPanes<0, 1>)) - ON_COMMAND(ID_SWAPPANES_SWAP23, (OnViewSwapPanes<1, 2>)) - ON_COMMAND(ID_SWAPPANES_SWAP13, (OnViewSwapPanes<0, 2>)) - ON_UPDATE_COMMAND_UI(ID_SWAPPANES_SWAP12, (OnUpdateViewSwapPanes<0, 1>)) - ON_UPDATE_COMMAND_UI(ID_SWAPPANES_SWAP23, (OnUpdateViewSwapPanes<1, 2>)) - ON_UPDATE_COMMAND_UI(ID_SWAPPANES_SWAP13, (OnUpdateViewSwapPanes<0, 2>)) - ON_COMMAND(ID_VIEW_DIR_STATISTICS, OnViewCompareStatistics) - ON_COMMAND(ID_OPTIONS_SHOWDIFFERENT, OnOptionsShowDifferent) - ON_COMMAND(ID_OPTIONS_SHOWIDENTICAL, OnOptionsShowIdentical) - ON_COMMAND(ID_OPTIONS_SHOWUNIQUELEFT, OnOptionsShowUniqueLeft) - ON_COMMAND(ID_OPTIONS_SHOWUNIQUEMIDDLE, OnOptionsShowUniqueMiddle) - ON_COMMAND(ID_OPTIONS_SHOWUNIQUERIGHT, OnOptionsShowUniqueRight) - ON_COMMAND(ID_OPTIONS_SHOWBINARIES, OnOptionsShowBinaries) - ON_COMMAND(ID_OPTIONS_SHOWSKIPPED, OnOptionsShowSkipped) - ON_COMMAND(ID_OPTIONS_SHOWDIFFERENTLEFTONLY, OnOptionsShowDifferentLeftOnly) - ON_COMMAND(ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY, OnOptionsShowDifferentMiddleOnly) - ON_COMMAND(ID_OPTIONS_SHOWDIFFERENTRIGHTONLY, OnOptionsShowDifferentRightOnly) - ON_COMMAND(ID_OPTIONS_SHOWMISSINGLEFTONLY, OnOptionsShowMissingLeftOnly) - ON_COMMAND(ID_OPTIONS_SHOWMISSINGMIDDLEONLY, OnOptionsShowMissingMiddleOnly) - ON_COMMAND(ID_OPTIONS_SHOWMISSINGRIGHTONLY, OnOptionsShowMissingRightOnly) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENT, OnUpdateOptionsShowdifferent) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWIDENTICAL, OnUpdateOptionsShowidentical) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUELEFT, OnUpdateOptionsShowuniqueleft) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUEMIDDLE, OnUpdateOptionsShowuniquemiddle) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUERIGHT, OnUpdateOptionsShowuniqueright) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWBINARIES, OnUpdateOptionsShowBinaries) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWSKIPPED, OnUpdateOptionsShowSkipped) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENTLEFTONLY, OnUpdateOptionsShowDifferentLeftOnly) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY, OnUpdateOptionsShowDifferentMiddleOnly) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENTRIGHTONLY, OnUpdateOptionsShowDifferentRightOnly) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWMISSINGLEFTONLY, OnUpdateOptionsShowMissingLeftOnly) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWMISSINGMIDDLEONLY, OnUpdateOptionsShowMissingMiddleOnly) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWMISSINGRIGHTONLY, OnUpdateOptionsShowMissingRightOnly) - ON_COMMAND(ID_FILE_ENCODING, OnFileEncoding) - ON_COMMAND(ID_HELP, OnHelp) - ON_COMMAND(ID_EDIT_COPY, OnEditCopy) - ON_COMMAND(ID_EDIT_CUT, OnEditCut) - ON_COMMAND(ID_EDIT_PASTE, OnEditPaste) - ON_COMMAND(ID_EDIT_UNDO, OnEditUndo) - ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo) - ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick) - ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged) - ON_NOTIFY_REFLECT(LVN_BEGINLABELEDIT, OnBeginLabelEdit) - ON_NOTIFY_REFLECT(LVN_ENDLABELEDIT, OnEndLabelEdit) - ON_NOTIFY_REFLECT(NM_CLICK, OnClick) - ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag) - ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw) + ON_UPDATE_COMMAND_UI(ID_STATUS_RIGHTDIR_RO, OnUpdateStatusRightRO) + ON_UPDATE_COMMAND_UI(ID_STATUS_MIDDLEDIR_RO, OnUpdateStatusMiddleRO) + ON_UPDATE_COMMAND_UI(ID_STATUS_LEFTDIR_RO, OnUpdateStatusLeftRO) + // Progress dialog ON_BN_CLICKED(IDC_COMPARISON_STOP, OnBnClickedComparisonStop) ON_BN_CLICKED(IDC_COMPARISON_PAUSE, OnBnClickedComparisonPause) ON_BN_CLICKED(IDC_COMPARISON_CONTINUE, OnBnClickedComparisonContinue) -- 2.11.0