-Changed Main Split view to fix a graphical bug in the results split area

-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
2012-06-18 16:19:01 +02:00
parent dd82658055
commit a5d716af91
13 changed files with 791 additions and 623 deletions
--- a/iLyrics/AppDelegate.m
+++ b/iLyrics/AppDelegate.m
@@ -49,7 +49,7 @@

 -(BOOL)validateMenuItem:(NSMenuItem *)menuItem {
    SEL action = [menuItem action];
-    if (action == @selector(runitunes:)) {
+    if (action == @selector(runiTunes:)) {
        return ![iTunes isRunning];
    }
    if (action == @selector(quitiTunes:) || action == @selector(playPauseiTunes:) || action == @selector(previousTrack:) || action == @selector(nextTrack:)) {
--- a/iLyrics/Magistrix.m
+++ b/iLyrics/Magistrix.m
@@ -42,11 +42,12 @@ typedef enum {

 -(NSArray*) nextResults {
    int site = (loadedResults/10) + 1;
-    NSString *searchPath = [NSString stringWithFormat:@"http://www.magistrix.de/lyrics/search?q=%@&page=%i", [query stringByReplacingOccurrencesOfString:@" " withString:@"+"], site];
+    NSString *searchPath = [NSString stringWithFormat:@"http://www.magistrix.de/lyrics/search?q=%@&page=%i", [self stringByFormattingQuery:query], site];
    NSURL *searchURL = [NSURL URLWithString:searchPath];
    NSError *error;
    NSString *page = [NSString stringWithContentsOfURL:searchURL encoding:NSUTF8StringEncoding error:&error];
    if (error) {
+        //Network error or invalid query
        return nil;
    }
    PageType pType = [self typeOfPage:page];
@@ -58,13 +59,22 @@ typedef enum {
        [self shouldSetResultCountFromPage:page];
        return [self searchResultsFromPage:page];
    } else if (pType == NoResultsPage) {
+        resultCount = 0;
        return [[NSArray alloc] init];
    } else {
        NSRunAlertPanel(NSLocalizedString(@"Magistrix.messages.unknownPage.title", @""), NSLocalizedString(@"Magistrix.messages.unknownPage.detail", @""), NSLocalizedString(@"OK", @""), nil, nil);
+        resultCount = 0;
        return [[NSArray alloc] init];
    }
 }

+-(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];
+}
+
 -(PageType) typeOfPage: (NSString *) page {
    if ([page rangeOfString:@"<title>Songtext-Suche</title>"].location != NSNotFound) {
        if ([page rangeOfString:@"<div class='empty_collection'>"].location != NSNotFound) {
@@ -87,10 +97,10 @@ typedef enum {
    int artistEnd = artistEndTag.location;
    int songNameStart = NSMaxRange(artistEndTag);
    int songNameEnd = headingEnd;
-    NSString *artist = [page substringWithRange:NSMakeRange(artistStart, artistEnd-artistStart)];
+    NSString *artist = [self stringByRemovingHTMLTags:[page substringWithRange:NSMakeRange(artistStart, artistEnd-artistStart)]];
    NSString *songName = [page substringWithRange:NSMakeRange(songNameStart, songNameEnd-songNameStart)];
    //Remove the " Lyric" and the " &ndash; " from the Song name
-    songName = [[songName substringToIndex:[songName length]-[@" Lyric" length]] substringFromIndex:[@" &ndash; " length]];
+    songName = [self stringByRemovingHTMLTags:[[songName substringToIndex:[songName length]-[@" Lyric" length]] substringFromIndex:[@" &ndash; " length]]];
    NSString *preview = [self lyricsFromPage:page];
    return [[SearchResult alloc]initWithName:songName fromArtist:artist preview:preview link:url];
 }
@@ -130,7 +140,7 @@ typedef enum {
    NSRange artistStartRange = [tag rangeOfString:@">"];
    int artistEndIndex = [tag rangeOfString:@"<" options:NSCaseInsensitiveSearch range:[self restRangeFromString:tag subtractingRange:artistStartRange]].location;
    int artistStartIndex = NSMaxRange(artistStartRange);
-    NSString *artist = [tag substringWithRange:NSMakeRange(artistStartIndex, artistEndIndex-artistStartIndex)];
+    NSString *artist = [self stringByRemovingHTMLTags:[tag substringWithRange:NSMakeRange(artistStartIndex, artistEndIndex-artistStartIndex)]];
    
    NSRange restRange = [self restRangeFromString:tag subtractingRange:NSMakeRange(artistEndIndex, [@"</a>" length])];
    NSRange songNameTagStartRange = [tag rangeOfString:@"<a href=\"" options:NSCaseInsensitiveSearch range:restRange];
@@ -139,7 +149,7 @@ typedef enum {
    NSURL *link = [self urlFromHref:[tag substringWithRange:NSMakeRange(linkStart, linkEndRage.location-linkStart)]];
    int songNameStart = NSMaxRange([tag rangeOfString:@">" options:NSCaseInsensitiveSearch range:[self restRangeFromString:tag subtractingRange:songNameTagStartRange]]);
    int songNameEnd = [tag rangeOfString:@"</a>" options:NSCaseInsensitiveSearch range:[self restRangeFromString:tag subtractingRange:songNameTagStartRange]].location;
-    NSString *songName = [tag substringWithRange:NSMakeRange(songNameStart, songNameEnd-songNameStart)];
+    NSString *songName = [self stringByRemovingHTMLTags:[tag substringWithRange:NSMakeRange(songNameStart, songNameEnd-songNameStart)]];
    int previewStart = songNameEnd + [@"</a>" length] + [@"\n<p>" length];
    NSRange previewRestRange = NSMakeRange(previewStart, [tag length]-previewStart);
    int previewEnd = [tag rangeOfString:@"</p>" options:NSCaseInsensitiveSearch range:previewRestRange].location;
@@ -156,7 +166,7 @@ typedef enum {
 }

 -(NSString*) stringByRemovingHTMLTags: (NSString *)string {
-    return [[[[[[[[[[string stringByReplacingOccurrencesOfString:@"<strong>" withString:@""] stringByReplacingOccurrencesOfString:@"</strong>" withString:@""] stringByReplacingOccurrencesOfString:@"<b>" withString:@""] stringByReplacingOccurrencesOfString:@"</b>" withString:@""] stringByReplacingOccurrencesOfString:@"<i>" withString:@""] stringByReplacingOccurrencesOfString:@"</i>" withString:@""] stringByReplacingOccurrencesOfString:@"<p>" withString:@""] stringByReplacingOccurrencesOfString:@"</p>" withString:@""] stringByReplacingOccurrencesOfString:@"<br />" withString:@""] stringByReplacingOccurrencesOfString:@"&quot;" withString:@"\""];
+    return [[[[[[[[[[[string stringByReplacingOccurrencesOfString:@"<strong>" withString:@""] stringByReplacingOccurrencesOfString:@"</strong>" withString:@""] stringByReplacingOccurrencesOfString:@"<b>" withString:@""] stringByReplacingOccurrencesOfString:@"</b>" withString:@""] stringByReplacingOccurrencesOfString:@"<i>" withString:@""] stringByReplacingOccurrencesOfString:@"</i>" withString:@""] stringByReplacingOccurrencesOfString:@"<p>" withString:@""] stringByReplacingOccurrencesOfString:@"</p>" withString:@""] stringByReplacingOccurrencesOfString:@"<br />" withString:@""] stringByReplacingOccurrencesOfString:@"&quot;" withString:@"\""] stringByReplacingOccurrencesOfString:@"&amp;" withString:@"&"];
 }

 -(NSRange) restRangeFromString: (NSString *) page subtractingRange: (NSRange) aRange {
--- a/iLyrics/MainController.h
+++ b/iLyrics/MainController.h
@@ -17,7 +17,7 @@
 #import "Lyrics.h"
 #import <Growl/Growl.h>

-@interface MainController : NSObject <NSWindowDelegate, NSOutlineViewDataSource, NSOutlineViewDelegate>
+@interface MainController : NSObject <NSWindowDelegate, NSSplitViewDelegate, NSOutlineViewDataSource, NSOutlineViewDelegate>
@property (weak) IBOutlet NSMenuItem *iLyricsMenuItem;
@property (unsafe_unretained) IBOutlet NSWindow *window;
@property (weak) IBOutlet NSSearchField *searchField;
--- a/iLyrics/MainController.m
+++ b/iLyrics/MainController.m
@@ -44,6 +44,7 @@

 #pragma mark -
 #pragma mark Outline view Data Source and Delegate
+
 -(NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
    return item == nil ? [loadedResults count] : 0;
 }
@@ -115,8 +116,9 @@

 - (IBAction)loadNextResults:(id)sender {
    NSArray *nextResults = [currentHoster nextResults];
+    [loadMoreResultsButton setEnabled:[currentHoster hasMoreResults]];
    if (nextResults == nil) {
-        NSRunCriticalAlertPanel(NSLocalizedString(@"Hoster.messages.networkError.title", @""), NSLocalizedString(@"Hoster.messages.networkError.detail", @""), NSLocalizedString(@"OK", @""), nil, nil);
+        NSRunCriticalAlertPanel(NSLocalizedString(@"Hoster.messages.networkOrQueryError.title", @""), NSLocalizedString(@"Hoster.messages.networkOrQueryError.detail", @""), NSLocalizedString(@"OK", @""), nil, nil);
        return;
    }
    if ([nextResults count] == 0) {
@@ -125,7 +127,6 @@
    }
    [loadedResults addObjectsFromArray:nextResults];
    [resultsOutline reloadData];
-    [loadMoreResultsButton setEnabled:[currentHoster hasMoreResults]];
 }

 -(IBAction)resetLoadedResults:(id)sender {
@@ -251,6 +252,21 @@
    [window makeKeyAndOrderFront:sender];
 }

+#pragma mark Split View Delegate
+
+/*-(CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMaximumPosition ofSubviewAt:(NSInteger)dividerIndex {
+    NSView *rightView = [[splitView subviews] objectAtIndex:1];
+    int width = [splitView frame].size.width;
+    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 {
--- a/iLyrics/de.lproj/Credits.rtf
+++ b/iLyrics/de.lproj/Credits.rtf
@@ -14,6 +14,13 @@
 	Kim Wittenburg\
 \

+\b \'dcbersetzt von:\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\b0 \cf0 	Kim Wittenburg\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+\cf0 \
+
 \b Getestet von:
 \b0 \
 	Kim Wittenbug}
--- a/iLyrics/de.lproj/MainMenu.xib
+++ b/iLyrics/de.lproj/MainMenu.xib
@@ -739,7 +739,7 @@
 								</object>
 								<object class="NSMenuItem" id="407265144">
 									<reference key="NSMenu" ref="582956040"/>
-									<string key="NSTitle">Play/Pause</string>
+									<string key="NSTitle">Wiedergabe/Pause</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="35465992"/>
@@ -922,8 +922,6 @@
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{0, 14}, {96, 22}}</string>
 								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSSearchFieldCell" key="NSCell" id="48517109">
@@ -998,7 +996,7 @@
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
 							<string key="NSToolbarItemMinSize">{96, 22}</string>
-							<string key="NSToolbarItemMaxSize">{96, 22}</string>
+							<string key="NSToolbarItemMaxSize">{300, 22}</string>
 							<bool key="NSToolbarItemEnabled">YES</bool>
 							<bool key="NSToolbarItemAutovalidates">YES</bool>
 							<int key="NSToolbarItemTag">0</int>
@@ -1068,7 +1066,7 @@
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="D907D172-E223-4708-B48A-EE062B41F68E" id="1022076601">
+						<object class="NSToolbarItem" key="D907D172-E223-4708-B48A-EE062B41F68E" id="351635289">
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
 								<characters key="NS.bytes">D907D172-E223-4708-B48A-EE062B41F68E</characters>
 							</object>
@@ -1145,16 +1143,16 @@
 							</object>
 						</object>
 					</dictionary>
-					<array class="NSMutableArray" key="NSToolbarIBAllowedItems">
+					<array key="NSToolbarIBAllowedItems">
 						<reference ref="348612815"/>
 						<reference ref="27027590"/>
-						<reference ref="1022076601"/>
+						<reference ref="351635289"/>
 						<reference ref="478869102"/>
 						<reference ref="281250230"/>
 						<reference ref="796233866"/>
 						<reference ref="611451715"/>
 					</array>
-					<array class="NSMutableArray" key="NSToolbarIBDefaultItems">
+					<array key="NSToolbarIBDefaultItems">
 						<reference ref="348612815"/>
 						<reference ref="27027590"/>
 						<reference ref="611451715"/>
@@ -1164,6 +1162,7 @@
 					<array key="NSToolbarIBSelectableItems" id="0"/>
 				</object>
 				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{650, 350}</string>
 				<object class="NSView" key="NSWindowView" id="439893737">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -1179,9 +1178,8 @@
 										<object class="NSButton" id="1053530024">
 											<reference key="NSNextResponder" ref="916426737"/>
 											<int key="NSvFlags">293</int>
-											<string key="NSFrame">{{146, 1}, {72, 18}}</string>
+											<string key="NSFrame">{{141, 1}, {72, 18}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="24773797"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -1214,9 +1212,8 @@
 										<object class="NSButton" id="24773797">
 											<reference key="NSNextResponder" ref="916426737"/>
 											<int key="NSvFlags">289</int>
-											<string key="NSFrame">{{224, -1}, {140, 23}}</string>
+											<string key="NSFrame">{{214, -1}, {140, 23}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="547184945"/>
 											<string key="NSReuseIdentifierKey">_NS:22</string>
 											<bool key="NSEnabled">YES</bool>
@@ -1240,7 +1237,6 @@
 											<int key="NSvFlags">292</int>
 											<string key="NSFrame">{{0, -1}, {139, 23}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1053530024"/>
 											<string key="NSReuseIdentifierKey">_NS:22</string>
 											<bool key="NSEnabled">YES</bool>
@@ -1270,18 +1266,16 @@
 														<object class="NSOutlineView" id="911257153">
 															<reference key="NSNextResponder" ref="724400969"/>
 															<int key="NSvFlags">4352</int>
-															<string key="NSFrameSize">{362, 415}</string>
+															<string key="NSFrameSize">{352, 415}</string>
 															<reference key="NSSuperview" ref="724400969"/>
-															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="1060229027"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTableHeaderView" key="NSHeaderView" id="831140326">
 																<reference key="NSNextResponder" ref="215702022"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrameSize">{362, 17}</string>
+																<string key="NSFrameSize">{352, 17}</string>
 																<reference key="NSSuperview" ref="215702022"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="724400969"/>
 																<string key="NSReuseIdentifierKey">_NS:16</string>
 																<reference key="NSTableView" ref="911257153"/>
@@ -1296,8 +1290,8 @@
 															<array class="NSMutableArray" key="NSTableColumns">
 																<object class="NSTableColumn" id="734335914">
 																	<string key="NSIdentifier">song</string>
-																	<double key="NSWidth">194.5859375</double>
-																	<double key="NSMinWidth">16</double>
+																	<double key="NSWidth">185</double>
+																	<double key="NSMinWidth">185</double>
 																	<double key="NSMaxWidth">1000</double>
 																	<object class="NSTableHeaderCell" key="NSHeaderCell">
 																		<int key="NSCellFlags">75628096</int>
@@ -1340,7 +1334,7 @@
 																<object class="NSTableColumn" id="488096494">
 																	<string key="NSIdentifier">artist</string>
 																	<double key="NSWidth">161</double>
-																	<double key="NSMinWidth">40</double>
+																	<double key="NSMinWidth">160</double>
 																	<double key="NSMaxWidth">1000</double>
 																	<object class="NSTableHeaderCell" key="NSHeaderCell">
 																		<int key="NSCellFlags">75628096</int>
@@ -1389,9 +1383,8 @@
 															<int key="NSTableViewGroupRowStyle">1</int>
 														</object>
 													</array>
-													<string key="NSFrame">{{1, 17}, {362, 415}}</string>
+													<string key="NSFrame">{{1, 17}, {352, 415}}</string>
 													<reference key="NSSuperview" ref="624056482"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="911257153"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
 													<reference key="NSDocView" ref="911257153"/>
@@ -1408,7 +1401,6 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 													<reference key="NSSuperview" ref="624056482"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="222180734"/>
 													<string key="NSReuseIdentifierKey">_NS:58</string>
 													<reference key="NSTarget" ref="624056482"/>
@@ -1419,15 +1411,14 @@
 												<object class="NSScroller" id="222180734">
 													<reference key="NSNextResponder" ref="624056482"/>
 													<int key="NSvFlags">-2147483392</int>
-													<string key="NSFrame">{{1, 417}, {238, 15}}</string>
+													<string key="NSFrame">{{1, 417}, {350, 15}}</string>
 													<reference key="NSSuperview" ref="624056482"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="288205323"/>
 													<string key="NSReuseIdentifierKey">_NS:60</string>
 													<int key="NSsFlags">1</int>
 													<reference key="NSTarget" ref="624056482"/>
 													<string key="NSAction">_doScroller:</string>
-													<double key="NSPercent">0.98755186721991706</double>
+													<double key="NSPercent">0.9971509971509972</double>
 												</object>
 												<object class="NSClipView" id="215702022">
 													<reference key="NSNextResponder" ref="624056482"/>
@@ -1435,9 +1426,8 @@
 													<array class="NSMutableArray" key="NSSubviews">
 														<reference ref="831140326"/>
 													</array>
-													<string key="NSFrame">{{1, 0}, {362, 17}}</string>
+													<string key="NSFrame">{{1, 0}, {352, 17}}</string>
 													<reference key="NSSuperview" ref="624056482"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="831140326"/>
 													<string key="NSReuseIdentifierKey">_NS:15</string>
 													<reference key="NSDocView" ref="831140326"/>
@@ -1445,9 +1435,8 @@
 													<int key="NScvFlags">4</int>
 												</object>
 											</array>
-											<string key="NSFrame">{{0, 29}, {364, 433}}</string>
+											<string key="NSFrame">{{0, 29}, {354, 433}}</string>
 											<reference key="NSSuperview" ref="916426737"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="215702022"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133682</int>
@@ -1458,9 +1447,8 @@
 											<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 										</object>
 									</array>
-									<string key="NSFrameSize">{364, 462}</string>
+									<string key="NSFrameSize">{354, 462}</string>
 									<reference key="NSSuperview" ref="900503006"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="624056482"/>
 									<string key="NSReuseIdentifierKey">_NS:11</string>
 									<string key="NSClassName">NSView</string>
@@ -1480,9 +1468,8 @@
 														<object class="NSTextView" id="205351759">
 															<reference key="NSNextResponder" ref="310131185"/>
 															<int key="NSvFlags">2322</int>
-															<string key="NSFrameSize">{457, 14}</string>
+															<string key="NSFrameSize">{495, 14}</string>
 															<reference key="NSSuperview" ref="310131185"/>
-															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="136843034"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<object class="NSTextContainer" key="NSTextContainer" id="503254842">
@@ -1500,7 +1487,7 @@
 																	<nil key="NSDelegate"/>
 																</object>
 																<reference key="NSTextView" ref="205351759"/>
-																<double key="NSWidth">457</double>
+																<double key="NSWidth">495</double>
 																<int key="NSTCFlags">1</int>
 															</object>
 															<object class="NSTextViewSharedData" key="NSSharedData">
@@ -1544,9 +1531,8 @@
 															<nil key="NSDelegate"/>
 														</object>
 													</array>
-													<string key="NSFrame">{{1, 1}, {457, 367}}</string>
+													<string key="NSFrame">{{1, 1}, {495, 367}}</string>
 													<reference key="NSSuperview" ref="681186150"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="205351759"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
 													<reference key="NSDocView" ref="205351759"/>
@@ -1575,9 +1561,8 @@
 												<object class="NSScroller" id="210278845">
 													<reference key="NSNextResponder" ref="681186150"/>
 													<int key="NSvFlags">256</int>
-													<string key="NSFrame">{{443, 1}, {15, 361}}</string>
+													<string key="NSFrame">{{481, 1}, {15, 361}}</string>
 													<reference key="NSSuperview" ref="681186150"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView"/>
 													<string key="NSReuseIdentifierKey">_NS:84</string>
 													<reference key="NSTarget" ref="681186150"/>
@@ -1588,9 +1573,8 @@
 												<object class="NSScroller" id="136843034">
 													<reference key="NSNextResponder" ref="681186150"/>
 													<int key="NSvFlags">256</int>
-													<string key="NSFrame">{{1, 353}, {451, 15}}</string>
+													<string key="NSFrame">{{1, 353}, {489, 15}}</string>
 													<reference key="NSSuperview" ref="681186150"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="210278845"/>
 													<string key="NSReuseIdentifierKey">_NS:33</string>
 													<int key="NSsFlags">1</int>
@@ -1600,9 +1584,8 @@
 													<double key="NSPercent">0.94565218687057495</double>
 												</object>
 											</array>
-											<string key="NSFrameSize">{459, 369}</string>
+											<string key="NSFrameSize">{497, 369}</string>
 											<reference key="NSSuperview" ref="547184945"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="310131185"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133170</int>
@@ -1617,9 +1600,8 @@
 												<object class="NSButton" id="988585596">
 													<reference key="NSNextResponder" ref="206159388"/>
 													<int key="NSvFlags">265</int>
-													<string key="NSFrame">{{292, 9}, {153, 32}}</string>
+													<string key="NSFrame">{{330, 10}, {153, 32}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="681186150"/>
 													<string key="NSReuseIdentifierKey">_NS:9</string>
 													<bool key="NSEnabled">YES</bool>
@@ -1641,9 +1623,8 @@
 												<object class="NSButton" id="549759153">
 													<reference key="NSNextResponder" ref="206159388"/>
 													<int key="NSvFlags">265</int>
-													<string key="NSFrame">{{292, 37}, {153, 32}}</string>
+													<string key="NSFrame">{{330, 37}, {153, 32}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="875899735"/>
 													<string key="NSReuseIdentifierKey">_NS:9</string>
 													<bool key="NSEnabled">YES</bool>
@@ -1665,9 +1646,8 @@
 												<object class="NSTextField" id="584106199">
 													<reference key="NSNextResponder" ref="206159388"/>
 													<int key="NSvFlags">266</int>
-													<string key="NSFrame">{{82, 20}, {211, 17}}</string>
+													<string key="NSFrame">{{82, 20}, {249, 17}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="988585596"/>
 													<string key="NSReuseIdentifierKey">_NS:9</string>
 													<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -1676,11 +1656,7 @@
 														<int key="NSCellFlags">69336641</int>
 														<int key="NSCellFlags2">272631808</int>
 														<string key="NSContents">Keine Auswahl</string>
-														<object class="NSFont" key="NSSupport">
-															<string key="NSName">LucidaGrande</string>
-															<double key="NSSize">13</double>
-															<int key="NSfFlags">16</int>
-														</object>
+														<reference key="NSSupport" ref="199720984"/>
 														<string key="NSCellIdentifier">_NS:9</string>
 														<reference key="NSControlView" ref="584106199"/>
 														<reference key="NSBackgroundColor" ref="484067113"/>
@@ -1692,7 +1668,6 @@
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{17, 20}, {63, 17}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="584106199"/>
 													<string key="NSReuseIdentifierKey">_NS:1505</string>
 													<bool key="NSEnabled">YES</bool>
@@ -1710,9 +1685,8 @@
 												<object class="NSTextField" id="796010464">
 													<reference key="NSNextResponder" ref="206159388"/>
 													<int key="NSvFlags">266</int>
-													<string key="NSFrame">{{82, 47}, {211, 17}}</string>
+													<string key="NSFrame">{{82, 47}, {249, 17}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="549759153"/>
 													<string key="NSReuseIdentifierKey">_NS:9</string>
 													<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -1733,7 +1707,6 @@
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{17, 47}, {36, 17}}</string>
 													<reference key="NSSuperview" ref="206159388"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="796010464"/>
 													<string key="NSReuseIdentifierKey">_NS:1505</string>
 													<bool key="NSEnabled">YES</bool>
@@ -1749,17 +1722,15 @@
 													</object>
 												</object>
 											</array>
-											<string key="NSFrame">{{0, 377}, {459, 85}}</string>
+											<string key="NSFrame">{{0, 377}, {497, 85}}</string>
 											<reference key="NSSuperview" ref="547184945"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="832505845"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<string key="NSClassName">NSView</string>
 										</object>
 									</array>
-									<string key="NSFrame">{{374, 0}, {487, 462}}</string>
+									<string key="NSFrame">{{364, 0}, {497, 462}}</string>
 									<reference key="NSSuperview" ref="900503006"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="206159388"/>
 									<string key="NSReuseIdentifierKey">_NS:13</string>
 									<string key="NSClassName">NSView</string>
@@ -1767,7 +1738,6 @@
 							</array>
 							<string key="NSFrameSize">{861, 462}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="916426737"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSIsVertical">YES</bool>
@@ -1776,10 +1746,10 @@
 					</array>
 					<string key="NSFrameSize">{861, 462}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="900503006"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMinSize">{650, 428}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<int key="NSWindowAnimationBehavior">3</int>
 				<int key="NSWindowCollectionBehavior">128</int>
@@ -1788,6 +1758,19 @@
 			<object class="NSCustomObject" id="1033563008">
 				<string key="NSClassName">MainController</string>
 			</object>
+			<object class="NSMenu" id="835657734">
+				<string key="NSTitle"/>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="322378040">
+						<reference key="NSMenu" ref="835657734"/>
+						<string key="NSTitle">Im Browser öffnen</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+				</array>
+			</object>
 			<object class="NSViewController" id="398344164"/>
 			<object class="NSPopover" id="963616451">
 				<nil key="NSNextResponder"/>
@@ -2083,9 +2066,10 @@
 				</object>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="346299228">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<string key="NSFrameSize">{480, 270}</string>
+					<reference key="NSSuperview"/>
 					<string key="NSReuseIdentifierKey">_NS:20</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -2096,7 +2080,7 @@
 				<string key="NSClassName">PreferencesController</string>
 			</object>
 			<object class="NSCustomView" id="226480988">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSTextField" id="875967531">
@@ -2131,7 +2115,7 @@
 										<int key="NSvFlags">256</int>
 										<string key="NSFrameSize">{424, 146}</string>
 										<reference key="NSSuperview" ref="568651855"/>
-										<reference key="NSNextKeyView" ref="25249278"/>
+										<reference key="NSNextKeyView" ref="962565179"/>
 										<string key="NSReuseIdentifierKey">_NS:13</string>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTableHeaderView" key="NSHeaderView" id="1008033059">
@@ -2188,7 +2172,7 @@
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
 													<int key="NSCellFlags">75628096</int>
 													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents">Version</string>
+													<string key="NSContents">Zuletzt aktualisiert</string>
 													<reference key="NSSupport" ref="26"/>
 													<object class="NSColor" key="NSBackgroundColor">
 														<int key="NSColorSpace">6</int>
@@ -2275,7 +2259,7 @@
 						</array>
 						<string key="NSFrame">{{20, 20}, {426, 164}}</string>
 						<reference key="NSSuperview" ref="226480988"/>
-						<reference key="NSNextKeyView" ref="568651855"/>
+						<reference key="NSNextKeyView" ref="25249278"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="NSsFlags">133682</int>
 						<reference key="NSVScroller" ref="962565179"/>
@@ -2311,6 +2295,7 @@
 					</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>
@@ -2319,6 +2304,28 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
+					<object class="NSButton" id="283515033">
+						<reference key="NSNextResponder" ref="1036377286"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{12, 17}, {25, 25}}</string>
+						<reference key="NSSuperview" ref="1036377286"/>
+						<string key="NSReuseIdentifierKey">_NS:1553</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="45709574">
+							<int key="NSCellFlags">604110336</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="199720984"/>
+							<string key="NSCellIdentifier">_NS:1553</string>
+							<reference key="NSControlView" ref="283515033"/>
+							<int key="NSButtonFlags">-2038415105</int>
+							<int key="NSButtonFlags2">161</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+					</object>
 					<object class="NSTextField" id="935245374">
 						<reference key="NSNextResponder" ref="1036377286"/>
 						<int key="NSvFlags">268</int>
@@ -2541,19 +2548,6 @@
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
 			</object>
-			<object class="NSMenu" id="835657734">
-				<string key="NSTitle"/>
-				<array class="NSMutableArray" key="NSMenuItems">
-					<object class="NSMenuItem" id="322378040">
-						<reference key="NSMenu" ref="835657734"/>
-						<string key="NSTitle">Im Browser öffnen</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-					</object>
-				</array>
-			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -3217,7 +3211,7 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">getCurrentSpotifySong:</string>
 						<reference key="source" ref="1033563008"/>
-						<reference key="destination" ref="1022076601"/>
+						<reference key="destination" ref="351635289"/>
 					</object>
 					<int key="connectionID">2602</int>
 				</object>
@@ -3397,6 +3391,14 @@
 					</object>
 					<int key="connectionID">2591</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="900503006"/>
+						<reference key="destination" ref="1033563008"/>
+					</object>
+					<int key="connectionID">2603</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -3998,7 +4000,7 @@
 							<reference ref="348612815"/>
 							<reference ref="478869102"/>
 							<reference ref="281250230"/>
-							<reference ref="1022076601"/>
+							<reference ref="351635289"/>
 						</array>
 						<reference key="parent" ref="972006081"/>
 					</object>
@@ -4584,6 +4586,7 @@
 							<reference ref="563417696"/>
 							<reference ref="355980366"/>
 							<reference ref="935245374"/>
+							<reference ref="283515033"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -4724,9 +4727,22 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2601</int>
-						<reference key="object" ref="1022076601"/>
+						<reference key="object" ref="351635289"/>
 						<reference key="parent" ref="1060589599"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2692</int>
+						<reference key="object" ref="283515033"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="45709574"/>
+						</array>
+						<reference key="parent" ref="1036377286"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2693</int>
+						<reference key="object" ref="45709574"/>
+						<reference key="parent" ref="283515033"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4874,6 +4890,8 @@
 				<string key="2598.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2599.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2601.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2692.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2693.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4926,9 +4944,11 @@
 				<string key="599.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="600.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="601.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="601.toolbarItem.selectable"/>
 				<string key="602.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="603.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="604.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="604.toolbarItem.selectable"/>
 				<string key="605.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="606.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="615.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4955,293 +4975,9 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2602</int>
-		</object>
-		<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">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>
+			<int key="maxID">2693</int>
 		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
--- a/iLyrics/en.lproj/Credits.rtf
+++ b/iLyrics/en.lproj/Credits.rtf
@@ -14,6 +14,13 @@
 	Kim Wittenburg\
 \

+\b Translations:\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\b0 \cf0 	Kim Wittenburg\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+\cf0 \
+
 \b Testing:
 \b0 \
 	Kim Wittenbug}
--- a/iLyrics/en.lproj/MainMenu.xib
+++ b/iLyrics/en.lproj/MainMenu.xib
--- a/iLyrics/iLyrics-Info.plist
+++ b/iLyrics/iLyrics-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>de_DE</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>