From: Kent Sutherland <ksuther@ithinksw.com>
Date: Sun, 29 Feb 2004 15:48:17 +0000 (+0000)
Subject: Added an option to the prefs to turn off the tooltip in the status item.
X-Git-Tag: v1.3~23
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/68dfd7431d482d1958c5d8371c4fd494b1356d84

Added an option to the prefs to turn off the tooltip in the status item.
---

diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib
index 56e143d..da5de05 100755
--- a/English.lproj/Preferences.nib/classes.nib
+++ b/English.lproj/Preferences.nib/classes.nib
@@ -53,6 +53,7 @@
                 sharingTableView = NSTableView; 
                 showOnChangeCheckbox = NSButton; 
                 showScriptsButton = NSButton; 
+                showToolTipCheckbox = NSButton; 
                 songsInAdvance = NSTextField; 
                 trackNumberCheckbox = NSButton; 
                 trackTimeCheckbox = NSButton; 
diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
index b133fd3..81bf1b2 100755
Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/MainController.m b/MainController.m
index c889234..e0230ff 100755
--- a/MainController.m
+++ b/MainController.m
@@ -372,17 +372,23 @@ static MainController *sharedController;
             
             [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];
             
-            NSString *artist = [[self currentRemote] currentSongArtist];
-            NSString *title = [[self currentRemote] currentSongTitle];
-            NSString *toolTip;
-            if (artist) {
-                toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
-            } else if (title) {
-                toolTip = title;
+            //Create the tooltip for the status item
+            if ( [df boolForKey:@"showToolTip"] ) {
+                NSString *artist = [[self currentRemote] currentSongArtist];
+                NSString *title = [[self currentRemote] currentSongTitle];
+                NSString *toolTip;
+                ITDebugLog(@"Creating status item tooltip.");
+                if (artist) {
+                    toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+                } else if (title) {
+                    toolTip = title;
+                } else {
+                    toolTip = @"No Song Playing";
+                }
+                [statusItem setToolTip:toolTip];
             } else {
-                toolTip = @"No Song Playing";
+                [statusItem setToolTip:nil];
             }
-            [statusItem setToolTip:toolTip];
         NS_HANDLER
             [self networkError:localException];
         NS_ENDHANDLER
diff --git a/PreferencesController.h b/PreferencesController.h
index 0730977..c52d9ad 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -55,6 +55,7 @@
     IBOutlet NSTableView *sharingTableView;
     IBOutlet NSButton *showOnChangeCheckbox;
     IBOutlet NSButton *showScriptsButton;
+    IBOutlet NSButton *showToolTipCheckbox;
     IBOutlet NSTextField *songsInAdvance;
     IBOutlet NSButton *trackNumberCheckbox;
     IBOutlet NSButton *trackTimeCheckbox;
diff --git a/PreferencesController.m b/PreferencesController.m
index dcbc6af..c962b52 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -236,6 +236,8 @@ static PreferencesController *prefs = nil;
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     } else if ( [sender tag] == 1100) {
         [df setBool:SENDER_STATE forKey:@"showAlbumArtwork"];
+    } else if ( [sender tag] == 1105) {
+        [df setBool:SENDER_STATE forKey:@"showToolTip"];
     } else if ( [sender tag] == 1110) {
         [df setBool:SENDER_STATE forKey:@"runScripts"];
         if (SENDER_STATE) {
@@ -799,6 +801,8 @@ static PreferencesController *prefs = nil;
     [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState];
     [albumArtworkCheckbox setState:[df boolForKey:@"showAlbumArtwork"] ? NSOnState : NSOffState];
     
+    [showToolTipCheckbox setState:[df boolForKey:@"showToolTip"] ? NSOnState : NSOffState];
+    
     if ([df boolForKey:@"runScripts"]) {
         [runScriptsCheckbox setState:NSOnState];
         [showScriptsButton setEnabled:YES];