Changeset 4315

Timestamp:

Dec 24, 2007, 4:18:09 PM (15 years ago)

Author:

livings124

Message:

set up message log in tr_initFull

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• MessageWindowController.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -204 +204 @@
                         FALSE, /* reset in prefs */
                         -1, /* reset in prefs */
-                        [fDefaults integerForKey: @"PeersGlobal"]);
+                        [fDefaults integerForKey: @"PeersGlobal"],
+                        [fDefaults integerForKey: @"MessageLevel"],
+                        YES);
         
         [NSApp setDelegate: self];

trunk/macosx/MessageWindowController.m

@@ -45 +45 @@
 - (id) init
 {
-    if ((self = [super initWithWindowNibName: @"MessageWindow"]))
-    {
-        fMessages = [[NSMutableArray alloc] init];
-        
-        fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
-                    selector: @selector(updateLog:) userInfo: nil repeats: YES];
-        
-        tr_setMessageLevel([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"]);
-        tr_setMessageQueuing(1);
-    }
-    return self;
+    return [super initWithWindowNibName: @"MessageWindow"];
 }
 
@@ -68 +58 @@
 }
 
+#warning don't update when the window is closed
 - (void) awakeFromNib
 {
+    fMessages = [[NSMutableArray alloc] init];
+        
+    fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
+                selector: @selector(updateLog:) userInfo: nil repeats: YES];
+    
     NSWindow * window = [self window];
     [window setFrameAutosaveName: @"MessageWindowFrame"];
@@ -79 +75 @@
     //initially sort peer table by IP
     if ([[fMessageTable sortDescriptors] count] == 0)
-    {
         [fMessageTable setSortDescriptors: [NSArray arrayWithObject: [[fMessageTable tableColumnWithIdentifier: @"Date"]
                                             sortDescriptorPrototype]]];
-        [self updateLog: nil];
-    }
     
     fErrorImage = [NSImage imageNamed: @"RedDot.png"];
@@ -107 +100 @@
             [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
     }
+    
+    [self updateLog: nil];
 }