codello/ilyrics
Archived
1
Fork 0
Code Releases Activity

-Fixed a search bug: Returned false results when having a & in query

Browse Source 
-Added Functionality: Send Lyrics to matching iTunes Tracks
This commit is contained in:
Kim Wittenburg
2012-06-26 11:17:05 +02:00
parent 41b1ef775c
commit 6a132a51d0
8 changed files with 438 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iLyrics/LyricsHosterUtil.m
View File

@@ -18,6 +18,6 @@
-(NSString *) stringByFormattingForURL {
//Can replace äöü with aou, no difference in results
NSCharacterSet *characters = [[NSCharacterSet alphanumericCharacterSet] invertedSet];
return [[[self stringByReplacingOccurrencesOfString:@" " withString:@"+"] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] stringByTrimmingCharactersInSet:characters];
return [[[[self stringByReplacingOccurrencesOfString:@" " withString:@"+"] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] stringByReplacingOccurrencesOfString:@"&" withString:@"%26"] stringByTrimmingCharactersInSet:characters];
}
@end

2
iLyrics/MainController.h
View File

@@ -27,6 +27,8 @@
- (IBAction)resetLoadedResults:(id)sender;
- (IBAction)lyricsSelectionChanged:(NSOutlineView *)sender;
- (IBAction)sendLyricsToiTunes:(id)sender;
- (IBAction)sendLyricsToCurrentiTunesTrack:(id)sender;
- (IBAction)sendLyricsToTracksMatchingTrack:(id)sender;
- (IBAction)downloadLyrics:(id)sender;
- (IBAction)showLyricsInBrowser:(id)sender;
- (IBAction)showiLyricsWindow:(id)sender;

62
iLyrics/MainController.m
View File

