diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index 4b5ab600..2758016b 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -1,6 +1,6 @@ - +
@@ -107,6 +107,12 @@ + + + + + + @@ -232,6 +238,9 @@ + + + @@ -275,6 +284,7 @@ + @@ -657,6 +667,8 @@ + + @@ -678,6 +690,7 @@ + @@ -815,6 +828,7 @@ + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index c618f50d..9ca04750 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -1,6 +1,6 @@ - +
@@ -114,6 +114,12 @@ + + + + + + @@ -230,6 +236,9 @@ + + + @@ -282,7 +291,7 @@ - + @@ -665,6 +674,7 @@ + @@ -827,6 +837,7 @@ + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index 4acbdcad..d25475f5 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -1,6 +1,6 @@ - +
@@ -114,6 +114,12 @@ + + + + + + @@ -230,6 +236,9 @@ + + + @@ -282,6 +291,7 @@ + @@ -362,7 +372,7 @@ - + @@ -663,6 +673,8 @@ + + @@ -685,6 +697,7 @@ + @@ -824,6 +837,7 @@ + @@ -850,6 +864,7 @@ + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 752f2263..3ff63f60 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -1,6 +1,6 @@ - +
@@ -108,6 +108,12 @@ + + + + + + @@ -244,6 +250,9 @@ + + + @@ -282,6 +291,7 @@ + @@ -646,6 +656,8 @@ + + @@ -667,6 +679,7 @@ + @@ -806,6 +819,7 @@ + diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index cca699e6..831644e9 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -280,8 +280,8 @@ BEGIN MENUITEM "Title Case (blend)", IDM_EDIT_TITLECASE_BLEND MENUITEM "&Sentence case", IDM_EDIT_SENTENCECASE_FORCE MENUITEM "Sentence case (blend)", IDM_EDIT_SENTENCECASE_BLEND - MENUITEM "&iNVERTCASE", IDM_EDIT_INVERTCASE - MENUITEM "&RAnDomCaSe", IDM_EDIT_RANDOMCASE + MENUITEM "&iNVERT cASE", IDM_EDIT_INVERTCASE + MENUITEM "&ranDOm CasE", IDM_EDIT_RANDOMCASE END POPUP "Line Operations" BEGIN @@ -877,7 +877,7 @@ BEGIN MENUITEM "Update Notepad++", IDM_UPDATE_NPP MENUITEM "Set Updater Proxy...", IDM_CONFUPDATERPROXY MENUITEM SEPARATOR - MENUITEM "Debug Info", IDM_DEBUGINFO + MENUITEM "Debug Info...", IDM_DEBUGINFO MENUITEM "About Notepad++", IDM_ABOUT END diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 5f8ee794..c932436a 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -1318,9 +1318,18 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa return TRUE; } + + case NPPM_INTERNAL_SCROLLBEYONDLASTLINE: + { + const bool endAtLastLine = not (pNppParam->getSVP())._scrollBeyondLastLine; + _mainEditView.execute(SCI_SETENDATLASTLINE, endAtLastLine); + _subEditView.execute(SCI_SETENDATLASTLINE, endAtLastLine); + return TRUE; + } + case NPPM_INTERNAL_SETMULTISELCTION: { - NppGUI & nppGUI = (NppGUI &)pNppParam->getNppGUI(); + NppGUI & nppGUI = const_cast(pNppParam->getNppGUI()); _mainEditView.execute(SCI_SETMULTIPLESELECTION, nppGUI._enableMultiSelection); _subEditView.execute(SCI_SETMULTIPLESELECTION, nppGUI._enableMultiSelection); return TRUE; diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index ae9ed12a..4cc48377 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -2807,14 +2807,6 @@ void Notepad_plus::command(int id) } break; - case IDM_VIEW_SCROLL_BEYOND_LASTLINE: - { - const bool endAtLastLine = not NppParameters::getInstance()->getSVP()._scrollBeyondLastLine; - _mainEditView.execute(SCI_SETENDATLASTLINE, endAtLastLine); - _subEditView.execute(SCI_SETENDATLASTLINE, endAtLastLine); - } - break; - case IDM_VIEW_EDGEBACKGROUND: case IDM_VIEW_EDGELINE: case IDM_VIEW_EDGENONE: diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 3581b16b..e13a22a0 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -684,7 +684,7 @@ INT_PTR CALLBACK MarginsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa case IDC_CHECK_SCROLLBEYONDLASTLINE: svp._scrollBeyondLastLine = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_GETCHECK, 0, 0)); - ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_SCROLL_BEYOND_LASTLINE, 0); + ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SCROLLBEYONDLASTLINE, 0, 0); return TRUE; case IDC_CHECK_DISABLEADVANCEDSCROLL: @@ -1828,10 +1828,10 @@ INT_PTR CALLBACK TabSettings::run_dlgProc(UINT Message, WPARAM wParam, LPARAM/* POINT p; ::GetCursorPos(&p); int size = tabSizeDlg.doDialog(p); + + //Tab size 0 removal if (size <= 0) return FALSE; - //Tab size 0 removal - ::SetDlgItemInt(_hSelf, IDC_TABSIZEVAL_STATIC, size, FALSE); ::SetDlgItemInt(_hSelf, IDC_TABSIZEVAL_DISABLE_STATIC, size, FALSE); diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index b7e91a87..07122586 100644 --- a/PowerEditor/src/menuCmdID.h +++ b/PowerEditor/src/menuCmdID.h @@ -343,8 +343,6 @@ #define IDM_VIEW_TAB_MOVEFORWARD (IDM_VIEW + 98) #define IDM_VIEW_TAB_MOVEBACKWARD (IDM_VIEW + 99) - #define IDM_VIEW_SCROLL_BEYOND_LASTLINE (IDM_VIEW + 100) - #define IDM_VIEW_GOTO_ANOTHER_VIEW 10001 #define IDM_VIEW_CLONE_TO_ANOTHER_VIEW 10002 #define IDM_VIEW_GOTO_NEW_INSTANCE 10003 diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index ac47769e..c894ab3a 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -408,6 +408,7 @@ #define NPPM_INTERNAL_REMOVEFINDER (NOTEPADPLUS_USER_INTERNAL + 41) #define NPPM_INTERNAL_RELOADSCROLLTOEND (NOTEPADPLUS_USER_INTERNAL + 42) // Used by Monitoring feature #define NPPM_INTERNAL_FINDKEYCONFLICTS (NOTEPADPLUS_USER_INTERNAL + 43) + #define NPPM_INTERNAL_SCROLLBEYONDLASTLINE (NOTEPADPLUS_USER_INTERNAL + 44) //wParam: 0 //lParam: document new index