summaryrefslogtreecommitdiff
path: root/tikzit/src/osx/PreferenceController.m
diff options
context:
space:
mode:
authorJohan Paulsson <gonz@Akita.local>2013-12-01 23:25:55 -0800
committerJohan Paulsson <gonz@Akita.local>2013-12-01 23:25:55 -0800
commit7e7e0607d0ab5a5c28ae593adc4a3235ee4b429e (patch)
treef45552412d4434eff10fa470f4f904ae0c920677 /tikzit/src/osx/PreferenceController.m
parent2b7726352d1d422d4284618c8762637f64ec9a68 (diff)
osx gui: Added preference tab for Sparkle updater.
Diffstat (limited to 'tikzit/src/osx/PreferenceController.m')
-rw-r--r--tikzit/src/osx/PreferenceController.m28
1 files changed, 9 insertions, 19 deletions
diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m
index 75d7ef7..6ccedd0 100644
--- a/tikzit/src/osx/PreferenceController.m
+++ b/tikzit/src/osx/PreferenceController.m
@@ -30,25 +30,7 @@
@implementation PreferenceController
-- (id)initWithWindow:(NSWindow *)window
-{
- self = [super initWithWindow:window];
- if (self) {
- // Initialization code here.
- }
-
- return self;
-}
-
-- (void)windowDidLoad
-{
- [super windowDidLoad];
-
- // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
-}
-
- (NSRect)newFrameForNewContentView:(NSView*)view {
-
NSWindow *window = [self window];
NSRect newFrameRect = [window frameRectForContentRect:[view frame]];
NSRect oldFrameRect = [window frame];
@@ -73,6 +55,9 @@
case 1:
view = engineView;
break;
+ case 2:
+ view = updateView;
+ break;
}
return view;
@@ -90,6 +75,11 @@
[[self window] setContentSize:[generalView frame].size];
[[[self window] contentView] addSubview:generalView];
[[[self window] contentView] setWantsLayer:YES];
+
+ updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil];
+ [[updateController view] setFrame:[updateView frame]];
+ [[[self window] contentView] replaceSubview:updateView with:[updateController view]];
+ updateView = [updateController view];
}
- (IBAction)switchView:(id)sender {
@@ -110,7 +100,7 @@
[[[self window] animator] setFrame:newFrame display:YES];
[NSAnimationContext endGrouping];
-
+
}
@end