Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BUG_FIXED] v4.2.1 : Fix regression bug : replace in selection bug.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@6 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2007-08-14 00:53:49 +00:00
parent 2322694649
commit a789174c0b
4 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/bin/change.log
View File

@ -1,4 +1,4 @@
v4.2 fixed bugs and added features (from v4.1.2) : v4.2.1 fixed bugs and added features (from v4.1.2) :
1. Fix the dockable dialog drag and drop problem under vista. 1. Fix the dockable dialog drag and drop problem under vista.
2. Add Column mode edition feature (Menu "Edit->Column Editor..."). 2. Add Column mode edition feature (Menu "Edit->Column Editor...").
@ -19,6 +19,6 @@ Plugins included in v4.2 :
4. NppExec v0.2 beta 4 4. NppExec v0.2 beta 4
5. Spell checker v1.1 5. Spell checker v1.1
6. Quick text v0.02 6. Quick text v0.02
7. Explorer v1.4 7. Light Explorer v1.4
8. Hex editor v0.84 8. Hex editor v0.84

13
PowerEditor/installer/nppSetup.nsi
View File

@ -17,13 +17,13 @@
; Define the application name ; Define the application name
!define APPNAME "Notepad++" !define APPNAME "Notepad++"
!define APPNAMEANDVERSION "Notepad++ v4.2" !define APPNAMEANDVERSION "Notepad++ v4.2.1"
; Main Install settings ; Main Install settings
Name "${APPNAMEANDVERSION}" Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\Notepad++" InstallDir "$PROGRAMFILES\Notepad++"
InstallDirRegKey HKLM "Software\${APPNAME}" "" InstallDirRegKey HKLM "Software\${APPNAME}" ""
OutFile "..\bin\npp.4.2.Installer.exe" OutFile "..\bin\npp.4.2.1.Installer.exe"
@ -644,9 +644,9 @@ SubSection "Plugins" Plugins
SectionEnd SectionEnd
Section "File Browser" FileBrowser Section "File Browser" FileBrowser
Delete "$INSTDIR\plugins\ExplorerPlugin.dll" Delete "$INSTDIR\plugins\LightExplorer.dll"
SetOutPath "$INSTDIR\plugins" SetOutPath "$INSTDIR\plugins"
File "..\bin\plugins\Explorer.dll" File "..\bin\plugins\LightExplorer.dll"
SectionEnd SectionEnd
Section "Hex Editor" HexEditor Section "Hex Editor" HexEditor
@ -844,9 +844,8 @@ SubSection un.Plugins
SectionEnd SectionEnd
Section un.FileBrowser Section un.FileBrowser
Delete "$INSTDIR\plugins\Explorer.dll" Delete "$INSTDIR\plugins\LightExplorer.dll"
Delete "$INSTDIR\plugins\Config\Explorer.ini" Delete "$INSTDIR\lightExplorer.ini"
RMDir "$INSTDIR\plugins\Config"
RMDir "$INSTDIR\plugins\" RMDir "$INSTDIR\plugins\"
SectionEnd SectionEnd

12
PowerEditor/src/Notepad_plus.rc
View File

@ -20,11 +20,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <windows.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define NOTEPAD_PLUS_VERSION "Notepad++ v4.2" #define NOTEPAD_PLUS_VERSION "Notepad++ v4.2.1"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 4, 2, 0, 0 FILEVERSION 4, 2, 1, 0
PRODUCTVERSION 4, 2, 0, 0 PRODUCTVERSION 4, 2, 1, 0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEFLAGS 0 FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
@ -41,12 +41,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Don HO don.h@free.fr\0" VALUE "CompanyName", "Don HO don.h@free.fr\0"
VALUE "FileDescription", "Notepad++ : a free (GNU) source code editor\0" VALUE "FileDescription", "Notepad++ : a free (GNU) source code editor\0"
VALUE "FileVersion", "4.1.2\0" VALUE "FileVersion", "4.2.1\0"
VALUE "InternalName", "npp.exe\0" VALUE "InternalName", "npp.exe\0"
VALUE "LegalCopyright", "Copyleft 1998-2006 by Don HO\0" VALUE "LegalCopyright", "Copyleft 1998-2006 by Don HO\0"
VALUE "OriginalFilename", "Notepad++.exe\0" VALUE "OriginalFilename", "Notepad++.exe\0"
VALUE "ProductName", "Notepad++\0" VALUE "ProductName", "Notepad++\0"
VALUE "ProductVersion", "4.1.2\0" VALUE "ProductVersion", "4.2.1\0"
END END
END END
END END
@ -395,7 +395,7 @@ BEGIN
POPUP "&Language" POPUP "&Language"
BEGIN BEGIN
MENUITEM "ADA", IDM_LANG_ADA MENUITEM "Ada", IDM_LANG_ADA
MENUITEM "ASP", IDM_LANG_ASP MENUITEM "ASP", IDM_LANG_ASP
MENUITEM "Assembler", IDM_LANG_ASM MENUITEM "Assembler", IDM_LANG_ASM
MENUITEM "AutoIt", IDM_LANG_AU3 MENUITEM "AutoIt", IDM_LANG_AU3

26
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -398,14 +398,6 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
} }
return TRUE; return TRUE;
/*case IDD_FINDINFILES_GOBACK_BUTTON :
doDialog(FIND_DLG);
return TRUE;
case IDC_GETCURRENTDOCTYPE :
*((LangType *)lParam) = (*_ppEditView)->getCurrentDocType();
return TRUE;*/
case IDCMARKALL : case IDCMARKALL :
{ {
if (_currentStatus == FIND_DLG) if (_currentStatus == FIND_DLG)
@ -521,7 +513,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
case IDC_IN_SELECTION_CHECK : case IDC_IN_SELECTION_CHECK :
{ {
if (_currentStatus == FIND_DLG) if (_currentStatus == REPLACE_DLG)
_isInSelection = isCheckedOrNot(IDC_IN_SELECTION_CHECK); _isInSelection = isCheckedOrNot(IDC_IN_SELECTION_CHECK);
} }
return TRUE; return TRUE;
@ -562,24 +554,8 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
if ((strlen(directory) > 0) && (directory[strlen(directory)-1] != '\\')) if ((strlen(directory) > 0) && (directory[strlen(directory)-1] != '\\'))
_directory += "\\"; _directory += "\\";
//::SendMessage(_hParent, WM_COMMAND, IDC_FINDINFILES_LAUNCH, 0);
updateCombo(IDFINDWHAT); updateCombo(IDFINDWHAT);
// thread to launch :
findAllIn(FILES_IN_DIR); findAllIn(FILES_IN_DIR);
//Thread
//HANDLE hEvent = ::CreateEvent(NULL, FALSE, FALSE, "findInFilesEvent");
//--HANDLE hFindInFilesThread = ::CreateThread(NULL, 0, staticFindInFilesFunc, this, 0, NULL);
//::WaitForSingleObject(hEvent, INFINITE);
//::CloseHandle(hFindInFilesThread);
//::CloseHandle(hEvent);
//::MessageBox(NULL, "Fin de thread", "", MB_OK);
//display(false);
} }
} }