BUG 1513218, option delete preferences on install, ask to uninstall first, messagebox...

diff --git a/packaging/win32/catalan.nsh b/packaging/win32/catalan.nsh
index 326ec9553061908ee71f5facc77f7bd8aa6da7c0..00d26bb5af37a17f025ec5df12ef454dd0ec2a2b 100644 (file)
--- a/packaging/win32/catalan.nsh
+++ b/packaging/win32/catalan.nsh
@@ -10,6 +10,7 @@
 ; 11 august 2006 new languages dz bg\r
 ; 24 october 2006 new languages en_US@piglatin, th
 ; 3rd December 2006 new languages eu km\r
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 \r
 !insertmacro MUI_LANGUAGE "Catalan"\r
 \r
@@ -28,6 +29,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_CATALAN} "L'$(^Name) s'ha alliberat
 ;LangString lng_DIFFERENT_USER ${LANG_CATALAN} "Inkscape has been installed by user $0.$\r$\nIf you continue you might not complete successfully!$\r$\nPlease log in as $0 and try again."\r
 LangString lng_DIFFERENT_USER ${LANG_CATALAN} "L'usuari $0.$\r ha instal·lat l'Inkscape.$\nSi continueu, és possible que no acabeu correctament.$\r$\nEntreu com a $0 i proveu de nou."\r
 \r
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_CATALAN} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_CATALAN} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ;you have no admin rigths\r
 ;LangString lng_NO_ADMIN ${LANG_CATALAN} "You do not have administrator privileges.$\r$\nInstalling Inkscape for all users might not complete successfully.$\r$\nUncheck the 'for all users' option."\r
 LangString lng_NO_ADMIN ${LANG_CATALAN} "No teniu privilegis d'administrador.$\r$\nÉs possible que la instal·lació per a tots els usuaris no es completi correctament.$\r$\nInhabiliteu l'opció 'per a tots els usuaris'."\r
@@ -120,6 +127,12 @@ LangString lng_ContextMenu ${LANG_CATALAN} "Men
 ; LangString lng_ContextMenuDesc ${LANG_CATALAN} "Add ${PRODUCT_NAME} into the Context Menu for SVG files"\r
 LangString lng_ContextMenuDesc ${LANG_CATALAN} "Afegeix l'${PRODUCT_NAME} al menú contextual per als fitxers SVG"\r
 \r
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_CATALAN} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_CATALAN} "Delete personal preferences leftover from previous installations"\r
+\r
 \r
 ; Additional files section\r
 ; LangString lng_Addfiles $(LANG_CATALAN) "Additional Files"\r

diff --git a/packaging/win32/czech.nsh b/packaging/win32/czech.nsh
index 0781390fee3cee5a3e0d22cbefd1a7e21cec7bc8..e691f2a0aea48bed63df6771d14f2a9a63a6b11e 100644 (file)
--- a/packaging/win32/czech.nsh
+++ b/packaging/win32/czech.nsh
@@ -10,6 +10,7 @@
 ; 11 august 2006 new languages dz bg\r
 ; 24 october 2006 new languages en_US@piglatin, th
 ; 3rd December 2006 new languages eu km\r
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 \r
 !insertmacro MUI_LANGUAGE "Czech"\r
 \r
@@ -25,6 +26,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_CZECH} "$(^Name) je vyd
 ;has been installed by different user\r
 LangString lng_DIFFERENT_USER ${LANG_CZECH} "Inkscape byl nainstalován u\9eivatelem $0.$\r$\nInstalace nemusí být dokonèena správnì pokud v ní budete pokraèovat!$\r$\nProsím pøihlaste se jako $0 a spus\9dte instalaci znovu."\r
 \r
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_CZECH} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_CZECH} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ;you have no admin rigths\r
 LangString lng_NO_ADMIN ${LANG_CZECH} "Nemáte administrátorská oprávnìní.$\r$\nInstalace Inkscape pro v\9aechny u\9eivatele nemusí být úspì\9anì dokonèena.$\r$\nZru\9ate oznaèení volby 'Pro v\9aechny u\9eivatele'."\r
 \r
