i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Unnamed volumes now get the disk size instead of "unnamed" in their mount

Browse Source 
menu name, ie. "(unnamed Ext2 File System)" could become "(12.5 GB Ext2 File System)".
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26242 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-07-03 20:44:57 +00:00
parent c4d5cef0c6
commit dcdf3137e1
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/MountMenu.cpp
+22 -13
View File
@@ -109,9 +109,18 @@ AddMenuItemVisitor::Visit(BPartition *partition, int32 level)
if (type == NULL) if (type == NULL)
return false; return false;
name = "(unnamed "; uint32 divisor = 1UL << 30;
name << type; char unit = 'G';
name << ")"; if (partition->Size() < divisor) {
divisor = 1UL << 20;
unit = 'M';
}
char* buffer = name.LockBuffer(256);
snprintf(buffer, 256, "(%.1f %cB %s)",
1.0 * partition->Size() / divisor, unit, type);
name.UnlockBuffer();
} }
} }
@@ -167,7 +176,7 @@ AddOnePartitionAsMenuItem(Partition *partition, void *castToParams)
AddOneAsMenuItemParams *params = (AddOneAsMenuItemParams *)castToParams; AddOneAsMenuItemParams *params = (AddOneAsMenuItemParams *)castToParams;
BBitmap *icon = new BBitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), BBitmap *icon = new BBitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1),
B_CMAP8); B_CMAP8);
get_device_icon(partition->GetDevice()->Name(), icon->Bits(), B_MINI_ICON); get_device_icon(partition->GetDevice()->Name(), icon->Bits(), B_MINI_ICON);
const char *name = partition->GetDevice()->DisplayName(); const char *name = partition->GetDevice()->DisplayName();
@@ -182,21 +191,21 @@ AddOnePartitionAsMenuItem(Partition *partition, void *castToParams)
BMessage *message = new BMessage; BMessage *message = new BMessage;
if (partition->Mounted() == kMounted) { if (partition->Mounted() == kMounted) {
message->what = kUnmountVolume; message->what = kUnmountVolume;
message->AddInt32("device_id", partition->VolumeDeviceID()); message->AddInt32("device_id", partition->VolumeDeviceID());
} else { } else {
message->what = kMountVolume; message->what = kMountVolume;
// //
// Floppies have an ID of -1, because they don't have // Floppies have an ID of -1, because they don't have
// partition (and hence no parititon ID). // partition (and hence no parititon ID).
// //
if (partition->GetDevice()->IsFloppy()) if (partition->GetDevice()->IsFloppy())
message->AddInt32("id", kFloppyID); message->AddInt32("id", kFloppyID);
else else
message->AddInt32("id", partition->UniqueID()); message->AddInt32("id", partition->UniqueID());
} }
BMenuItem *item = new IconMenuItem(name, message, icon); BMenuItem *item = new IconMenuItem(name, message, icon);
if (partition->Mounted() == kMounted) if (partition->Mounted() == kMounted)
@@ -277,12 +286,12 @@ MountMenu::AddDynamicItem(add_state)
// Use the shared icon instead of the device icon // Use the shared icon instead of the device icon
if (get_device_icon(info.device_name, icon->Bits(), B_MINI_ICON) != B_OK) if (get_device_icon(info.device_name, icon->Bits(), B_MINI_ICON) != B_OK)
GetTrackerResources()->GetIconResource(kResShareIcon, B_MINI_ICON, icon); GetTrackerResources()->GetIconResource(kResShareIcon, B_MINI_ICON, icon);
BMessage *message = new BMessage(kUnmountVolume); BMessage *message = new BMessage(kUnmountVolume);
message->AddInt32("device_id", volume.Device()); message->AddInt32("device_id", volume.Device());
char volumeName[B_FILE_NAME_LENGTH]; char volumeName[B_FILE_NAME_LENGTH];
volume.GetName(volumeName); volume.GetName(volumeName);
BMenuItem *item = new IconMenuItem(volumeName, message, icon); BMenuItem *item = new IconMenuItem(volumeName, message, icon);
item->SetMarked(true); item->SetMarked(true);
AddItem(item); AddItem(item);
@@ -303,12 +312,12 @@ MountMenu::AddDynamicItem(add_state)
BMenuItem *mountAll = new BMenuItem("Mount All", new BMessage(kMountAllNow)); BMenuItem *mountAll = new BMenuItem("Mount All", new BMessage(kMountAllNow));
AddItem(mountAll); AddItem(mountAll);
BMenuItem *mountSettings = new BMenuItem("Settings"B_UTF8_ELLIPSIS, BMenuItem *mountSettings = new BMenuItem("Settings" B_UTF8_ELLIPSIS,
new BMessage(kRunAutomounterSettings)); new BMessage(kRunAutomounterSettings));
AddItem(mountSettings); AddItem(mountSettings);
SetTargetForItems(be_app); SetTargetForItems(be_app);
#ifndef __HAIKU__ #ifndef __HAIKU__
if (rescanItem) if (rescanItem)
rescanItem->SetTarget(autoMounter); rescanItem->SetTarget(autoMounter);