diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index cfa130836..279873180 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,3 +1,13 @@ +Notepad++ v5.4.5 fixed bugs (from v5.4.4) : + +1. Fix plugins shortcuts not working bug. +2. Fix the tooltip on toolbar display bug for the plugins icons. +3. Fix a crash that was occurring when searching in files from a deep path. +4. Fix a crash issue (Unicode binary) while close Notepad++ with an RC file opened under Chinese Xp. +5. Fix Pascal and Scheme syntax highlighting problem (fixes in styles.xml). +6. Add SQL folding capacity. + + Notepad++ v5.4.4 fixed bugs (from v5.4.3) : 1. Upgrade Scintilla from 1.77 to 1.78. @@ -80,16 +90,19 @@ Included plugins (Unicode): 7. Doc Monitor v2.2 8. NppNetNote v0.1 9. ChangeMarkers 1.2.1 - +10. Compare Plugin 1.5.4 + Included plugins (ANSI): -1. TextFX v0.25 -2. NppExec v0.3 RC1 -3. Spell Checker v1.3.1 -4. MIME Tools v1.5 -5. FTP_synchronize v0.9.6 -6. NppExport v0.2.8 -7. Light Explorer v1.5 -8. Doc Monitor v2.2 -9. NppNetNote v0.1 -10. ChangeMarkers 1.2.1 +1. TextFX v0.25 +2. NppExec v0.3 RC1 +3. Spell Checker v1.3.1 +4. MIME Tools v1.5 +5. FTP_synchronize v0.9.6 +6. NppExport v0.2.8 +7. Light Explorer v1.5 +8. Doc Monitor v2.2 +9. NppNetNote v0.1 +10. ChangeMarkers 1.2.1 +11. Compare Plugin 1.5.4 + diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml index 90383e339..a4759cfb9 100644 --- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml +++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml @@ -1,4 +1,4 @@ - + @@ -20,6 +20,18 @@ + + + + + + + + + + + + @@ -98,6 +110,17 @@ + + + + + + + + + + + @@ -138,9 +161,9 @@ - - + + @@ -148,11 +171,12 @@ - + + - + @@ -170,18 +194,18 @@ - - - - - - - - + - - + + + + + + + + + @@ -205,8 +229,7 @@ - - + @@ -222,7 +245,8 @@ - + + @@ -248,8 +272,8 @@ - - + + @@ -412,6 +436,7 @@ + diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index 459a7e06a..4a4b2cc4a 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,7 +1,7 @@ - +
@@ -21,19 +21,19 @@ - - - - - - + + + + + + - - - - - + + + + + @@ -62,7 +62,7 @@ - + @@ -78,38 +78,38 @@ - + - + - + - + - + - - - - + + + + @@ -123,7 +123,7 @@ - + @@ -135,8 +135,8 @@ - - + + @@ -157,10 +157,10 @@ - - - - + + + + @@ -185,7 +185,7 @@ - +
diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index 0b6696879..6e96fbf9f 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -1,7 +1,7 @@ @@ -239,6 +239,7 @@ + diff --git a/PowerEditor/installer/nativeLang/tagalog.xml b/PowerEditor/installer/nativeLang/tagalog.xml new file mode 100644 index 000000000..63228583b --- /dev/null +++ b/PowerEditor/installer/nativeLang/tagalog.xml @@ -0,0 +1,541 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index c7368a13f..2bbd0fec8 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -441,11 +441,11 @@ GLOBAL_INST: IfFileExists "$INSTDIR\plugins\NppAutoIndent.dll" 0 +3 MessageBox MB_OK "Due to the stabilty issue,$\nNppAutoIndent.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it." Delete "$INSTDIR\plugins\NppAutoIndent.dll" - +/* IfFileExists "$INSTDIR\plugins\ComparePlugin.dll" 0 +3 MessageBox MB_OK "Due to the problem of compability with this version,$\nComparePlugin.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it." Delete "$INSTDIR\plugins\ComparePlugin.dll" - +*/ ; detect the right of UserInfo::GetAccountType Pop $1 @@ -676,6 +676,13 @@ SubSection "Plugins" Plugins SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\NppPlugin_ChangeMarker.dll" SectionEnd + + Section "Compare Plugin" ComparePlugin + Delete "$INSTDIR\plugins\ComparePlugin.dll" + SetOutPath "$INSTDIR\plugins" + File "..\bin\plugins\ComparePlugin.dll" + SectionEnd + SubSectionEnd SubSection "Themes" Themes diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index b7444078e..8b7cb9a33 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -2,11 +2,7 @@ copy /Y ".\nativeLang\*.*" ..\bin\localization\ cd ..\bin\ -del /F *.Installer.exe -del /F *.zip -del /F *.7z del /F /S /Q .\zipped.package.release\unicode\*.* - copy /Y license.txt .\zipped.package.release\unicode\ copy /Y readme.txt .\zipped.package.release\unicode\ copy /Y NppHelp.chm .\zipped.package.release\unicode\ @@ -21,11 +17,11 @@ copy /Y LINEDRAW.TTF .\zipped.package.release\unicode\ copy /Y "notepad++.exe" .\zipped.package.release\unicode\ copy /Y SciLexer.dll .\zipped.package.release\unicode\ copy /Y ".\plugins\*.*" .\zipped.package.release\unicode\plugins\ -copy /Y ".\plugins\APIs\*.xml" .\zipped.package.release\unicode\plugins\APIs -copy /Y ".\plugins\doc\*.*" .\zipped.package.release\unicode\plugins\doc -copy /Y ".\plugins\Config\tidy\*.*" .\zipped.package.release\unicode\plugins\Config\tidy -copy /Y ".\localization\*.*" .\zipped.package.release\unicode\localization -copy /Y ".\themes\*.*" .\zipped.package.release\unicode\themes +copy /Y ".\plugins\APIs\*.xml" .\zipped.package.release\unicode\plugins\APIs\ +copy /Y ".\plugins\doc\*.*" .\zipped.package.release\unicode\plugins\doc\ +copy /Y ".\plugins\Config\tidy\*.*" .\zipped.package.release\unicode\plugins\Config\tidy\ +copy /Y ".\localization\*.*" .\zipped.package.release\unicode\localization\ +copy /Y ".\themes\*.*" .\zipped.package.release\unicode\themes\ del /F /S /Q .\zipped.package.release\ansi\config.xml @@ -44,8 +40,8 @@ copy /Y contextMenu.xml .\zipped.package.release\ansi\ copy /Y shortcuts.xml .\zipped.package.release\ansi\ copy /Y doLocalConf.xml .\zipped.package.release\ansi\ copy /Y LINEDRAW.TTF .\zipped.package.release\ansi\ -copy /Y ".\plugins\Config\tidy\*.*" .\zipped.package.release\ansi\plugins\Config\tidy -copy /Y ".\themes\*.*" .\zipped.package.release\ansi\themes +copy /Y ".\plugins\Config\tidy\*.*" .\zipped.package.release\ansi\plugins\Config\tidy\ +copy /Y ".\themes\*.*" .\zipped.package.release\ansi\themes\ "C:\Program Files\7-Zip\7z.exe" a -tzip -r npp.bin.zip .\zipped.package.release\* "C:\Program Files\7-Zip\7z.exe" a -r npp.bin.7z .\zipped.package.release\* diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index afca160c2..9d79451b7 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2041,11 +2041,12 @@ void Notepad_plus::checkLangsMenu(int id) const if (curBuf->isUserDefineLangExt()) { const TCHAR *userLangName = curBuf->getUserDefineLangName(); - TCHAR menuLangName[16]; + const int nbChar = 16; + TCHAR menuLangName[nbChar]; for (int i = IDM_LANG_USER + 1 ; i <= IDM_LANG_USER_LIMIT ; i++) { - if (::GetMenuString(_mainMenuHandle, i, menuLangName, sizeof(menuLangName), MF_BYCOMMAND)) + if (::GetMenuString(_mainMenuHandle, i, menuLangName, nbChar-1, MF_BYCOMMAND)) if (!lstrcmp(userLangName, menuLangName)) { ::CheckMenuRadioItem(_mainMenuHandle, IDM_LANG_C, IDM_LANG_USER_LIMIT, i, MF_BYCOMMAND); @@ -8622,7 +8623,6 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa case WM_CLOSE: { const NppGUI & nppgui = pNppParam->getNppGUI(); - Session currentSession; if (nppgui._rememberLastSession) { @@ -8631,14 +8631,13 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa //Causing them to show on restart even though they are loaded by session _lastRecentFileList.setLock(true); //only lock when the session is remembered } - bool allClosed = fileCloseAll(); //try closing files before doing anything else if (nppgui._rememberLastSession) { _lastRecentFileList.setLock(false); //only lock when the session is remembered } - + if (!allClosed) { //User cancelled the shutdown @@ -8652,7 +8651,7 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa if (_configStyleDlg.isCreated() && ::IsWindowVisible(_configStyleDlg.getHSelf())) _configStyleDlg.restoreGlobalOverrideValues(); - + SCNotification scnN; scnN.nmhdr.code = NPPN_SHUTDOWN; scnN.nmhdr.hwndFrom = _hSelf; @@ -9417,14 +9416,13 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session) //Buffer * mainBuf = _mainEditView.getCurrentBuffer(); //Buffer * subBuf = _subEditView.getCurrentBuffer(); Document oldDoc = _invisibleEditView.execute(SCI_GETDOCPOINTER); - for (int i = 0 ; i < _mainDocTab.nbItem() ; i++) { BufferID bufID = _mainDocTab.getBufferByIndex(i); Buffer * buf = MainFileManager->getBufferByID(bufID); if (!buf->isUntitled() && PathFileExists(buf->getFullPathName())) { - generic_string languageName = getLangFromMenu( buf ); + generic_string languageName = getLangFromMenu(buf); const TCHAR *langName = languageName.c_str(); sessionFileInfo sfi(buf->getFullPathName(), langName, buf->getPosition(&_mainEditView)); @@ -9432,6 +9430,7 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session) //_mainEditView.activateBuffer(buf->getID()); _invisibleEditView.execute(SCI_SETDOCPOINTER, 0, buf->getDocument()); int maxLine = _invisibleEditView.execute(SCI_GETLINECOUNT); + for (int j = 0 ; j < maxLine ; j++) { if ((_invisibleEditView.execute(SCI_MARKERGET, j)&(1 << MARK_BOOKMARK)) != 0) diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h index f0af32906..c54a012aa 100644 --- a/PowerEditor/src/Notepad_plus.h +++ b/PowerEditor/src/Notepad_plus.h @@ -787,16 +787,17 @@ private: }; generic_string getLangFromMenu(const Buffer * buf) { + int id; - const TCHAR * userLangName; - TCHAR menuLangName[32]; + generic_string userLangName; + const int nbChar = 32; + TCHAR menuLangName[nbChar]; id = (NppParameters::getInstance())->langTypeToCommandID( buf->getLangType() ); - if ( ( id != IDM_LANG_USER ) || !( buf->isUserDefineLangExt() ) ) { - ( ::GetMenuString( _mainMenuHandle, id, menuLangName, sizeof( menuLangName ), MF_BYCOMMAND ) ); - userLangName = (TCHAR *)menuLangName; + ::GetMenuString(_mainMenuHandle, id, menuLangName, nbChar-1, MF_BYCOMMAND); + userLangName = menuLangName; } else { diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 6a146e6d3..bc8b4c54d 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -543,7 +543,7 @@ void Finder::DeleteResult() _MarkingsStruct._length = _pMainMarkings->size(); assert(_pMainFoundInfos->size() == _pMainMarkings->size()); - assert(_scintView.execute(SCI_GETLINECOUNT) == _pMainFoundInfos->size() + 1); + assert(size_t(_scintView.execute(SCI_GETLINECOUNT)) == _pMainFoundInfos->size() + 1); } void Finder::gotoNextFoundResult(int direction) diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.cpp b/PowerEditor/src/ScitillaComponent/columnEditor.cpp index 06efb7693..470994f68 100644 --- a/PowerEditor/src/ScitillaComponent/columnEditor.cpp +++ b/PowerEditor/src/ScitillaComponent/columnEditor.cpp @@ -227,7 +227,7 @@ BOOL CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) default : return FALSE; } - return FALSE; + //return FALSE; } void ColumnEditorDlg::switchTo(bool toText) diff --git a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp index 26ed3da27..7e033d602 100644 --- a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp +++ b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp @@ -343,7 +343,7 @@ bool XmlMatchedTagsHighlighter::getXmlMatchedTagsPos(XmlMatchedTagsPos & tagsPos return false; } - return false; + //return false; } vector< pair > XmlMatchedTagsHighlighter::getAttributesPos(int start, int end) diff --git a/PowerEditor/src/TinyXml/tinyxmlparser.cpp b/PowerEditor/src/TinyXml/tinyxmlparser.cpp index f603353f1..ff5d0133c 100644 --- a/PowerEditor/src/TinyXml/tinyxmlparser.cpp +++ b/PowerEditor/src/TinyXml/tinyxmlparser.cpp @@ -245,7 +245,7 @@ const TCHAR* TiXmlBase::GetEntity( const TCHAR* p, TCHAR* value ) { if ( generic_strncmp( entity[i].str, p, entity[i].strLength ) == 0 ) { - assert( lstrlen( entity[i].str ) == entity[i].strLength ); + assert( (unsigned int)lstrlen( entity[i].str ) == entity[i].strLength ); *value = entity[i].chr; return ( p + entity[i].strLength ); } diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 38ef81973..27cf42cfc 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -443,7 +443,7 @@ BOOL CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPar return FALSE; } } - return TRUE; + //return TRUE; } } @@ -451,7 +451,7 @@ BOOL CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPar default : return FALSE; } - return FALSE; + //return FALSE; } void WordStyleDlg::loadLangListFromNppParam() diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 29ca2d1d2..4c6da995b 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -310,30 +310,6 @@ BOOL CALLBACK BarsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) #endif } return TRUE; -/* - case IDC_COMBO_THEME : - { - LocalizationSwitcher & localizationSwitcher = pNppParam->getLocalizationSwitcher(); - int index = ::SendDlgItemMessage(_hSelf, IDC_COMBO_LOCALIZATION, CB_GETCURSEL, 0, 0); - TCHAR themeName[MAX_PATH]; - ::SendDlgItemMessage(_hSelf, IDC_COMBO_LOCALIZATION, CB_GETLBTEXT, index, (LPARAM)themeName); - if (langName[0]) - { - // Make English as basic language - if (localizationSwitcher.switchToLang(TEXT("English"))) - { - ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_RELOADNATIVELANG, 0, 0); - } - // Change the language - if (localizationSwitcher.switchToLang(langName)) - { - ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_RELOADNATIVELANG, 0, 0); - ::InvalidateRect(_hParent, NULL, TRUE); - } - } - } - return TRUE; - */ default: break; } diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.cpp b/PowerEditor/src/WinControls/shortcut/shortcut.cpp index d22749c50..1a9882ba8 100644 --- a/PowerEditor/src/WinControls/shortcut/shortcut.cpp +++ b/PowerEditor/src/WinControls/shortcut/shortcut.cpp @@ -820,5 +820,5 @@ BOOL CALLBACK ScintillaKeyMap::run_dlgProc(UINT Message, WPARAM wParam, LPARAM) return FALSE; } - return FALSE; + //return FALSE; } diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h index 45c21bec9..f6eb94bda 100644 Binary files a/PowerEditor/src/localizationString.h and b/PowerEditor/src/localizationString.h differ diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj index e504ce01f..fbabb2cad 100644 --- a/PowerEditor/visual.net/notepadPlus.vcproj +++ b/PowerEditor/visual.net/notepadPlus.vcproj @@ -50,7 +50,8 @@ RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="" - WarningLevel="3" + WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" />