From: Kent Sutherland <ksuther@ithinksw.com>
Date: Fri, 14 Nov 2003 01:04:23 +0000 (+0000)
Subject: Fixed my dorkiness with making unneeded helper methods in
X-Git-Tag: v1.2~36
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/b2bb0c2895efc7d1556a37576f224d7e5ff91258

Fixed my dorkiness with making unneeded helper methods in
StatusWindowController. Made it save the changes over to the next run of
MT. It doesn't show the prefs states though yet.
---

diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib
index 670f459..9a0e5d1 100755
--- a/English.lproj/Preferences.nib/info.nib
+++ b/English.lproj/Preferences.nib/info.nib
@@ -20,7 +20,6 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>6</integer>
-		<integer>634</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>7C107</string>
diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
index 8563020..f812308 100755
Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/PreferencesController.m b/PreferencesController.m
index f5ffe1c..01ca498 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -364,7 +364,8 @@ static PreferencesController *prefs = nil;
     if ( [sender tag] == 2010) {
         [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"];
         [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"];
-        [[StatusWindowController sharedController] readDefaults];
+        [sw setHorizontalPosition:[sender selectedColumn]];
+        [sw setVerticalPosition:[sender selectedRow]];
         // update the window's position here
     } else if ( [sender tag] == 2020) {
         // update screen selection
diff --git a/StatusWindowController.h b/StatusWindowController.h
index 7e9aae5..11d7fe8 100755
--- a/StatusWindowController.h
+++ b/StatusWindowController.h
@@ -33,8 +33,6 @@ typedef enum {
 
 + (StatusWindowController *)sharedController;
 
-- (void)readDefaults;
-
 - (void)showUpcomingSongsWindowWithTitles:(NSArray *)titleStrings;
 
 - (void)showVolumeWindowWithLevel:(float)level;
diff --git a/StatusWindowController.m b/StatusWindowController.m
index e28bf71..a0ab68c 100755
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -52,6 +52,9 @@ static StatusWindowController *sharedController;
         [_window setExitMode:ITTransientStatusWindowExitAfterDelay];
         [_window setExitDelay:(exitDelay ? exitDelay : 4.0)];
 
+        [_window setHorizontalPosition:[df integerForKey:@"statusWindowHorizontalPosition"]];
+        [_window setVerticalPosition:[df integerForKey:@"statusWindowVerticalPosition"]];
+
         if ( entryTag == 2101 ) {
             entryEffect = [[[ITDissolveWindowEffect alloc] initWithWindow:_window] autorelease];
         } else if ( entryTag == 2102 ) {
@@ -93,14 +96,6 @@ static StatusWindowController *sharedController;
     [super dealloc];
 }
 
-- (void)readDefaults
-{
-    ITHorizontalWindowPosition horizontalPosition = [[NSUserDefaults standardUserDefaults] integerForKey:@"statusWindowHorizontalPosition"];
-    ITVerticalWindowPosition verticalPosition = [[NSUserDefaults standardUserDefaults] integerForKey:@"statusWindowVerticalPosition"];
-    [_window setHorizontalPosition:horizontalPosition];
-    [_window setVerticalPosition:verticalPosition];
-}
-
 - (void)showSongInfoWindowWithSource:(ITMTRemotePlayerSource)source
                                title:            (NSString *)title
                                album:            (NSString *)album