@@ -94,6 +101,13 @@ LangString lng_ContextMenu ${LANG_CZECH} "Kontextov
 ; Context Menu description\r
 LangString lng_ContextMenuDesc ${LANG_CZECH} "Pøidat ${PRODUCT_NAME} do kontextové nabídky pro SVG soubory"\r
 \r
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_CZECH} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_CZECH} "Delete personal preferences leftover from previous installations"\r
+\r
+\r
 \r
 ; Additional files section\r
 LangString lng_Addfiles $(LANG_CZECH) "Dal\9aí soubory"\r

diff --git a/packaging/win32/english.nsh b/packaging/win32/english.nsh
index c7bb36003b009bbb982bdb02ff429fc8931ea054..e90d70e3c311915d3186c3947f3b439db0cc6b5f 100644 (file)
--- a/packaging/win32/english.nsh
+++ b/packaging/win32/english.nsh
@@ -9,6 +9,7 @@
 ; 11 august 2006 new languages dz bg
 ; 24 october 2006 new languages en_US@piglatin, th
 ; 3rd December 2006 new languages eu km
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC
 
 !insertmacro MUI_LANGUAGE "English"
 
@@ -24,6 +25,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_ENGLISH} "$(^Name) is released under
 ;has been installed by different user
 LangString lng_DIFFERENT_USER ${LANG_ENGLISH} "Inkscape has been installed by user $0.$\r$\nIf you continue you might not complete successfully!$\r$\nPlease log in as $0 and try again."
 
+; want to uninstall before install
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_ENGLISH} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"
+
+; press OK to continue press Cancel to abort
+LangString lng_OK_CANCEL_DESC ${LANG_ENGLISH} "$\n$\nPress OK to continue or press CANCEL to abort."
+
 ;you have no admin rigths
 LangString lng_NO_ADMIN ${LANG_ENGLISH} "You do not have administrator privileges.$\r$\nInstalling Inkscape for all users might not complete successfully.$\r$\nUncheck the 'for all users' option."
 
@@ -93,6 +100,12 @@ LangString lng_ContextMenu ${LANG_ENGLISH} "Context Menu"
 ; Context Menu description
 LangString lng_ContextMenuDesc ${LANG_ENGLISH} "Add ${PRODUCT_NAME} into the Context Menu for SVG files"
 
+; remove personal preferences
+LangString lng_DeletePrefs ${LANG_ENGLISH} "Delete personal preferences"
+
+; remove personal preferences description
+LangString lng_DeletePrefsDesc ${LANG_ENGLISH} "Delete personal preferences leftover from previous installations"
+
 
 ; Additional files section
 LangString lng_Addfiles $(LANG_ENGLISH) "Additional Files"

diff --git a/packaging/win32/finnish.nsh b/packaging/win32/finnish.nsh
index 4376e0f8e26ef8752e03acf74d5be6365785a090..176f0f411614627d4ae1512944330c02db48bbc7 100644 (file)
--- a/packaging/win32/finnish.nsh
+++ b/packaging/win32/finnish.nsh
@@ -8,7 +8,8 @@
 ; 27 july 2006 new languages en_CA, en_GB, fi, hr, mn, ne, rw, sq
 ; 11 august 2006 new languages dz bg
 ; 24 october 2006 new languages en_US@piglatin, th
-; 3rd December 2006 new languages eu km\r
+; 3rd December 2006 new languages eu km
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 
 !insertmacro MUI_LANGUAGE "Finnish"
 
