From c1a0560c897b0a0cae5bf7993578ecca890d89a8 Mon Sep 17 00:00:00 2001 From: "ssu%netscape.com" Date: Wed, 1 Mar 2000 00:42:11 +0000 Subject: [PATCH] fixing bugs #29263 and 12359 added readme and license files support. a=cathleen r=sgehani --- xpinstall/packager/windows/config.it | 4 ++-- xpinstall/wizard/windows/setup/dialogs.c | 2 ++ xpinstall/wizard/windows/setup/extra.c | 1 + xpinstall/wizard/windows/setuprsc/setuprsc.rc | 10 ++++------ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xpinstall/packager/windows/config.it b/xpinstall/packager/windows/config.it index 809ad6a8ce33..0603af9e6bd1 100644 --- a/xpinstall/packager/windows/config.it +++ b/xpinstall/packager/windows/config.it @@ -93,8 +93,8 @@ Message2=Click Cancel to quit Setup and then close any programs you have running Show Dialog=FALSE Title=Software License Agreement License File=license.txt -Message0= -Message1= +Message0=Please read the following license agreement. Use the scroll bar to view the rest of this agreement. +Message1=Click Accept if you accept the terms of the preceeding license agreement. If No is clicked, setup will quit. [Dialog Setup Type] Show Dialog=TRUE diff --git a/xpinstall/wizard/windows/setup/dialogs.c b/xpinstall/wizard/windows/setup/dialogs.c index 12c95271ea14..dd5b1135abf6 100644 --- a/xpinstall/wizard/windows/setup/dialogs.c +++ b/xpinstall/wizard/windows/setup/dialogs.c @@ -197,6 +197,8 @@ LRESULT CALLBACK DlgProcLicense(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam) { case WM_INITDIALOG: SetWindowText(hDlg, diLicense.szTitle); + SetDlgItemText(hDlg, IDC_MESSAGE0, diLicense.szMessage0); + SetDlgItemText(hDlg, IDC_MESSAGE1, diLicense.szMessage1); lstrcpy(szBuf, szSetupDir); lstrcat(szBuf, "\\"); diff --git a/xpinstall/wizard/windows/setup/extra.c b/xpinstall/wizard/windows/setup/extra.c index 73daf5fb405c..4c102b2ab6cd 100644 --- a/xpinstall/wizard/windows/setup/extra.c +++ b/xpinstall/wizard/windows/setup/extra.c @@ -2948,6 +2948,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine) GetPrivateProfileString("Dialog License", "Title", "", diLicense.szTitle, MAX_BUF, szFileIniConfig); GetPrivateProfileString("Dialog License", "License File", "", diLicense.szLicenseFilename, MAX_BUF, szFileIniConfig); GetPrivateProfileString("Dialog License", "Message0", "", diLicense.szMessage0, MAX_BUF, szFileIniConfig); + GetPrivateProfileString("Dialog License", "Message1", "", diLicense.szMessage1, MAX_BUF, szFileIniConfig); if(lstrcmpi(szShowDialog, "TRUE") == 0) diLicense.bShowDialog = TRUE; diff --git a/xpinstall/wizard/windows/setuprsc/setuprsc.rc b/xpinstall/wizard/windows/setuprsc/setuprsc.rc index 9225e47980b7..a24a19ee5e9d 100644 --- a/xpinstall/wizard/windows/setuprsc/setuprsc.rc +++ b/xpinstall/wizard/windows/setuprsc/setuprsc.rc @@ -171,15 +171,13 @@ DLG_LICENSE DIALOG DISCARDABLE 51, 56, 315, 205 STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,12 - PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,12 + DEFPUSHBUTTON "&Accept",IDWIZNEXT,188,186,53,12 + PUSHBUTTON "&No",IDCANCEL,252,186,53,12 EDITTEXT IDC_EDIT_LICENSE,11,29,295,119,ES_MULTILINE | ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_GROUP PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,12 - LTEXT "Click the type of Setup you prefer, then click Next.", - -1,11,8,295,17,NOT WS_GROUP - LTEXT "Static",IDC_STATIC_DESCRIPTION,11,152,295,19,NOT - WS_GROUP + LTEXT "",IDC_MESSAGE0,11,8,295,17,NOT WS_GROUP + LTEXT "",IDC_MESSAGE1,11,152,295,19,NOT WS_GROUP CONTROL "",-1,"Static",SS_ETCHEDHORZ,11,179,295,1, WS_EX_STATICEDGE END