Changeset 6369

Timestamp:

11/30/08 13:47:13 (1 month ago)

Author:

morris

Message:

Make preference window tabbed with toolbar

Files:

• trunk/Spiral/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
• trunk/Spiral/General.tiff (added)
• trunk/Spiral/Remotes.tiff (added)
• trunk/Spiral/SPPreferencesController.h (modified) (2 diffs)
• trunk/Spiral/SPPreferencesController.m (modified) (4 diffs)
• trunk/Spiral/Spiral.xcodeproj/project.pbxproj (modified) (6 diffs)

trunk/Spiral/SPPreferencesController.h

@@ -30 +30 @@
-
-@interface SPPreferencesController : WIWindowController {
+        IBOutlet NSView                                                 *_generalView;
+        IBOutlet NSView                                                 *_remotesView;
+        
-        IBOutlet NSButton                                               *_playMoviesWhenOpenedButton;
-        IBOutlet NSButton                                               *_simplifyFilenamesButton;
@@ -47 +50 @@
-        IBOutlet NSTextField                                    *_wiiRemoteTextField;
-        IBOutlet NSProgressIndicator                    *_wiiRemoteProgressIndicator;
+        
+        NSView                                                                  *_shownView;
-}
-
-+ (SPPreferencesController *)preferencesController;
+
+- (IBAction)general:(id)sender;
+- (IBAction)remotes:(id)sender;
-
-- (IBAction)playMoviesWhenOpened:(id)sender;

trunk/Spiral/SPPreferencesController.m

