From 4a6a6b6d1c76c74f167756e1c961cd98696e42fd Mon Sep 17 00:00:00 2001 From: Bryce Groff Date: Thu, 13 Aug 2009 12:23:35 +0000 Subject: [PATCH] Updated menu changes. * Disable Init menu for partitions that are read only, or have no media (ie. empty cdrom) * Disable Delete menu for partitions that are devices. * Disable Mount menu for partitions that are devices. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32307 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/drivesetup/MainWindow.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp index 754ba9b7ce..690915462b 100644 --- a/src/apps/drivesetup/MainWindow.cpp +++ b/src/apps/drivesetup/MainWindow.cpp @@ -503,7 +503,6 @@ MainWindow::_UpdateMenus(BDiskDevice* disk, fInitMenu->SetEnabled(prepared); fDeleteMI->SetEnabled(prepared); - BDiskSystem diskSystem; fDDRoster.RewindDiskSystems(); while (fDDRoster.GetNextDiskSystem(&diskSystem) == B_OK) { @@ -535,9 +534,15 @@ MainWindow::_UpdateMenus(BDiskDevice* disk, // Mount items if (partition) { - fInitMenu->SetEnabled(!partition->IsMounted()); - fDeleteMI->SetEnabled(!partition->IsMounted()); - fMountMI->SetEnabled(!partition->IsMounted()); + fInitMenu->SetEnabled(!partition->IsMounted() + && !partition->IsReadOnly() + && partition->Device()->HasMedia()); + + fDeleteMI->SetEnabled(!partition->IsMounted() + && !partition->IsDevice()); + + fMountMI->SetEnabled(!partition->IsMounted() + && !partition->IsDevice()); bool unMountable = false; if (partition->IsMounted()) {