From 73c4811c8bf2db477157dd036341dab65de28a72 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Mon, 28 Jan 2013 01:18:56 +0000 Subject: [PATCH] [RELEASE] Notepad++ 6.3 RC. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1016 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/nppSetup.nsi | 4 +- PowerEditor/installer/themes/Zenburn.xml | 225 +++++++++--------- PowerEditor/src/Notepad_plus.rc | 2 +- .../src/ScitillaComponent/FindReplaceDlg.cpp | 17 +- PowerEditor/src/resource.h | 6 +- 5 files changed, 128 insertions(+), 126 deletions(-) diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 1a4d45ef6..a9cc03fe8 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -28,10 +28,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "6.2.3" +!define APPVERSION "6.3" !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 6 -!define VERSION_MINOR 23 +!define VERSION_MINOR 3 !define APPWEBSITE "http://notepad-plus-plus.org/" diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml index d99ab427a..fdf61f23d 100644 --- a/PowerEditor/installer/themes/Zenburn.xml +++ b/PowerEditor/installer/themes/Zenburn.xml @@ -5,9 +5,9 @@ Style Name: Zenburn Description: Zenburn-like style for Notepad++. Inspired by the original Zenburn colorscheme for Vim by Jani Nurminen. Official Vim Zenburn home page: http://slinky.imukuppi.org/zenburnpage/ -Supported languages: All the languages supported by release 5.6.4 +Supported languages: All the languages supported by release 6.2.3 Created by: Jani Kesänen (jani dot kesanen gmail com) -Released: 12.01.2010 +Released: 25.01.2013 License: Feel free to modify this style and re-release it. This style is available under the terms of the GNU Free License. --> @@ -16,7 +16,7 @@ License: Feel free to modify this style and re-release it. This styl - toto titi + @@ -38,9 +38,7 @@ License: Feel free to modify this style and re-release it. This styl - - @@ -51,12 +49,11 @@ License: Feel free to modify this style and re-release it. This styl - - + @@ -70,7 +67,6 @@ License: Feel free to modify this style and re-release it. This styl - @@ -119,7 +115,7 @@ License: Feel free to modify this style and re-release it. This styl - ooooo + @@ -134,6 +130,42 @@ License: Feel free to modify this style and re-release it. This styl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -154,11 +186,11 @@ License: Feel free to modify this style and re-release it. This styl - the_ID the_post have_posts wp_link_pages the_content + - $_POST $_GET $_SESSION + @@ -168,6 +200,21 @@ License: Feel free to modify this style and re-release it. This styl + + + + + + + + + + + + + + + @@ -185,67 +232,16 @@ License: Feel free to modify this style and re-release it. This styl - - - - - alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window - XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - import - import - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -257,8 +253,8 @@ License: Feel free to modify this style and re-release it. This styl - - + + @@ -273,7 +269,6 @@ License: Feel free to modify this style and re-release it. This styl - @@ -379,7 +374,6 @@ License: Feel free to modify this style and re-release it. This styl - @@ -402,9 +396,9 @@ License: Feel free to modify this style and re-release it. This styl + - @@ -451,10 +445,10 @@ License: Feel free to modify this style and re-release it. This styl - ContentScroller + - onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + @@ -502,7 +496,6 @@ License: Feel free to modify this style and re-release it. This styl - @@ -585,7 +578,7 @@ License: Feel free to modify this style and re-release it. This styl - True False + @@ -593,7 +586,6 @@ License: Feel free to modify this style and re-release it. This styl - @@ -631,8 +623,8 @@ License: Feel free to modify this style and re-release it. This styl - if else for while - bool long int char + + @@ -653,9 +645,9 @@ License: Feel free to modify this style and re-release it. This styl + - @@ -697,14 +689,14 @@ License: Feel free to modify this style and re-release it. This styl - - - - + + + + @@ -738,7 +730,6 @@ License: Feel free to modify this style and re-release it. This styl - @@ -749,7 +740,6 @@ License: Feel free to modify this style and re-release it. This styl - @@ -766,12 +756,12 @@ License: Feel free to modify this style and re-release it. This styl - if else for while - bool long int char + + - + @@ -781,9 +771,9 @@ License: Feel free to modify this style and re-release it. This styl - if else for while - if else for while - bool long int char + + + @@ -792,9 +782,9 @@ License: Feel free to modify this style and re-release it. This styl - if else for while - bool long int char - bool long int char + + + @@ -804,27 +794,28 @@ License: Feel free to modify this style and re-release it. This styl - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 307de1f13..9579fc5e4 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -451,7 +451,7 @@ BEGIN MENUITEM "Document Map", IDM_VIEW_DOC_MAP - MENUITEM "Function List", IDM_VIEW_FUNC_LIST + //MENUITEM "Function List", IDM_VIEW_FUNC_LIST MENUITEM SEPARATOR MENUITEM "Synchronize Vertical Scrolling", IDM_VIEW_SYNSCROLLV MENUITEM "Synchronize Horizontal Scrolling", IDM_VIEW_SYNSCROLLH diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 009e51dc7..a16afc4d4 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -357,9 +357,14 @@ void FindReplaceDlg::fillFindHistory() ::SendDlgItemMessage(_hSelf, IDREDOTMATCHNL, BM_SETCHECK, findHistory._dotMatchesNewline, 0); if (findHistory._searchMode == FindHistory::regExpr) { - //regex doesnt allow wholeword + //regex doesn't allow wholeword ::SendDlgItemMessage(_hSelf, IDWHOLEWORD, BM_SETCHECK, BST_UNCHECKED, 0); ::EnableWindow(::GetDlgItem(_hSelf, IDWHOLEWORD), (BOOL)false); + + //regex upward search is disable in v6.3 due to a regression + ::SendDlgItemMessage(_hSelf, IDDIRECTIONDOWN, BM_SETCHECK, BST_CHECKED, 0); + ::SendDlgItemMessage(_hSelf, IDDIRECTIONUP, BM_SETCHECK, BST_UNCHECKED, 0); + ::EnableWindow(::GetDlgItem(_hSelf, IDDIRECTIONUP), (BOOL)false); } if (nppParams->isTransparentAvailable()) @@ -1047,14 +1052,20 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP bool isRegex = (_options._searchType == FindRegex); if (isRegex) { - //regex doesnt allow whole word + //regex doesn't allow whole word _options._isWholeWord = false; ::SendDlgItemMessage(_hSelf, IDWHOLEWORD, BM_SETCHECK, _options._isWholeWord?BST_CHECKED:BST_UNCHECKED, 0); + //regex upward search is disable in v6.3 due to a regression + ::SendDlgItemMessage(_hSelf, IDDIRECTIONDOWN, BM_SETCHECK, BST_CHECKED, 0); + ::SendDlgItemMessage(_hSelf, IDDIRECTIONUP, BM_SETCHECK, BST_UNCHECKED, 0); + _options._whichDirection = DIR_DOWN; } ::EnableWindow(::GetDlgItem(_hSelf, IDWHOLEWORD), (BOOL)!isRegex); - + + //regex upward search is disable in v6.3 due to a regression + ::EnableWindow(::GetDlgItem(_hSelf, IDDIRECTIONUP), (BOOL)!isRegex); return TRUE; } case IDWRAP : diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 51e5a2a0b..9cc0dac4d 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -29,12 +29,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.2.3") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.3") // 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("6.23\0") -#define VERSION_DIGITALVALUE 6, 2, 3, 0 +#define VERSION_VALUE TEXT("6.3\0") +#define VERSION_DIGITALVALUE 6, 3, 0, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")