Changeset 712 for trunk

Timestamp:

Jul 30, 2006, 10:11:08 PM (16 years ago)

Author:

livings124

Message:

Change setup of PrefsController? a little.

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• PrefsController.h (modified) (1 diff)
• PrefsController.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -74 +74 @@
         fDefaults = [NSUserDefaults standardUserDefaults];
         fInfoController = [[InfoWindowController alloc] initWithWindowNibName: @"InfoWindow"];
-        fPrefsController = [[PrefsController alloc] initWithWindowNibName: @"PrefsWindow"];
+        fPrefsController = [[PrefsController alloc] initWithWindowNibName: @"PrefsWindow" handle: fLib];
         fBadger = [[Badger alloc] init];
         
@@ -106 +106 @@
 - (void) awakeFromNib
 {
-    [fPrefsController setPrefs: fLib];
-    
     [fStatusBar setBackgroundImage: [NSImage imageNamed: @"StatusBarBackground.png"]];
     [fFilterBar setBackgroundImage: [NSImage imageNamed: @"FilterBarBackground.png"]];

trunk/macosx/PrefsController.h

@@ -61 +61 @@
 }
 
-- (void) setPrefs: (tr_handle_t *) handle;
+- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle;
 
 - (void) setShowMessage:    (id) sender;

trunk/macosx/PrefsController.m

@@ -71 +71 @@
 }
 
+- (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle
+{
+    if ((self = [super initWithWindowNibName: name]))
+    {
+        fDefaults = [NSUserDefaults standardUserDefaults];
+        fHandle = handle;
+    }
+    return self;
+}
+
 - (void) dealloc
 {
@@ -77 +87 @@
 }
 
-- (void) setPrefs: (tr_handle_t *) handle
+- (void) awakeFromNib
 {
     fToolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"];
@@ -88 +98 @@
     [fToolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
     [self showGeneralPref: nil];
-
-    fDefaults = [NSUserDefaults standardUserDefaults];
-    fHandle = handle;
     
     //set download folder
@@ -286 +293 @@
     else
     {
-        tr_setBindPort( fHandle, bindPort );
+        tr_setBindPort(fHandle, bindPort);
         [fDefaults setInteger: bindPort forKey: @"BindPort"];
     }