@@ -24,6 +25,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_FINNISH} "$(^Name) on julkaistu GNU
 ;has been installed by different user
 LangString lng_DIFFERENT_USER ${LANG_FINNISH} "Käyttäjä $0.$\r$\n on asentanut Inkscapen\nJos jatkat, asennus saattaa epäonnistua.!$\r$\nKirjaudu sisään käyttäjänä $0 ja yritä uudestaan."
 
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_FINISH} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_FINISH} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ;you have no admin rigths
 LangString lng_NO_ADMIN ${LANG_FINNISH} "Sinulla ei ole pääkäyttäjän oikeuksia.$\r$\nInkscapen asennus kaikille käyttäjille saattaa epäonnistua.$\r$\nÄlä käytä kaikille käyttäjille -ominaisuutta."
 
@@ -93,6 +100,12 @@ LangString lng_ContextMenu ${LANG_FINNISH} "Context Menu"
 ; Context Menu description
 LangString lng_ContextMenuDesc ${LANG_FINNISH} "Lisää ${PRODUCT_NAME} SVG-tiedostojen pikavalikkoon"
 
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_FINNISH} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_FINNISH} "Delete personal preferences leftover from previous installations"\r
+
 
 ; Additional files section
 LangString lng_Addfiles $(LANG_FINNISH) "Valinnaiset tiedostot"

diff --git a/packaging/win32/french.nsh b/packaging/win32/french.nsh
index c2411361de93c2ebe0e01a04a8a59f9af8e53956..75d79e3dc10b56d0e54664afe588e7b4ef5c96aa 100644 (file)
--- a/packaging/win32/french.nsh
+++ b/packaging/win32/french.nsh
@@ -9,7 +9,8 @@
 ; 27 july 2006 new languages en_CA, en_GB, fi, hr, mn, ne, rw, sq
 ; 11 august 2006 new languages dz bg\r
 ; 24 october 2006 new languages en_US@piglatin, th
-; 3rd December 2006 new languages eu km\r
+; 3rd December 2006 new languages eu km
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 
 !insertmacro MUI_LANGUAGE "French"
 
@@ -25,6 +26,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_FRENCH} "$(^Name) est diffus
 ;has been installed by different user
 LangString lng_DIFFERENT_USER ${LANG_FRENCH} "Inkscape a déjà été installé par l'utilisateur $0.$\r$\nSi vous continuez, l'installation pourrait devenir défectueuse!$\r$\nVeuillez, svp, vous connecter en tant que $0 et essayer de nouveau."
 
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_FRENCH} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_FRENCH} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ;you have no admin rigths
 LangString lng_NO_ADMIN ${LANG_FRENCH} "Vous n'avez pas les privilèges d'administrateur.$\r$\nL'installation d'Inkscape pour tous les utilisateurs pourrait devenir défectueuse.$\r$\nVeuillez décocher l'option 'pour tous les utilisateurs'."
 
@@ -94,6 +101,12 @@ LangString lng_ContextMenu ${LANG_FRENCH} "Menu contextuel"
 ; Context Menu description
 LangString lng_ContextMenuDesc ${LANG_FRENCH} "Ajouter ${PRODUCT_NAME} dans le menu contextuel des fichiers SVG"
 
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_FRENCH} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_FRENCH} "Delete personal preferences leftover from previous installations"\r
+\r
 
 ; Additional files section
 LangString lng_Addfiles $(LANG_FRENCH) "Fichiers additionnels"

diff --git a/packaging/win32/german.nsh b/packaging/win32/german.nsh
index 4cc5943744a587b9dac913253469c9c49349a729..678cbd47f0259813e6e26afc678d630a74b987d9 100644 (file)
--- a/packaging/win32/german.nsh
+++ b/packaging/win32/german.nsh
@@ -9,6 +9,7 @@
 ; 11 august 2006 new languages dz bg
 ; 24 october 2006 new languages en_US@piglatin, th
 ; 3rd December 2006 new languages eu km
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC
 
 !insertmacro MUI_LANGUAGE "German"
 
@@ -21,6 +22,12 @@ LangString lng_LICENSE_BUTTON   ${LANG_GERMAN} "Weiter >"
 ; Bottom text for the license page
 LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_GERMAN} "$(^Name) wird unter der GNU General Public License (GPL) veröffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
 
+; want to uninstall before install
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_GERMAN} "$R1 wurde bereits installiert. $\nSoll die verhergehende Version $(^Name) zuerst deinstalliert werden?"
+
+; press OK to continue press Cancel to abort
+LangString lng_OK_CANCEL_DESC ${LANG_GERMAN} "$\n$\nOK um fortzufahren oder Abbrechen zum sofortigen Beenden."
+
 ;has been installed by different user
 LangString lng_DIFFERENT_USER ${LANG_GERMAN} "Inkscape wurde durch den Benutzer $0 installiert.$\r$\nWenn Sie fortfahren kann die Aktion möglicherweise nicht korrekt abgeschlossen werden!$\r$\nBitte melden Sie sich als $0 an und versuchen Sie es erneut."
 
@@ -96,6 +103,12 @@ LangString lng_ContextMenu ${LANG_GERMAN} "Kontext-Men
 ; Context Menu description
 LangString lng_ContextMenuDesc ${LANG_GERMAN} "Fügt ${PRODUCT_NAME} in das Kontext-Menü für SVG Dateien ein"
 
+; remove personal preferences
+LangString lng_DeletePrefs ${LANG_GERMAN} "Persönliche Inkscape-Vorgaben löschen"
+
+; remove personal preferences description
+LangString lng_DeletePrefsDesc ${LANG_GERMAN} "Löscht verbliebene persönliche Inkscape-Vorgaben einer vorhergehenden Version"
+
 
 ; Additional Files section
 LangString lng_Addfiles $(LANG_GERMAN) "weitere Dateien"

diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi
index 0af7d420318eea72ae91e000f5b087c184af1ac3..4a4dd2845a2a587c5601d208e2247209c2547e31 100644 (file)
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -422,7 +422,29 @@ FunctionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
 
-
+;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Delete prefs
+; code taken from the vlc project
+;;;;;;;;;;;;;;;;;;;;;;;;;;
+!macro delprefs
+  StrCpy $0 0
+       DetailPrint "Delete personal preferences ..."
+       DetailPrint "try to find all users ..."
+       delprefs-Loop:
+ ; FIXME
+  ; this will loop through all the logged users and "virtual" windows users
+  ; (it looks like users are only present in HKEY_USERS when they are logged in)
+    ClearErrors
+    EnumRegKey $1 HKU "" $0
+    StrCmp $1 "" delprefs-End
+    IntOp $0 $0 + 1
+    ReadRegStr $2 HKU "$1\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
+    StrCmp $2 "" delprefs-Loop
+       DetailPrint "$2\Inkscape will be removed"
+    RMDir /r "$2\Inkscape"
+    Goto delprefs-Loop
+  delprefs-End:
+!macroend
 
 
 ;--------------------------------
@@ -629,6 +651,10 @@ SectionEnd
 
 SectionGroupEnd
 
+Section /o $(lng_DeletePrefs) SecPrefs
+       !insertmacro delprefs
+SectionEnd
+
 SectionGroup $(lng_Addfiles) SecAddfiles
 
 Section $(lng_Examples) SecExamples
