From 012ef22b40d4335337a24dbd5f8ccb3219cccf0b Mon Sep 17 00:00:00 2001 From: Chris Moeller Date: Fri, 11 Oct 2013 12:02:05 -0700 Subject: [PATCH] Major UI overhaul; Now supports mini mode --- Application/AppController.h | 7 + Application/AppController.m | 31 + Cog.xcodeproj/project.pbxproj | 20 +- English.lproj/Feedback.xib | 423 +++-- English.lproj/FileTree.xib | 1908 +++++++++++++++++-- English.lproj/InfoInspector.xib | 658 ++++--- English.lproj/Localizable.strings | 3 + English.lproj/MainMenu.xib | 676 ++++--- English.lproj/OpenURLPanel.xib | 544 +----- English.lproj/SpotlightPanel.xib | 2434 +++++++++++++++++++++---- Images/miniModeOffTemplate.pdf | 326 ++++ Images/miniModeOnTemplate.pdf | 319 ++++ Window/MainWindow.h | 3 +- Window/MainWindow.m | 4 - Window/MiniModeMenuTitleTransformer.h | 11 + Window/MiniModeMenuTitleTransformer.m | 24 + Window/MiniWindow.h | 3 +- Window/MiniWindow.m | 16 +- 18 files changed, 5681 insertions(+), 1729 deletions(-) create mode 100644 Images/miniModeOffTemplate.pdf create mode 100644 Images/miniModeOnTemplate.pdf create mode 100644 Window/MiniModeMenuTitleTransformer.h create mode 100644 Window/MiniModeMenuTitleTransformer.m diff --git a/Application/AppController.h b/Application/AppController.h index bf5463038..50610e0dd 100644 --- a/Application/AppController.h +++ b/Application/AppController.h @@ -22,6 +22,7 @@ IBOutlet PlaylistLoader *playlistLoader; IBOutlet NSWindow *mainWindow; + IBOutlet NSWindow *miniWindow; IBOutlet NSSplitView *mainView; IBOutlet NSSegmentedControl *playbackButtons; @@ -63,6 +64,8 @@ NSOperationQueue *queue; // Since we are the app delegate, we take care of the op queue NSMutableSet* expandedNodes; + + BOOL miniMode; } - (IBAction)openURL:(id)sender; @@ -103,4 +106,8 @@ OSStatus handleHotKey(EventHandlerCallRef nextHandler,EventRef theEvent,void *us - (void)windowDidEnterFullScreen:(NSNotification *)notification; - (void)windowDidExitFullScreen:(NSNotification *)notification; +- (IBAction)toggleMiniMode:(id)sender; + +@property BOOL miniMode; + @end diff --git a/Application/AppController.m b/Application/AppController.m index f7c948a86..d26f54d4e 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -15,6 +15,8 @@ #import #import "Logging.h" +#import "MiniModeMenuTitleTransformer.h" +#import "DualWindow.h" @implementation AppController @@ -29,6 +31,10 @@ [[[FontSizetoLineHeightTransformer alloc] init]autorelease]; [NSValueTransformer setValueTransformer:fontSizetoLineHeightTransformer forName:@"FontSizetoLineHeightTransformer"]; + + NSValueTransformer *miniModeMenuTitleTransformer = [[[MiniModeMenuTitleTransformer alloc] init] autorelease]; + [NSValueTransformer setValueTransformer:miniModeMenuTitleTransformer + forName:@"MiniModeMenuTitleTransformer"]; } @@ -278,6 +284,10 @@ increase/decrease as long as the user holds the left/right, plus/minus button */ [playbackController seek:[NSNumber numberWithDouble:[[NSUserDefaults standardUserDefaults] floatForKey:@"lastTrackPosition"]]]; } + + // Restore mini mode + [self setMiniMode:[[NSUserDefaults standardUserDefaults] boolForKey:@"miniMode"]]; + // We need file tree view to restore its state here // so attempt to access file tree view controller's root view // to force it to read nib and create file tree view for us @@ -650,4 +660,25 @@ increase/decrease as long as the user holds the left/right, plus/minus button */ } +- (IBAction)toggleMiniMode:(id)sender +{ + [self setMiniMode:(!miniMode)]; +} + +- (BOOL)miniMode +{ + return miniMode; +} + +- (void)setMiniMode:(BOOL)newMiniMode +{ + miniMode = newMiniMode; + [[NSUserDefaults standardUserDefaults] setBool:miniMode forKey:@"miniMode"]; + + NSWindow *windowToShow = miniMode ? miniWindow : mainWindow; + NSWindow *windowToHide = miniMode ? mainWindow : miniWindow; + [windowToHide close]; + [windowToShow makeKeyAndOrderFront:self]; +} + @end diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 8e3fbc63b..56967aa53 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -115,7 +115,6 @@ 17D1B2810CF8B2830028F5B5 /* song.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B27A0CF8B2830028F5B5 /* song.icns */; }; 17D1B2820CF8B2830028F5B5 /* vg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B27B0CF8B2830028F5B5 /* vg.icns */; }; 17D1B2830CF8B2830028F5B5 /* xm.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B27C0CF8B2830028F5B5 /* xm.icns */; }; - 17E0D5E90F520F02005B6FED /* DualWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D5E00F520F02005B6FED /* DualWindow.m */; }; 17E0D5EA0F520F02005B6FED /* MainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D5E20F520F02005B6FED /* MainWindow.m */; }; 17E0D5EB0F520F02005B6FED /* MiniWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D5E40F520F02005B6FED /* MiniWindow.m */; }; 17E0D5EC0F520F02005B6FED /* PositionSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D5E60F520F02005B6FED /* PositionSlider.m */; }; @@ -142,6 +141,7 @@ 8355D6B8180613FB00D05687 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8355D6B7180613FB00D05687 /* Security.framework */; }; 8359009D17FF06570060F3ED /* ArchiveSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8359FF3117FEF35D0060F3ED /* ArchiveSource.bundle */; }; 8360EF6D17F92E56005208A4 /* HighlyComplete.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8360EF0517F92B24005208A4 /* HighlyComplete.bundle */; }; + 836D28A818086386005B7299 /* MiniModeMenuTitleTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 836D28A718086386005B7299 /* MiniModeMenuTitleTransformer.m */; }; 8375B36517FFEF130092A79F /* Opus.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8375B05717FFEA410092A79F /* Opus.bundle */; }; 838491211807F38A00E7332D /* NowPlayingBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8384911D1807F38A00E7332D /* NowPlayingBarView.m */; }; 838491221807F38A00E7332D /* NowPlayingBarController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8384911E1807F38A00E7332D /* NowPlayingBarController.xib */; }; @@ -179,6 +179,8 @@ 838491881808593200E7332D /* NDHotKey.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8384917E1808585D00E7332D /* NDHotKey.framework */; }; 8399D4E21805A55000B503B1 /* XmlContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8399D4E01805A55000B503B1 /* XmlContainer.m */; }; 83BCB8DE17FC971300760340 /* FFMPEG.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = B09E94350D747F7B0064F138 /* FFMPEG.bundle */; }; + 83E5E54C18087CA5001F3284 /* miniModeOffTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 83E5E54A18087CA5001F3284 /* miniModeOffTemplate.pdf */; }; + 83E5E54D18087CA5001F3284 /* miniModeOnTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 83E5E54B18087CA5001F3284 /* miniModeOnTemplate.pdf */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -722,8 +724,6 @@ 17D1B27A0CF8B2830028F5B5 /* song.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = song.icns; sourceTree = ""; }; 17D1B27B0CF8B2830028F5B5 /* vg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = vg.icns; sourceTree = ""; }; 17D1B27C0CF8B2830028F5B5 /* xm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = xm.icns; sourceTree = ""; }; - 17E0D5DF0F520F02005B6FED /* DualWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DualWindow.h; path = Window/DualWindow.h; sourceTree = ""; }; - 17E0D5E00F520F02005B6FED /* DualWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DualWindow.m; path = Window/DualWindow.m; sourceTree = ""; }; 17E0D5E10F520F02005B6FED /* MainWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainWindow.h; path = Window/MainWindow.h; sourceTree = ""; }; 17E0D5E20F520F02005B6FED /* MainWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainWindow.m; path = Window/MainWindow.m; sourceTree = ""; }; 17E0D5E30F520F02005B6FED /* MiniWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MiniWindow.h; path = Window/MiniWindow.h; sourceTree = ""; }; @@ -772,6 +772,8 @@ 8355D6B7180613FB00D05687 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ArchiveSource.xcodeproj; path = Plugins/ArchiveSource/ArchiveSource.xcodeproj; sourceTree = ""; }; 8360EF0017F92B23005208A4 /* HighlyComplete.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HighlyComplete.xcodeproj; path = Plugins/HighlyComplete/HighlyComplete.xcodeproj; sourceTree = ""; }; + 836D28A618086386005B7299 /* MiniModeMenuTitleTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MiniModeMenuTitleTransformer.h; path = Window/MiniModeMenuTitleTransformer.h; sourceTree = ""; }; + 836D28A718086386005B7299 /* MiniModeMenuTitleTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MiniModeMenuTitleTransformer.m; path = Window/MiniModeMenuTitleTransformer.m; sourceTree = ""; }; 8375B05117FFEA400092A79F /* Opus.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Opus.xcodeproj; path = Plugins/Opus/Opus.xcodeproj; sourceTree = ""; }; 8384911D1807F38A00E7332D /* NowPlayingBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NowPlayingBarView.m; path = Window/NowPlayingBarView.m; sourceTree = ""; }; 8384911E1807F38A00E7332D /* NowPlayingBarController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = NowPlayingBarController.xib; path = Window/NowPlayingBarController.xib; sourceTree = ""; }; @@ -811,6 +813,8 @@ 838491791808585C00E7332D /* NDHotKey.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = NDHotKey.xcodeproj; path = Frameworks/NDHotKey/NDHotKey.xcodeproj; sourceTree = ""; }; 8399D4E01805A55000B503B1 /* XmlContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XmlContainer.m; sourceTree = ""; }; 8399D4E11805A55000B503B1 /* XmlContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlContainer.h; sourceTree = ""; }; + 83E5E54A18087CA5001F3284 /* miniModeOffTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = miniModeOffTemplate.pdf; path = Images/miniModeOffTemplate.pdf; sourceTree = ""; }; + 83E5E54B18087CA5001F3284 /* miniModeOnTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = miniModeOnTemplate.pdf; path = Images/miniModeOnTemplate.pdf; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8E07AB760AAC930B00A4B32F /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PreferencesController.h; path = Preferences/PreferencesController.h; sourceTree = ""; }; 8E07AB770AAC930B00A4B32F /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PreferencesController.m; path = Preferences/PreferencesController.m; sourceTree = ""; }; @@ -1016,6 +1020,8 @@ 177EC02D0B8BC2E60000BC8C /* Images */ = { isa = PBXGroup; children = ( + 83E5E54A18087CA5001F3284 /* miniModeOffTemplate.pdf */, + 83E5E54B18087CA5001F3284 /* miniModeOnTemplate.pdf */, 8384916F180843B200E7332D /* pauseDockBadgeColorful.png */, 83849170180843B200E7332D /* playDockBadgeColorful.png */, 83849171180843B200E7332D /* stopDockBadgeColorful.png */, @@ -1259,6 +1265,8 @@ 17E0D5D20F520E75005B6FED /* Window */ = { isa = PBXGroup; children = ( + 836D28A618086386005B7299 /* MiniModeMenuTitleTransformer.h */, + 836D28A718086386005B7299 /* MiniModeMenuTitleTransformer.m */, 8384911D1807F38A00E7332D /* NowPlayingBarView.m */, 838491241807F75D00E7332D /* NowPlayingBarView.h */, 8384911F1807F38A00E7332D /* NowPlayingBarController.m */, @@ -1273,8 +1281,6 @@ 17E0D6190F520F9F005B6FED /* VolumeButton.m */, 17E0D61A0F520F9F005B6FED /* VolumeSlider.h */, 17E0D61B0F520F9F005B6FED /* VolumeSlider.m */, - 17E0D5DF0F520F02005B6FED /* DualWindow.h */, - 17E0D5E00F520F02005B6FED /* DualWindow.m */, 17E0D5E10F520F02005B6FED /* MainWindow.h */, 17E0D5E20F520F02005B6FED /* MainWindow.m */, 17E0D5E30F520F02005B6FED /* MiniWindow.h */, @@ -1914,6 +1920,7 @@ 177EC04F0B8BC2FF0000BC8C /* play.png in Resources */, 177EC0510B8BC2FF0000BC8C /* previous.png in Resources */, 83849174180843B200E7332D /* stopDockBadgeColorful.png in Resources */, + 83E5E54C18087CA5001F3284 /* miniModeOffTemplate.pdf in Resources */, 177EC0580B8BC2FF0000BC8C /* volume_high.png in Resources */, 177EC0590B8BC2FF0000BC8C /* volume_low.png in Resources */, 17E41E230C130EE200AC744D /* Help in Resources */, @@ -1943,6 +1950,7 @@ 17818A960C0B27AC001C4916 /* ape.icns in Resources */, 17818A970C0B27AC001C4916 /* m3u.icns in Resources */, 17818A980C0B27AC001C4916 /* mpc.icns in Resources */, + 83E5E54D18087CA5001F3284 /* miniModeOnTemplate.pdf in Resources */, 17818A990C0B27AC001C4916 /* shn.icns in Resources */, 17818A9A0C0B27AC001C4916 /* wav.icns in Resources */, 17818A9B0C0B27AC001C4916 /* wv.icns in Resources */, @@ -2059,9 +2067,9 @@ 173855FF0E0CC81F00488CD4 /* FileTreeOutlineView.m in Sources */, 07D971E60ED1DAA800E7602E /* TagEditorController.m in Sources */, 173A43A10F3FD26500676A7B /* ToolTipWindow.m in Sources */, - 17E0D5E90F520F02005B6FED /* DualWindow.m in Sources */, 838491231807F38A00E7332D /* NowPlayingBarController.m in Sources */, 17E0D5EA0F520F02005B6FED /* MainWindow.m in Sources */, + 836D28A818086386005B7299 /* MiniModeMenuTitleTransformer.m in Sources */, 17E0D5EB0F520F02005B6FED /* MiniWindow.m in Sources */, 17E0D5EC0F520F02005B6FED /* PositionSlider.m in Sources */, 17E0D5ED0F520F02005B6FED /* TimeField.m in Sources */, diff --git a/English.lproj/Feedback.xib b/English.lproj/Feedback.xib index fc1e6fb6d..3b03636b6 100644 --- a/English.lproj/Feedback.xib +++ b/English.lproj/Feedback.xib @@ -1,28 +1,36 @@ - + 1050 - 9G55 - 677 - 949.43 - 353.00 - + 11E53 + 1938 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 1938 + + YES - + NSTextField + NSView + NSScrollView + NSWindowTemplate + NSProgressIndicator + NSTextFieldCell + NSTextView + NSButtonCell + NSButton + NSScroller + NSCustomObject YES - com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -39,13 +47,13 @@ 3 2 {{168, 357}, {480, 376}} - 1886912512 + 1886913536 Send Feedback NSWindow View - {3.40282e+38, 3.40282e+38} + {213, 107} @@ -57,6 +65,8 @@ 256 {{80, 295}, {356, 22}} + + YES -1804468671 @@ -64,7 +74,7 @@ LucidaGrande - 1.300000e+01 + 13 1044 @@ -94,6 +104,8 @@ 256 {{17, 297}, {58, 17}} + + YES 67239424 @@ -107,7 +119,7 @@ controlColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -121,8 +133,10 @@ 256 - {{17, 270}, {66, 17}} + {{17, 262}, {66, 17}} + + YES 67239424 @@ -149,7 +163,7 @@ 2322 YES - + YES Apple HTML pasteboard type Apple PDF pasteboard type @@ -157,7 +171,6 @@ Apple PNG pasteboard type Apple URL pasteboard type CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 NSColor pasteboard type NSFilenamesPboardType NSStringPboardType @@ -168,10 +181,13 @@ NeXT font pasteboard type NeXT ruler pasteboard type WebURLsWithTitlesPboardType + public.url - {423, 14} + {438, 14} + + @@ -188,16 +204,17 @@ - 4.230000e+02 + 438 1 - 11239 + 67120103 + 0 + - YES - + YES NSBackgroundColor NSColor @@ -218,10 +235,10 @@ - + YES - + YES NSColor NSUnderline @@ -232,53 +249,83 @@ 1 MCAwIDEAA - + + + 1 6 - {863, 1e+07} + {863, 10000000} {83, 0} - {{1, 1}, {423, 200}} + {{1, 1}, {438, 197}} + - {4, -5} - 1 + {4, 5} + + 12582912 + + YES + + YES + + + + TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym +SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA +AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA +AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA +AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + + + + + 3 + MCAwAA + + 4 256 - {{424, 1}, {15, 200}} + {{424, 1}, {15, 197}} + + _doScroller: - 6.644518e-01 + 0.66445180000000004 - 256 + -2147483392 {{-100, -100}, {87, 18}} + + 1 _doScroller: - 1.000000e+00 - 9.456522e-01 + 1 + 0.94565220000000005 - {{20, 60}, {440, 202}} + {{20, 55}, {440, 199}} + - 18 + 133138 @@ -288,6 +335,8 @@ 256 {{306, 12}, {82, 32}} + + YES 67239424 @@ -311,6 +360,7 @@ 256 {{388, 12}, {78, 32}} + YES 67239424 @@ -335,14 +385,18 @@ {{444, 340}, {16, 16}} + + 20746 - 1.000000e+02 + 100 256 {{80, 337}, {356, 22}} + + YES -1804468671 @@ -360,6 +414,8 @@ 256 {{17, 339}, {71, 17}} + + YES 67239424 @@ -374,63 +430,18 @@ {480, 376} + + - {{0, 0}, {1680, 1028}} + {{0, 0}, {1280, 1002}} {213, 129} - {3.40282e+38, 3.40282e+38} + {10000000000000, 10000000000000} + YES YES - - - initialFirstResponder - - - - 23 - - - - nextKeyView - - - - 24 - - - - nextKeyView - - - - 26 - - - - nextKeyView - - - - 28 - - - - nextKeyView - - - - 30 - - - - nextKeyView - - - - 33 - subjectView @@ -487,13 +498,61 @@ 42 + + + initialFirstResponder + + + + 23 + + + + nextKeyView + + + + 33 + + + + nextKeyView + + + + 24 + + + + nextKeyView + + + + 28 + + + + nextKeyView + + + + 30 + + + + nextKeyView + + + + 26 + YES 0 - + YES @@ -502,19 +561,19 @@ -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application @@ -524,7 +583,7 @@ YES - + FeedbackWindow @@ -535,12 +594,12 @@ - - - + + + @@ -677,133 +736,73 @@ YES - + YES -1.IBPluginDependency -2.IBPluginDependency -3.IBPluginDependency - 1.IBEditorWindowLastContentRect + 1.IBPluginDependency 1.IBWindowTemplateEditedContentRect - 1.ImportedFromIB2 - 1.editorWindowContentRectSynchronizationRect - 1.windowTemplate.hasMaxSize - 1.windowTemplate.hasMinSize - 1.windowTemplate.maxSize - 1.windowTemplate.minSize 10.IBPluginDependency - 10.ImportedFromIB2 11.IBPluginDependency - 11.ImportedFromIB2 12.IBPluginDependency - 12.ImportedFromIB2 13.IBPluginDependency - 13.ImportedFromIB2 14.IBPluginDependency - 14.ImportedFromIB2 15.IBPluginDependency - 15.ImportedFromIB2 16.IBPluginDependency - 16.ImportedFromIB2 17.IBPluginDependency - 17.ImportedFromIB2 18.IBPluginDependency - 18.ImportedFromIB2 19.IBPluginDependency - 19.ImportedFromIB2 20.IBPluginDependency - 20.ImportedFromIB2 21.IBPluginDependency - 21.ImportedFromIB2 22.IBPluginDependency - 22.ImportedFromIB2 3.IBPluginDependency - 3.ImportedFromIB2 4.IBPluginDependency - 4.ImportedFromIB2 5.IBPluginDependency - 5.ImportedFromIB2 6.IBPluginDependency - 6.ImportedFromIB2 7.IBPluginDependency - 7.ImportedFromIB2 8.IBPluginDependency - 8.ImportedFromIB2 9.IBPluginDependency - 9.ImportedFromIB2 YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{124, 381}, {480, 376}} - {{124, 381}, {480, 376}} - - {{139, 290}, {480, 376}} - - - {3.40282e+38, 3.40282e+38} - {213, 107} 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 - 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 - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + + YES - - YES - - - YES - + + 42 @@ -816,7 +815,7 @@ NSWindowController YES - + YES cancel: sendFeedback: @@ -827,9 +826,28 @@ id + + YES + + YES + cancel: + sendFeedback: + + + YES + + cancel: + id + + + sendFeedback: + id + + + YES - + YES fromView messageView @@ -844,36 +862,53 @@ NSTextField - - IBProjectSource - Feedback/FeedbackController.h + + YES + + YES + fromView + messageView + sendingIndicator + subjectView + + + YES + + fromView + NSTextField + + + messageView + NSTextView + + + sendingIndicator + NSProgressIndicator + + + subjectView + NSTextField + + - - - NSObject IBProjectSource - ThirdParty/AppleRemote/AppleRemote.h - - - - NSObject - - IBProjectSource - ThirdParty/GCWindowMenu/GCOneShotEffectTimer.h - - - - NSObject - - IBProjectSource - ThirdParty/NDHotKeys/NDHotKeyEvent.h + ./Classes/FeedbackController.h 0 - ../Cog.xcodeproj + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES 3 diff --git a/English.lproj/FileTree.xib b/English.lproj/FileTree.xib index 555f29871..ee583e4c5 100644 --- a/English.lproj/FileTree.xib +++ b/English.lproj/FileTree.xib @@ -1,145 +1,1763 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - StringToURLTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FontSizetoLineHeightTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + 1050 + 11E53 + 1938 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 1938 + + + YES + NSScroller + NSMenuItem + NSMenu + NSScrollView + NSTextFieldCell + NSPathCell + NSBox + NSPathControl + NSOutlineView + NSCustomView + NSCustomObject + NSTableColumn + NSUserDefaultsController + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + YES + + FileTreeViewController + + + FirstResponder + + + NSApplication + + + FileTreeDataSource + + + YES + + + PathWatcher + + + + 274 + + YES + + + 274 + + YES + + + 2304 + + YES + + + 4384 + {300, 373} + + + + YES + + + -2147483392 + {{-26, 0}, {16, 17}} + + + YES + + 297 + 16 + 1000 + + 75628096 + 2048 + + + LucidaGrande + 11 + 3100 + + + 3 + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + + 3 + MAA + + + + + 337772097 + 2048 + Text Cell + + LucidaGrande + 13 + 1044 + + + + 6 + System + controlBackgroundColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + + + 3 + YES + + + + 3 + 5 + + 6 + System + _sourceListBackgroundColor + + 6 + System + alternateSelectedControlColor + + 1 + MCAwIDEAA + + + + + 6 + System + gridColor + + 3 + MC41AA + + + 18 + 1514143744 + + + FileTree + 4 + 15 + 0 + YES + 1 + 1 + 1 + 14 + + + {300, 373} + + + + + + 2 + + + + -2147483392 + {{261, 0}, {15, 363}} + + + + + _doScroller: + 0.99736150000000001 + + + + -2147483392 + {{0, 362}, {306, 15}} + + + + 1 + + _doScroller: + 0.99674267100977199 + + + {300, 373} + + + + 133680 + + + + QSAAAEEgAABBuAAAQbgAAA + + + + 266 + + YES + + + 274 + {{1, 1}, {298, 0}} + + + + + + {{0, 373}, {300, 1}} + + + + _NS:2411 + {0, 0} + + 67239424 + 0 + Box + + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 3 + 4 + 0 + NO + + 6 + System + scrollBarColor + + + + 6 + System + textColor + + + + + + 266 + + YES + + YES + Apple URL pasteboard type + NSFilenamesPboardType + + + {{0, 374}, {300, 26}} + + + + YES + + 337772033 + 32768 + + + + 6 + System + windowBackgroundColor + + + + YES + + 2 + + + + + {300, 400} + + + + NSView + + + FileTreeController + + + Menu + + YES + + + Add to Playlist + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + 1 + + + + Set as Playlist + + 1048576 + 2147483647 + + + 2 + + + + YES + YES + + + 2147483647 + + + + + + Show in Finder + + 1048576 + 2147483647 + + + 3 + + + + YES + YES + + + 2147483647 + + + + + + Set as Root + + 1048576 + 2147483647 + + + 4 + + + + + + + YES + + + view + + + + 103 + + + + firstResponder + + + + 140 + + + + fileTreeOutlineView + + + + 141 + + + + watcher + + + + 34 + + + + outlineView + + + + 88 + + + + pathControl + + + + 109 + + + + delegate + + + + 33 + + + + nextKeyView + + + + 104 + + + + value: values.fileTreeRootURL + + + + + + value: values.fileTreeRootURL + value + values.fileTreeRootURL + + NSValueTransformerName + StringToURLTransformer + + 2 + + + 108 + + + + rowHeight: values.fontSize + + + + + + rowHeight: values.fontSize + rowHeight + values.fontSize + + NSValueTransformerName + FontSizetoLineHeightTransformer + + 2 + + + 86 + + + + dataSource + + + + 87 + + + + delegate + + + + 98 + + + + menu + + + + 121 + + + + fontSize: values.fontSize + + + + + + fontSize: values.fontSize + fontSize + values.fontSize + 2 + + + 93 + + + + outlineView + + + + 95 + + + + controller + + + + 106 + + + + addToPlaylist: + + + + 122 + + + + showEntryInFinder: + + + + 123 + + + + setAsRoot: + + + + 125 + + + + setAsPlaylist: + + + + 130 + + + + dataSource + + + + 137 + + + + delegate + + + + 139 + + + + + YES + + 0 + + YES + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 9 + + + FileTreeDataSource + + + 27 + + + + + 31 + + + + + 55 + + + YES + + + + + + File Tree View + + + 64 + + + YES + + + + + + + + 65 + + + YES + + + + + + 66 + + + + + 67 + + + + + 68 + + + + + 69 + + + YES + + + + + + 70 + + + YES + + + + + + 71 + + + + + 94 + + + + + 110 + + + YES + + + + + + + + + ContextualMenu + + + 112 + + + + + 119 + + + + + 124 + + + + + 126 + + + + + 128 + + + + + 129 + + + + + 147 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 110.IBPluginDependency + 112.IBPluginDependency + 119.IBPluginDependency + 124.IBPluginDependency + 126.IBPluginDependency + 128.IBPluginDependency + 129.IBPluginDependency + 147.IBPluginDependency + 27.IBPluginDependency + 31.IBPluginDependency + 55.IBPluginDependency + 64.IBPluginDependency + 65.IBPluginDependency + 66.IBPathControlIntegration.allowedTypes + 66.IBPluginDependency + 67.IBPluginDependency + 68.IBPluginDependency + 69.CustomClassName + 69.IBPluginDependency + 70.IBPluginDependency + 71.CustomClassName + 71.IBPluginDependency + 9.IBPluginDependency + 94.IBPluginDependency + + + YES + 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 + 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 + + YES + Type + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + FileTreeOutlineView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + FileIconCell + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + + + + + YES + + + + + 147 + + + + YES + + DNDArrayController + NSArrayController + + tableView + NSTableView + + + tableView + + tableView + NSTableView + + + + IBProjectSource + ./Classes/DNDArrayController.h + + + + EntriesController + NSObject + + IBProjectSource + ./Classes/EntriesController.h + + + + FileIconCell + ImageTextCell + + IBProjectSource + ./Classes/FileIconCell.h + + + + FileTreeController + NSObject + + YES + + YES + addToPlaylist: + setAsPlaylist: + setAsRoot: + showEntryInFinder: + + + YES + id + id + id + id + + + + YES + + YES + addToPlaylist: + setAsPlaylist: + setAsRoot: + showEntryInFinder: + + + YES + + addToPlaylist: + id + + + setAsPlaylist: + id + + + setAsRoot: + id + + + showEntryInFinder: + id + + + + + YES + + YES + controller + dataSource + outlineView + + + YES + SideViewController + FileTreeDataSource + NSOutlineView + + + + YES + + YES + controller + dataSource + outlineView + + + YES + + controller + SideViewController + + + dataSource + FileTreeDataSource + + + outlineView + NSOutlineView + + + + + IBProjectSource + ./Classes/FileTreeController.h + + + + FileTreeDataSource + NSObject + + YES + + YES + outlineView + pathControl + watcher + + + YES + NSOutlineView + NSPathControl + PathWatcher + + + + YES + + YES + outlineView + pathControl + watcher + + + YES + + outlineView + NSOutlineView + + + pathControl + NSPathControl + + + watcher + PathWatcher + + + + + IBProjectSource + ./Classes/FileTreeDataSource.h + + + + FileTreeOutlineView + NSOutlineView + + IBProjectSource + ./Classes/FileTreeOutlineView.h + + + + FileTreeViewController + SideViewController + + YES + + YES + fileTreeOutlineView + playbackController + playlistLoader + + + YES + FileTreeOutlineView + PlaybackController + PlaylistLoader + + + + YES + + YES + fileTreeOutlineView + playbackController + playlistLoader + + + YES + + fileTreeOutlineView + FileTreeOutlineView + + + playbackController + PlaybackController + + + playlistLoader + PlaylistLoader + + + + + IBProjectSource + ./Classes/FileTreeViewController.h + + + + ImageTextCell + NSTextFieldCell + + IBProjectSource + ./Classes/ImageTextCell.h + + + + PathWatcher + NSObject + + delegate + id + + + delegate + + delegate + id + + + + IBProjectSource + ./Classes/PathWatcher.h + + + + PlaybackController + NSObject + + YES + + YES + changeVolume: + eventSeekBackward: + eventSeekForward: + fade: + next: + pause: + pauseResume: + play: + playPauseResume: + prev: + resume: + seek: + skipToNextAlbum: + skipToPreviousAlbum: + stop: + volumeDown: + volumeUp: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + changeVolume: + eventSeekBackward: + eventSeekForward: + fade: + next: + pause: + pauseResume: + play: + playPauseResume: + prev: + resume: + seek: + skipToNextAlbum: + skipToPreviousAlbum: + stop: + volumeDown: + volumeUp: + + + YES + + changeVolume: + id + + + eventSeekBackward: + id + + + eventSeekForward: + id + + + fade: + id + + + next: + id + + + pause: + id + + + pauseResume: + id + + + play: + id + + + playPauseResume: + id + + + prev: + id + + + resume: + id + + + seek: + id + + + skipToNextAlbum: + id + + + skipToPreviousAlbum: + id + + + stop: + id + + + volumeDown: + id + + + volumeUp: + id + + + + + YES + + YES + outputDevices + playlistController + playlistView + volumeSlider + + + YES + NSArrayController + PlaylistController + PlaylistView + NSSlider + + + + YES + + YES + outputDevices + playlistController + playlistView + volumeSlider + + + YES + + outputDevices + NSArrayController + + + playlistController + PlaylistController + + + playlistView + PlaylistView + + + volumeSlider + NSSlider + + + + + IBProjectSource + ./Classes/PlaybackController.h + + + + PlaylistController + DNDArrayController + + YES + + YES + clear: + clearFilterPredicate: + emptyQueueList: + searchByAlbum: + searchByArtist: + showEntryInFinder: + stopAfterCurrent: + toggleQueued: + toggleRepeat: + toggleShuffle: + + + YES + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + clear: + clearFilterPredicate: + emptyQueueList: + searchByAlbum: + searchByArtist: + showEntryInFinder: + stopAfterCurrent: + toggleQueued: + toggleRepeat: + toggleShuffle: + + + YES + + clear: + id + + + clearFilterPredicate: + id + + + emptyQueueList: + id + + + searchByAlbum: + id + + + searchByArtist: + id + + + showEntryInFinder: + id + + + stopAfterCurrent: + id + + + toggleQueued: + id + + + toggleRepeat: + id + + + toggleShuffle: + id + + + + + YES + + YES + entriesController + playbackController + playlistLoader + spotlightWindowController + + + YES + EntriesController + PlaybackController + PlaylistLoader + SpotlightWindowController + + + + YES + + YES + entriesController + playbackController + playlistLoader + spotlightWindowController + + + YES + + entriesController + EntriesController + + + playbackController + PlaybackController + + + playlistLoader + PlaylistLoader + + + spotlightWindowController + SpotlightWindowController + + + + + IBProjectSource + ./Classes/PlaylistController.h + + + + PlaylistLoader + NSObject + + playlistController + PlaylistController + + + playlistController + + playlistController + PlaylistController + + + + IBProjectSource + ./Classes/PlaylistLoader.h + + + + PlaylistView + NSTableView + + YES + + YES + scrollToCurrentEntry: + shufflePlaylist: + sortByPath: + toggleColumn: + + + YES + id + id + id + id + + + + YES + + YES + scrollToCurrentEntry: + shufflePlaylist: + sortByPath: + toggleColumn: + + + YES + + scrollToCurrentEntry: + id + + + shufflePlaylist: + id + + + sortByPath: + id + + + toggleColumn: + id + + + + + YES + + YES + playbackController + playlistController + + + YES + PlaybackController + PlaylistController + + + + YES + + YES + playbackController + playlistController + + + YES + + playbackController + PlaybackController + + + playlistController + PlaylistController + + + + + IBProjectSource + ./Classes/PlaylistView.h + + + + SideViewController + NSViewController + + YES + + YES + toggleSideView: + toggleVertical: + + + YES + id + id + + + + YES + + YES + toggleSideView: + toggleVertical: + + + YES + + toggleSideView: + id + + + toggleVertical: + id + + + + + YES + + YES + firstResponder + mainView + splitView + + + YES + NSView + NSView + NSSplitView + + + + YES + + YES + firstResponder + mainView + splitView + + + YES + + firstResponder + NSView + + + mainView + NSView + + + splitView + NSSplitView + + + + + IBProjectSource + ./Classes/SideViewController.h + + + + SpotlightWindowController + NSWindowController + + YES + + YES + addToPlaylist: + pathComponentClicked: + toggleWindow: + + + YES + id + id + id + + + + YES + + YES + addToPlaylist: + pathComponentClicked: + toggleWindow: + + + YES + + addToPlaylist: + id + + + pathComponentClicked: + id + + + toggleWindow: + id + + + + + YES + + YES + pathControl + playlistController + playlistLoader + searchField + + + YES + NSPathControl + NSArrayController + PlaylistLoader + NSSearchField + + + + YES + + YES + pathControl + playlistController + playlistLoader + searchField + + + YES + + pathControl + NSPathControl + + + playlistController + NSArrayController + + + playlistLoader + PlaylistLoader + + + searchField + NSSearchField + + + + + IBProjectSource + ./Classes/SpotlightWindowController.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + + + YES + {11, 11} + {10, 3} + + + + diff --git a/English.lproj/InfoInspector.xib b/English.lproj/InfoInspector.xib index 9ac6399ad..a05be4117 100644 --- a/English.lproj/InfoInspector.xib +++ b/English.lproj/InfoInspector.xib @@ -1,28 +1,33 @@ - + 1050 - 9G55 - 677 - 949.43 - 353.00 - + 11G63b + 2549 + 1138.51 + 569.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 2549 + + YES - + NSCustomObject + NSImageCell + NSImageView + NSTextField + NSTextFieldCell + NSUserDefaultsController + NSView + NSWindowTemplate YES - com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -36,15 +41,16 @@ NSApplication - 8223 + 8219 2 - {{246, 60}, {351, 498}} - -1543502848 + {{700, 80}, {300, 450}} + -1538259968 Info Inspector NSPanel - {3.40282e+38, 3.40282e+38} - {200, 450} + + {400, 600} + {240, 420} 256 @@ -53,8 +59,10 @@ 268 - {{69, 464}, {37, 14}} + {{69, 416}, {37, 14}} + + YES 68288064 @@ -62,7 +70,7 @@ Artist: LucidaGrande - 1.100000e+01 + 11 3100 @@ -72,7 +80,7 @@ controlColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -84,8 +92,10 @@ 268 - {{63, 442}, {43, 14}} + {{63, 394}, {43, 14}} + + YES 68288064 @@ -100,8 +110,10 @@ 268 - {{68, 398}, {38, 14}} + {{68, 350}, {38, 14}} + + YES 68288064 @@ -116,8 +128,10 @@ 268 - {{61, 376}, {45, 14}} + {{61, 328}, {45, 14}} + + YES 68288064 @@ -132,8 +146,10 @@ 268 - {{74, 354}, {32, 14}} + {{74, 306}, {32, 14}} + + YES 68288064 @@ -148,8 +164,10 @@ 268 - {{66, 332}, {40, 14}} + {{66, 284}, {40, 14}} + + YES 68288064 @@ -164,8 +182,10 @@ 268 - {{33, 288}, {73, 14}} + {{33, 240}, {73, 14}} + + YES 68288064 @@ -180,8 +200,10 @@ 268 - {{49, 266}, {57, 14}} + {{49, 218}, {57, 14}} + + YES 68288064 @@ -196,8 +218,10 @@ 268 - {{64, 244}, {42, 14}} + {{64, 196}, {42, 14}} + + YES 68288064 @@ -212,8 +236,10 @@ 268 - {{17, 222}, {89, 14}} + {{17, 174}, {89, 14}} + + YES 68288064 @@ -228,8 +254,10 @@ 268 - {{74, 420}, {32, 14}} + {{74, 372}, {32, 14}} + + YES 68288064 @@ -244,8 +272,10 @@ 266 - {{113, 464}, {221, 14}} + {{113, 416}, {170, 14}} + + YES 67239488 @@ -260,8 +290,10 @@ 266 - {{113, 442}, {221, 14}} + {{113, 394}, {170, 14}} + + YES 67239488 @@ -276,8 +308,10 @@ 266 - {{113, 420}, {221, 14}} + {{113, 372}, {170, 14}} + + YES 67239488 @@ -292,8 +326,10 @@ 266 - {{113, 398}, {221, 14}} + {{113, 350}, {170, 14}} + + YES 67239488 @@ -308,8 +344,10 @@ 266 - {{113, 376}, {221, 14}} + {{113, 328}, {170, 14}} + + YES 67239488 @@ -324,8 +362,10 @@ 266 - {{113, 354}, {221, 14}} + {{113, 306}, {170, 14}} + + YES 67239488 @@ -340,8 +380,10 @@ 266 - {{113, 332}, {221, 14}} + {{113, 284}, {170, 14}} + + YES 67239488 @@ -356,8 +398,10 @@ 266 - {{113, 288}, {221, 14}} + {{113, 240}, {170, 14}} + + YES 67239488 @@ -372,8 +416,10 @@ 266 - {{113, 266}, {221, 14}} + {{113, 218}, {170, 14}} + + YES 67239488 @@ -388,8 +434,10 @@ 266 - {{113, 244}, {221, 14}} + {{113, 196}, {170, 14}} + + YES 67239488 @@ -404,8 +452,10 @@ 266 - {{113, 222}, {221, 14}} + {{113, 174}, {170, 14}} + + YES 67239488 @@ -420,8 +470,10 @@ 268 - {{50, 310}, {56, 14}} + {{50, 262}, {56, 14}} + + YES 68288064 @@ -436,8 +488,10 @@ 266 - {{113, 310}, {221, 14}} + {{113, 262}, {170, 14}} + + YES 67239488 @@ -454,7 +508,7 @@ 274 YES - + YES Apple PDF pasteboard type Apple PICT pasteboard type @@ -464,13 +518,14 @@ NeXT TIFF v4.0 pasteboard type - {{17, 17}, {317, 186}} + {{17, 17}, {266, 138}} + + YES - 604110336 - 33685504 - + 671219200 + 33554432 0 0 0 @@ -479,13 +534,16 @@ YES - {351, 498} + {300, 450} + + - {{0, 0}, {1680, 1028}} - {200, 469} - {3.40282e+38, 3.40282e+38} + {{0, 0}, {1280, 1002}} + {240, 439} + {400, 619} InfoInspector + YES YES @@ -500,189 +558,61 @@ YES + + + window + + + + 83 + - value: playlistSelectionController.selection.artist + value: valueToDisplay.artist - value: playlistSelectionController.selection.artist + value: valueToDisplay.artist value - playlistSelectionController.selection.artist + valueToDisplay.artist 2 - 66 + 108 - value: playlistSelectionController.selection.album + value: valueToDisplay.album - value: playlistSelectionController.selection.album + value: valueToDisplay.album value - playlistSelectionController.selection.album + valueToDisplay.album 2 - 68 + 109 - value: playlistSelectionController.selection.title + value: valueToDisplay.title - value: playlistSelectionController.selection.title + value: valueToDisplay.title value - playlistSelectionController.selection.title + valueToDisplay.title 2 - 69 - - - - value: playlistSelectionController.selection.track - - - - - - value: playlistSelectionController.selection.track - value - playlistSelectionController.selection.track - 2 - - - 70 - - - - value: playlistSelectionController.selection.length - - - - - - value: playlistSelectionController.selection.length - value - playlistSelectionController.selection.length - 2 - - - 71 - - - - value: playlistSelectionController.selection.year - - - - - - value: playlistSelectionController.selection.year - value - playlistSelectionController.selection.year - 2 - - - 72 - - - - value: playlistSelectionController.selection.genre - - - - - - value: playlistSelectionController.selection.genre - value - playlistSelectionController.selection.genre - 2 - - - 73 - - - - value: playlistSelectionController.selection.sampleRate - - - - - - value: playlistSelectionController.selection.sampleRate - value - playlistSelectionController.selection.sampleRate - 2 - - - 74 - - - - value: playlistSelectionController.selection.channels - - - - - - value: playlistSelectionController.selection.channels - value - playlistSelectionController.selection.channels - 2 - - - 75 - - - - value: playlistSelectionController.selection.bitsPerSample - - - - - - value: playlistSelectionController.selection.bitsPerSample - value - playlistSelectionController.selection.bitsPerSample - 2 - - - 77 - - - - value: playlistSelectionController.selection.bitrate - - - - - - value: playlistSelectionController.selection.bitrate - value - playlistSelectionController.selection.bitrate - 2 - - - 78 - - - - formatter - - - - 81 + 110 @@ -692,60 +622,61 @@ 82 + + + value: valueToDisplay.track + + + + + + value: valueToDisplay.track + value + valueToDisplay.track + 2 + + + 111 + - window - - + formatter + + - 83 + 81 - value: playlistSelectionController.selection.filename - + value: valueToDisplay.length + - + - value: playlistSelectionController.selection.filename + value: valueToDisplay.length value - playlistSelectionController.selection.filename + valueToDisplay.length 2 - 89 + 112 - value: playlistSelectionController.selection.albumArt - + value: valueToDisplay.year + - + - value: playlistSelectionController.selection.albumArt + value: valueToDisplay.year value - playlistSelectionController.selection.albumArt - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSConditionallySetsEnabled - NSValueTransformerName - - - YES - - - MissingAlbumArtTransformer - - + valueToDisplay.year 2 - 106 + 113 @@ -755,6 +686,133 @@ 107 + + + value: valueToDisplay.genre + + + + + + value: valueToDisplay.genre + value + valueToDisplay.genre + 2 + + + 114 + + + + value: valueToDisplay.sampleRate + + + + + + value: valueToDisplay.sampleRate + value + valueToDisplay.sampleRate + 2 + + + 116 + + + + value: valueToDisplay.channels + + + + + + value: valueToDisplay.channels + value + valueToDisplay.channels + 2 + + + 117 + + + + value: valueToDisplay.bitrate + + + + + + value: valueToDisplay.bitrate + value + valueToDisplay.bitrate + 2 + + + 118 + + + + value: valueToDisplay.bitsPerSample + + + + + + value: valueToDisplay.bitsPerSample + value + valueToDisplay.bitsPerSample + 2 + + + 122 + + + + value: valueToDisplay.filename + + + + + + value: valueToDisplay.filename + value + valueToDisplay.filename + 2 + + + 115 + + + + value: valueToDisplay.albumArt + + + + + + value: valueToDisplay.albumArt + value + valueToDisplay.albumArt + + YES + + YES + NSAllowsEditingMultipleValuesSelection + NSConditionallySetsEnabled + NSValueTransformerName + + + YES + + + MissingAlbumArtTransformer + + + 2 + + + 121 + @@ -771,7 +829,7 @@ -2 - RmlsZSdzIE93bmVyA + File's Owner -1 @@ -1196,19 +1254,16 @@ YES - + YES -1.IBPluginDependency -2.IBPluginDependency -3.IBPluginDependency - 1.IBEditorWindowLastContentRect + 1.IBNSWindowAutoPositionCentersHorizontal + 1.IBNSWindowAutoPositionCentersVertical 1.IBPluginDependency 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch - 1.windowTemplate.hasMaxSize - 1.windowTemplate.hasMinSize - 1.windowTemplate.maxSize - 1.windowTemplate.minSize 10.IBPluginDependency 11.IBPluginDependency 12.IBPluginDependency @@ -1264,6 +1319,7 @@ 55.CustomClassName 55.IBPluginDependency 56.IBPluginDependency + 58.IBPluginDependency 79.IBPluginDependency 80.IBPluginDependency 84.IBPluginDependency @@ -1275,19 +1331,16 @@ 95.IBPluginDependency 96.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit - {{548, 275}, {351, 498}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin {{548, 275}, {351, 498}} - - - - {351, 498} - {200, 450} + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1347,6 +1400,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin ToolTipTextField com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1357,25 +1411,17 @@ YES - - YES - - - YES - + + YES - - YES - - - YES - + + - 107 + 122 @@ -1385,7 +1431,7 @@ NSFormatter IBProjectSource - Formatters/BlankZeroFormatter.h + ./Classes/BlankZeroFormatter.h @@ -1395,34 +1441,55 @@ toggleWindow: id + + toggleWindow: + + toggleWindow: + id + + - playlistSelectionController - id + YES + + YES + appController + currentEntryController + playlistSelectionController + + + YES + id + id + id + + + + YES + + YES + appController + currentEntryController + playlistSelectionController + + + YES + + appController + id + + + currentEntryController + id + + + playlistSelectionController + id + + IBProjectSource - InfoInspector/InfoWindowController.h - - - - NSObject - - IBProjectSource - ThirdParty/AppleRemote/AppleRemote.h - - - - NSObject - - IBProjectSource - ThirdParty/GCWindowMenu/GCOneShotEffectTimer.h - - - - NSObject - - IBProjectSource - ThirdParty/NDHotKeys/NDHotKeyEvent.h + ./Classes/InfoWindowController.h @@ -1430,7 +1497,7 @@ NSFormatter IBProjectSource - Formatters/SecondsFormatter.h + ./Classes/SecondsFormatter.h @@ -1438,13 +1505,22 @@ NSTextField IBProjectSource - Utils/ToolTipTextField.h + ./Classes/ToolTipTextField.h 0 - ../Cog.xcodeproj + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES 3 diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings index 1d6072dcf..fb5a457e0 100644 --- a/English.lproj/Localizable.strings +++ b/English.lproj/Localizable.strings @@ -25,3 +25,6 @@ "InvalidURLShort" = "Invalid URL"; "InvalidURLLong" = "The URL is not valid."; +"SwitchToMiniPlayer" = "Switch to Mini Player"; +"SwitchFromMiniPlayer" = "Switch from Mini Player"; + diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 70047bea0..5b238b87f 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -15,16 +15,19 @@ - - + + + + + - + - + - + @@ -38,24 +41,24 @@ - + - - + + - - + + - - + + - + - + @@ -68,12 +71,12 @@ + - @@ -82,7 +85,7 @@ - + @@ -95,7 +98,7 @@ - + @@ -109,15 +112,15 @@ + - - + @@ -131,15 +134,15 @@ + - - + @@ -153,15 +156,15 @@ + - - + @@ -174,15 +177,15 @@ + - - + @@ -195,11 +198,11 @@ - + - + @@ -213,12 +216,12 @@ - + - - + + @@ -230,11 +233,11 @@ - + - @@ -302,7 +305,7 @@ - + @@ -321,9 +324,30 @@ + + + + + + + + + + + + + + + + + + + + + - + @@ -333,12 +357,6 @@ - - - All - (title contains[cd] $value) OR (artist contains[cd] $value) OR (album contains[cd] $value) OR (genre contains[cd] $value) - - Title @@ -353,94 +371,75 @@ - - - artist contains[cd] $value - Album + + artist contains[cd] $value + + Album - - - genre contains[cd] $value - Genre + + genre contains[cd] $value + + Genre + + + + + All + (title contains[cd] $value) OR (artist contains[cd] $value) OR (album contains[cd] $value) OR (genre contains[cd] $value) - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - + + - - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - - + + + + + + - + - - + + - + - - - - - - - - - - + + + + + @@ -569,38 +582,37 @@ - - - + + - - - - - + + + + + + - - - - + + - + - - - + + + @@ -611,7 +623,7 @@ - + @@ -620,35 +632,35 @@ + - - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - - + + + + + + + + +