diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index db748ae32..6fdf2d3c4 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -105,7 +105,7 @@ 17E41E070C130DFF00AC744D /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 17E41E060C130DFF00AC744D /* Credits.html */; }; 17F3BB890CBC565900864489 /* CueSheet.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F3BB880CBC565100864489 /* CueSheet.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 17F561400C3BD4F30019975C /* CogAudio.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F561330C3BD4DC0019975C /* CogAudio.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 17F562390C3BD91B0019975C /* General.preferencePane in Resources */ = {isa = PBXBuildFile; fileRef = 17F5622E0C3BD8FB0019975C /* General.preferencePane */; }; + 17F562390C3BD91B0019975C /* Preferences.preferencePane in Resources */ = {isa = PBXBuildFile; fileRef = 17F5622E0C3BD8FB0019975C /* Preferences.preferencePane */; }; 17F6C8070F603701000D9DA9 /* PlaybackEventController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17F6C8060F603701000D9DA9 /* PlaybackEventController.m */; }; 17FAEBAC0F662985007C8707 /* ToolTipTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 17FAEBAB0F662985007C8707 /* ToolTipTextField.m */; }; 5604D45B0D60349B004F5C5D /* SpotlightWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5604D4590D60349B004F5C5D /* SpotlightWindowController.m */; }; @@ -315,17 +315,17 @@ }; 17F5622D0C3BD8FB0019975C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 17F562260C3BD8FB0019975C /* General.xcodeproj */; + containerPortal = 17F562260C3BD8FB0019975C /* Preferences.xcodeproj */; proxyType = 2; remoteGlobalIDString = 8D5B49B6048680CD000E48DA; - remoteInfo = General; + remoteInfo = Preferences; }; 17F5623A0C3BD9280019975C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 17F562260C3BD8FB0019975C /* General.xcodeproj */; + containerPortal = 17F562260C3BD8FB0019975C /* Preferences.xcodeproj */; proxyType = 1; remoteGlobalIDString = 8D5B49AC048680CD000E48DA; - remoteInfo = General; + remoteInfo = Preferences; }; 566D321A0D538550004466A5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -828,7 +828,7 @@ 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 = ""; }; + 17F562260C3BD8FB0019975C /* Preferences.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Preferences.xcodeproj; path = Preferences/Preferences/Preferences.xcodeproj; sourceTree = ""; }; 17F6C8050F603701000D9DA9 /* PlaybackEventController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackEventController.h; sourceTree = ""; }; 17F6C8060F603701000D9DA9 /* PlaybackEventController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaybackEventController.m; sourceTree = ""; }; 17FAEBAA0F662985007C8707 /* ToolTipTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToolTipTextField.h; sourceTree = ""; }; @@ -1380,7 +1380,7 @@ 17F562270C3BD8FB0019975C /* Products */ = { isa = PBXGroup; children = ( - 17F5622E0C3BD8FB0019975C /* General.preferencePane */, + 17F5622E0C3BD8FB0019975C /* Preferences.preferencePane */, ); name = Products; sourceTree = ""; @@ -1672,7 +1672,7 @@ 8E07AD280AAC9BE600A4B32F /* Preference Panes */ = { isa = PBXGroup; children = ( - 17F562260C3BD8FB0019975C /* General.xcodeproj */, + 17F562260C3BD8FB0019975C /* Preferences.xcodeproj */, ); name = "Preference Panes"; sourceTree = ""; @@ -1881,7 +1881,7 @@ }, { ProductGroup = 17F562270C3BD8FB0019975C /* Products */; - ProjectRef = 17F562260C3BD8FB0019975C /* General.xcodeproj */; + ProjectRef = 17F562260C3BD8FB0019975C /* Preferences.xcodeproj */; }, { ProductGroup = 17C8F3C90CBED663008D969D /* Products */; @@ -2017,10 +2017,10 @@ remoteRef = 17F561320C3BD4DC0019975C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 17F5622E0C3BD8FB0019975C /* General.preferencePane */ = { + 17F5622E0C3BD8FB0019975C /* Preferences.preferencePane */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = General.preferencePane; + path = Preferences.preferencePane; remoteRef = 17F5622D0C3BD8FB0019975C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2185,7 +2185,7 @@ 83BC5AC120E4CE8700631CD4 /* OpenURLPanel.xib in Resources */, 83BC5AC020E4CE7D00631CD4 /* MainMenu.xib in Resources */, 83BC5ABF20E4CE7A00631CD4 /* InfoInspector.xib in Resources */, - 17F562390C3BD91B0019975C /* General.preferencePane in Resources */, + 17F562390C3BD91B0019975C /* Preferences.preferencePane in Resources */, 8384915B18083EAB00E7332D /* navigatorTemplate.pdf in Resources */, 832C1253180BD1E2005507C1 /* Cog.help in Resources */, 8384916218083EAB00E7332D /* randomizeTemplate.pdf in Resources */, @@ -2411,7 +2411,7 @@ }; 17F5623B0C3BD9280019975C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = General; + name = Preferences; targetProxy = 17F5623A0C3BD9280019975C /* PBXContainerItemProxy */; }; 834D793020E4EFCC00C4A5CC /* PBXTargetDependency */ = { diff --git a/Preferences/General/AppcastArrayController.h b/Preferences/Preferences/AppcastArrayController.h similarity index 100% rename from Preferences/General/AppcastArrayController.h rename to Preferences/Preferences/AppcastArrayController.h diff --git a/Preferences/General/AppcastArrayController.m b/Preferences/Preferences/AppcastArrayController.m similarity index 100% rename from Preferences/General/AppcastArrayController.m rename to Preferences/Preferences/AppcastArrayController.m diff --git a/Preferences/General/Base.lproj/Preferences.xib b/Preferences/Preferences/Base.lproj/Preferences.xib similarity index 100% rename from Preferences/General/Base.lproj/Preferences.xib rename to Preferences/Preferences/Base.lproj/Preferences.xib diff --git a/Preferences/General/English.lproj/InfoPlist.strings b/Preferences/Preferences/English.lproj/InfoPlist.strings similarity index 100% rename from Preferences/General/English.lproj/InfoPlist.strings rename to Preferences/Preferences/English.lproj/InfoPlist.strings diff --git a/Preferences/General/English.lproj/Localizable.strings b/Preferences/Preferences/English.lproj/Localizable.strings similarity index 100% rename from Preferences/General/English.lproj/Localizable.strings rename to Preferences/Preferences/English.lproj/Localizable.strings diff --git a/Preferences/General/GeneralPreferencePane.h b/Preferences/Preferences/GeneralPreferencePane.h similarity index 100% rename from Preferences/General/GeneralPreferencePane.h rename to Preferences/Preferences/GeneralPreferencePane.h diff --git a/Preferences/General/GeneralPreferencePane.m b/Preferences/Preferences/GeneralPreferencePane.m similarity index 100% rename from Preferences/General/GeneralPreferencePane.m rename to Preferences/Preferences/GeneralPreferencePane.m diff --git a/Preferences/General/GeneralPreferencesPlugin.h b/Preferences/Preferences/GeneralPreferencesPlugin.h similarity index 100% rename from Preferences/General/GeneralPreferencesPlugin.h rename to Preferences/Preferences/GeneralPreferencesPlugin.h diff --git a/Preferences/General/GeneralPreferencesPlugin.m b/Preferences/Preferences/GeneralPreferencesPlugin.m similarity index 100% rename from Preferences/General/GeneralPreferencesPlugin.m rename to Preferences/Preferences/GeneralPreferencesPlugin.m diff --git a/Preferences/General/HotKeyControl.h b/Preferences/Preferences/HotKeyControl.h similarity index 100% rename from Preferences/General/HotKeyControl.h rename to Preferences/Preferences/HotKeyControl.h diff --git a/Preferences/General/HotKeyControl.m b/Preferences/Preferences/HotKeyControl.m similarity index 100% rename from Preferences/General/HotKeyControl.m rename to Preferences/Preferences/HotKeyControl.m diff --git a/Preferences/General/HotKeyPane.h b/Preferences/Preferences/HotKeyPane.h similarity index 100% rename from Preferences/General/HotKeyPane.h rename to Preferences/Preferences/HotKeyPane.h diff --git a/Preferences/General/HotKeyPane.m b/Preferences/Preferences/HotKeyPane.m similarity index 100% rename from Preferences/General/HotKeyPane.m rename to Preferences/Preferences/HotKeyPane.m diff --git a/Preferences/General/Icons/appearance.png b/Preferences/Preferences/Icons/appearance.png similarity index 100% rename from Preferences/General/Icons/appearance.png rename to Preferences/Preferences/Icons/appearance.png diff --git a/Preferences/General/Icons/appearance@2x.png b/Preferences/Preferences/Icons/appearance@2x.png similarity index 100% rename from Preferences/General/Icons/appearance@2x.png rename to Preferences/Preferences/Icons/appearance@2x.png diff --git a/Preferences/General/Icons/apple_remote.png b/Preferences/Preferences/Icons/apple_remote.png similarity index 100% rename from Preferences/General/Icons/apple_remote.png rename to Preferences/Preferences/Icons/apple_remote.png diff --git a/Preferences/General/Icons/file_tree.png b/Preferences/Preferences/Icons/file_tree.png similarity index 100% rename from Preferences/General/Icons/file_tree.png rename to Preferences/Preferences/Icons/file_tree.png diff --git a/Preferences/General/Icons/growl.png b/Preferences/Preferences/Icons/growl.png similarity index 100% rename from Preferences/General/Icons/growl.png rename to Preferences/Preferences/Icons/growl.png diff --git a/Preferences/General/Icons/growl@2x.png b/Preferences/Preferences/Icons/growl@2x.png similarity index 100% rename from Preferences/General/Icons/growl@2x.png rename to Preferences/Preferences/Icons/growl@2x.png diff --git a/Preferences/General/Icons/hot_keys.png b/Preferences/Preferences/Icons/hot_keys.png similarity index 100% rename from Preferences/General/Icons/hot_keys.png rename to Preferences/Preferences/Icons/hot_keys.png diff --git a/Preferences/General/Icons/lastfm.png b/Preferences/Preferences/Icons/lastfm.png similarity index 100% rename from Preferences/General/Icons/lastfm.png rename to Preferences/Preferences/Icons/lastfm.png diff --git a/Preferences/General/Icons/lastfm@2x.png b/Preferences/Preferences/Icons/lastfm@2x.png similarity index 100% rename from Preferences/General/Icons/lastfm@2x.png rename to Preferences/Preferences/Icons/lastfm@2x.png diff --git a/Preferences/General/Icons/midi.png b/Preferences/Preferences/Icons/midi.png similarity index 100% rename from Preferences/General/Icons/midi.png rename to Preferences/Preferences/Icons/midi.png diff --git a/Preferences/General/Icons/midi@2x.png b/Preferences/Preferences/Icons/midi@2x.png similarity index 100% rename from Preferences/General/Icons/midi@2x.png rename to Preferences/Preferences/Icons/midi@2x.png diff --git a/Preferences/General/Icons/output.png b/Preferences/Preferences/Icons/output.png similarity index 100% rename from Preferences/General/Icons/output.png rename to Preferences/Preferences/Icons/output.png diff --git a/Preferences/General/Icons/playlist.png b/Preferences/Preferences/Icons/playlist.png similarity index 100% rename from Preferences/General/Icons/playlist.png rename to Preferences/Preferences/Icons/playlist.png diff --git a/Preferences/General/Icons/playlist@2x.png b/Preferences/Preferences/Icons/playlist@2x.png similarity index 100% rename from Preferences/General/Icons/playlist@2x.png rename to Preferences/Preferences/Icons/playlist@2x.png diff --git a/Preferences/General/Icons/updates.png b/Preferences/Preferences/Icons/updates.png similarity index 100% rename from Preferences/General/Icons/updates.png rename to Preferences/Preferences/Icons/updates.png diff --git a/Preferences/General/Icons/updates@2x.png b/Preferences/Preferences/Icons/updates@2x.png similarity index 100% rename from Preferences/General/Icons/updates@2x.png rename to Preferences/Preferences/Icons/updates@2x.png diff --git a/Preferences/General/Info.plist b/Preferences/Preferences/Info.plist similarity index 100% rename from Preferences/General/Info.plist rename to Preferences/Preferences/Info.plist diff --git a/Preferences/General/MIDIFlavorBehaviorArrayController.h b/Preferences/Preferences/MIDIFlavorBehaviorArrayController.h similarity index 100% rename from Preferences/General/MIDIFlavorBehaviorArrayController.h rename to Preferences/Preferences/MIDIFlavorBehaviorArrayController.h diff --git a/Preferences/General/MIDIFlavorBehaviorArrayController.m b/Preferences/Preferences/MIDIFlavorBehaviorArrayController.m similarity index 100% rename from Preferences/General/MIDIFlavorBehaviorArrayController.m rename to Preferences/Preferences/MIDIFlavorBehaviorArrayController.m diff --git a/Preferences/General/MIDIPane.h b/Preferences/Preferences/MIDIPane.h similarity index 100% rename from Preferences/General/MIDIPane.h rename to Preferences/Preferences/MIDIPane.h diff --git a/Preferences/General/MIDIPane.m b/Preferences/Preferences/MIDIPane.m similarity index 100% rename from Preferences/General/MIDIPane.m rename to Preferences/Preferences/MIDIPane.m diff --git a/Preferences/General/MIDIPluginBehaviorArrayController.h b/Preferences/Preferences/MIDIPluginBehaviorArrayController.h similarity index 100% rename from Preferences/General/MIDIPluginBehaviorArrayController.h rename to Preferences/Preferences/MIDIPluginBehaviorArrayController.h diff --git a/Preferences/General/MIDIPluginBehaviorArrayController.m b/Preferences/Preferences/MIDIPluginBehaviorArrayController.m similarity index 100% rename from Preferences/General/MIDIPluginBehaviorArrayController.m rename to Preferences/Preferences/MIDIPluginBehaviorArrayController.m diff --git a/Preferences/General/MIDIPluginFlavorTransformer.h b/Preferences/Preferences/MIDIPluginFlavorTransformer.h similarity index 100% rename from Preferences/General/MIDIPluginFlavorTransformer.h rename to Preferences/Preferences/MIDIPluginFlavorTransformer.h diff --git a/Preferences/General/MIDIPluginFlavorTransformer.m b/Preferences/Preferences/MIDIPluginFlavorTransformer.m similarity index 100% rename from Preferences/General/MIDIPluginFlavorTransformer.m rename to Preferences/Preferences/MIDIPluginFlavorTransformer.m diff --git a/Preferences/General/OutputPane.h b/Preferences/Preferences/OutputPane.h similarity index 100% rename from Preferences/General/OutputPane.h rename to Preferences/Preferences/OutputPane.h diff --git a/Preferences/General/OutputPane.m b/Preferences/Preferences/OutputPane.m similarity index 100% rename from Preferences/General/OutputPane.m rename to Preferences/Preferences/OutputPane.m diff --git a/Preferences/General/OutputsArrayController.h b/Preferences/Preferences/OutputsArrayController.h similarity index 100% rename from Preferences/General/OutputsArrayController.h rename to Preferences/Preferences/OutputsArrayController.h diff --git a/Preferences/General/OutputsArrayController.m b/Preferences/Preferences/OutputsArrayController.m similarity index 100% rename from Preferences/General/OutputsArrayController.m rename to Preferences/Preferences/OutputsArrayController.m diff --git a/Preferences/General/PathToFileTransformer.h b/Preferences/Preferences/PathToFileTransformer.h similarity index 100% rename from Preferences/General/PathToFileTransformer.h rename to Preferences/Preferences/PathToFileTransformer.h diff --git a/Preferences/General/PathToFileTransformer.m b/Preferences/Preferences/PathToFileTransformer.m similarity index 100% rename from Preferences/General/PathToFileTransformer.m rename to Preferences/Preferences/PathToFileTransformer.m diff --git a/Preferences/General/PlaylistBehaviorArrayController.h b/Preferences/Preferences/PlaylistBehaviorArrayController.h similarity index 100% rename from Preferences/General/PlaylistBehaviorArrayController.h rename to Preferences/Preferences/PlaylistBehaviorArrayController.h diff --git a/Preferences/General/PlaylistBehaviorArrayController.m b/Preferences/Preferences/PlaylistBehaviorArrayController.m similarity index 100% rename from Preferences/General/PlaylistBehaviorArrayController.m rename to Preferences/Preferences/PlaylistBehaviorArrayController.m diff --git a/Preferences/General/General.xcodeproj/project.pbxproj b/Preferences/Preferences/Preferences.xcodeproj/project.pbxproj similarity index 96% rename from Preferences/General/General.xcodeproj/project.pbxproj rename to Preferences/Preferences/Preferences.xcodeproj/project.pbxproj index 3ee2a52f6..9e4516208 100644 --- a/Preferences/General/General.xcodeproj/project.pbxproj +++ b/Preferences/Preferences/Preferences.xcodeproj/project.pbxproj @@ -94,7 +94,7 @@ 17C7E5AF0DCCC30A003CBCF7 /* playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playlist.png; path = Icons/playlist.png; sourceTree = ""; }; 17D1B3F60F6349CE00694C57 /* PreferencePanePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferencePanePlugin.h; path = ../PreferencePanePlugin.h; sourceTree = SOURCE_ROOT; }; 17E78A7D0D68BE3C005C5A59 /* file_tree.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = file_tree.png; path = Icons/file_tree.png; sourceTree = ""; }; - 32DBCF630370AF2F00C91783 /* General_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = General_Prefix.pch; sourceTree = ""; }; + 32DBCF630370AF2F00C91783 /* Preferences_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Preferences_Prefix.pch; sourceTree = ""; }; 3DFAC48E235B6B8100A29416 /* DEVELOPMENT_TEAM.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DEVELOPMENT_TEAM.xcconfig; sourceTree = ""; }; 3DFAC48F235B6B8100A29416 /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = ""; }; 833F681B1CDBCAA700AFB9F0 /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -129,7 +129,7 @@ 83F27E6A1810DD3A00CEF538 /* updates@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "updates@2x.png"; path = "Icons/updates@2x.png"; sourceTree = ""; }; 83F27E721810E45D00CEF538 /* PathToFileTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathToFileTransformer.h; sourceTree = ""; }; 83F27E731810E45D00CEF538 /* PathToFileTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PathToFileTransformer.m; sourceTree = ""; }; - 8D5B49B6048680CD000E48DA /* General.preferencePane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = General.preferencePane; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D5B49B6048680CD000E48DA /* Preferences.preferencePane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Preferences.preferencePane; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8E07AA800AAC8EA200A4B32F /* HotKeyPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HotKeyPane.h; sourceTree = ""; }; 8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HotKeyPane.m; sourceTree = ""; }; @@ -160,7 +160,7 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 089C166AFE841209C02AAC07 /* General */ = { + 089C166AFE841209C02AAC07 /* Preferences */ = { isa = PBXGroup; children = ( 08FB77AFFE84173DC02AAC07 /* Classes */, @@ -170,7 +170,7 @@ 3DFAC48D235B6B8100A29416 /* Xcode-config */, 19C28FB8FE9D52D311CA2CBB /* Products */, ); - name = General; + name = Preferences; sourceTree = ""; }; 089C1671FE841209C02AAC07 /* Frameworks and Libraries */ = { @@ -269,7 +269,7 @@ 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8D5B49B6048680CD000E48DA /* General.preferencePane */, + 8D5B49B6048680CD000E48DA /* Preferences.preferencePane */, ); name = Products; sourceTree = ""; @@ -277,7 +277,7 @@ 32C88E010371C26100C91783 /* Other Sources */ = { isa = PBXGroup; children = ( - 32DBCF630370AF2F00C91783 /* General_Prefix.pch */, + 32DBCF630370AF2F00C91783 /* Preferences_Prefix.pch */, ); name = "Other Sources"; sourceTree = ""; @@ -337,9 +337,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* General */ = { + 8D5B49AC048680CD000E48DA /* Preferences */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "General" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Preferences" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -351,10 +351,10 @@ dependencies = ( 8384918A1808594800E7332D /* PBXTargetDependency */, ); - name = General; + name = Preferences; productInstallPath = "$(HOME)/Library/Bundles"; - productName = General; - productReference = 8D5B49B6048680CD000E48DA /* General.preferencePane */; + productName = Preferences; + productReference = 8D5B49B6048680CD000E48DA /* Preferences.preferencePane */; productType = "com.apple.product-type.bundle"; }; /* End PBXNativeTarget section */ @@ -371,7 +371,7 @@ }; }; }; - buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "General" */; + buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Preferences" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 1; @@ -387,7 +387,7 @@ sv, he, ); - mainGroup = 089C166AFE841209C02AAC07 /* General */; + mainGroup = 089C166AFE841209C02AAC07 /* Preferences */; projectDirPath = ""; projectReferences = ( { @@ -397,7 +397,7 @@ ); projectRoot = ""; targets = ( - 8D5B49AC048680CD000E48DA /* General */, + 8D5B49AC048680CD000E48DA /* Preferences */, ); }; /* End PBXProject section */ @@ -517,11 +517,11 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = General_Prefix.pch; + GCC_PREFIX_HEADER = Preferences_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; PRODUCT_BUNDLE_IDENTIFIER = org.cogx.cog.preferences; - PRODUCT_NAME = General; + PRODUCT_NAME = Preferences; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; WRAPPER_EXTENSION = preferencePane; @@ -537,11 +537,11 @@ COMBINE_HIDPI_IMAGES = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = General_Prefix.pch; + GCC_PREFIX_HEADER = Preferences_Prefix.pch; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; PRODUCT_BUNDLE_IDENTIFIER = org.cogx.cog.preferences; - PRODUCT_NAME = General; + PRODUCT_NAME = Preferences; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; WRAPPER_EXTENSION = preferencePane; @@ -642,7 +642,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "General" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Preferences" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, @@ -651,7 +651,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "General" */ = { + 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Preferences" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913F08733D840010E9CD /* Debug */, diff --git a/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme b/Preferences/Preferences/Preferences.xcodeproj/xcshareddata/xcschemes/Preferences.xcscheme similarity index 81% rename from Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme rename to Preferences/Preferences/Preferences.xcodeproj/xcshareddata/xcschemes/Preferences.xcscheme index 592458693..b6c849bd4 100644 --- a/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme +++ b/Preferences/Preferences/Preferences.xcodeproj/xcshareddata/xcschemes/Preferences.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "Preferences.preferencePane" + BlueprintName = "Preferences" + ReferencedContainer = "container:Preferences.xcodeproj"> @@ -44,9 +44,9 @@ + BuildableName = "Preferences.preferencePane" + BlueprintName = "Preferences" + ReferencedContainer = "container:Preferences.xcodeproj"> @@ -60,9 +60,9 @@ + BuildableName = "Preferences.preferencePane" + BlueprintName = "Preferences" + ReferencedContainer = "container:Preferences.xcodeproj"> diff --git a/Preferences/General/General_Prefix.pch b/Preferences/Preferences/Preferences_Prefix.pch similarity index 100% rename from Preferences/General/General_Prefix.pch rename to Preferences/Preferences/Preferences_Prefix.pch diff --git a/Preferences/General/ResamplerBehaviorArrayController.h b/Preferences/Preferences/ResamplerBehaviorArrayController.h similarity index 100% rename from Preferences/General/ResamplerBehaviorArrayController.h rename to Preferences/Preferences/ResamplerBehaviorArrayController.h diff --git a/Preferences/General/ResamplerBehaviorArrayController.m b/Preferences/Preferences/ResamplerBehaviorArrayController.m similarity index 100% rename from Preferences/General/ResamplerBehaviorArrayController.m rename to Preferences/Preferences/ResamplerBehaviorArrayController.m diff --git a/Preferences/General/SS_PreferencePaneProtocol.h b/Preferences/Preferences/SS_PreferencePaneProtocol.h similarity index 100% rename from Preferences/General/SS_PreferencePaneProtocol.h rename to Preferences/Preferences/SS_PreferencePaneProtocol.h diff --git a/Preferences/General/VolumeBehaviorArrayController.h b/Preferences/Preferences/VolumeBehaviorArrayController.h similarity index 100% rename from Preferences/General/VolumeBehaviorArrayController.h rename to Preferences/Preferences/VolumeBehaviorArrayController.h diff --git a/Preferences/General/VolumeBehaviorArrayController.m b/Preferences/Preferences/VolumeBehaviorArrayController.m similarity index 100% rename from Preferences/General/VolumeBehaviorArrayController.m rename to Preferences/Preferences/VolumeBehaviorArrayController.m diff --git a/Preferences/General/en.lproj/InfoPlist.strings b/Preferences/Preferences/en.lproj/InfoPlist.strings similarity index 100% rename from Preferences/General/en.lproj/InfoPlist.strings rename to Preferences/Preferences/en.lproj/InfoPlist.strings diff --git a/Preferences/General/en.lproj/Localizable.strings b/Preferences/Preferences/en.lproj/Localizable.strings similarity index 100% rename from Preferences/General/en.lproj/Localizable.strings rename to Preferences/Preferences/en.lproj/Localizable.strings diff --git a/Preferences/General/en.lproj/Preferences.strings b/Preferences/Preferences/en.lproj/Preferences.strings similarity index 100% rename from Preferences/General/en.lproj/Preferences.strings rename to Preferences/Preferences/en.lproj/Preferences.strings diff --git a/Preferences/General/es.lproj/InfoPlist.strings b/Preferences/Preferences/es.lproj/InfoPlist.strings similarity index 100% rename from Preferences/General/es.lproj/InfoPlist.strings rename to Preferences/Preferences/es.lproj/InfoPlist.strings diff --git a/Preferences/General/es.lproj/Localizable.strings b/Preferences/Preferences/es.lproj/Localizable.strings similarity index 100% rename from Preferences/General/es.lproj/Localizable.strings rename to Preferences/Preferences/es.lproj/Localizable.strings diff --git a/Preferences/General/es.lproj/Preferences.strings b/Preferences/Preferences/es.lproj/Preferences.strings similarity index 100% rename from Preferences/General/es.lproj/Preferences.strings rename to Preferences/Preferences/es.lproj/Preferences.strings diff --git a/Preferences/PreferencesController.m b/Preferences/PreferencesController.m index c594eec06..0325b3299 100644 --- a/Preferences/PreferencesController.m +++ b/Preferences/PreferencesController.m @@ -16,7 +16,7 @@ { if (nil == window) { // Determine path to the sample preference panes - NSString *pluginPath = [[NSBundle mainBundle] pathForResource:@"General" ofType:@"preferencePane"]; + NSString *pluginPath = [[NSBundle mainBundle] pathForResource:@"Preferences" ofType:@"preferencePane"]; NSBundle *bundle = [NSBundle bundleWithPath:pluginPath]; PreferencePluginController *pluginController = [[PreferencePluginController alloc] initWithPlugins:@[bundle]];