diff --git a/PowerEditor/bin/SourceCodePro-Regular.otf b/PowerEditor/bin/SourceCodePro-Regular.otf new file mode 100644 index 000000000..4e3b9d0bc Binary files /dev/null and b/PowerEditor/bin/SourceCodePro-Regular.otf differ diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 685c04125..d86fd9860 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -489,6 +489,7 @@ Section -"Notepad++" mainSection SetOverwrite off File "..\bin\shortcuts.xml" + File "..\bin\SourceCodePro-Regular.otf" ; Set Section Files and Shortcuts SetOverwrite on @@ -1969,6 +1970,7 @@ Section Uninstall Delete "$INSTDIR\nativeLang.xml" Delete "$INSTDIR\session.xml" Delete "$INSTDIR\localization\english.xml" + Delete "$INSTDIR\SourceCodePro-Regular.otf" SetShellVarContext current Delete "$APPDATA\Notepad++\langs.xml" diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 5360a4178..f083ba342 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -47,6 +47,8 @@ copy /Y ..\bin\"notepad++.exe" .\minimalist\ If ErrorLevel 1 PAUSE copy /Y ..\bin\SciLexer.dll .\minimalist\ If ErrorLevel 1 PAUSE +copy /Y copy ..\src\fonts\sourceCodePro\SourceCodePro-Regular.otf .\minimalist\ +If ErrorLevel 1 PAUSE rem Notepad++ Unicode package @@ -87,6 +89,8 @@ copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\ If ErrorLevel 1 PAUSE copy /Y ..\bin\SciLexer.dll .\zipped.package.release\ If ErrorLevel 1 PAUSE +copy ..\src\fonts\sourceCodePro\SourceCodePro-Regular.otf .\zipped.package.release\ +If ErrorLevel 1 PAUSE rem Plugins copy /Y "..\bin\plugins\DSpellCheck.dll" .\zipped.package.release\plugins\ diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 2df9d0cfd..f2828873b 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -56,6 +56,8 @@ enum tb_stat {tb_saved, tb_unsaved, tb_ro}; #define NPP_INTERNAL_FUCTION_STR TEXT("Notepad++::InternalFunction") +#define SOURCECODEPRO_FONT TEXT("SourceCodePro-Regular.otf") + int docTabIconIDs[] = {IDI_SAVED_ICON, IDI_UNSAVED_ICON, IDI_READONLY_ICON}; ToolBarButtonUnit toolBarIcons[] = { @@ -199,6 +201,7 @@ Notepad_plus::~Notepad_plus() delete _pProjectPanel_3; delete _pDocMap; delete _pFuncList; + ::RemoveFontResource(SOURCECODEPRO_FONT); } @@ -209,6 +212,9 @@ LRESULT Notepad_plus::init(HWND hwnd) NppParameters *pNppParam = NppParameters::getInstance(); NppGUI & nppGUI = (NppGUI &)pNppParam->getNppGUI(); + // Add Main font + ::AddFontResource(SOURCECODEPRO_FONT); + // Menu _mainMenuHandle = ::GetMenu(hwnd); int langPos2BeRemoved = MENUINDEX_LANGUAGE+1; diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 036084706..04f77077e 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -234,7 +234,6 @@ INT_PTR CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM l break; case IDCANCEL : - //::MessageBox(NULL, TEXT("cancel"), TEXT(""), MB_OK); if (_isDirty) { NppParameters *nppParamInst = NppParameters::getInstance(); diff --git a/PowerEditor/src/fonts/sourceCodePro/LICENSE.txt b/PowerEditor/src/fonts/sourceCodePro/LICENSE.txt new file mode 100644 index 000000000..d154618a7 --- /dev/null +++ b/PowerEditor/src/fonts/sourceCodePro/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Regular.otf b/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Regular.otf new file mode 100644 index 000000000..4e3b9d0bc Binary files /dev/null and b/PowerEditor/src/fonts/sourceCodePro/SourceCodePro-Regular.otf differ diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml index 19a8e1732..5d1f89c3b 100644 --- a/PowerEditor/src/stylers.model.xml +++ b/PowerEditor/src/stylers.model.xml @@ -799,10 +799,10 @@ - - + + - + diff --git a/PowerEditor/visual.net/notepadPlus.vcxproj b/PowerEditor/visual.net/notepadPlus.vcxproj index 2b6979cbe..b534201a3 100644 --- a/PowerEditor/visual.net/notepadPlus.vcxproj +++ b/PowerEditor/visual.net/notepadPlus.vcxproj @@ -200,6 +200,7 @@ copy ..\src\stylers.model.xml ..\bin\stylers.model.xml copy ..\src\shortcuts.xml ..\bin\shortcuts.xml copy ..\src\functionList.xml ..\bin\functionList.xml copy ..\src\contextMenu.xml ..\bin\contextMenu.xml +copy ..\src\fonts\sourceCodePro\SourceCodePro-Regular.otf ..\bin\SourceCodePro-Regular.otf ..\misc\vistaIconTool\changeIcon.bat "..\misc\vistaIconTool\ChangeIcon.exe" "$(OutDir)notepad++.exe"