Author: mkupfer Date: Mon Nov 17 12:23:06 2008 New Revision: 37414
URL: http://svn.reactos.org/svn/reactos?rev=37414&view=rev Log: - add summary page to check settings before start installation - add disabled driver button for future use
Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/resource.h
Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -60,12 +60,13 @@ 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
Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en-... ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -60,12 +60,13 @@ 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 @@ 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 @@ -94,6 +95,14 @@ CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE 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 @@ -137,6 +146,8 @@ 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
Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos.... ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -674,6 +674,57 @@ }
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, WPARAM wParam, @@ -995,7 +1046,7 @@ int nCmdShow) { PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[7]; + HPROPSHEETPAGE ahpsp[8]; PROPSHEETPAGE psp = {0}; UINT nPages = 0; hInstance = hInst; @@ -1052,7 +1103,7 @@ 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); @@ -1061,6 +1112,17 @@ psp.lParam = 0; 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);
}
Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resource... ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -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