@@ -919,6 +945,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecQuicklaunch} $(lng_QuicklaunchDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecSVGWriter} $(lng_SVGWriterDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecContextMenu} $(lng_ContextMenuDesc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecPrefs} $(lng_DeletePrefsDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecAddfiles} $(lng_AddfilesDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(lng_ExamplesDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTutorials} $(lng_TutorialsDesc)
@@ -969,15 +996,17 @@ Function .onInit
        Pop $1
        StrCmp $1 "Admin" info_done
 
-       MessageBox MB_OK|MB_ICONEXCLAMATION "$(lng_NO_ADMIN)"
-
+       MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(lng_NO_ADMIN)$(lng_OK_CANCEL_DESC)" /SD IDOK IDOK info_done IDCANCEL +1
+               Quit
+               
        Goto info_done
 
        info_Win9x:
                # This one means you don't need to care about admin or
                # not admin because Windows 9x doesn't either
-               MessageBox MB_OK|MB_ICONEXCLAMATION $(lng_NOT_SUPPORTED)
-
+               MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(lng_NOT_SUPPORTED)$(lng_OK_CANCEL_DESC)" /SD IDOK IDOK info_done IDCANCEL +1
+                       Quit
+                       
        info_done:
 
   ;check for previous installation
@@ -985,10 +1014,28 @@ Function .onInit
   StrCmp $0 "" +1 +2
   ReadRegStr $0 HKCU "${PRODUCT_DIR_REGKEY}" "User"
   ;check user if applicable
-  StrCmp $0 "" +3
-    StrCmp $0 $User +2
-         MessageBox MB_OK|MB_ICONEXCLAMATION "$(lng_DIFFERENT_USER)"
-       
+  StrCmp $0 "" diff_user_install_done
+    StrCmp $0 $User diff_user_install_done
+         MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(lng_DIFFERENT_USER)$(lng_OK_CANCEL_DESC)" /SD IDOK IDOK diff_user_install_done IDCANCEL +1
+               Quit
+   diff_user_install_done:
+         
+  ; call uninstall first
+  ; code taken from the vlc project
+    ReadRegStr $R0  HKLM ${PRODUCT_UNINST_KEY} "UninstallString"
+       ReadRegStr $R1  HKLM ${PRODUCT_UNINST_KEY} "DisplayName"
+       StrCmp $R0 "" +1 +3
+    ReadRegStr $R0  HKCU ${PRODUCT_UNINST_KEY} "UninstallString"
+       ReadRegStr $R1  HKCU ${PRODUCT_UNINST_KEY} "DisplayName"
+       StrCmp $R0 "" uninstall_before_done
+        
+         MessageBox MB_YESNO|MB_ICONEXCLAMATION $(lng_WANT_UNINSTALL_BEFORE) /SD IDNO IDYES +1 IDNO uninstall_before_done 
+         ;Run the uninstaller
+         ;uninst:
+           ClearErrors
+           ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
+         uninstall_before_done:
+         
   ; proccess command line parameter
   !insertmacro Parameter "GTK" ${SecGTK}
   !insertmacro Parameter "SHORTCUTS" ${secShortcuts}
@@ -997,6 +1044,7 @@ Function .onInit
   !insertmacro Parameter "QUICKLAUNCH" ${SecQUICKlaunch}
   !insertmacro Parameter "SVGEDITOR" ${SecSVGWriter}
   !insertmacro Parameter "CONTEXTMENUE" ${SecContextMenu}
+  !insertmacro Parameter "PREFERENCES" ${SecPrefs}
   !insertmacro Parameter "ADDFILES" ${SecAddfiles}
   !insertmacro Parameter "EXAMPLES" ${SecExamples}
   !insertmacro Parameter "TUTORIALS" ${SecTutorials}
@@ -1070,6 +1118,7 @@ Function .onInit
       /QUICKLAUNCH=(OFF/ON): quick launch icon$\r$\n \
       /SVGEDITOR=(OFF/ON): default SVG editor$\r$\n \
       /CONTEXTMENUE=(OFF/ON): context menue integration$\r$\n \
+      /PREFERENCES=(OFF/ON): delete users preference files$\r$\n \
       /ADDFILES=(OFF/ON): additional files$\r$\n \
       /EXAMPLES=(OFF/ON): examples$\r$\n \
       /TUTORIALS=(OFF/ON): tutorials$\r$\n \
@@ -1121,7 +1170,9 @@ Function un.onInit
   ;check user if applicable
   StrCmp $0 "" +3
     StrCmp $0 $User +2
-         MessageBox MB_OK|MB_ICONEXCLAMATION "$(lng_DIFFERENT_USER)"
+         MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(lng_DIFFERENT_USER)$(lng_OK_CANCEL_DESC)" /SD IDOK IDOK diff_user_uninstall_done IDCANCEL +1
+               Quit
+  diff_user_uninstall_done:
     
  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "inkscape.nsi.uninstall"
 
@@ -1139,7 +1190,8 @@ Section Uninstall
   Delete "$APPDATA\Inkscape\extension-errors.log"
   StrCmp $MultiUser "0" 0 endPurge  ; multiuser assigned in dialog
     DetailPrint "purge personal settings in $APPDATA\Inkscape"
-    RMDir /r "$APPDATA\Inkscape"
+    ;RMDir /r "$APPDATA\Inkscape"
+       !insertmacro delprefs
   endPurge:
 
   ; Remove file associations for svg editor

diff --git a/packaging/win32/italian.nsh b/packaging/win32/italian.nsh
index b0dab885a69580394e5ea4f1cb55c381ba5bac36..4e87a0514458eaf940c1e00bcb4de9bb8e3f762b 100644 (file)
--- a/packaging/win32/italian.nsh
+++ b/packaging/win32/italian.nsh
@@ -9,6 +9,7 @@
 ; 11 august 2006 new languages dz bg\r
 ; 24 october 2006 new languages en_US@piglatin, th
 ; 3rd December 2006 new languages eu km\r
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 \r
 !insertmacro MUI_LANGUAGE "Italian"\r
 \r
@@ -24,6 +25,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_ITALIAN} "$(^Name) 
 ; has been installed by different user\r
 LangString lng_DIFFERENT_USER ${LANG_ITALIAN} "Inkscape è stato installato dall'utente $0.  Potrebbe non essere possibile portare a termine l'installazione.   Accedere come $0 e riprovare."\r
 \r
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_ITALIAN} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_ITALIAN} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ; you have no admin rigths\r
 LangString lng_NO_ADMIN ${LANG_ITALIAN} "Non si posseggono i diritti di amministratore.  Potrebbe non essere possibile installare Inkscape per tutti gli utenti.  Non selezionare l'opzione 'Per Tutti Gli Utenti'"\r
 \r
