18 Jul
2008
18 Jul
'08
7:35 p.m.
Author: frik85
Date: Fri Jul 18 14:35:03 2008
New Revision: 34576
URL: http://svn.reactos.org/svn/reactos?rev=34576&view=rev
Log:
* update GUI interface, according to
http://www.reactos.org/wiki/index.php/First_Stage_GUI_Setup
Added:
trunk/reactos/base/setup/reactos/res/rosbitmap.bmp (with props)
Modified:
trunk/reactos/base/setup/reactos/lang/en-US.rc
trunk/reactos/base/setup/reactos/reactos.rc
trunk/reactos/base/setup/reactos/resource.h
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] Fri Jul 18 14:35:03 2008
@@ -19,10 +19,11 @@
CAPTION "ReactOS Setup"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Please choose the language used for the installation process."
- , IDC_STATIC, 10, 0, 297, 10
- LTEXT "The selected language will be the default language for the final
system.", IDC_STATIC, 10, 13, 297, 10
- LISTBOX IDC_LANGUAGES, 10,28,297,142,LBS_HASSTRINGS | WS_VSCROLL
+ CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE
| SS_CENTERIMAGE, 18, 7, 290, 74
+ CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD |
WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 99, 106, 11
+ CONTROL "", IDC_LANGUAGES,"ComboBox",WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 132, 97, 176, 142
+ CONTROL "Keyboard or input method:", IDC_STATIC, "Static",
WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 132, 106, 11
+ CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 132, 131, 176, 81
LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10
END
@@ -49,8 +50,6 @@
CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 35, 150, 80
LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10
CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 55, 150, 80
- LTEXT "Keyboard layout:", IDC_STATIC, 20,75, 80, 10
- CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 75, 150, 80
LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180
,277, 20
END
@@ -59,19 +58,26 @@
CAPTION "ReactOS Setup"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "Partition for ReactOS installation", IDC_STATIC,
"Button", BS_GROUPBOX, 10,0,297,102
- LISTBOX IDC_PARTITION, 20,13,277,70,LBS_HASSTRINGS | WS_VSCROLL
- PUSHBUTTON "&Create" ,IDC_PARTCREATE, 20,83,50,15
- PUSHBUTTON "&Delete" ,IDC_PARTDELETE, 75,83,50,15
+ CONTROL "Partition for ReactOS installation", IDC_STATIC,
"Button", BS_GROUPBOX, 10,1,298,176
+ 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
+ LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180
,277, 20
+END
- CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX,
10,103,297,30
- EDITTEXT IDC_PATH, 20,113,277,12, WS_VISIBLE
+IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105
+STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME
+CAPTION "Advanced Partition Settings"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX,
4,1,298,30
+ EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE
- CONTROL "Boot loader installation", IDC_STATIC, "Button",
BS_GROUPBOX, 10,136,297,40
+ CONTROL "Boot loader installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4,36,298,41
- CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 147, 277, 10
- CONTROL "No installation of bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP /* | WS_DISABLED*/ , 20, 159, 277, 10
- LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180
,277, 20
+ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11
+ CONTROL "No installation of bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11
END
IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
Modified: trunk/reactos/base/setup/reactos/reactos.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos…
==============================================================================
--- trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] Fri Jul 18 14:35:03 2008
@@ -17,6 +17,7 @@
/* Bitmaps */
IDB_WATERMARK BITMAP "res/watermark.bmp"
IDB_HEADER BITMAP "res/header.bmp"
+IDB_ROSLOGO BITMAP "res/rosbitmap.bmp"
/* Language-specific resources */
#include "rsrc.rc"
Added: trunk/reactos/base/setup/reactos/res/rosbitmap.bmp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/ros…
==============================================================================
Binary file - no diff available.
Propchange: trunk/reactos/base/setup/reactos/res/rosbitmap.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/reactos/base/setup/reactos/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc…
==============================================================================
--- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Fri Jul 18 14:35:03 2008
@@ -3,7 +3,8 @@
#define RESOURCE_H
#define IDB_WATERMARK 100
-#define IDB_HEADER 101
+#define IDB_HEADER 101
+#define IDB_ROSLOGO 102
#define IDC_STATIC -1
@@ -48,6 +49,8 @@
#define IDS_ABORTSETUP 2038
#define IDS_ABORTSETUP2 2039
#define IDC_ACTION 2040
+#define IDC_PARTMOREOPTS 2041
+
#define IDI_MAIN 3000
