X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/259ae5fac769954c7db5974b86e791a929fe6700..9c238c34625031237017749bb07c4b333328a616:/PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 6f8abfd..f7598cb 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -86,6 +86,10 @@ static PreferencesController *prefs = nil;
 	SecKeychainAttribute attributes[3];
 	SecKeychainAttributeList list;
 
+	if ((user == nil) || ([user length] == 0)) {
+		return nil;
+	}
+
 	ITDebugLog(@"Audioscrobbler: Searching for keychain item for %@.", user);
 	attributes[0].tag = kSecAccountItemAttr;
 	attributes[0].data = (char *)[user UTF8String];
@@ -204,6 +208,7 @@ static PreferencesController *prefs = nil;
 		}
 		CFRelease(item);
 	}
+	NSLog(@"Audioscrobbler: Retrieved password: %@", pass);
 	return pass;
 }
 
@@ -235,6 +240,7 @@ static PreferencesController *prefs = nil;
                                                        @"Rewind",
                                                        @"ShowPlayer",
                                                        @"TrackInfo",
+													   @"AlbumArt",
                                                        @"UpcomingSongs",
                                                        @"IncrementVolume",
                                                        @"DecrementVolume",
@@ -259,6 +265,7 @@ static PreferencesController *prefs = nil;
                                                        @"Rewind",
                                                        @"Show Player",
                                                        @"Track Info",
+													   @"Album Art",
                                                        @"Upcoming Songs",
                                                        @"Increment Volume",
                                                        @"Decrement Volume",
@@ -268,12 +275,12 @@ static PreferencesController *prefs = nil;
                                                        @"Toggle Loop",
 													   @"Toggle Song Included In Shuffle",
                                                        @"Pop-up status menu",
-                                                       [NSString stringWithUTF8String:"Set Rating: ☆☆☆☆☆"],
-                                                       [NSString stringWithUTF8String:"Set Rating: ★☆☆☆☆"],
-                                                       [NSString stringWithUTF8String:"Set Rating: ★★☆☆☆"],
-                                                       [NSString stringWithUTF8String:"Set Rating: ★★★☆☆"],
-                                                       [NSString stringWithUTF8String:"Set Rating: ★★★★☆"],
-                                                       [NSString stringWithUTF8String:"Set Rating: ★★★★★"],
+                                                       [NSString stringWithUTF8String:"Set Rating: ‚òÜ‚òÜ‚òÜ‚òÜ‚òÜ"],
+                                                       [NSString stringWithUTF8String:"Set Rating: ‚òÖ‚òÜ‚òÜ‚òÜ‚òÜ"],
+                                                       [NSString stringWithUTF8String:"Set Rating: ‚òÖ‚òÖ‚òÜ‚òÜ‚òÜ"],
+                                                       [NSString stringWithUTF8String:"Set Rating: ‚òÖ‚òÖ‚òÖ‚òÜ‚òÜ"],
+                                                       [NSString stringWithUTF8String:"Set Rating: ‚òÖ‚òÖ‚òÖ‚òÖ‚òÜ"],
+                                                       [NSString stringWithUTF8String:"Set Rating: ‚òÖ‚òÖ‚òÖ‚òÖ‚òÖ"],
                                                        nil];
         hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;
@@ -422,6 +429,9 @@ static PreferencesController *prefs = nil;
 		[audioscrobblerUseCacheCheckbox setEnabled:SENDER_STATE];
 		[audioscrobblerUserTextField setEnabled:SENDER_STATE];
 		[audioscrobblerPasswordTextField setEnabled:SENDER_STATE];
+		if (SENDER_STATE) {
+			[[AudioscrobblerController sharedController] attemptHandshake:NO];
+		}
 	} else if ( [sender tag ] == 6015) {
 		//Here we create a new keychain item if needed and deletes the keychain item if the field is cleared.
 		NSString *currentAccount = [df stringForKey:@"audioscrobblerUser"], *newAccount = [sender stringValue];
@@ -603,7 +613,7 @@ static PreferencesController *prefs = nil;
 
 - (IBAction)changeStatusWindowSetting:(id)sender
 {
-    StatusWindow *sw = [StatusWindow sharedWindow];
+    StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
     ITDebugLog(@"Changing status window setting of tag %i", [sender tag]);
     
     if ( [sender tag] == 2010) {
@@ -886,6 +896,11 @@ static PreferencesController *prefs = nil;
 #pragma mark PRIVATE METHOD IMPLEMENTATIONS
 /*************************************************************************/
 
+- (void)audioscrobblerStatusChanged:(NSNotification *)note
+{
+	[audioscrobblerStatusTextField setStringValue:[[note userInfo] objectForKey:@"StatusString"]];
+}
+
 - (void)setupWindow
 {
     ITDebugLog(@"Loading Preferences.nib.");
@@ -971,6 +986,12 @@ static PreferencesController *prefs = nil;
     int selectedBGStyle;
     id anItem;
 	
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioscrobblerStatusChanged:) name:@"AudioscrobblerStatusChanged" object:nil];
+	if ([df boolForKey:@"audioscrobblerEnabled"]) {
+		NSString *status = [[AudioscrobblerController sharedController] lastStatus];
+		[audioscrobblerStatusTextField setStringValue:(status == nil) ? @"Idle" : status];
+	}
+	
     [df setInteger:MT_CURRENT_VERSION forKey:@"appVersion"];
     
     ITDebugLog(@"Setting up preferences UI.");
@@ -1162,7 +1183,7 @@ static PreferencesController *prefs = nil;
 
 - (void)setStatusWindowEntryEffect:(Class)effectClass
 {
-    StatusWindow *sw = [StatusWindow sharedWindow];
+    StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
     
     float time = ([df floatForKey:@"statusWindowAppearanceSpeed"] ? [df floatForKey:@"statusWindowAppearanceSpeed"] : 0.8);
     [df setObject:NSStringFromClass(effectClass) forKey:@"statusWindowAppearanceEffect"];
@@ -1173,7 +1194,7 @@ static PreferencesController *prefs = nil;
 
 - (void)setStatusWindowExitEffect:(Class)effectClass
 {
-    StatusWindow *sw = [StatusWindow sharedWindow];
+    StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
     
     float time = ([df floatForKey:@"statusWindowVanishSpeed"] ? [df floatForKey:@"statusWindowVanishSpeed"] : 0.8);
     [df setObject:NSStringFromClass(effectClass) forKey:@"statusWindowVanishEffect"];