diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index eb75e3c28..f2677e7d2 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -465,16 +465,16 @@ EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE CAPTION "Go To..." FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0 BEGIN - CONTROL "Line",IDC_RADIO_GOTOLINE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,5,9,80,10 - CONTROL "Offset",IDC_RADIO_GOTOOFFSET,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,102,9,80,10 + CONTROL "&Line",IDC_RADIO_GOTOLINE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,5,9,80,10 + CONTROL "&Offset",IDC_RADIO_GOTOOFFSET,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,98,9,80,10 LTEXT "You are here :",ID_URHERE_STATIC,5,34,95,8,NOT WS_GROUP LTEXT "0123456789",ID_CURRLINE,100,34,45,8,NOT WS_GROUP - LTEXT "You want to go :",ID_UGO_STATIC,5,50,95,8 - EDITTEXT ID_GOLINE_EDIT,100,49,71,12,ES_NUMBER - LTEXT "You can't go further than :",ID_NOMORETHAN_STATIC,5,73,92,8,NOT WS_GROUP - LTEXT "0123456789",ID_LASTLINE,99,73,45,8,NOT WS_GROUP - DEFPUSHBUTTON "&Go !",IDOK,181,47,70,14,BS_NOTIFY - PUSHBUTTON "I'm going nowhere",IDCANCEL,181,69,70,14,BS_NOTIFY + LTEXT "You want to &go :",ID_UGO_STATIC,5,51,95,8 + EDITTEXT ID_GOLINE_EDIT,98,49,71,12,ES_NUMBER + LTEXT "You can't go further than :",ID_NOMORETHAN_STATIC,5,68,92,8,NOT WS_GROUP + LTEXT "0123456789",ID_LASTLINE,100,68,45,8,NOT WS_GROUP + DEFPUSHBUTTON "Go !",IDOK,181,48,70,14,BS_NOTIFY + PUSHBUTTON "I'm going nowhere",IDCANCEL,181,66,70,14,BS_NOTIFY END IDD_VALUE_DLG DIALOGEX 0, 0, 74, 17 diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 8135d3cd0..b331442b1 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -763,7 +763,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP lstrcpy(result, TEXT("The regular expression to search is formed badly")); else wsprintf(result, TEXT("%d occurrences were replaced."), nbReplaced); - ::MessageBox(_hSelf, result, TEXT(""), MB_OK); + ::MessageBox(_hSelf, result, TEXT("Replace All"), MB_OK); } } return TRUE; @@ -778,8 +778,8 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP lstrcpy(result, TEXT("The regular expression to search is formed badly.\r\nIs it resulting in nothing?")); else wsprintf(result, TEXT("%d match(es) to occurrence(s)"), nbCounted); - ::MessageBox(_hSelf, result, TEXT(""), MB_OK); - } + ::MessageBox(_hSelf, result, TEXT("Count"), MB_OK); + } } return TRUE; @@ -795,7 +795,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP lstrcpy(result, TEXT("The regular expression to search is formed badly.\r\nIs it resulting in nothing?")); else wsprintf(result, TEXT("%d match(es) to occurrence(s)"), nbMarked); - ::MessageBox(_hSelf, result, TEXT(""), MB_OK); + ::MessageBox(_hSelf, result, TEXT("Mark"), MB_OK); } } return TRUE; diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc index bd8813b09..91c5ab0f8 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc @@ -22,58 +22,55 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include #include "FindReplaceDlg_rc.h" -IDD_FIND_REPLACE_DLG DIALOGEX 36, 44, 321, 182 +IDD_FIND_REPLACE_DLG DIALOGEX 36, 44, 317, 182 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW CAPTION "Replace" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - RTEXT "Find what :",IDFINDWHAT_STATIC,6,22,75,8 + RTEXT "&Find what :",IDFINDWHAT_STATIC,6,22,75,8 COMBOBOX IDFINDWHAT,83,20,125,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP - RTEXT "Replace with :",ID_STATICTEXT_REPLACE,6,40,75,8 - COMBOBOX IDREPLACEWITH,83,39,125,50,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP - CONTROL "Mark Line",IDC_MARKLINE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,38,88,10 - CONTROL "Style found token",IDC_STYLEFOUND_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,13,50,100,15 - GROUPBOX "",IDC_FINDALL_STATIC,7,31,204,54 - CONTROL "Purge for each search",IDC_PURGE_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,13,64,99,16 - PUSHBUTTON "Find All",IDCMARKALL,131,40,75,14 + RTEXT "Rep&lace with :",ID_STATICTEXT_REPLACE,6,40,75,8 + COMBOBOX IDREPLACEWITH,83,38,125,50,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP + CONTROL "&Mark Line",IDC_MARKLINE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,40,88,10 + CONTROL "Style found to&ken",IDC_STYLEFOUND_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,13,52,100,15 + GROUPBOX "",IDC_FINDALL_STATIC,6,31,204,54 + CONTROL "Purge for each search",IDC_PURGE_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,13,66,99,16 + PUSHBUTTON "Find &All",IDCMARKALL,146,38,59,14 GROUPBOX "",IDC_REPLACEINSELECTION,141,50,170,23 - CONTROL "In selection",IDC_IN_SELECTION_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,59,59,10 - PUSHBUTTON "Clear",IDC_CLEAR_ALL,156,71,50,11 - RTEXT "Filters :",IDD_FINDINFILES_FILTERS_STATIC,27,59,53,8 - COMBOBOX IDD_FINDINFILES_FILTERS_COMBO,83,57,125,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP - RTEXT "Directory :",IDD_FINDINFILES_DIR_STATIC,7,77,40,8 - COMBOBOX IDD_FINDINFILES_DIR_COMBO,49,75,141,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDD_FINDINFILES_BROWSE_BUTTON,193,74,16,14 - CONTROL "In all sub-folders",IDD_FINDINFILES_RECURSIVE_CHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,73,80,15 - CONTROL "In hidden folders",IDD_FINDINFILES_INHIDDENDIR_CHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,87,80,15 + CONTROL "In select&ion",IDC_IN_SELECTION_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,58,59,10 + PUSHBUTTON "Clear",IDC_CLEAR_ALL,146,71,59,11 + RTEXT "Filter&s :",IDD_FINDINFILES_FILTERS_STATIC,27,58,53,8 + COMBOBOX IDD_FINDINFILES_FILTERS_COMBO,83,56,125,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP + RTEXT "Dir&ectory :",IDD_FINDINFILES_DIR_STATIC,7,76,40,8 + COMBOBOX IDD_FINDINFILES_DIR_COMBO,49,74,141,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDD_FINDINFILES_BROWSE_BUTTON,193,74,15,13 + CONTROL "In all su&b-folders",IDD_FINDINFILES_RECURSIVE_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,218,73,80,15 + CONTROL "In &hidden folders",IDD_FINDINFILES_INHIDDENDIR_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,218,87,80,15 CONTROL "Match &whole word only",IDWHOLEWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,88,104,15 CONTROL "Match &case",IDMATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,100,82,15 CONTROL "Wra&p around",IDWRAP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,6,112,110,15 GROUPBOX "Search mode",IDC_MODE_STATIC,6,126,138,48 CONTROL "&Normal",IDNORMAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,138,126,10 - CONTROL "&Extended (\\n, \\r, \\t, \\0, \\x...)",IDEXTENDED, - "Button",BS_AUTORADIOBUTTON,12,150,126,10 - CONTROL "Regular e&xpression",IDREGEXP,"Button",BS_AUTORADIOBUTTON,12,162,126,10 - CONTROL "&Up",IDDIRECTIONUP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,155,94,45,12 - CONTROL "&Down",IDDIRECTIONDOWN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,155,106,45,12 - GROUPBOX "Direction",IDC_DIR_STATIC,150,86,60,34,WS_GROUP + CONTROL "E&xtended (\\n, \\r, \\t, \\0, \\x...)",IDEXTENDED, "Button",BS_AUTORADIOBUTTON,12,150,126,10 + CONTROL "Re&gular expression",IDREGEXP,"Button",BS_AUTORADIOBUTTON,12,162,126,10 + CONTROL "&Up",IDDIRECTIONUP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,155,138,45,12 + CONTROL "&Down",IDDIRECTIONDOWN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,155,150,45,12 + GROUPBOX "Direction",IDC_DIR_STATIC,150,126,60,48,WS_GROUP PUSHBUTTON "Find Next",IDOK,217,20,90,14,WS_GROUP - PUSHBUTTON "Count",IDCCOUNTALL,217,38,90,14 - PUSHBUTTON "Replace in files",IDD_FINDINFILES_REPLACEINFILES,217,38,90,14 - PUSHBUTTON "Find all in all opened documents",IDC_FINDALL_OPENEDFILES,217,56,90,21,BS_MULTILINE + PUSHBUTTON "Coun&t",IDCCOUNTALL,217,38,90,14 + PUSHBUTTON "Find all in all &opened documents",IDC_FINDALL_OPENEDFILES,217,56,90,21,BS_MULTILINE PUSHBUTTON "&Replace",IDREPLACE,217,38,90,14 PUSHBUTTON "Replace &All",IDREPLACEALL,217,56,90,14 - PUSHBUTTON "Replace all in all opened documents",IDC_REPLACE_OPENEDFILES,217,74,90,21,BS_MULTILINE - PUSHBUTTON "Find them all",IDD_FINDINFILES_FIND_BUTTON,217,20,90,14,WS_GROUP - PUSHBUTTON "Close",IDCANCEL,217,99,90,14 - GROUPBOX "Transparency",IDC_TRANSPARENT_GRPBOX,227,123,83,49 - CONTROL "",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,223,123,9,10 - CONTROL "On lose focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,237,135,69,10 - CONTROL "Always",IDC_TRANSPARENT_ALWAYS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,237,147,63,10 - CONTROL "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,240,161,53,10 + PUSHBUTTON "Replace all in all &opened documents",IDC_REPLACE_OPENEDFILES,217,74,90,21,BS_MULTILINE + PUSHBUTTON "Find All",IDD_FINDINFILES_FIND_BUTTON,217,20,90,14,WS_GROUP + PUSHBUTTON "&Replace in files",IDD_FINDINFILES_REPLACEINFILES,217,38,90,14 + PUSHBUTTON "Close",IDCANCEL,217,98,90,14 + GROUPBOX "",IDC_TRANSPARENT_GRPBOX,222,126,85,48 + CONTROL "Transparenc&y",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,218,126,57,10 + CONTROL "On lose focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,138,65,10 + CONTROL "Always",IDC_TRANSPARENT_ALWAYS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,150,63,10 + CONTROL "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,235,161,53,10 END IDD_INCREMENT_FIND DIALOGEX 0, 0, 400, 20 diff --git a/PowerEditor/src/TinyXml/tinyxmlparser.cpp b/PowerEditor/src/TinyXml/tinyxmlparser.cpp index d41f94e93..d177d057e 100644 --- a/PowerEditor/src/TinyXml/tinyxmlparser.cpp +++ b/PowerEditor/src/TinyXml/tinyxmlparser.cpp @@ -233,7 +233,7 @@ const TCHAR* TiXmlBase::GetEntity( const TCHAR* p, TCHAR* value ) { int val; if (generic_sscanf(p+3, TEXT("%x"), &val) == 1) - { + { *value = val; return end + 1; }