From b3e60ef7da41142c5dd5e85ea97de99fee06b758 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Sun, 11 Mar 2018 19:17:50 +0100 Subject: [PATCH] rebase --- src/Notepad3.rc | 6 ++++++ src/Styles.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/Notepad3.rc b/src/Notepad3.rc index dea4e5f12..b271dae30 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -634,10 +634,16 @@ END IDR_ACCCUSTOMSCHEMES ACCELERATORS BEGIN +<<<<<<< HEAD "S", IDACC_SAVEPOS, VIRTKEY, CONTROL, NOINVERT "R", IDACC_RESETPOS, VIRTKEY, CONTROL, NOINVERT "S", IDACC_PREVIEW, VIRTKEY, CONTROL, NOINVERT VK_F12, IDACC_VIEWSCHEMECONFIG, VIRTKEY, CONTROL, NOINVERT +======= + "O", IDACC_SAVEPOS, VIRTKEY, CONTROL, NOINVERT + "P", IDACC_RESETPOS, VIRTKEY, CONTROL, NOINVERT + VK_F12, IDACC_VIEWSCHEMECONFIG, VIRTKEY, CONTROL, NOINVERT +>>>>>>> + add: save/reset dialog position commands (Customize Schemes Dlg) END ///////////////////////////////////////////////////////////////////////////// diff --git a/src/Styles.c b/src/Styles.c index 72fe97e4d..fac34daa2 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -5788,6 +5788,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam SetDlgPos(hwnd, xCustomSchemesDlg, yCustomSchemesDlg); HMENU hmenu = GetSystemMenu(hwnd, FALSE); +<<<<<<< HEAD GetString(IDS_PREVIEW, tchBuf, COUNTOF(tchBuf)); InsertMenu(hmenu, 0, MF_BYPOSITION | MF_STRING | MF_ENABLED, IDS_PREVIEW, tchBuf); InsertMenu(hmenu, 1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); @@ -5796,6 +5797,13 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam GetString(IDS_RESETPOS, tchBuf, COUNTOF(tchBuf)); InsertMenu(hmenu, 3, MF_BYPOSITION | MF_STRING | MF_ENABLED, IDS_RESETPOS, tchBuf); InsertMenu(hmenu, 4, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); +======= + GetString(IDS_SAVEPOS, tchBuf, COUNTOF(tchBuf)); + InsertMenu(hmenu, 0, MF_BYPOSITION | MF_STRING | MF_ENABLED, IDS_SAVEPOS, tchBuf); + GetString(IDS_RESETPOS, tchBuf, COUNTOF(tchBuf)); + InsertMenu(hmenu, 1, MF_BYPOSITION | MF_STRING | MF_ENABLED, IDS_RESETPOS, tchBuf); + InsertMenu(hmenu, 2, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); +>>>>>>> + add: save/reset dialog position commands (Customize Schemes Dlg) } return TRUE; @@ -6260,6 +6268,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam break; +<<<<<<< HEAD case IDACC_VIEWSCHEMECONFIG: PostMessage(hwnd, WM_COMMAND, MAKELONG(IDC_SETCURLEXERTV, 1), 0); break; @@ -6268,6 +6277,8 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam PostMessage(hwnd, WM_COMMAND, MAKELONG(IDC_PREVIEW, 1), 0); break; +======= +>>>>>>> + add: save/reset dialog position commands (Customize Schemes Dlg) case IDACC_SAVEPOS: GetDlgPos(hwnd, &xCustomSchemesDlg, &yCustomSchemesDlg); break;