Skip to content

Commit 952474b

Browse files
EricKohlEricKohl
committed
[REACTOS]
- Remove the code that hides the system menu and the cancel button. Users should be able to cancel the installation process. - Add code to reboot ReactOS after completing or cancelling the wizard. It is disabled for now. - Remove the groupbox on the device page. - Resize / realign the controls on the drive page. - Replace the listbox on the drive page by a list view. svn path=/trunk/; revision=70643
1 parent 2de9328 commit 952474b

27 files changed

+236
-330
lines changed

‎reactos/base/setup/reactos/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ add_executable(reactos ${SOURCE} reactos.rc)
1010
add_pch(reactos reactos.h SOURCE)
1111
target_link_libraries(reactos uuid)
1212
set_module_type(reactos win32gui UNICODE)
13-
add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)
13+
add_importlibs(reactos advapi32 gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)
1414
add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd)

‎reactos/base/setup/reactos/drivepage.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,24 +126,10 @@ DriveDlgProc(
126126
{
127127
case WM_INITDIALOG:
128128
{
129-
HWND hwndControl;
130-
DWORD dwStyle;
131-
132129
/* Save pointer to the global setup data */
133130
pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
134131
SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
135132

136-
hwndControl = GetParent(hwndDlg);
137-
138-
dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
139-
SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
140-
141-
/* Set title font */
142-
/*SendDlgItemMessage(hwndDlg,
143-
IDC_STARTTITLE,
144-
WM_SETFONT,
145-
(WPARAM)hTitleFont,
146-
(LPARAM)TRUE);*/
147133
#if 1
148134
h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT);
149135
if (h != INVALID_HANDLE_VALUE)

‎reactos/base/setup/reactos/lang/bg-BG.rc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,33 @@ BEGIN
1919
LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
2020
AUTORADIOBUTTON "Поправка или осъвременяване на сложен РеактОС", IDC_UPDATE, 7, 50, 277, 10
2121
LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
22-
LTEXT "Натиснете „Напред“ за настройка на устройствата.", IDC_STATIC, 10, 180, 297, 10
22+
LTEXT "Натиснете „Напред“ за настройка на устройствата.", IDC_STATIC, 7, 128, 297, 8
2323
END
2424

2525
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
2626
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
2727
CAPTION "Настройка на РеактОС"
2828
FONT 8, "MS Shell Dlg"
2929
BEGIN
30-
CONTROL "Настройки на устройствата", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
3130
LTEXT "Компютър:", IDC_STATIC, 20, 15, 80, 10
3231
CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
3332
LTEXT " Екран:", IDC_STATIC, 20, 35, 80, 10
3433
CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
3534
LTEXT "Клавиатура", IDC_STATIC, 20, 55, 80, 10
3635
CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
37-
LTEXT "Натиснете „Напред“ за избор на устройство за слагане.", IDC_STATIC, 10, 180, 277, 20
36+
LTEXT "Натиснете „Напред“ за избор на устройство за слагане.", IDC_STATIC, 7, 128, 297, 8
3837
END
3938

4039
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
4140
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
4241
CAPTION "Настройка на РеактОС"
4342
FONT 8, "MS Shell Dlg"
4443
BEGIN
45-
CONTROL "Дял за слагане на РеактОС", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
46-
LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
47-
PUSHBUTTON "&Създаване", IDC_PARTCREATE, 20, 155, 50, 15
48-
PUSHBUTTON "Из&триване", IDC_PARTDELETE, 76, 155, 50, 15
49-
PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
50-
PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 218, 155, 80, 15
44+
CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
45+
PUSHBUTTON "&Създаване", IDC_PARTCREATE, 7, 122, 50, 15
46+
PUSHBUTTON "Из&триване", IDC_PARTDELETE, 63, 122, 50, 15
47+
PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
48+
PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 230, 122, 80, 15
5149
LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 10, 180, 277, 20
5250
END
5351

‎reactos/base/setup/reactos/lang/cs-CZ.rc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,33 @@ BEGIN
2525
LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
2626
AUTORADIOBUTTON "Opravit nebo aktualizovat již nainstalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10
2727
LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
28-
LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 10, 180, 297, 10
28+
LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 7, 128, 297, 8
2929
END
3030

3131
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
3232
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
3333
CAPTION "Instalace systému ReactOS"
3434
FONT 8, "MS Shell Dlg"
3535
BEGIN
36-
CONTROL "Nastavení zařízení", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
3736
LTEXT "Počítač:", IDC_STATIC, 20, 15, 80, 10
3837
CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
3938
LTEXT "Obrazovka:", IDC_STATIC, 20, 35, 80, 10
4039
CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
4140
LTEXT "Klávesnice:", IDC_STATIC, 20, 55, 80, 10
4241
CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
43-
LTEXT "Po klepnutí na Další bude možné nastavit instalační zařízení.", IDC_STATIC, 10, 180, 277, 20
42+
LTEXT "Po klepnutí na Další bude možné nastavit instalační zařízení.", IDC_STATIC, 7, 128, 297, 8
4443
END
4544

4645
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
4746
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
4847
CAPTION "Instalace systému ReactOS"
4948
FONT 8, "MS Shell Dlg"
5049
BEGIN
51-
CONTROL "Oddíl, do kterého bude systém ReactOS nainstalován", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
52-
LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
53-
PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 20, 155, 50, 15
54-
PUSHBUTTON "&Smazat", IDC_PARTDELETE, 76, 155, 50, 15
55-
PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
56-
PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 218, 155, 80, 15
50+
CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
51+
PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 7, 122, 50, 15
52+
PUSHBUTTON "&Smazat", IDC_PARTDELETE, 63, 122, 50, 15
53+
PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
54+
PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 15
5755
LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.", IDC_STATIC, 10, 180, 277, 20
5856
END
5957

‎reactos/base/setup/reactos/lang/de-DE.rc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,33 @@ BEGIN
1919
LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
2020
AUTORADIOBUTTON "Aktualisiere oder repariere ein installiertes ReactOS", IDC_UPDATE, 7, 50, 277, 10
2121
LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
22-
LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 10, 180, 297, 10
22+
LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 7, 128, 297, 8
2323
END
2424

2525
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
2626
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
2727
CAPTION "ReactOS-Setup"
2828
FONT 8, "MS Shell Dlg"
2929
BEGIN
30-
// CONTROL "Geräteeinstellungen", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
3130
LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10
3231
CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
3332
LTEXT "Anzeige:", IDC_STATIC, 20, 35, 80, 10
3433
CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
3534
LTEXT "Tastatur:", IDC_STATIC, 20, 55, 80, 10
3635
CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
37-
LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 10, 180, 277, 20
36+
LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 7, 128, 297, 8
3837
END
3938

4039
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
4140
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
4241
CAPTION "ReactOS-Setup"
4342
FONT 8, "MS Shell Dlg"
4443
BEGIN
45-
// CONTROL "Partition für die ReactOS-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
46-
LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
47-
PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 20, 155, 50, 15
48-
PUSHBUTTON "&Löschen", IDC_PARTDELETE, 76, 155, 50, 15
49-
PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
50-
PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 218, 155, 80, 15
44+
CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
45+
PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 15
46+
PUSHBUTTON "&Löschen", IDC_PARTDELETE, 63, 122, 50, 15
47+
PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
48+
PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80, 15
5149
LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 10, 180, 277, 20
5250
END
5351

‎reactos/base/setup/reactos/lang/el-GR.rc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,33 @@ BEGIN
1919
LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
2020
AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10
2121
LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
22-
LTEXT "Πατήστε Επόμενο για να ρυθμίσετε τις συσκευές.", IDC_STATIC, 10, 180, 297, 10
22+
LTEXT "Πατήστε Επόμενο για να ρυθμίσετε τις συσκευές.", IDC_STATIC, 7, 128, 297, 8
2323
END
2424

2525
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
2626
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
2727
CAPTION "Εγκατάσταση του ReactOS"
2828
FONT 8, "MS Shell Dlg"
2929
BEGIN
30-
CONTROL "Ρυθμίσεις συσκευών", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
3130
LTEXT "Υπολογιστής:", IDC_STATIC, 20, 15, 80, 10
3231
CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
3332
LTEXT "Εμφάνιση:", IDC_STATIC, 20, 35, 80, 10
3433
CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
3534
LTEXT "Πληκτρολόγιο:", IDC_STATIC, 20, 55, 80, 10
3635
CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
37-
LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
36+
LTEXT "Click Next setup of the installation device.", IDC_STATIC, 7, 128, 297, 8
3837
END
3938

4039
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
4140
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
4241
CAPTION "Εγκατάσταση του ReactOS"
4342
FONT 8, "MS Shell Dlg"
4443
BEGIN
45-
CONTROL "Partition για την εγκατάσταση του ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
46-
LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
47-
PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 20, 155, 50, 15
48-
PUSHBUTTON "&Διαγραφή", IDC_PARTDELETE, 76, 155, 50, 15
49-
PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
50-
PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 218, 155, 80, 15
44+
CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
45+
PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 7, 122, 50, 15
46+
PUSHBUTTON "&Διαγραφή", IDC_PARTDELETE, 63, 122, 50, 15
47+
PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
48+
PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 230, 122, 80, 15
5149
LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.", IDC_STATIC, 10, 180, 277, 20
5250
END
5351

‎reactos/base/setup/reactos/lang/en-US.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ BEGIN
3333
CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
3434
LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10
3535
CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
36-
/* LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 277, 8 */
36+
LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 297, 8
3737
END
3838

3939
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
4040
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
4141
CAPTION "ReactOS Setup"
4242
FONT 8, "MS Shell Dlg"
4343
BEGIN
44-
LISTBOX IDC_PARTITION, 7, 7, 303, 112, LBS_HASSTRINGS | WS_VSCROLL
44+
CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
4545
PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
4646
PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
4747
PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED

‎reactos/base/setup/reactos/lang/es-ES.rc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,33 @@ BEGIN
2121
LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
2222
AUTORADIOBUTTON "Actualizar o reparar una versión instalada de ReactOS", IDC_UPDATE, 7, 50, 277, 10
2323
LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
24-
LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 10, 180, 297, 10
24+
LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7, 128, 297, 8
2525
END
2626

2727
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
2828
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
2929
CAPTION "Instalación de ReactOS"
3030
FONT 8, "MS Shell Dlg"
3131
BEGIN
32-
CONTROL "Ajustes de dispositivos", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
3332
LTEXT "Equipo:", IDC_STATIC, 20, 15, 80, 10
3433
CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
3534
LTEXT "Pantalla:", IDC_STATIC, 20, 35, 80, 10
3635
CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
3736
LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10
3837
CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
39-
LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 10, 180, 277, 20
38+
LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 7, 128, 297, 8
4039
END
4140

4241
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
4342
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
4443
CAPTION "Instalación de ReactOS"
4544
FONT 8, "MS Shell Dlg"
4645
BEGIN
47-
CONTROL "Partición para la instalación de ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
48-
LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
49-
PUSHBUTTON "&Crear", IDC_PARTCREATE, 20, 155, 50, 15
50-
PUSHBUTTON "&Borrar", IDC_PARTDELETE, 76, 155, 50, 15
51-
PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
52-
PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 218, 155, 80, 15
46+
CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
47+
PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 15
48+
PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15
49+
PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
50+
PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
5351
LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180, 277, 20
5452
END
5553

‎reactos/base/setup/reactos/lang/et-EE.rc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,33 @@ BEGIN
1919
LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
2020
AUTORADIOBUTTON "Paranda või uuenda installeeritud ReactOS", IDC_UPDATE, 7, 50, 277, 10
2121
LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
22-
LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 10, 180, 297, 10
22+
LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 7, 128, 297, 8
2323
END
2424

2525
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
2626
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
2727
CAPTION "ReactOSi paigaldamine"
2828
FONT 8, "MS Shell Dlg"
2929
BEGIN
30-
CONTROL "Seadmete seaded", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
3130
LTEXT "Arvuti:", IDC_STATIC, 20, 15, 80, 10
3231
CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
3332
LTEXT "Monitor:", IDC_STATIC, 20, 35, 80, 10
3433
CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
3534
LTEXT "Klaviatuur:", IDC_STATIC, 20, 55, 80, 10
3635
CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
37-
LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 10, 180, 277, 20
36+
LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 7, 128, 297, 8
3837
END
3938

4039
IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
4140
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
4241
CAPTION "ReactOSi paigaldamine"
4342
FONT 8, "MS Shell Dlg"
4443
BEGIN
45-
CONTROL "Partitsioneerimine", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
46-
LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
47-
PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 20, 155, 50, 15
48-
PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 76, 155, 50, 15
49-
PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
50-
PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 218, 155, 80, 15
44+
CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
45+
PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 15
46+
PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 15
47+
PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
48+
PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 15
5149
LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10, 180, 277, 20
5250
END
5351

0 commit comments

Comments
 (0)