From 2567253ed192e5cfa0e1e44b1cb65f2496d02aa7 Mon Sep 17 00:00:00 2001 From: Kim Wittenburg Date: Mon, 18 Jun 2012 19:04:01 +0200 Subject: [PATCH] -Fixed a resource bug -Fixed special characters in url bug (final) --- Changelog.rtf | 4 +- iLyrics/AppDelegate.m | 7 + iLyrics/Magistrix.m | 3 +- iLyrics/MainController.m | 22 +- iLyrics/de.lproj/MainMenu.xib | 2300 +++++++++++++++++++++++++++++++- iLyrics/en.lproj/MainMenu.xib | 2313 ++++++++++++++++++++++++++++----- 6 files changed, 4286 insertions(+), 363 deletions(-) diff --git a/Changelog.rtf b/Changelog.rtf index e93e620..e4046c8 100644 --- a/Changelog.rtf +++ b/Changelog.rtf @@ -61,4 +61,6 @@ \cf0 \ -Changed the maximum width of the search field\ -Fixed a bug: "Network error" when having special characters in query\ --Fixed a bug: Returned false results when having a "&" in the query} \ No newline at end of file +-Fixed a bug: Returned false results when having a "&" in the query\ +-Fixed a resource bug\ +-Fixed special characters in url bug (final)} \ No newline at end of file diff --git a/iLyrics/AppDelegate.m b/iLyrics/AppDelegate.m index e1c1467..d72d6dd 100644 --- a/iLyrics/AppDelegate.m +++ b/iLyrics/AppDelegate.m @@ -34,6 +34,13 @@ [mainController loadFromDefaults:defaults]; } +-(BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag { + if (!flag) { + [window makeKeyAndOrderFront:self]; + } + return YES; +} + -(NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; [defaults setBool:[quitWhenAllWindowClosedCheckBox state] == NSOnState forKey:@"Quit when all windows are closed"]; diff --git a/iLyrics/Magistrix.m b/iLyrics/Magistrix.m index 2181918..547da6e 100644 --- a/iLyrics/Magistrix.m +++ b/iLyrics/Magistrix.m @@ -69,10 +69,9 @@ typedef enum { } -(NSString *) stringByFormattingQuery: (NSString *) q { - NSRange stringRange = NSMakeRange(0, [q length]); //Can replace äöü with aou, no difference in results NSCharacterSet *characters = [[NSCharacterSet alphanumericCharacterSet] invertedSet]; - return [[[[[[q stringByReplacingOccurrencesOfString:@" " withString:@"+"] stringByReplacingOccurrencesOfString:@"Ö" withString:@"o" options:NSCaseInsensitiveSearch range:stringRange] stringByReplacingOccurrencesOfString:@"Ä" withString:@"a" options:NSCaseInsensitiveSearch range:stringRange] stringByReplacingOccurrencesOfString:@"Ü" withString:@"ü" options:NSCaseInsensitiveSearch range:stringRange] stringByReplacingOccurrencesOfString:@"&" withString:@"%26"] stringByTrimmingCharactersInSet:characters]; + return [[[q stringByReplacingOccurrencesOfString:@" " withString:@"+"] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] stringByTrimmingCharactersInSet:characters]; } -(PageType) typeOfPage: (NSString *) page { diff --git a/iLyrics/MainController.m b/iLyrics/MainController.m index 2116539..597ee55 100644 --- a/iLyrics/MainController.m +++ b/iLyrics/MainController.m @@ -46,15 +46,27 @@ #pragma mark Outline view Data Source and Delegate -(NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { - return item == nil ? [loadedResults count] : 0; + if (item == nil) { + return [loadedResults count]; + } + if ([item isKindOfClass:[NSArray class]]) { + return [item count]; + } + return 0; } -(id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item { - return [loadedResults objectAtIndex:index]; + if (item == nil) { + return [loadedResults objectAtIndex:index]; + } + if ([item isKindOfClass:[SearchResult class]]) { + return [item objectAtIndex:index]; + } + return nil; } -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item { - return NO; + return [loadedResults containsObject:item]; } -(id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item { @@ -260,13 +272,13 @@ int maxWidth = width-[rightView frame].size.width; return maxWidth; }*/ - +/* -(CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMinimumPosition ofSubviewAt:(NSInteger)dividerIndex { int outlineMinWith = [[resultsOutline tableColumnWithIdentifier:@"song"] minWidth] + [[resultsOutline tableColumnWithIdentifier:@"artist"] minWidth]; int minWidth = outlineMinWith; return minWidth; } - +*/ #pragma mark window delegate -(BOOL)validateMenuItem:(NSMenuItem *)menuItem { diff --git a/iLyrics/de.lproj/MainMenu.xib b/iLyrics/de.lproj/MainMenu.xib index 3f60804..75f8a52 100644 --- a/iLyrics/de.lproj/MainMenu.xib +++ b/iLyrics/de.lproj/MainMenu.xib @@ -15,6 +15,7 @@ NSMenu NSToolbarItem NSButton + IBNSLayoutConstraint NSToolbarFlexibleSpaceItem NSCustomObject NSSplitView @@ -264,7 +265,7 @@ - Druchen... + Drucken... p 1048576 2147483647 @@ -918,10 +919,9 @@ Suchen - + 268 {{0, 14}, {96, 22}} - _NS:9 YES @@ -1180,6 +1180,7 @@ 293 {{141, 1}, {72, 18}} + _NS:9 YES @@ -1214,6 +1215,7 @@ 289 {{214, -1}, {140, 23}} + _NS:22 YES @@ -1237,6 +1239,7 @@ 292 {{0, -1}, {139, 23}} + _NS:22 YES @@ -1268,7 +1271,8 @@ 4352 {352, 415} - + + _NS:13 YES @@ -1276,6 +1280,7 @@ 256 {352, 17} + _NS:16 @@ -1385,6 +1390,7 @@ {{1, 17}, {352, 415}} + _NS:11 @@ -1401,6 +1407,7 @@ -2147483392 {{224, 17}, {15, 102}} + _NS:58 @@ -1413,6 +1420,7 @@ -2147483392 {{1, 417}, {350, 15}} + _NS:60 1 @@ -1428,6 +1436,7 @@ {{1, 0}, {352, 17}} + _NS:15 @@ -1437,7 +1446,8 @@ {{0, 29}, {354, 433}} - + + _NS:9 133682 @@ -1449,6 +1459,7 @@ {354, 462} + _NS:11 NSView @@ -1470,6 +1481,7 @@ 2322 {495, 14} + _NS:13 @@ -1533,6 +1545,7 @@ {{1, 1}, {495, 367}} + _NS:11 @@ -1563,7 +1576,7 @@ 256 {{481, 1}, {15, 361}} - + _NS:84 _doScroller: @@ -1575,6 +1588,7 @@ 256 {{1, 353}, {489, 15}} + _NS:33 1 @@ -1586,6 +1600,7 @@ {497, 369} + _NS:9 133170 @@ -1602,6 +1617,7 @@ 265 {{330, 10}, {153, 32}} + _NS:9 YES @@ -1625,6 +1641,7 @@ 265 {{330, 37}, {153, 32}} + _NS:9 YES @@ -1648,6 +1665,7 @@ 266 {{82, 20}, {249, 17}} + _NS:9 {250, 750} @@ -1668,6 +1686,7 @@ 268 {{17, 20}, {63, 17}} + _NS:1505 YES @@ -1687,6 +1706,7 @@ 266 {{82, 47}, {249, 17}} + _NS:9 {250, 750} @@ -1707,6 +1727,7 @@ 268 {{17, 47}, {36, 17}} + _NS:1505 YES @@ -1724,6 +1745,7 @@ {{0, 377}, {497, 85}} + _NS:9 NSView @@ -1731,6 +1753,7 @@ {{364, 0}, {497, 462}} + _NS:13 NSView @@ -1738,6 +1761,7 @@ {861, 462} + _NS:9 YES @@ -1746,6 +1770,7 @@ {861, 462} + {{0, 0}, {1680, 1028}} @@ -1960,10 +1985,7 @@ Auto-Lyrics - - NSImage - iTunes-icon - + {0, 0} @@ -2066,10 +2088,9 @@ - + 256 {480, 270} - _NS:20 {{0, 0}, {1680, 1028}} @@ -2080,7 +2101,7 @@ PreferencesController - + 268 @@ -2115,7 +2136,7 @@ 256 {424, 146} - + _NS:13 YES @@ -2259,7 +2280,7 @@ {{20, 20}, {426, 164}} - + _NS:9 133682 @@ -2277,7 +2298,7 @@ _NS:9 YES - -2080244224 + 67239424 0 Beenden, wenn alle Fenster geschlossen wurden @@ -2295,13 +2316,12 @@ {466, 251} - _NS:9 NSView - + 268 @@ -2543,7 +2563,6 @@ {466, 251} - _NS:9 NSView @@ -3883,6 +3902,70 @@ + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + @@ -4155,6 +4238,102 @@ + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + @@ -4188,6 +4367,22 @@ + + + 7 + 0 + + 0 + 1 + + 108 + + 1000 + 3 + 9 + 1 + + @@ -4218,6 +4413,182 @@ + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + @@ -4227,6 +4598,134 @@ + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 3 + 0 + + 3 + 1 + + 93 + + 1000 + 3 + 9 + 3 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + @@ -4240,6 +4739,246 @@ + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + @@ -4264,6 +5003,22 @@ + + + 7 + 0 + + 0 + 1 + + 57 + + 1000 + 3 + 9 + 1 + + @@ -4288,6 +5043,22 @@ + + + 7 + 0 + + 0 + 1 + + 141 + + 1000 + 3 + 9 + 1 + + @@ -4412,6 +5183,22 @@ + + + 8 + 0 + + 0 + 1 + + 21 + + 1000 + 3 + 9 + 1 + + @@ -4484,6 +5271,134 @@ + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + @@ -4587,6 +5502,326 @@ + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 72 + + 1000 + 3 + 9 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 20 + + 1000 + 6 + 24 + 3 + + + + + 3 + 0 + + 3 + 1 + + 99 + + 1000 + 3 + 9 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 14 + + 1000 + 3 + 9 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + @@ -4595,6 +5830,22 @@ + + + 7 + 0 + + 0 + 1 + + 210 + + 1000 + 3 + 9 + 1 + + @@ -4608,6 +5859,22 @@ + + + 8 + 0 + + 0 + 1 + + 28 + + 1000 + 3 + 9 + 1 + + @@ -4634,6 +5901,38 @@ + + + 7 + 0 + + 0 + 1 + + 368 + + 1000 + 3 + 9 + 1 + + + + + 8 + 0 + + 0 + 1 + + 28 + + 1000 + 3 + 9 + 1 + + @@ -4647,6 +5946,22 @@ + + + 8 + 0 + + 0 + 1 + + 42 + + 1000 + 3 + 9 + 1 + + @@ -4673,6 +5988,22 @@ + + + 7 + 0 + + 0 + 1 + + 312 + + 1000 + 3 + 9 + 1 + + @@ -4743,12 +6074,423 @@ + + 2721 + + + + + 2722 + + + + + 2723 + + + + + 2724 + + + + + 2725 + + + + + 2726 + + + + + 2727 + + + + + 2728 + + + + + 2729 + + + + + 2730 + + + + + 2731 + + + + + 2732 + + + + + 2733 + + + + + 2734 + + + + + 2735 + + + + + 2736 + + + + + 2737 + + + + + 2738 + + + + + 2739 + + + + + 2740 + + + + + 2741 + + + + + 2742 + + + + + 2743 + + + + + 2744 + + + + + 2745 + + + + + 2746 + + + + + 2747 + + + + + 2748 + + + + + 2749 + + + + + 2750 + + + + + 2751 + + + + + 2752 + + + + + 2753 + + + + + 2754 + + + + + 2755 + + + + + 2756 + + + + + 2757 + + + + + 2758 + + + + + 2759 + + + + + 2760 + + + + + 2761 + + + + + 2762 + + + + + 2763 + + + + + 2764 + + + + + 2765 + + + + + 2766 + + + + + 2767 + + + + + 2768 + + + + + 2769 + + + + + 2770 + + + + + 2771 + + + + + 2772 + + + + + 2773 + + + + + 2774 + + + + + 2775 + + + + + 2776 + + + + + 2777 + + + + + 2778 + + + + + 2779 + + + + + 2780 + + + + + 2781 + + + + + 2782 + + + + + 2783 + + + + + 2784 + + + + + 2785 + + + + + 2786 + + + + + 2787 + + + + + 2788 + + + + + 2789 + + + + + 2790 + + + + + 2791 + + + + + 2792 + + + + + 2793 + + + + + 2794 + + + + + 2795 + + + + + 2796 + + + + + 2797 + + + + + 2798 + + + + + 2799 + + + + + 2800 + + + + + 2801 + + + + + 2802 + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4776,12 +6518,18 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4789,22 +6537,39 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4813,8 +6578,32 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4856,18 +6645,69 @@ com.apple.InterfaceBuilder.CocoaPlugin auto-lyrics + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4878,11 +6718,16 @@ Noch nicht verfügbar. Auto-Lyrics überprüft Songtexte alle 30 Sekunden. + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4890,8 +6735,91 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4908,6 +6836,12 @@ com.apple.InterfaceBuilder.CocoaPlugin {{380, 496}, {480, 360}} + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4928,6 +6862,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4951,12 +6886,19 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4966,8 +6908,30 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4975,9 +6939,301 @@ - 2693 + 2802 + + + + + AppDelegate + NSObject + + id + id + id + id + id + + + + nextTrack: + id + + + playPauseiTunes: + id + + + previousTrack: + id + + + quitiTunes: + id + + + runiTunes: + id + + + + MainController + PreferencesController + NSWindow + NSButton + NSWindow + + + + mainController + MainController + + + preferencesController + PreferencesController + + + preferencesWindow + NSWindow + + + quitWhenAllWindowClosedCheckBox + NSButton + + + window + NSWindow + + + + IBProjectSource + ./Classes/AppDelegate.h + + + + MainController + NSObject + + id + id + id + id + NSOutlineView + id + id + id + id + id + + + + downloadLyrics: + id + + + getCurrentSpotifySong: + id + + + getCurrentiTunesSong: + id + + + loadNextResults: + id + + + lyricsSelectionChanged: + NSOutlineView + + + resetLoadedResults: + id + + + sendLyricsToiTunes: + id + + + showLyricsInBrowser: + id + + + showiLyricsWindow: + id + + + startNewSearch: + id + + + + NSTextField + NSButton + NSMenuItem + NSButton + NSTextView + NSPopover + NSTextView + NSOutlineView + NSSearchField + NSButton + NSButton + NSTextField + NSWindow + + + + artistLabel + NSTextField + + + downloadLyricsButton + NSButton + + + iLyricsMenuItem + NSMenuItem + + + loadMoreResultsButton + NSButton + + + lyricsArea + NSTextView + + + previewPopover + NSPopover + + + previewTextArea + NSTextView + + + resultsOutline + NSOutlineView + + + searchField + NSSearchField + + + sendToiTunesButton + NSButton + + + showPreviewCheckBox + NSButton + + + songLabel + NSTextField + + + window + NSWindow + + + + IBProjectSource + ./Classes/MainController.h + + + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + + + PreferencesController + NSObject + + id + id + id + id + id + + + + changeAutoLyricsInterval: + id + + + showAutoLyricsPreferences: + id + + + showGeneralPreferences: + id + + + toggleAutoLyrics: + id + + + toggleReplaceOldLyrics: + id + + + + NSView + NSToolbarItem + NSView + NSTableView + PreferencesWindow + NSButton + NSButton + + + + autoLyricsView + NSView + + + generalButton + NSToolbarItem + + + generalView + NSView + + + hosterTable + NSTableView + + + preferencesWindow + PreferencesWindow + + + replaceOldCheckBox + NSButton + + + toggleAutoLyricsButton + NSButton + + + + IBProjectSource + ./Classes/PreferencesController.h + + + + PreferencesWindow + NSWindow + + IBProjectSource + ./Classes/PreferencesWindow.h + + + - 0 IBCocoaFramework @@ -4994,7 +7250,7 @@ {15, 15} {512, 512} {512, 512} - {128, 128} + YES diff --git a/iLyrics/en.lproj/MainMenu.xib b/iLyrics/en.lproj/MainMenu.xib index 71d4f2b..3b01d60 100644 --- a/iLyrics/en.lproj/MainMenu.xib +++ b/iLyrics/en.lproj/MainMenu.xib @@ -15,6 +15,7 @@ NSMenu NSToolbarItem NSButton + IBNSLayoutConstraint NSToolbarFlexibleSpaceItem NSCustomObject NSSplitView @@ -1179,7 +1180,6 @@ 293 {{118, 1}, {63, 18}} - _NS:9 YES @@ -1214,7 +1214,6 @@ 289 {{182, -1}, {120, 23}} - _NS:22 YES @@ -1238,7 +1237,6 @@ 292 {{0, -1}, {114, 23}} - _NS:22 YES @@ -1270,7 +1268,6 @@ 4352 {300, 415} - _NS:13 YES @@ -1279,7 +1276,6 @@ 256 {300, 17} - _NS:16 @@ -1389,7 +1385,6 @@ {{1, 17}, {300, 415}} - _NS:11 @@ -1406,7 +1401,6 @@ -2147483392 {{224, 17}, {15, 102}} - _NS:58 @@ -1419,7 +1413,6 @@ -2147483392 {{1, 417}, {290, 15}} - _NS:60 1 @@ -1435,7 +1428,6 @@ {{1, 0}, {300, 17}} - _NS:15 @@ -1445,7 +1437,6 @@ {{0, 29}, {302, 433}} - _NS:9 133682 @@ -1458,7 +1449,6 @@ {302, 462} - _NS:11 NSView @@ -1480,7 +1470,6 @@ 2322 {527, 14} - _NS:13 @@ -1544,7 +1533,6 @@ {{1, 1}, {527, 367}} - _NS:11 @@ -1575,7 +1563,6 @@ 256 {{513, 1}, {15, 361}} - _NS:84 @@ -1588,7 +1575,6 @@ 256 {{1, 353}, {521, 15}} - _NS:33 1 @@ -1600,7 +1586,6 @@ {529, 369} - _NS:9 133170 @@ -1617,7 +1602,6 @@ 265 {{381, 10}, {134, 32}} - _NS:9 YES @@ -1641,7 +1625,6 @@ 265 {{381, 37}, {134, 32}} - _NS:9 YES @@ -1665,7 +1648,6 @@ 266 {{62, 20}, {320, 17}} - _NS:9 {250, 750} @@ -1686,7 +1668,6 @@ 268 {{17, 22}, {43, 17}} - _NS:1505 YES @@ -1706,7 +1687,6 @@ 266 {{62, 47}, {320, 17}} - _NS:9 {250, 750} @@ -1727,7 +1707,6 @@ 268 {{17, 47}, {40, 17}} - _NS:1505 YES @@ -1745,7 +1724,6 @@ {{0, 377}, {529, 85}} - _NS:9 NSView @@ -1753,7 +1731,6 @@ {{312, 0}, {549, 462}} - _NS:13 NSView @@ -1761,7 +1738,6 @@ {861, 462} - _NS:9 YES @@ -1770,7 +1746,6 @@ {841, 462} - {{0, 0}, {1680, 1028}} @@ -1985,10 +1960,7 @@ Auto-Lyrics - - NSImage - iTunes-icon - + {0, 0} @@ -2091,10 +2063,9 @@ - + 256 {480, 270} - _NS:20 {{0, 0}, {1680, 1028}} @@ -2113,7 +2084,6 @@ 268 {{17, 192}, {93, 17}} - _NS:1505 YES @@ -2141,7 +2111,6 @@ 256 {424, 146} - _NS:13 YES @@ -2150,7 +2119,6 @@ 256 {424, 17} - @@ -2243,7 +2211,6 @@ {{1, 17}, {424, 146}} - _NS:11 @@ -2255,7 +2222,6 @@ -2147483392 {{224, 17}, {15, 102}} - _NS:58 @@ -2267,7 +2233,7 @@ -2147483392 {{1, 173}, {438, 15}} - + _NS:60 1 @@ -2282,7 +2248,6 @@ {{1, 0}, {424, 17}} - @@ -2291,7 +2256,6 @@ {{20, 20}, {426, 164}} - _NS:9 133682 @@ -2306,13 +2270,12 @@ 268 {{18, 215}, {233, 18}} - _NS:9 YES - -2080244224 - 0 + 67239424 + 8388608 Quit when all windows are closed _NS:9 @@ -2330,13 +2293,12 @@ {466, 251} - _NS:9 NSView - + 268 @@ -2578,7 +2540,6 @@ {466, 251} - _NS:9 NSView @@ -3918,6 +3879,70 @@ + + + 6 + 0 + + 6 + 1 + + -20 + + 1000 + 3 + 9 + 3 + + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + @@ -4190,6 +4215,102 @@ + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + @@ -4223,6 +4344,22 @@ + + + 7 + 0 + + 0 + 1 + + 108 + + 1000 + 3 + 9 + 1 + + @@ -4253,6 +4390,182 @@ + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 5 + 1 + + 121 + + 1000 + 3 + 9 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + @@ -4322,6 +4635,22 @@ + + + 8 + 0 + + 0 + 1 + + 21 + + 1000 + 3 + 9 + 1 + + @@ -4335,6 +4664,22 @@ + + + 7 + 0 + + 0 + 1 + + 120 + + 1000 + 3 + 9 + 1 + + @@ -4394,6 +4739,134 @@ + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + @@ -4497,6 +4970,342 @@ + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 3 + 0 + + 3 + 1 + + 96 + + 1000 + 3 + 9 + 3 + + + + + 3 + 0 + + 3 + 1 + + 93 + + 1000 + 3 + 9 + 3 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 4 + 0 + + 4 + 1 + + 72 + + 1000 + 3 + 9 + 3 + + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 20 + + 1000 + 6 + 24 + 3 + + @@ -4505,6 +5314,22 @@ + + + 7 + 0 + + 0 + 1 + + 210 + + 1000 + 3 + 9 + 1 + + @@ -4518,6 +5343,22 @@ + + + 8 + 0 + + 0 + 1 + + 28 + + 1000 + 3 + 9 + 1 + + @@ -4544,6 +5385,22 @@ + + + 8 + 0 + + 0 + 1 + + 28 + + 1000 + 3 + 9 + 1 + + @@ -4557,6 +5414,22 @@ + + + 8 + 0 + + 0 + 1 + + 42 + + 1000 + 3 + 9 + 1 + + @@ -4583,6 +5456,22 @@ + + + 7 + 0 + + 0 + 1 + + 312 + + 1000 + 3 + 9 + 1 + + @@ -4646,6 +5535,134 @@ + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 93 + + 1000 + 3 + 9 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 8 + 29 + 3 + + @@ -4684,6 +5701,246 @@ + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + 8 + 29 + 3 + + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 6 + 24 + 3 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + + @@ -4705,6 +5962,22 @@ + + + 7 + 0 + + 0 + 1 + + 122 + + 1000 + 3 + 9 + 1 + + @@ -4744,6 +6017,22 @@ + + + 7 + 0 + + 0 + 1 + + 37 + + 1000 + 3 + 9 + 1 + + @@ -4778,12 +6067,428 @@ + + 2609 + + + + + 2610 + + + + + 2611 + + + + + 2612 + + + + + 2613 + + + + + 2614 + + + + + 2615 + + + + + 2616 + + + + + 2617 + + + + + 2618 + + + + + 2619 + + + + + 2620 + + + + + 2621 + + + + + 2622 + + + + + 2623 + + + + + 2624 + + + + + 2625 + + + + + 2626 + + + + + 2627 + + + + + 2628 + + + + + 2629 + + + + + 2630 + + + + + 2631 + + + + + 2632 + + + + + 2633 + + + + + 2634 + + + + + 2635 + + + + + 2636 + + + + + 2637 + + + + + 2638 + + + + + 2639 + + + + + 2640 + + + + + 2641 + + + + + 2642 + + + + + 2643 + + + + + 2644 + + + + + 2645 + + + + + 2646 + + + + + 2647 + + + + + 2648 + + + + + 2649 + + + + + 2650 + + + + + 2651 + + + + + 2652 + + + + + 2653 + + + + + 2654 + + + + + 2655 + + + + + 2656 + + + + + 2657 + + + + + 2658 + + + + + 2659 + + + + + 2660 + + + + + 2661 + + + + + 2662 + + + + + 2663 + + + + + 2664 + + + + + 2665 + + + + + 2666 + + + + + 2667 + + + + + 2668 + + + + + 2669 + + + + + 2670 + + + + + 2671 + + + + + 2672 + + + + + 2673 + + + + + 2674 + + + + + 2675 + + + + + 2676 + + + + + 2677 + + + + + 2678 + + + + + 2679 + + + + + 2680 + + + + + 2681 + + + + + 2682 + + + + + 2683 + + + + + 2684 + + + + + 2685 + + + + + 2686 + + + + + 2687 + + + + + 2688 + + + + + 2689 + + + + + 2690 + + + + + 2691 + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4811,12 +6516,21 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4824,22 +6538,39 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4848,8 +6579,32 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4891,18 +6646,69 @@ com.apple.InterfaceBuilder.CocoaPlugin auto-lyrics + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4913,11 +6719,16 @@ Not available yet. Auto-Lyrics check in 30 seconds intervals. + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4925,8 +6736,92 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4943,6 +6838,12 @@ com.apple.InterfaceBuilder.CocoaPlugin {{380, 496}, {480, 360}} + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4963,6 +6864,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4984,12 +6886,19 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4999,8 +6908,30 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5008,293 +6939,9 @@ - 2608 - - - - - AppDelegate - NSObject - - id - id - id - id - id - - - - nextTrack: - id - - - playPauseiTunes: - id - - - previousTrack: - id - - - quitiTunes: - id - - - runiTunes: - id - - - - MainController - PreferencesController - NSWindow - NSButton - NSWindow - - - - mainController - MainController - - - preferencesController - PreferencesController - - - preferencesWindow - NSWindow - - - quitWhenAllWindowClosedCheckBox - NSButton - - - window - NSWindow - - - - IBProjectSource - ./Classes/AppDelegate.h - - - - MainController - NSObject - - id - id - id - id - NSOutlineView - id - id - id - id - id - - - - downloadLyrics: - id - - - getCurrentSpotifySong: - id - - - getCurrentiTunesSong: - id - - - loadNextResults: - id - - - lyricsSelectionChanged: - NSOutlineView - - - resetLoadedResults: - id - - - sendLyricsToiTunes: - id - - - showLyricsInBrowser: - id - - - showiLyricsWindow: - id - - - startNewSearch: - id - - - - NSTextField - NSButton - NSMenuItem - NSButton - NSTextView - NSPopover - NSTextView - NSOutlineView - NSSearchField - NSButton - NSButton - NSTextField - NSWindow - - - - artistLabel - NSTextField - - - downloadLyricsButton - NSButton - - - iLyricsMenuItem - NSMenuItem - - - loadMoreResultsButton - NSButton - - - lyricsArea - NSTextView - - - previewPopover - NSPopover - - - previewTextArea - NSTextView - - - resultsOutline - NSOutlineView - - - searchField - NSSearchField - - - sendToiTunesButton - NSButton - - - showPreviewCheckBox - NSButton - - - songLabel - NSTextField - - - window - NSWindow - - - - IBProjectSource - ./Classes/MainController.h - - - - PreferencesController - NSObject - - id - id - id - id - id - - - - changeAutoLyricsInterval: - id - - - showAutoLyricsPreferences: - id - - - showGeneralPreferences: - id - - - toggleAutoLyrics: - id - - - toggleReplaceOldLyrics: - id - - - - NSView - NSToolbarItem - NSView - NSTableView - PreferencesWindow - NSButton - NSButton - - - - autoLyricsView - NSView - - - generalButton - NSToolbarItem - - - generalView - NSView - - - hosterTable - NSTableView - - - preferencesWindow - PreferencesWindow - - - replaceOldCheckBox - NSButton - - - toggleAutoLyricsButton - NSButton - - - - IBProjectSource - ./Classes/PreferencesController.h - - - - PreferencesWindow - NSWindow - - IBProjectSource - ./Classes/PreferencesWindow.h - - - + 2691 + 0 IBCocoaFramework @@ -5311,7 +6958,7 @@ {15, 15} {512, 512} {512, 512} - {128, 128} + YES