X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/0e96faf46397725b657c4947d13cd31fa75aa170..8cd402b5d3e43c95046af7ac0e4cb3cde2d622bc:/MainController.m

diff --git a/MainController.m b/MainController.m
index 2a3d6b3..9a8b493 100755
--- a/MainController.m
+++ b/MainController.m
@@ -103,8 +103,12 @@ static MainController *sharedController;
 	float iTunesVersion;
 	
     //Turn on debug mode if needed
-    if ([df boolForKey:@"ITDebugMode"]) {
+	/*if ((GetCurrentKeyModifiers() & (controlKey | rightControlKey)) != 0)
+    if ((GetCurrentKeyModifiers() & (optionKey | rightOptionKey)) != 0)
+    if ((GetCurrentKeyModifiers() & (shiftKey | rightShiftKey)) != 0)*/
+    if ([df boolForKey:@"ITDebugMode"] || ((GetCurrentKeyModifiers() & (controlKey | rightControlKey)) != 0)) {
         SetITDebugMode(YES);
+		[[StatusWindowController sharedController] showDebugModeEnabledWindow];
     }
 
 	//Check if iTunes 4.7 or later is installed	
@@ -764,7 +768,7 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Show preferences.");
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
@@ -971,6 +975,16 @@ static MainController *sharedController;
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
+	if ([df objectForKey:@"ToggleShufflability"] != nil) {
+        ITDebugLog(@"Setting up toggle song shufflability hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"ToggleShufflability"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShufflability"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(toggleSongShufflable)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+	
     if ([df objectForKey:@"PopupMenu"] != nil) {
         ITDebugLog(@"Setting up popup menu hot key.");
         hotKey = [[ITHotKey alloc] init];
@@ -1066,6 +1080,8 @@ static MainController *sharedController;
             NS_HANDLER
                 [self networkError:localException];
             NS_ENDHANDLER
+			_timeUpdateCount = 0;
+			[NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(updateTime:) userInfo:nil repeats:YES];
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {
@@ -1122,6 +1138,23 @@ static MainController *sharedController;
                                                    image:art];
 }
 
+- (void)updateTime:(NSTimer *)timer
+{
+	_timeUpdateCount++;
+	if (_timeUpdateCount > (int)[df floatForKey:@"statusWindowVanishDelay"] - 1) {
+		NSString *time = nil;
+		NS_DURING
+			time = [NSString stringWithFormat:@"%@: %@ / %@",
+						NSLocalizedString(@"time", @"Time"),
+						[[self currentRemote] currentSongElapsed],
+						[[self currentRemote] currentSongLength]];
+			[[StatusWindowController sharedController] updateTime:time];
+		NS_HANDLER
+			[self networkError:localException];
+		NS_ENDHANDLER
+	}
+}
+
 - (void)showUpcomingSongs
 {
     int numSongs = 0;
@@ -1314,9 +1347,22 @@ static MainController *sharedController;
     NS_ENDHANDLER
 }
 
+- (void)toggleSongShufflable
+{
+	NS_DURING
+        BOOL flag = ![[self currentRemote] currentSongShufflable];
+        ITDebugLog(@"Toggling shufflability.");
+        [[self currentRemote] setCurrentSongShufflable:flag];
+        //Show song shufflability status window
+        //[statusWindowController showSongShuffabilityWindow:flag];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+}
+
 - (void)registerNowOK
 {
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 
@@ -1325,7 +1371,7 @@ static MainController *sharedController;
 
 - (void)registerNowCancel
 {
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 
@@ -1480,14 +1526,14 @@ static MainController *sharedController;
         [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
     }*/
     [self checkForRemoteServerAndConnectImmediately:YES];
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
 
 - (void)cancelReconnect
 {
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
@@ -1572,7 +1618,8 @@ static MainController *sharedController;
 
 - (void)applicationDidBecomeActive:(NSNotification *)note
 {
-	if (_open && !blinged && ![NSApp mainWindow] && ([[StatusWindow sharedWindow] exitMode] == ITTransientStatusWindowExitAfterDelay)) {
+	//This appears to not work in 10.4
+	if (_open && !blinged && ![[ITAboutWindowController sharedController] isVisible] && ![NSApp mainWindow] && ([[StatusWindow sharedWindow] exitMode] == ITTransientStatusWindowExitAfterDelay)) {
 		[[MainController sharedController] showPreferences];
 	}
 }