Archived
1

Re-Commit after Time Machine restore

This commit is contained in:
Kim Wittenburg
2012-06-18 23:41:56 +02:00
parent 2567253ed1
commit 98b0e70a8b
22 changed files with 28 additions and 359 deletions

View File

@@ -63,4 +63,5 @@
-Fixed a bug: "Network error" when having special characters in query\ -Fixed a bug: "Network error" when having special characters in query\
-Fixed a bug: Returned false results when having a "&" in the query\ -Fixed a bug: Returned false results when having a "&" in the query\
-Fixed a resource bug\ -Fixed a resource bug\
-Fixed special characters in url bug (final)} -Fixed special characters in url bug (final)\
}

View File

@@ -75,4 +75,4 @@
"Growl.messages.lyricsSent.title" = "Songtext an iTunes gesendet"; "Growl.messages.lyricsSent.title" = "Songtext an iTunes gesendet";
"Growl.messages.lyricsSent.detail" = "Songtext an \"%@\" gesendet."; "Growl.messages.lyricsSent.detail" = "Songtext an \"%@\" gesendet.";

View File

@@ -76,4 +76,4 @@
"Growl.messages.lyricsSent.title" = "Lyrics sent to iTunes"; "Growl.messages.lyricsSent.title" = "Lyrics sent to iTunes";
/* %@ is the name of the song */ /* %@ is the name of the song */
"Growl.messages.lyricsSent.detail" = "Lyrics sent to \"%@\"."; "Growl.messages.lyricsSent.detail" = "Lyrics sent to \"%@\".";

View File

@@ -27,5 +27,4 @@
- (IBAction)playPauseiTunes:(id)sender; - (IBAction)playPauseiTunes:(id)sender;
- (IBAction)previousTrack:(id)sender; - (IBAction)previousTrack:(id)sender;
- (IBAction)nextTrack:(id)sender; - (IBAction)nextTrack:(id)sender;
@end @end

View File

@@ -106,4 +106,5 @@
- (IBAction)nextTrack:(id)sender { - (IBAction)nextTrack:(id)sender {
[iTunes nextTrack]; [iTunes nextTrack];
} }
@end @end

View File

@@ -24,5 +24,4 @@
-(void) saveToDefaults: (NSUserDefaults *)defaults; -(void) saveToDefaults: (NSUserDefaults *)defaults;
-(void) loadFromDefaults: (NSUserDefaults *)defaults; -(void) loadFromDefaults: (NSUserDefaults *)defaults;
@end @end

View File

@@ -90,5 +90,4 @@ AutoLyrics *instace;
enabled = [defaults boolForKey:@"Auto Lyrics Enabled"]; enabled = [defaults boolForKey:@"Auto Lyrics Enabled"];
replaceOldLyrics = [defaults boolForKey:@"Auto Lyrics replaces old lyrics"]; replaceOldLyrics = [defaults boolForKey:@"Auto Lyrics replaces old lyrics"];
} }
@end @end

View File

@@ -9,9 +9,11 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@interface Lyrics : NSObject @interface Lyrics : NSObject
@property NSString *name; @property NSString *name;
@property NSString *artist; @property NSString *artist;
@property NSString *lyrics; @property NSString *lyrics;
-(id)initWithName: (NSString*) name byArtist: (NSString*) artist withLyrics: (NSString*) lyrics; -(id)initWithName: (NSString*) name byArtist: (NSString*) artist withLyrics: (NSString*) lyrics;
@end @end

View File

@@ -20,5 +20,4 @@
name = son; name = son;
return self; return self;
} }
@end @end

View File

@@ -10,5 +10,4 @@
#import "LyricsHoster.h" #import "LyricsHoster.h"
@interface Magistrix : NSObject <LyricsHoster> @interface Magistrix : NSObject <LyricsHoster>
@end @end

View File

@@ -216,4 +216,5 @@ typedef enum {
NSString *lyrics = [self stringByRemovingHTMLTags:[page substringWithRange:NSMakeRange(lyricsStart, lyricsEnd-lyricsStart)]]; NSString *lyrics = [self stringByRemovingHTMLTags:[page substringWithRange:NSMakeRange(lyricsStart, lyricsEnd-lyricsStart)]];
return lyrics; return lyrics;
} }
@end @end

View File

@@ -45,5 +45,4 @@
- (IBAction)showiLyricsWindow:(id)sender; - (IBAction)showiLyricsWindow:(id)sender;
- (void)saveToDefalts: (NSUserDefaults *)defaults; - (void)saveToDefalts: (NSUserDefaults *)defaults;
- (void)loadFromDefaults: (NSUserDefaults *)defaults; - (void)loadFromDefaults: (NSUserDefaults *)defaults;
@end @end

View File

@@ -46,27 +46,15 @@
#pragma mark Outline view Data Source and Delegate #pragma mark Outline view Data Source and Delegate
-(NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { -(NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
if (item == nil) { return item == nil ? [loadedResults count] : 0;
return [loadedResults count];
}
if ([item isKindOfClass:[NSArray class]]) {
return [item count];
}
return 0;
} }
-(id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item { -(id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item {
if (item == nil) { return [loadedResults objectAtIndex:index];
return [loadedResults objectAtIndex:index];
}
if ([item isKindOfClass:[SearchResult class]]) {
return [item objectAtIndex:index];
}
return nil;
} }
-(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item { -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
return [loadedResults containsObject:item]; return NO;
} }
-(id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item { -(id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
@@ -345,4 +333,5 @@
-(void)loadFromDefaults:(NSUserDefaults *)defaults { -(void)loadFromDefaults:(NSUserDefaults *)defaults {
[showPreviewCheckBox setState:[defaults boolForKey:@"Show preview"]?NSOnState:NSOffState]; [showPreviewCheckBox setState:[defaults boolForKey:@"Show preview"]?NSOnState:NSOffState];
} }
@end @end

View File

@@ -31,5 +31,4 @@
- (IBAction)toggleAutoLyrics:(id)sender; - (IBAction)toggleAutoLyrics:(id)sender;
- (IBAction)changeAutoLyricsInterval:(id)sender; - (IBAction)changeAutoLyricsInterval:(id)sender;
- (IBAction)toggleReplaceOldLyrics:(id)sender; - (IBAction)toggleReplaceOldLyrics:(id)sender;
@end @end

View File

@@ -126,5 +126,4 @@
return [dateFormatter stringFromDate:version]; return [dateFormatter stringFromDate:version];
} }
} }
@end @end

View File

@@ -9,5 +9,4 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface PreferencesWindow : NSWindow @interface PreferencesWindow : NSWindow
@end @end

View File

@@ -16,5 +16,4 @@
} }
return [super validateUserInterfaceItem:anItem]; return [super validateUserInterfaceItem:anItem];
} }
@end @end

View File

@@ -16,4 +16,5 @@
-(id)initWithName: (NSString*) name fromArtist: (NSString*) artist preview: (NSString*) preview link: (id) link; -(id)initWithName: (NSString*) name fromArtist: (NSString*) artist preview: (NSString*) preview link: (id) link;
@end @end

View File

@@ -21,5 +21,4 @@
link = l; link = l;
return self; return self;
} }
@end @end

View File

@@ -1180,7 +1180,6 @@
<int key="NSvFlags">293</int> <int key="NSvFlags">293</int>
<string key="NSFrame">{{141, 1}, {72, 18}}</string> <string key="NSFrame">{{141, 1}, {72, 18}}</string>
<reference key="NSSuperview" ref="916426737"/> <reference key="NSSuperview" ref="916426737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="24773797"/> <reference key="NSNextKeyView" ref="24773797"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -1215,7 +1214,6 @@
<int key="NSvFlags">289</int> <int key="NSvFlags">289</int>
<string key="NSFrame">{{214, -1}, {140, 23}}</string> <string key="NSFrame">{{214, -1}, {140, 23}}</string>
<reference key="NSSuperview" ref="916426737"/> <reference key="NSSuperview" ref="916426737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="547184945"/> <reference key="NSNextKeyView" ref="547184945"/>
<string key="NSReuseIdentifierKey">_NS:22</string> <string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -1239,7 +1237,6 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{0, -1}, {139, 23}}</string> <string key="NSFrame">{{0, -1}, {139, 23}}</string>
<reference key="NSSuperview" ref="916426737"/> <reference key="NSSuperview" ref="916426737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1053530024"/> <reference key="NSNextKeyView" ref="1053530024"/>
<string key="NSReuseIdentifierKey">_NS:22</string> <string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -1271,7 +1268,6 @@
<int key="NSvFlags">4352</int> <int key="NSvFlags">4352</int>
<string key="NSFrameSize">{352, 415}</string> <string key="NSFrameSize">{352, 415}</string>
<reference key="NSSuperview" ref="724400969"/> <reference key="NSSuperview" ref="724400969"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="215702022"/> <reference key="NSNextKeyView" ref="215702022"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -1280,7 +1276,6 @@
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<string key="NSFrameSize">{352, 17}</string> <string key="NSFrameSize">{352, 17}</string>
<reference key="NSSuperview" ref="215702022"/> <reference key="NSSuperview" ref="215702022"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="724400969"/> <reference key="NSNextKeyView" ref="724400969"/>
<string key="NSReuseIdentifierKey">_NS:16</string> <string key="NSReuseIdentifierKey">_NS:16</string>
<reference key="NSTableView" ref="911257153"/> <reference key="NSTableView" ref="911257153"/>
@@ -1390,7 +1385,6 @@
</array> </array>
<string key="NSFrame">{{1, 17}, {352, 415}}</string> <string key="NSFrame">{{1, 17}, {352, 415}}</string>
<reference key="NSSuperview" ref="624056482"/> <reference key="NSSuperview" ref="624056482"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="911257153"/> <reference key="NSNextKeyView" ref="911257153"/>
<string key="NSReuseIdentifierKey">_NS:11</string> <string key="NSReuseIdentifierKey">_NS:11</string>
<reference key="NSDocView" ref="911257153"/> <reference key="NSDocView" ref="911257153"/>
@@ -1407,7 +1401,6 @@
<int key="NSvFlags">-2147483392</int> <int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 17}, {15, 102}}</string> <string key="NSFrame">{{224, 17}, {15, 102}}</string>
<reference key="NSSuperview" ref="624056482"/> <reference key="NSSuperview" ref="624056482"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="222180734"/> <reference key="NSNextKeyView" ref="222180734"/>
<string key="NSReuseIdentifierKey">_NS:58</string> <string key="NSReuseIdentifierKey">_NS:58</string>
<reference key="NSTarget" ref="624056482"/> <reference key="NSTarget" ref="624056482"/>
@@ -1420,7 +1413,6 @@
<int key="NSvFlags">-2147483392</int> <int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 417}, {350, 15}}</string> <string key="NSFrame">{{1, 417}, {350, 15}}</string>
<reference key="NSSuperview" ref="624056482"/> <reference key="NSSuperview" ref="624056482"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="288205323"/> <reference key="NSNextKeyView" ref="288205323"/>
<string key="NSReuseIdentifierKey">_NS:60</string> <string key="NSReuseIdentifierKey">_NS:60</string>
<int key="NSsFlags">1</int> <int key="NSsFlags">1</int>
@@ -1436,7 +1428,6 @@
</array> </array>
<string key="NSFrame">{{1, 0}, {352, 17}}</string> <string key="NSFrame">{{1, 0}, {352, 17}}</string>
<reference key="NSSuperview" ref="624056482"/> <reference key="NSSuperview" ref="624056482"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="831140326"/> <reference key="NSNextKeyView" ref="831140326"/>
<string key="NSReuseIdentifierKey">_NS:15</string> <string key="NSReuseIdentifierKey">_NS:15</string>
<reference key="NSDocView" ref="831140326"/> <reference key="NSDocView" ref="831140326"/>
@@ -1446,7 +1437,6 @@
</array> </array>
<string key="NSFrame">{{0, 29}, {354, 433}}</string> <string key="NSFrame">{{0, 29}, {354, 433}}</string>
<reference key="NSSuperview" ref="916426737"/> <reference key="NSSuperview" ref="916426737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="724400969"/> <reference key="NSNextKeyView" ref="724400969"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133682</int> <int key="NSsFlags">133682</int>
@@ -1459,7 +1449,6 @@
</array> </array>
<string key="NSFrameSize">{354, 462}</string> <string key="NSFrameSize">{354, 462}</string>
<reference key="NSSuperview" ref="900503006"/> <reference key="NSSuperview" ref="900503006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="624056482"/> <reference key="NSNextKeyView" ref="624056482"/>
<string key="NSReuseIdentifierKey">_NS:11</string> <string key="NSReuseIdentifierKey">_NS:11</string>
<string key="NSClassName">NSView</string> <string key="NSClassName">NSView</string>
@@ -1481,7 +1470,6 @@
<int key="NSvFlags">2322</int> <int key="NSvFlags">2322</int>
<string key="NSFrameSize">{495, 14}</string> <string key="NSFrameSize">{495, 14}</string>
<reference key="NSSuperview" ref="310131185"/> <reference key="NSSuperview" ref="310131185"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="136843034"/> <reference key="NSNextKeyView" ref="136843034"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
<object class="NSTextContainer" key="NSTextContainer" id="503254842"> <object class="NSTextContainer" key="NSTextContainer" id="503254842">
@@ -1545,7 +1533,6 @@
</array> </array>
<string key="NSFrame">{{1, 1}, {495, 367}}</string> <string key="NSFrame">{{1, 1}, {495, 367}}</string>
<reference key="NSSuperview" ref="681186150"/> <reference key="NSSuperview" ref="681186150"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="205351759"/> <reference key="NSNextKeyView" ref="205351759"/>
<string key="NSReuseIdentifierKey">_NS:11</string> <string key="NSReuseIdentifierKey">_NS:11</string>
<reference key="NSDocView" ref="205351759"/> <reference key="NSDocView" ref="205351759"/>
@@ -1559,7 +1546,9 @@
<integer value="5"/> <integer value="5"/>
<object class="NSURL"> <object class="NSURL">
<nil key="NS.base"/> <nil key="NS.base"/>
<string key="NS.relative">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</string> <object class="NSMutableString" key="NS.relative">
<characters key="NS.bytes">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</characters>
</object>
</object> </object>
</array> </array>
</array> </array>
@@ -1576,7 +1565,6 @@
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<string key="NSFrame">{{481, 1}, {15, 361}}</string> <string key="NSFrame">{{481, 1}, {15, 361}}</string>
<reference key="NSSuperview" ref="681186150"/> <reference key="NSSuperview" ref="681186150"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:84</string> <string key="NSReuseIdentifierKey">_NS:84</string>
<reference key="NSTarget" ref="681186150"/> <reference key="NSTarget" ref="681186150"/>
<string key="NSAction">_doScroller:</string> <string key="NSAction">_doScroller:</string>
@@ -1588,7 +1576,6 @@
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<string key="NSFrame">{{1, 353}, {489, 15}}</string> <string key="NSFrame">{{1, 353}, {489, 15}}</string>
<reference key="NSSuperview" ref="681186150"/> <reference key="NSSuperview" ref="681186150"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="210278845"/> <reference key="NSNextKeyView" ref="210278845"/>
<string key="NSReuseIdentifierKey">_NS:33</string> <string key="NSReuseIdentifierKey">_NS:33</string>
<int key="NSsFlags">1</int> <int key="NSsFlags">1</int>
@@ -1600,7 +1587,6 @@
</array> </array>
<string key="NSFrameSize">{497, 369}</string> <string key="NSFrameSize">{497, 369}</string>
<reference key="NSSuperview" ref="547184945"/> <reference key="NSSuperview" ref="547184945"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="310131185"/> <reference key="NSNextKeyView" ref="310131185"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133170</int> <int key="NSsFlags">133170</int>
@@ -1617,7 +1603,6 @@
<int key="NSvFlags">265</int> <int key="NSvFlags">265</int>
<string key="NSFrame">{{330, 10}, {153, 32}}</string> <string key="NSFrame">{{330, 10}, {153, 32}}</string>
<reference key="NSSuperview" ref="206159388"/> <reference key="NSSuperview" ref="206159388"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="681186150"/> <reference key="NSNextKeyView" ref="681186150"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -1641,7 +1626,6 @@
<int key="NSvFlags">265</int> <int key="NSvFlags">265</int>
<string key="NSFrame">{{330, 37}, {153, 32}}</string> <string key="NSFrame">{{330, 37}, {153, 32}}</string>
<reference key="NSSuperview" ref="206159388"/> <reference key="NSSuperview" ref="206159388"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="875899735"/> <reference key="NSNextKeyView" ref="875899735"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -1665,7 +1649,6 @@
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrame">{{82, 20}, {249, 17}}</string> <string key="NSFrame">{{82, 20}, {249, 17}}</string>
<reference key="NSSuperview" ref="206159388"/> <reference key="NSSuperview" ref="206159388"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="988585596"/> <reference key="NSNextKeyView" ref="988585596"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string> <string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -1686,7 +1669,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 20}, {63, 17}}</string> <string key="NSFrame">{{17, 20}, {63, 17}}</string>
<reference key="NSSuperview" ref="206159388"/> <reference key="NSSuperview" ref="206159388"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="584106199"/> <reference key="NSNextKeyView" ref="584106199"/>
<string key="NSReuseIdentifierKey">_NS:1505</string> <string key="NSReuseIdentifierKey">_NS:1505</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -1706,7 +1688,6 @@
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrame">{{82, 47}, {249, 17}}</string> <string key="NSFrame">{{82, 47}, {249, 17}}</string>
<reference key="NSSuperview" ref="206159388"/> <reference key="NSSuperview" ref="206159388"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="549759153"/> <reference key="NSNextKeyView" ref="549759153"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string> <string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -1727,7 +1708,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 47}, {36, 17}}</string> <string key="NSFrame">{{17, 47}, {36, 17}}</string>
<reference key="NSSuperview" ref="206159388"/> <reference key="NSSuperview" ref="206159388"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="796010464"/> <reference key="NSNextKeyView" ref="796010464"/>
<string key="NSReuseIdentifierKey">_NS:1505</string> <string key="NSReuseIdentifierKey">_NS:1505</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -1745,7 +1725,6 @@
</array> </array>
<string key="NSFrame">{{0, 377}, {497, 85}}</string> <string key="NSFrame">{{0, 377}, {497, 85}}</string>
<reference key="NSSuperview" ref="547184945"/> <reference key="NSSuperview" ref="547184945"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="832505845"/> <reference key="NSNextKeyView" ref="832505845"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string> <string key="NSClassName">NSView</string>
@@ -1753,7 +1732,6 @@
</array> </array>
<string key="NSFrame">{{364, 0}, {497, 462}}</string> <string key="NSFrame">{{364, 0}, {497, 462}}</string>
<reference key="NSSuperview" ref="900503006"/> <reference key="NSSuperview" ref="900503006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="206159388"/> <reference key="NSNextKeyView" ref="206159388"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
<string key="NSClassName">NSView</string> <string key="NSClassName">NSView</string>
@@ -1761,7 +1739,6 @@
</array> </array>
<string key="NSFrameSize">{861, 462}</string> <string key="NSFrameSize">{861, 462}</string>
<reference key="NSSuperview" ref="439893737"/> <reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="916426737"/> <reference key="NSNextKeyView" ref="916426737"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSIsVertical">YES</bool> <bool key="NSIsVertical">YES</bool>
@@ -1770,7 +1747,6 @@
</array> </array>
<string key="NSFrameSize">{861, 462}</string> <string key="NSFrameSize">{861, 462}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="900503006"/> <reference key="NSNextKeyView" ref="900503006"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -6941,299 +6917,7 @@
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">2802</int> <int key="maxID">2802</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes"/>
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">AppDelegate</string>
<string key="superclassName">NSObject</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="nextTrack:">id</string>
<string key="playPauseiTunes:">id</string>
<string key="previousTrack:">id</string>
<string key="quitiTunes:">id</string>
<string key="runiTunes:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="nextTrack:">
<string key="name">nextTrack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="playPauseiTunes:">
<string key="name">playPauseiTunes:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="previousTrack:">
<string key="name">previousTrack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="quitiTunes:">
<string key="name">quitiTunes:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="runiTunes:">
<string key="name">runiTunes:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="mainController">MainController</string>
<string key="preferencesController">PreferencesController</string>
<string key="preferencesWindow">NSWindow</string>
<string key="quitWhenAllWindowClosedCheckBox">NSButton</string>
<string key="window">NSWindow</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="mainController">
<string key="name">mainController</string>
<string key="candidateClassName">MainController</string>
</object>
<object class="IBToOneOutletInfo" key="preferencesController">
<string key="name">preferencesController</string>
<string key="candidateClassName">PreferencesController</string>
</object>
<object class="IBToOneOutletInfo" key="preferencesWindow">
<string key="name">preferencesWindow</string>
<string key="candidateClassName">NSWindow</string>
</object>
<object class="IBToOneOutletInfo" key="quitWhenAllWindowClosedCheckBox">
<string key="name">quitWhenAllWindowClosedCheckBox</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="window">
<string key="name">window</string>
<string key="candidateClassName">NSWindow</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/AppDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MainController</string>
<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>
<string key="resetLoadedResults:">id</string>
<string key="sendLyricsToiTunes:">id</string>
<string key="showLyricsInBrowser:">id</string>
<string key="showiLyricsWindow:">id</string>
<string key="startNewSearch:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="downloadLyrics:">
<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>
</object>
<object class="IBActionInfo" key="loadNextResults:">
<string key="name">loadNextResults:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="lyricsSelectionChanged:">
<string key="name">lyricsSelectionChanged:</string>
<string key="candidateClassName">NSOutlineView</string>
</object>
<object class="IBActionInfo" key="resetLoadedResults:">
<string key="name">resetLoadedResults:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="sendLyricsToiTunes:">
<string key="name">sendLyricsToiTunes:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showLyricsInBrowser:">
<string key="name">showLyricsInBrowser:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showiLyricsWindow:">
<string key="name">showiLyricsWindow:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="startNewSearch:">
<string key="name">startNewSearch:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="artistLabel">NSTextField</string>
<string key="downloadLyricsButton">NSButton</string>
<string key="iLyricsMenuItem">NSMenuItem</string>
<string key="loadMoreResultsButton">NSButton</string>
<string key="lyricsArea">NSTextView</string>
<string key="previewPopover">NSPopover</string>
<string key="previewTextArea">NSTextView</string>
<string key="resultsOutline">NSOutlineView</string>
<string key="searchField">NSSearchField</string>
<string key="sendToiTunesButton">NSButton</string>
<string key="showPreviewCheckBox">NSButton</string>
<string key="songLabel">NSTextField</string>
<string key="window">NSWindow</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="artistLabel">
<string key="name">artistLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="downloadLyricsButton">
<string key="name">downloadLyricsButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="iLyricsMenuItem">
<string key="name">iLyricsMenuItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo" key="loadMoreResultsButton">
<string key="name">loadMoreResultsButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="lyricsArea">
<string key="name">lyricsArea</string>
<string key="candidateClassName">NSTextView</string>
</object>
<object class="IBToOneOutletInfo" key="previewPopover">
<string key="name">previewPopover</string>
<string key="candidateClassName">NSPopover</string>
</object>
<object class="IBToOneOutletInfo" key="previewTextArea">
<string key="name">previewTextArea</string>
<string key="candidateClassName">NSTextView</string>
</object>
<object class="IBToOneOutletInfo" key="resultsOutline">
<string key="name">resultsOutline</string>
<string key="candidateClassName">NSOutlineView</string>
</object>
<object class="IBToOneOutletInfo" key="searchField">
<string key="name">searchField</string>
<string key="candidateClassName">NSSearchField</string>
</object>
<object class="IBToOneOutletInfo" key="sendToiTunesButton">
<string key="name">sendToiTunesButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="showPreviewCheckBox">
<string key="name">showPreviewCheckBox</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="songLabel">
<string key="name">songLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="window">
<string key="name">window</string>
<string key="candidateClassName">NSWindow</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MainController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">PreferencesController</string>
<string key="superclassName">NSObject</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="changeAutoLyricsInterval:">id</string>
<string key="showAutoLyricsPreferences:">id</string>
<string key="showGeneralPreferences:">id</string>
<string key="toggleAutoLyrics:">id</string>
<string key="toggleReplaceOldLyrics:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="changeAutoLyricsInterval:">
<string key="name">changeAutoLyricsInterval:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showAutoLyricsPreferences:">
<string key="name">showAutoLyricsPreferences:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showGeneralPreferences:">
<string key="name">showGeneralPreferences:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="toggleAutoLyrics:">
<string key="name">toggleAutoLyrics:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="toggleReplaceOldLyrics:">
<string key="name">toggleReplaceOldLyrics:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="autoLyricsView">NSView</string>
<string key="generalButton">NSToolbarItem</string>
<string key="generalView">NSView</string>
<string key="hosterTable">NSTableView</string>
<string key="preferencesWindow">PreferencesWindow</string>
<string key="replaceOldCheckBox">NSButton</string>
<string key="toggleAutoLyricsButton">NSButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="autoLyricsView">
<string key="name">autoLyricsView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="generalButton">
<string key="name">generalButton</string>
<string key="candidateClassName">NSToolbarItem</string>
</object>
<object class="IBToOneOutletInfo" key="generalView">
<string key="name">generalView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="hosterTable">
<string key="name">hosterTable</string>
<string key="candidateClassName">NSTableView</string>
</object>
<object class="IBToOneOutletInfo" key="preferencesWindow">
<string key="name">preferencesWindow</string>
<string key="candidateClassName">PreferencesWindow</string>
</object>
<object class="IBToOneOutletInfo" key="replaceOldCheckBox">
<string key="name">replaceOldCheckBox</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="toggleAutoLyricsButton">
<string key="name">toggleAutoLyricsButton</string>
<string key="candidateClassName">NSButton</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/PreferencesController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">PreferencesWindow</string>
<string key="superclassName">NSWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/PreferencesWindow.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

