tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[RELEASE] Notepad++ 5.9.7 release 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@854 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2012-01-01 22:51:32 +00:00
parent d6633a0b6c
commit 18942fa999
7 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
PowerEditor/bin/allowAppDataPlugins.xml Normal file
View File

10
PowerEditor/bin/change.log
View File

@ -4,7 +4,7 @@ Notepad++ v5.9.7 new features and fixed bugs:
2. Add "Move Up" (Ctrl+Up) and "Move Down" (Ctrl+Down) commands in Project Panel.
3. Edit Zone border can be customizable via "Editing" tab of Preferences dialog.
4. Fix an aesthetic problem in incremental search bar.
5. Make plugins in %APPDATA%\Notepad++\plugins\ override les plugins in Notepad++ installation directory. (Plugins loading from %APPDATA%\Notepad++\plugins\ is enabled only if "NPP_INSTALLED_DIR\Notepad++\allowAppDataPlugins.xml" is present)
5. Make plugins in "%APPDATA%\Notepad++\plugins\" override les plugins in Notepad++ installation directory. (Plugins loading from %APPDATA%\Notepad++\plugins\ is enabled only if "NPP_INSTALLED_DIR\Notepad++\allowAppDataPlugins.xml" is present)
Included plugins (Unicode):
@ -12,7 +12,7 @@ Included plugins (Unicode):
1. Spell Checker v1.3.3
2. NppFTP 0.24.1
3. NppExport v0.2.8
4. Plugin Manager 1.0.5
4. Plugin Manager 1.0.7
5. Converter 3.0
@ -21,8 +21,8 @@ Included plugins (ANSI):
1. TextFX v0.25
2. NppExec v0.4.1
3. Spell Checker v1.3.3
3. Spell Checker v1.3.1
4. NppExport v0.2.8
5. Light Explorer v1.6
6. Compare Plugin 1.5.5
7. Plugin Manager 0.9.3.1
6. Compare Plugin 1.5.6.1
7. Plugin Manager 1.0.7

BIN
PowerEditor/bin/npp.pdb
View File

Binary file not shown.

BIN
PowerEditor/bin/updater/gpup.exe
View File

Binary file not shown.

29
PowerEditor/installer/nppSetup.nsi
View File

@ -18,10 +18,10 @@
; Define the application name
!define APPNAME "Notepad++"
!define APPVERSION "5.9.6.2"
!define APPVERSION "5.9.7"
!define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
!define VERSION_MAJOR 5
!define VERSION_MINOR 962
!define VERSION_MINOR 97
!define APPWEBSITE "http://notepad-plus-plus.org/"
@ -230,6 +230,7 @@ Var Dialog
Var NoUserDataCheckboxHandle
Var OldIconCheckboxHandle
Var ShortcutCheckboxHandle
Var PluginLoadFromUserDataCheckboxHandle
Function ExtraOptions
nsDialogs::Create 1018
@ -239,15 +240,19 @@ Function ExtraOptions
Abort
${EndIf}
${NSD_CreateCheckbox} 0 20 100% 30u "Don't use %APPDATA%$\nEnable this option to make Notepad++ load/write the configuration files from/to its install directory. Check it if you use Notepad++ in an USB device."
${NSD_CreateCheckbox} 0 0 100% 30u "Don't use %APPDATA%$\nEnable this option to make Notepad++ load/write the configuration files from/to its install directory. Check it if you use Notepad++ in an USB device."
Pop $NoUserDataCheckboxHandle
${NSD_OnClick} $NoUserDataCheckboxHandle OnChange_NoUserDataCheckBox
${NSD_CreateCheckbox} 0 80 100% 30u "Create Shortcut on Desktop"
${NSD_CreateCheckbox} 0 50 100% 30u "Allow plugins to be loaded from %APPDATA%\\notepad++\\plugins$\nIt could cause the security issue. Turn it on if you know what you are doing."
Pop $PluginLoadFromUserDataCheckboxHandle
${NSD_OnClick} $PluginLoadFromUserDataCheckboxHandle OnChange_PluginLoadFromUserDataCheckBox
${NSD_CreateCheckbox} 0 110 100% 30u "Create Shortcut on Desktop"
Pop $ShortcutCheckboxHandle
${NSD_OnClick} $ShortcutCheckboxHandle ShortcutOnChange_OldIconCheckBox
${NSD_CreateCheckbox} 0 140 100% 30u "Use the old, obsolete and monstrous icon$\nI won't blame you if you want to get the old icon back :)"
${NSD_CreateCheckbox} 0 170 100% 30u "Use the old, obsolete and monstrous icon$\nI won't blame you if you want to get the old icon back :)"
Pop $OldIconCheckboxHandle
${NSD_OnClick} $OldIconCheckboxHandle OnChange_OldIconCheckBox
@ -255,6 +260,7 @@ Function ExtraOptions
FunctionEnd
Var noUserDataChecked
Var allowPluginLoadFromUserDataChecked
Var isOldIconChecked
Var createShortcutChecked
@ -263,6 +269,10 @@ Function OnChange_NoUserDataCheckBox
${NSD_GetState} $NoUserDataCheckboxHandle $noUserDataChecked
FunctionEnd
Function OnChange_PluginLoadFromUserDataCheckBox
${NSD_GetState} $PluginLoadFromUserDataCheckboxHandle $allowPluginLoadFromUserDataChecked
FunctionEnd
Function OnChange_OldIconCheckBox
${NSD_GetState} $OldIconCheckboxHandle $isOldIconChecked
FunctionEnd
@ -375,7 +385,14 @@ Section -"Notepad++" mainSection
StrCpy $UPDATE_PATH "$APPDATA\Notepad++"
CreateDirectory $UPDATE_PATH\plugins\config
${EndIf}
${If} $allowPluginLoadFromUserDataChecked == ${BST_CHECKED}
File "..\bin\allowAppDataPlugins.xml"
${ELSE}
IfFileExists $INSTDIR\allowAppDataPlugins.xml 0 +2
Delete $INSTDIR\allowAppDataPlugins.xml
${EndIf}
SetOutPath "$TEMP\"
File "langsModel.xml"
File "configModel.xml"

4
PowerEditor/src/Notepad_plus.cpp
View File

@ -813,8 +813,10 @@ void Notepad_plus::saveDockingParams()
if (floatContArray[floatCont] == 0)
{
RECT rc;
if (nppGUI._dockingData.getFloatingRCFrom(floatCont, rc))
if (nppGUI._dockingData.getFloatingRCFrom(floatCont, rc))
{
vFloatingWindowInfo.push_back(FloatingWindowInfo(floatCont, rc.left, rc.top, rc.right, rc.bottom));
}
floatContArray[floatCont] = 1;
}

6
PowerEditor/src/resource.h
View File

@ -18,12 +18,12 @@
#ifndef RESOURCE_H
#define RESOURCE_H
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.6.2")
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.7")
// should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
// ex : #define VERSION_VALUE TEXT("5.63\0")
#define VERSION_VALUE TEXT("5.962\0")
#define VERSION_DIGITALVALUE 5, 9, 6, 2
#define VERSION_VALUE TEXT("5.97\0")
#define VERSION_DIGITALVALUE 5, 9, 7, 0
#ifdef UNICODE
#define UNICODE_ANSI_MODE TEXT("(UNICODE)")