@@ -77,7 +77,7 @@
NSMenuItem *titleItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"iLyrics.text.loadNextResultsFrom", @"") action:@selector(nothingResponsible:soDisable:titleItem:) keyEquivalent:@""];
[menu addItem:titleItem];
for (id<LyricsHoster> hoster in [ilyrics lyricsHosters]) {
NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [hoster name]] action:@selector(loadNextResults:) keyEquivalent:@""];
NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:[hoster name] action:@selector(loadNextResults:) keyEquivalent:@""];
[menuItem setTarget:self];
[menu addItem:menuItem];
}
@@ -265,6 +265,23 @@
}
- (IBAction)sendLyricsToiTunes:(id)sender {
NSString *title = NSLocalizedString(@"iTunes.messages.sentToiTunes.title", @"");
NSString *detail = NSLocalizedString(@"iTunes.messages.sentToiTunes.detail", @"");
NSString *sendToCurrent = NSLocalizedString(@"iTunes.messages.sentToiTunes.sendToCurrent", @"");
NSString *sendToMatching = NSLocalizedString(@"iTunes.messages.sentToiTunes.sendToMatching", @"");
NSString *cancel = NSLocalizedString(@"Cancel", @"");
NSBeginAlertSheet(title, sendToCurrent, cancel, sendToMatching, window, self, nil, @selector(sendLyricsToiTunesSheetDidDismiss:returnCode:contextInfo:), nil, detail);
}
- (void)sendLyricsToiTunesSheetDidDismiss: (NSWindow *) sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
if (returnCode == NSAlertDefaultReturn) {
[self sendLyricsToCurrentiTunesTrack:nil];
} else if (returnCode == NSAlertOtherReturn) {
[self sendLyricsToTracksMatchingTrack:nil];
}
}
- (IBAction)sendLyricsToCurrentiTunesTrack:(id)sender {
iTunesTrack *track = [[ilyrics iTunes] currentTrack];
NSString *name = [track name];
if (name == nil) {
@@ -275,18 +292,43 @@
if (oldLyrics != nil && [oldLyrics length] > 0) {
NSBeginAlertSheet(NSLocalizedString(@"iTunes.messages.replaceLyrics.title", @""), NSLocalizedString(@"Yes", @""), NSLocalizedString(@"No", @""), nil, window, self, @selector(replaceLyricsSheetDidEnd:returnCode:contextInfo:), nil, nil, NSLocalizedString(@"iTunes.messages.replaceLyrics.detail", @""));
} else {
[self replaceLyricsSheetDidEnd:nil returnCode:NSAlertDefaultReturn contextInfo:nil];
[self sendLyricsToiTunesTrack:[[ilyrics iTunes] currentTrack]];
}
}
- (IBAction)sendLyricsToTracksMatchingTrack:(id)sender {
iTunesSource *iTunesSrc = [[[ilyrics iTunes] sources] objectAtIndex:0];
iTunesLibraryPlaylist *library = [[iTunesSrc libraryPlaylists] objectAtIndex:0];
NSString *name = [currentLyrics name];
NSString *artist = [currentLyrics artist];
BOOL foundTrack = NO;
for (iTunesFileTrack *track in [library fileTracks]) {
if ([[track name] rangeOfString:name options:NSCaseInsensitiveSearch].location != NSNotFound && [[track artist] rangeOfString:artist options:NSCaseInsensitiveSearch].location != NSNotFound) {
[self sendLyricsToiTunesTrack:track];
foundTrack = YES;
}
}
if (!foundTrack) {
NSString *title = NSLocalizedString(@"iTunes.messages.noMatchingTracks.title", @"");
NSString *detail = [[NSLocalizedString(@"iTunes.messages.noMatchingTracks.detail", @"") stringByReplacingOccurrencesOfString:@"%track%" withString:name] stringByReplacingOccurrencesOfString:@"%artist%" withString:artist];
NSString *ok = NSLocalizedString(@"OK", @"");
NSBeginAlertSheet(title, ok, nil, nil, window, nil, nil, nil, nil, detail);
}
}
- (void)replaceLyricsSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
if (returnCode == NSAlertDefaultReturn) {
iTunesTrack *track = [[ilyrics iTunes] currentTrack];
[track setLyrics:[lyricsArea string]];
[GrowlApplicationBridge notifyWithTitle:NSLocalizedString(@"Growl.messages.lyricsSent.title", @"") description:[NSString stringWithFormat:NSLocalizedString(@"Growl.messages.lyricsSent.detail", @""), [track name]] notificationName:@"Lyrics sent to iTunes" iconData:nil priority:0 isSticky:NO clickContext:nil];
[self sendLyricsToiTunesTrack:track];
}
}
- (void)sendLyricsToiTunesTrack:(iTunesTrack *)track {
[track setLyrics:[lyricsArea string]];
[GrowlApplicationBridge notifyWithTitle:NSLocalizedString(@"Growl.messages.lyricsSent.title", @"") description:[NSString stringWithFormat:NSLocalizedString(@"Growl.messages.lyricsSent.detail", @""), [track name]] notificationName:@"Lyrics sent to iTunes" iconData:nil priority:0 isSticky:NO clickContext:nil];
}
- (IBAction)downloadLyrics:(id)sender {
NSSavePanel *savePanel = [NSSavePanel savePanel];
[savePanel setAllowedFileTypes:[NSArray arrayWithObject:@"txt"]];
@@ -373,6 +415,18 @@
BOOL enabled = lyricsSelected && [[ilyrics iTunes] isRunning];
return enabled;
}
if (action == @selector(sendLyricsToCurrentiTunesTrack:)) {
if (![[ilyrics iTunes] isRunning]) {
return NO;
}
NSString *name = [[[ilyrics iTunes] currentTrack] name];
BOOL enabled = lyricsSelected && name != nil && [name length]>0;
return enabled;
}
if (action == @selector(sendLyricsToMatchingiTunesTrack:)) {
BOOL enabled = lyricsSelected && [[ilyrics iTunes] isRunning];
return enabled;
}
if (action == @selector(getCurrentiTunesSong:)) {
return [[ilyrics iTunes] isRunning];
}

225
iLyrics/de.lproj/MainMenu.xib
View File

