diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 8846a1d64..5822afe97 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -48,5 +48,4 @@ Included plugins (ANSI): 7. Doc Monitor v2.2 8. NppNetNote v0.1 9. Compare Plugin 1.5.5 -10. Plugin Manager 0.9.2.1 diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index b9addf110..dc8ce2be9 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml index 8af7ef405..0d5d952cb 100644 --- a/PowerEditor/installer/nativeLang/czech.xml +++ b/PowerEditor/installer/nativeLang/czech.xml @@ -20,19 +20,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -46,7 +47,7 @@ - + @@ -69,8 +70,8 @@ - - + + @@ -92,7 +93,7 @@ - + @@ -163,15 +164,17 @@ - + - + + + @@ -200,8 +203,8 @@ - - + + @@ -236,7 +239,9 @@ - + @@ -250,25 +255,27 @@ - + - - - - - + + + + + - + + @@ -281,10 +288,10 @@ - + --> @@ -358,20 +365,21 @@ + - + - + - + @@ -389,17 +397,13 @@ - + - - - - @@ -415,8 +419,12 @@ + + + + - + @@ -427,9 +435,9 @@ - + - + @@ -438,10 +446,15 @@ - + - + + + + + + @@ -469,7 +482,8 @@ - + + @@ -502,12 +516,12 @@ - + - + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 2f47fe0e9..98241dd8f 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -694,6 +694,13 @@ SubSection "Plugins" Plugins File "..\bin\plugins\ComparePlugin.dll" SectionEnd + Section "Plugin Manager" PluginManager + Delete "$INSTDIR\plugins\PluginManager.dll" + SetOutPath "$INSTDIR\plugins" + File "..\bin\plugins\PluginManager.dll" + SetOutPath "$INSTDIR\updater" + File "..\bin\updater\gpup.exe" + SectionEnd SubSectionEnd SubSection "Themes" Themes @@ -1022,7 +1029,12 @@ SubSection un.Plugins Delete "$INSTDIR\plugins\ComparePlugin.dll" RMDir "$INSTDIR\plugins\" SectionEnd - + Section un.PluginManager + Delete "$INSTDIR\plugins\PluginManager.dll" + RMDir "$INSTDIR\plugins\" + Delete "$INSTDIR\updater\gpup.exe" + RMDir "$INSTDIR\updater\" + SectionEnd Section un.ChangeMarkers Delete "$INSTDIR\plugins\NppPlugin_ChangeMarker.dll" RMDir "$INSTDIR\plugins\" diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 9c752477b..dbff221ba 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -26,6 +26,7 @@ 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 ".\updater\gpup.exe" .\zipped.package.release\unicode\updater\ del /F /S /Q .\zipped.package.release\ansi\config.xml diff --git a/PowerEditor/src/WinControls/ContextMenu/ContextMenu.h b/PowerEditor/src/WinControls/ContextMenu/ContextMenu.h index be961dc9a..fe3b9f251 100644 --- a/PowerEditor/src/WinControls/ContextMenu/ContextMenu.h +++ b/PowerEditor/src/WinControls/ContextMenu/ContextMenu.h @@ -51,10 +51,28 @@ public: void create(HWND hParent, const vector & menuItemArray) { _hParent = hParent; _hMenu = ::CreatePopupMenu(); + bool lastIsSep = false; for (size_t i = 0 ; i < menuItemArray.size() ; i++) { unsigned int flag = MF_BYPOSITION | ((menuItemArray[i]._cmdID == 0)?MF_SEPARATOR:0); - ::InsertMenu(_hMenu, i, flag, menuItemArray[i]._cmdID, menuItemArray[i]._itemName.c_str()); + if ((i == 0 || i == menuItemArray.size() - 1) && menuItemArray[i]._cmdID == 0) + { + lastIsSep = true; + } + else if (menuItemArray[i]._cmdID != 0) + { + ::InsertMenu(_hMenu, i, flag, menuItemArray[i]._cmdID, menuItemArray[i]._itemName.c_str()); + lastIsSep = false; + } + else if (menuItemArray[i]._cmdID == 0 && !lastIsSep) + { + ::InsertMenu(_hMenu, i, flag, menuItemArray[i]._cmdID, menuItemArray[i]._itemName.c_str()); + lastIsSep = true; + } + else // last item is separator and current item is separator + { + lastIsSep = true; + } } }; bool isCreated() const {return _hMenu != NULL;}; diff --git a/PowerEditor/src/icons/npp.ico b/PowerEditor/src/icons/npp.ico index 8425ee14e..1ae54139c 100644 Binary files a/PowerEditor/src/icons/npp.ico and b/PowerEditor/src/icons/npp.ico differ