diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 7c06afe98..15db61323 100644 --- a/PowerEditor/bin/change.log +++ b/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: diff --git a/PowerEditor/bin/license.txt b/PowerEditor/bin/license.txt index caa7e6e21..8902bcdcd 100644 --- a/PowerEditor/bin/license.txt +++ b/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 ********************** * * diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index 1e8efed1d..92690ec54 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml index c108f43cc..2e203bdbf 100644 --- a/PowerEditor/installer/nativeLang/finnish.xml +++ b/PowerEditor/installer/nativeLang/finnish.xml @@ -1,7 +1,7 @@ @@ -34,9 +34,9 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 - + - + @@ -49,7 +49,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 - + @@ -225,6 +225,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + @@ -336,6 +337,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + @@ -511,6 +513,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + @@ -638,6 +641,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 + @@ -700,26 +704,32 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 - + - + + + - + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index ef06ff24c..66fcd578a 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -1,27 +1,37 @@ -;this file is part of installer for Notepad++ -;Copyright (C)2006 Don HO +; this file is part of installer for Notepad++ +; Copyright (C)2006 Don HO ; -;This program is free software; you can redistribute it and/or -;modify it under the terms of the GNU General Public License -;as published by the Free Software Foundation; either -;version 2 of the License, or (at your option) any later version. +; This program is free software; you can redistribute it and/or +; modify it under the terms of the GNU General Public License +; as published by the Free Software Foundation; either +; version 2 of the License, or (at your option) any later version. ; -;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. +; 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: +; 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 -;along with this program; if not, write to the Free Software -;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +; 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. +; +; 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 diff --git a/PowerEditor/license.txt b/PowerEditor/license.txt index caa7e6e21..bcd93044a 100644 --- a/PowerEditor/license.txt +++ b/PowerEditor/license.txt @@ -1,35 +1,20 @@ -/*************************************************************************** - * COPYING -- Describes the terms under which Notepad++ is distributed. * - * A copyof the GNU GPL is appended to this file. * - * * - ****************** IMPORTANT NOTEPAD++ LICENSE TERMS ********************** - * * - * Copyright (C)2003 Don HO . 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. * - * * - * 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: * - * 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. * - * * - ***************************************************************************/ +COPYING -- Describes the terms under which Notepad++ is distributed. +A copy of the GNU GPL is appended to this file. + +IMPORTANT NOTEPAD++ LICENSE TERMS + +Copyright (C)2003 Don HO . 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. + +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: +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 diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index e7b2818c0..f360bf1f4 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/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."} +//{"", ""}, //{"", ""}, //{"", ""}, }; diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 69933e2e2..89f65958a 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.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_DIGITALVALUE 6, 1, 0, 0 +#define VERSION_VALUE TEXT("6.11\0") +#define VERSION_DIGITALVALUE 6, 1, 1, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")