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

Back to the regular release mode.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1329 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2015-02-01 16:41:08 +00:00
parent b09a7c17f3
commit a7074ee7b9
7 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PowerEditor/bin/updater/gpup.exe
View File

Binary file not shown.

7
PowerEditor/installer/nppSetup.nsi
View File

@ -28,10 +28,10 @@
; Define the application name
!define APPNAME "Notepad++"
!define APPVERSION "6.7.4"
!define APPVERSION "6.7.5"
!define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
!define VERSION_MAJOR 6
!define VERSION_MINOR 74
!define VERSION_MINOR 75
!define APPWEBSITE "http://notepad-plus-plus.org/"
@ -150,8 +150,7 @@ FunctionEnd
Function LaunchNpp
;Exec '"$INSTDIR\notepad++.exe" "$INSTDIR\change.log" '
Exec '"$INSTDIR\notepad++.exe" -e#JeSuisCharlie '
Exec '"$INSTDIR\notepad++.exe" "$INSTDIR\change.log" '
FunctionEnd
; Modern interface settings

4
PowerEditor/src/Notepad_plus.cpp
View File

@ -5487,7 +5487,7 @@ struct Quote{
const char *_quote;
};
const int nbQuote = 202;
const int nbQuote = 203;
Quote quotes[nbQuote] = {
{"Notepad++", "Good programmers use Notepad++ to code.\nExtreme programmers use MS Word to code, in Comic Sans, center aligned."},
{"Martin Golding", "Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live."},
@ -5665,7 +5665,7 @@ Quote quotes[nbQuote] = {
{"Anonymous #144", "I don't want to sound like a badass but...\nI eject my USB drive without removing it safely."},
{"Anonymous #145", "feet (noun)\na device used for finding legos in the dark"},
{"Anonymous #146", "Buy a sheep\nName it \"Relation\"\nNow you have a Relationsheep\n"},
//{"Anonymous #147", ""},
{"Anonymous #147", "I dig, you dig, we dig,\nhe dig, she dig, they dig...\n\nIt's not a beautiful poem,\nbut it's very deep."},
{"Anonymous #148", "UNIX command line Russian roulette:\n[ $[ $RANDOM % 6 ] == 0 ] && rm -rf /* || echo *Click*"},
{"Anonymous #149", "unzip, strip, top, less, touch, finger, grep, mount, fsck, more, yes, fsck, fsck, fsck, umount, sleep.\n\nNo, it's not porn. It's Unix."},
{"Anonymous #150", "To understand what recursion is, you must first understand recursion."},

6
PowerEditor/src/Notepad_plus.rc
View File

@ -63,7 +63,7 @@ END
// remains consistent on all systems.
IDI_M30ICON ICON "icons\\npp.ico"
IDI_CHAMELEON ICON "icons\\chameleon.ico"
IDI_JESUISCHARLIE ICON "icons\\Je_suis_Charlie.ico"
//IDI_JESUISCHARLIE ICON "icons\\Je_suis_Charlie.ico"
IDI_NEW_OFF_ICON ICON "icons\\new_off.ico"
IDI_OPEN_OFF_ICON ICON "icons\\open_off.ico"
IDI_SAVE_OFF_ICON ICON "icons\\save_off.ico"
@ -870,8 +870,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU
FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1
BEGIN
EDITTEXT IDC_BUILD_DATETIME,150,2,150,10, ES_READONLY | NOT WS_BORDER
//CONTROL "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64
CONTROL "",IDI_JESUISCHARLIE,"Static",SS_OWNERDRAW,20,5,64,64
CONTROL "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64
//CONTROL "",IDI_JESUISCHARLIE,"Static",SS_OWNERDRAW,20,5,64,64
LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,140,11
LTEXT "Author :",IDC_STATIC,21,45,31,8
LTEXT "Notepad++ team",IDC_AUTHOR_NAME,78,45,70,8

4
PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
View File

@ -81,8 +81,8 @@ BOOL CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
case WM_DRAWITEM :
{
//HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_JESUISCHARLIE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
//HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_JESUISCHARLIE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam;
::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL);
return TRUE;

BIN
PowerEditor/src/icons/Je_suis_Charlie.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

10
PowerEditor/src/resource.h
View File

@ -29,13 +29,13 @@
#ifndef RESOURCE_H
#define RESOURCE_H
//#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7.3")
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ Je suis Charlie edition")
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7.5")
//#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ Je suis Charlie edition")
// 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.74\0")
#define VERSION_DIGITALVALUE 6, 7, 4, 0
#define VERSION_VALUE TEXT("6.75\0")
#define VERSION_DIGITALVALUE 6, 7, 5, 0
#ifndef IDC_STATIC
#define IDC_STATIC -1
@ -43,7 +43,7 @@
#define IDI_M30ICON 100
#define IDI_CHAMELEON 101
#define IDI_JESUISCHARLIE 102
//#define IDI_JESUISCHARLIE 102
#define IDR_RT_MANIFEST 103
#define IDI_NEW_OFF_ICON 201