Changeset 3314 for trunk/macosx/InfoWindowController.m

Timestamp:

Oct 7, 2007, 12:24:26 PM (15 years ago)

Author:

livings124

Message:

change some initializers so that they are aware of their own nib's name

File:

• trunk/macosx/InfoWindowController.m (modified) (7 diffs)

trunk/macosx/InfoWindowController.m

@@ -63 +63 @@
 - (void) updateInfoOptions;
 
+- (NSView *) tabViewForTag: (int) tag;
 - (NSArray *) peerSortDescriptors;
 
@@ -68 +69 @@
 
 @implementation InfoWindowController
+
+- (id) init
+{
+    return [super initWithWindowNibName: @"InfoWindow"];
+}
 
 - (void) awakeFromNib
@@ -77 +83 @@
     NSPanel * window = (NSPanel *)[self window];
     
-    /*[window setFrameAutosaveName: @"InspectorWindowFrame"];
-    [window setFrameUsingName: @"InspectorWindowFrame"];*/
+    float windowHeight = [window frame].size.height;
+    
+    [window setFrameAutosaveName: @"InspectorWindow"];
+    [window setFrameUsingName: @"InspectorWindow"];
+    
+    NSRect windowRect = [window frame];
+    windowRect.origin.y -= windowHeight - windowRect.size.height;
+    windowRect.size.height = windowHeight;
+    [window setFrame: windowRect display: NO];
     
     [window setBecomesKeyOnlyIfNeeded: YES];
@@ -147 +160 @@
 - (void) dealloc
 {
+    #warning not called?
+    float viewHeight = [[self tabViewForTag: fCurrentTabTag] frame].size.height;
+    
+    //save resizeable view height
     if (fCurrentTabTag == TAB_PEERS_TAG || fCurrentTabTag == TAB_FILES_TAG)
-    {
-        NSView * view = fCurrentTabTag == TAB_PEERS_TAG ? fPeersView : fFilesView;
-        [[NSUserDefaults standardUserDefaults] setFloat: [view frame].size.height forKey: @"InspectorContentHeight"];
-    }
+        [[NSUserDefaults standardUserDefaults] setFloat: viewHeight forKey: @"InspectorContentHeight"];
     
     [[NSNotificationCenter defaultCenter] removeObserver: self];
@@ -812 +826 @@
         
         //get old view
-        NSView * oldView;
-        switch (oldTabTag)
-        {
-            case TAB_INFO_TAG:
-                oldView = fInfoView;
-                break;
-            case TAB_ACTIVITY_TAG:
-                oldView = fActivityView;
-                break;
-            case TAB_PEERS_TAG:
-                oldView = fPeersView;
-                break;
-            case TAB_FILES_TAG:
-                oldView = fFilesView;
-                break;
-            case TAB_OPTIONS_TAG:
-                oldView = fOptionsView;
-                break;
-        }
-        
+        NSView * oldView = [self tabViewForTag: oldTabTag];
         [oldView setHidden: YES];
         [oldView removeFromSuperview];
@@ -1008 +1003 @@
 }
 
-- (NSArray *) peerSortDescriptors
-{
-    NSMutableArray * descriptors = [NSMutableArray arrayWithCapacity: 2];
-    
-    NSArray * oldDescriptors = [fPeerTable sortDescriptors];
-    BOOL useSecond = YES, asc = YES;
-    if ([oldDescriptors count] > 0)
-    {
-        NSSortDescriptor * descriptor = [oldDescriptors objectAtIndex: 0];
-        [descriptors addObject: descriptor];
-        
-        if ((useSecond = ![[descriptor key] isEqualToString: @"IP"]))
-            asc = [descriptor ascending];
-    }
-    
-    //sort by IP after primary sort
-    if (useSecond)
-    {
-        NSSortDescriptor * secondDescriptor = [[NSSortDescriptor alloc] initWithKey: @"IP" ascending: asc
-                                                                        selector: @selector(compareIP:)];
-        [descriptors addObject: secondDescriptor];
-        [secondDescriptor release];
-    }
-    
-    return descriptors;
-}
-
 - (int) outlineView: (NSOutlineView *) outlineView numberOfChildrenOfItem: (id) item
 {
@@ -1368 +1336 @@
 
 @end
+
+@implementation InfoWindowController (Private)
+
+- (NSView *) tabViewForTag: (int) tag
+{
+    switch (tag)
+    {
+        case TAB_INFO_TAG:
+            return fInfoView;
+        case TAB_ACTIVITY_TAG:
+            return fActivityView;
+        case TAB_PEERS_TAG:
+            return fPeersView;
+        case TAB_FILES_TAG:
+            return fFilesView;
+        case TAB_OPTIONS_TAG:
+            return fOptionsView;
+        default:
+            return nil;
+    }
+}
+
+- (NSArray *) peerSortDescriptors
+{
+    NSMutableArray * descriptors = [NSMutableArray arrayWithCapacity: 2];
+    
+    NSArray * oldDescriptors = [fPeerTable sortDescriptors];
+    BOOL useSecond = YES, asc = YES;
+    if ([oldDescriptors count] > 0)
+    {
+        NSSortDescriptor * descriptor = [oldDescriptors objectAtIndex: 0];
+        [descriptors addObject: descriptor];
+        
+        if ((useSecond = ![[descriptor key] isEqualToString: @"IP"]))
+            asc = [descriptor ascending];
+    }
+    
+    //sort by IP after primary sort
+    if (useSecond)
+    {
+        NSSortDescriptor * secondDescriptor = [[NSSortDescriptor alloc] initWithKey: @"IP" ascending: asc
+                                                                        selector: @selector(compareIP:)];
+        [descriptors addObject: secondDescriptor];
+        [secondDescriptor release];
+    }
+    
+    return descriptors;
+}
+
+@end