@@ -93,6 +100,12 @@ LangString lng_ContextMenu ${LANG_ITALIAN} "Menu Contestuale"
 ; Context Menu description\r
 LangString lng_ContextMenuDesc ${LANG_ITALIAN} "Aggiunge ${PRODUCT_NAME} nel Menu Contestuale per i file SVG"\r
 \r
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_ITALIAN} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_ITALIAN} "Delete personal preferences leftover from previous installations"\r
+\r
 \r
 ; Additional files section\r
 LangString lng_Addfiles $(LANG_ITALIAN) "File Aggiuntivi"\r

diff --git a/packaging/win32/polish.nsh b/packaging/win32/polish.nsh
index 9c275650287baf1a249d35a598b408bd80a9befd..cd07ef6376d70d2cc6ad3c2da57a9140b1bb4cda 100644 (file)
--- a/packaging/win32/polish.nsh
+++ b/packaging/win32/polish.nsh
@@ -9,6 +9,7 @@
 ; 11 august 2006 new languages dz bg\r
 ; 24 october 2006 new languages en_US@piglatin, th
 ; 3rd December 2006 new languages eu km\r
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 \r
 !insertmacro MUI_LANGUAGE "Polish"\r
 \r
@@ -24,6 +25,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_POLISH} "$(^Name) jest udost
 ;has been installed by different user\r
 LangString lng_DIFFERENT_USER ${LANG_POLISH} "Program Inkscape zosta³ zainstalowany przez u¿ytkownika $0.$\r$\nJe\9cli bêdziesz teraz kontynuowaæ instalacja mo¿e nie zostaæ zakoñczona pomy\9clnie!$\r$\nZaloguj siê proszê jako u¿ytkownik $0 i spróbuj ponownie."\r
 \r
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_POLISH} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_POLISH} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ;you have no admin rigths\r
 LangString lng_NO_ADMIN ${LANG_POLISH} "Nie masz uprawnieñ administratora.$\r$\nInstalacja programu Inkscape dla wszystkich u¿ytkowników mo¿e nie zostaæ zakoñczon pomy\9clnie.$\r$\nWy³¹cz opcjê 'dla wszystkich u¿ytkowników'."\r
 \r
