hrev54869 adds 1 changeset to branch 'master'
old head: c38dea9e37367d9473e3826a706fad53d66895d4
new head: d9848639c6d8971600af469dfc5d6f3928e8b8cc
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=d9848639c6d8+%5Ec38dea9e3736
----------------------------------------------------------------------------
d9848639c6d8: DriveSetup: clarify partition state
DriveSetup does not make it clear when there is empty space or when a
partition is not formatted. Reword things a bit to make this easier to
understand.
This was a common source of confusion in various video reviews of Haiku,
with people trying to install Haiku to a partition that had not been
formatted.
Part of #16304
[ Adrien Destugues <adrien.destugues@xxxxxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54869
Commit: d9848639c6d8971600af469dfc5d6f3928e8b8cc
URL: https://git.haiku-os.org/haiku/commit/?id=d9848639c6d8
Author: Adrien Destugues <adrien.destugues@xxxxxxxxxxxxxxxxxxxxx>
Date: Sun Jan 10 14:02:47 2021 UTC
Ticket: https://dev.haiku-os.org/ticket/16304
----------------------------------------------------------------------------
2 files changed, 4 insertions(+), 4 deletions(-)
src/apps/drivesetup/DiskView.cpp | 2 +-
src/apps/drivesetup/PartitionList.cpp | 6 +++---
----------------------------------------------------------------------------
diff --git a/src/apps/drivesetup/DiskView.cpp b/src/apps/drivesetup/DiskView.cpp
index 75f90eb6ac..2d9e3a27aa 100644
--- a/src/apps/drivesetup/DiskView.cpp
+++ b/src/apps/drivesetup/DiskView.cpp
@@ -421,7 +421,7 @@ public:
partition_id id
=
fSpaceIDMap.SpaceIDFor(partition->ID(), offset);
PartitionView* view = new PartitionView(
- B_TRANSLATE("<empty or unknown>"),
scale, offset,
+ B_TRANSLATE("Empty space"), scale,
offset,
parentView->Level() + 1, id, partition);
fViewMap.Put(id, view);
diff --git a/src/apps/drivesetup/PartitionList.cpp
b/src/apps/drivesetup/PartitionList.cpp
index afc733e7fb..2c44051832 100644
--- a/src/apps/drivesetup/PartitionList.cpp
+++ b/src/apps/drivesetup/PartitionList.cpp
@@ -305,8 +305,8 @@ PartitionListRow::PartitionListRow(BPartition* partition)
SetField(new BStringField(kUnavailableString),
kVolumeNameColumn);
} else {
if (!partitionType.IsEmpty()) {
- partitionType.Prepend("(");
- partitionType.Append(")");
+ partitionType.SetToFormat(B_TRANSLATE("Not formatted
(%s)"),
+ partitionType.String());
SetField(new BStringField(partitionType),
kFilesystemColumn);
} else
SetField(new BStringField(kUnavailableString),
kFilesystemColumn);
@@ -378,7 +378,7 @@ PartitionListRow::PartitionListRow(partition_id parentID,
partition_id id,
// TODO: design icon for spaces on partitions
SetField(new BBitmapStringField(NULL, "-"), kDeviceColumn);
- SetField(new BStringField(B_TRANSLATE("<empty or unknown>")),
+ SetField(new BStringField(B_TRANSLATE("Empty space")),
kFilesystemColumn);
SetField(new BStringField(kUnavailableString), kVolumeNameColumn);