From: <che...@us...> - 2009-06-20 01:14:36
|
Revision: 2944 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2944&view=rev Author: chef_koch Date: 2009-06-20 00:31:06 +0000 (Sat, 20 Jun 2009) Log Message: ----------- added UninstallModePage.nsh tve2blaster plugin will be removed on installation uuninstallation: removed confirm page Modified Paths: -------------- trunk/plugins/IR Server Suite/setup/languages/English.nsh trunk/plugins/IR Server Suite/setup/setup.nsi Added Paths: ----------- trunk/plugins/IR Server Suite/setup/pages/UninstallModePage.nsh Modified: trunk/plugins/IR Server Suite/setup/languages/English.nsh =================================================================== --- trunk/plugins/IR Server Suite/setup/languages/English.nsh 2009-06-19 23:38:21 UTC (rev 2943) +++ trunk/plugins/IR Server Suite/setup/languages/English.nsh 2009-06-20 00:31:06 UTC (rev 2944) @@ -49,6 +49,20 @@ !insertmacro LANG_STRING TEXT_ADDREMOVE_UPDOWN_OPT2 "Change settings (advanced)" +# Strings for UninstallMode-Page +!insertmacro LANG_STRING TEXT_UNMODE_HEADER "Uninstallation Mode" +!insertmacro LANG_STRING TEXT_UNMODE_HEADER2 "Please choose the mode, you want to do the uninstallation." +!insertmacro LANG_STRING TEXT_UNMODE_OPT0 "Standard Uninstall (recommended)" +!insertmacro LANG_STRING TEXT_UNMODE_OPT1 "Complete Uninstallation for ${PRODUCT_NAME}" +;!insertmacro LANG_STRING TEXT_UNMODE_OPT2 "Full MediaPortal Products cleanup" +!insertmacro LANG_STRING TEXT_UNMODE_OPT0_DESC "Only the main application will be uninstalled. Userfiles and settings won't be deleted (recommended)" +!insertmacro LANG_STRING TEXT_UNMODE_OPT1_DESC "This will uninstall ${PRODUCT_NAME} and remove all userfiles" +;!insertmacro LANG_STRING TEXT_UNMODE_OPT2_DESC "This will also remove all files, folders, databases, settings and registry keys which might be leftovers from older MediaPortal versions." +!insertmacro LANG_STRING TEXT_UNMODE_OPT1_MSGBOX "Are you sure that you want to do a Complete Uninstallation? This can not be undone!" +;!insertmacro LANG_STRING TEXT_UNMODE_OPT2_MSGBOX "Are you sure that you want to do a Full MediaPortal Products cleanup? This can not be undone!" + + + # Strings for ServerServiceMode-Page !insertmacro LANG_STRING ServerServiceModePage_HEADER "Choose the Server/Service Mode" !insertmacro LANG_STRING ServerServiceModePage_HEADER2 "Choose whether you want to use InputService or IRServer" Added: trunk/plugins/IR Server Suite/setup/pages/UninstallModePage.nsh =================================================================== --- trunk/plugins/IR Server Suite/setup/pages/UninstallModePage.nsh (rev 0) +++ trunk/plugins/IR Server Suite/setup/pages/UninstallModePage.nsh 2009-06-20 00:31:06 UTC (rev 2944) @@ -0,0 +1,113 @@ +#region Copyright (C) 2005-2009 Team MediaPortal + +/* + * Copyright (C) 2005-2009 Team MediaPortal + * http://www.team-mediaportal.com + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Make; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +#endregion + +/* +_____________________________________________________________________________ + + UninstallModePage +_____________________________________________________________________________ +*/ + +!ifndef UninstallModePage_INCLUDED +!define UninstallModePage_INCLUDED + + +Var UnInstallMode +Var uninstModePage.optBtn0 +Var uninstModePage.optBtn0.state +Var uninstModePage.optBtn1 +Var uninstModePage.optBtn1.state +;Var uninstModePage.optBtn2 +;Var uninstModePage.optBtn2.state + +Function un.UninstallModePage + ${If} $frominstall == 1 + StrCpy $UnInstallMode 0 + Abort + ${EndIf} + + !insertmacro MUI_HEADER_TEXT "$(TEXT_UNMODE_HEADER)" "$(TEXT_UNMODE_HEADER2)" + + nsDialogs::Create /NOUNLOAD 1018 + + ;${NSD_CreateLabel} 0 0 100% 24u "$(TEXT_UNMODE_INFO)" + ;Pop $R1 + + + ${NSD_CreateRadioButton} 20u 20u -20u 8u "$(TEXT_UNMODE_OPT0)" + Pop $uninstModePage.optBtn0 + ${NSD_OnClick} $uninstModePage.optBtn0 un.UninstallModePageUpdateSelection + + ${NSD_CreateLabel} 30u 30u -30u 24u "$(TEXT_UNMODE_OPT0_DESC)" + + + ${NSD_CreateRadioButton} 20u 60u -20u 8u "$(TEXT_UNMODE_OPT1)" + Pop $uninstModePage.optBtn1 + ${NSD_OnClick} $uninstModePage.optBtn1 un.UninstallModePageUpdateSelection + + ${NSD_CreateLabel} 30u 70u -30u 24u "$(TEXT_UNMODE_OPT1_DESC)" + + + ;${NSD_CreateRadioButton} 20u 100u -20u 8u "$(TEXT_UNMODE_OPT2)" + ;Pop $uninstModePage.optBtn2 + ;${NSD_OnClick} $uninstModePage.optBtn2 un.UninstallModePageUpdateSelection + + ;${NSD_CreateLabel} 30u 110u -30u 24u "$(TEXT_UNMODE_OPT2_DESC)" + + + SendMessage $uninstModePage.optBtn0 ${BM_SETCHECK} ${BST_CHECKED} 0 + + nsDialogs::Show +FunctionEnd + +Function un.UninstallModePageUpdateSelection + + ${NSD_GetState} $uninstModePage.optBtn0 $uninstModePage.optBtn0.state + ${NSD_GetState} $uninstModePage.optBtn1 $uninstModePage.optBtn1.state + ;${NSD_GetState} $uninstModePage.optBtn2 $uninstModePage.optBtn2.state + + ${If} $uninstModePage.optBtn1.state == ${BST_CHECKED} + StrCpy $UnInstallMode 1 + ;${ElseIf} $uninstModePage.optBtn2.state == ${BST_CHECKED} + ; StrCpy $UnInstallMode 2 + ${Else} + StrCpy $UnInstallMode 0 + ${EndIf} + +FunctionEnd + +Function un.UninstallModePageLeave + + ${If} $UnInstallMode == 1 + MessageBox MB_YESNO|MB_ICONEXCLAMATION|MB_DEFBUTTON2 "$(TEXT_UNMODE_OPT1_MSGBOX)" IDYES +2 + Abort + ;${ElseIf} $UnInstallMode == 2 + ; MessageBox MB_YESNO|MB_ICONEXCLAMATION|MB_DEFBUTTON2 "$(TEXT_UNMODE_OPT2_MSGBOX)" IDYES +2 + ; Abort + ${EndIf} + +FunctionEnd + +!endif # UninstallModePage_INCLUDED Modified: trunk/plugins/IR Server Suite/setup/setup.nsi =================================================================== --- trunk/plugins/IR Server Suite/setup/setup.nsi 2009-06-19 23:38:21 UTC (rev 2943) +++ trunk/plugins/IR Server Suite/setup/setup.nsi 2009-06-20 00:31:06 UTC (rev 2944) @@ -115,7 +115,7 @@ !include "pages\AddRemovePage.nsh" !include "pages\ServerServiceMode.nsh" -;!include "pages\UninstallModePage.nsh" +!include "pages\UninstallModePage.nsh" #--------------------------------------------------------------------------- @@ -206,8 +206,9 @@ ; UnInstaller Interface !define MUI_PAGE_CUSTOMFUNCTION_PRE un.WelcomePagePre !insertmacro MUI_UNPAGE_WELCOME -!define MUI_PAGE_CUSTOMFUNCTION_PRE un.ConfirmPagePre -!insertmacro MUI_UNPAGE_CONFIRM +UninstPage custom un.UninstallModePage un.UninstallModePageLeave +;!define MUI_PAGE_CUSTOMFUNCTION_PRE un.ConfirmPagePre +;!insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES !define MUI_PAGE_CUSTOMFUNCTION_PRE un.FinishPagePre !insertmacro MUI_UNPAGE_FINISH @@ -1025,6 +1026,9 @@ !insertmacro StartTVService !endif + ; removing tve2 blaster + Delete "$MPdir.Plugins\Process\TV2BlasterPlugin.dll" + ; Use the all users context SetShellVarContext all @@ -1114,7 +1118,13 @@ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" DeleteRegKey HKLM "Software\${PRODUCT_NAME}" + ${If} $UnInstallMode == 1 + ${LOG_TEXT} "INFO" "Removing User Settings" + RMDir /r "$APPDATA\${PRODUCT_NAME}" + + ${EndIf} + ${If} $frominstall == 1 Quit ${EndIf} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |