Add Confirm Sheet before drop DB or Collection

bububa · Dec 22, 2010 · 73cdd2c · 73cdd2c
1 parent 4475240
commit 73cdd2c
Show file tree

Hide file tree

Showing 4 changed files with 225 additions and 35 deletions.
diff --git a/ConnectionWindowController.h b/ConnectionWindowController.h
@@ -84,4 +84,5 @@
 -(void) checkTunnel;
 - (void) connect:(BOOL)haveHostAddress;
 - (void) tunnelStatusChanged: (Tunnel*) tunnel status: (NSString*) status;
+- (void)dropWarning:(NSString *)msg;
 @end
diff --git a/ConnectionWindowController.mm b/ConnectionWindowController.mm
@@ -176,6 +176,7 @@ - (void)reloadSidebar {
 
 - (void)reloadDBList {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    [loaderIndicator start];
     //[selectedDB release];
     selectedDB = nil;
     //[selectedCollection release];
@@ -198,6 +199,7 @@ - (void)reloadDBList {
     }
     [sidebar reloadData];
     [sidebar expandItem:@"1"];
+    [loaderIndicator stop];
     [pool release];
 }
 
@@ -219,7 +221,9 @@ - (void)useDB:(id)sender {
     }
     [db release];
     [collections release];
+    [loaderIndicator start];
     collections = [[NSMutableArray alloc] initWithArray:[mongoDB listCollections:dbname user:user password:password]];
+    [loaderIndicator stop];
     [dbname release];
 
     [sidebar removeItem:@"2"];
@@ -267,6 +271,7 @@ - (IBAction)showDBStats:(id)sender
         NSRunAlertPanel(@"Error", @"Please specify a database!", @"OK", nil, nil);
         return;
     }
+    [loaderIndicator start];
     [resultsTitle setStringValue:[NSString stringWithFormat:@"Database %@ stats", [selectedDB caption]]];
     NSString *user=nil;
     NSString *password=nil;
@@ -282,6 +287,7 @@ - (IBAction)showDBStats:(id)sender
     resultsOutlineViewController.results = results;
     [resultsOutlineViewController.myOutlineView reloadData];
     [results release];
+    [loaderIndicator stop];
     //NSLog(@"STATUS: %@", results);
 }
 
@@ -291,6 +297,7 @@ - (IBAction)showCollStats:(id)sender
         NSRunAlertPanel(@"Error", @"Please specify a collection!", @"OK", nil, nil);
         return;
     }
+    [loaderIndicator start];
     [resultsTitle setStringValue:[NSString stringWithFormat:@"Collection %@.%@ stats", [selectedDB caption], [selectedCollection caption]]];
     NSString *user=nil;
     NSString *password=nil;
@@ -308,6 +315,7 @@ - (IBAction)showCollStats:(id)sender
     resultsOutlineViewController.results = results;
     [resultsOutlineViewController.myOutlineView reloadData];
     [results release];
+    [loaderIndicator stop];
 }
 
 - (IBAction)createDBorCollection:(id)sender
@@ -394,9 +402,9 @@ - (void)addCollection:(id)sender
 - (IBAction)dropDBorCollection:(id)sender
 {
     if (selectedCollection) {
-        [self dropCollection:[selectedCollection caption] ForDB:[selectedDB caption]];
+        [self dropWarning:[NSString stringWithFormat:@"COLLECTION:%@", [selectedCollection caption]]];
     }else {
-        [self dropDB];
+        [self dropWarning:[NSString stringWithFormat:@"DB:%@", [selectedDB caption]]];
     }
 }
 
@@ -411,10 +419,12 @@ - (void)dropCollection:(NSString *)collectionname ForDB:(NSString *)dbname
         password = db.password;
     }
     [db release];
+    [loaderIndicator start];
     [mongoDB dropCollection:collectionname 
                       forDB:dbname 
                        user:user 
                    password:password];
