Added "Show in Spotify" functionality"

Changelog.rtf

@@ -32,4 +32,5 @@
 \cf0 06/17/2012\
 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
-\cf0 -Added "Show in Browser" functionality}
+\cf0 -Added "Show in Browser" functionality\
+-Added "Get from Spotify" functionality}

de.lproj/Localizable.strings

@@ -58,6 +58,11 @@
 
 "iTunes.messages.replaceLyrics.detail" = "Beim Eretzen geht der alte Songtext vollständig verloren. Diese Aktion kann nicht wiederrufen werden.";
 
+/* Spotify Messages */
+"Spotify.messages.noTrackPlaying.title" = "Spotify spielt zut Zeit keine Musik.";
+
+"Spotify.messages.noTrackPlaying.detail" = "Starten Sie die Wiedergabe in Spotify, um diese Funktion zu verwenden.";
+
 /* Error while saving */
 "messages.error.saveLyrics.title" = "Der Songtext konnte nicht gespeichert werden.";
 

en.lproj/Localizable.strings

@@ -58,6 +58,11 @@
 
 "iTunes.messages.replaceLyrics.detail" = "If you replace the old lyrics they can not be restored anymore.";
 
+/* Spotify Messages */
+"Spotify.messages.noTrackPlaying.title" = "Spotify does currently not play any music.";
+
+"Spotify.messages.noTrackPlaying.detail" = "Play a track in Spotify to use this feature.";
+
 /* Error while saving */
 "messages.error.saveLyrics.title" = "The Lyrics could not be saved.";
 

iLyrics.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@
 		3B20EF3F1584EA9A006C0CDF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B20EF3E1584EA9A006C0CDF /* AppDelegate.m */; };
 		3B20EF421584EA9A006C0CDF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3B20EF401584EA9A006C0CDF /* MainMenu.xib */; };
 		3B20EF491584EAA3006C0CDF /* iLyrics.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3B20EF481584EAA3006C0CDF /* iLyrics.icns */; };
-		3B20EF4D1584EAAD006C0CDF /* iTunes-icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3B20EF4A1584EAAD006C0CDF /* iTunes-icon.icns */; };
+		3B20EF4D1584EAAD006C0CDF /* iTunes.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3B20EF4A1584EAAD006C0CDF /* iTunes.icns */; };
 		3B20EF4E1584EAAD006C0CDF /* Diamond.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3B20EF4B1584EAAD006C0CDF /* Diamond.tiff */; };
 		3B20EF4F1584EAAD006C0CDF /* Download-icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3B20EF4C1584EAAD006C0CDF /* Download-icon.icns */; };
 		3B20EF521584EAF8006C0CDF /* MainController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B20EF511584EAF8006C0CDF /* MainController.m */; };
@@ -22,6 +22,7 @@
 		3B20EF5C1584F34E006C0CDF /* SearchResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B20EF5B1584F34E006C0CDF /* SearchResult.m */; };
 		3B20EF6115853345006C0CDF /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3B20EF6315853345006C0CDF /* Localizable.strings */; };
 		3B2DC55B158CD31E00C004A4 /* PreferencesWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B2DC55A158CD31E00C004A4 /* PreferencesWindow.m */; };
+		3B5E8ED2158E7AC40082A769 /* Spotify.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3B5E8ED1158E7AC40082A769 /* Spotify.icns */; };
 		3B73010E158CDF7200D3AF26 /* AutoLyrics.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B73010D158CDF7200D3AF26 /* AutoLyrics.m */; };
 		3B81D4FE1586248F00916CE3 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B81D4FD1586248F00916CE3 /* ScriptingBridge.framework */; };
 		3BBD9B76158C873F00A5CD2C /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BBD9B75158C873F00A5CD2C /* Growl.framework */; };
