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

DriveSetup: Added column for the partition type. 

* This implements ticket #4235.
This commit is contained in:
Axel Dörfler 2013-01-29 00:12:31 +01:00
parent 2dd0a26ac0
commit 5a81662642
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,15 @@
/*
* Copyright 2006-2013 Haiku Inc. All rights reserved.
* Copyright 2006-2013, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT license.
*
* Authors:
* Ithamar R. Adema <ithamar@unet.nl>
* James Urquhart
* Stephan Aßmus <superstippi@gmx.de>
* Axel Dörfler, axeld@pinc-software.de
*/
#include "PartitionList.h"
#include <Catalog.h>
@ -24,6 +26,19 @@
#define B_TRANSLATION_CONTEXT "PartitionList"
static const char* kUnavailableString = "";
enum {
kDeviceColumn,
kFilesystemColumn,
kVolumeNameColumn,
kMountedAtColumn,
kSizeColumn,
kParametersColumn,
kPartitionTypeColumn,
};
// #pragma mark - BBitmapStringField
@ -179,18 +194,6 @@ PartitionColumn::InitTextMargin(BView* parent)
// #pragma mark - PartitionListRow
static const char* kUnavailableString = "";
enum {
kDeviceColumn,
kFilesystemColumn,
kVolumeNameColumn,
kMountedAtColumn,
kSizeColumn,
kParametersColumn
};
PartitionListRow::PartitionListRow(BPartition* partition)
:
Inherited(),
@ -218,6 +221,8 @@ PartitionListRow::PartitionListRow(BPartition* partition)
// File system & volume name
BString partitionType(partition->Type());
if (partition->ContainsFileSystem()) {
SetField(new BStringField(partition->ContentType()), kFilesystemColumn);
SetField(new BStringField(partition->ContentName()), kVolumeNameColumn);
@ -231,7 +236,6 @@ PartitionListRow::PartitionListRow(BPartition* partition)
SetField(new BStringField(kUnavailableString), kFilesystemColumn);
SetField(new BStringField(kUnavailableString), kVolumeNameColumn);
} else {
BString partitionType(partition->Type());
if (!partitionType.IsEmpty()) {
partitionType.Prepend("(");
partitionType.Append(")");
@ -278,6 +282,10 @@ PartitionListRow::PartitionListRow(BPartition* partition)
} else {
SetField(new BStringField(kUnavailableString), kParametersColumn);
}
// Partition type
SetField(new BStringField(partitionType), kPartitionTypeColumn);
}
@ -333,8 +341,10 @@ PartitionListView::PartitionListView(const BRect& frame, uint32 resizeMode)
B_TRUNCATE_MIDDLE), kMountedAtColumn);
AddColumn(new PartitionColumn(B_TRANSLATE("Size"), 100, 50, 500,
B_TRUNCATE_END, B_ALIGN_RIGHT), kSizeColumn);
AddColumn(new PartitionColumn(B_TRANSLATE("Parameters"), 150, 50, 500,
B_TRUNCATE_MIDDLE), kParametersColumn);
AddColumn(new PartitionColumn(B_TRANSLATE("Parameters"), 200, 50, 500,
B_TRUNCATE_END), kParametersColumn);
AddColumn(new PartitionColumn(B_TRANSLATE("Partition type"), 100, 50, 500,
B_TRUNCATE_END), kPartitionTypeColumn);
SetSortingEnabled(false);
}