+    [loaderIndicator stop];
     if ([[selectedDB caption] isEqualToString:dbname]) {
         [sidebar selectItem:[selectedDB nodeKey]];
     }
@@ -436,9 +446,11 @@ - (void)dropDB
         password = db.password;
     }
     [db release];
+    [loaderIndicator start];
     [mongoDB dropDB:[selectedDB caption] 
                 user:user 
             password:password];
+    [loaderIndicator stop];
     [self reloadSidebar];
     [pool release];
 }
@@ -523,4 +535,29 @@ - (IBAction)exportToMySQL:(id)sender
     [exportWindowController showWindow:self];
 }
 
+- (void)alertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+    if (returnCode == NSAlertFirstButtonReturn)
+    {
+        if (selectedCollection) {
+            [self dropCollection:[selectedCollection caption] ForDB:[selectedDB caption]];
+        }else {
+            [self dropDB];
+        }
+    }
+}
+
+- (void)dropWarning:(NSString *)msg
+{
+    NSAlert *alert = [[[NSAlert alloc] init] autorelease];
+    [alert addButtonWithTitle:@"OK"];
+    [alert addButtonWithTitle:@"Cancel"];
+    [alert setMessageText:[NSString stringWithFormat:@"Drop this %@?", msg]];
+    [alert setInformativeText:[NSString stringWithFormat:@"Dropped %@ cannot be restored.", msg]];
+    [alert setAlertStyle:NSWarningAlertStyle];
+    [alert beginSheetModalForWindow:[self window] modalDelegate:self
+                     didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
+                        contextInfo:nil];
+}
+
 @end
diff --git a/MongoHub.xcodeproj/syd.mode1v3 b/MongoHub.xcodeproj/syd.mode1v3
@@ -330,7 +330,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>1DBFFB4512C207CC00B643CA</string>
+										<string>1DBFFB9812C20F8200B643CA</string>
 										<key>history</key>
 										<array>
 											<string>1D93C27E11833DE7003216F7</string>
@@ -417,7 +417,6 @@
 											<string>1DCC9C7212C0FFB3003B101E</string>
 											<string>1DBFF8F312C11A3A00B643CA</string>
 											<string>1DBFF8F412C11A3A00B643CA</string>
-											<string>1DBFFA5112C1F00E00B643CA</string>
 											<string>1DBFFA5212C1F00E00B643CA</string>
 											<string>1DBFFA5B12C1F0E800B643CA</string>
 											<string>1DBFFAC012C1F51700B643CA</string>
@@ -426,9 +425,10 @@
 											<string>1DBFFAF912C1FEE600B643CA</string>
 											<string>1DBFFAFA12C1FEE600B643CA</string>
 											<string>1DBFFAFB12C1FEE600B643CA</string>
-											<string>1DBFFB3212C2062100B643CA</string>
 											<string>1DBFFB4312C207CC00B643CA</string>
-											<string>1DBFFB4412C207CC00B643CA</string>
+											<string>1DBFFB4F12C20A9900B643CA</string>
+											<string>1DBFFB5012C20A9900B643CA</string>
+											<string>1DBFFB9312C20F3900B643CA</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -626,12 +626,13 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>1DBFFB9912C20F8200B643CA</string>
 		<string>1DBFF8D512C118C200B643CA</string>
 		<string>1DBFF8D612C118C200B643CA</string>
-		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>1D93C1AB118329FB003216F7</string>
 		<string>/Users/syd/Documents/Works/codes/MongoHub/MongoHub.xcodeproj</string>
+		<string>1C78EAAD065D492600B07095</string>
 	</array>
 	<key>WindowString</key>
 	<string>0 73 1129 705 0 0 1280 778 </string>
@@ -650,12 +651,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>Tunnel.m</string>
+								<string>ConnectionWindowController.mm</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -672,8 +675,6 @@
 							<string>365pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>