@@ -33 +33 @@
-@interface SPPreferencesController(Private)
-
+- (void)_showView:(NSView *)view;
+
-- (void)_updateFastForwardSpeedTextField;
-- (void)_updatePS3RemoteStatus;
@@ -41 +43 @@
-
-@implementation SPPreferencesController(Private)
+
+- (void)_showView:(NSView *)view {
+        NSRect          frame;
+        
+        if(view != _shownView) {
+                [_shownView removeFromSuperview];
+                
+                [view setAlphaValue:0.0];
+                [[[self window] contentView] addSubview:view];
+                
+                frame = [[self window] frame];
+                frame.size = [[self window] frameRectForContentRect:[view frame]].size;
+                frame.origin.y -= frame.size.height - [[self window] frame].size.height;
+                [[self window] setFrame:frame display:YES animate:YES];
+                
+                [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:[[self window] animationResizeTime:frame]]];
+                
+                [[view animator] setAlphaValue:1.0];
+
+                _shownView = view;
+        }
+}
+
+
+
+#pragma mark -
-
-- (void)_updateFastForwardSpeedTextField {
@@ -159 +187 @@
-        [[self window] center];
-        
+        [self general:self];
+
-        [_playMoviesWhenOpenedButton setState:[SPSettings boolForKey:SPPlayMoviesWhenOpened]];
-        [_simplifyFilenamesButton setState:[SPSettings boolForKey:SPSimplifyFilenames]];
@@ -221 +251 @@
-
-
+- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar {
+        NSMutableArray          *identifiers;
+        NSToolbarItem           *item;
+        
+        identifiers = [NSMutableArray array];
+        
+        for(item in [toolbar items])
+                [identifiers addObject:[item itemIdentifier]];
+        
+        return identifiers;
+}
+
+
+
+#pragma mark -
+
+- (IBAction)general:(id)sender {
+        [[self window] setTitle:NSLS(@"General", @"General preferences")];
+
+        [self _showView:_generalView];
+        
+        [[[self window] toolbar] setSelectedItemIdentifier:[[[[self window] toolbar] itemWithTag:0] itemIdentifier]];
+}
+
+
+
+- (IBAction)remotes:(id)sender {
+        [[self window] setTitle:NSLS(@"Remotes", @"Remote preferences")];
+
+        [self _showView:_remotesView];
+        
+        [[[self window] toolbar] setSelectedItemIdentifier:[[[[self window] toolbar] itemWithTag:1] itemIdentifier]];
+}
+
+
+
-#pragma mark -
-

trunk/Spiral/Spiral.xcodeproj/project.pbxproj

@@ -175 +175 @@
-                A5E54A4B0CC2A8E800A608D1 /* SPFullscreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A5E54A490CC2A8E800A608D1 /* SPFullscreenWindow.m */; };
-                A5F2F1E00EDCED790047BD9B /* PlaylistExportGroup.icns in Resources */ = {isa = PBXBuildFile; fileRef = A5F2F1DF0EDCED790047BD9B /* PlaylistExportGroup.icns */; };
+                A5F2FB480EE2ACC50047BD9B /* General.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5F2FB470EE2ACC50047BD9B /* General.tiff */; };
+                A5F2FB4A0EE2ACD00047BD9B /* Remotes.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5F2FB490EE2ACD00047BD9B /* Remotes.tiff */; };
-                A5F34DC50DB7F8EB004C3DF6 /* SPDrillItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A5F34DC10DB7F8EB004C3DF6 /* SPDrillItem.m */; };
-                A5F34DC60DB7F8EB004C3DF6 /* SPDrillListView.m in Sources */ = {isa = PBXBuildFile; fileRef = A5F34DC20DB7F8EB004C3DF6 /* SPDrillListView.m */; };
@@ -496 +498 @@
-                A5E54A490CC2A8E800A608D1 /* SPFullscreenWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFullscreenWindow.m; sourceTree = "<group>"; };
-                A5F2F1DF0EDCED790047BD9B /* PlaylistExportGroup.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PlaylistExportGroup.icns; sourceTree = "<group>"; };
+                A5F2FB470EE2ACC50047BD9B /* General.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = General.tiff; sourceTree = "<group>"; };
+                A5F2FB490EE2ACD00047BD9B /* Remotes.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Remotes.tiff; sourceTree = "<group>"; };
-                A5F34DC10DB7F8EB004C3DF6 /* SPDrillItem.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SPDrillItem.m; sourceTree = "<group>"; };
-                A5F34DC20DB7F8EB004C3DF6 /* SPDrillListView.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SPDrillListView.m; sourceTree = "<group>"; };
@@ -758 +762 @@
-                        children = (
-                                A5373FCC0ED6EA61000B6C9E /* AppleTV.tiff */,
+                                A5F2FB470EE2ACC50047BD9B /* General.tiff */,
-                                A599C6D70ECCC1AA001A0ACB /* HalfViewed.tiff */,
-                                A569CB200CCAB5640046F90E /* HUDBackground.tiff */,
@@ -796 +801 @@
-                                A56D50FB0DB7BD0200F1B2EF /* RemoteNoDeviceFound.tiff */,
-                                A56D50FA0DB7BD0200F1B2EF /* RemoteNotConnected.tiff */,
+                                A5F2FB490EE2ACD00047BD9B /* Remotes.tiff */,
-                                A5697FF30CC97A950046F90E /* RepeatAll.tiff */,
-                                A5697FDA0CC978230046F90E /* RepeatOff.tiff */,
@@ -1148 +1154 @@
-                                A50E4A730CCD46CF0070EBAF /* wmv.icns in Resources */,
-                                A5373FCD0ED6EA61000B6C9E /* AppleTV.tiff in Resources */,
+                                A5F2FB480EE2ACC50047BD9B /* General.tiff in Resources */,
-                                A569CB210CCAB5640046F90E /* HUDBackground.tiff in Resources */,
-                                A569CA610CCAAAD70046F90E /* HUDElapsedTimeBackground.tiff in Resources */,
@@ -1184 +1191 @@
-                                A56D50FE0DB7BD0200F1B2EF /* RemoteNoDeviceFound.tiff in Resources */,
-                                A56D50FD0DB7BD0200F1B2EF /* RemoteNotConnected.tiff in Resources */,
+                                A5F2FB4A0EE2ACD00047BD9B /* Remotes.tiff in Resources */,
-                                A5697FDB0CC978230046F90E /* RepeatOff.tiff in Resources */,
-                                A5697FF40CC97A950046F90E /* RepeatAll.tiff in Resources */,