@@ -93,6 +100,12 @@ LangString lng_ContextMenu ${LANG_POLISH} "Menu kontekstowe"
 ; Context Menu description\r
 LangString lng_ContextMenuDesc ${LANG_POLISH} "Dodaj ${PRODUCT_NAME} do menu kontekstowego dla plików SVG"\r
 \r
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_POLISH} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_POLISH} "Delete personal preferences leftover from previous installations"\r
+\r
 \r
 ; Additional files section\r
 LangString lng_Addfiles $(LANG_POLISH) "Dodatkowe pliki"\r

diff --git a/packaging/win32/slovak.nsh b/packaging/win32/slovak.nsh
index 471f1e78e9ee5415a1b12c1f35b1ae760461d311..eee5f5d9fe060929190b13f5d24a2e132b680a64 100644 (file)
--- a/packaging/win32/slovak.nsh
+++ b/packaging/win32/slovak.nsh
@@ -9,6 +9,7 @@
 ; 11 august 2006 new languages dz bg\r
 ; 24 october 2006 new languages en_US@piglatin, th
 ; 3rd December 2006 new languages eu km\r
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 \r
 !insertmacro MUI_LANGUAGE "Slovak"\r
 \r
@@ -24,6 +25,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_SLOVAK} "$(^Name) je mo
 ;has been installed by different user\r
 LangString lng_DIFFERENT_USER ${LANG_SLOVAK} "Inkscape nain\9ataloval pou\9eívate¾ $0.$\r$\nIn\9atalácia nemusí správne skonèi\9d, ak v nej budete pokraèova\9d!$\r$\nProsím, prihláste sa ako $0 a spustite in\9ataláciu znova."\r
 \r
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_SLOVAK} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_SLOVAK} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ;you have no admin rigths\r
 LangString lng_NO_ADMIN ${LANG_SLOVAK} "Nemáte administrátorské práva.$\r$\nIn\9atalácia Inkscape pre v\9aetkých pou\9eívate¾ov nemusí skonèi\9d úspe\9ane.$\r$\nZru\9ate oznaèenie vo¾by 'Pre v\9aetkých pou\9eívate¾ov'."\r
 \r
@@ -93,6 +100,12 @@ LangString lng_ContextMenu ${LANG_SLOVAK} "Kontextov
 ; Context Menu description\r
 LangString lng_ContextMenuDesc ${LANG_SLOVAK} "Prida\9d ${PRODUCT_NAME} do kontextového menu pre SVG súbory"\r
 \r
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_SLOVAK} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_SLOVAK} "Delete personal preferences leftover from previous installations"\r
+\r
 \r
 ; Additional files section\r
 LangString lng_Addfiles $(LANG_SLOVAK) "Ïal\9aie súbory"\r

diff --git a/packaging/win32/slovenian.nsh b/packaging/win32/slovenian.nsh
index 1b2d60d263f40a7db60c273a48d55f6c46e826be..d2403b65c789df0a57e3b01203468869bf330a7c 100644 (file)
--- a/packaging/win32/slovenian.nsh
+++ b/packaging/win32/slovenian.nsh
@@ -8,7 +8,8 @@
 ; 27 july 2006 new languages en_CA, en_GB, fi, hr, mn, ne, rw, sq
 ; 11 august 2006 new languages dz bg
 ; 24 october 2006 new languages en_US@piglatin, th
-; 3rd December 2006 new languages eu km\r
+; 3rd December 2006 new languages eu km
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 
 ; !insertmacro MUI_LANGUAGE "Sloven\9aèina"
 !insertmacro MUI_LANGUAGE "Slovenian"
