Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-03 03:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP] Simplify display of partitions being formatted (#5837)

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2023-10-24 20:15:57 +02:00
parent 3d4f001084
commit 1899a09399
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 14 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
base/setup/usetup/usetup.c
View file

@ -2108,11 +2108,6 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE));
#if 0
CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB",
CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB);
#endif
CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION));
PartEntry = CurrentPartition; PartEntry = CurrentPartition;
@ -2226,11 +2221,6 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE));
#if 0
CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB",
CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB);
#endif
CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION));
PartEntry = CurrentPartition; PartEntry = CurrentPartition;
@ -2343,11 +2333,6 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE)); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDPARTSIZE));
#if 0
CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB",
CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB);
#endif
CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION));
PartEntry = CurrentPartition; PartEntry = CurrentPartition;
@ -2489,7 +2474,7 @@ DeletePartitionPage(PINPUT_RECORD Ir)
MUIDisplayPage(DELETE_PARTITION_PAGE); MUIDisplayPage(DELETE_PARTITION_PAGE);
PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer)); PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_PrintTextXY(6, 10, " %s", LineBuffer); CONSOLE_SetTextXY(6, 10, LineBuffer);
DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer)); DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2), CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2),
@ -2822,20 +2807,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
if (PartEntry->AutoCreate) if (PartEntry->AutoCreate)
{ {
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION));
#if 0
PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_SetTextXY(8, 10, LineBuffer);
#endif
DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDISK1),
LineBuffer);
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
PartEntry->AutoCreate = FALSE; PartEntry->AutoCreate = FALSE;
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION));
} }
else if (PartEntry->New) else if (PartEntry->New)
{ {
@ -2857,25 +2831,23 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
ASSERT(FALSE); ASSERT(FALSE);
break; break;
} }
DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDISK1),
LineBuffer);
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
} }
else else
{ {
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART));
PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_SetTextXY(8, 10, LineBuffer);
DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2),
LineBuffer);
} }
PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_SetTextXY(6, 10, LineBuffer);
DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDISK2),
LineBuffer);
/* Show "This Partition will be formatted next" only if it is unformatted */
if (PartEntry->New || PartEntry->FormatState == Unformatted)
CONSOLE_SetTextXY(6, 14, MUIGetString(STRING_PARTFORMAT));
ASSERT(FileSystemList == NULL); ASSERT(FileSystemList == NULL);
if (IsUnattendedSetup) if (IsUnattendedSetup)