From 4d8175ad3a77f1b3c33f0193182f3097070bc8c8 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Thu, 23 Feb 2023 10:07:12 +0900 Subject: [PATCH] =?utf8?q?Implement=20issue=20#1413:=20"Move"=20needs=20op?= =?utf8?q?tions=20"Left=20to=20Right"=20or=20"Right=E2=80=A6=20(#1732)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Src/DirActions.cpp | 22 ++++++++- Src/DirActions.h | 40 +++++++++++++++++ Src/DirView.cpp | 40 +++++++++++++++++ Src/DirView.h | 6 +++ Src/FileActionScript.h | 2 +- Src/MainFrm.cpp | 8 +++- Src/Merge.rc | 6 +++ Src/Merge2.rc | 6 +++ Src/res/move_left_to_middle.bmp | Bin 0 -> 774 bytes Src/res/move_left_to_right.bmp | Bin 0 -> 774 bytes Src/res/move_middle_to_left.bmp | Bin 0 -> 774 bytes Src/res/move_middle_to_right.bmp | Bin 0 -> 774 bytes Src/res/move_right_to_left.bmp | Bin 0 -> 774 bytes Src/res/move_right_to_middle.bmp | Bin 0 -> 774 bytes Src/resource.h | 94 ++++++++++++++++++++++----------------- 15 files changed, 179 insertions(+), 45 deletions(-) create mode 100644 Src/res/move_left_to_middle.bmp create mode 100644 Src/res/move_left_to_right.bmp create mode 100644 Src/res/move_middle_to_left.bmp create mode 100644 Src/res/move_middle_to_right.bmp create mode 100644 Src/res/move_right_to_left.bmp create mode 100644 Src/res/move_right_to_middle.bmp diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index 4a74a8594..f62c19ce0 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -203,7 +203,8 @@ void ConfirmActionList(const CDiffContext& ctxt, const FileActionScript & action break; case FileAction::ACT_MOVE: - bDestIsSide = false; + if (item.UIResult == FileActionItem::UI_DEL) + bDestIsSide = false; if (actionList.GetActionItemCount() == 1) { ThrowConfirmMove(ctxt, item.UIOrigin, item.UIDestination, @@ -262,6 +263,14 @@ UPDATEITEM_TYPE UpdateDiffAfterOperation(const FileActionItem & act, CDiffContex SetDiffCounts(di, 0, 0); break; + case FileActionItem::UI_MOVE: + bUpdateSrc = true; + bUpdateDest = true; + CopyDiffSideAndProperties(di, act.UIOrigin, act.UIDestination); + UnsetDiffSide(di, act.UIOrigin); + SetDiffCompare(di, DIFFCODE::NOCMP); + break; + case FileActionItem::UI_DEL: if (di.diffcode.isSideOnly(act.UIOrigin)) { @@ -360,6 +369,17 @@ bool IsItemCopyable(const DIFFITEM &di, int index) return true; } +/// is it possible to move item to left ? +bool IsItemMovable(const DIFFITEM &di, int index) +{ + // don't let them mess with error items + if (di.diffcode.isResultError()) return false; + // impossible if not existing + if (!di.diffcode.exists(index)) return false; + // everything else can be copied to other side + return true; +} + /// is it possible to delete item ? bool IsItemDeletable(const DIFFITEM &di, int index) { diff --git a/Src/DirActions.h b/Src/DirActions.h index 5da09f783..02f78e681 100644 --- a/Src/DirActions.h +++ b/Src/DirActions.h @@ -140,6 +140,7 @@ UPDATEITEM_TYPE UpdateDiffAfterOperation(const FileActionItem & act, CDiffContex DIFFITEM *FindItemFromPaths(const CDiffContext& ctxt, const PathContext& paths); bool IsItemCopyable(const DIFFITEM &di, int index); +bool IsItemMovable(const DIFFITEM &di, int index); bool IsItemDeletable(const DIFFITEM &di, int index); bool IsItemDeletableOnBoth(const CDiffContext& ctxt, const DIFFITEM &di); bool AreItemsOpenable(const CDiffContext& ctxt, SELECTIONTYPE selectionType, const DIFFITEM &di1, const DIFFITEM &di2, bool openableForDir = true); @@ -267,6 +268,13 @@ struct DirActions return true; } + template + bool IsItemMovableOnTo(const DIFFITEM& di) const + { + const int idx = SideToIndex(m_ctxt, src); + return (di.diffcode.diffcode != 0 && !m_RO[idx] && !m_RO[SideToIndex(m_ctxt, dst)] && ::IsItemMovable(di, idx)); + } + template bool IsItemMovableToOn(const DIFFITEM& di) const { @@ -383,6 +391,38 @@ struct DirActions return CopyItem(pscript, it, src, to); } + FileActionScript *MoveItem(FileActionScript *pscript, const std::pair& it, SIDE_TYPE src, SIDE_TYPE dst) const + { + const DIFFITEM& di = *it.second; + const int srcidx = SideToIndex(m_ctxt, src); + const int dstidx = SideToIndex(m_ctxt, dst); + if (di.diffcode.diffcode != 0 && !m_RO[dstidx] && IsItemMovable(di, srcidx)) + { + FileActionItem act; + act.src = GetItemFileName(m_ctxt, di, srcidx); + act.dest = GetItemFileName(m_ctxt, di, dstidx); + + // We must check that paths still exists + if (paths::DoesPathExist(act.src) == paths::DOES_NOT_EXIST) + throw ContentsChangedException(act.src); + + act.context = it.first; + act.dirflag = di.diffcode.isDirectory(); + act.atype = FileAction::ACT_MOVE; + act.UIResult = FileActionItem::UI_MOVE; + act.UIOrigin = srcidx; + act.UIDestination = dstidx; + pscript->AddActionItem(act); + } + return pscript; + } + + template + FileActionScript *Move(FileActionScript *pscript, const std::pair& it) const + { + return MoveItem(pscript, it, src, to); + } + FileActionScript *DeleteItem(FileActionScript *pscript, const std::pair& it, SIDE_TYPE src) const { const DIFFITEM& di = *it.second; diff --git a/Src/DirView.cpp b/Src/DirView.cpp index 419bf973a..8eabb1b8a 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -257,6 +257,18 @@ BEGIN_MESSAGE_MAP(CDirView, CListView) 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_RIGHT, (OnCtxtDirMove)) + ON_COMMAND(ID_DIR_MOVE_LEFT_TO_MIDDLE, (OnCtxtDirMove)) + ON_COMMAND(ID_DIR_MOVE_RIGHT_TO_LEFT, (OnCtxtDirMove)) + ON_COMMAND(ID_DIR_MOVE_RIGHT_TO_MIDDLE, (OnCtxtDirMove)) + ON_COMMAND(ID_DIR_MOVE_MIDDLE_TO_LEFT, (OnCtxtDirMove)) + ON_COMMAND(ID_DIR_MOVE_MIDDLE_TO_RIGHT, (OnCtxtDirMove)) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_LEFT_TO_RIGHT, (OnUpdateCtxtDirMove)) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_LEFT_TO_MIDDLE, (OnUpdateCtxtDirMove)) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_RIGHT_TO_LEFT, (OnUpdateCtxtDirMove)) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_RIGHT_TO_MIDDLE, (OnUpdateCtxtDirMove)) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_MIDDLE_TO_LEFT, (OnUpdateCtxtDirMove)) + ON_UPDATE_COMMAND_UI(ID_DIR_MOVE_MIDDLE_TO_RIGHT, (OnUpdateCtxtDirMove)) 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) @@ -717,7 +729,11 @@ void CDirView::ListContextMenu(CPoint point, int /*i*/) pPopup->RemoveMenu(ID_DIR_COPY_MIDDLE_TO_RIGHT, MF_BYCOMMAND); pPopup->RemoveMenu(ID_DIR_COPY_MIDDLE_TO_BROWSE, MF_BYCOMMAND); pPopup->RemoveMenu(ID_DIR_COPY_RIGHT_TO_MIDDLE, MF_BYCOMMAND); + pPopup->RemoveMenu(ID_DIR_MOVE_LEFT_TO_MIDDLE, MF_BYCOMMAND); + pPopup->RemoveMenu(ID_DIR_MOVE_MIDDLE_TO_LEFT, MF_BYCOMMAND); + pPopup->RemoveMenu(ID_DIR_MOVE_MIDDLE_TO_RIGHT, MF_BYCOMMAND); pPopup->RemoveMenu(ID_DIR_MOVE_MIDDLE_TO_BROWSE, MF_BYCOMMAND); + pPopup->RemoveMenu(ID_DIR_MOVE_RIGHT_TO_MIDDLE, MF_BYCOMMAND); pPopup->RemoveMenu(ID_DIR_DEL_MIDDLE, MF_BYCOMMAND); pPopup->RemoveMenu(ID_DIR_DEL_ALL, MF_BYCOMMAND); pPopup->RemoveMenu(ID_DIR_OPEN_MIDDLE, MF_BYCOMMAND); @@ -1082,6 +1098,16 @@ void CDirView::DoUpdateDirCopy(CCmdUI* pCmdUI, eMenuType menuType) pCmdUI->SetText(FormatMenuItemString(srctype, dsttype, counts.count, counts.total).c_str()); } +/// Should Move to Left be enabled or disabled ? (both main menu & context menu use this) +template +void CDirView::DoUpdateDirMove(CCmdUI* pCmdUI, eMenuType menuType) +{ + Counts counts = Count(&DirActions::IsItemMovableOnTo); + pCmdUI->Enable(counts.count > 0); + if (menuType == eContext) + pCmdUI->SetText(FormatMenuItemString(srctype, dsttype, counts.count, counts.total).c_str()); +} + /** * @brief Update any resources necessary after a GUI language change */ @@ -3354,6 +3380,13 @@ void CDirView::OnUpdateHideFilenames(CCmdUI* pCmdUI) pCmdUI->Enable(m_pList->GetSelectedCount() != 0); } +/// User chose (context men) Move from right to left +template +void CDirView::OnCtxtDirMove() +{ + DoDirAction(&DirActions::Move, _("Moveing files...")); +} + /// User chose (context menu) Move left to... template void CDirView::OnCtxtDirMoveTo() @@ -3361,6 +3394,13 @@ void CDirView::OnCtxtDirMoveTo() DoDirActionTo(stype, &DirActions::MoveTo, _("Moving files...")); } +/// Update context menu Move Right to Left item +template +void CDirView::OnUpdateCtxtDirMove(CCmdUI* pCmdUI) +{ + DoUpdateDirMove(pCmdUI, eContext); +} + /** * @brief Update "Move | Left to..." item */ diff --git a/Src/DirView.h b/Src/DirView.h index f52de5306..c6d8dc1d5 100644 --- a/Src/DirView.h +++ b/Src/DirView.h @@ -233,6 +233,10 @@ protected: afx_msg void OnUpdateDirCopy(CCmdUI* pCmdUI); template afx_msg void OnUpdateCtxtDirCopy(CCmdUI* pCmdUI); + template + afx_msg void OnCtxtDirMove(); + template + afx_msg void OnUpdateCtxtDirMove(CCmdUI* pCmdUI); template afx_msg void OnCtxtDirDel(); template @@ -411,6 +415,8 @@ private: void OpenParentDirectory(CDirDoc *pDocOpen); template void DoUpdateDirCopy(CCmdUI* pCmdUI, eMenuType menuType); + template + void DoUpdateDirMove(CCmdUI* pCmdUI, eMenuType menuType); const DIFFITEM &GetDiffItem(int sel) const; DIFFITEM &GetDiffItem(int sel); int GetSingleSelectedItem() const; diff --git a/Src/FileActionScript.h b/Src/FileActionScript.h index 3912f58fb..e357cc2fe 100644 --- a/Src/FileActionScript.h +++ b/Src/FileActionScript.h @@ -64,7 +64,7 @@ struct FileActionItem : public FileAction enum UI_RESULT { UI_SYNC = 1, /**< Make items identical (synchronized). */ - UI_DESYNC, /**< Make items different. */ + UI_MOVE, /**< Move items. */ UI_DEL, /**< Remove left item. */ UI_DONT_CARE, /**< Ignore the GUI change. */ UI_RENAME /**< Rename item. */ diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 5649857ef..8ccb19992 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -172,6 +172,12 @@ const CMainFrame::MENUITEM_ICON CMainFrame::m_MenuIcons[] = { { ID_DIR_COPY_LEFT_TO_BROWSE, IDB_LEFT_TO_BROWSE, CMainFrame::MENU_FOLDERCMP }, { ID_DIR_COPY_MIDDLE_TO_BROWSE, IDB_MIDDLE_TO_BROWSE, CMainFrame::MENU_FOLDERCMP }, { ID_DIR_COPY_RIGHT_TO_BROWSE, IDB_RIGHT_TO_BROWSE, CMainFrame::MENU_FOLDERCMP }, + { ID_DIR_MOVE_LEFT_TO_RIGHT, IDB_MOVE_LEFT_TO_RIGHT, CMainFrame::MENU_FOLDERCMP }, + { ID_DIR_MOVE_LEFT_TO_MIDDLE, IDB_MOVE_LEFT_TO_MIDDLE, CMainFrame::MENU_FOLDERCMP }, + { ID_DIR_MOVE_RIGHT_TO_LEFT, IDB_MOVE_RIGHT_TO_LEFT, CMainFrame::MENU_FOLDERCMP }, + { ID_DIR_MOVE_RIGHT_TO_MIDDLE, IDB_MOVE_RIGHT_TO_MIDDLE, CMainFrame::MENU_FOLDERCMP }, + { ID_DIR_MOVE_MIDDLE_TO_LEFT, IDB_MOVE_MIDDLE_TO_LEFT, CMainFrame::MENU_FOLDERCMP }, + { ID_DIR_MOVE_MIDDLE_TO_RIGHT, IDB_MOVE_MIDDLE_TO_RIGHT, CMainFrame::MENU_FOLDERCMP }, { ID_DIR_MOVE_LEFT_TO_BROWSE, IDB_MOVE_LEFT_TO_BROWSE, CMainFrame::MENU_FOLDERCMP }, { ID_DIR_MOVE_MIDDLE_TO_BROWSE, IDB_MOVE_MIDDLE_TO_BROWSE, CMainFrame::MENU_FOLDERCMP }, { ID_DIR_MOVE_RIGHT_TO_BROWSE, IDB_MOVE_RIGHT_TO_BROWSE, CMainFrame::MENU_FOLDERCMP }, @@ -561,9 +567,7 @@ HMENU CMainFrame::NewMenu(int view, int ID) for (auto& menu_icon: m_MenuIcons) { if (menu_view == (menu_icon.menusToApply & menu_view)) - { m_pMenus[view]->ModifyODMenu(nullptr, menu_icon.menuitemID, menu_icon.iconResID); - } } m_pMenus[view]->LoadToolbar(IDR_MAINFRAME, &m_wndToolBar); diff --git a/Src/Merge.rc b/Src/Merge.rc index 9e9e95a1a..0103ad336 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -863,8 +863,14 @@ BEGIN END POPUP "&Move" BEGIN + MENUITEM "Left to Middle (%1 of %2)", ID_DIR_MOVE_LEFT_TO_MIDDLE + MENUITEM "Left to Right (%1 of %2)", ID_DIR_MOVE_LEFT_TO_RIGHT MENUITEM "Left to... (%1 of %2)", ID_DIR_MOVE_LEFT_TO_BROWSE + MENUITEM "Middle to Left (%1 of %2)", ID_DIR_MOVE_MIDDLE_TO_LEFT + MENUITEM "Middle to Right (%1 of %2)", ID_DIR_MOVE_MIDDLE_TO_RIGHT MENUITEM "Middle to... (%1 of %2)", ID_DIR_MOVE_MIDDLE_TO_BROWSE + MENUITEM "Right to Middle (%1 of %2)", ID_DIR_MOVE_RIGHT_TO_MIDDLE + MENUITEM "Right to Left (%1 of %2)", ID_DIR_MOVE_RIGHT_TO_LEFT MENUITEM "Right to... (%1 of %2)", ID_DIR_MOVE_RIGHT_TO_BROWSE END POPUP "&Delete" diff --git a/Src/Merge2.rc b/Src/Merge2.rc index 554875b7b..4f57cde7e 100644 --- a/Src/Merge2.rc +++ b/Src/Merge2.rc @@ -159,6 +159,12 @@ IDB_RIGHT_TO_LEFT BITMAP "res\\right_to_left.bmp" IDB_RIGHT_TO_MIDDLE BITMAP "res\\right_to_middle.bmp" IDB_MIDDLE_TO_LEFT BITMAP "res\\middle_to_left.bmp" IDB_MIDDLE_TO_RIGHT BITMAP "res\\middle_to_right.bmp" +IDB_MOVE_LEFT_TO_RIGHT BITMAP "res\\move_left_to_right.bmp" +IDB_MOVE_LEFT_TO_MIDDLE BITMAP "res\\move_left_to_middle.bmp" +IDB_MOVE_RIGHT_TO_LEFT BITMAP "res\\move_right_to_left.bmp" +IDB_MOVE_RIGHT_TO_MIDDLE BITMAP "res\\move_right_to_middle.bmp" +IDB_MOVE_MIDDLE_TO_LEFT BITMAP "res\\move_middle_to_left.bmp" +IDB_MOVE_MIDDLE_TO_RIGHT BITMAP "res\\move_middle_to_right.bmp" IDB_COPY_FROM_LEFT BITMAP "res\\from_left.bmp" IDB_COPY_FROM_RIGHT BITMAP "res\\from_right.bmp" IDB_COPY_SELECTED_LINES_FROM_LEFT BITMAP "res\\selected_lines_from_left.bmp" diff --git a/Src/res/move_left_to_middle.bmp b/Src/res/move_left_to_middle.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3190a3e94ac66276c0025b20e89b7eb86b97286f GIT binary patch literal 774 zcmZ?rWn*Rl12Z700mK48%n!tj3=%*R0*>%8Fn}-&{Ac)2Dq?7A0wUsdfz;o*L%bHK z`V%LJ)B;ui;|Bu~S{N8k!qv+Iy$;s$hT#nyF42^zYC03h5X3z{e#isE0IVhL`D=#jcTo_-QwBIfQtuAe^5rYT zoA+>}s`?p@;O+sM4^*EB)6)0rpVN0JVqkcWK&a-!)o1_u&-o36xW4?4jeP+_uOQ~@ z{{Qd$|9>vb@VUSK$9xB&*l!@jz;FVAz~)!~|9=vu7}LMVu?aCBt{7PgD;w%x+<}j# O3#y*zBm`1VNHG8&a;)S4 literal 0 HcmV?d00001 diff --git a/Src/res/move_middle_to_left.bmp b/Src/res/move_middle_to_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1f5af055e40456d1dc544731b657f17f17098079 GIT binary patch literal 774 zcmZ?rWn*Rl12Z700mK48%n!tj3=%*R0*>%8Fn}-&{Ac)2IbvvP0wN;K0V%$7he-7x z#V1Y>sUE8M#}7Q}8Lr<2qO|9)A&TXJzK5xQ!|(=z7#L0>(3|&ZU%o;VyZ`@>tp0z) ze+Xh=cnU{O-~T}rC;tDBrvBu*{}80A`WcS6zWgVso`K;#9L0Y7Klc|@OYZ;wzW@L0 z0=)nZPq_K9u`l2V&A%uA|F4FrNAm9p1_mfXjzoyVfLic`C$f4V8={4H^-wKDrw532 JAX{*xHvrN`v55cx literal 0 HcmV?d00001 diff --git a/Src/res/move_middle_to_right.bmp b/Src/res/move_middle_to_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e1a4fc432b8486bed50a8b457530927cd9aa0165 GIT binary patch literal 774 zcmZ?rWn*Rl12Z700mK48%n!tj3=%*R0*>%8Fn}-&{Ac)2IbvvP0wUtg0ja-phj=Ye z^(RgcsRgS3#}5V!Ees4N;ph#+8wi4{mj?z0SWDXT*9_P1f)K+~IQrl4AA*q8yTi47 z`O5I-y{hVGI6ArRKLnwvPlRc4`u>lB;XND?RL}M0e{AdvI6_me`~Sc1|Npr#!{`3` zAN%b;1H%b8Li2C+|NkdpisAmn8i^41!xdvygDeR3FGk=at3hT%)f1hBK%8Fn}-&{Ac)2Ma0n51Vls{2vU6K4w33X zicg#%Qax1hj~|%o8Lr<&MrqGqLlnycg8`aOYZ;w zzW@L00=)nZ&)C>kv9T{82-&khHr&4_|NpOssb^p~0Y_Nl4&pGN7R>O(sval^(L%g> Qs1~Br1H@jCEvV@Y0EhUj?f?J) literal 0 HcmV?d00001 diff --git a/Src/res/move_right_to_middle.bmp b/Src/res/move_right_to_middle.bmp new file mode 100644 index 0000000000000000000000000000000000000000..95efc9dc77f79b3394b48c0d00d0d0730ea7bab3 GIT binary patch literal 774 zcmcJNF$%&!5JkTTf);9NXBDuq^#EzCasyL%08d~eIgqEYNKRlAOTi+LLP=8joy{am zv)7e<=&^FSUJ z6zxhAMatVF4rD;CrGi_@% literal 0 HcmV?d00001 diff --git a/Src/resource.h b/Src/resource.h index e1138704d..1b9f8f29d 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -125,39 +125,45 @@ #define IDB_LEFT_TO_BROWSE 358 #define IDB_MIDDLE_TO_BROWSE 359 #define IDB_RIGHT_TO_BROWSE 360 -#define IDB_MOVE_LEFT_TO_BROWSE 361 -#define IDB_MOVE_MIDDLE_TO_BROWSE 362 -#define IDB_MOVE_RIGHT_TO_BROWSE 363 -#define IDB_TOOLBAR_ENABLED32 365 -#define IDB_VIEW_ZOOMIN 366 -#define IDB_VIEW_ZOOMOUT 367 -#define IDB_FILE_NEW3 368 -#define IDB_FILE_OPENCONFLICT 369 -#define IDB_PLUGINS_LIST 370 -#define IDB_MERGE_COMPARE 371 -#define IDB_MERGE_COMPARE_LEFT1_LEFT2 372 -#define IDB_MERGE_COMPARE_RIGHT1_RIGHT2 373 -#define IDB_MERGE_COMPARE_LEFT1_RIGHT2 374 -#define IDB_MERGE_COMPARE_LEFT2_RIGHT1 375 -#define IDB_COPY_FROM_LEFT 376 -#define IDB_COPY_FROM_RIGHT 377 -#define IDB_TOOLBAR_ENABLED 378 -#define IDB_FILE_NEW_TABLE 379 -#define IDB_FILE_NEW_HEX 380 -#define IDB_FILE_NEW_IMAGE 381 -#define IDB_FILE_NEW_WEBPAGE 382 -#define IDB_FILE_NEW3_TABLE 383 -#define IDB_FILE_NEW3_HEX 384 -#define IDB_FILE_NEW3_IMAGE 385 -#define IDB_FILE_NEW3_WEBPAGE 386 -#define IDB_COPY_SELECTED_LINES_FROM_LEFT 387 -#define IDB_COPY_SELECTED_LINES_FROM_RIGHT 388 -#define IDB_COPY_SELECTED_LINES_LEFT_TO_RIGHT 389 -#define IDB_COPY_SELECTED_LINES_LEFT_TO_MIDDLE 390 -#define IDB_COPY_SELECTED_LINES_MIDDLE_TO_LEFT 391 -#define IDB_COPY_SELECTED_LINES_MIDDLE_TO_RIGHT 392 -#define IDB_COPY_SELECTED_LINES_RIGHT_TO_MIDDLE 393 -#define IDB_COPY_SELECTED_LINES_RIGHT_TO_LEFT 394 +#define IDB_MOVE_LEFT_TO_RIGHT 361 +#define IDB_MOVE_LEFT_TO_MIDDLE 362 +#define IDB_MOVE_RIGHT_TO_LEFT 363 +#define IDB_MOVE_RIGHT_TO_MIDDLE 364 +#define IDB_MOVE_MIDDLE_TO_LEFT 365 +#define IDB_MOVE_MIDDLE_TO_RIGHT 366 +#define IDB_MOVE_LEFT_TO_BROWSE 367 +#define IDB_MOVE_MIDDLE_TO_BROWSE 368 +#define IDB_MOVE_RIGHT_TO_BROWSE 369 +#define IDB_TOOLBAR_ENABLED32 370 +#define IDB_VIEW_ZOOMIN 371 +#define IDB_VIEW_ZOOMOUT 372 +#define IDB_FILE_NEW3 373 +#define IDB_FILE_OPENCONFLICT 374 +#define IDB_PLUGINS_LIST 375 +#define IDB_MERGE_COMPARE 376 +#define IDB_MERGE_COMPARE_LEFT1_LEFT2 377 +#define IDB_MERGE_COMPARE_RIGHT1_RIGHT2 378 +#define IDB_MERGE_COMPARE_LEFT1_RIGHT2 379 +#define IDB_MERGE_COMPARE_LEFT2_RIGHT1 380 +#define IDB_COPY_FROM_LEFT 381 +#define IDB_COPY_FROM_RIGHT 382 +#define IDB_TOOLBAR_ENABLED 383 +#define IDB_FILE_NEW_TABLE 384 +#define IDB_FILE_NEW_HEX 385 +#define IDB_FILE_NEW_IMAGE 386 +#define IDB_FILE_NEW_WEBPAGE 387 +#define IDB_FILE_NEW3_TABLE 388 +#define IDB_FILE_NEW3_HEX 389 +#define IDB_FILE_NEW3_IMAGE 390 +#define IDB_FILE_NEW3_WEBPAGE 391 +#define IDB_COPY_SELECTED_LINES_FROM_LEFT 392 +#define IDB_COPY_SELECTED_LINES_FROM_RIGHT 393 +#define IDB_COPY_SELECTED_LINES_LEFT_TO_RIGHT 394 +#define IDB_COPY_SELECTED_LINES_LEFT_TO_MIDDLE 395 +#define IDB_COPY_SELECTED_LINES_MIDDLE_TO_LEFT 396 +#define IDB_COPY_SELECTED_LINES_MIDDLE_TO_RIGHT 397 +#define IDB_COPY_SELECTED_LINES_RIGHT_TO_MIDDLE 398 +#define IDB_COPY_SELECTED_LINES_RIGHT_TO_LEFT 399 #define IDI_FOLDER 500 #define IDI_LFOLDER 501 #define IDI_MFOLDER 502 @@ -828,14 +834,20 @@ #define ID_DIR_ZIP_BOTH 32994 #define ID_DIR_ZIP_ALL 32995 #define ID_DIR_ZIP_BOTH_DIFFS_ONLY 32996 -#define ID_DIR_MOVE_LEFT_TO_BROWSE 32997 -#define ID_DIR_MOVE_MIDDLE_TO_BROWSE 32998 -#define ID_DIR_MOVE_RIGHT_TO_BROWSE 32999 -#define ID_DIR_HIDE_FILENAMES 33000 -#define ID_DIR_ITEM_RENAME 33001 -#define ID_DIR_SHELL_CONTEXT_MENU_LEFT 33002 -#define ID_DIR_SHELL_CONTEXT_MENU_MIDDLE 33003 -#define ID_DIR_SHELL_CONTEXT_MENU_RIGHT 33004 +#define ID_DIR_MOVE_LEFT_TO_RIGHT 32997 +#define ID_DIR_MOVE_LEFT_TO_MIDDLE 32998 +#define ID_DIR_MOVE_LEFT_TO_BROWSE 32999 +#define ID_DIR_MOVE_MIDDLE_TO_LEFT 33000 +#define ID_DIR_MOVE_MIDDLE_TO_RIGHT 33001 +#define ID_DIR_MOVE_MIDDLE_TO_BROWSE 33002 +#define ID_DIR_MOVE_RIGHT_TO_LEFT 33003 +#define ID_DIR_MOVE_RIGHT_TO_MIDDLE 33004 +#define ID_DIR_MOVE_RIGHT_TO_BROWSE 33005 +#define ID_DIR_HIDE_FILENAMES 33006 +#define ID_DIR_ITEM_RENAME 33007 +#define ID_DIR_SHELL_CONTEXT_MENU_LEFT 33008 +#define ID_DIR_SHELL_CONTEXT_MENU_MIDDLE 33009 +#define ID_DIR_SHELL_CONTEXT_MENU_RIGHT 33010 #define ID_DISPLAY_MOVED_NONE 33111 #define ID_DISPLAY_MOVED_ALL 33112 #define ID_LOCBAR_GOTODIFF 33114 -- 2.11.0