From fadf9d2b1754eaa70465290167c44e4b55515e79 Mon Sep 17 00:00:00 2001 From: "ssu%netscape.com" Date: Thu, 6 Jul 2000 22:56:57 +0000 Subject: [PATCH] fixing nsbeta2+ bug 43404 - Update delete dialog text to be less scary. r=dbragg. Affects windows platforms only. --- xpinstall/packager/windows/config.it | 5 ++- xpinstall/wizard/windows/setup/dialogs.c | 1 + xpinstall/wizard/windows/setup/extra.c | 10 ++++- xpinstall/wizard/windows/setuprsc/setuprsc.rc | 37 ++++++++++--------- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/xpinstall/packager/windows/config.it b/xpinstall/packager/windows/config.it index 6c4be1f4372d..8708c08d35d6 100644 --- a/xpinstall/packager/windows/config.it +++ b/xpinstall/packager/windows/config.it @@ -96,8 +96,9 @@ Verify Existance= [Legacy Check0] Filename=[SETUP PATH]\$MainExeFile$ Version=5.0.0.0 -Message0=Setup has detected an old version of Mozilla in the chosen destination directory that may pose compatibility issues. It is recommended that Setup delete the destination directory (including its files), or a different destination directory be used. -Message1=If you choose to allow Setup to delete the destination directory, you will need to save and then restore any files that you have placed in the destination directory. Click Delete to delete the destination directory, or Back to go back and choose a different destination directory. +Message0=The destination directory already contains an earlier version of $ProductName$. To avoid problems, the installer will delete the destination directory and all its files, and then re-create the directory and install $ProductName$. +Message1=If you wish to keep any files currently in the destination directory, either save them to a temporary directory and restore them after the install OR install to an alternate directory. +Message2=Click Delete to delete the directory when installation begins. If you prefer not to delete the directory, click Back to go back and choose a different destination directory. [Dialog Welcome] Show Dialog=TRUE diff --git a/xpinstall/wizard/windows/setup/dialogs.c b/xpinstall/wizard/windows/setup/dialogs.c index 4a80f6caf44d..ffe97184917d 100644 --- a/xpinstall/wizard/windows/setup/dialogs.c +++ b/xpinstall/wizard/windows/setup/dialogs.c @@ -275,6 +275,7 @@ LRESULT CALLBACK DlgProcUpgrade(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam) SetDlgItemText(hDlg, IDC_DELETE_PATH, szStrList[0]); SetDlgItemText(hDlg, IDC_MESSAGE0, szStrList[1]); SetDlgItemText(hDlg, IDC_MESSAGE1, szStrList[2]); + SetDlgItemText(hDlg, IDC_MESSAGE2, szStrList[3]); if(GetClientRect(hDlg, &rDlg)) SetWindowPos(hDlg, HWND_TOP, (dwScreenX/2)-(rDlg.right/2), (dwScreenY/2)-(rDlg.bottom/2), 0, 0, SWP_NOSIZE); diff --git a/xpinstall/wizard/windows/setup/extra.c b/xpinstall/wizard/windows/setup/extra.c index e126567510df..520d359c960d 100644 --- a/xpinstall/wizard/windows/setup/extra.c +++ b/xpinstall/wizard/windows/setup/extra.c @@ -3862,7 +3862,7 @@ BOOL CheckLegacy(HWND hDlg) { char szSection[MAX_BUF]; char szFilename[MAX_BUF]; - LPSTR szMessage[3]; + LPSTR szMessage[4]; char szIndex[MAX_BUF]; char szVersionNew[MAX_BUF]; char szDecryptedFilePath[MAX_BUF]; @@ -3914,6 +3914,11 @@ BOOL CheckLegacy(HWND hDlg) bRv = TRUE; break; } + if((szMessage[3] = NS_GlobalAlloc(MAX_BUF)) == NULL) + { + bRv = TRUE; + break; + } lstrcpy(szMessage[0], sgProduct.szPath); if(*sgProduct.szSubPath != '\0') @@ -3924,7 +3929,8 @@ BOOL CheckLegacy(HWND hDlg) GetPrivateProfileString(szSection, "Message0", "", szMessage[1], MAX_BUF, szFileIniConfig); GetPrivateProfileString(szSection, "Message1", "", szMessage[2], MAX_BUF, szFileIniConfig); - if((*szMessage[1] == '\0') && (*szMessage[2] == '\0')) + GetPrivateProfileString(szSection, "Message2", "", szMessage[3], MAX_BUF, szFileIniConfig); + if((*szMessage[1] == '\0') && (*szMessage[2] == '\0') && (*szMessage[3] == '\0')) /* no message string input. so just continue with the next check */ continue; diff --git a/xpinstall/wizard/windows/setuprsc/setuprsc.rc b/xpinstall/wizard/windows/setuprsc/setuprsc.rc index 2a1b88681d05..0b3eb226cd81 100644 --- a/xpinstall/wizard/windows/setuprsc/setuprsc.rc +++ b/xpinstall/wizard/windows/setuprsc/setuprsc.rc @@ -52,7 +52,7 @@ END // Dialog // -DLG_WELCOME DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_WELCOME DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -67,7 +67,7 @@ BEGIN WS_EX_STATICEDGE END -DLG_SETUP_TYPE DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_SETUP_TYPE DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -96,7 +96,7 @@ BEGIN WS_GROUP,107,160,143,9 END -DLG_SELECT_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_SELECT_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -122,7 +122,7 @@ BEGIN LTEXT "Space Available:",IDC_STATIC,206,148,94,9 END -DLG_WINDOWS_INTEGRATION DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_WINDOWS_INTEGRATION DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -145,7 +145,7 @@ BEGIN WS_EX_STATICEDGE END -DLG_PROGRAM_FOLDER DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_PROGRAM_FOLDER DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -164,7 +164,7 @@ BEGIN WS_EX_STATICEDGE END -DLG_LICENSE DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_LICENSE DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -179,7 +179,7 @@ BEGIN WS_EX_STATICEDGE END -DLG_START_INSTALL DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_START_INSTALL DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -198,7 +198,7 @@ BEGIN WS_EX_STATICEDGE END -DLG_BROWSE_DIR DIALOG DISCARDABLE 147, 23, 190, 143 +DLG_BROWSE_DIR DIALOG DISCARDABLE 147, 23, 190, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select a directory" FONT 8, "MS Shell Dlg" @@ -250,7 +250,7 @@ BEGIN CONTROL "",IDC_GAUGE_ARCHIVE,"GaugeArchive",0x0,9,21,175,11 END -DLG_ADVANCED_SETTINGS DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_ADVANCED_SETTINGS DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -275,7 +275,7 @@ BEGIN GROUPBOX "Proxy Settings:",IDC_STATIC,101,70,206,51 END -DLG_SELECT_ADDITIONAL_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205 +DLG_SELECT_ADDITIONAL_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN @@ -301,16 +301,17 @@ BEGIN LTEXT "Space Available:",IDC_STATIC,206,148,94,9 END -DLG_UPGRADE DIALOG DISCARDABLE 51, 56, 306, 157 +DLG_UPGRADE DIALOG DISCARDABLE 51, 56, 310, 166 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "&Back",IDWIZBACK,160,131,53,14 - PUSHBUTTON "&Delete",ID_DELETE,93,131,53,14 - LTEXT "",IDC_MESSAGE0,16,13,272,30,NOT WS_GROUP - LTEXT "",IDC_MESSAGE1,16,47,272,38,NOT WS_GROUP - LTEXT "",IDC_DELETE_PATH,21,103,260,13,SS_CENTERIMAGE - GROUPBOX "Destination Directory",IDC_STATIC,15,94,272,25 + DEFPUSHBUTTON "&Back",IDWIZBACK,162,139,53,14 + PUSHBUTTON "&Delete",ID_DELETE,95,139,53,14 + LTEXT "",IDC_MESSAGE0,17,13,276,31,NOT WS_GROUP + LTEXT "",IDC_MESSAGE1,17,48,276,21,NOT WS_GROUP + LTEXT "",IDC_DELETE_PATH,22,111,264,13,SS_CENTERIMAGE + GROUPBOX "Destination Directory",IDC_STATIC,16,102,276,25 + LTEXT "",IDC_MESSAGE2,17,73,276,21,NOT WS_GROUP END @@ -348,7 +349,7 @@ BEGIN DLG_UPGRADE, DIALOG BEGIN - BOTTOMMARGIN, 156 + BOTTOMMARGIN, 165 END END #endif // APSTUDIO_INVOKED