From 9a9b400fdc1cd2f855279108d5ee7963212f2c37 Mon Sep 17 00:00:00 2001
From: Kent Sutherland <ksuther@ithinksw.com>
Date: Thu, 4 Aug 2005 17:53:09 +0000
Subject: [PATCH] Added an about box menu item. Bumped versions to MT 1.5.2.

---
 English.lproj/InfoPlist.strings   | Bin 548 -> 548 bytes
 English.lproj/Localizable.strings |   1 +
 Info.plist                        |   2 +-
 MainController.h                  |   2 +-
 MainController.m                  |   3 ++-
 MenuController.h                  |   1 +
 MenuController.m                  |  14 +++++++++++++-
 PreferencesController.m           |   2 ++
 8 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings
index 6036df352ff1cdbb3f5eb61feb121cbab3345648..a9cef8f190a01cada9c195e5e8f8a876923ca7ba 100755
GIT binary patch
delta 17
ZcmZ3&vV>*ATSlXa??M@kCc7{`002Eo2EYIS

delta 17
ZcmZ3&vV>*ATSmi)??M?3C%Z5{002EZ2EG6Q

diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings
index 0b70ce5..665f569 100755
--- a/English.lproj/Localizable.strings
+++ b/English.lproj/Localizable.strings
@@ -9,6 +9,7 @@ rewind = "Rewind";
 showPlayer = "Show Player";
 show = "Show";
 preferences = "Preferences...";
+about = "About MenuTunes...";
 quit = "Quit MenuTunes";
 trackInfo = "Current Track Info";
 nowPlaying = "Now Playing";
diff --git a/Info.plist b/Info.plist
index 236728a..4eec771 100755
--- a/Info.plist
+++ b/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>ITmt</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.1</string>
+	<string>1.5.2</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSMainNibFile</key>
diff --git a/MainController.h b/MainController.h
index 027db07..36323bc 100755
--- a/MainController.h
+++ b/MainController.h
@@ -19,7 +19,7 @@
 #import <ITMTRemote/ITMTRemote.h>
 #import "MTBlingController.h"
 
-#define MT_CURRENT_VERSION 1510
+#define MT_CURRENT_VERSION 1520
 
 @class StatusWindowController, MenuController, NetworkController;
 
diff --git a/MainController.m b/MainController.m
index d185d83..50b078d 100755
--- a/MainController.m
+++ b/MainController.m
@@ -1576,7 +1576,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 && ![[ITAboutBox sharedController] isVisible] && ![NSApp mainWindow] && ([[StatusWindow sharedWindow] exitMode] == ITTransientStatusWindowExitAfterDelay)) {
 		[[MainController sharedController] showPreferences];
 	}
 }
diff --git a/MenuController.h b/MenuController.h
index 91a462a..5768a39 100755
--- a/MenuController.h
+++ b/MenuController.h
@@ -34,6 +34,7 @@ typedef enum {
     MTMenuNextTrackItem,
     MTMenuShowPlayerItem,
     MTMenuPreferencesItem,
+	MTMenuAboutItem,
     MTMenuQuitItem,
     MTMenuRegisterItem
 } MTMenuItemTag;
diff --git a/MenuController.m b/MenuController.m
index a7147a4..5fdf747 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -15,6 +15,7 @@
 #import <ITKit/ITHotKey.h>
 #import <ITKit/ITKeyCombo.h>
 #import <ITKit/ITCategory-NSMenu.h>
+#import <ITKit/ITAboutBox.h>
 
 @interface MenuController (SubmenuMethods)
 - (NSMenu *)ratingMenu;
@@ -222,7 +223,14 @@
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuPreferencesItem];
             [tempItem setTarget:self];
-        } else if ([nextObject isEqualToString:@"quit"]) {
+        } else if ([nextObject isEqualToString:@"about"]) {
+			ITDebugLog(@"Add \"About MenuTunes...\" menu item.");
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"about", @"About MenuTunes...")
+                    action:@selector(performMainMenuAction:)
+                    keyEquivalent:@""];
+            [tempItem setTag:MTMenuAboutItem];
+            [tempItem setTarget:self];
+		} else if ([nextObject isEqualToString:@"quit"]) {
             if ([[MainController sharedController] blingBling] == NO) {
                 ITDebugLog(@"Add \"Register MenuTunes...\" menu item.");
                 tempItem = [menu addItemWithTitle:NSLocalizedString(@"register", @"Register MenuTunes...") action:@selector(performMainMenuAction:) keyEquivalent:@""];
@@ -876,6 +884,10 @@
             ITDebugLog(@"Performing Menu Action: Preferences...");
             [[MainController sharedController] showPreferences];
             break;
+		case MTMenuAboutItem:
+			ITDebugLog(@"Performing Menu Action: About MenuTunes...");
+			[[ITAboutBox sharedController] showAboutBox];
+			break;
         case MTMenuQuitItem:
             ITDebugLog(@"Performing Menu Action: Quit");
             [[MainController sharedController] quitMenuTunes];
diff --git a/PreferencesController.m b/PreferencesController.m
index 0c2a71c..247dca7 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -559,6 +559,7 @@ static PreferencesController *prefs = nil;
         @"upcomingSongs",
         @"separator",
         @"preferences",
+		@"about",
         @"quit",
         nil] forKey:@"menu"];
 
@@ -756,6 +757,7 @@ static PreferencesController *prefs = nil;
         @"fastForward",
         @"rewind",
         @"showPlayer",
+		@"about",
         @"quit",
         nil];
     
-- 
2.20.1