@@ -59,7 +60,7 @@
 		3B20EF3E1584EA9A006C0CDF /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		3B20EF411584EA9A006C0CDF /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		3B20EF481584EAA3006C0CDF /* iLyrics.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = iLyrics.icns; sourceTree = "<group>"; };
-		3B20EF4A1584EAAD006C0CDF /* iTunes-icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "iTunes-icon.icns"; sourceTree = "<group>"; };
+		3B20EF4A1584EAAD006C0CDF /* iTunes.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = iTunes.icns; sourceTree = "<group>"; };
 		3B20EF4B1584EAAD006C0CDF /* Diamond.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Diamond.tiff; sourceTree = "<group>"; };
 		3B20EF4C1584EAAD006C0CDF /* Download-icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "Download-icon.icns"; sourceTree = "<group>"; };
 		3B20EF501584EAF8006C0CDF /* MainController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainController.h; sourceTree = "<group>"; };
@@ -73,6 +74,8 @@
 		3B2DC558158CCE8100C004A4 /* Changelog.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Changelog.rtf; sourceTree = SOURCE_ROOT; };
 		3B2DC559158CD31E00C004A4 /* PreferencesWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesWindow.h; sourceTree = "<group>"; };
 		3B2DC55A158CD31E00C004A4 /* PreferencesWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesWindow.m; sourceTree = "<group>"; };
+		3B5E8ECD158E788D0082A769 /* Spotify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Spotify.h; sourceTree = "<group>"; };
+		3B5E8ED1158E7AC40082A769 /* Spotify.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Spotify.icns; sourceTree = "<group>"; };
 		3B73010C158CDF7200D3AF26 /* AutoLyrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoLyrics.h; sourceTree = "<group>"; };
 		3B73010D158CDF7200D3AF26 /* AutoLyrics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AutoLyrics.m; sourceTree = "<group>"; };
 		3B81D4FD1586248F00916CE3 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = System/Library/Frameworks/ScriptingBridge.framework; sourceTree = SDKROOT; };
@@ -170,6 +173,7 @@
 			isa = PBXGroup;
 			children = (
 				3B81D5041586298100916CE3 /* iTunes.h */,
+				3B5E8ECD158E788D0082A769 /* Spotify.h */,
 				3B20EF331584EA9A006C0CDF /* iLyrics-Info.plist */,
 				3B20EF341584EA9A006C0CDF /* InfoPlist.strings */,
 				3B20EF371584EA9A006C0CDF /* main.m */,
@@ -194,7 +198,8 @@
 			children = (
 				3BBD9B79158C87D000A5CD2C /* Growl Registration Ticket.growlRegDict */,
 				3B20EF481584EAA3006C0CDF /* iLyrics.icns */,
-				3B20EF4A1584EAAD006C0CDF /* iTunes-icon.icns */,
+				3B5E8ED1158E7AC40082A769 /* Spotify.icns */,
+				3B20EF4A1584EAAD006C0CDF /* iTunes.icns */,
 				3B20EF4B1584EAAD006C0CDF /* Diamond.tiff */,
 				3B20EF4C1584EAAD006C0CDF /* Download-icon.icns */,
 				3B20EF6315853345006C0CDF /* Localizable.strings */,
@@ -258,11 +263,12 @@
 				3B20EF3C1584EA9A006C0CDF /* Credits.rtf in Resources */,
 				3B20EF421584EA9A006C0CDF /* MainMenu.xib in Resources */,
 				3B20EF491584EAA3006C0CDF /* iLyrics.icns in Resources */,
-				3B20EF4D1584EAAD006C0CDF /* iTunes-icon.icns in Resources */,
+				3B20EF4D1584EAAD006C0CDF /* iTunes.icns in Resources */,
 				3B20EF4E1584EAAD006C0CDF /* Diamond.tiff in Resources */,
 				3B20EF4F1584EAAD006C0CDF /* Download-icon.icns in Resources */,
 				3B20EF6115853345006C0CDF /* Localizable.strings in Resources */,
 				3BBD9B7A158C87D000A5CD2C /* Growl Registration Ticket.growlRegDict in Resources */,
+				3B5E8ED2158E7AC40082A769 /* Spotify.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

iLyrics/MainController.h

@@ -11,6 +11,7 @@
 #import <ScriptingBridge/ScriptingBridge.h>
 #import <AppKitScripting/AppKitScripting.h>
 #import "iTunes.h"
+#import "Spotify.h"
 #import "Magistrix.h"
 #import "SearchResult.h"
 #import "Lyrics.h"
@@ -33,6 +34,7 @@
 @property (readonly) Lyrics *currentLyrics;
 
 - (IBAction)getCurrentiTunesSong:(id)sender;
+- (IBAction)getCurrentSpotifySong:(id)sender;
 - (IBAction)startNewSearch:(id)sender;
 - (IBAction)loadNextResults:(id)sender;
 - (IBAction)resetLoadedResults:(id)sender;

iLyrics/MainController.m

@@ -15,6 +15,7 @@
     NSInteger selectedSavePanelButton;
     NSURL *saveFile;
     iTunesApplication *iTunes;
+    SpotifyApplication *spotify;
     Lyrics *currentLyrics;
     int selectedRow;
 }
@@ -35,6 +36,7 @@
 
 -(id)init {
     iTunes = [SBApplication applicationWithBundleIdentifier:@"com.apple.iTunes"];
+    spotify = [SBApplication applicationWithBundleIdentifier:@"com.spotify.client"];
     loadedResults = [[NSMutableArray alloc] init];
     currentHoster = [[Magistrix alloc] init];
     return [super init];
@@ -90,6 +92,19 @@
     [searchField performClick:sender];
 }
 
+- (IBAction)getCurrentSpotifySong:(id)sender {
+    SpotifyTrack *track = [spotify currentTrack];
+    NSString *name = [track name];
+    NSString *artist = [track artist];
+    if (name == nil) {
+        NSBeginAlertSheet(NSLocalizedString(@"Spotify.messages.noTrackPlaying.title", @""), NSLocalizedString(@"OK", @""), nil, nil, window, nil, nil, nil, nil, NSLocalizedString(@"Spotify.messages.noTrackPlaying.detail", @""));
+        return;
+    }
+    NSString *searchText = [NSString stringWithFormat:@"%@ - %@", name, artist];
+    [searchField setStringValue:searchText];
+    [searchField performClick:sender];
+}
+
 - (IBAction)startNewSearch:(id)sender {
     [self resetLoadedResults:sender];
     if ([[searchField stringValue] length] > 0) {
@@ -260,6 +275,9 @@
     if (action == @selector(getCurrentiTunesSong:)) {
         return [iTunes isRunning];
     }
+    if (action == @selector(getCurrentSpotifySong:)) {
+        return [spotify isRunning];
+    }
     if (action == @selector(showPreview:)) {
         return [resultsOutline clickedRow] >= 0;
     }

iLyrics/Spotify.h

@@ -0,0 +1,79 @@
+/*
+ * Spotify.h
+ */
+
+#import <AppKit/AppKit.h>
+#import <ScriptingBridge/ScriptingBridge.h>
+
+
+@class SpotifyApplication, SpotifyTrack, SpotifyApplication;
+
+enum SpotifyEPlS {
+	SpotifyEPlSStopped = 'kPSS',
+	SpotifyEPlSPlaying = 'kPSP',
+	SpotifyEPlSPaused = 'kPSp'
+};
+typedef enum SpotifyEPlS SpotifyEPlS;
+
+
+
+/*
+ * Spotify Suite
+ */
+
+// The Spotify application.
+@interface SpotifyApplication : SBApplication
+
+@property (copy, readonly) SpotifyTrack *currentTrack;  // The current playing track.
+@property NSInteger soundVolume;  // The sound output volume (0 = minimum, 100 = maximum)
+@property (readonly) SpotifyEPlS playerState;  // Is Spotify stopped, paused, or playing?
+@property double playerPosition;  // The player’s position within the currently playing track in seconds.
+@property (readonly) BOOL repeatingEnabled;  // Is repeating enabled in the current playback context?
+@property BOOL repeating;  // Is repeating on or off?
+@property (readonly) BOOL shufflingEnabled;  // Is shuffling enabled in the current playback context?
+@property BOOL shuffling;  // Is shuffling on or off?
+
+- (void) nextTrack;  // Skip to the next track.
+- (void) previousTrack;  // Skip to the previous track.
+- (void) playpause;  // Toggle play/pause.
+- (void) pause;  // Pause playback.
+- (void) play;  // Resume playback.
+- (void) playTrack:(NSString *)x inContext:(NSString *)inContext;  // Start playback of a track in the given context.
+
+@end
+
+// A Spotify track.
+@interface SpotifyTrack : SBObject
+
+@property (copy, readonly) NSString *artist;  // The artist of the track.
+@property (copy, readonly) NSString *album;  // The album of the track.
+@property (readonly) NSInteger discNumber;  // The disc number of the track.
+@property (readonly) NSInteger duration;  // The length of the track in seconds.
+@property (readonly) NSInteger playedCount;  // The number of times this track has been played.
+@property (readonly) NSInteger trackNumber;  // The index of the track in its album.
+@property (readonly) BOOL starred;  // Is the track starred?
+@property (readonly) NSInteger popularity;  // How popular is this track? 0-100
+- (NSString *) id;  // The ID of the item.
+@property (copy, readonly) NSString *name;  // The name of the track.
+@property (copy, readonly) NSImage *artwork;  // The track's album cover.
+@property (copy, readonly) NSString *albumArtist;  // That album artist of the track.
+@property (copy) NSString *spotifyUrl;  // The URL of the track.
+
+
+@end
+
+
+
+/*
+ * Standard Suite
+ */
+
+// The application's top level scripting object.
+@interface SpotifyApplication (StandardSuite)
+
+@property (copy, readonly) NSString *name;  // The name of the application.
+@property (readonly) BOOL frontmost;  // Is this the frontmost (active) application?
+@property (copy, readonly) NSString *version;  // The version of the application.
+
+@end
+

iLyrics/de.lproj/MainMenu.xib

@@ -214,7 +214,7 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
-								<object class="NSMenuItem" id="393515644">
+								<object class="NSMenuItem" id="938950238">
 									<reference key="NSMenu" ref="720053764"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
@@ -224,7 +224,7 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
-								<object class="NSMenuItem" id="987414673">
+								<object class="NSMenuItem" id="570459016">
 									<reference key="NSMenu" ref="720053764"/>
 									<string key="NSTitle">Im Browser öffnen</string>
 									<string key="NSKeyEquiv"/>
@@ -918,9 +918,12 @@
 							<string key="NSToolbarItemPaletteLabel">Suchen</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSSearchField" key="NSToolbarItemView" id="288810339">
-								<nil key="NSNextResponder"/>
+								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{0, 14}, {96, 22}}</string>
+								<reference key="NSSuperview"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSSearchFieldCell" key="NSCell" id="48517109">
@@ -1032,9 +1035,9 @@
 							<string key="NSToolbarItemPaletteLabel">Von iTunes holen</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage" id="86175271">
+							<object class="NSCustomResource" key="NSToolbarItemImage" id="258650783">
 								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">iTunes-icon</string>
+								<string key="NSResourceName">iTunes</string>
 							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
@@ -1054,7 +1057,29 @@
 							<string key="NSToolbarItemPaletteLabel">An iTunes senden</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<reference key="NSToolbarItemImage" ref="86175271"/>
+							<reference key="NSToolbarItemImage" ref="258650783"/>
+							<nil key="NSToolbarItemTarget"/>
+							<nil key="NSToolbarItemAction"/>
+							<string key="NSToolbarItemMinSize">{0, 0}</string>
+							<string key="NSToolbarItemMaxSize">{0, 0}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+						</object>
+						<object class="NSToolbarItem" key="D907D172-E223-4708-B48A-EE062B41F68E" id="1022076601">
+							<object class="NSMutableString" key="NSToolbarItemIdentifier">
+								<characters key="NS.bytes">D907D172-E223-4708-B48A-EE062B41F68E</characters>
+							</object>
+							<string key="NSToolbarItemLabel">Von Spotify holen</string>
+							<string key="NSToolbarItemPaletteLabel">Von Spotify holen</string>
+							<string key="NSToolbarItemToolTip"/>
+							<nil key="NSToolbarItemView"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">Spotify</string>
+							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
 							<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -1120,15 +1145,16 @@
 							</object>
 						</object>
 					</dictionary>
-					<array key="NSToolbarIBAllowedItems">
+					<array class="NSMutableArray" key="NSToolbarIBAllowedItems">
 						<reference ref="348612815"/>
 						<reference ref="27027590"/>
+						<reference ref="1022076601"/>
 						<reference ref="478869102"/>
 						<reference ref="281250230"/>
 						<reference ref="796233866"/>
 						<reference ref="611451715"/>
 					</array>
-					<array key="NSToolbarIBDefaultItems">
+					<array class="NSMutableArray" key="NSToolbarIBDefaultItems">
 						<reference ref="348612815"/>
 						<reference ref="27027590"/>
 						<reference ref="611451715"/>
@@ -1951,7 +1977,10 @@
 							<string key="NSToolbarItemPaletteLabel">Auto-Lyrics</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<reference key="NSToolbarItemImage" ref="86175271"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">iTunes-icon</string>
+							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
 							<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -2295,7 +2324,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{389, 133}, {66, 17}}</string>
 						<reference key="NSSuperview" ref="1036377286"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="774100582"/>
 						<string key="NSReuseIdentifierKey">_NS:1505</string>
 						<bool key="NSEnabled">YES</bool>
@@ -2315,7 +2343,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{72, 130}, {312, 22}}</string>
 						<reference key="NSSuperview" ref="1036377286"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="935245374"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -2386,7 +2413,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{18, 70}, {173, 18}}</string>
 						<reference key="NSSuperview" ref="1036377286"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="397715139"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -2412,8 +2438,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{75, 20}, {374, 42}}</string>
 						<reference key="NSSuperview" ref="1036377286"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSAntiCompressionPriority">{250, 750}</string>
 						<bool key="NSEnabled">YES</bool>
@@ -2433,7 +2457,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{75, 94}, {374, 28}}</string>
 						<reference key="NSSuperview" ref="1036377286"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="591966936"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -2454,7 +2477,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{11, 133}, {59, 17}}</string>
 						<reference key="NSSuperview" ref="1036377286"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="355980366"/>
 						<string key="NSReuseIdentifierKey">_NS:1505</string>
 						<bool key="NSEnabled">YES</bool>
@@ -2474,7 +2496,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 203}, {432, 28}}</string>
 						<reference key="NSSuperview" ref="1036377286"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="739367538"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -2495,7 +2516,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{122, 155}, {222, 32}}</string>
 						<reference key="NSSuperview" ref="1036377286"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="563417696"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
@@ -2517,16 +2537,15 @@
 				</array>
 				<string key="NSFrameSize">{466, 251}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1022206124"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
 			</object>
-			<object class="NSMenu" id="194609641">
+			<object class="NSMenu" id="835657734">
 				<string key="NSTitle"/>
 				<array class="NSMutableArray" key="NSMenuItems">
-					<object class="NSMenuItem" id="430935450">
+					<object class="NSMenuItem" id="322378040">
-						<reference key="NSMenu" ref="194609641"/>
+						<reference key="NSMenu" ref="835657734"/>
 						<string key="NSTitle">Im Browser öffnen</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
@@ -3182,7 +3201,7 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showLyricsInBrowser:</string>
 						<reference key="source" ref="1033563008"/>
-						<reference key="destination" ref="430935450"/>
+						<reference key="destination" ref="322378040"/>
 					</object>
 					<int key="connectionID">2596</int>
 				</object>
@@ -3190,10 +3209,18 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showLyricsInBrowser:</string>
 						<reference key="source" ref="1033563008"/>
-						<reference key="destination" ref="987414673"/>
+						<reference key="destination" ref="570459016"/>
 					</object>
 					<int key="connectionID">2600</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">getCurrentSpotifySong:</string>
+						<reference key="source" ref="1033563008"/>
+						<reference key="destination" ref="1022076601"/>
+					</object>
+					<int key="connectionID">2602</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -3214,7 +3241,7 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menu</string>
 						<reference key="source" ref="911257153"/>
-						<reference key="destination" ref="194609641"/>
+						<reference key="destination" ref="835657734"/>
 					</object>
 					<int key="connectionID">2597</int>
 				</object>
@@ -3452,8 +3479,8 @@
 							<reference ref="294629803"/>
 							<reference ref="776162233"/>
 							<reference ref="1010469920"/>
-							<reference ref="393515644"/>
+							<reference ref="938950238"/>
-							<reference ref="987414673"/>
+							<reference ref="570459016"/>
 						</array>
 						<reference key="parent" ref="379814623"/>
 					</object>
@@ -3971,6 +3998,7 @@
 							<reference ref="348612815"/>
 							<reference ref="478869102"/>
 							<reference ref="281250230"/>
+							<reference ref="1022076601"/>
 						</array>
 						<reference key="parent" ref="972006081"/>
 					</object>
@@ -4673,27 +4701,32 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2592</int>
-						<reference key="object" ref="194609641"/>
+						<reference key="object" ref="835657734"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="430935450"/>
+							<reference ref="322378040"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2593</int>
-						<reference key="object" ref="430935450"/>
+						<reference key="object" ref="322378040"/>
-						<reference key="parent" ref="194609641"/>
+						<reference key="parent" ref="835657734"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2598</int>
-						<reference key="object" ref="393515644"/>
+						<reference key="object" ref="938950238"/>
 						<reference key="parent" ref="720053764"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2599</int>
-						<reference key="object" ref="987414673"/>
+						<reference key="object" ref="570459016"/>
 						<reference key="parent" ref="720053764"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2601</int>
+						<reference key="object" ref="1022076601"/>
+						<reference key="parent" ref="1060589599"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4840,6 +4873,7 @@
 				<string key="2593.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2598.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2599.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2601.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4921,7 +4955,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2600</int>
+			<int key="maxID">2602</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4996,6 +5030,7 @@
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="downloadLyrics:">id</string>
+						<string key="getCurrentSpotifySong:">id</string>
 						<string key="getCurrentiTunesSong:">id</string>
 						<string key="loadNextResults:">id</string>
 						<string key="lyricsSelectionChanged:">NSOutlineView</string>
@@ -5010,6 +5045,10 @@
 							<string key="name">downloadLyrics:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="getCurrentSpotifySong:">
+							<string key="name">getCurrentSpotifySong:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="getCurrentiTunesSong:">
 							<string key="name">getCurrentiTunesSong:</string>
 							<string key="candidateClassName">id</string>
@@ -5217,7 +5256,9 @@
 			<string key="NSMenuMixedState">{10, 3}</string>
 			<string key="NSPreferencesGeneral">{32, 32}</string>
 			<string key="NSSwitch">{15, 15}</string>
-			<string key="iTunes-icon">{512, 512}</string>
+			<string key="Spotify">{512, 512}</string>
+			<string key="iTunes">{512, 512}</string>
+			<string key="iTunes-icon">{128, 128}</string>
 		</dictionary>
 	</data>
 </archive>

iLyrics/en.lproj/MainMenu.xib

@@ -214,7 +214,7 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
-								<object class="NSMenuItem" id="409922502">
+								<object class="NSMenuItem" id="554100429">
 									<reference key="NSMenu" ref="720053764"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
@@ -224,7 +224,7 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
-								<object class="NSMenuItem" id="180361536">
+								<object class="NSMenuItem" id="123626502">
 									<reference key="NSMenu" ref="720053764"/>
 									<string key="NSTitle">Show in Browser</string>
 									<string key="NSKeyEquiv"/>
@@ -918,9 +918,10 @@
 							<string key="NSToolbarItemPaletteLabel">Search</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSSearchField" key="NSToolbarItemView" id="288810339">
-								<nil key="NSNextResponder"/>
+								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{0, 14}, {96, 22}}</string>
+								<reference key="NSSuperview"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSSearchFieldCell" key="NSCell" id="48517109">
@@ -1032,9 +1033,9 @@
 							<string key="NSToolbarItemPaletteLabel">Get from iTunes</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage" id="86175271">
+							<object class="NSCustomResource" key="NSToolbarItemImage" id="1014157709">
 								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">iTunes-icon</string>
+								<string key="NSResourceName">iTunes</string>
 							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
@@ -1054,7 +1055,29 @@
 							<string key="NSToolbarItemPaletteLabel">Send to iTunes</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<reference key="NSToolbarItemImage" ref="86175271"/>
+							<reference key="NSToolbarItemImage" ref="1014157709"/>
+							<nil key="NSToolbarItemTarget"/>
+							<nil key="NSToolbarItemAction"/>
+							<string key="NSToolbarItemMinSize">{0, 0}</string>
+							<string key="NSToolbarItemMaxSize">{0, 0}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+						</object>
+						<object class="NSToolbarItem" key="F19D1A15-FED6-48F9-B670-7D7F2D798C5A" id="214912433">
+							<object class="NSMutableString" key="NSToolbarItemIdentifier">
+								<characters key="NS.bytes">F19D1A15-FED6-48F9-B670-7D7F2D798C5A</characters>
+							</object>
+							<string key="NSToolbarItemLabel">Get from Spotify</string>
+							<string key="NSToolbarItemPaletteLabel">Get from Spotify</string>
+							<string key="NSToolbarItemToolTip"/>
+							<nil key="NSToolbarItemView"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">Spotify</string>
+							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
 							<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -1120,15 +1143,16 @@
 							</object>
 						</object>
 					</dictionary>
-					<array key="NSToolbarIBAllowedItems">
+					<array class="NSMutableArray" key="NSToolbarIBAllowedItems">
 						<reference ref="348612815"/>
 						<reference ref="27027590"/>
+						<reference ref="214912433"/>
 						<reference ref="478869102"/>
 						<reference ref="281250230"/>
 						<reference ref="796233866"/>
 						<reference ref="611451715"/>
 					</array>