View File

@@ -919,9 +919,10 @@
<string key="NSToolbarItemPaletteLabel">Search</string> <string key="NSToolbarItemPaletteLabel">Search</string>
<nil key="NSToolbarItemToolTip"/> <nil key="NSToolbarItemToolTip"/>
<object class="NSSearchField" key="NSToolbarItemView" id="288810339"> <object class="NSSearchField" key="NSToolbarItemView" id="288810339">
<nil key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {96, 22}}</string> <string key="NSFrame">{{0, 14}, {96, 22}}</string>
<reference key="NSSuperview"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="48517109"> <object class="NSSearchFieldCell" key="NSCell" id="48517109">
@@ -1268,7 +1269,7 @@
<int key="NSvFlags">4352</int> <int key="NSvFlags">4352</int>
<string key="NSFrameSize">{300, 415}</string> <string key="NSFrameSize">{300, 415}</string>
<reference key="NSSuperview" ref="724400969"/> <reference key="NSSuperview" ref="724400969"/>
<reference key="NSNextKeyView" ref="1060229027"/> <reference key="NSNextKeyView" ref="215702022"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="831140326"> <object class="NSTableHeaderView" key="NSHeaderView" id="831140326">
@@ -1437,7 +1438,7 @@
</array> </array>
<string key="NSFrame">{{0, 29}, {302, 433}}</string> <string key="NSFrame">{{0, 29}, {302, 433}}</string>
<reference key="NSSuperview" ref="916426737"/> <reference key="NSSuperview" ref="916426737"/>
<reference key="NSNextKeyView" ref="215702022"/> <reference key="NSNextKeyView" ref="724400969"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133682</int> <int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="1060229027"/> <reference key="NSVScroller" ref="1060229027"/>
@@ -1546,7 +1547,9 @@
<integer value="5"/> <integer value="5"/>
<object class="NSURL"> <object class="NSURL">
<nil key="NS.base"/> <nil key="NS.base"/>
<string key="NS.relative">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</string> <object class="NSMutableString" key="NS.relative">
<characters key="NS.bytes">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</characters>
</object>
</object> </object>
</array> </array>
</array> </array>
@@ -1563,7 +1566,6 @@
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<string key="NSFrame">{{513, 1}, {15, 361}}</string> <string key="NSFrame">{{513, 1}, {15, 361}}</string>
<reference key="NSSuperview" ref="681186150"/> <reference key="NSSuperview" ref="681186150"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:84</string> <string key="NSReuseIdentifierKey">_NS:84</string>
<reference key="NSTarget" ref="681186150"/> <reference key="NSTarget" ref="681186150"/>
<string key="NSAction">_doScroller:</string> <string key="NSAction">_doScroller:</string>
@@ -2076,7 +2078,7 @@
<string key="NSClassName">PreferencesController</string> <string key="NSClassName">PreferencesController</string>
</object> </object>
<object class="NSCustomView" id="226480988"> <object class="NSCustomView" id="226480988">
<reference key="NSNextResponder"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="875967531"> <object class="NSTextField" id="875967531">
@@ -2111,7 +2113,7 @@
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<string key="NSFrameSize">{424, 146}</string> <string key="NSFrameSize">{424, 146}</string>
<reference key="NSSuperview" ref="568651855"/> <reference key="NSSuperview" ref="568651855"/>
<reference key="NSNextKeyView" ref="962565179"/> <reference key="NSNextKeyView" ref="25249278"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="1008033059"> <object class="NSTableHeaderView" key="NSHeaderView" id="1008033059">
@@ -2233,7 +2235,6 @@
<int key="NSvFlags">-2147483392</int> <int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 173}, {438, 15}}</string> <string key="NSFrame">{{1, 173}, {438, 15}}</string>
<reference key="NSSuperview" ref="128630455"/> <reference key="NSSuperview" ref="128630455"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:60</string> <string key="NSReuseIdentifierKey">_NS:60</string>
<int key="NSsFlags">1</int> <int key="NSsFlags">1</int>
<reference key="NSTarget" ref="128630455"/> <reference key="NSTarget" ref="128630455"/>
@@ -2256,7 +2257,7 @@
</array> </array>
<string key="NSFrame">{{20, 20}, {426, 164}}</string> <string key="NSFrame">{{20, 20}, {426, 164}}</string>
<reference key="NSSuperview" ref="226480988"/> <reference key="NSSuperview" ref="226480988"/>
<reference key="NSNextKeyView" ref="25249278"/> <reference key="NSNextKeyView" ref="568651855"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133682</int> <int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="962565179"/> <reference key="NSVScroller" ref="962565179"/>
@@ -2292,7 +2293,6 @@
</object> </object>
</array> </array>
<string key="NSFrameSize">{466, 251}</string> <string key="NSFrameSize">{466, 251}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="473254112"/> <reference key="NSNextKeyView" ref="473254112"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string> <string key="NSClassName">NSView</string>

View File

@@ -5,3 +5,4 @@
#ifdef __OBJC__ #ifdef __OBJC__
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#endif #endif