Changeset 3729

Timestamp:

02/23/06 10:50:27 (2 years ago)

Author:

morris

Message:

Show Status tab on load

Add confirmation dialog to accounts delete

Files:

• WiredServer/trunk/PreferencePane/English.lproj/Wired.nib/info.nib (modified) (1 diff)
• WiredServer/trunk/PreferencePane/English.lproj/Wired.nib/keyedobjects.nib (modified) (previous)
• WiredServer/trunk/WCAccountsController.m (modified) (1 diff)

WiredServer/trunk/PreferencePane/English.lproj/Wired.nib/info.nib

@@ -12 +12 @@
-        </array>
-        <key>IBSystem Version</key>
-G32
+H14
-</dict>
-</plist>

WiredServer/trunk/WCAccountsController.m

@@ -488 +488 @@
-
-- (IBAction)delete:(id)sender {
+        NSString                *name;
+
+        name = [[self _selectedAccount] name];
+
+        NSBeginAlertSheet([NSSWF:NSLS(@"Are you sure you want to delete \"%@\"?", @"Delete account dialog title (account)"), name],
+                                          NSLS(@"Delete", @"Delete account dialog button title"),
+                                          NSLS(@"Cancel", @"Delete account dialog button title"),
+                                          NULL,
+                                          [_deleteButton window],
+                                          self,
+                                          @selector(deleteSheetDidEnd:returnCode:contextInfo:),
+                                          NULL,
+                                          NULL,
+                                          NSLS(@"This cannot be undone.", @"Delete account dialog description"));
+}
+
+
+
+- (void)deleteSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo {
-        NSEnumerator    *enumerator;
-        WCAccount               *account, *user;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
+                
+                [account retain];
+                [_accounts removeObject:account];
+                [_users deleteAccount:account];
+                [_groups deleteAccount:account];
+                [account release];
+                
+                _touched = YES;
+                
+                [_tableView reloadData];
+                
+                row = row == 0 ? 0 : row - 1;
+                
+                if(row != [_tableView selectedRow])
+                        [_tableView selectRow:row byExtendingSelection:NO];
+                else
+                        [self _selectAccount:[self _selectedAccount]];
-        }
-        
-        [account retain];
-        [_accounts removeObject:account];
-        [_users deleteAccount:account];
-        [_groups deleteAccount:account];
-        [account release];
-        
-        _touched = YES;
-        
-        [_tableView selectRow:[_tableView selectedRow] == 0 ? 0 : [_tableView selectedRow] - 1 byExtendingSelection:NO];
-        [_tableView reloadData];
-}
-