diff --git a/Changelog.rtf b/Changelog.rtf
index 2f23b11..e93e620 100644
--- a/Changelog.rtf
+++ b/Changelog.rtf
@@ -4,33 +4,61 @@
\margl1440\margr1440\vieww9000\viewh8400\viewkind0
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc
-\f0\fs24 \cf0 ---------- iLyrics Changelog ----------\
+\f0\b\fs24 \cf0 ---------- iLyrics Changelog ----------\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
-\cf0 \
+
+\b0 \cf0 \
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc
-\cf0 Release No. 1.0 - 06/16/2012\
+
+\b \cf0 Release No. 1.0
+\b0 -
+\i 06/16/2012
+\i0 \
\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
\cf0 - iLyrics functionality added\
- Magistrix Lyrics Hoster added\
\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc
-\cf0 Release No. 1.0.1 - 06/16/2012\
+
+\b \cf0 Release No. 1.0.1
+\b0 -
+\i 06/16/2012
+\i0 \
\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
\cf0 - Added Split View on Main Window\
- Some little code changes\
\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc
-\cf0 Release No. 1.1 - 06/17/2012\
+
+\b \cf0 Release No. 1.1
+\b0 -
+\i 06/17/2012
+\i0 \
\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
\cf0 -Added Auto-Lyrics\
-Improved the preferences window\
\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc
-\cf0 06/17/2012\
+
+\i \cf0 06/17/2012
+\i0 \
\
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
\cf0 -Added "Show in Browser" functionality\
--Added "Get from Spotify" functionality}
\ No newline at end of file
+-Added "Get from Spotify" functionality\
+-Changed Main Split view to fix a graphical bug in the results split area\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\b \cf0 Release No. 1.1.1
+\b0 -
+\i 06/18/2012
+\i0 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
+\cf0 \
+-Changed the maximum width of the search field\
+-Fixed a bug: "Network error" when having special characters in query\
+-Fixed a bug: Returned false results when having a "&" in the query}
\ No newline at end of file
diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings
index b2e7023..1bb1a96 100644
--- a/de.lproj/Localizable.strings
+++ b/de.lproj/Localizable.strings
@@ -29,9 +29,9 @@
"Hoster.text.noNetwork" = "Keine Netzwerkverbindung.";
-"Hoster.messages.networkError.title" = "Sie sind zur Zeit nicht mit dem Internet verbunden.";
+"Hoster.messages.networkOrQueryError.title" = "Sie sind zur Zeit nicht mit dem Internet verbunden oder haben einen ungültigen Suchtext eingegeben.";
-"Hoster.messages.networkError.detail" = "Prüfen Sie, ob ihre WLAN oder Ethernet-Verbndung korrekt funktioniert. Weitere Informationenen erhalten Sie mit dem Netzwerkdiagnose Programm.";
+"Hoster.messages.networkOrQueryError.detail" = "1. Prüfen Sie, ob ihre WLAN oder Ethernet-Verbndung korrekt funktioniert. Weitere Informationenen erhalten Sie mit dem Netzwerkdiagnose Programm.\n2. Entfernen Sie alle Sonderzeichen (§$&€) aus dem Suchfeld und versuchen Sie es erneut.";
"Hoster.messages.noResults.title" = "Ihre Suche ergab keine Ergebnisse.";
diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings
index d7b0f81..e2fcd73 100644
--- a/en.lproj/Localizable.strings
+++ b/en.lproj/Localizable.strings
@@ -29,9 +29,9 @@
"Hoster.text.noNetwork" = "No Network connection";
-"Hoster.messages.networkError.title" = "You are not connected to the internet.";
+"Hoster.messages.networkOrQueryError.title" = "You are not connected to the internet or you entered an invalid query.";
-"Hoster.messages.networkError.detail" = "Check if you are connected through WLAN or Ethernet. Use the Network Diagnostics for more information.";
+"Hoster.messages.networkOrQueryError.detail" = "1. Check if you are connected through WLAN or Ethernet. Use the Network Diagnostics for more information.\n2. Try to remove any special characters (&%$§€) and try again.";
"Hoster.messages.noResults.title" = "Your search did not return any results.";
diff --git a/iLyrics/AppDelegate.m b/iLyrics/AppDelegate.m
index f0bd0e4..e1c1467 100644
--- 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:)) {
diff --git a/iLyrics/Magistrix.m b/iLyrics/Magistrix.m
index 0eace77..2181918 100644
--- 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:@"
"].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 " – " from the Song name
- songName = [[songName substringToIndex:[songName length]-[@" Lyric" length]] substringFromIndex:[@" – " length]];
+ songName = [self stringByRemovingHTMLTags:[[songName substringToIndex:[songName length]-[@" Lyric" length]] substringFromIndex:[@" – " 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, [@"" length])];
NSRange songNameTagStartRange = [tag rangeOfString:@"
" options:NSCaseInsensitiveSearch range:[self restRangeFromString:tag subtractingRange:songNameTagStartRange]]);
int songNameEnd = [tag rangeOfString:@"" 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 + [@"" length] + [@"\n
" length];
NSRange previewRestRange = NSMakeRange(previewStart, [tag length]-previewStart);
int previewEnd = [tag rangeOfString:@"
" options:NSCaseInsensitiveSearch range:previewRestRange].location;
@@ -156,7 +166,7 @@ typedef enum {
}
-(NSString*) stringByRemovingHTMLTags: (NSString *)string {
- return [[[[[[[[[[string stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@""" withString:@"\""];
+ return [[[[[[[[[[[string stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@"
" withString:@""] stringByReplacingOccurrencesOfString:@""" withString:@"\""] stringByReplacingOccurrencesOfString:@"&" withString:@"&"];
}
-(NSRange) restRangeFromString: (NSString *) page subtractingRange: (NSRange) aRange {
diff --git a/iLyrics/MainController.h b/iLyrics/MainController.h
index cbcdac9..a83f6e2 100644
--- a/iLyrics/MainController.h
+++ b/iLyrics/MainController.h
@@ -17,7 +17,7 @@
#import "Lyrics.h"
#import
-@interface MainController : NSObject
+@interface MainController : NSObject
@property (weak) IBOutlet NSMenuItem *iLyricsMenuItem;
@property (unsafe_unretained) IBOutlet NSWindow *window;
@property (weak) IBOutlet NSSearchField *searchField;
diff --git a/iLyrics/MainController.m b/iLyrics/MainController.m
index f8cecd3..2116539 100644
--- 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 {
diff --git a/iLyrics/de.lproj/Credits.rtf b/iLyrics/de.lproj/Credits.rtf
index 405b985..6b9f611 100644
--- 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}
\ No newline at end of file
diff --git a/iLyrics/de.lproj/MainMenu.xib b/iLyrics/de.lproj/MainMenu.xib
index 472a68d..3f60804 100644
--- a/iLyrics/de.lproj/MainMenu.xib
+++ b/iLyrics/de.lproj/MainMenu.xib
@@ -739,7 +739,7 @@
+ {650, 350}
2601
-
+
+
+ 2692
+
+
+
+
+
+
+
+ 2693
+
+
+
@@ -4874,6 +4890,8 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -4926,9 +4944,11 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -4955,293 +4975,9 @@
- 2602
-
-
-
-
- AppDelegate
- NSObject
-
- id
- id
- id
- id
- id
-
-
-
- nextTrack:
- id
-
-
- playPauseiTunes:
- id
-
-
- previousTrack:
- id
-
-
- quitiTunes:
- id
-
-
- runiTunes:
- id
-
-
-
- MainController
- PreferencesController
- NSWindow
- NSButton
- NSWindow
-
-
-
- mainController
- MainController
-
-
- preferencesController
- PreferencesController
-
-
- preferencesWindow
- NSWindow
-
-
- quitWhenAllWindowClosedCheckBox
- NSButton
-
-
- window
- NSWindow
-
-
-
- IBProjectSource
- ./Classes/AppDelegate.h
-
-
-
- MainController
- NSObject
-
- id
- id
- id
- id
- NSOutlineView
- id
- id
- id
- id
- id
-
-
-
- downloadLyrics:
- id
-
-
- getCurrentSpotifySong:
- id
-
-
- getCurrentiTunesSong:
- id
-
-
- loadNextResults:
- id
-
-
- lyricsSelectionChanged:
- NSOutlineView
-
-
- resetLoadedResults:
- id
-
-
- sendLyricsToiTunes:
- id
-
-
- showLyricsInBrowser:
- id
-
-
- showiLyricsWindow:
- id
-
-
- startNewSearch:
- id
-
-
-
- NSTextField
- NSButton
- NSMenuItem
- NSButton
- NSTextView
- NSPopover
- NSTextView
- NSOutlineView
- NSSearchField
- NSButton
- NSButton
- NSTextField
- NSWindow
-
-
-
- artistLabel
- NSTextField
-
-
- downloadLyricsButton
- NSButton
-
-
- iLyricsMenuItem
- NSMenuItem
-
-
- loadMoreResultsButton
- NSButton
-
-
- lyricsArea
- NSTextView
-
-
- previewPopover
- NSPopover
-
-
- previewTextArea
- NSTextView
-
-
- resultsOutline
- NSOutlineView
-
-
- searchField
- NSSearchField
-
-
- sendToiTunesButton
- NSButton
-
-
- showPreviewCheckBox
- NSButton
-
-
- songLabel
- NSTextField
-
-
- window
- NSWindow
-
-
-
- IBProjectSource
- ./Classes/MainController.h
-
-
-
- PreferencesController
- NSObject
-
- id
- id
- id
- id
- id
-
-
-
- changeAutoLyricsInterval:
- id
-
-
- showAutoLyricsPreferences:
- id
-
-
- showGeneralPreferences:
- id
-
-
- toggleAutoLyrics:
- id
-
-
- toggleReplaceOldLyrics:
- id
-
-
-
- NSView
- NSToolbarItem
- NSView
- NSTableView
- PreferencesWindow
- NSButton
- NSButton
-
-
-
- autoLyricsView
- NSView
-
-
- generalButton
- NSToolbarItem
-
-
- generalView
- NSView
-
-
- hosterTable
- NSTableView
-
-
- preferencesWindow
- PreferencesWindow
-
-
- replaceOldCheckBox
- NSButton
-
-
- toggleAutoLyricsButton
- NSButton
-
-
-
- IBProjectSource
- ./Classes/PreferencesController.h
-
-
-
- PreferencesWindow
- NSWindow
-
- IBProjectSource
- ./Classes/PreferencesWindow.h
-
-
-
+ 2693
+
0
IBCocoaFramework
diff --git a/iLyrics/en.lproj/Credits.rtf b/iLyrics/en.lproj/Credits.rtf
index 21fb96a..dd5b128 100644
--- 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}
\ No newline at end of file
diff --git a/iLyrics/en.lproj/MainMenu.xib b/iLyrics/en.lproj/MainMenu.xib
index eb6bcec..71d4f2b 100644
--- a/iLyrics/en.lproj/MainMenu.xib
+++ b/iLyrics/en.lproj/MainMenu.xib
@@ -894,7 +894,7 @@
15
2
- {{471, 390}, {861, 462}}
+ {{471, 390}, {841, 462}}
1954021376
iLyrics
NSWindow
@@ -918,10 +918,9 @@
Search
-
+
268
{{0, 14}, {96, 22}}
-
_NS:9
YES
@@ -996,7 +995,7 @@
{96, 22}
- {96, 22}
+ {300, 22}
YES
YES
0
@@ -1066,7 +1065,7 @@
YES
0
-
+
F19D1A15-FED6-48F9-B670-7D7F2D798C5A
@@ -1143,16 +1142,16 @@
-
+
-
+
-
+
@@ -1162,6 +1161,7 @@
+ {650, 350}
256
@@ -1179,6 +1179,7 @@
293
{{118, 1}, {63, 18}}
+
_NS:9
YES
@@ -1211,8 +1212,9 @@
289
- {{181, -1}, {120, 23}}
+ {{182, -1}, {120, 23}}
+
_NS:22
YES
@@ -1236,6 +1238,7 @@
292
{{0, -1}, {114, 23}}
+
_NS:22
YES
@@ -1265,16 +1268,18 @@
4352
- {299, 415}
+ {300, 415}
+
_NS:13
YES
- {{0, 29}, {301, 433}}
+ {{0, 29}, {302, 433}}
+
_NS:9
133682
@@ -1446,8 +1456,9 @@
QSAAAEEgAABBmAAAQZgAAA
- {301, 462}
+ {302, 462}
+
_NS:11
NSView
@@ -1467,8 +1478,9 @@
2322
- {520, 14}
+ {527, 14}
+
_NS:13
@@ -1486,7 +1498,7 @@
- 520
+ 527
1
@@ -1530,8 +1542,9 @@
- {{1, 1}, {520, 367}}
+ {{1, 1}, {527, 367}}
+
_NS:11
@@ -1560,8 +1573,10 @@
256
- {{506, 1}, {15, 361}}
+ {{513, 1}, {15, 361}}
+
+
_NS:84
_doScroller:
@@ -1571,8 +1586,9 @@
256
- {{1, 353}, {514, 15}}
+ {{1, 353}, {521, 15}}
+
_NS:33
1
@@ -1582,8 +1598,9 @@
0.94565218687057495
- {522, 369}
+ {529, 369}
+
_NS:9
133170
@@ -1598,8 +1615,9 @@
265
- {{374, 9}, {134, 32}}
+ {{381, 10}, {134, 32}}
+
_NS:9
YES
@@ -1621,8 +1639,9 @@
265
- {{374, 37}, {134, 32}}
+ {{381, 37}, {134, 32}}
+
_NS:9
YES
@@ -1644,8 +1663,9 @@
266
- {{62, 20}, {313, 17}}
+ {{62, 20}, {320, 17}}
+
_NS:9
{250, 750}
@@ -1654,11 +1674,7 @@
69336641
272631808
No Selection
-
- LucidaGrande
- 13
- 16
-
+
_NS:9
@@ -1670,6 +1686,7 @@
268
{{17, 22}, {43, 17}}
+
_NS:1505
YES
@@ -1687,8 +1704,9 @@
266
- {{62, 47}, {313, 17}}
+ {{62, 47}, {320, 17}}
+
_NS:9
{250, 750}
@@ -1709,6 +1727,7 @@
268
{{17, 47}, {40, 17}}
+
_NS:1505
YES
@@ -1724,15 +1743,17 @@
- {{0, 377}, {522, 85}}
+ {{0, 377}, {529, 85}}
+
_NS:9
NSView
- {{311, 0}, {550, 462}}
+ {{312, 0}, {549, 462}}
+
_NS:13
NSView
@@ -1740,22 +1761,28 @@
{861, 462}
+
_NS:9
YES
3
- {861, 462}
+ {841, 462}
+
{{0, 0}, {1680, 1028}}
+ {650, 428}
{10000000000000, 10000000000000}
3
128
YES
+
+ MainController
+
-
- MainController
-
@@ -2089,6 +2113,7 @@
268
{{17, 192}, {93, 17}}
+
_NS:1505
YES
@@ -2116,6 +2141,7 @@
256
{424, 146}
+
_NS:13
YES
@@ -2124,6 +2150,7 @@
256
{424, 17}
+
@@ -2173,7 +2200,7 @@
2601
-
+
+
+ 1912
+
+
+
+
+
+
+
+
+ 1102
+
+
+
+
+
+
+
+
+
+ 1103
+
+
+
+
+ 1104
+
+
+
+
+ 1105
+
+
+
+
+ 908
+
+
+
+
+
+
+
+
+
+
+
+
+ 1432
+
+
+
+
+
+
+
+ 1433
+
+
+
+
+ 832
+
+
+
+
+
+
+
+ 833
+
+
+
+
+ 620
+
+
+
+
+
+
+
+ 621
+
+
+
+
+ 615
+
+
+
+
+
+
+
+ 616
+
+
+
+
+ 653
+
+
+
+
+
+
+
+ 654
+
+
+
+
+ 659
+
+
+
+
+
+
+
+ 660
+
+
+
+
+ 2607
+
+
+
+
+
+
+
+ 2608
+
+
+
@@ -4847,6 +4925,8 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -4928,9 +5008,293 @@
- 2602
+ 2608
+
+
+
+
+ AppDelegate
+ NSObject
+
+ id
+ id
+ id
+ id
+ id
+
+
+
+ nextTrack:
+ id
+
+
+ playPauseiTunes:
+ id
+
+
+ previousTrack:
+ id
+
+
+ quitiTunes:
+ id
+
+
+ runiTunes:
+ id
+
+
+
+ MainController
+ PreferencesController
+ NSWindow
+ NSButton
+ NSWindow
+
+
+
+ mainController
+ MainController
+
+
+ preferencesController
+ PreferencesController
+
+
+ preferencesWindow
+ NSWindow
+
+
+ quitWhenAllWindowClosedCheckBox
+ NSButton
+
+
+ window
+ NSWindow
+
+
+
+ IBProjectSource
+ ./Classes/AppDelegate.h
+
+
+
+ MainController
+ NSObject
+
+ id
+ id
+ id
+ id
+ NSOutlineView
+ id
+ id
+ id
+ id
+ id
+
+
+
+ downloadLyrics:
+ id
+
+
+ getCurrentSpotifySong:
+ id
+
+
+ getCurrentiTunesSong:
+ id
+
+
+ loadNextResults:
+ id
+
+
+ lyricsSelectionChanged:
+ NSOutlineView
+
+
+ resetLoadedResults:
+ id
+
+
+ sendLyricsToiTunes:
+ id
+
+
+ showLyricsInBrowser:
+ id
+
+
+ showiLyricsWindow:
+ id
+
+
+ startNewSearch:
+ id
+
+
+
+ NSTextField
+ NSButton
+ NSMenuItem
+ NSButton
+ NSTextView
+ NSPopover
+ NSTextView
+ NSOutlineView
+ NSSearchField
+ NSButton
+ NSButton
+ NSTextField
+ NSWindow
+
+
+
+ artistLabel
+ NSTextField
+
+
+ downloadLyricsButton
+ NSButton
+
+
+ iLyricsMenuItem
+ NSMenuItem
+
+
+ loadMoreResultsButton
+ NSButton
+
+
+ lyricsArea
+ NSTextView
+
+
+ previewPopover
+ NSPopover
+
+
+ previewTextArea
+ NSTextView
+
+
+ resultsOutline
+ NSOutlineView
+
+
+ searchField
+ NSSearchField
+
+
+ sendToiTunesButton
+ NSButton
+
+
+ showPreviewCheckBox
+ NSButton
+
+
+ songLabel
+ NSTextField
+
+
+ window
+ NSWindow
+
+
+
+ IBProjectSource
+ ./Classes/MainController.h
+
+
+
+ PreferencesController
+ NSObject
+
+ id
+ id
+ id
+ id
+ id
+
+
+
+ changeAutoLyricsInterval:
+ id
+
+
+ showAutoLyricsPreferences:
+ id
+
+
+ showGeneralPreferences:
+ id
+
+
+ toggleAutoLyrics:
+ id
+
+
+ toggleReplaceOldLyrics:
+ id
+
+
+
+ NSView
+ NSToolbarItem
+ NSView
+ NSTableView
+ PreferencesWindow
+ NSButton
+ NSButton
+
+
+
+ autoLyricsView
+ NSView
+
+
+ generalButton
+ NSToolbarItem
+
+
+ generalView
+ NSView
+
+
+ hosterTable
+ NSTableView
+
+
+ preferencesWindow
+ PreferencesWindow
+
+
+ replaceOldCheckBox
+ NSButton
+
+
+ toggleAutoLyricsButton
+ NSButton
+
+
+
+ IBProjectSource
+ ./Classes/PreferencesController.h
+
+
+
+ PreferencesWindow
+ NSWindow
+
+ IBProjectSource
+ ./Classes/PreferencesWindow.h
+
+
+
-
0
IBCocoaFramework
diff --git a/iLyrics/iLyrics-Info.plist b/iLyrics/iLyrics-Info.plist
index f8d2600..3d67d08 100644
--- a/iLyrics/iLyrics-Info.plist
+++ b/iLyrics/iLyrics-Info.plist
@@ -3,7 +3,7 @@
CFBundleDevelopmentRegion
- en
+ de_DE
CFBundleExecutable
${EXECUTABLE_NAME}
CFBundleIconFile
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.1.0
+ 1.1.1
CFBundleSignature
????
CFBundleVersion
diff --git a/iTunes-icon.icns b/iTunes-icon.icns
deleted file mode 100644
index 7e92888..0000000
Binary files a/iTunes-icon.icns and /dev/null differ