[RELEASE] Notepad++ 6.1.1 release

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@897 f5eea248-9336-0410-98b8-ebc06183d4e3

PowerEditor/bin/change.log

@@ -1,10 +1,10 @@
-Notepad++ v6.1 fixed bugs:
+Notepad++ v6.1.1 modification and fixed bugs:
+
+1.  Enhance project's license (GPL) to avoid the other malicious websites bundle Notepad++ release with their parasite software.
+2.  Fix selectAll-copy-paste on the same document crash bug while document map has been activated.
+3.  Fix a regression about auto-completion feature.
+4.  Fix focus on document map problem after its launch.
 
-1.  Fix search/replace bug while Doc Map is opened.
-2.  Fix User Defined Language syntax highlighting problem while Doc Map is opened.
-3.  Fix Chinese characters showing problem while Doc Map is opened.
-4.  The old behaviour of comment/uncomment w/o selection is restored.
-5.  Fix selecting all the text in doc map while clicking on doc map dialog caption.
 
 Included plugins:
 

PowerEditor/bin/license.txt

@@ -1,6 +1,6 @@
 /***************************************************************************
  * COPYING -- Describes the terms under which Notepad++ is distributed.    *
- * A copyof the GNU GPL is appended to this file.                          *
+ * A copy of the GNU GPL is appended to this file.                         *
  *                                                                         *
  ****************** IMPORTANT NOTEPAD++ LICENSE TERMS **********************
  *                                                                         *

PowerEditor/installer/nativeLang/finnish.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <!--
-Suomenkielinen lokalisointi Notepad++ 5.9.6.2 / Finnish localization
+Suomenkielinen lokalisointi Notepad++ 6.0.0 / Finnish localization
-Viimeisin muokkaaja: Teijo, 15-11-2011 21:15
+Viimeisin muokkaaja: Teijo, 11-04-2012 19:15
 Lähetä käännösvirhehavaintosi ja korjausehdotuksesi osoitteeseen teijo(at)nic.fi
 Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
 -->
@@ -34,9 +34,9 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
                     <Item posX="1" posY="12" name="Rivitoiminnot"/>
                     <Item posX="1" posY="13" name="Kommentit"/>
                     <Item posX="1" posY="14" name="Automaattiset täydennykset"/> 
-					<Item posX="1" posY="15" name="Rivin loppumerkit (EOL)"/>
+			<Item posX="1" posY="15" name="Rivin loppumerkit (EOL)"/>
                     <Item posX="1" posY="16" name="Välilyöntien käsittely"/>					
-					<Item posX="1" posY="17" name="Liitä erikoistekstiä"/>
+			<Item posX="1" posY="17" name="Liitä erikoistekstiä"/>
 					
                     <Item posX="2" posY="16" name="Samanlaisten korostaminen"/>
                     <Item posX="2" posY="17" name="Korostusten poistaminen"/>
@@ -49,7 +49,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
                     <Item posX="3" posY="6" name="Näkymät ja istunnot"/>
                     <Item posX="3" posY="16" name="Sulje lohkot tasolle"/>
                     <Item posX="3" posY="17" name="Avaa lohkot tasolle"/>
-					<Item posX="3" posY="21" name="Projekti" />		
+			<Item posX="3" posY="21" name="Projekti" />		
 
                     <Item posX="4" posY="5" name="Merkistökoodaus"/>
                     <Item posX="4" posY="5"  posZ="0"  name="Arabialainen"/>
@@ -225,6 +225,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
 <Item id="44042" name="Piilota rivit"/>
 <Item id="44049" name="Tiedoston tilastotiedot"/>
 <Item id="44072" name="Aktivoi viereinen näkymä"/>
+<Item id="44080" name="Asiakirjakartta"/>
 <Item id="44081" name="Projekti-ikkuna 1"/>
 <Item id="44082" name="Projekti-ikkuna 2"/>
 <Item id="44083" name="Projekti-ikkuna 3"/>
@@ -336,6 +337,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
 <Item id="1686" name="Läpinäkyvyys"/>
 <Item id="1687" name="Passiivisena"/>
 <Item id="1688" name="Aina"/>
+<!-- <Item id="1703" name="&amp;. significa 'a capo'"/> -->
 </Find>
 
 <GoToLine title="Siirtyminen kohtaan">
@@ -511,6 +513,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
 <Item id="6228" name="Oletus"/>
 <Item id="6229" name="Tasattu"/>
 <Item id="6230" name="Sisennetty"/>
+<Item id="6231" name="Reunaleveys"/> 
 
 <Item id="6301" name="Sarkain"/>
 <Item id="6302" name="Korvaa välilyönneillä"/>
@@ -638,6 +641,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
 <Item id="6813" name=":stä merkistä"/>
 <Item id="6814" name="Kelpaavat arvot: 1 - 9"/>
 <Item id="6815" name="Näytä funktioiden parametrivihjeet"/>
+
 </Backup>
 
 </Preference>
@@ -700,26 +704,32 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520
 					<Item id="3125" name="Tallenna"/>
 					<Item id="3126" name="Tallenna nimellä..."/>
 					<Item id="3127" name="Tallenna kopio..."/>
-					<Item id="3121" name="Lisää uusi projekti"/>
+					<Item id="3121" name="Lisää projekti"/>
 				</WorkspaceMenu>
 				<ProjectMenu>
 					<Item id="3111" name="Nimeä uudelleen"/>
 					<Item id="3112" name="Lisää kansio"/>
 					<Item id="3113" name="Lisää tiedostot..."/>
 					<Item id="3114" name="Poista"/>
-		<!-- 			<Item id="3117" name="Lisää tiedostot kansiosta.. ***"/> -->
+		 			<Item id="3117" name="Lisää tiedostot kansiosta... "/> 
+					<Item id="3118" name="Siirrä ylös"/>
+					<Item id="3119" name="Siirrä alas"/>
 				</ProjectMenu>
 				<FolderMenu>
 					<Item id="3111" name="Nimeä uudelleen"/>
 					<Item id="3112" name="Lisää kansio"/>
 					<Item id="3113" name="Lisää tiedostot..."/>
 					<Item id="3114" name="Poista"/>
-		<!-- 			<Item id="3117" name="Lisää tiedostot kansiosta.. ***"/> -->
+		 			<Item id="3117" name="Lisää tiedostot kansiosta... "/> 
+					<Item id="3118" name="Siirrä ylös"/>
+					<Item id="3119" name="Siirrä alas"/>
 				</FolderMenu>
 				<FileMenu>
 					<Item id="3111" name="Nimeä uudelleen"/>
 					<Item id="3115" name="Poista"/>
 					<Item id="3116" name="Muokkaa kansiopolkua"/>
+					<Item id="3118" name="Siirrä ylös"/>
+					<Item id="3119" name="Siirrä alas"/>
 				</FileMenu>
 			</Menus>
 		</ProjectManager>

PowerEditor/installer/nppSetup.nsi

@@ -1,27 +1,37 @@
-;this file is part of installer for Notepad++
+; this file is part of installer for Notepad++
-;Copyright (C)2006 Don HO <don.h@free.fr>
+; Copyright (C)2006 Don HO <don.h@free.fr>
 ;
-;This program is free software; you can redistribute it and/or
+; This program is free software; you can redistribute it and/or
-;modify it under the terms of the GNU General Public License
+; modify it under the terms of the GNU General Public License
-;as published by the Free Software Foundation; either
+; as published by the Free Software Foundation; either
-;version 2 of the License, or (at your option) any later version.
+; version 2 of the License, or (at your option) any later version.
 ;
-;This program is distributed in the hope that it will be useful,
+; Note that the GPL places important restrictions on "derived works", yet
-;but WITHOUT ANY WARRANTY; without even the implied warranty of
+; it does not provide a detailed definition of that term.  To avoid      
-;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; misunderstandings, we consider an application to constitute a          
-;GNU General Public License for more details.
+; "derivative work" for the purpose of this license if it does any of the
+; following:                                                             
+; 1. Integrates source code from Notepad++.
+; 2. Integrates/includes/aggregates Notepad++ into a proprietary executable
+;    installer, such as those produced by InstallShield.
+; 3. Links to a library or executes a program that does any of the above.
 ;
-;You should have received a copy of the GNU General Public License
+; This program is distributed in the hope that it will be useful,
-;along with this program; if not, write to the Free Software
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+; 
+; You should have received a copy of the GNU General Public License
+; along with this program; if not, write to the Free Software
+; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "6.1"
+!define APPVERSION "6.1.1"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 1
+!define VERSION_MINOR 11
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
@@ -1048,6 +1058,7 @@ SectionGroup "Themes" Themes
 	Section "Solarized" Solarized
 		SetOutPath "$INSTDIR\themes"
 		File ".\themes\Solarized.xml"
+	SectionEnd
 
 	Section "Solarized Light" Solarized-light
 		SetOutPath "$INSTDIR\themes"
@@ -1384,7 +1395,16 @@ SectionGroup un.Themes
 	
 	Section un.Zenburn
 		Delete "$INSTDIR\themes\Zenburn.xml"
-	SectionEnd	
+	SectionEnd
+
+	Section un.Solarized
+		Delete "$INSTDIR\themes\Solarized.xml"
+	SectionEnd
+
+	Section un.Solarized-light
+		Delete "$INSTDIR\themes\Solarized-light.xml"
+	SectionEnd
+
 SectionGroupEnd
 
 SectionGroup un.localization

PowerEditor/license.txt

@@ -1,35 +1,20 @@
-/***************************************************************************
+COPYING -- Describes the terms under which Notepad++ is distributed.
- * COPYING -- Describes the terms under which Notepad++ is distributed.    *
+A copy of the GNU GPL is appended to this file.
- * A copyof the GNU GPL is appended to this file.                          *
+
- *                                                                         *
+IMPORTANT NOTEPAD++ LICENSE TERMS
- ****************** IMPORTANT NOTEPAD++ LICENSE TERMS **********************
+
- *                                                                         *
+Copyright (C)2003 Don HO <don.h@free.fr>.  This program is free software; you may redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; Version 2 with the clarifications and exceptions described below. This guarantees your right to use, modify, and redistribute this software under certain conditions.
- * Copyright (C)2003 Don HO <don.h@free.fr>.  This program is free         *
+
- * software; you may redistribute and/or modify it under the terms of the  *
+Note that the GPL places important restrictions on "derived works", yet it does not provide a detailed definition of that term.  To avoid misunderstandings, we consider an application to constitute a "derivative work" for the purpose of this license if it does any of the following:
- * GNU General Public License as published by the Free Software            *
+1. Integrates source code from Notepad++.
- * Foundation; Version 2 with the clarifications and exceptions described  *
+2. Integrates/includes/aggregates Notepad++ into a proprietary executable installer, such as those produced by InstallShield.
- * below. This guarantees your right to use, modify, and redistribute      *
+3. Links to a library or executes a program that does any of the above.
- * this software under certain conditions.                                 *
+
- *                                                                         *
+Our interpretation applies only to Notepad++ - we don't speak for other people's GPL works.
- * Note that the GPL places important restrictions on "derived works", yet *
+
- * it does not provide a detailed definition of that term.  To avoid       *
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- * misunderstandings, we consider an application to constitute a           *
+
- * "derivative work" for the purpose of this license if it does any of the *
+******************************************************************
- * following:                                                              *
- * 1. Integrates source code from Notepad++.                               *
- * 2. Integrates/includes/aggregates Notepad++ into a proprietary          *
- *    executable installer, such as those produced by InstallShield.       *
- * 3. Links to a library or executes a program that does any of the above. *
- *                                                                         *
- * Our interpretation applies only to Notepad++ - we don't speak for other *
- * people's GPL works.                                                     *
- *                                                                         *
- * This program is distributed in the hope that it will be useful, but     *
- * WITHOUT ANY WARRANTY; without even the implied warranty of              *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *
- * GNU General Public License for more details.                            *
- *                                                                         *
- ***************************************************************************/
 
 
 GNU GENERAL PUBLIC LICENSE

