CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-03-11 19:17:50 +01:00
parent a396299fc5
commit b3e60ef7da
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Notepad3.rc
View File

@ -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
/////////////////////////////////////////////////////////////////////////////

11
src/Styles.c
View File

@ -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;