diff --git a/Application/AppController.m b/Application/AppController.m index 8884bfb0c..de16643f2 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -192,18 +192,12 @@ increase/decrease as long as the user holds the left/right, plus/minus button */ { id tc = [playlistView tableColumnWithIdentifier:identifier]; - NSArray *visibleColumnIdentifiers = [[NSUserDefaults standardUserDefaults] objectForKey:[playlistView columnVisibilitySaveName]]; - if (visibleColumnIdentifiers) { - NSEnumerator *enumerator = [visibleColumnIdentifiers objectEnumerator]; - id column; - while (column = [enumerator nextObject]) { - if ([visibleColumnIdentifiers containsObject:identifier]) { - [showColumn setState:NSOnState]; - } - else { - [showColumn setState:NSOffState]; - } - } + + if ([tc isHidden]) { + [showColumn setState:NSOffState]; + } + else { + [showColumn setState:NSOnState]; } [showColumn setRepresentedObject: tc]; diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 4ff60eeea..aad08148e 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -29,8 +29,6 @@ 1769D7D20CC2BFF7003F455B /* FileTreeDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 1769D7D00CC2BFF7003F455B /* FileTreeDataSource.m */; }; 1770429C0B8BC53600B86321 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 177042980B8BC53600B86321 /* AppController.m */; }; 1770429E0B8BC53600B86321 /* PlaybackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1770429A0B8BC53600B86321 /* PlaybackController.m */; }; - 177EBF9E0B8BC2A70000BC8C /* AMRemovableColumnsTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EBF7A0B8BC2A70000BC8C /* AMRemovableColumnsTableView.m */; }; - 177EBFA00B8BC2A70000BC8C /* AMRemovableTableColumn.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EBF7C0B8BC2A70000BC8C /* AMRemovableTableColumn.m */; }; 177EBFA20B8BC2A70000BC8C /* AppleRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EBF7F0B8BC2A70000BC8C /* AppleRemote.m */; }; 177EBFA70B8BC2A70000BC8C /* ImageTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EBF870B8BC2A70000BC8C /* ImageTextCell.m */; }; 177EBFAB0B8BC2A70000BC8C /* NDHotKeyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 177EBF8D0B8BC2A70000BC8C /* NDHotKeyControl.m */; }; @@ -69,6 +67,7 @@ 1791FF900CB43A2C0070BC5C /* MediaKeysApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1791FF8E0CB43A2C0070BC5C /* MediaKeysApplication.m */; }; 179790E10C087AB7001D6996 /* OpenURLPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 179790DF0C087AB7001D6996 /* OpenURLPanel.m */; }; 179790F20C087B46001D6996 /* OpenURLPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 179790F00C087B46001D6996 /* OpenURLPanel.nib */; }; + 17B6FA7F0D48225300C3BEF1 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17BF2B270CDD77EB007E1295 /* Sparkle.framework */; }; 17BA9FBF0CC431890015F804 /* ContainerNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 17BA9FBD0CC431890015F804 /* ContainerNode.m */; }; 17BA9FC80CC432060015F804 /* ContainedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 17BA9FC60CC432060015F804 /* ContainedNode.m */; }; 17BB5CED0B8A86010009ACB1 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CEC0B8A86010009ACB1 /* AudioToolbox.framework */; }; @@ -78,7 +77,6 @@ 17BB5EA60B8A87850009ACB1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5EA50B8A87850009ACB1 /* IOKit.framework */; }; 17BBE5BC0CD95CFA00258F7A /* InvertedToolbarWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 17BBE5BB0CD95CFA00258F7A /* InvertedToolbarWindow.m */; }; 17BF2B280CDD7802007E1295 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BF2B270CDD77EB007E1295 /* Sparkle.framework */; }; - 17BF2B370CDD7810007E1295 /* Sparkle.framework in CopyFiles */ = {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 */; }; 17C809930C3BD21D005707C4 /* TagLib.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808B60C3BD1C5005707C4 /* TagLib.bundle */; }; @@ -449,7 +447,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 17BF2B370CDD7810007E1295 /* Sparkle.framework in CopyFiles */, + 17B6FA7F0D48225300C3BEF1 /* Sparkle.framework in CopyFiles */, 17F561400C3BD4F30019975C /* CogAudio.framework in CopyFiles */, 170680840B950164006BA573 /* Growl.framework in CopyFiles */, ); @@ -507,10 +505,6 @@ 177042980B8BC53600B86321 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = ""; }; 177042990B8BC53600B86321 /* PlaybackController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlaybackController.h; sourceTree = ""; }; 1770429A0B8BC53600B86321 /* PlaybackController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PlaybackController.m; sourceTree = ""; }; - 177EBF790B8BC2A70000BC8C /* AMRemovableColumnsTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AMRemovableColumnsTableView.h; sourceTree = ""; }; - 177EBF7A0B8BC2A70000BC8C /* AMRemovableColumnsTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AMRemovableColumnsTableView.m; sourceTree = ""; }; - 177EBF7B0B8BC2A70000BC8C /* AMRemovableTableColumn.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AMRemovableTableColumn.h; sourceTree = ""; }; - 177EBF7C0B8BC2A70000BC8C /* AMRemovableTableColumn.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AMRemovableTableColumn.m; sourceTree = ""; }; 177EBF7E0B8BC2A70000BC8C /* AppleRemote.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppleRemote.h; sourceTree = ""; }; 177EBF7F0B8BC2A70000BC8C /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AppleRemote.m; sourceTree = ""; }; 177EBF860B8BC2A70000BC8C /* ImageTextCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageTextCell.h; sourceTree = ""; }; @@ -763,7 +757,6 @@ isa = PBXGroup; children = ( 178BAB920CD4E1B700B33D47 /* GCWindowMenu */, - 177EBF780B8BC2A70000BC8C /* AMRemovableColumnsTableView */, 177EBF7D0B8BC2A70000BC8C /* AppleRemote */, 177EBF850B8BC2A70000BC8C /* ImageTextCell */, 179790DD0C087AB7001D6996 /* OpenURLPanel */, @@ -773,17 +766,6 @@ path = ThirdParty; sourceTree = ""; }; - 177EBF780B8BC2A70000BC8C /* AMRemovableColumnsTableView */ = { - isa = PBXGroup; - children = ( - 177EBF790B8BC2A70000BC8C /* AMRemovableColumnsTableView.h */, - 177EBF7A0B8BC2A70000BC8C /* AMRemovableColumnsTableView.m */, - 177EBF7B0B8BC2A70000BC8C /* AMRemovableTableColumn.h */, - 177EBF7C0B8BC2A70000BC8C /* AMRemovableTableColumn.m */, - ); - path = AMRemovableColumnsTableView; - sourceTree = ""; - }; 177EBF7D0B8BC2A70000BC8C /* AppleRemote */ = { isa = PBXGroup; children = ( @@ -1609,8 +1591,6 @@ 8E07AAF30AAC910500A4B32F /* SS_PrefsController.m in Sources */, 8E07AB790AAC930B00A4B32F /* PreferencesController.m in Sources */, 171678C00AC8C39E00C28CF3 /* SmartFolderNode.m in Sources */, - 177EBF9E0B8BC2A70000BC8C /* AMRemovableColumnsTableView.m in Sources */, - 177EBFA00B8BC2A70000BC8C /* AMRemovableTableColumn.m in Sources */, 177EBFA20B8BC2A70000BC8C /* AppleRemote.m in Sources */, 177EBFA70B8BC2A70000BC8C /* ImageTextCell.m in Sources */, 177EBFAB0B8BC2A70000BC8C /* NDHotKeyControl.m in Sources */, diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 567a1fe33..4ea9e6d3d 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Frameworks/Sparkle/Sparkle.xcodeproj/project.pbxproj b/Frameworks/Sparkle/Sparkle.xcodeproj/project.pbxproj index 4be8e3777..5471dcb27 100755 --- a/Frameworks/Sparkle/Sparkle.xcodeproj/project.pbxproj +++ b/Frameworks/Sparkle/Sparkle.xcodeproj/project.pbxproj @@ -159,10 +159,6 @@ 61B5F8E409C4CE3C00B25A18 /* SUUpdater.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SUUpdater.m; sourceTree = ""; }; 61B5F8E509C4CE3C00B25A18 /* NSFileManager+Authentication.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = "NSFileManager+Authentication.m"; sourceTree = ""; }; 61B5F8F609C4CEB300B25A18 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = ""; }; - 61B5F90409C4CEE200B25A18 /* Test Application-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = "Test Application-Info.plist"; path = "Test Application/Test Application-Info.plist"; sourceTree = ""; }; - 61B5F92409C4CFC900B25A18 /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = main.m; path = "Test Application/main.m"; sourceTree = ""; }; - 61B5F92B09C4CFD800B25A18 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = "Test Application/English.lproj/InfoPlist.strings"; sourceTree = ""; }; - 61B5F92D09C4CFD800B25A18 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = "Test Application/English.lproj/MainMenu.nib"; sourceTree = ""; }; 61B5FB9409C4F04600B25A18 /* SUAppcast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAppcast.h; sourceTree = ""; }; 61B5FB9509C4F04600B25A18 /* SUAppcast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAppcast.m; sourceTree = ""; }; 61B5FBCB09C4FBAB00B25A18 /* SUUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUtilities.h; sourceTree = ""; }; @@ -339,10 +335,6 @@ isa = PBXGroup; children = ( 61BBDF810A49220C00378739 /* Sparkle.icns */, - 61B5F92A09C4CFD800B25A18 /* InfoPlist.strings */, - 61B5F92C09C4CFD800B25A18 /* MainMenu.nib */, - 61B5F92409C4CFC900B25A18 /* main.m */, - 61B5F90409C4CEE200B25A18 /* Test Application-Info.plist */, ); name = "Test Application Sources"; sourceTree = ""; @@ -587,22 +579,6 @@ name = SUUpdateAlert.nib; sourceTree = ""; }; - 61B5F92A09C4CFD800B25A18 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 61B5F92B09C4CFD800B25A18 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 61B5F92C09C4CFD800B25A18 /* MainMenu.nib */ = { - isa = PBXVariantGroup; - children = ( - 61B5F92D09C4CFD800B25A18 /* English */, - ); - name = MainMenu.nib; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -688,6 +664,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.4; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SYMROOT = ../../build; WARNING_CFLAGS = "-wall"; }; name = Debug; diff --git a/Playlist/PlaylistView.h b/Playlist/PlaylistView.h index a30b53890..97a249b54 100644 --- a/Playlist/PlaylistView.h +++ b/Playlist/PlaylistView.h @@ -11,9 +11,7 @@ #import "PlaybackController.h" #import "PlaylistController.h" -#import "AMRemovableColumnsTableView.h" - -@interface PlaylistView : AMRemovableColumnsTableView { +@interface PlaylistView : NSTableView { IBOutlet PlaybackController *playbackController; IBOutlet PlaylistController *playlistController; diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index 1c8e351ea..84726583b 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -19,12 +19,10 @@ - (void)awakeFromNib { - [super awakeFromNib]; - [[self menu] setAutoenablesItems:NO]; NSControlSize s = NSSmallControlSize; - NSEnumerator *oe = [[self allTableColumns] objectEnumerator]; + NSEnumerator *oe = [[self tableColumns] objectEnumerator]; NSFont *f = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:s]]; NSFont *bf = [[NSFontManager sharedFontManager] convertFont:f toHaveTrait:NSBoldFontMask]; @@ -68,7 +66,7 @@ NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"headerCell.title" ascending:YES]; NSArray *sortDescriptors = [NSArray arrayWithObject:sortDescriptor]; - NSEnumerator *e = [[[[self allTableColumns] allObjects] sortedArrayUsingDescriptors: sortDescriptors] objectEnumerator]; + NSEnumerator *e = [[[self tableColumns] sortedArrayUsingDescriptors: sortDescriptors] objectEnumerator]; int menuIndex = 0; NSTableColumn *col; @@ -77,7 +75,7 @@ [contextMenuItem setTarget:self]; [contextMenuItem setRepresentedObject:col]; - [contextMenuItem setState:([[self visibleTableColumns] containsObject:col] ? NSOnState : NSOffState)]; + [contextMenuItem setState:([col isHidden] ? NSOffState : NSOnState)]; menuIndex++; } @@ -95,12 +93,13 @@ { [sender setState:NSOnState]; - [self showTableColumn:tc]; + [tc setHidden: NO]; } else { [sender setState:NSOffState]; - [self hideTableColumn:tc]; + + [tc setHidden: YES]; } }