@@ -25,6 +26,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_SLOVENIAN} "$(^Name) je izdan pod li
 ;has been installed by different user
 LangString lng_DIFFERENT_USER ${LANG_SLOVENIAN} "Inkscape je \9ee namestil uporabnik $0.$\r$\nÈe nadaljujete, namestitev morda ne bo uspe\9ano dokonèana!$\r$\nPonovno se prijavite kot $0 in poskusite znova."
 
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_SLOVENIAN} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_SLOVENIAN} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ;you have no admin rigths
 LangString lng_NO_ADMIN ${LANG_SLOVENIAN} "Nimate skrbni\9akih pravic.$\r$\nName\9aèanje aplikacije Inkscape za vse uporabnike se morda ne bo konèala uspe\9ano.$\r$\nIzklopite mo\9enost 'za vse uporabnike'."
 
@@ -94,6 +101,12 @@ LangString lng_ContextMenu ${LANG_SLOVENIAN} "Pojavni meni"
 ; Context Menu description
 LangString lng_ContextMenuDesc ${LANG_SLOVENIAN} "Doda ${PRODUCT_NAME} v pojavni meni za datoteke SVG"
 
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_SLOVENIAN} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_SLOVENIAN} "Delete personal preferences leftover from previous installations"\r
+\r
 
 ; Additional files section
 LangString lng_Addfiles $(LANG_SLOVENIAN) "Dodatne datoteke"

diff --git a/packaging/win32/spanish.nsh b/packaging/win32/spanish.nsh
index 23f3d6220b0775a6357752184cf1eaa322e8e6ad..c18bbda1a86ec9d57b5a227569300921aec0b9cc 100644 (file)
--- a/packaging/win32/spanish.nsh
+++ b/packaging/win32/spanish.nsh
@@ -8,7 +8,8 @@
 ; 27 july 2006 new languages en_CA, en_GB, fi, hr, mn, ne, rw, sq
 ; 11 august 2006 new languages dz bg\r
 ; 24 october 2006 new languages en_US@piglatin, th
-; 3rd December 2006 new languages eu km\r
+; 3rd December 2006 new languages eu km
+; 14th December 2006 new lng_DeletePrefs, lng_DeletePrefsDesc, lng_WANT_UNINSTALL_BEFORE and lng_OK_CANCEL_DESC\r
 
 !insertmacro MUI_LANGUAGE "Spanish"
 
@@ -24,6 +25,12 @@ LangString lng_LICENSE_BOTTOM_TEXT   ${LANG_SPANISH} "$(^Name) se publica bajo l
 ;has been installed by different user\r
 LangString lng_DIFFERENT_USER ${LANG_SPANISH} "Inkscape has been installed by user $0.$\r$\nIf you continue you might not complete successfully!$\r$\nPlease log in as $0 and try again."\r
 \r
+; want to uninstall before install\r
+LangString lng_WANT_UNINSTALL_BEFORE ${LANG_SPANISH} "$R1 has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?"\r
+\r
+; press OK to continue press Cancel to abort\r
+LangString lng_OK_CANCEL_DESC ${LANG_SPANISH} "$\n$\nPress OK to continue or press CANCEL to abort."\r
+\r
 ;you have no admin rigths\r
 LangString lng_NO_ADMIN ${LANG_SPANISH} "You do not have administrator privileges.$\r$\nInstalling Inkscape for all users might not complete successfully.$\r$\nUncheck the 'for all users' option."\r
 \r
@@ -93,6 +100,11 @@ LangString lng_ContextMenu ${LANG_SPANISH} "Men
 ; Context Menu description
 LangString lng_ContextMenuDesc ${LANG_SPANISH} "Añadir ${PRODUCT_NAME} al menú contextual para archivos SVG"
 
+; remove personal preferences\r
+LangString lng_DeletePrefs ${LANG_SPANISH} "Delete personal preferences"\r
+\r
+; remove personal preferences description\r
+LangString lng_DeletePrefsDesc ${LANG_SPANISH} "Delete personal preferences leftover from previous installations"
 
 ; Additional files section
 LangString lng_Addfiles $(LANG_SPANISH) "Archivos adicionales"