Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'find-dlg-enhance-GUI'

Browse Source
This commit is contained in:
Don HO 2019-07-19 09:54:41 +02:00
commit 0db7c75ff9
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/installer/nativeLang/chinese.xml
View File

@ -385,6 +385,8 @@
<Item id="1641" name="在目前文件中全部尋找"/>
<Item id="1686" name="透明"/>
<Item id="1703" name="「.」包含換行"/>
<Item id="1721" name="▲"/>
<Item id="1723" name="▼ 找下一個"/>
</Find>
<FindCharsInRange title="以字元編號搜尋字元">
<Item id="2" name="關閉"/>

2
PowerEditor/installer/nativeLang/english.xml
View File

@ -384,6 +384,8 @@
<Item id="1641" name="Find All in Current Document"/>
<Item id="1686" name="Transparenc&amp;y"/>
<Item id="1703" name="&amp;. matches newline"/>
<Item id="1721" name="▲"/>
<Item id="1723" name="▼ Find Next"/>
</Find>
<FindCharsInRange title="Find Characters in Range...">

2
PowerEditor/installer/nativeLang/french.xml
View File

@ -380,6 +380,8 @@
<Item id="1688" name="persistante"/>
<Item id="1703" name="&amp;. comprend ligne nouvelle"/>
<Item id="2" name="Annuler"/>
<Item id="1721" name="▲"/>
<Item id="1723" name="▼ Suivant"/>
</Find>
<FindCharsInRange title="Rechercher des caractères dans une plage">

7
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -1,4 +1,4 @@
// This file is part of Notepad++ project
// This file is part of Notepad++ project
// Copyright (C)2003 Don HO <don.h@free.fr>
//
// This program is free software; you can redistribute it and/or
@ -835,7 +835,7 @@ INT_PTR CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
_countInSelFramePos.left = _replaceInSelFramePos.left = p.x;
_countInSelFramePos.top = _replaceInSelFramePos.top = p.y;
_countInSelFramePos.top = countP.y - 9;
_countInSelFramePos.top = countP.y - 14;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string searchButtonTip = pNativeSpeaker->getLocalizedStrFromID("shift-change-direction-tip", TEXT("Use Shift+Enter to search in the opposite direction."));
@ -861,6 +861,9 @@ INT_PTR CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
// Make tip stay 15 seconds
SendMessage(_2ButtonsTip, TTM_SETDELAYTIME, TTDT_AUTOPOP, MAKELPARAM((15000), (0)));
}
::SetWindowTextW(::GetDlgItem(_hSelf, IDC_FINDPREV), TEXT("▲"));
::SetWindowTextW(::GetDlgItem(_hSelf, IDC_FINDNEXT), TEXT("▼ Find Next"));
return TRUE;
}

4
PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
View File

@ -68,8 +68,8 @@ BEGIN
"Button",BS_AUTORADIOBUTTON,12,155,145,10
CONTROL "Re&gular expression",IDREGEXP,"Button",BS_AUTORADIOBUTTON,12,167,78,10
CONTROL "&. matches newline",IDREDOTMATCHNL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,167,68,9
PUSHBUTTON "<< ", IDC_FINDPREV, 268, 20, 45, 14, WS_GROUP | BS_MULTILINE
PUSHBUTTON " >>", IDC_FINDNEXT, 313, 20, 45, 14, WS_GROUP | BS_MULTILINE
PUSHBUTTON "", IDC_FINDPREV, 268, 20, 18, 14, WS_GROUP | BS_MULTILINE
PUSHBUTTON "", IDC_FINDNEXT, 289, 20, 70, 14, WS_GROUP | BS_MULTILINE
PUSHBUTTON "Find Next",IDOK,268,20,91,14,WS_GROUP
CONTROL "", IDC_2_BUTTONS_MODE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 363, 20, 15, 15
PUSHBUTTON "Coun&t",IDCCOUNTALL,268,38,91,14