From 6f3166c86526137d8487e7bdae5627f8081bb0a8 Mon Sep 17 00:00:00 2001 From: Don HO Date: Thu, 18 Jul 2019 23:28:02 +0200 Subject: [PATCH] Improve GUI in Find dialog Thanx to: https://github.com/notepad-plus-plus/notepad-plus-plus/issues/449#issuecomment-135799762 --- PowerEditor/installer/nativeLang/chinese.xml | 2 ++ PowerEditor/installer/nativeLang/english.xml | 2 ++ PowerEditor/installer/nativeLang/french.xml | 2 ++ PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp | 7 +++++-- PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc | 4 ++-- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index 260d2187..edcbf3b0 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -385,6 +385,8 @@ + + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index a88c7fb6..1002c7b4 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -384,6 +384,8 @@ + + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 6b6c4e1e..1f95824c 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -380,6 +380,8 @@ + + diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index c76bc44f..7cac8a3f 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -1,4 +1,4 @@ -// This file is part of Notepad++ project +// This file is part of Notepad++ project // Copyright (C)2003 Don HO // // 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; } diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc index 4c0f96cb..3445132d 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc @@ -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