From d6dbaf54449b7a3405ac8322b69831fda58adaf2 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 28 Mar 2021 11:50:55 +0900 Subject: [PATCH] Add drop-down menu to save icon on toolbar --- Src/MainFrm.cpp | 5 ++++- Src/Merge.rc | 14 ++++++++++++++ Src/resource.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index badadf4ca..10518e6d2 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -2126,7 +2126,7 @@ BOOL CMainFrame::CreateToolbar() LoadToolbarImages(); UINT nID, nStyle; - for (auto cmd : { ID_OPTIONS, ID_FILE_NEW, ID_FILE_OPEN }) + for (auto cmd : { ID_OPTIONS, ID_FILE_NEW, ID_FILE_OPEN, ID_FILE_SAVE }) { int iImage; int index = m_wndToolBar.GetToolBarCtrl().CommandToIndex(cmd); @@ -2483,6 +2483,9 @@ void CMainFrame::OnToolbarButtonDropDown(NMHDR* pNMHDR, LRESULT* pResult) case ID_FILE_OPEN: id = IDR_POPUP_OPEN; break; + case ID_FILE_SAVE: + id = IDR_POPUP_SAVE; + break; default: id = IDR_POPUP_DIFF_OPTIONS; break; diff --git a/Src/Merge.rc b/Src/Merge.rc index fb6968567..63e55969f 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -920,6 +920,20 @@ BEGIN END END +IDR_POPUP_SAVE MENU +BEGIN + POPUP "_POPUP_" + BEGIN + MENUITEM "Save &Left", ID_FILE_SAVE_LEFT + MENUITEM "Save &Middle", ID_FILE_SAVE_MIDDLE + MENUITEM "Save &Right", ID_FILE_SAVE_RIGHT + MENUITEM SEPARATOR + MENUITEM "Save &Left As...", ID_FILE_SAVEAS_LEFT + MENUITEM "Save &Middle As...", ID_FILE_SAVEAS_MIDDLE + MENUITEM "Save &Right As...", ID_FILE_SAVEAS_RIGHT + END +END + IDR_POPUP_MERGEEDITFRAME_STATUSBAR_EOL MENU BEGIN POPUP "_POPUP_" diff --git a/Src/resource.h b/Src/resource.h index b23cb22bb..383053c6f 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -19,6 +19,7 @@ #define IDR_POPUP_NEW 117 #define IDR_POPUP_OPEN 118 #define IDR_POPUP_COMPARE 119 +#define IDR_POPUP_SAVE 120 #define IDD_ABOUTBOX 200 #define IDD_OPEN 202 #define IDD_SAVECLOSING 203 -- 2.11.0