@@ -921,11 +921,9 @@
<string key="NSToolbarItemPaletteLabel">Suchen</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSearchField" key="NSToolbarItemView" id="288810339">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {96, 22}}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="48517109">
@@ -1007,6 +1005,47 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" key="14B40E10-2B11-4F8C-B79F-5577F59A71C9" id="466217623">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">14B40E10-2B11-4F8C-B79F-5577F59A71C9</characters>
</object>
<string key="NSToolbarItemLabel">An aktuellen Titel senden</string>
<string key="NSToolbarItemPaletteLabel">An aktuellen iTunes Titel senden</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage" id="708099935">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">iTunes</string>
</object>
<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="5A0D9D97-8ED0-45E1-B7D9-100BDA7542E7" id="659205759">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">5A0D9D97-8ED0-45E1-B7D9-100BDA7542E7</characters>
</object>
<string key="NSToolbarItemLabel">An passende senden</string>
<string key="NSToolbarItemPaletteLabel">An alle passenden iTunes Titel senden</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<reference key="NSToolbarItemImage" ref="708099935"/>
<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="5B496B66-64F2-4E7B-9926-E769A97FCF71" id="27027590">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">5B496B66-64F2-4E7B-9926-E769A97FCF71</characters>
@@ -1037,10 +1076,7 @@
<string key="NSToolbarItemPaletteLabel">Von Tunes holen</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage" id="1014157709">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">iTunes</string>
</object>
<reference key="NSToolbarItemImage" ref="708099935"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -1059,7 +1095,7 @@
<string key="NSToolbarItemPaletteLabel">An iTunes senden</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<reference key="NSToolbarItemImage" ref="1014157709"/>
<reference key="NSToolbarItemImage" ref="708099935"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -1149,6 +1185,8 @@
</dictionary>
<array key="NSToolbarIBAllowedItems">
<reference ref="348612815"/>
<reference ref="659205759"/>
<reference ref="466217623"/>
<reference ref="27027590"/>
<reference ref="513678254"/>
<reference ref="478869102"/>
@@ -1168,7 +1206,7 @@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{650, 350}</string>
<object class="NSView" key="NSWindowView" id="439893737">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSSplitView" id="900503006">
@@ -1249,7 +1287,7 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{368, 415}</string>
<reference key="NSSuperview" ref="724400969"/>
<reference key="NSNextKeyView" ref="1060229027"/>
<reference key="NSNextKeyView" ref="215702022"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="831140326">
@@ -1451,7 +1489,7 @@
</array>
<string key="NSFrame">{{0, 29}, {370, 433}}</string>
<reference key="NSSuperview" ref="916426737"/>
<reference key="NSNextKeyView" ref="215702022"/>
<reference key="NSNextKeyView" ref="724400969"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="1060229027"/>
@@ -1505,7 +1543,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">67244001</int>
<int key="NSFlags">100798433</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="329583645"/>
@@ -1655,16 +1693,39 @@
<string key="NSTitle">OtherViews</string>
<array class="NSMutableArray" key="NSMenuItems">
<reference ref="607633429"/>
<object class="NSMenuItem" id="368204004">
<object class="NSMenuItem" id="397818494">
<reference key="NSMenu" ref="258565555"/>
<string key="NSTitle">An iTunes senden</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="331223631"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="682222424">
<string key="NSTitle">An iTunes senden</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="605585086">
<reference key="NSMenu" ref="682222424"/>
<string key="NSTitle">An den aktuellen Titel senden</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="331223631"/>
</object>
<object class="NSMenuItem" id="549428261">
<reference key="NSMenu" ref="682222424"/>
<string key="NSTitle">An alle passenden Titel senden</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="331223631"/>
</object>
</array>
</object>
</object>
<object class="NSMenuItem" id="413039258">
<reference key="NSMenu" ref="258565555"/>
@@ -1680,7 +1741,6 @@
</array>
<reference key="NSMenuFont" ref="199720984"/>
</object>
<int key="NSSelectedIndex">-1</int>
<bool key="NSPullDown">YES</bool>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
@@ -1790,7 +1850,6 @@
</object>
</array>
<string key="NSFrameSize">{841, 462}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="900503006"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -1826,7 +1885,7 @@
<bool key="NSAnimates">YES</bool>
</object>
<object class="NSCustomView" id="65671261">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="991346115">
@@ -1834,7 +1893,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{195, -1}, {108, 19}}</string>
<reference key="NSSuperview" ref="65671261"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="593943430">
@@ -1869,7 +1927,7 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{301, 14}</string>
<reference key="NSSuperview" ref="224261160"/>
<reference key="NSNextKeyView" ref="1004910206"/>
<reference key="NSNextKeyView" ref="468888810"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<object class="NSTextContainer" key="NSTextContainer" id="866949613">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -1890,7 +1948,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">67112865</int>
<int key="NSFlags">100667297</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="329583645"/>
@@ -1966,7 +2024,7 @@
</array>
<string key="NSFrame">{{0, 20}, {303, 172}}</string>
<reference key="NSSuperview" ref="65671261"/>
<reference key="NSNextKeyView" ref="468888810"/>
<reference key="NSNextKeyView" ref="224261160"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133138</int>
<reference key="NSVScroller" ref="1004910206"/>
@@ -1975,7 +2033,6 @@
</object>
</array>
<string key="NSFrameSize">{303, 192}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="130215498"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
@@ -2007,7 +2064,7 @@
<string key="NSToolbarItemPaletteLabel">Auto-Lyrics</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<reference key="NSToolbarItemImage" ref="1014157709"/>
<reference key="NSToolbarItemImage" ref="708099935"/>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -2110,11 +2167,9 @@
</object>
<nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="346299228">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{480, 270}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:20</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -2125,7 +2180,7 @@
<string key="NSClassName">PreferencesController</string>
</object>
<object class="NSCustomView" id="226480988">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="875967531">
@@ -2161,7 +2216,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{424, 146}</string>
<reference key="NSSuperview" ref="568651855"/>
<reference key="NSNextKeyView" ref="962565179"/>
<reference key="NSNextKeyView" ref="25249278"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="1008033059">
@@ -2300,7 +2355,7 @@
</array>
<string key="NSFrame">{{20, 20}, {426, 164}}</string>
<reference key="NSSuperview" ref="226480988"/>
<reference key="NSNextKeyView" ref="25249278"/>
<reference key="NSNextKeyView" ref="568651855"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="962565179"/>
@@ -2336,13 +2391,12 @@
</object>
</array>
<string key="NSFrameSize">{466, 251}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="473254112"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="1036377286">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="46930690">
@@ -2487,7 +2541,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{71, 22}, {386, 42}}</string>
<reference key="NSSuperview" ref="1036377286"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
@@ -2586,7 +2639,6 @@
</object>
</array>
<string key="NSFrameSize">{466, 251}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="1022206124"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
@@ -3210,14 +3262,6 @@
</object>
<int key="connectionID">751</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToiTunes:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="368204004"/>
</object>
<int key="connectionID">2749</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">downloadLyrics:</string>
@@ -3226,6 +3270,46 @@
</object>
<int key="connectionID">2750</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToCurrentiTunesTrack:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="466217623"/>
</object>
<int key="connectionID">3047</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToiTunes:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="397818494"/>
</object>
<int key="connectionID">3052</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToCurrentiTunesTrack:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="605585086"/>
</object>
<int key="connectionID">3054</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToTracksMatchingTrack:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="549428261"/>
</object>
<int key="connectionID">3056</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToTracksMatchingTrack:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="659205759"/>
</object>
<int key="connectionID">3057</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
@@ -4084,6 +4168,8 @@
<reference ref="478869102"/>
<reference ref="281250230"/>
<reference ref="513678254"/>
<reference ref="466217623"/>
<reference ref="659205759"/>
</array>
<reference key="parent" ref="972006081"/>
</object>
@@ -6134,17 +6220,12 @@
<int key="objectID">2717</int>
<reference key="object" ref="258565555"/>
<array class="NSMutableArray" key="children">
<reference ref="368204004"/>
<reference ref="413039258"/>
<reference ref="607633429"/>
<reference ref="397818494"/>
</array>
<reference key="parent" ref="331223631"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2719</int>
<reference key="object" ref="368204004"/>
<reference key="parent" ref="258565555"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2720</int>
<reference key="object" ref="413039258"/>
@@ -6435,6 +6516,43 @@
<reference key="object" ref="30010589"/>
<reference key="parent" ref="875899735"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3045</int>
<reference key="object" ref="466217623"/>
<reference key="parent" ref="1060589599"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3046</int>
<reference key="object" ref="659205759"/>
<reference key="parent" ref="1060589599"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3049</int>
<reference key="object" ref="397818494"/>
<array class="NSMutableArray" key="children">
<reference ref="682222424"/>
</array>
<reference key="parent" ref="258565555"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3050</int>
<reference key="object" ref="682222424"/>
<array class="NSMutableArray" key="children">
<reference ref="605585086"/>
<reference ref="549428261"/>
</array>
<reference key="parent" ref="397818494"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3051</int>
<reference key="object" ref="605585086"/>
<reference key="parent" ref="682222424"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3053</int>
<reference key="object" ref="549428261"/>
<reference key="parent" ref="682222424"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -6721,7 +6839,6 @@
<string key="2715.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2716.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2717.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2719.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2720.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2748.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2842.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6785,6 +6902,12 @@
<string key="3041.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3042.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3043.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3045.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3046.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3049.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3050.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3051.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3053.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6888,7 +7011,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">3043</int>
<int key="maxID">3057</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>

