Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add partition type to fs column for unknown file systems.

Browse Source 
* Original patch by Morgul as part of #4235. This does not close the ticket,
  however.
* Updated the patch to not show empty '()' in case the partition type
  returned was NULL.
This commit is contained in:
Axel Dörfler 2012-11-28 23:26:39 +01:00
parent 8df20d2c85
commit 9d5955453c
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/apps/drivesetup/PartitionList.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All rights reserved.
* Copyright 2006-2012 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT license.
*
* Authors:
@ -202,6 +202,8 @@ PartitionListRow::PartitionListRow(BPartition* partition)
BPath path;
partition->GetPath(&path);
// Device icon
BBitmap* icon = NULL;
if (partition->IsDevice()) {
icon_size size = B_MINI_ICON;
@ -214,6 +216,8 @@ PartitionListRow::PartitionListRow(BPartition* partition)
SetField(new BBitmapStringField(icon, path.Path()), kDeviceColumn);
// File system & volume name
if (partition->ContainsFileSystem()) {
SetField(new BStringField(partition->ContentType()), kFilesystemColumn);
SetField(new BStringField(partition->ContentName()), kVolumeNameColumn);
@ -221,23 +225,32 @@ PartitionListRow::PartitionListRow(BPartition* partition)
SetField(new BStringField(kUnavailableString), kFilesystemColumn);
SetField(new BStringField(kUnavailableString), kVolumeNameColumn);
} else {
if (partition->ContainsFileSystem())
SetField(new BStringField(partition->Type()), kFilesystemColumn);
else
BString partitionType(partition->Type());
if (!partitionType.IsEmpty()) {
partitionType.Prepend("(");
partitionType.Append(")");
SetField(new BStringField(partitionType), kFilesystemColumn);
} else
SetField(new BStringField(kUnavailableString), kFilesystemColumn);
SetField(new BStringField(kUnavailableString), kVolumeNameColumn);
}
if (partition->IsMounted() && partition->GetMountPoint(&path) == B_OK) {
// Mounted at
if (partition->IsMounted() && partition->GetMountPoint(&path) == B_OK)
SetField(new BStringField(path.Path()), kMountedAtColumn);
} else {
else
SetField(new BStringField(kUnavailableString), kMountedAtColumn);
}
// Size
char size[1024];
SetField(new BStringField(string_for_size(partition->Size(), size,
sizeof(size))), kSizeColumn);
// Additional parameters
if (partition->Parameters() != NULL) {
BString parameters;