fixing bugs:

31157
21575
27298
27578
27581
27582
27583
27589
27590
28537
28538
28539
28750
30436
29169
27579

windows platform only

r=sgehani
This commit is contained in:
ssu%netscape.com 2000-03-21 21:43:22 +00:00
parent e3042083ab
commit dbc6706464
5 changed files with 98 additions and 67 deletions
xpinstall
packager/windows
wizard/windows

@ -14,7 +14,7 @@ Product Name=Mozilla Seamonkey
; WINDISK
; WINDIR
; WINSYSDIR
Path=[PROGRAMFILESDIR]\Netscape\Seamonkey
Path=[PROGRAMFILESDIR]\Mozilla\Seamonkey
; Program Folder Path values:
; COMMON_STARTUP
@ -99,7 +99,7 @@ Show Dialog=TRUE
Title=Welcome
Message0=Welcome to %s Setup.
Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
Message2=Click Cancel to quit Setup and then close any programs you have running. Click Next to continue the Setup Program.
Message2=Click Cancel to quit Setup and then close any programs you have running. Click Next to continue the Setup program.
[Dialog License]
Show Dialog=FALSE
@ -111,7 +111,7 @@ Message1=Click Accept if you accept the terms of the preceeding license agreemen
[Dialog Setup Type]
Show Dialog=TRUE
Title=Setup Type
Message0=Click the type of Setup you prefer, then click Next.
Message0=Click the type of setup you prefer, then click Next.
Readme Filename=readme.txt
Readme App=notepad.exe
@ -140,7 +140,7 @@ C2=Component2
[Setup Type2]
Description Short=C&ustom
Description Long=You may choose the options you want to install. Recommended for advanced users.
Description Long=You may choose the options you want to install. Recommended for advanced users only.
;Description Short=&Pro
;Description Long=Program will be installed with all the options available.
@ -193,11 +193,11 @@ Archive=
[Dialog Program Folder]
Show Dialog=TRUE
Title=Program Folder
Message0=Setup will add program icons to the Program Folder listed below. You may type a new folder name, or select one from the existing folder list. Click Next to continue.
Title=Select Program Folder
Message0=Setup will add program icons to the Program Folder listed below. You may type a new folder name, or select one from the Existing Folder list. Click Next to continue.
[Dialog Start Install]
Show Dialog=TRUE
Show Dialog=FALSE
Title=Start Install
Message0=Setup has enough information to start copying the program files. If you want to review or change settings, click Back. If you are satisfied with the current settings, click Install to begin copying files.
@ -278,7 +278,7 @@ url0=$URLPath$
[Component2]
Description Short=Mail & News
Description Long=Seamonkey Mail & News
Description Long=Seamonkey Mail && News
Archive=mail.xpi
$InstallSize$:mail
$InstallSizeSystem$

