From a2f360177ed7f7a01f54961928f7c4f95c9840ac Mon Sep 17 00:00:00 2001 From: vspader Date: Sun, 22 Feb 2009 14:57:02 -0800 Subject: [PATCH] Organized things a little better. --- Cog.xcodeproj/project.pbxproj | 136 +++++++++--------- .../FontSizetoLineHeightTransformer.h | 0 .../FontSizetoLineHeightTransformer.m | 0 .../StringToURLTransformer.h | 0 .../StringToURLTransformer.m | 0 Utils/DBLog.h | 21 --- Utils/DBLog.m | 25 ---- Utils/DragScrollView.h | 16 --- Utils/DragScrollView.m | 46 ------ {Application => Window}/DualWindow.h | 0 {Application => Window}/DualWindow.m | 0 {Application => Window}/MainWindow.h | 0 {Application => Window}/MainWindow.m | 0 {Application => Window}/MiniWindow.h | 0 {Application => Window}/MiniWindow.m | 0 {Application => Window}/PositionSlider.h | 0 {Application => Window}/PositionSlider.m | 0 {Application => Window}/TimeField.h | 0 {Application => Window}/TimeField.m | 0 {Utils => Window}/VolumeButton.h | 0 {Utils => Window}/VolumeButton.m | 0 {Utils => Window}/VolumeSlider.h | 0 {Utils => Window}/VolumeSlider.m | 0 23 files changed, 70 insertions(+), 174 deletions(-) rename {Utils => Transformers}/FontSizetoLineHeightTransformer.h (100%) rename {Utils => Transformers}/FontSizetoLineHeightTransformer.m (100%) rename {Utils => Transformers}/StringToURLTransformer.h (100%) rename {Utils => Transformers}/StringToURLTransformer.m (100%) delete mode 100644 Utils/DBLog.h delete mode 100644 Utils/DBLog.m delete mode 100644 Utils/DragScrollView.h delete mode 100644 Utils/DragScrollView.m rename {Application => Window}/DualWindow.h (100%) rename {Application => Window}/DualWindow.m (100%) rename {Application => Window}/MainWindow.h (100%) rename {Application => Window}/MainWindow.m (100%) rename {Application => Window}/MiniWindow.h (100%) rename {Application => Window}/MiniWindow.m (100%) rename {Application => Window}/PositionSlider.h (100%) rename {Application => Window}/PositionSlider.m (100%) rename {Application => Window}/TimeField.h (100%) rename {Application => Window}/TimeField.m (100%) rename {Utils => Window}/VolumeButton.h (100%) rename {Utils => Window}/VolumeButton.m (100%) rename {Utils => Window}/VolumeSlider.h (100%) rename {Utils => Window}/VolumeSlider.m (100%) diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 39932c79e..0f749502d 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -25,8 +25,6 @@ 1738589B0E0D92DD00488CD4 /* SideBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 173858950E0D92DD00488CD4 /* SideBarController.m */; }; 1738589D0E0D92DD00488CD4 /* SideWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 173858990E0D92DD00488CD4 /* SideWindowController.m */; }; 173A43A10F3FD26500676A7B /* ToolTipWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 173A43A00F3FD26500676A7B /* ToolTipWindow.m */; }; - 173A43B80F3FD3B200676A7B /* VolumeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 173A43B70F3FD3B200676A7B /* VolumeButton.m */; }; - 1752C6B00F3FE3CC00FC3235 /* VolumeSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 1752C6AF0F3FE3CC00FC3235 /* VolumeSlider.m */; }; 1755E1F90BA0D2B600CA3560 /* PlaylistLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1755E1F70BA0D2B600CA3560 /* PlaylistLoader.m */; }; 1766C6930B911DF1004A7AE4 /* AudioScrobbler.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C68F0B911DF1004A7AE4 /* AudioScrobbler.m */; }; 1766C6950B911DF1004A7AE4 /* AudioScrobblerClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C6910B911DF1004A7AE4 /* AudioScrobblerClient.m */; }; @@ -42,8 +40,6 @@ 177EBFA70B8BC2A70000BC8C /* ImageTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EBF870B8BC2A70000BC8C /* ImageTextCell.m */; }; 177EBFAB0B8BC2A70000BC8C /* NDHotKeyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EBF8D0B8BC2A70000BC8C /* NDHotKeyControl.m */; }; 177EBFAD0B8BC2A70000BC8C /* NDHotKeyEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EBF8F0B8BC2A70000BC8C /* NDHotKeyEvent.m */; }; - 177EC0210B8BC2CF0000BC8C /* DBLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EC0150B8BC2CF0000BC8C /* DBLog.m */; }; - 177EC0230B8BC2CF0000BC8C /* DragScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EC0170B8BC2CF0000BC8C /* DragScrollView.m */; }; 177EC0270B8BC2CF0000BC8C /* TrackingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EC01B0B8BC2CF0000BC8C /* TrackingCell.m */; }; 177EC0290B8BC2CF0000BC8C /* TrackingSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EC01D0B8BC2CF0000BC8C /* TrackingSlider.m */; }; 177EC0440B8BC2FF0000BC8C /* add_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 177EC02E0B8BC2FF0000BC8C /* add_blue.png */; }; @@ -69,8 +65,6 @@ 1791005E0CB44D6D0070BC5C /* Cog.scriptSuite in Resources */ = {isa = PBXBuildFile; fileRef = 1791005C0CB44D6D0070BC5C /* Cog.scriptSuite */; }; 1791005F0CB44D6D0070BC5C /* Cog.scriptTerminology in Resources */ = {isa = PBXBuildFile; fileRef = 1791005D0CB44D6D0070BC5C /* Cog.scriptTerminology */; }; 1791FF900CB43A2C0070BC5C /* MediaKeysApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1791FF8E0CB43A2C0070BC5C /* MediaKeysApplication.m */; }; - 179571590F51DF4100E4168D /* MiniWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 179571580F51DF4100E4168D /* MiniWindow.m */; }; - 179571730F51E21400E4168D /* MainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 179571720F51E21400E4168D /* MainWindow.m */; }; 179790E10C087AB7001D6996 /* OpenURLPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 179790DF0C087AB7001D6996 /* OpenURLPanel.m */; }; 179D02EE0E0CB0B00064A77A /* SideView.m in Sources */ = {isa = PBXBuildFile; fileRef = 179D02EB0E0CB0B00064A77A /* SideView.m */; }; 179D02EF0E0CB0B00064A77A /* SideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 179D02ED0E0CB0B00064A77A /* SideViewController.m */; }; @@ -97,7 +91,6 @@ 17BB5CFA0B8A86350009ACB1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CF70B8A86350009ACB1 /* CoreAudio.framework */; }; 17BB5CFB0B8A86350009ACB1 /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CF80B8A86350009ACB1 /* CoreAudioKit.framework */; }; 17BB5EA60B8A87850009ACB1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5EA50B8A87850009ACB1 /* IOKit.framework */; }; - 17BBE5BC0CD95CFA00258F7A /* DualWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 17BBE5BB0CD95CFA00258F7A /* DualWindow.m */; }; 17BF2B280CDD7802007E1295 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BF2B270CDD77EB007E1295 /* Sparkle.framework */; }; 17C809910C3BD201005707C4 /* WavPack.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808C80C3BD1DD005707C4 /* WavPack.bundle */; }; 17C809920C3BD206005707C4 /* Vorbis.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808BF0C3BD1D2005707C4 /* Vorbis.bundle */; }; @@ -119,11 +112,17 @@ 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 */; }; - 17E0D4CA0F51FF78005B6FED /* PositionSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D4C90F51FF78005B6FED /* PositionSlider.m */; }; - 17E0D55B0F520636005B6FED /* TimeField.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D55A0F520636005B6FED /* TimeField.m */; }; + 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 */; }; + 17E0D5ED0F520F02005B6FED /* TimeField.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D5E80F520F02005B6FED /* TimeField.m */; }; + 17E0D6160F520F87005B6FED /* FontSizetoLineHeightTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D6130F520F87005B6FED /* FontSizetoLineHeightTransformer.m */; }; + 17E0D6170F520F87005B6FED /* StringToURLTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D6150F520F87005B6FED /* StringToURLTransformer.m */; }; + 17E0D61C0F520F9F005B6FED /* VolumeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D6190F520F9F005B6FED /* VolumeButton.m */; }; + 17E0D61D0F520F9F005B6FED /* VolumeSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E0D61B0F520F9F005B6FED /* VolumeSlider.m */; }; 17E41E070C130DFF00AC744D /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 17E41E060C130DFF00AC744D /* Credits.html */; }; 17E41E230C130EE200AC744D /* Help in Resources */ = {isa = PBXBuildFile; fileRef = 17E41E220C130EE200AC744D /* Help */; }; - 17E78CB10D68D46F005C5A59 /* StringToURLTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E78CB00D68D46F005C5A59 /* StringToURLTransformer.m */; }; 17F3BB890CBC565900864489 /* CueSheet.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F3BB880CBC565100864489 /* CueSheet.bundle */; }; 17F561400C3BD4F30019975C /* CogAudio.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F561330C3BD4DC0019975C /* CogAudio.framework */; }; 17F562390C3BD91B0019975C /* General.preferencePane in Resources */ = {isa = PBXBuildFile; fileRef = 17F5622E0C3BD8FB0019975C /* General.preferencePane */; }; @@ -132,7 +131,6 @@ 5604D4F60D60726E004F5C5D /* SpotlightPlaylistEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 5604D4F50D60726E004F5C5D /* SpotlightPlaylistEntry.m */; }; 56462EAF0D6341F6000AB68C /* SpotlightTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 56462EAE0D6341F6000AB68C /* SpotlightTransformers.m */; }; 56462EB20D634206000AB68C /* SpotlightPlaylistController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56462EB10D634206000AB68C /* SpotlightPlaylistController.m */; }; - 56AE86C10D6901BC00B0F89B /* FontSizetoLineHeightTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 56AE86C00D6901BC00B0F89B /* FontSizetoLineHeightTransformer.m */; }; 56C63D910D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = 56C63D900D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.m */; }; 56DB084C0D6717DC00453B6A /* NSNumber+CogSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 56DB084B0D6717DC00453B6A /* NSNumber+CogSort.m */; }; 56DB08550D67185300453B6A /* NSArray+CogSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 56DB08540D67185300453B6A /* NSArray+CogSort.m */; }; @@ -532,10 +530,6 @@ 173858990E0D92DD00488CD4 /* SideWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SideWindowController.m; path = SideView/SideWindowController.m; sourceTree = ""; }; 173A439F0F3FD26500676A7B /* ToolTipWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolTipWindow.h; path = ToolTip/ToolTipWindow.h; sourceTree = ""; }; 173A43A00F3FD26500676A7B /* ToolTipWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolTipWindow.m; path = ToolTip/ToolTipWindow.m; sourceTree = ""; }; - 173A43B60F3FD3B200676A7B /* VolumeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VolumeButton.h; sourceTree = ""; }; - 173A43B70F3FD3B200676A7B /* VolumeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VolumeButton.m; sourceTree = ""; }; - 1752C6AE0F3FE3CC00FC3235 /* VolumeSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VolumeSlider.h; sourceTree = ""; }; - 1752C6AF0F3FE3CC00FC3235 /* VolumeSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VolumeSlider.m; sourceTree = ""; }; 1755E1F60BA0D2B600CA3560 /* PlaylistLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlaylistLoader.h; sourceTree = ""; }; 1755E1F70BA0D2B600CA3560 /* PlaylistLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PlaylistLoader.m; sourceTree = ""; }; 1766C68E0B911DF1004A7AE4 /* AudioScrobbler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AudioScrobbler.h; sourceTree = ""; }; @@ -561,10 +555,6 @@ 177EBF8D0B8BC2A70000BC8C /* NDHotKeyControl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NDHotKeyControl.m; sourceTree = ""; }; 177EBF8E0B8BC2A70000BC8C /* NDHotKeyEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NDHotKeyEvent.h; sourceTree = ""; }; 177EBF8F0B8BC2A70000BC8C /* NDHotKeyEvent.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NDHotKeyEvent.m; sourceTree = ""; }; - 177EC0140B8BC2CF0000BC8C /* DBLog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DBLog.h; sourceTree = ""; }; - 177EC0150B8BC2CF0000BC8C /* DBLog.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DBLog.m; sourceTree = ""; }; - 177EC0160B8BC2CF0000BC8C /* DragScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DragScrollView.h; sourceTree = ""; }; - 177EC0170B8BC2CF0000BC8C /* DragScrollView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DragScrollView.m; sourceTree = ""; }; 177EC01A0B8BC2CF0000BC8C /* TrackingCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TrackingCell.h; sourceTree = ""; }; 177EC01B0B8BC2CF0000BC8C /* TrackingCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = TrackingCell.m; sourceTree = ""; }; 177EC01C0B8BC2CF0000BC8C /* TrackingSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TrackingSlider.h; sourceTree = ""; }; @@ -596,10 +586,6 @@ 1791005D0CB44D6D0070BC5C /* Cog.scriptTerminology */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Cog.scriptTerminology; sourceTree = ""; }; 1791FF8D0CB43A2C0070BC5C /* MediaKeysApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeysApplication.h; sourceTree = ""; }; 1791FF8E0CB43A2C0070BC5C /* MediaKeysApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MediaKeysApplication.m; sourceTree = ""; }; - 179571570F51DF4100E4168D /* MiniWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MiniWindow.h; sourceTree = ""; }; - 179571580F51DF4100E4168D /* MiniWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MiniWindow.m; sourceTree = ""; }; - 179571710F51E21400E4168D /* MainWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainWindow.h; sourceTree = ""; }; - 179571720F51E21400E4168D /* MainWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainWindow.m; sourceTree = ""; }; 179790DE0C087AB7001D6996 /* OpenURLPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OpenURLPanel.h; sourceTree = ""; }; 179790DF0C087AB7001D6996 /* OpenURLPanel.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OpenURLPanel.m; sourceTree = ""; }; 179D02EA0E0CB0B00064A77A /* SideView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SideView.h; path = SideView/SideView.h; sourceTree = ""; }; @@ -641,8 +627,6 @@ 17BB5CF70B8A86350009ACB1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 17BB5CF80B8A86350009ACB1 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = /System/Library/Frameworks/CoreAudioKit.framework; sourceTree = ""; }; 17BB5EA50B8A87850009ACB1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - 17BBE5BA0CD95CFA00258F7A /* DualWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DualWindow.h; sourceTree = ""; }; - 17BBE5BB0CD95CFA00258F7A /* DualWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DualWindow.m; sourceTree = ""; }; 17BF2B1F0CDD77EB007E1295 /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = Frameworks/Sparkle/Sparkle.xcodeproj; sourceTree = ""; }; 17C808660C3BD0F8005707C4 /* CoreAudio.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoreAudio.xcodeproj; path = Plugins/CoreAudio/CoreAudio.xcodeproj; sourceTree = SOURCE_ROOT; }; 17C808710C3BD167005707C4 /* FileSource.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FileSource.xcodeproj; path = Plugins/FileSource/FileSource.xcodeproj; sourceTree = ""; }; @@ -664,12 +648,24 @@ 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 = ""; }; - 17E0D4C80F51FF78005B6FED /* PositionSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionSlider.h; sourceTree = ""; }; - 17E0D4C90F51FF78005B6FED /* PositionSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PositionSlider.m; sourceTree = ""; }; - 17E0D5590F520636005B6FED /* TimeField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeField.h; sourceTree = ""; }; - 17E0D55A0F520636005B6FED /* TimeField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimeField.m; sourceTree = ""; }; - 17E78CAF0D68D46F005C5A59 /* StringToURLTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringToURLTransformer.h; sourceTree = ""; }; - 17E78CB00D68D46F005C5A59 /* StringToURLTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StringToURLTransformer.m; 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 = ""; }; + 17E0D5E40F520F02005B6FED /* MiniWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MiniWindow.m; path = Window/MiniWindow.m; sourceTree = ""; }; + 17E0D5E50F520F02005B6FED /* PositionSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PositionSlider.h; path = Window/PositionSlider.h; sourceTree = ""; }; + 17E0D5E60F520F02005B6FED /* PositionSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PositionSlider.m; path = Window/PositionSlider.m; sourceTree = ""; }; + 17E0D5E70F520F02005B6FED /* TimeField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimeField.h; path = Window/TimeField.h; sourceTree = ""; }; + 17E0D5E80F520F02005B6FED /* TimeField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TimeField.m; path = Window/TimeField.m; sourceTree = ""; }; + 17E0D6120F520F87005B6FED /* FontSizetoLineHeightTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontSizetoLineHeightTransformer.h; path = Transformers/FontSizetoLineHeightTransformer.h; sourceTree = ""; }; + 17E0D6130F520F87005B6FED /* FontSizetoLineHeightTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FontSizetoLineHeightTransformer.m; path = Transformers/FontSizetoLineHeightTransformer.m; sourceTree = ""; }; + 17E0D6140F520F87005B6FED /* StringToURLTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringToURLTransformer.h; path = Transformers/StringToURLTransformer.h; sourceTree = ""; }; + 17E0D6150F520F87005B6FED /* StringToURLTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StringToURLTransformer.m; path = Transformers/StringToURLTransformer.m; sourceTree = ""; }; + 17E0D6180F520F9F005B6FED /* VolumeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VolumeButton.h; path = Window/VolumeButton.h; sourceTree = ""; }; + 17E0D6190F520F9F005B6FED /* VolumeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VolumeButton.m; path = Window/VolumeButton.m; sourceTree = ""; }; + 17E0D61A0F520F9F005B6FED /* VolumeSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VolumeSlider.h; path = Window/VolumeSlider.h; sourceTree = ""; }; + 17E0D61B0F520F9F005B6FED /* VolumeSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VolumeSlider.m; path = Window/VolumeSlider.m; sourceTree = ""; }; 17F3BB830CBC565100864489 /* CueSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CueSheet.xcodeproj; path = Plugins/CueSheet/CueSheet.xcodeproj; sourceTree = ""; }; 17F5612A0C3BD4DC0019975C /* CogAudio.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CogAudio.xcodeproj; path = Audio/CogAudio.xcodeproj; sourceTree = ""; }; 17F562260C3BD8FB0019975C /* General.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = General.xcodeproj; path = Preferences/General/General.xcodeproj; sourceTree = ""; }; @@ -687,8 +683,6 @@ 56462EB00D634206000AB68C /* SpotlightPlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SpotlightPlaylistController.h; path = Spotlight/SpotlightPlaylistController.h; sourceTree = ""; }; 56462EB10D634206000AB68C /* SpotlightPlaylistController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SpotlightPlaylistController.m; path = Spotlight/SpotlightPlaylistController.m; sourceTree = ""; }; 566D32160D538550004466A5 /* APL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = APL.xcodeproj; path = Plugins/APL/APL.xcodeproj; sourceTree = ""; }; - 56AE86BF0D6901BC00B0F89B /* FontSizetoLineHeightTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSizetoLineHeightTransformer.h; sourceTree = ""; }; - 56AE86C00D6901BC00B0F89B /* FontSizetoLineHeightTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FontSizetoLineHeightTransformer.m; sourceTree = ""; }; 56C63D8F0D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSComparisonPredicate+CogPredicate.h"; path = "Spotlight/NSComparisonPredicate+CogPredicate.h"; sourceTree = ""; }; 56C63D900D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSComparisonPredicate+CogPredicate.m"; path = "Spotlight/NSComparisonPredicate+CogPredicate.m"; sourceTree = ""; }; 56DB084A0D6717DC00453B6A /* NSNumber+CogSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSNumber+CogSort.h"; path = "Spotlight/NSNumber+CogSort.h"; sourceTree = ""; }; @@ -768,6 +762,7 @@ isa = PBXGroup; children = ( 177042960B8BC53600B86321 /* Application */, + 17E0D5D20F520E75005B6FED /* Window */, 8E75752A09F31D5A0080F1EE /* Playlist */, 8E07AAEA0AAC90DC00A4B32F /* Preferences */, 179DFCDF0E0C5A130064A77A /* SideView */, @@ -775,6 +770,7 @@ 8E75752309F31D5A0080F1EE /* Feedback */, 569C52C50D5F2BD500BDBDC9 /* Spotlight */, 1766C68D0B911DF1004A7AE4 /* AudioScrobbler */, + 17E0D5F60F520F42005B6FED /* Transformers */, 177EC0110B8BC2CF0000BC8C /* Utils */, 177EBF770B8BC2A70000BC8C /* ThirdParty */, 07D973050ED1E8F200E7602E /* ID3TagEditor */, @@ -837,16 +833,6 @@ 1770429A0B8BC53600B86321 /* PlaybackController.m */, 1791FF8D0CB43A2C0070BC5C /* MediaKeysApplication.h */, 1791FF8E0CB43A2C0070BC5C /* MediaKeysApplication.m */, - 17BBE5BA0CD95CFA00258F7A /* DualWindow.h */, - 17BBE5BB0CD95CFA00258F7A /* DualWindow.m */, - 179571570F51DF4100E4168D /* MiniWindow.h */, - 179571580F51DF4100E4168D /* MiniWindow.m */, - 179571710F51E21400E4168D /* MainWindow.h */, - 179571720F51E21400E4168D /* MainWindow.m */, - 17E0D4C80F51FF78005B6FED /* PositionSlider.h */, - 17E0D4C90F51FF78005B6FED /* PositionSlider.m */, - 17E0D5590F520636005B6FED /* TimeField.h */, - 17E0D55A0F520636005B6FED /* TimeField.m */, ); path = Application; sourceTree = ""; @@ -896,10 +882,6 @@ 177EC0110B8BC2CF0000BC8C /* Utils */ = { isa = PBXGroup; children = ( - 177EC0140B8BC2CF0000BC8C /* DBLog.h */, - 177EC0150B8BC2CF0000BC8C /* DBLog.m */, - 177EC0160B8BC2CF0000BC8C /* DragScrollView.h */, - 177EC0170B8BC2CF0000BC8C /* DragScrollView.m */, 177EC01A0B8BC2CF0000BC8C /* TrackingCell.h */, 177EC01B0B8BC2CF0000BC8C /* TrackingCell.m */, 177EC01C0B8BC2CF0000BC8C /* TrackingSlider.h */, @@ -908,14 +890,6 @@ 8E9A30140BA792DC0091081B /* NSFileHandle+CreateFile.m */, 07E18DF10D62B38400BB0E11 /* NSArray+ShuffleUtils.h */, 07E18DF20D62B38400BB0E11 /* NSArray+ShuffleUtils.m */, - 17E78CAF0D68D46F005C5A59 /* StringToURLTransformer.h */, - 17E78CB00D68D46F005C5A59 /* StringToURLTransformer.m */, - 56AE86BF0D6901BC00B0F89B /* FontSizetoLineHeightTransformer.h */, - 56AE86C00D6901BC00B0F89B /* FontSizetoLineHeightTransformer.m */, - 173A43B60F3FD3B200676A7B /* VolumeButton.h */, - 173A43B70F3FD3B200676A7B /* VolumeButton.m */, - 1752C6AE0F3FE3CC00FC3235 /* VolumeSlider.h */, - 1752C6AF0F3FE3CC00FC3235 /* VolumeSlider.m */, ); path = Utils; sourceTree = ""; @@ -1151,6 +1125,38 @@ name = FileTree; sourceTree = ""; }; + 17E0D5D20F520E75005B6FED /* Window */ = { + isa = PBXGroup; + children = ( + 17E0D6180F520F9F005B6FED /* VolumeButton.h */, + 17E0D6190F520F9F005B6FED /* VolumeButton.m */, + 17E0D61A0F520F9F005B6FED /* VolumeSlider.h */, + 17E0D61B0F520F9F005B6FED /* VolumeSlider.m */, + 17E0D5DF0F520F02005B6FED /* DualWindow.h */, + 17E0D5E00F520F02005B6FED /* DualWindow.m */, + 17E0D5E10F520F02005B6FED /* MainWindow.h */, + 17E0D5E20F520F02005B6FED /* MainWindow.m */, + 17E0D5E30F520F02005B6FED /* MiniWindow.h */, + 17E0D5E40F520F02005B6FED /* MiniWindow.m */, + 17E0D5E50F520F02005B6FED /* PositionSlider.h */, + 17E0D5E60F520F02005B6FED /* PositionSlider.m */, + 17E0D5E70F520F02005B6FED /* TimeField.h */, + 17E0D5E80F520F02005B6FED /* TimeField.m */, + ); + name = Window; + sourceTree = ""; + }; + 17E0D5F60F520F42005B6FED /* Transformers */ = { + isa = PBXGroup; + children = ( + 17E0D6120F520F87005B6FED /* FontSizetoLineHeightTransformer.h */, + 17E0D6130F520F87005B6FED /* FontSizetoLineHeightTransformer.m */, + 17E0D6140F520F87005B6FED /* StringToURLTransformer.h */, + 17E0D6150F520F87005B6FED /* StringToURLTransformer.m */, + ); + name = Transformers; + sourceTree = ""; + }; 17F3BB840CBC565100864489 /* Products */ = { isa = PBXGroup; children = ( @@ -1780,8 +1786,6 @@ 177EBFA70B8BC2A70000BC8C /* ImageTextCell.m in Sources */, 177EBFAB0B8BC2A70000BC8C /* NDHotKeyControl.m in Sources */, 177EBFAD0B8BC2A70000BC8C /* NDHotKeyEvent.m in Sources */, - 177EC0210B8BC2CF0000BC8C /* DBLog.m in Sources */, - 177EC0230B8BC2CF0000BC8C /* DragScrollView.m in Sources */, 177EC0270B8BC2CF0000BC8C /* TrackingCell.m in Sources */, 177EC0290B8BC2CF0000BC8C /* TrackingSlider.m in Sources */, 1770429C0B8BC53600B86321 /* AppController.m in Sources */, @@ -1797,7 +1801,6 @@ 178BAB990CD4E1B700B33D47 /* GCOneShotEffectTimer.m in Sources */, 178BAB9A0CD4E1B700B33D47 /* GCWindowMenu.m in Sources */, 178BAB9B0CD4E1B700B33D47 /* PopupButton.m in Sources */, - 17BBE5BC0CD95CFA00258F7A /* DualWindow.m in Sources */, 173428F50D5FB1C400E8D854 /* EntriesController.m in Sources */, 5604D45B0D60349B004F5C5D /* SpotlightWindowController.m in Sources */, 5604D4F60D60726E004F5C5D /* SpotlightPlaylistEntry.m in Sources */, @@ -1808,8 +1811,6 @@ 56DB084C0D6717DC00453B6A /* NSNumber+CogSort.m in Sources */, 56DB08550D67185300453B6A /* NSArray+CogSort.m in Sources */, 56DB08580D67186500453B6A /* NSString+CogSort.m in Sources */, - 17E78CB10D68D46F005C5A59 /* StringToURLTransformer.m in Sources */, - 56AE86C10D6901BC00B0F89B /* FontSizetoLineHeightTransformer.m in Sources */, 17A8F6370D6A7B0F0095DA13 /* RepeatTransformers.m in Sources */, 170B55940D6E5E7B006B9E92 /* StatusImageTransformer.m in Sources */, 17B7DD7D0D7CD10D00320E70 /* BlankZeroFormatter.m in Sources */, @@ -1832,12 +1833,15 @@ 1738589D0E0D92DD00488CD4 /* SideWindowController.m in Sources */, 07D971E60ED1DAA800E7602E /* TagEditorController.m in Sources */, 173A43A10F3FD26500676A7B /* ToolTipWindow.m in Sources */, - 173A43B80F3FD3B200676A7B /* VolumeButton.m in Sources */, - 1752C6B00F3FE3CC00FC3235 /* VolumeSlider.m in Sources */, - 179571590F51DF4100E4168D /* MiniWindow.m in Sources */, - 179571730F51E21400E4168D /* MainWindow.m in Sources */, - 17E0D4CA0F51FF78005B6FED /* PositionSlider.m in Sources */, - 17E0D55B0F520636005B6FED /* TimeField.m in Sources */, + 17E0D5E90F520F02005B6FED /* DualWindow.m in Sources */, + 17E0D5EA0F520F02005B6FED /* MainWindow.m in Sources */, + 17E0D5EB0F520F02005B6FED /* MiniWindow.m in Sources */, + 17E0D5EC0F520F02005B6FED /* PositionSlider.m in Sources */, + 17E0D5ED0F520F02005B6FED /* TimeField.m in Sources */, + 17E0D6160F520F87005B6FED /* FontSizetoLineHeightTransformer.m in Sources */, + 17E0D6170F520F87005B6FED /* StringToURLTransformer.m in Sources */, + 17E0D61C0F520F9F005B6FED /* VolumeButton.m in Sources */, + 17E0D61D0F520F9F005B6FED /* VolumeSlider.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Utils/FontSizetoLineHeightTransformer.h b/Transformers/FontSizetoLineHeightTransformer.h similarity index 100% rename from Utils/FontSizetoLineHeightTransformer.h rename to Transformers/FontSizetoLineHeightTransformer.h diff --git a/Utils/FontSizetoLineHeightTransformer.m b/Transformers/FontSizetoLineHeightTransformer.m similarity index 100% rename from Utils/FontSizetoLineHeightTransformer.m rename to Transformers/FontSizetoLineHeightTransformer.m diff --git a/Utils/StringToURLTransformer.h b/Transformers/StringToURLTransformer.h similarity index 100% rename from Utils/StringToURLTransformer.h rename to Transformers/StringToURLTransformer.h diff --git a/Utils/StringToURLTransformer.m b/Transformers/StringToURLTransformer.m similarity index 100% rename from Utils/StringToURLTransformer.m rename to Transformers/StringToURLTransformer.m diff --git a/Utils/DBLog.h b/Utils/DBLog.h deleted file mode 100644 index 8c3fb0825..000000000 --- a/Utils/DBLog.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * NSDebug.h - * Cog - * - * Created by Vincent Spader on 5/30/05. - * Copyright 2005 Vincent Spader All rights reserved. - * - */ - -#include - -#ifdef __cplusplus -extern "C" -{ -#endif - - void DBLog(NSString *format, ...); - -#ifdef __cplusplus -}; -#endif diff --git a/Utils/DBLog.m b/Utils/DBLog.m deleted file mode 100644 index db96956ab..000000000 --- a/Utils/DBLog.m +++ /dev/null @@ -1,25 +0,0 @@ -/* - * NSDebug.c - * Cog - * - * Created by Vincent Spader on 5/30/05. - * Copyright 2005 Vincent Spader All rights reserved. - * - */ - -#include "DBLog.h" - - -void DBLog(NSString *format, ...) -{ -#ifdef DEBUG - - va_list ap; - - va_start(ap, format); - - NSLogv(format, ap); - - va_end(ap); -#endif -} diff --git a/Utils/DragScrollView.h b/Utils/DragScrollView.h deleted file mode 100644 index 764ac22cc..000000000 --- a/Utils/DragScrollView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// ScrollableTextField.h -// Cog -// -// Created by Vincent Spader on 4/30/06. -// Copyright 2006 Vincent Spader. All rights reserved. -// - -#import - - -@interface DragScrollView : NSScrollView { - NSPoint downPoint; -} - -@end diff --git a/Utils/DragScrollView.m b/Utils/DragScrollView.m deleted file mode 100644 index 1a1b68a79..000000000 --- a/Utils/DragScrollView.m +++ /dev/null @@ -1,46 +0,0 @@ -// -// ScrollableTextField.m -// Cog -// -// Created by Vincent Spader on 4/30/06. -// Copyright 2006 Vincent Spader. All rights reserved. -// - -#import "DragScrollView.h" - - -@implementation DragScrollView - -- (BOOL)acceptsFirstMouse:(NSEvent *)event { - return YES; -} - -- (void)mouseDown:(NSEvent *)event -{ - if([event type] == NSLeftMouseDown) - { - if ([event clickCount] == 2) - { - [[self contentView] scrollToPoint:NSMakePoint(0,0)]; - } - - downPoint = [event locationInWindow]; - downPoint = [[self contentView] convertPoint:downPoint fromView:nil]; - } - -} - -- (void)mouseDragged:(NSEvent *)event -{ - NSPoint p = [event locationInWindow]; - - p = [self convertPoint:p fromView:nil]; - - p.y = 0; - p.x = -p.x + downPoint.x; - [[self contentView] scrollToPoint:p]; - [self setNeedsDisplay:YES]; -} - - -@end diff --git a/Application/DualWindow.h b/Window/DualWindow.h similarity index 100% rename from Application/DualWindow.h rename to Window/DualWindow.h diff --git a/Application/DualWindow.m b/Window/DualWindow.m similarity index 100% rename from Application/DualWindow.m rename to Window/DualWindow.m diff --git a/Application/MainWindow.h b/Window/MainWindow.h similarity index 100% rename from Application/MainWindow.h rename to Window/MainWindow.h diff --git a/Application/MainWindow.m b/Window/MainWindow.m similarity index 100% rename from Application/MainWindow.m rename to Window/MainWindow.m diff --git a/Application/MiniWindow.h b/Window/MiniWindow.h similarity index 100% rename from Application/MiniWindow.h rename to Window/MiniWindow.h diff --git a/Application/MiniWindow.m b/Window/MiniWindow.m similarity index 100% rename from Application/MiniWindow.m rename to Window/MiniWindow.m diff --git a/Application/PositionSlider.h b/Window/PositionSlider.h similarity index 100% rename from Application/PositionSlider.h rename to Window/PositionSlider.h diff --git a/Application/PositionSlider.m b/Window/PositionSlider.m similarity index 100% rename from Application/PositionSlider.m rename to Window/PositionSlider.m diff --git a/Application/TimeField.h b/Window/TimeField.h similarity index 100% rename from Application/TimeField.h rename to Window/TimeField.h diff --git a/Application/TimeField.m b/Window/TimeField.m similarity index 100% rename from Application/TimeField.m rename to Window/TimeField.m diff --git a/Utils/VolumeButton.h b/Window/VolumeButton.h similarity index 100% rename from Utils/VolumeButton.h rename to Window/VolumeButton.h diff --git a/Utils/VolumeButton.m b/Window/VolumeButton.m similarity index 100% rename from Utils/VolumeButton.m rename to Window/VolumeButton.m diff --git a/Utils/VolumeSlider.h b/Window/VolumeSlider.h similarity index 100% rename from Utils/VolumeSlider.h rename to Window/VolumeSlider.h diff --git a/Utils/VolumeSlider.m b/Window/VolumeSlider.m similarity index 100% rename from Utils/VolumeSlider.m rename to Window/VolumeSlider.m