From c902c96a197cb6b9c6c54201b4f39c8b69e00710 Mon Sep 17 00:00:00 2001 From: vspader Date: Fri, 27 Feb 2009 22:40:50 -0800 Subject: [PATCH] Fixed shuffle images. --- Cog.xcodeproj/project.pbxproj | 18 ++++++---- English.lproj/MainMenu.xib | 40 ++++++++++++++++------ Images/shuffle_off.png | Bin 655 -> 209 bytes Images/shuffle_on.png | Bin 209 -> 188 bytes Playlist/PlaylistController.h | 2 +- Playlist/PlaylistController.m | 14 ++++---- {Playlist => Window}/RepeatTransformers.h | 0 {Playlist => Window}/RepeatTransformers.m | 0 Window/ShuffleTransformers.h | 14 ++++++++ Window/ShuffleTransformers.m | 29 ++++++++++++++++ 10 files changed, 94 insertions(+), 23 deletions(-) rename {Playlist => Window}/RepeatTransformers.h (100%) rename {Playlist => Window}/RepeatTransformers.m (100%) create mode 100644 Window/ShuffleTransformers.h create mode 100644 Window/ShuffleTransformers.m diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 6c9603bdb..ef846b089 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -18,6 +18,8 @@ 171B57E00C091F2B00F6AFAF /* ogg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DC0C091F2B00F6AFAF /* ogg.icns */; }; 17211A7E0D68B7C500911CA9 /* FileTree.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17211A7C0D68B7C500911CA9 /* FileTree.xib */; }; 17249F0F0D82E17700F33392 /* ToggleQueueTitleTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 17249F0E0D82E17700F33392 /* ToggleQueueTitleTransformer.m */; }; + 172A12330F5911D20078EF0C /* RepeatTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 172A12320F5911D20078EF0C /* RepeatTransformers.m */; }; + 172A123C0F5912AE0078EF0C /* ShuffleTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 172A123B0F5912AE0078EF0C /* ShuffleTransformers.m */; }; 173428F50D5FB1C400E8D854 /* EntriesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 173428F40D5FB1C400E8D854 /* EntriesController.m */; }; 17342A9A0D5FD20B00E8D854 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17342A980D5FD20B00E8D854 /* MainMenu.xib */; }; 17342ABF0D5FD36400E8D854 /* OpenURLPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17342ABD0D5FD36400E8D854 /* OpenURLPanel.xib */; }; @@ -79,7 +81,6 @@ 179D03270E0CB2500064A77A /* PathWatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 179D031B0E0CB2500064A77A /* PathWatcher.m */; }; 179D03280E0CB2500064A77A /* SmartFolderNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 179D031D0E0CB2500064A77A /* SmartFolderNode.m */; }; 17A140E90D88B954004852F9 /* FilePlaylistEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A140E80D88B954004852F9 /* FilePlaylistEntry.m */; }; - 17A8F6370D6A7B0F0095DA13 /* RepeatTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A8F6360D6A7B0F0095DA13 /* RepeatTransformers.m */; }; 17A8F6850D6A7FCA0095DA13 /* repeat_all.png in Resources */ = {isa = PBXBuildFile; fileRef = 17A8F6820D6A7FCA0095DA13 /* repeat_all.png */; }; 17A8F6860D6A7FCA0095DA13 /* repeat_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 17A8F6830D6A7FCA0095DA13 /* repeat_none.png */; }; 17A8F6870D6A7FCA0095DA13 /* repeat_one.png in Resources */ = {isa = PBXBuildFile; fileRef = 17A8F6840D6A7FCA0095DA13 /* repeat_one.png */; }; @@ -518,6 +519,10 @@ 17211A7D0D68B7C500911CA9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/FileTree.xib; sourceTree = ""; }; 17249F0D0D82E17700F33392 /* ToggleQueueTitleTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToggleQueueTitleTransformer.h; sourceTree = ""; }; 17249F0E0D82E17700F33392 /* ToggleQueueTitleTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ToggleQueueTitleTransformer.m; sourceTree = ""; }; + 172A12310F5911D20078EF0C /* RepeatTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RepeatTransformers.h; path = Window/RepeatTransformers.h; sourceTree = ""; }; + 172A12320F5911D20078EF0C /* RepeatTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RepeatTransformers.m; path = Window/RepeatTransformers.m; sourceTree = ""; }; + 172A123A0F5912AE0078EF0C /* ShuffleTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShuffleTransformers.h; path = Window/ShuffleTransformers.h; sourceTree = ""; }; + 172A123B0F5912AE0078EF0C /* ShuffleTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ShuffleTransformers.m; path = Window/ShuffleTransformers.m; sourceTree = ""; }; 173428F30D5FB1C400E8D854 /* EntriesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EntriesController.h; sourceTree = ""; }; 173428F40D5FB1C400E8D854 /* EntriesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EntriesController.m; sourceTree = ""; }; 17342A990D5FD20B00E8D854 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; @@ -613,8 +618,6 @@ 179D031D0E0CB2500064A77A /* SmartFolderNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SmartFolderNode.m; path = FileTree/SmartFolderNode.m; sourceTree = ""; }; 17A140E70D88B954004852F9 /* FilePlaylistEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilePlaylistEntry.h; sourceTree = ""; }; 17A140E80D88B954004852F9 /* FilePlaylistEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilePlaylistEntry.m; sourceTree = ""; }; - 17A8F6350D6A7B0F0095DA13 /* RepeatTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RepeatTransformers.h; sourceTree = ""; }; - 17A8F6360D6A7B0F0095DA13 /* RepeatTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RepeatTransformers.m; sourceTree = ""; }; 17A8F6820D6A7FCA0095DA13 /* repeat_all.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_all.png; path = Images/repeat_all.png; sourceTree = ""; }; 17A8F6830D6A7FCA0095DA13 /* repeat_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_none.png; path = Images/repeat_none.png; sourceTree = ""; }; 17A8F6840D6A7FCA0095DA13 /* repeat_one.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_one.png; path = Images/repeat_one.png; sourceTree = ""; }; @@ -1128,6 +1131,10 @@ 17E0D5D20F520E75005B6FED /* Window */ = { isa = PBXGroup; children = ( + 172A123A0F5912AE0078EF0C /* ShuffleTransformers.h */, + 172A123B0F5912AE0078EF0C /* ShuffleTransformers.m */, + 172A12310F5911D20078EF0C /* RepeatTransformers.h */, + 172A12320F5911D20078EF0C /* RepeatTransformers.m */, 17E0D6180F520F9F005B6FED /* VolumeButton.h */, 17E0D6190F520F9F005B6FED /* VolumeButton.m */, 17E0D61A0F520F9F005B6FED /* VolumeSlider.h */, @@ -1334,8 +1341,6 @@ 8E9A2ED80BA78D9D0091081B /* IndexFormatter.m */, 173428F30D5FB1C400E8D854 /* EntriesController.h */, 173428F40D5FB1C400E8D854 /* EntriesController.m */, - 17A8F6350D6A7B0F0095DA13 /* RepeatTransformers.h */, - 17A8F6360D6A7B0F0095DA13 /* RepeatTransformers.m */, 170B55920D6E5E7B006B9E92 /* StatusImageTransformer.h */, 170B55930D6E5E7B006B9E92 /* StatusImageTransformer.m */, 17B7DD7B0D7CD10D00320E70 /* BlankZeroFormatter.h */, @@ -1811,7 +1816,6 @@ 56DB084C0D6717DC00453B6A /* NSNumber+CogSort.m in Sources */, 56DB08550D67185300453B6A /* NSArray+CogSort.m in Sources */, 56DB08580D67186500453B6A /* NSString+CogSort.m in Sources */, - 17A8F6370D6A7B0F0095DA13 /* RepeatTransformers.m in Sources */, 170B55940D6E5E7B006B9E92 /* StatusImageTransformer.m in Sources */, 17B7DD7D0D7CD10D00320E70 /* BlankZeroFormatter.m in Sources */, 17249F0F0D82E17700F33392 /* ToggleQueueTitleTransformer.m in Sources */, @@ -1842,6 +1846,8 @@ 17E0D6170F520F87005B6FED /* StringToURLTransformer.m in Sources */, 17E0D61C0F520F9F005B6FED /* VolumeButton.m in Sources */, 17E0D61D0F520F9F005B6FED /* VolumeSlider.m in Sources */, + 172A12330F5911D20078EF0C /* RepeatTransformers.m in Sources */, + 172A123C0F5912AE0078EF0C /* ShuffleTransformers.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 65a8f98a2..969405177 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -5395,14 +5395,6 @@ OQA 1769 - - - takeShuffleFromObject: - - - - 1781 - value: arrangedObjects.filename @@ -6800,6 +6792,34 @@ OQA 2389 + + + image: shuffle + + + + + + image: shuffle + image + shuffle + + NSValueTransformerName + ShuffleImageTransformer + + 2 + + + 2392 + + + + toggleShuffle: + + + + 2393 + @@ -10375,7 +10395,7 @@ OQA - 2389 + 2393 @@ -10782,9 +10802,9 @@ OQA searchByArtist: showEntryInFinder: stopAfterCurrent: - takeShuffleFromObject: toggleQueued: toggleRepeat: + toggleShuffle: YES diff --git a/Images/shuffle_off.png b/Images/shuffle_off.png index fd3a36ccd1d302d0230a79a592ae1d854756ca9f..2d95d489250fbc4cfd76ab2a4030a46a7835aa8f 100644 GIT binary patch delta 180 zcmeBYy~wE88Q|y6%O%Cdz`(%k>ERLtqy<2jgAGW^fBv61(NMjfq1e;KF{I*F(x3nT z?U@Z5CQb}w^r&3SnV*`dAlJdPk$u(;O*J+y#-nT-9(-8OKVg!)&@a{_;vHrT96b#; zL^}VAPG@XZ;A!}G)=k*jJxgKH@wei;suHg-B&=dh5;fWQ-Qf(|kvkqq{~La&3V1JC eS<5Goz#y(I5I$8h*^7Yz=r~VTKbLh*2~7Y(?mdhE delta 629 zcmV-*0*d|70gnYSiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9R{#J21ZP1_ zK>z^O*wjy0GLa!Ce*z&%L_t(|+Qd{lZ{k1@9?bh85a4Sl5CxS5qJV-DQS%?7Tmco~ zZ-nCRB)a6Ph>D6Pf|d#aq5>%bY9tDTkj?w$y_rpLNPJRKM9Nyb^L?|kHZaEE zE1Kaw&~P|Rpvj;=g*{5^s;c(UHqbuCVzKUrK%>zphw~f1f8Q@T91gHrt=zxeZeg)l zz+^IcLa3Ee5fF7`k{b*LGHznj$l_)u%QD++Hr%&btyrtolAFzD?!52ZIU{6} zK>H91g(PAzpU-)aVzCH*QG}n@*L;plVZB~Mr_&*3SLt+GlPS=E&Wz9J(?It7J?}gc zK8M2rPNx$ne~JPmIT#E|2$;E4CcMZ?xm+$l32=K`gmSrjDPBtf1_YD`Uayz(meK)X zw5Y{mf!%HgZ?!)IT;`I1C@8Xw>VVE4zP`U4DL$(DJo)|W58U7X<=>HPlBxruIw4ua ziZNA_qp}l!7X$%E6$}Odr_%|u*^C(V|0k_MiL~48e|R#YwkYC>oh6Cl4{mKX8;r+e z0&3_A5^E!YU=NWt&*Pn3dDx1x|J^o}e*+prkcDt<* zZMWMEMx&7@-)uI6$z;+%YPFhz{?a9g?ut~a)f`g335UZ{AQ0ey$Kw&E(-G2* zDHIBKJ0D)!N~My(tC2xKs*@-cBep&QG?3+EKA-P?>h^!xZ{*v7{s}Mu@t&62aTNM^ P00000NkvXXu0mjf?ExIK diff --git a/Images/shuffle_on.png b/Images/shuffle_on.png index 2d95d489250fbc4cfd76ab2a4030a46a7835aa8f..2e68ddb641b7f2a544c5435d6761ff0ac843b880 100644 GIT binary patch delta 160 zcmV;R0AK&n0lWc_B!7cRL_t(|UhR@G3V<*SMH}hn?BJwl5WIt+H}QO4!a+QOn>e}X z;$Zza)wC3)4h{w$f!FY%A*7TNyoe}8E17OEJMdX4>=l86xfU1!f$%H;07*m@dZM`v z^tS^*26D}lNB6#$wCkS O0000 + + +@interface ShuffleImageTransformer : NSValueTransformer {} +@end + diff --git a/Window/ShuffleTransformers.m b/Window/ShuffleTransformers.m new file mode 100644 index 000000000..1c7de68b7 --- /dev/null +++ b/Window/ShuffleTransformers.m @@ -0,0 +1,29 @@ +// +// ShuffleTransformers.m +// Cog +// +// Created by Vincent Spader on 2/27/09. +// Copyright 2009 __MyCompanyName__. All rights reserved. +// + +#import "ShuffleTransformers.h" + + +@implementation ShuffleImageTransformer + ++ (Class)transformedValueClass { return [NSImage class]; } ++ (BOOL)allowsReverseTransformation { return NO; } + +// Convert from string to RepeatMode +- (id)transformedValue:(id)value { + if (value == nil) return nil; + + BOOL shuffleEnabled = [value boolValue]; + + if (shuffleEnabled == YES) { + return [NSImage imageNamed:@"shuffle_on"]; + } + return [NSImage imageNamed:@"shuffle_off"]; +} + +@end