@ -31,6 +31,7 @@
#include <shlobj.h>
static WNDPROC OldListBoxWndProc;
static BOOL gbProcessingXpnstallFiles;
void AskCancelDlg(HWND hDlg)
{
@ -128,7 +129,8 @@ LRESULT CALLBACK DlgProcMain(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
break;
case WM_CLOSE:
AskCancelDlg(hWnd);
if(gbProcessingXpnstallFiles == FALSE)
AskCancelDlg(hWnd);
bReturn = FALSE;
break;
@ -810,14 +812,14 @@ LRESULT CALLBACK DlgProcSelectComponents(HWND hDlg, UINT msg, WPARAM wParam, LON
DWORD dwItemsSelected[MAX_BUF];
HWND hwndLBComponents;
RECT rDlg;
RECT rLBComponentSize;
RECT rListBox;
// RECT rLBComponentSize;
// RECT rListBox;
TCHAR tchBuffer[MAX_BUF];
TEXTMETRIC tm;
DWORD y;
HDC hdcComponentSize;
// HDC hdcComponentSize;
LPDRAWITEMSTRUCT lpdis;
RECT rTemp;
// RECT rTemp;
ULONGLONG ullDSBuf;
char szBuf[MAX_BUF];
@ -874,9 +876,9 @@ LRESULT CALLBACK DlgProcSelectComponents(HWND hDlg, UINT msg, WPARAM wParam, LON
break;
SendMessage(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, (LPARAM)tchBuffer);
GetClientRect(lpdis->hwndItem, &rTemp);
hdcComponentSize = GetDC(lpdis->hwndItem);
SelectObject(hdcComponentSize, GetCurrentObject(lpdis->hDC, OBJ_FONT));
// GetClientRect(lpdis->hwndItem, &rTemp);
// hdcComponentSize = GetDC(lpdis->hwndItem);
// SelectObject(hdcComponentSize, GetCurrentObject(lpdis->hDC, OBJ_FONT));
if((lpdis->itemAction & ODA_FOCUS) && (lpdis->itemState & ODS_SELECTED))
{
@ -891,15 +893,15 @@ LRESULT CALLBACK DlgProcSelectComponents(HWND hDlg, UINT msg, WPARAM wParam, LON
{
SetTextColor(lpdis->hDC, GetSysColor(COLOR_WINDOWTEXT));
SetBkColor(lpdis->hDC, GetSysColor(COLOR_WINDOW));
SetTextColor(hdcComponentSize, GetSysColor(COLOR_WINDOWTEXT));
SetBkColor(hdcComponentSize, GetSysColor(COLOR_WINDOW));
// SetTextColor(hdcComponentSize, GetSysColor(COLOR_WINDOWTEXT));
// SetBkColor(hdcComponentSize, GetSysColor(COLOR_WINDOW));
}
else
{
SetTextColor(lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
SetBkColor(lpdis->hDC, GetSysColor(COLOR_HIGHLIGHT));
SetTextColor(hdcComponentSize, GetSysColor(COLOR_HIGHLIGHTTEXT));
SetBkColor(hdcComponentSize, GetSysColor(COLOR_HIGHLIGHT));
// SetTextColor(hdcComponentSize, GetSysColor(COLOR_HIGHLIGHTTEXT));
// SetBkColor(hdcComponentSize, GetSysColor(COLOR_HIGHLIGHT));
}
}
@ -918,6 +920,7 @@ LRESULT CALLBACK DlgProcSelectComponents(HWND hDlg, UINT msg, WPARAM wParam, LON
strlen(tchBuffer),
NULL);
#ifdef XXX_SSU
siCTemp = SiCNodeGetObject(lpdis->itemID, FALSE);
_ui64toa(siCTemp->ullInstallSizeArchive, tchBuffer, 10);
lstrcat(tchBuffer, " K");
@ -947,6 +950,7 @@ LRESULT CALLBACK DlgProcSelectComponents(HWND hDlg, UINT msg, WPARAM wParam, LON
tchBuffer,
strlen(tchBuffer),
NULL);
#endif
}
DrawCheck(lpdis);
@ -958,7 +962,7 @@ LRESULT CALLBACK DlgProcSelectComponents(HWND hDlg, UINT msg, WPARAM wParam, LON
DrawFocusRect(lpdis->hDC, &(lpdis->rcItem));
}
ReleaseDC(lpdis->hwndItem, hdcComponentSize);
// ReleaseDC(lpdis->hwndItem, hdcComponentSize);
bReturn = TRUE;
/* update the disk space required info in the dialog. It is already
@ -1653,6 +1657,7 @@ void DlgSequenceNext()
{
case DLG_NONE:
dwWizardState = DLG_WELCOME;
gbProcessingXpnstallFiles = FALSE;
if(diWelcome.bShowDialog)
InstantiateDialog(dwWizardState, diWelcome.szTitle, DlgProcWelcome);
else
@ -1661,6 +1666,7 @@ void DlgSequenceNext()
case DLG_WELCOME:
dwWizardState = DLG_LICENSE;
gbProcessingXpnstallFiles = FALSE;
if(diLicense.bShowDialog)
InstantiateDialog(dwWizardState, diLicense.szTitle, DlgProcLicense);
else
@ -1670,6 +1676,7 @@ void DlgSequenceNext()
case DLG_LICENSE:
dwWizardState = DLG_SETUP_TYPE;
gbProcessingXpnstallFiles = FALSE;
if(diSetupType.bShowDialog)
InstantiateDialog(dwWizardState, diSetupType.szTitle, DlgProcSetupType);
else
@ -1683,6 +1690,7 @@ void DlgSequenceNext()
/* depending on what the users chooses, the Select Components dialog */
/* might not be the next dialog in the sequence. */
dwWizardState = DLG_SELECT_COMPONENTS;
gbProcessingXpnstallFiles = FALSE;
if(diSelectComponents.bShowDialog)
InstantiateDialog(dwWizardState, diSelectComponents.szTitle, DlgProcSelectComponents);
else
@ -1691,6 +1699,7 @@ void DlgSequenceNext()
case DLG_SELECT_COMPONENTS:
dwWizardState = DLG_WINDOWS_INTEGRATION;
gbProcessingXpnstallFiles = FALSE;
if(diWindowsIntegration.bShowDialog)
InstantiateDialog(dwWizardState, diWindowsIntegration.szTitle, DlgProcWindowsIntegration);
else
@ -1699,6 +1708,7 @@ void DlgSequenceNext()
case DLG_WINDOWS_INTEGRATION:
dwWizardState = DLG_PROGRAM_FOLDER;
gbProcessingXpnstallFiles = FALSE;
do
{
hrValue = VerifyDiskSpace();
@ -1729,6 +1739,7 @@ void DlgSequenceNext()
case DLG_PROGRAM_FOLDER:
dwWizardState = DLG_START_INSTALL;
gbProcessingXpnstallFiles = FALSE;
if(diStartInstall.bShowDialog)
InstantiateDialog(dwWizardState, diStartInstall.szTitle, DlgProcStartInstall);
else
@ -1737,6 +1748,7 @@ void DlgSequenceNext()
default:
dwWizardState = DLG_START_INSTALL;
gbProcessingXpnstallFiles = TRUE;
/* PRE_DOWNLOAD process file manipulation functions */
ProcessFileOps(T_PRE_DOWNLOAD);
@ -1794,6 +1806,7 @@ void DlgSequenceNext()
CleanupCoreFile();
PostQuitMessage(0);
}
gbProcessingXpnstallFiles = FALSE;
break;
}
@ -1805,6 +1818,7 @@ void DlgSequencePrev()
{
case DLG_START_INSTALL:
dwWizardState = DLG_PROGRAM_FOLDER;
gbProcessingXpnstallFiles = FALSE;
if(diStartInstall.bShowDialog)
InstantiateDialog(dwWizardState, diProgramFolder.szTitle, DlgProcProgramFolder);
else
@ -1813,6 +1827,7 @@ void DlgSequencePrev()
case DLG_PROGRAM_FOLDER:
dwWizardState = DLG_WINDOWS_INTEGRATION;
gbProcessingXpnstallFiles = FALSE;
if(diWindowsIntegration.bShowDialog)
InstantiateDialog(dwWizardState, diWindowsIntegration.szTitle, DlgProcWindowsIntegration);
else
@ -1826,6 +1841,7 @@ void DlgSequencePrev()
/* depending on what the users chooses, the Select Components dialog */
/* might not be the next dialog in the sequence. */
dwWizardState = DLG_SELECT_COMPONENTS;
gbProcessingXpnstallFiles = FALSE;
if(diSelectComponents.bShowDialog)
InstantiateDialog(dwWizardState, diSelectComponents.szTitle, DlgProcSelectComponents);
else
@ -1834,6 +1850,7 @@ void DlgSequencePrev()
case DLG_SELECT_COMPONENTS:
dwWizardState = DLG_SETUP_TYPE;
gbProcessingXpnstallFiles = FALSE;
if(diSetupType.bShowDialog)
InstantiateDialog(dwWizardState, diSetupType.szTitle, DlgProcSetupType);
else
@ -1842,6 +1859,7 @@ void DlgSequencePrev()
case DLG_SETUP_TYPE:
dwWizardState = DLG_LICENSE;
gbProcessingXpnstallFiles = FALSE;
if(diLicense.bShowDialog)
InstantiateDialog(dwWizardState, diLicense.szTitle, DlgProcLicense);
else
@ -1850,6 +1868,7 @@ void DlgSequencePrev()
case DLG_LICENSE:
dwWizardState = DLG_WELCOME;
gbProcessingXpnstallFiles = FALSE;
if(diWelcome.bShowDialog)
InstantiateDialog(dwWizardState, diWelcome.szTitle, DlgProcWelcome);
else
@ -1858,6 +1877,7 @@ void DlgSequencePrev()
default:
dwWizardState = DLG_WELCOME;
gbProcessingXpnstallFiles = FALSE;
if(diWelcome.bShowDialog)
InstantiateDialog(DLG_WELCOME, diWelcome.szTitle, DlgProcWelcome);
else

@ -2923,7 +2923,12 @@ BOOL CheckLegacy()
{
if(FileExists(szDecryptedFilePath))
{
if(MessageBox(hWndMain, szMessage, NULL, MB_ICONEXCLAMATION | MB_YESNO) == IDYES)
char szMBWarningStr[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_MB_WARNING_STR, szMBWarningStr, MAX_BUF) != WIZ_OK)
lstrcpy(szMBWarningStr, "Warning");
if(MessageBox(hWndMain, szMessage, szMBWarningStr, MB_ICONWARNING | MB_YESNO) == IDYES)
return(TRUE);
}
/* file does not exist, so it's okay. Continue with the next check */
@ -2935,7 +2940,12 @@ BOOL CheckLegacy()
TranslateVersionStr(szVersionNew, &vbVersionNew);
if(CompareVersion(vbVersionOld, vbVersionNew) < 0)
{
if(MessageBox(hWndMain, szMessage, NULL, MB_ICONEXCLAMATION | MB_YESNO) == IDYES)
char szMBWarningStr[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_MB_WARNING_STR, szMBWarningStr, MAX_BUF) != WIZ_OK)
lstrcpy(szMBWarningStr, "Warning");
if(MessageBox(hWndMain, szMessage, szMBWarningStr, MB_ICONWARNING | MB_YESNO) == IDYES)
return(TRUE);
}
}
@ -2971,7 +2981,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
if(CheckInstances())
return(1);
ShowWindow(hWndMain, SW_SHOWNORMAL);
ShowWindow(hWndMain, SW_MAXIMIZE);
UpdateWindow(hWndMain);
if(InitSetupGeneral())

@ -40,6 +40,7 @@
#define IDS_STR_PROCESSINGFILE 26
#define IDS_STR_INSTALLING 27
#define IDS_STR_COPYINGFILE 28
#define IDS_MB_WARNING_STR 29
#define IDI_ICON1 105
#define IDI_SETUP 105
#define IDB_BITMAP_WELCOME 108

@ -54,22 +54,22 @@ END
//
DLG_WELCOME DIALOG DISCARDABLE 51, 56, 315, 205
STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE 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
LTEXT "",IDC_STATIC0,127,11,176,37,NOT WS_GROUP
LTEXT "",IDC_STATIC1,127,53,176,37,NOT WS_GROUP
LTEXT "",IDC_STATIC2,127,96,176,37,NOT WS_GROUP
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,80,160,
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
LTEXT "",IDC_STATIC0,101,11,202,37,NOT WS_GROUP
LTEXT "",IDC_STATIC1,102,53,201,37,NOT WS_GROUP
LTEXT "",IDC_STATIC2,102,96,201,37,NOT WS_GROUP
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
END
DLG_SETUP_TYPE DIALOG DISCARDABLE 51, 56, 315, 205
STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "",IDC_RADIO_ST0,"Button",BS_AUTORADIOBUTTON |
@ -83,49 +83,48 @@ BEGIN
LTEXT "",IDC_STATIC_ST1_DESCRIPTION,175,59,126,24
LTEXT "",IDC_STATIC_ST2_DESCRIPTION,175,86,126,24
GROUPBOX "&Destination Directory",IDC_STATIC,101,147,204,27
PUSHBUTTON "B&rowse...",IDC_BUTTON_BROWSE,255,157,46,12
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,12
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,12
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,12
PUSHBUTTON "B&rowse...",IDC_BUTTON_BROWSE,255,156,46,14
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
LTEXT "",IDC_STATIC_MSG0,101,11,204,17,NOT WS_GROUP
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,80,160,
WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
PUSHBUTTON "Readme",IDC_README,11,186,53,12
LTEXT "Static",IDC_EDIT_DESTINATION,107,160,144,9
PUSHBUTTON "Read Me",IDC_README,11,186,53,14
LTEXT "",IDC_EDIT_DESTINATION,107,160,144,9
END
DLG_SELECT_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205
STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
DLG_SELECT_COMPONENTS DIALOG DISCARDABLE 51, 56, 316, 205
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif"
BEGIN
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,12
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,12
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,12
LTEXT "Select the components you want to install, clear the components you do not want to install. ",
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
LTEXT "Netscape Navigator is always installed. Select or clear the additional components you want to install.",
IDC_STATIC,101,10,204,19,NOT WS_GROUP
LTEXT "C&omponents",IDC_STATIC,101,32,103,8
GROUPBOX "Description",IDC_STATIC,101,124,204,22
LTEXT "Component Description",IDC_STATIC_DESCRIPTION,106,133,
195,8
GROUPBOX "&Disk space information",IDC_STATIC,101,150,204,23
LTEXT "",IDC_STATIC_DESCRIPTION,106,133,195,8
GROUPBOX "&Download information",IDC_STATIC,101,150,204,23
LTEXT "Total download size:",IDC_STATIC,106,160,91,8,NOT
WS_GROUP
RTEXT "",IDC_STATIC_DRIVE_SPACE_REQUIRED,206,160,94,8,NOT
WS_GROUP
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,80,160,
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
LISTBOX IDC_LIST_COMPONENTS,101,42,204,78,LBS_OWNERDRAWFIXED |
LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
LTEXT "Download Size",IDC_STATIC,201,32,103,8,0,WS_EX_RIGHT
LTEXT "",IDC_STATIC,201,32,103,8,0,WS_EX_RIGHT
END
DLG_WINDOWS_INTEGRATION DIALOG DISCARDABLE 51, 56, 315, 205
STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "Check0",IDC_CHECK0,"Button",BS_AUTOCHECKBOX | BS_TOP |
@ -137,26 +136,26 @@ BEGIN
CONTROL "Check3",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | BS_TOP |
BS_MULTILINE | WS_TABSTOP,101,94,205,17
LTEXT "",IDC_MESSAGE1,101,117,205,54,NOT WS_GROUP
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,12
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,12
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,12
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
LTEXT "",IDC_MESSAGE0,101,11,204,17,NOT WS_GROUP
CONTROL 108,IDC_PICT0,"Static",SS_BITMAP,11,11,80,160,
CONTROL 108,IDC_PICT0,"Static",SS_BITMAP,11,11,83,162,
WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC0,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
END
DLG_PROGRAM_FOLDER DIALOG DISCARDABLE 51, 56, 315, 205
STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
DLG_PROGRAM_FOLDER DIALOG DISCARDABLE 51, 56, 316, 205
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif"
BEGIN
EDITTEXT IDC_EDIT_PROGRAM_FOLDER,101,64,204,12,ES_AUTOHSCROLL
LISTBOX IDC_LIST,101,94,204,77,LBS_SORT | LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,12
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,12
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,12
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Install",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
LTEXT "Click the type of Setup you prefer, then click Next.",
IDC_MESSAGE0,101,11,204,33,NOT WS_GROUP
LTEXT "&Program Folder:",IDC_STATIC,101,54,105,8
@ -168,14 +167,14 @@ BEGIN
END
DLG_LICENSE DIALOG DISCARDABLE 51, 56, 315, 205
STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "&Accept",IDWIZNEXT,188,186,53,12
PUSHBUTTON "&No",IDCANCEL,252,186,53,12
DEFPUSHBUTTON "&Accept",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&No",IDCANCEL,252,186,53,14
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
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
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,
@ -183,14 +182,14 @@ BEGIN
END
DLG_START_INSTALL DIALOG DISCARDABLE 51, 56, 315, 205
STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif"
BEGIN
EDITTEXT IDC_EDIT_CURRENT_SETTINGS,101,67,204,104,ES_MULTILINE |
ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,12
DEFPUSHBUTTON "&Install",IDWIZNEXT,188,186,53,12
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,12
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Install",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
LTEXT "Click the type of Setup you prefer, then click Next.",
IDC_MESSAGE0,101,11,204,33,NOT WS_GROUP
LTEXT "Current Settings:",IDC_STATIC,101,57,163,8,NOT WS_GROUP
@ -332,6 +331,7 @@ BEGIN
IDS_STR_PROCESSINGFILE "Preparing file: %s"
IDS_STR_INSTALLING "Currently installing %s"
IDS_STR_COPYINGFILE "Copying file: %s"
IDS_MB_WARNING_STR "Warning"
END
#endif // English (U.S.) resources