Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOTEPAD] Shift+F3 for backward search (#5101)

Browse source 
- Add Shift+F3 accelerator as command CMD_SEARCH_PREV.
- Extend DIALOG_SearchNext function with bDown argument for the action of CMD_SEARCH_PREV.
- Modify the message loop for effective F3 key on Find/Replace dialog.
CORE-17064
This commit is contained in:
Katayama Hirofumi MZ 2023-03-01 07:16:28 +09:00 committed by GitHub
parent a9b1e059f4
commit 55e3feba53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 58 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
base/applications/notepad/dialog.c
View file

@ -1070,8 +1070,13 @@ VOID DIALOG_Search(VOID)
DIALOG_SearchDialog(FindText);
}
VOID DIALOG_SearchNext(VOID)
VOID DIALOG_SearchNext(BOOL bDown)
{
if (bDown)
Globals.find.Flags |= FR_DOWN;
else
Globals.find.Flags &= ~FR_DOWN;
if (Globals.find.lpstrFindWhat != NULL)
NOTEPAD_FindNext(&Globals.find, FALSE, TRUE);
else

2
base/applications/notepad/dialog.h
View file

@ -39,7 +39,7 @@ VOID DIALOG_EditTimeDate(VOID);
VOID DIALOG_EditWrap(VOID);
VOID DIALOG_Search(VOID);
VOID DIALOG_SearchNext(VOID);
VOID DIALOG_SearchNext(BOOL bDown);
VOID DIALOG_Replace(VOID);
VOID DIALOG_GoTo(VOID);

1
base/applications/notepad/lang/bg-BG.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/cs-CZ.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/da-DK.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/de-DE.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/el-GR.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/en-US.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/es-ES.rc
View file

@ -18,6 +18,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/et-EE.rc
View file

@ -24,6 +24,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/eu-ES.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/fi-FI.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/fr-FR.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/he-IL.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/hi-IN.rc
View file

@ -23,6 +23,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/hr-HR.rc
View file

@ -23,6 +23,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/hu-HU.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/hy-AM.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/id-ID.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/it-IT.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/ja-JP.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/lt-LT.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/ms-MY.rc
View file

@ -18,6 +18,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/nl-NL.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/no-NO.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/pl-PL.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/pt-BR.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/pt-PT.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/ro-RO.rc
View file

@ -21,6 +21,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/ru-RU.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/sk-SK.rc
View file

@ -24,6 +24,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/sl-SI.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/sq-AL.rc
View file

@ -20,6 +20,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/sv-SE.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/th-TH.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/tr-TR.rc
View file

@ -19,6 +19,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/uk-UA.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/uz-UZ.rc
View file

@ -16,6 +16,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/zh-CN.rc
View file

@ -24,6 +24,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/zh-HK.rc
View file

@ -24,6 +24,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

1
base/applications/notepad/lang/zh-TW.rc
View file

@ -24,6 +24,7 @@ BEGIN
"^X", CMD_CUT
"^Z", CMD_UNDO
VK_F3, CMD_SEARCH_NEXT, VIRTKEY
VK_F3, CMD_SEARCH_PREV, VIRTKEY, SHIFT
VK_F5, CMD_TIME_DATE, VIRTKEY
END

15
base/applications/notepad/main.c
View file

@ -5,7 +5,7 @@
* Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
* Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
* Copyright 2002 Andriy Palamarchuk
* Copyright 2020 Katayama Hirofumi MZ
* Copyright 2020-2023 Katayama Hirofumi MZ
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -37,6 +37,7 @@ VOID NOTEPAD_EnableSearchMenu()
UINT uEnable = MF_BYCOMMAND | (bEmpty ? MF_GRAYED : MF_ENABLED);
EnableMenuItem(Globals.hMenu, CMD_SEARCH, uEnable);
EnableMenuItem(Globals.hMenu, CMD_SEARCH_NEXT, uEnable);
EnableMenuItem(Globals.hMenu, CMD_SEARCH_PREV, uEnable);
}
/***********************************************************************
@ -83,9 +84,10 @@ static int NOTEPAD_MenuCommand(WPARAM wParam)
case CMD_TIME_DATE: DIALOG_EditTimeDate(); break;
case CMD_SEARCH: DIALOG_Search(); break;
case CMD_SEARCH_NEXT: DIALOG_SearchNext(); break;
case CMD_SEARCH_NEXT: DIALOG_SearchNext(TRUE); break;
case CMD_REPLACE: DIALOG_Replace(); break;
case CMD_GOTO: DIALOG_GoTo(); break;
case CMD_SEARCH_PREV: DIALOG_SearchNext(FALSE); break;
case CMD_WRAP: DIALOG_EditWrap(); break;
case CMD_FONT: DIALOG_SelectFont(); break;
@ -647,14 +649,17 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh
hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCEL));
while (GetMessage(&msg, 0, 0, 0))
while (GetMessage(&msg, NULL, 0, 0))
{
if (!IsDialogMessage(Globals.hFindReplaceDlg, &msg) &&
!TranslateAccelerator(Globals.hMainWnd, hAccel, &msg))
if (!TranslateAccelerator(Globals.hMainWnd, hAccel, &msg) &&
!IsDialogMessage(Globals.hFindReplaceDlg, &msg))
{
TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
DestroyAcceleratorTable(hAccel);
return (int) msg.wParam;
}

2
base/applications/notepad/main.h
View file

@ -99,5 +99,5 @@ void NOTEPAD_LoadSettingsFromRegistry(void);
void NOTEPAD_SaveSettingsToRegistry(void);
/* from main.c */
BOOL NOTEPAD_FindNext(FINDREPLACE *, BOOL , BOOL );
BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert);
VOID NOTEPAD_EnableSearchMenu(VOID);

1
base/applications/notepad/notepad_res.h
View file

@ -54,6 +54,7 @@
#define CMD_SEARCH_NEXT 0x121
#define CMD_REPLACE 0x122
#define CMD_GOTO 0x123
#define CMD_SEARCH_PREV 0x124
#define CMD_WRAP 0x119
#define CMD_FONT 0x140