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

Remove the old icon

This commit is contained in:
Don Ho 2016-09-21 09:06:22 +02:00
parent 53ca639b17
commit 6d2b1e4f5e
7 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/installer/nppSetup.nsi
View File

@ -116,7 +116,7 @@ Var UPDATE_PATH
!include "nsisInclude\mainSectionFuncs.nsh"
Section -"Notepad++" mainSection
Call setPathAndOptions
Call copyCommonFiles
@ -126,8 +126,6 @@ Section -"Notepad++" mainSection
Call removeOldContextMenu
Call shortcutLinkManagement
Call changeIconOption
SectionEnd

9
PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
View File

@ -258,13 +258,4 @@ Function shortcutLinkManagement
SetShellVarContext current
FunctionEnd
Function changeIconOption
${If} $isOldIconChecked == ${BST_CHECKED}
SetOutPath "$TEMP\"
File "..\misc\vistaIconTool\changeIcon.exe"
File "..\src\icons\npp.ico"
nsExec::ExecToStack '"$TEMP\changeIcon.exe" "$TEMP\npp.ico" "$INSTDIR\notepad++.exe" 100 1033'
${EndIf}
FunctionEnd

8
PowerEditor/installer/nsisInclude/tools.nsh
View File

@ -36,7 +36,6 @@ FunctionEnd
;Installer Functions
Var Dialog
Var NoUserDataCheckboxHandle
Var OldIconCheckboxHandle
Var ShortcutCheckboxHandle
Var PluginLoadFromUserDataCheckboxHandle
Var WinVer
@ -63,10 +62,6 @@ Function ExtraOptions
${NSD_Check} $ShortcutCheckboxHandle
${NSD_OnClick} $ShortcutCheckboxHandle OnChange_ShortcutCheckBox
${NSD_CreateCheckbox} 0 170 100% 30u "Use the old, obsolete and monstrous icon$\nI won't blame you if you want to get the old icon back :)"
Pop $OldIconCheckboxHandle
${NSD_OnClick} $OldIconCheckboxHandle OnChange_OldIconCheckBox
nsDialogs::Show
FunctionEnd
@ -109,9 +104,6 @@ Function OnChange_ShortcutCheckBox
${NSD_GetState} $ShortcutCheckboxHandle $createShortcutChecked
FunctionEnd
Function OnChange_OldIconCheckBox
${NSD_GetState} $OldIconCheckboxHandle $isOldIconChecked
FunctionEnd
Function writeInstallInfoInRegistry
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe" "" "$INSTDIR\notepad++.exe"

BIN
PowerEditor/misc/vistaIconTool/ChangeIcon.exe
View File

Binary file not shown.

9
PowerEditor/misc/vistaIconTool/changeIcon.bat
View File

@ -1,9 +0,0 @@
REM To add vista style icon, you need ChangeIcon.exe in the same directory.
REM %1 should be the path of ChangeIcon.exe
REM %2 should be the path of notepad++.exe
if exist %1 (
%1 "..\src\icons\nppNewIcon.ico" %2 100 1033
)

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 182 KiB

2
PowerEditor/visual.net/notepadPlus.vcxproj
View File

@ -206,7 +206,6 @@ 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
..\misc\vistaIconTool\changeIcon.bat "..\misc\vistaIconTool\ChangeIcon.exe" "$(OutDir)notepad++.exe"
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@ -256,7 +255,6 @@ copy ..\src\stylers.model.xml ..\bin64\stylers.model.xml
copy ..\src\shortcuts.xml ..\bin64\shortcuts.xml
copy ..\src\functionList.xml ..\bin64\functionList.xml
copy ..\src\contextMenu.xml ..\bin64\contextMenu.xml
..\misc\vistaIconTool\changeIcon.bat "..\misc\vistaIconTool\ChangeIcon.exe" "$(OutDir)notepad++.exe"
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>