Apply 1695491: uninstall all pixmaps on Win32. Patch by Dmitriy Pomerantsev (Atrus)

[synfig.git] / synfig-studio / trunk / win32inst.nsi.in

diff --git a/synfig-studio/trunk/win32inst.nsi.in b/synfig-studio/trunk/win32inst.nsi.in
index 7c6f388..e8e1e0d 100644 (file)
--- a/synfig-studio/trunk/win32inst.nsi.in
+++ b/synfig-studio/trunk/win32inst.nsi.in
@@ -57,10 +57,10 @@ Section "Synfig Studio"
   SectionIn RO
   
   SetOutPath "$INSTDIR\share\pixmaps"
-  File "images\*.png"
+  !include "images\images.nsh"
   
   SetOutPath "$INSTDIR\share\pixmaps"
-  File "images\*.ico"
+  !include "images\icons.nsh"
 
   SetOutPath "$INSTDIR\bin"
   File "src\synfigapp\.libs\libsynfigapp-0.dll"
@@ -91,9 +91,9 @@ Section "Synfig Studio"
        WriteRegStr HKCR ".sif" "Content Type" "image/x-sif"
        WriteRegStr HKCR ".sif" "PerceivedType" "image"
 
-       WriteRegStr HKCR ".sif.gz" "" "Synfig.Composition"
-       WriteRegStr HKCR ".sif.gz" "Content Type" "image/x-sifz"
-       WriteRegStr HKCR ".sif.gz" "PerceivedType" "image"
+       WriteRegStr HKCR ".sifz" "" "Synfig.Composition"
+       WriteRegStr HKCR ".sifz" "Content Type" "image/x-sifz"
+       WriteRegStr HKCR ".sifz" "PerceivedType" "image"
 
        WriteRegStr HKCR "Synfig.Composition" "" "Synfig Composition File"
        WriteRegStr HKCR "Synfig.Composition\DefaultIcon" "" "$INSTDIR\share\pixmaps\sif_icon.ico"
@@ -125,17 +125,23 @@ Section "Uninstall"
        DeleteRegKey HKCR "Synfig.Composition\shell"
        DeleteRegKey HKCR "Synfig.Composition" 
        DeleteRegKey HKCR ".sif"
-       DeleteRegKey HKCR ".sif.gz"
+       DeleteRegKey HKCR ".sifz"
   
   ; Remove registry keys
   DeleteRegKey HKLM "${PRODUCT_REG_KEY}"
   DeleteRegKey HKLM "${PRODUCT_UNINSTALL_KEY}"
 
+  ; Remove images and icons
+  !include "images\unimages.nsh"
+  !include "images\unicons.nsh"
+  RMDir "$INSTDIR\share\pixmaps"
+  RMDir "$INSTDIR\share"
+
   ; Remove files and uninstaller
        Delete "$INSTDIR\${PRODUCT_UNINSTALL_EXE}"
   Delete $INSTDIR\bin\synfigstudio.exe
   Delete $INSTDIR\bin\libsynfigapp-0.dll
-  RMDir $INSTDIR\bin
+  RMDir "$INSTDIR\bin"
 
   ; Remove shortcuts, if any
   Delete "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk"