Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing bugs #29263 and 12359

Browse Source 
added readme and license files support.

a=cathleen
r=sgehani
This commit is contained in:
ssu%netscape.com 2000-03-01 00:42:11 +00:00
parent 03cf5064ad
commit c1a0560c89
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpinstall/packager/windows/config.it
View File

@ -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

2
xpinstall/wizard/windows/setup/dialogs.c
View File

@ -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, "\\");

1
xpinstall/wizard/windows/setup/extra.c
View File

@ -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;

10
xpinstall/wizard/windows/setuprsc/setuprsc.rc
View File

@ -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