From badea728fa8d7c91e70a3cc52e37da25b42239a9 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Fri, 3 Aug 2012 10:22:33 -0500
Subject: [PATCH] DriveSetup: Reorganize Disk menu.

* Group destructive and non-destructive operations
* Rename Disk->Format to Wipe (seems like a more modern term)
* Mostly bikeshed :)
---
 src/apps/drivesetup/MainWindow.cpp | 16 ++++++++--------
 src/apps/drivesetup/MainWindow.h   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index dd50a58efe..78118d41b6 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -170,7 +170,7 @@ MainWindow::MainWindow(BRect frame)
 	BMenuBar* menuBar = new BMenuBar(Bounds(), "root menu");
 
 	// create all the menu items
-	fFormatMI = new BMenuItem(B_TRANSLATE("Format (not implemented)"),
+	fWipeMI = new BMenuItem(B_TRANSLATE("Wipe (not implemented)"),
 		new BMessage(MSG_FORMAT));
 	fEjectMI = new BMenuItem(B_TRANSLATE("Eject"),
 		new BMessage(MSG_EJECT), 'E');
@@ -193,17 +193,17 @@ MainWindow::MainWindow(BRect frame)
 
 	// Disk menu
 	fDiskMenu = new BMenu(B_TRANSLATE("Disk"));
-	fDiskMenu->AddItem(fFormatMI);
 
+	fDiskMenu->AddItem(fWipeMI);
 	fDiskInitMenu = new BMenu(B_TRANSLATE("Initialize"));
 	fDiskMenu->AddItem(fDiskInitMenu);
 
-	fDiskMenu->AddItem(fEjectMI);
-	fDiskMenu->AddItem(fSurfaceTestMI);
-
 	fDiskMenu->AddSeparatorItem();
 
+	fDiskMenu->AddItem(fEjectMI);
+	fDiskMenu->AddItem(fSurfaceTestMI);
 	fDiskMenu->AddItem(fRescanMI);
+
 	menuBar->AddItem(fDiskMenu);
 
 	// Parition menu
@@ -529,12 +529,12 @@ MainWindow::_UpdateMenus(BDiskDevice* disk,
 	fFormatMenu->SetEnabled(false);
 
 	if (!disk) {
-		fFormatMI->SetEnabled(false);
+		fWipeMI->SetEnabled(false);
 		fEjectMI->SetEnabled(false);
 		fSurfaceTestMI->SetEnabled(false);
 	} else {
-//		fFormatMI->SetEnabled(true);
-		fFormatMI->SetEnabled(false);
+//		fWipeMI->SetEnabled(true);
+		fWipeMI->SetEnabled(false);
 		fEjectMI->SetEnabled(disk->IsRemovableMedia());
 //		fSurfaceTestMI->SetEnabled(true);
 		fSurfaceTestMI->SetEnabled(false);
diff --git a/src/apps/drivesetup/MainWindow.h b/src/apps/drivesetup/MainWindow.h
index 1700e50006..24d0e44b88 100644
--- a/src/apps/drivesetup/MainWindow.h
+++ b/src/apps/drivesetup/MainWindow.h
@@ -88,7 +88,7 @@ private:
 			BMenu*				fPartitionMenu;
 			BMenu*				fFormatMenu;
 
-			BMenuItem*			fFormatMI;
+			BMenuItem*			fWipeMI;
 			BMenuItem*			fEjectMI;
 			BMenuItem*			fSurfaceTestMI;
 			BMenuItem*			fRescanMI;