[RELEASE] Notepad++ v5.9.4 release

- Notepad-plus svn trunk @ 826
npp-community · Oct 10, 2011 · 6d7ccc0 · 6d7ccc0
1 parent bffadd5
commit 6d7ccc0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
@@ -2,9 +2,10 @@ Notepad++ v5.9.4 new features and fixed bugs:
 
 1.  Add 3 Project Panels for the management of projects
 2.  Doc Switcher can be sorted now.
-3.  Fix crash issue while printing for some printers.
-4.  Fix ANSI version Clipboard history entries display bug.
-5.  Fix wrong display of tab number setting dialog in Lang Menu/Tab settings of Preferences dialog.
+3.  Fix a crash bug - crash on launch time if default User defined language was set on the previous session.
+4.  Fix crash issue while printing for some printers.
+5.  Fix ANSI version Clipboard history entries display bug.
+6.  Fix wrong display of tab number setting dialog in Lang Menu/Tab settings of Preferences dialog.
 
 
 

diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
@@ -52,7 +52,7 @@ BOOL CALLBACK ProjectPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPar
 								   0,0,0,0,_hSelf,(HMENU)0, _hInst, NULL);
 			TBBUTTON tbButtons[2];
 
-			static TCHAR *projectMenuStr = TEXT("WorkSpace");
+			static TCHAR *projectMenuStr = TEXT("Workspace");
 			tbButtons[0].idCommand = IDB_PROJECT_BTN;
 			tbButtons[0].iBitmap = I_IMAGENONE;
 			tbButtons[0].fsState = TBSTATE_ENABLED;
@@ -130,11 +130,11 @@ void ProjectPanel::checkIfNeedSave(const TCHAR *title)
 	if (_isDirty)
 	{
 		display();
-		int res = ::MessageBox(_hSelf, TEXT("The work space was modified. Do you want to save the it?"), title, MB_YESNO | MB_ICONQUESTION);
+		int res = ::MessageBox(_hSelf, TEXT("The workspace was modified. Do you want to save it?"), title, MB_YESNO | MB_ICONQUESTION);
 		if (res == IDYES)
 		{
 			if (!saveWorkSpace())
-				::MessageBox(_hSelf, TEXT("Your work space was not saved."), title, MB_OK | MB_ICONERROR);
+				::MessageBox(_hSelf, TEXT("Your workspace was not saved."), title, MB_OK | MB_ICONERROR);
 		}
 		//else if (res == IDNO)
 			// Don't save so do nothing here
@@ -144,9 +144,9 @@ void ProjectPanel::checkIfNeedSave(const TCHAR *title)
 void ProjectPanel::initMenus()
 {
 	_hWorkSpaceMenu = ::CreatePopupMenu();
-	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWWS, TEXT("New WorkSpace"));
-	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_OPENWS, TEXT("Open WorkSpace"));
-	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RELOADWS, TEXT("Reload WorkSpace"));
+	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWWS, TEXT("New Workspace"));
+	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_OPENWS, TEXT("Open Workspace"));
+	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RELOADWS, TEXT("Reload Workspace"));
 	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEWS, TEXT("Save"));
 	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEASWS, TEXT("Save As..."));
 	::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEACOPYASWS, TEXT("Save a Copy As..."));
@@ -265,7 +265,7 @@ bool ProjectPanel::openWorkSpace(const TCHAR *projectFileName)
 
 	_workSpaceFilePath = projectFileName;
 
-	HTREEITEM rootItem = _treeView.addItem(TEXT("Work Space"), TVI_ROOT, INDEX_CLEAN_ROOT);
+	HTREEITEM rootItem = _treeView.addItem(TEXT("Workspace"), TVI_ROOT, INDEX_CLEAN_ROOT);
 
 	for ( ; childNode ; childNode = childNode->NextSibling(TEXT("Project")))
 	{
@@ -281,7 +281,7 @@ bool ProjectPanel::openWorkSpace(const TCHAR *projectFileName)
 
 void ProjectPanel::newWorkSpace()
 {
-  _treeView.addItem(TEXT("Work Space"), TVI_ROOT, INDEX_CLEAN_ROOT);
+  _treeView.addItem(TEXT("Workspace"), TVI_ROOT, INDEX_CLEAN_ROOT);
   setWorkSpaceDirty(false);
   _workSpaceFilePath = TEXT("");
 }
@@ -718,7 +718,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
 		{
 			if (_isDirty)
 			{
-				int res = ::MessageBox(_hSelf, TEXT("The current work space was modified. Do you want to save the current project?"), TEXT(""), MB_YESNOCANCEL | MB_ICONQUESTION | MB_APPLMODAL);
+				int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Do you want to save the current project?"), TEXT(""), MB_YESNOCANCEL | MB_ICONQUESTION | MB_APPLMODAL);
 				if (res == IDYES)
 				{
 					if (!saveWorkSpace())
@@ -730,7 +730,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
 				}
 				else if (res == IDCANCEL)
 				{
-					// User cancels action "New WorkSpace" so we interrupt here
+					// User cancels action "New Workspace" so we interrupt here
 					return;
 				}
 			}
@@ -766,7 +766,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
 		{
 			if (_isDirty)
 			{
-				int res = ::MessageBox(_hSelf, TEXT("The current work space was modified. Do you want to save the current project?"), TEXT(""), MB_YESNOCANCEL | MB_ICONQUESTION | MB_APPLMODAL);
+				int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Do you want to save the current project?"), TEXT(""), MB_YESNOCANCEL | MB_ICONQUESTION | MB_APPLMODAL);
 				if (res == IDYES)
 				{
 					if (!saveWorkSpace())
@@ -778,7 +778,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
 				}
 				else if (res == IDCANCEL)
 				{
-					// User cancels action "New WorkSpace" so we interrupt here
+					// User cancels action "New Workspace" so we interrupt here
 					return;
 				}
 			}
@@ -798,7 +798,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
 		{
 			if (_isDirty)
 			{
-				int res = ::MessageBox(_hSelf, TEXT("The current work space was modified. Reload will discard all modification.\rDo you want to continue?"), TEXT(""), MB_YESNO | MB_ICONQUESTION | MB_APPLMODAL);
+				int res = ::MessageBox(_hSelf, TEXT("The current workspace was modified. Reload will discard all modification.\rDo you want to continue?"), TEXT(""), MB_YESNO | MB_ICONQUESTION | MB_APPLMODAL);
 				if (res == IDYES)
 				{
 					// Do nothing

diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.rc b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.rc
@@ -26,7 +26,7 @@ EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
 CAPTION "Project"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-	CONTROL    "",ID_PROJECTTREEVIEW,"SysTreeView32",      TVS_HASBUTTONS | TVS_EDITLABELS |  TVS_INFOTIP | TVS_HASLINES | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,172,93
+	CONTROL    "",ID_PROJECTTREEVIEW,"SysTreeView32",      TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS |  TVS_INFOTIP | TVS_HASLINES | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,172,93
 END
 
 IDD_FILERELOCALIZER_DIALOG DIALOGEX 0, 0, 350, 48