From b9d2622de12cd8c03dd263a8adb4ff260f0da378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sun, 19 Dec 2010 10:55:36 +0000 Subject: [PATCH] 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 --- src/apps/drivesetup/MainWindow.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp index 20ee632a92..d402e7f954 100644 --- a/src/apps/drivesetup/MainWindow.cpp +++ b/src/apps/drivesetup/MainWindow.cpp @@ -515,23 +515,22 @@ MainWindow::_UpdateMenus(BDiskDevice* disk, while (BMenuItem* item = fInitMenu->RemoveItem(0L)) delete item; + fCreateMI->SetEnabled(false); + fUnmountMI->SetEnabled(false); + fInitMenu->SetEnabled(false); + if (!disk) { fFormatMI->SetEnabled(false); fEjectMI->SetEnabled(false); fSurfaceTestMI->SetEnabled(false); - - fPartitionMenu->SetEnabled(false); } else { // fFormatMI->SetEnabled(true); fFormatMI->SetEnabled(false); fEjectMI->SetEnabled(disk->IsRemovableMedia()); // fSurfaceTestMI->SetEnabled(true); fSurfaceTestMI->SetEnabled(false); - fCreateMI->SetEnabled(false); // Create menu and items - fPartitionMenu->SetEnabled(true); - BPartition* parentPartition = NULL; if (selectedPartition <= -2) parentPartition = disk->FindDescendant(parentID); @@ -601,10 +600,8 @@ MainWindow::_UpdateMenus(BDiskDevice* disk, } fUnmountMI->SetEnabled(unMountable); } else { - fInitMenu->SetEnabled(false); fDeleteMI->SetEnabled(false); fMountMI->SetEnabled(false); - fUnmountMI->SetEnabled(false); } if (prepared)