PowerEditor/src/Notepad_plus.cpp

@@ -4838,7 +4838,7 @@ struct Quote{
 	const char *_quote;
 };
 
-const int nbQuote = 54;
+const int nbQuote = 55;
 Quote quotes[nbQuote] = {
 {"Notepad++", "Notepad++ is written in C++ and uses pure Win32 API and STL which ensures a higher execution speed and smaller program size.\nBy optimizing as many routines as possible without losing user friendliness, Notepad++ is trying to reduce the world carbon dioxide emissions. When using less CPU power, the PC can throttle down and reduce power consumption, resulting in a greener environment."},
 {"Martin Golding", "Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live."},
@@ -4893,7 +4893,9 @@ Quote quotes[nbQuote] = {
 {"Anonymous #24", "I'm not saying I hate her.\nI just hope she gets fingered by wolverine"},
 {"Anonymous #25", "In a way, I feel sorry for the kids of this generation.\nThey'll have parents who know how to check browser history."},
 {"Anonymous #26", "I would nerver bungee jump...\nI came into this world because of a broken rubber, and I'm not going out cause of one..."},
-{"Anonymous #26", "I'm no gynecologist, but I know a cunt when I see one."}
+{"Anonymous #27", "I'm no gynecologist, but I know a cunt when I see one."},
+{"Anonymous #28", "Why 6 afraid of 7?\nBecause 7 8 9 (seven ate nine) while 6 and 9 were flirting."}
+//{"", ""},
 //{"", ""},
 //{"", ""},
 };

PowerEditor/src/resource.h

@@ -29,12 +29,12 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.1")
 
 // 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.1\0")
+#define VERSION_VALUE TEXT("6.11\0")
-#define VERSION_DIGITALVALUE 6, 1, 0, 0
+#define VERSION_DIGITALVALUE 6, 1, 1, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")