-					<array key="NSToolbarIBDefaultItems">
+					<array class="NSMutableArray" key="NSToolbarIBDefaultItems">
 						<reference ref="348612815"/>
 						<reference ref="27027590"/>
 						<reference ref="611451715"/>
@@ -1732,11 +1756,11 @@
 				<int key="NSWindowCollectionBehavior">128</int>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
-			<object class="NSMenu" id="162947467">
+			<object class="NSMenu" id="551056994">
 				<string key="NSTitle"/>
 				<array class="NSMutableArray" key="NSMenuItems">
-					<object class="NSMenuItem" id="747510690">
+					<object class="NSMenuItem" id="292224518">
-						<reference key="NSMenu" ref="162947467"/>
+						<reference key="NSMenu" ref="551056994"/>
 						<string key="NSTitle">Show in Browser</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
@@ -1937,7 +1961,10 @@
 							<string key="NSToolbarItemPaletteLabel">Auto-Lyrics</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<reference key="NSToolbarItemImage" ref="86175271"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">iTunes-icon</string>
+							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
 							<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -3147,7 +3174,7 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showLyricsInBrowser:</string>
 						<reference key="source" ref="1033563008"/>
-						<reference key="destination" ref="747510690"/>
+						<reference key="destination" ref="292224518"/>
 					</object>
 					<int key="connectionID">2597</int>
 				</object>
@@ -3155,10 +3182,18 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showLyricsInBrowser:</string>
 						<reference key="source" ref="1033563008"/>
-						<reference key="destination" ref="180361536"/>
+						<reference key="destination" ref="123626502"/>
 					</object>
 					<int key="connectionID">2600</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">getCurrentSpotifySong:</string>
+						<reference key="source" ref="1033563008"/>
+						<reference key="destination" ref="214912433"/>
+					</object>
+					<int key="connectionID">2602</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -3179,7 +3214,7 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menu</string>
 						<reference key="source" ref="911257153"/>
-						<reference key="destination" ref="162947467"/>
+						<reference key="destination" ref="551056994"/>
 					</object>
 					<int key="connectionID">2596</int>
 				</object>
@@ -3416,9 +3451,9 @@
 							<reference ref="49223823"/>
 							<reference ref="294629803"/>
 							<reference ref="1010469920"/>
-							<reference ref="180361536"/>
+							<reference ref="123626502"/>
 							<reference ref="776162233"/>
-							<reference ref="409922502"/>
+							<reference ref="554100429"/>
 						</array>
 						<reference key="parent" ref="379814623"/>
 					</object>
@@ -3936,6 +3971,7 @@
 							<reference ref="348612815"/>
 							<reference ref="478869102"/>
 							<reference ref="281250230"/>
+							<reference ref="214912433"/>
 						</array>
 						<reference key="parent" ref="972006081"/>
 					</object>
@@ -4638,27 +4674,32 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2592</int>
-						<reference key="object" ref="162947467"/>
+						<reference key="object" ref="551056994"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="747510690"/>
+							<reference ref="292224518"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2593</int>
-						<reference key="object" ref="747510690"/>
+						<reference key="object" ref="292224518"/>
-						<reference key="parent" ref="162947467"/>
+						<reference key="parent" ref="551056994"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2598</int>
-						<reference key="object" ref="180361536"/>
+						<reference key="object" ref="123626502"/>
 						<reference key="parent" ref="720053764"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2599</int>
-						<reference key="object" ref="409922502"/>
+						<reference key="object" ref="554100429"/>
 						<reference key="parent" ref="720053764"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2601</int>
+						<reference key="object" ref="214912433"/>
+						<reference key="parent" ref="1060589599"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4805,6 +4846,7 @@
 				<string key="2593.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2598.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2599.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2601.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4886,7 +4928,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2600</int>
+			<int key="maxID">2602</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
@@ -4903,7 +4945,9 @@
 			<string key="NSMenuMixedState">{10, 3}</string>
 			<string key="NSPreferencesGeneral">{32, 32}</string>
 			<string key="NSSwitch">{15, 15}</string>
-			<string key="iTunes-icon">{512, 512}</string>
+			<string key="Spotify">{512, 512}</string>
+			<string key="iTunes">{512, 512}</string>
+			<string key="iTunes-icon">{128, 128}</string>
 		</dictionary>
 	</data>
 </archive>