git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing some simple, silly naming issues.
[MenuTunes.git]
/
PreferencesController.m
diff --git
a/PreferencesController.m
b/PreferencesController.m
index
fa8d29d
..
e82526b
100755
(executable)
--- a/
PreferencesController.m
+++ b/
PreferencesController.m
@@
-515,6
+515,7
@@
static PreferencesController *prefs = nil;
@"quit",
nil] forKey:@"menu"];
@"quit",
nil] forKey:@"menu"];
+ [df setInteger:1200 forKey:@"appVersion"];
[df setInteger:5 forKey:@"SongsInAdvance"];
// [df setBool:YES forKey:@"showName"]; // Song info will always show song title.
[df setBool:YES forKey:@"showArtist"];
[df setInteger:5 forKey:@"SongsInAdvance"];
// [df setBool:YES forKey:@"showName"]; // Song info will always show song title.
[df setBool:YES forKey:@"showArtist"];
@@
-528,6
+529,8
@@
static PreferencesController *prefs = nil;
[df setFloat:4.0 forKey:@"statusWindowVanishDelay"];
[df setInteger:(int)ITWindowPositionBottom forKey:@"statusWindowVerticalPosition"];
[df setInteger:(int)ITWindowPositionLeft forKey:@"statusWindowHorizontalPosition"];
[df setFloat:4.0 forKey:@"statusWindowVanishDelay"];
[df setInteger:(int)ITWindowPositionBottom forKey:@"statusWindowVerticalPosition"];
[df setInteger:(int)ITWindowPositionLeft forKey:@"statusWindowHorizontalPosition"];
+ [[StatusWindow sharedWindow] setVerticalPosition:(int)ITWindowPositionBottom];
+ [[StatusWindow sharedWindow] setHorizontalPosition:(int)ITWindowPositionLeft];
[df setBool:YES forKey:@"showSongInfoOnChange"];
[df setObject:[NSArchiver archivedDataWithRootObject:[NSColor blueColor]] forKey:@"statusWindowBackgroundColor"];
[df setBool:YES forKey:@"showSongInfoOnChange"];
[df setObject:[NSArchiver archivedDataWithRootObject:[NSColor blueColor]] forKey:@"statusWindowBackgroundColor"];
@@
-863,7
+866,7
@@
static PreferencesController *prefs = nil;
[nameTextField setStringValue:serverName];
[selectPlayerBox setContentView:zeroConfView];
[nameTextField setStringValue:serverName];
[selectPlayerBox setContentView:zeroConfView];
- if ([[df dataForKey:@"sharedPlayerPassword"] length]) {
+ if ([[df dataForKey:@"sharedPlayerPassword"] length]
> 0
) {
[passwordTextField setStringValue:@"p4s5w0rdMT1.2"];
} else {
[passwordTextField setStringValue:@""];
[passwordTextField setStringValue:@"p4s5w0rdMT1.2"];
} else {
[passwordTextField setStringValue:@""];
@@
-977,6
+980,11
@@
static PreferencesController *prefs = nil;
ITDebugLog(@"Synchronizing menus");
[df setObject:myItems forKey:@"menu"];
[df synchronize];
ITDebugLog(@"Synchronizing menus");
[df setObject:myItems forKey:@"menu"];
[df synchronize];
+
+ //If we're connected over a network, refresh the menu immediately
+ if ([[NetworkController sharedController] isConnectedToServer]) {
+ [controller timerUpdate];
+ }
}
- (void)setLaunchesAtLogin:(BOOL)flag
}
- (void)setLaunchesAtLogin:(BOOL)flag