Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-02 17:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

- add summary page to check settings before start installation

Browse source 
- add disabled driver button for future use

svn path=/trunk/; revision=37414
This commit is contained in:
Matthias Kupfer 2008-11-17 18:23:06 +00:00
parent 191a64db66
commit f1fcb8e5cb
4 changed files with 84 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/base/setup/reactos/lang/de-DE.rc
View file

@ -60,12 +60,13 @@ BEGIN
LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL
PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15
PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15
PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED
PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15
LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20
END
IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105
STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME
STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME
CAPTION "Advanced Partition Settings"
FONT 8, "MS Shell Dlg"
BEGIN

17
reactos/base/setup/reactos/lang/en-US.rc
View file

@ -60,12 +60,13 @@ BEGIN
LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL
PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15
PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15
PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15
PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15
PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15, WS_DISABLED
LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20
END
IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90
STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME
STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME
CAPTION "Create Partition"
FONT 8, "MS Shell Dlg"
BEGIN
@ -81,7 +82,7 @@ BEGIN
END
IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105
STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME
STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME
CAPTION "Advanced Partition Settings"
FONT 8, "MS Shell Dlg"
BEGIN
@ -96,6 +97,14 @@ BEGIN
PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Setup"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172
END
IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Setup"
@ -137,6 +146,8 @@ BEGIN
IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader"
IDS_RESTARTTITLE "First stage of setup finished"
IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage"
IDS_SUMMARYTITLE "Installation Summary"
IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device"
IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?"
IDS_ABORTSETUP2 "Abort installation?"
END

66
reactos/base/setup/reactos/reactos.c
View file

@ -673,6 +673,57 @@ DriveDlgProc(HWND hwndDlg,
return FALSE;
}
static INT_PTR CALLBACK
SummaryDlgProc(HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
LPARAM lParam)
{
switch (uMsg)
{
case WM_INITDIALOG:
{
HWND hwndControl;
DWORD dwStyle;
hwndControl = GetParent(hwndDlg);
dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow (hwndControl, SW_HIDE);
EnableWindow (hwndControl, FALSE);
/* Set title font */
/*SendDlgItemMessage(hwndDlg,
IDC_STARTTITLE,
WM_SETFONT,
(WPARAM)hTitleFont,
(LPARAM)TRUE);*/
}
break;
case WM_NOTIFY:
{
LPNMHDR lpnm = (LPNMHDR)lParam;
switch (lpnm->code)
{
case PSN_SETACTIVE:
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
break;
default:
break;
}
break;
default:
break;
}
}
return FALSE;
}
static INT_PTR CALLBACK
ProcessDlgProc(HWND hwndDlg,
UINT uMsg,
@ -995,7 +1046,7 @@ WinMain(HINSTANCE hInst,
int nCmdShow)
{
PROPSHEETHEADER psh;
HPROPSHEETPAGE ahpsp[7];
HPROPSHEETPAGE ahpsp[8];
PROPSHEETPAGE psp = {0};
UINT nPages = 0;
hInstance = hInst;
@ -1052,7 +1103,7 @@ WinMain(HINSTANCE hInst,
psp.pszTemplate = MAKEINTRESOURCE(IDD_DEVICEPAGE);
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
/* Create install device settings page / boot method / install directory*/
/* Create install device settings page / boot method / install directory */
psp.dwSize = sizeof(PROPSHEETPAGE);
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DRIVETITLE);
@ -1062,6 +1113,17 @@ WinMain(HINSTANCE hInst,
psp.pfnDlgProc = DriveDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_DRIVEPAGE);
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
/* Create summary page */
psp.dwSize = sizeof(PROPSHEETPAGE);
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SUMMARYTITLE);
psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_SUMMARYSUBTITLE);
psp.hInstance = hInst;
psp.lParam = 0;
psp.pfnDlgProc = SummaryDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_SUMMARYPAGE);
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
}

5
reactos/base/setup/reactos/resource.h
View file

@ -56,7 +56,10 @@
#define IDC_PARTSIZE 2045
#define IDC_UNIT 2046
#define IDC_FSTYPE 2047
#define IDD_SUMMARYPAGE 2048
#define IDS_SUMMARYTITLE 2049
#define IDS_SUMMARYSUBTITLE 2050
#define IDC_DEVICEDRIVER 2051
#define IDI_MAIN 3000