Since "Mount all" is not connected to a selected disk/partition,

the Partition menu shall never be disabled. Fixed enabled state
of some other menus/entries after this change. Fixes ticket #6783.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39891 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-12-19 10:55:36 +00:00
parent 22334353d0
commit b9d2622de1
+4 -7
View File
@@ -515,23 +515,22 @@ MainWindow::_UpdateMenus(BDiskDevice* disk,
while (BMenuItem* item = fInitMenu->RemoveItem(0L)) while (BMenuItem* item = fInitMenu->RemoveItem(0L))
delete item; delete item;
fCreateMI->SetEnabled(false);
fUnmountMI->SetEnabled(false);
fInitMenu->SetEnabled(false);
if (!disk) { if (!disk) {
fFormatMI->SetEnabled(false); fFormatMI->SetEnabled(false);
fEjectMI->SetEnabled(false); fEjectMI->SetEnabled(false);
fSurfaceTestMI->SetEnabled(false); fSurfaceTestMI->SetEnabled(false);
fPartitionMenu->SetEnabled(false);
} else { } else {
// fFormatMI->SetEnabled(true); // fFormatMI->SetEnabled(true);
fFormatMI->SetEnabled(false); fFormatMI->SetEnabled(false);
fEjectMI->SetEnabled(disk->IsRemovableMedia()); fEjectMI->SetEnabled(disk->IsRemovableMedia());
// fSurfaceTestMI->SetEnabled(true); // fSurfaceTestMI->SetEnabled(true);
fSurfaceTestMI->SetEnabled(false); fSurfaceTestMI->SetEnabled(false);
fCreateMI->SetEnabled(false);
// Create menu and items // Create menu and items
fPartitionMenu->SetEnabled(true);
BPartition* parentPartition = NULL; BPartition* parentPartition = NULL;
if (selectedPartition <= -2) if (selectedPartition <= -2)
parentPartition = disk->FindDescendant(parentID); parentPartition = disk->FindDescendant(parentID);
@@ -601,10 +600,8 @@ MainWindow::_UpdateMenus(BDiskDevice* disk,
} }
fUnmountMI->SetEnabled(unMountable); fUnmountMI->SetEnabled(unMountable);
} else { } else {
fInitMenu->SetEnabled(false);
fDeleteMI->SetEnabled(false); fDeleteMI->SetEnabled(false);
fMountMI->SetEnabled(false); fMountMI->SetEnabled(false);
fUnmountMI->SetEnabled(false);
} }
if (prepared) if (prepared)