Changeset 15039

Timestamp:

01/22/2006 06:37:11 PM (3 years ago)

Author:

evands

Message:

• Hide the Info and Accounts tab view items in the Get Info window for groups.
  
• General code cleanup and efficiency
  

Fixes #2788

Files:

• trunk/Resources/ContactInfoWindow.nib/classes.nib (modified) (3 diffs)
• trunk/Resources/ContactInfoWindow.nib/keyedobjects.nib (modified) (previous)
• trunk/Source/AIContactInfoWindowController.h (modified) (2 diffs)
• trunk/Source/AIContactInfoWindowController.m (modified) (5 diffs)

trunk/Resources/ContactInfoWindow.nib/classes.nib

@@ -1 +1 @@
-{
-    IBClasses = (
-        {
-            CLASS = AIAbstractListWindowController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                contactListView = AIMultiCellOutlineView; 
-                "scrollView_contactList" = AIAutoScrollView; 
-            }; 
-            SUPERCLASS = AIWindowController; 
-        }, 
-        {
-            CLASS = AIAlternatingRowOutlineView; 
@@ -23 +14 @@
-        {CLASS = AIAutoScrollView; LANGUAGE = ObjC; SUPERCLASS = NSScrollView; }, 
-        {
-closeWindow = id; 
+
-            CLASS = AIContactInfoWindowController; 
-            LANGUAGE = ObjC; 
@@ -31 +22 @@
-                contactListView = AIListOutlineView; 
-                "drawer_metaContact" = NSDrawer; 
-ES
+AI
-                "scrollView_contactList" = AIAutoScrollView; 
+                "tabViewItem_accounts" = NSTabViewItem; 
+                "tabViewItem_info" = NSTabViewItem; 
-                "tabView_category" = NSTabView; 
-                "textField_accountName" = NSTextField; 

trunk/Source/AIContactInfoWindowController.h

@@ -23 +23 @@
-@interface AIContactInfoWindowController : AIWindowController <AIListControllerDelegate> {      
-        IBOutlet                NSTabView                                               *tabView_category;
+        
+        IBOutlet                NSTabViewItem                                   *tabViewItem_info;
+        IBOutlet                NSTabViewItem                                   *tabViewItem_accounts;
+        NSTabViewItem                                                                   *tabViewItem_lastSelectedForListContacts;
+
-        IBOutlet                AIImageViewWithImagePicker              *imageView_userIcon;
-        IBOutlet                NSTextField                                             *textField_accountName;
@@ -48 +53 @@
-+ (void)closeInfoWindow;
-- (void)configureForListObject:(AIListObject *)inObject;
-- (void)configurePanes;
-
-- (IBAction)addContact:(id)sender;

trunk/Source/AIContactInfoWindowController.m

@@ -52 +52 @@
-- (void)localizeTabViewItemTitles;
-- (void)configureDrawer;
+- (void)configureVisiblityOfTabViewItemsForListObject:(AIListObject *)inObject;
+- (void)configurePanes:(NSArray *)inPanes;
-- (void)setupMetaContactDrawer;
-
@@ -108 +110 @@
-}
-
-//init
-- (id)initWithWindowNibName:(NSString *)windowNibName
-{
-        self = [super initWithWindowNibName:windowNibName];
-
-        return self;
-}
-
-- (void)dealloc
-{
+        //If we removed the account and info tab view items, we're currently also retaining them
+        if ([tabView_category indexOfTabViewItem:tabViewItem_info] == NSNotFound) {
+                [tabViewItem_accounts release]; tabViewItem_accounts = nil;
+                [tabViewItem_info release]; tabViewItem_info = nil;
+        }
+
-        [displayedObject release]; displayedObject = nil;
-        [loadedPanes release]; loadedPanes = nil;
-
+
-        [super dealloc];
-}
@@ -238 +238 @@
-{
-        if (tabView == tabView_category) {
-
-
-
-
-
+
+
+
+
+
+
+
-
-                switch (identifier) {
-                        case AIInfo_Profile:
-
+
+
-                                break;
-                        case AIInfo_Accounts:
-
+
+
-                                break;
-                        case AIInfo_Alerts:
-
+
+
-                                break;
-                        case AIInfo_Settings:
-
-
-
-
-
-
-
+
+
+
-                }
-
-                //Configure the loaded panes
-
+:panes
-        }
-}
@@ -377 +378 @@
-                                                                          [NSString stringWithFormat:AILocalizedString(@"%@'s Image",nil),[inObject displayName]] :
-                                                                          AILocalizedString(@"Image Picker",nil))];
+
-                //Configure our subpanes
-Panes
+VisiblityOfTabViewItemsForListObject:inObject
-
-                //Confiugre the drawer
-                [self configureDrawer];
+                
+                //Reconfigure the currently selected tab view item
+                [self tabView:tabView_category willSelectTabViewItem:[tabView_category selectedTabViewItem]];
+
-        }
-}
-
-//Configure our views
-
+:(NSArray *)panes
-{
-        if (displayedObject) {
-loadedP
+p
-                AIContactInfoPane       *pane;
-
@@ -395 +401 @@
-                        [pane configureForListObject:displayedObject];
-                }
+        }
+}
+
+- (void)configureVisiblityOfTabViewItemsForListObject:(AIListObject *)inObject
+{
+        if ([inObject isKindOfClass:[AIListGroup class]]) {
+                //Remove the info and account items for groups
+                if ([tabView_category indexOfTabViewItem:tabViewItem_info] != NSNotFound) {
+                        [tabViewItem_accounts retain];
+                        [tabViewItem_info retain];
+                        
+                        //Store the tab view item selected out of accounts or info, if one is selected
+                        NSTabViewItem *currentlySelected = [tabView_category selectedTabViewItem];
+                        tabViewItem_lastSelectedForListContacts = ((currentlySelected == tabViewItem_accounts || currentlySelected == tabViewItem_info) ?
+                                                                                                           currentlySelected :
+                                                                                                           nil);
+
+                        [tabView_category removeTabViewItem:tabViewItem_accounts];
+                        [tabView_category removeTabViewItem:tabViewItem_info];
+                }
+                
+        } else {
+                //Add the info and account items back in if they are missing
+                if ([tabView_category indexOfTabViewItem:tabViewItem_info] == NSNotFound) {
+                        [tabView_category insertTabViewItem:tabViewItem_accounts atIndex:0];
+                        [tabView_category insertTabViewItem:tabViewItem_info atIndex:0];
+                        
+                        //Restore the tab view item last selected for a contact if we have one stored
+                        if (tabViewItem_lastSelectedForListContacts) {
+                                [tabView_category selectTabViewItem:tabViewItem_lastSelectedForListContacts];
+                                tabViewItem_lastSelectedForListContacts = nil;
+                        }
+                        
+                        [tabViewItem_accounts release];
+                        [tabViewItem_info release];
+                }                       
-        }
-}