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 1 Packages Projects Releases Wiki Activity

+ add: search/replace dialog to be MUI aware

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-05-18 16:32:43 +02:00
parent 62d2cb651d
commit dba5766cb9
15 changed files with 29 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
language/common_res.h
View File

@ -113,12 +113,35 @@
#define IDD_MUI_RUN 17000
#define IDI_MUI_RUN 17001
#define IDD_MUI_FIND 17002
#define IDD_MUI_REPLACE 17003
#define IDC_COMMANDLINE 18000
#define IDC_SEARCHEXE 18001
#define IDC_FINDTEXT 18002
#define IDC_REPLACETEXT 18003
#define IDC_FINDCASE 18004
#define IDC_FINDWORD 18005
#define IDC_FINDSTART 18006
#define IDC_FINDTRANSFORMBS 18007
#define IDC_FINDREGEXP 18008
#define IDC_DOT_MATCH_ALL 18009
#define IDC_NOWRAP 18010
#define IDC_FINDCLOSE 18011
#define IDC_ALL_OCCURRENCES 18012
#define IDC_WILDCARDSEARCH 18013
#define IDC_FINDPREV 18014
#define IDC_REPLACE 18015
#define IDC_REPLACEINSEL 18016
#define IDC_REPLACEALL 18017
#define IDC_SWAPSTRG 18018
#define IDC_TOGGLEFINDREPLACE 18019
#define IDC_BACKSLASHHELP 18020
#define IDC_REGEXPHELP 18021
#define IDC_WILDCARDHELP 18022
#define IDS_FR_STATUS_TEXT 18023
#define IDC_TOGGLE_VISIBILITY 18024

BIN
language/np3_af_af/dialogs_af_af.rc
View File

Binary file not shown.

BIN
language/np3_af_af/np3_af_af.rc
View File

Binary file not shown.

BIN
language/np3_de_de/dialogs_de_de.rc
View File

Binary file not shown.

BIN
language/np3_de_de/np3_de_de.rc
View File

Binary file not shown.

BIN
language/np3_en_uk/dialogs_en_uk.rc
View File

Binary file not shown.

BIN
language/np3_en_uk/np3_en_uk.rc
View File

Binary file not shown.

BIN
language/np3_en_us/dialogs_en_us.rc
View File

Binary file not shown.

BIN
language/np3_es_es/dialogs_es_es.rc
View File

Binary file not shown.

BIN
language/np3_es_es/np3_es_es.rc
View File

Binary file not shown.

BIN
language/np3_fr_fr/dialogs_fr_fr.rc
View File

Binary file not shown.

BIN
language/np3_fr_fr/np3_fr_fr.rc
View File

Binary file not shown.

4
src/Edit.c
View File

