From 9418974c8735d8bff02e61635576899227253018 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 27 Jul 2014 22:54:02 +0000 Subject: [PATCH] [RELEASE] Notepad++ 6.6.8 Release. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1267 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/bin/change.log | 12 +- PowerEditor/installer/nativeLang/chinese.xml | 2 +- .../nativeLang/chineseSimplified.xml | 8 +- PowerEditor/installer/nativeLang/english.xml | 2 +- PowerEditor/installer/nativeLang/french.xml | 2 +- PowerEditor/installer/nativeLang/german.xml | 152 +++++- PowerEditor/installer/nativeLang/russian.xml | 10 +- PowerEditor/installer/nativeLang/swedish.xml | 39 +- PowerEditor/installer/nppSetup.nsi | 4 +- PowerEditor/installer/themes/Twilight.xml | 505 +++++++++--------- PowerEditor/installer/themes/Zenburn.xml | 59 +- PowerEditor/src/Notepad_plus.cpp | 2 +- .../src/WinControls/Preference/preference.rc | 2 +- PowerEditor/src/resource.h | 6 +- 14 files changed, 478 insertions(+), 327 deletions(-) diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index e6af2efb1..b0214fab4 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,7 +1,13 @@ -Notepad++ v6.6.7 new feature and bug fixes: +Notepad++ v6.6.8 new feature and bug fixes: -1. Settings on cloud - OneDrive. -2. Fix the crash issue on start up for some context. +1. Settings on cloud - Google Drive. +2. Fix Settings on cloud - OneDrive detection error. +3. Make internal docking dialogs apply the selected theme's background and foreground colours. +4. Fix the bug that "backslash is escape char for SQL" setting is not saved correctly. +5. Fix the bug that user cannot disable "backslash is SQL escape char" without restarting. +6. Fix DocMap's syntax highlighting doesn't update while current doc apply a new syntax highlighting. +7. Add 2 new plugins APIs: NPPM_GETEDITORDEFAULTBACKGROUNDCOLOR & NPPM_GETEDITORDEFAULTFOREGROUNDCOLOR +8. Add new notification NPPN_SNAPSHOTDIRTYFILELOADED to notify plugins that a snapshot dirty file is loaded on startup. Included plugins: diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index 542b200a4..1617f87fa 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml index 5d22d6fe6..cb9f38b9c 100644 --- a/PowerEditor/installer/nativeLang/chineseSimplified.xml +++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml @@ -672,10 +672,10 @@ - - - - + + + + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 8878e2d8c..090b55f02 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index c69987205..8427f05f9 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml index 011d4ab70..9df6c3f2f 100644 --- a/PowerEditor/installer/nativeLang/german.xml +++ b/PowerEditor/installer/nativeLang/german.xml @@ -1,9 +1,17 @@ + + @@ -25,7 +33,9 @@ + + @@ -46,6 +56,7 @@ + @@ -80,6 +91,7 @@ + @@ -88,6 +100,9 @@ + + + @@ -121,8 +136,8 @@ - - + + @@ -143,6 +158,10 @@ + + + + @@ -192,6 +211,7 @@ + @@ -221,7 +241,18 @@ - + + + + + + + + + + + + @@ -245,12 +276,11 @@ - - + @@ -262,6 +292,7 @@ +
@@ -284,6 +315,10 @@ + + + + @@ -450,7 +485,7 @@ - + @@ -585,16 +620,24 @@ - + - + + + + + + + + + - + @@ -617,7 +660,16 @@ + + + + + + + + + @@ -627,6 +679,7 @@ + @@ -697,7 +750,6 @@ - @@ -707,7 +759,7 @@ - + @@ -718,16 +770,30 @@ - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -736,7 +802,21 @@ - + + + + + + + + + + + + + + + @@ -771,6 +851,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index ef2247ad2..2f31a0d36 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -154,7 +154,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -367,7 +367,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -642,7 +642,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml index f6d07ba3d..3cc674b9f 100644 --- a/PowerEditor/installer/nativeLang/swedish.xml +++ b/PowerEditor/installer/nativeLang/swedish.xml @@ -1,6 +1,6 @@ - +
@@ -302,14 +302,14 @@
- + - - - - - - + + + + + + @@ -321,9 +321,9 @@ - - - + + + @@ -591,6 +591,7 @@ + @@ -702,7 +703,6 @@ - @@ -720,14 +720,22 @@ + + + + + + + + @@ -760,6 +768,13 @@ + + + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index c36b3a06e..7777cee06 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.6.7" +!define APPVERSION "6.6.8" !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 6 -!define VERSION_MINOR 67 +!define VERSION_MINOR 68 !define APPWEBSITE "http://notepad-plus-plus.org/" diff --git a/PowerEditor/installer/themes/Twilight.xml b/PowerEditor/installer/themes/Twilight.xml index edf82ad6b..f65672b1a 100644 --- a/PowerEditor/installer/themes/Twilight.xml +++ b/PowerEditor/installer/themes/Twilight.xml @@ -3,6 +3,7 @@ Twilight Copyright (c) 2008 Fabio Zendhi Nagao + 2011-2014 Renato Silva Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -152,12 +153,12 @@ Credits: - - - - - - + + + + + + @@ -231,13 +232,13 @@ Credits: - - + + - - - - + + + + @@ -295,11 +296,11 @@ Credits: - - - - - + + + + + @@ -329,23 +330,23 @@ Credits: - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + @@ -379,20 +380,20 @@ Credits: - - - - - - + + + + + + - - - - - - + + + + + + @@ -400,27 +401,27 @@ Credits: - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + @@ -434,13 +435,13 @@ Credits: - - + + - - - - + + + + @@ -460,54 +461,54 @@ Credits: - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + raise - + @@ -515,30 +516,30 @@ Credits: - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -548,48 +549,48 @@ Credits: - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -607,59 +608,59 @@ Credits: - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -674,31 +675,31 @@ Credits: - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -707,18 +708,18 @@ Credits: - - - - - - - - - - - - + + + + + + + + + + + + @@ -743,21 +744,21 @@ Credits: - - - - - - - + + + + + + + - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml index 6a1997fbc..a937b3f5e 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 6.2.3 +Supported languages: All the languages supported by release 6.6.6 Created by: Jani Kesänen (jani dot kesanen gmail com) -Released: 25.01.2013 +Released: 18.06.2014 License: Feel free to modify this style and re-release it. This style is available under the terms of the GNU Free License. --> @@ -200,21 +200,6 @@ License: Feel free to modify this style and re-release it. This styl - - - - - - - - - - - - - - - @@ -232,6 +217,43 @@ License: Feel free to modify this style and re-release it. This styl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -803,7 +825,7 @@ License: Feel free to modify this style and re-release it. This styl - + @@ -816,5 +838,6 @@ License: Feel free to modify this style and re-release it. This styl + diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 617bce302..198fb675f 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -5358,7 +5358,7 @@ Quote quotes[nbQuote] = { {"Anonymous #33", "Programmer - an organism that turns coffee into software."}, {"Anonymous #34", "It's not a bug - it's an undocumented feature."}, {"Anonymous #35", "Should array index start at 0 or 1?\nMy compromised solution is 0.5"}, -{"Anonymous #36", "Every single time when I'm about to hug someone extremely sexy, I hit the miror."}, +{"Anonymous #36", "Every single time when I'm about to hug someone extremely sexy, I hit the mirror."}, {"Anonymous #37", "My software never has bugs. It just develops random features."}, {"Anonymous #38", "LISP = Lots of Irritating Silly Parentheses."}, {"Anonymous #39", "Perl, the only language that looks the same before and after RSA encryption."}, diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index ebe67f0c2..38399e91b 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -302,7 +302,7 @@ BEGIN CONTROL "Simple backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,104,104,111,10 CONTROL "Verbose backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,104,117,111,10 GROUPBOX "Custom Backup Directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,95,135,260,40 - CONTROL "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,132,8,10 + CONTROL "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,135,8,10 RTEXT "Directory :",IDD_BACKUPDIR_STATIC,99,152,40,8 EDITTEXT IDC_BACKUPDIR_EDIT,146,150,179,14,ES_AUTOHSCROLL PUSHBUTTON "...",IDD_BACKUPDIR_BROWSE_BUTTON,332,150,16,14 diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 3d85fa126..88c3f8f8c 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.6.7") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.6.8") // 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.67\0") -#define VERSION_DIGITALVALUE 6, 6, 7, 0 +#define VERSION_VALUE TEXT("6.68\0") +#define VERSION_DIGITALVALUE 6, 6, 8, 0 #ifndef IDC_STATIC #define IDC_STATIC -1