189
iLyrics/en.lproj/MainMenu.xib
View File

@@ -1069,6 +1069,44 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" key="A7DBA208-905D-4FF5-9F62-D0011CD811B6" id="578030390">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">A7DBA208-905D-4FF5-9F62-D0011CD811B6</characters>
</object>
<string key="NSToolbarItemLabel">Send to matching</string>
<string key="NSToolbarItemPaletteLabel">Send to all matching Tracks</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<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="B5E59498-369E-4FA6-B378-0110FF0D7D82" id="932762949">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">B5E59498-369E-4FA6-B378-0110FF0D7D82</characters>
</object>
<string key="NSToolbarItemLabel">Sent to current</string>
<string key="NSToolbarItemPaletteLabel">Send to current iTunes Track</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<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="513678254">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">F19D1A15-FED6-48F9-B670-7D7F2D798C5A</characters>
@@ -1148,6 +1186,8 @@
</dictionary>
<array key="NSToolbarIBAllowedItems">
<reference ref="348612815"/>
<reference ref="932762949"/>
<reference ref="578030390"/>
<reference ref="27027590"/>
<reference ref="513678254"/>
<reference ref="478869102"/>
@@ -1251,7 +1291,7 @@
<string key="NSFrameSize">{368, 415}</string>
<reference key="NSSuperview" ref="724400969"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1060229027"/>
<reference key="NSNextKeyView" ref="215702022"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="831140326">
@@ -1459,7 +1499,7 @@
<string key="NSFrame">{{0, 29}, {370, 433}}</string>
<reference key="NSSuperview" ref="916426737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="215702022"/>
<reference key="NSNextKeyView" ref="724400969"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="1060229027"/>
@@ -1670,16 +1710,39 @@
<string key="NSTitle">OtherViews</string>
<array class="NSMutableArray" key="NSMenuItems">
<reference ref="607633429"/>
<object class="NSMenuItem" id="368204004">
<object class="NSMenuItem" id="1043100506">
<reference key="NSMenu" ref="258565555"/>
<string key="NSTitle">Send to iTunes</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="331223631"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="130060991">
<string key="NSTitle">Send to iTunes</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="470899900">
<reference key="NSMenu" ref="130060991"/>
<string key="NSTitle">Send to current Track</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="331223631"/>
</object>
<object class="NSMenuItem" id="443850376">
<reference key="NSMenu" ref="130060991"/>
<string key="NSTitle">Send to all matching Tracks</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="331223631"/>
</object>
</array>
</object>
</object>
<object class="NSMenuItem" id="413039258">
<reference key="NSMenu" ref="258565555"/>
@@ -1695,6 +1758,7 @@
</array>
<reference key="NSMenuFont" ref="199720984"/>
</object>
<int key="NSSelectedIndex">1</int>
<bool key="NSPullDown">YES</bool>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
@@ -3224,14 +3288,6 @@
</object>
<int key="connectionID">751</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToiTunes:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="368204004"/>
</object>
<int key="connectionID">2749</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">downloadLyrics:</string>
@@ -3240,6 +3296,46 @@
</object>
<int key="connectionID">2750</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToCurrentiTunesTrack:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="932762949"/>
</object>
<int key="connectionID">2911</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToiTunes:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="1043100506"/>
</object>
<int key="connectionID">2917</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToCurrentiTunesTrack:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="470899900"/>
</object>
<int key="connectionID">2919</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToTracksMatchingTrack:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="443850376"/>
</object>
<int key="connectionID">2921</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">sendLyricsToTracksMatchingTrack:</string>
<reference key="source" ref="1033563008"/>
<reference key="destination" ref="578030390"/>
</object>
<int key="connectionID">2922</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
@@ -4098,6 +4194,8 @@
<reference ref="478869102"/>
<reference ref="281250230"/>
<reference ref="513678254"/>
<reference ref="932762949"/>
<reference ref="578030390"/>
</array>
<reference key="parent" ref="972006081"/>
</object>
@@ -6256,17 +6354,12 @@
<int key="objectID">2717</int>
<reference key="object" ref="258565555"/>
<array class="NSMutableArray" key="children">
<reference ref="368204004"/>
<reference ref="413039258"/>
<reference ref="607633429"/>
<reference ref="1043100506"/>
</array>
<reference key="parent" ref="331223631"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2719</int>
<reference key="object" ref="368204004"/>
<reference key="parent" ref="258565555"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2720</int>
<reference key="object" ref="413039258"/>
@@ -6407,6 +6500,43 @@
<reference key="object" ref="648796724"/>
<reference key="parent" ref="288205323"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2909</int>
<reference key="object" ref="932762949"/>
<reference key="parent" ref="1060589599"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2910</int>
<reference key="object" ref="578030390"/>
<reference key="parent" ref="1060589599"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2914</int>
<reference key="object" ref="1043100506"/>
<array class="NSMutableArray" key="children">
<reference ref="130060991"/>
</array>
<reference key="parent" ref="258565555"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2915</int>
<reference key="object" ref="130060991"/>
<array class="NSMutableArray" key="children">
<reference ref="470899900"/>
<reference ref="443850376"/>
</array>
<reference key="parent" ref="1043100506"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2916</int>
<reference key="object" ref="470899900"/>
<reference key="parent" ref="130060991"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2918</int>
<reference key="object" ref="443850376"/>
<reference key="parent" ref="130060991"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -6716,7 +6846,6 @@
<string key="2715.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2716.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2717.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2719.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2720.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2748.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2842.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6746,6 +6875,12 @@
<string key="2906.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2907.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2908.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2909.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2910.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2914.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2915.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2916.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2918.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6852,7 +6987,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">2908</int>
<int key="maxID">2922</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -6931,6 +7066,8 @@
<string key="getCurrentiTunesSong:">id</string>
<string key="lyricsSelectionChanged:">NSOutlineView</string>
<string key="resetLoadedResults:">id</string>
<string key="sendLyricsToCurrentiTunesTrack:">id</string>
<string key="sendLyricsToTracksMatchingTrack:">id</string>
<string key="sendLyricsToiTunes:">id</string>
<string key="showLyricsInBrowser:">id</string>
<string key="showiLyricsWindow:">id</string>
@@ -6957,6 +7094,14 @@
<string key="name">resetLoadedResults:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="sendLyricsToCurrentiTunesTrack:">
<string key="name">sendLyricsToCurrentiTunesTrack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="sendLyricsToTracksMatchingTrack:">
<string key="name">sendLyricsToTracksMatchingTrack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="sendLyricsToiTunes:">
<string key="name">sendLyricsToiTunes:</string>
<string key="candidateClassName">id</string>