@ -5738,8 +5738,8 @@ HWND EditFindReplaceDlg(HWND hwnd,LPCEDITFINDREPLACE lpefr,bool bReplace)
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_SPEED_OVER_MEMORY);
lpefr->hwnd = hwnd;
HWND hDlg = CreateThemedDialogParam(g_hInstance,
(bReplace) ? MAKEINTRESOURCEW(IDD_REPLACE) : MAKEINTRESOURCEW(IDD_FIND),
HWND hDlg = CreateThemedDialogParam(g_hLngResContainer,
(bReplace) ? MAKEINTRESOURCEW(IDD_MUI_REPLACE) : MAKEINTRESOURCEW(IDD_MUI_FIND),
GetParent(hwnd),
EditFindReplaceDlgProcW,
(LPARAM) lpefr);

89
src/Notepad3.rc
View File

@ -297,70 +297,6 @@ BEGIN
CONTROL "",IDC_RICHEDITABOUT,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | ES_NUMBER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,20,80,360,168
END
IDD_FIND DIALOGEX 0, 0, 273, 130
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Find Text"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Search Strin&g:",IDC_STATIC,7,7,46,8
COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,53,10
CONTROL "Match &whole word only",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10
CONTROL "Match &beginning of word only",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10
CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,85,10
CONTROL "Regular &expression search",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10
CONTROL "Dot &matches all",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,65,10
CONTROL "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10
CONTROL "C&lose after find",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,65,10
CONTROL "Mark &Occurrences",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,73,10
CONTROL "W&ildcard Search",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,63,10
DEFPUSHBUTTON "&Find Next",IDOK,211,7,55,14
PUSHBUTTON "Find &Previous",IDC_FINDPREV,211,24,55,14
PUSHBUTTON "Close",IDCANCEL,212,99,54,14
CONTROL "<a>Goto Replace (Ctrl+H)</a>",IDC_TOGGLEFINDREPLACE,
"SysLink",0x0,125,103,74,10
CONTROL "<a>(?)</a>",IDC_REGEXPHELP,"SysLink",0x0,106,85,14,10
CONTROL "<a>(?)</a>",IDC_BACKSLASHHELP,"SysLink",0x0,106,73,14,10
CONTROL "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10
CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,117,259,9,WS_EX_STATICEDGE
PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,65,55,14
END
IDD_REPLACE DIALOGEX 0, 0, 273, 156
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Replace Text"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Search Strin&g:",IDC_STATIC,7,7,46,8
COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "Replace wit&h:",IDC_STATIC,7,36,44,8
COMBOBOX IDC_REPLACETEXT,7,47,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,53,10
CONTROL "Match &whole word only",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10
CONTROL "Match &beginning of word only",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10
CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10
CONTROL "Regular &expression search",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10
CONTROL "Dot &matches all",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10
CONTROL "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10
CONTROL "C&lose after replace",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,77,10
CONTROL "Mark &Occurrences",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,73,10
CONTROL "W&ildcard Search",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,63,10
DEFPUSHBUTTON "&Find Next",IDOK,211,7,55,14
PUSHBUTTON "Find &Previous",IDC_FINDPREV,211,23,55,14
PUSHBUTTON "&Replace",IDC_REPLACE,211,43,55,14
PUSHBUTTON "In &Selection",IDC_REPLACEINSEL,211,59,55,14
PUSHBUTTON "Replace &All",IDC_REPLACEALL,211,75,55,14
PUSHBUTTON "Swap Strings",IDC_SWAPSTRG,150,32,49,12
PUSHBUTTON "Close",IDCANCEL,211,126,55,14
CONTROL "<a>Goto Find (Ctrl+F)</a>",IDC_TOGGLEFINDREPLACE,
"SysLink",0x0,125,130,74,10
CONTROL "<a>(?)</a>",IDC_BACKSLASHHELP,"SysLink",0x0,107,102,14,10
CONTROL "<a>(?)</a>",IDC_REGEXPHELP,"SysLink",0x0,107,114,14,10
CONTROL "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10
CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,144,259,9,WS_EX_STATICEDGE
PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,94,55,14
END
IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Run"
@ -824,31 +760,6 @@ BEGIN
BOTTOMMARGIN, 270
END
IDD_FIND, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 266
VERTGUIDE, 7
TOPMARGIN, 7
BOTTOMMARGIN, 113
END
IDD_REPLACE, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 266
VERTGUIDE, 7
TOPMARGIN, 7
BOTTOMMARGIN, 140
END
IDD_RUN, DIALOG
BEGIN
LEFTMARGIN, 10
RIGHTMARGIN, 218
BOTTOMMARGIN, 85
END
IDD_OPENWITH, DIALOG
BEGIN
LEFTMARGIN, 7

27
src/resource.h
View File

@ -5,7 +5,8 @@
#define IDR_RT_MANIFEST 1
#define IDR_MAINWND 100
#define IDC_FINDTEXT 101
#define IDC_LINENUM 102
#define IDD_ABOUT 104
#define IDC_VERSION 105
@ -21,7 +22,6 @@
#define IDC_GETOPENWITHDIR 116
#define IDC_RESIZEGRIP 117
#define IDD_OPENWITH 118
#define IDC_REPLACETEXT 119
#define IDC_COLNUM 121
#define IDC_DEFAULTSCHEME 122
#define IDC_GETFAVORITESDIR 123
@ -43,7 +43,6 @@
#define IDC_RESIZEGRIP4 139
#define IDC_NOUNICODEDETECTION 140
#define IDC_COPYRIGHT 141
#define IDC_FINDCASE 142
#define IDC_OPENWITHDESCR 143
#define IDC_SAVEMRU 144
#define IDC_AUTOSELECT 146
@ -55,7 +54,6 @@
#define IDC_ASCIIASUTF8 152
#define IDC_WEBPAGE 153
#define IDD_DEFENCODING 154
#define IDC_FINDWORD 155
#define IDC_RESIZEGRIP3 156
#define IDB_NEXT 157
#define IDC_STYLEFORE 158
@ -66,44 +64,32 @@
#define IDC_MODWEBPAGE2 163
#define IDD_ENCODING 164
#define IDC_MOD_PAGE2 165
#define IDC_FINDSTART 166
#define IDB_PICK 167
#define IDC_AUTHORNAME 168
#define IDC_WEBPAGE4 169
#define IDC_MODWEBPAGE 170
#define IDD_RECODE 171
#define IDC_FINDREGEXP 172
#define IDB_ENCODING 173
#define IDC_EMAIL 174
#define IDC_NOTE2WEBPAGE 175
#define IDD_DEFEOLMODE 176
#define IDC_FINDTRANSFORMBS 177
#define IDC_EMAIL2 178
#define IDC_NOTE2WEBPAGE2 179
#define IDD_FAVORITES 180
#define IDC_NOWRAP 181
#define IDD_ADDTOFAV 182
#define IDC_FINDCLOSE 183
#define IDC_EMAIL3 184
#define IDD_FILEMRU 186
#define IDC_FINDPREV 187
#define IDD_CHANGENOTIFY 188
#define IDD_MODIFYLINES 189
#define IDC_MOD_PAGE 190
#define IDC_REPLACE 191
#define IDC_TITLE 192
#define IDD_ALIGN 193
#define IDC_WEBPAGE3 194
#define IDD_ENCLOSESELECTION 195
#define IDC_REPLACEALL 196
#define IDD_INSERTTAG 198
#define IDC_REPLACEINSEL 199
#define IDD_SORT 200
#define IDC_TOGGLEFINDREPLACE 201
#define IDD_COLUMNWRAP 202
#define IDD_LINENUM 203
#define IDD_FIND 204
#define IDD_REPLACE 205
#define IDD_STYLESELECT 206
#define IDD_STYLECONFIG 207
#define IDD_WORDWRAP 208
@ -114,25 +100,17 @@
#define IDD_INFOBOX2 213
#define IDD_INFOBOX3 214
#define IDT_TIMER_MRKALL 215
#define IDC_ALL_OCCURRENCES 216
#define IDC_DOT_MATCH_ALL 217
#define IDT_TIMER_MAIN_MRKALL 218
#define IDT_TIMER_UPDATE_HOTSPOT 219
#define IDC_BACKSLASHHELP 220
#define IDC_REGEXPHELP 221
#define IDC_WILDCARDHELP 222
#define IDC_WILDCARDSEARCH 223
#define IDC_SCI_VERSION 224
#define IDR_MAINWNDTB 225
#define IDC_REMOVE 226
#define IDC_SWAPSTRG 227
#define IDC_CHECK_OCC 228
#define IDC_PRINTER 229
#define IDC_USEASREADINGFALLBACK 230
#define IDR_ACCCUSTOMSCHEMES 231
#define IDC_NOANSICPDETECTION 232
#define IDC_REMEMBERSEARCHPATTERN 233
#define IDC_TOGGLE_VISIBILITY 234
#define IDC_DOC_MODIFIED 235
#define IDT_TIMER_UPDATE_STATUSBAR 236
#define IDT_TIMER_UPDATE_TOOLBAR 237
@ -161,7 +139,6 @@
#define IDC_CHECK3 409
#define IDD_PASSWORDS 411
#define IDC_EDIT3 412
#define IDS_FR_STATUS_TEXT 417
#define IDC_CHECK4 418
#define ___SCI_CMD__SCEN_SETFOCUS___ 512
#define IDR_MAINWNDTB2 550