Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:05:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSSETUP]

Browse source 
Move the locale page between the acknowledgments and the owner/computer name pages.
Arch, you do not want to type your Russian password with an English layout, do you ? 

svn path=/trunk/; revision=61593
This commit is contained in:
Sylvain Petreolle 2014-01-12 15:38:17 +00:00
parent 6d5ade5442
commit 4ba150ba61
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
reactos/dll/win32/syssetup/wizard.c
View file

@ -366,7 +366,7 @@ AckPageDlgProc(HWND hwndDlg,
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
if (SetupData.UnattendSetup) if (SetupData.UnattendSetup)
{ {
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_OWNERPAGE); SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_LOCALEPAGE);
return TRUE; return TRUE;
} }
break; break;
@ -634,7 +634,7 @@ ComputerPageDlgProc(HWND hwndDlg,
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
if (SetupData.UnattendSetup && WriteComputerSettings(SetupData.ComputerName, hwndDlg)) if (SetupData.UnattendSetup && WriteComputerSettings(SetupData.ComputerName, hwndDlg))
{ {
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_LOCALEPAGE); SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE);
return TRUE; return TRUE;
} }
break; break;
@ -918,7 +918,7 @@ LocalePageDlgProc(HWND hwndDlg,
RunControlPanelApplet(hwndDlg, L"intl.cpl,,/f:\"unattend.inf\""); RunControlPanelApplet(hwndDlg, L"intl.cpl,,/f:\"unattend.inf\"");
} }
SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_OWNERPAGE);
return TRUE; return TRUE;
} }
break; break;
@ -2276,6 +2276,15 @@ InstallWizard(VOID)
psp.pfnDlgProc = AckPageDlgProc; psp.pfnDlgProc = AckPageDlgProc;
ahpsp[nPages++] = CreatePropertySheetPage(&psp); ahpsp[nPages++] = CreatePropertySheetPage(&psp);
/* Create the Locale page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_LOCALETITLE);
psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_LOCALESUBTITLE);
psp.pfnDlgProc = LocalePageDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_LOCALEPAGE);
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
/* Create the Owner page */ /* Create the Owner page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_OWNERTITLE); psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_OWNERTITLE);
@ -2293,15 +2302,6 @@ InstallWizard(VOID)
ahpsp[nPages++] = CreatePropertySheetPage(&psp); ahpsp[nPages++] = CreatePropertySheetPage(&psp);
/* Create the Locale page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_LOCALETITLE);
psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_LOCALESUBTITLE);
psp.pfnDlgProc = LocalePageDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_LOCALEPAGE);
ahpsp[nPages++] = CreatePropertySheetPage(&psp);
/* Create the DateTime page */ /* Create the DateTime page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DATETIMETITLE); psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DATETIMETITLE);