From c14d526b2a6a5b1556ba07db87d78f51f4a7341c Mon Sep 17 00:00:00 2001 From: Don Ho Date: Mon, 26 Oct 2009 01:14:12 +0000 Subject: [PATCH] [NEW] Add SQL ESC symbol '\'. [NEW] Add new Notepad++ logo in About box. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@554 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/Notepad_plus.rc | 19 +++++++++--------- .../src/ScitillaComponent/ScintillaEditView.h | 1 + .../src/WinControls/AboutDlg/AboutDlg.cpp | 4 ++-- PowerEditor/src/icons/chameleon.ico | Bin 3774 -> 5694 bytes scintilla/src/LexUser.cxx | 3 ++- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 40c94c68b..417106ace 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -598,17 +598,18 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 271, 240 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 BEGIN - LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,60,16,65,11 - LTEXT UNICODE_ANSI_MODE, IDC_STATIC,130,16,65,11 - GROUPBOX "GNU General Public Licence",IDC_STATIC,19,75,231,131,BS_CENTER - DEFPUSHBUTTON "Ok",IDOK,106,215,50,14,BS_FLAT,WS_EX_STATICEDGE - LTEXT "Author :",IDC_STATIC,21,41,31,8 - LTEXT "Notepad++ team",IDC_AUTHOR_NAME,78,41,70,8 - LTEXT "Home Page :",IDC_STATIC,21,54,47,8 - LTEXT "http://notepad-plus.sourceforge.net/",IDC_HOME_ADDR,78,54,126,8 - EDITTEXT IDC_LICENCE_EDIT,31,99,209,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL EDITTEXT IDC_BUILD_DATETIME,150,2,150,10, ES_READONLY | NOT WS_BORDER CONTROL "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64 + LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,65,11 + LTEXT UNICODE_ANSI_MODE, IDC_STATIC,140,20,65,11 + LTEXT "Author :",IDC_STATIC,21,45,31,8 + LTEXT "Notepad++ team",IDC_AUTHOR_NAME,78,45,70,8 + LTEXT "Home Page :",IDC_STATIC,21,59,47,8 + LTEXT "http://notepad-plus.sourceforge.net/",IDC_HOME_ADDR,78,59,126,8 + GROUPBOX "GNU General Public Licence",IDC_STATIC,19,75,231,131,BS_CENTER + DEFPUSHBUTTON "Ok",IDOK,106,215,50,14,BS_FLAT,WS_EX_STATICEDGE + // IDC_LICENCE_EDIT should be the last line, don't know why + EDITTEXT IDC_LICENCE_EDIT,31,99,209,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL END IDD_GOLINE DIALOGEX 26, 41, 261, 88 diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h index afaccdfb3..7a456f499 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h @@ -684,6 +684,7 @@ protected: void setSqlLexer() { + execute(SCI_SETPROPERTY, (WPARAM)"sql.backslash.escapes", (LPARAM)"1"); setLexer(SCLEX_SQL, L_SQL, LIST_0); }; diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp index 660fbcfd8..b27c5e8f4 100644 --- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp @@ -70,9 +70,9 @@ BOOL CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) case WM_DRAWITEM : { - HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 48, 48, LR_DEFAULTSIZE); + HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam; - ::DrawIconEx(pdis->hDC, 0, 0, hIcon, 48, 48, 0, NULL, DI_NORMAL); + ::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL); return TRUE; } diff --git a/PowerEditor/src/icons/chameleon.ico b/PowerEditor/src/icons/chameleon.ico index 3a38506a65b4d3a63cbd388a0a017ec9f26b8e07..636c56c5e3df9d130e51081fe93c0ee3b3d2826e 100644 GIT binary patch literal 5694 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