Archived
1

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

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

View File

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