Tweaked the image position in the status window a bit. Added base of the

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 9313f11..307800f 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -55,6 +55,13 @@ static MainController *sharedController;
         SetITDebugMode(YES);
     }
     
+    if (([df integerForKey:@"appVersion"] < 1200) && ([df integerForKey:@"SongsInAdvance"] > 0)) {
+        [df removePersistentDomainForName:@"com.ithinksw.menutunes"];
+        [df synchronize];
+        [[PreferencesController sharedPrefs] registerDefaults];
+        [[StatusWindowController sharedController] showPreferencesUpdateWindow];
+    }
+    
     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     
@@ -85,10 +92,14 @@ static MainController *sharedController;
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     
-    [StatusItemHack install];
-    statusItem = [[ITStatusItem alloc]
-            initWithStatusBar:[NSStatusBar systemStatusBar]
-            withLength:NSSquareStatusItemLength];
+    if ([df boolForKey:@"ITMTNoStatusItem"]) {
+        statusItem = nil;
+    } else {
+        [StatusItemHack install];
+        statusItem = [[ITStatusItem alloc]
+                initWithStatusBar:[NSStatusBar systemStatusBar]
+                withLength:NSSquareStatusItemLength];
+    }
     
     bling = [[MTBlingController alloc] init];
     [self blingTime];
@@ -476,6 +487,15 @@ static MainController *sharedController;
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
+- (void)showPreferencesAndClose
+{
+    ITDebugLog(@"Show preferences.");
+    [[PreferencesController sharedPrefs] showPrefsWindow:self];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+}
+
 - (void)showTestWindow
 {
     [self showCurrentTrackInfo];
@@ -663,6 +683,7 @@ static MainController *sharedController;
     NSString               *artist      = nil;
     NSString               *time        = nil;
     NSString               *track       = nil;
+    NSImage                *art         = nil;
     int                     rating      = -1;
     
     NS_DURING
@@ -734,6 +755,14 @@ static MainController *sharedController;
             }
         }
         
+        if ( [df boolForKey:@"showAlbumArtwork"] ) {
+             NS_DURING
+                art = [[self currentRemote] currentSongAlbumArt];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
+        }
+        
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
@@ -744,7 +773,8 @@ static MainController *sharedController;
                                                   artist:artist
                                                     time:time
                                                    track:track
-                                                  rating:rating];
+                                                  rating:rating
+                                                   image:art];
 }
 
 - (void)showUpcomingSongs