Changeset 156 for smplayer/trunk/setup/smplayer.nsi

Timestamp:

Feb 21, 2014, 5:26:03 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.6

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• setup/smplayer.nsi (modified) (16 diffs)

smplayer/trunk/setup/smplayer.nsi

@@ -97 +97 @@
   Var Reinstall_OverwriteButton
   Var Reinstall_OverwriteButton_State
+  Var Reinstall_RemoveSettings
+  Var Reinstall_RemoveSettings_State
   Var Reinstall_Uninstall
   Var Reinstall_UninstallButton
@@ -361 +363 @@
 
     SetOutPath "$INSTDIR\mplayer"
-    File /r /x mencoder.exe "${SMPLAYER_BUILD_DIR}\mplayer\*.*"
+    File /r /x mplayer.exe /x mencoder.exe /x mplayer64.exe /x mencoder64.exe "${SMPLAYER_BUILD_DIR}\mplayer\*.*"
+!ifdef WIN64
+    File /oname=mplayer.exe "${SMPLAYER_BUILD_DIR}\mplayer\mplayer64.exe"
+!else
+    File "${SMPLAYER_BUILD_DIR}\mplayer\mplayer.exe"
+!endif
 
     WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_MPlayer 0x1
@@ -368 +375 @@
 
   Section /o $(Section_MPlayerCodecs) SecCodecs
+
+!ifdef WIN64
+    SectionIn RO
+!endif
 
     AddSize 22931
@@ -442 +453 @@
 ${MementoSectionEnd}
 
+Section /o $(Reinstall_Msg5) SecResetSettings
+
+    NsExec::Exec '"$INSTDIR\smplayer.exe" -delete-config'
+
+SectionEnd
+
 ;--------------------------------
 ;Install/Uninstall information
@@ -492 +509 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecThemes} $(Section_IconThemes_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTranslations} $(Section_Translations_Desc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecResetSettings} $(Section_ResetSettings_Desc)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -642 +660 @@
 Function .onInit
 
-/*
   ${Unless} ${AtLeastWinXP}
     MessageBox MB_YESNO|MB_ICONSTOP $(OS_Not_Supported) /SD IDNO IDYES installonoldwindows
@@ -648 +665 @@
   installonoldwindows:
   ${EndIf}
-*/
 
 !ifdef WIN64
@@ -719 +735 @@
   ${MementoSectionSave}
 
-  ExecShell "open" "http://smplayer.sourceforge.net/thank-you.php?version=${SMPLAYER_VERSION}"
+/*
+  ${Unless} $Reinstall_Uninstall == 1
+    ExecShell "open" "http://smplayer.sourceforge.net/thank-you.php?version=${SMPLAYER_VERSION}"
+  ${EndIf}
+*/
 
 FunctionEnd
@@ -736 +756 @@
 FunctionEnd
 
-Function un.onUninstSuccess
+/* Function un.onUninstSuccess
 
   ;Don't launch uninstall page if reinstalling
@@ -745 +765 @@
   ExecShell "open" "http://smplayer.sourceforge.net/uninstall.php?version=${SMPLAYER_VERSION}"
 
-FunctionEnd
+FunctionEnd */
 
 Function CheckPreviousVersion
@@ -794 +814 @@
 
   ;MPlayer codecs section doesn't use Memento so we need to restore it manually
-  ReadRegDWORD $R0 HKLM "${SMPLAYER_REG_KEY}" "Installed_Codecs"
-  ${If} $R0 == 1
-    !insertmacro SelectSection ${SecCodecs}
-  ${EndIf}
+  ;32-bit only
+!ifdef WIN64
+    !insertmacro UnSelectSection ${SecCodecs}
+!else
+    ReadRegDWORD $R0 HKLM "${SMPLAYER_REG_KEY}" "Installed_Codecs"
+    ${If} $R0 == 1
+      !insertmacro SelectSection ${SecCodecs}
+    ${EndIf}
+!endif
 
   ;Gets start menu folder name
@@ -834 +859 @@
   Pop $Reinstall_ChgSettings
 
-  ${NSD_CreateLabel} 0 115u 100% 16u 
+  ${NSD_CreateCheckBox} 0 102u 100% 8u $(Reinstall_Msg5)
+  Pop $Reinstall_RemoveSettings
+
+  ${NSD_CreateLabel} 0 121u 100% 16u 
   Pop $Reinstall_Message
 
@@ -844 +872 @@
   ${Endif}
 
+  ${If} $Reinstall_RemoveSettings_State == 1
+    SendMessage $Reinstall_RemoveSettings ${BM_SETCHECK} 1 0
+  ${Endif}
+
   ${NSD_OnClick} $Reinstall_OverwriteButton PageReinstallUpdate
   ${NSD_OnClick} $Reinstall_UninstallButton PageReinstallUpdate
@@ -859 +891 @@
   ${NSD_GetState} $Reinstall_UninstallButton $Reinstall_UninstallButton_State
   ${NSD_GetState} $Reinstall_ChgSettings $Reinstall_ChgSettings_State
+  ${NSD_GetState} $Reinstall_RemoveSettings $Reinstall_RemoveSettings_State
+
+  ${If} $Reinstall_RemoveSettings_State == 1
+    !insertmacro SelectSection ${SecResetSettings}
+  ${EndIf}
 
 FunctionEnd
@@ -871 +908 @@
 
     EnableWindow $Reinstall_ChgSettings 1
+    EnableWindow $Reinstall_RemoveSettings 1
 
     GetDlgItem $R0 $HWNDPARENT 1
@@ -886 +924 @@
     ${NSD_SetState} $Reinstall_ChgSettings 0
 
+    EnableWindow $Reinstall_RemoveSettings 0
+    ${NSD_SetState} $Reinstall_RemoveSettings 0
+
     GetDlgItem $R0 $HWNDPARENT 1
     SendMessage $R0 ${WM_SETTEXT} 0 "STR:$(^UninstallBtn)"