summaryrefslogtreecommitdiff
path: root/tikzit/src/osx/PreferenceController.m
diff options
context:
space:
mode:
authorJohan Paulsson <gonz@Akita.local>2013-12-02 11:28:52 -0800
committerJohan Paulsson <gonz@Akita.local>2013-12-02 11:28:52 -0800
commit000084adfd36c87051fb7df912a00fca35365f4e (patch)
tree236cbe625532de1551d6c465f92eebf8142263ae /tikzit/src/osx/PreferenceController.m
parent7e7e0607d0ab5a5c28ae593adc4a3235ee4b429e (diff)
osx gui: Moved preamble window to preferences.
Moved the preamble window to the preference panel as a new tab. The PreambleController is now a subclass of NSView with related changes to the Preamble.xib. The toolbar that controlled default or custom preamble has been replaced with buttons in the interface.
Diffstat (limited to 'tikzit/src/osx/PreferenceController.m')
-rw-r--r--tikzit/src/osx/PreferenceController.m19
1 files changed, 17 insertions, 2 deletions
diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m
index 6ccedd0..b08cbeb 100644
--- a/tikzit/src/osx/PreferenceController.m
+++ b/tikzit/src/osx/PreferenceController.m
@@ -30,6 +30,14 @@
@implementation PreferenceController
+- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController*)pc{
+ [super initWithWindowNibName:windowNibName];
+
+ preambleController = pc;
+
+ return self;
+}
+
- (NSRect)newFrameForNewContentView:(NSView*)view {
NSWindow *window = [self window];
NSRect newFrameRect = [window frameRectForContentRect:[view frame]];
@@ -51,13 +59,16 @@
default:
case 0:
view = generalView;
- break;
+ break;
case 1:
view = engineView;
- break;
+ break;
case 2:
view = updateView;
break;
+ case 3:
+ view = preambleView;
+ break;
}
return view;
@@ -80,6 +91,10 @@
[[updateController view] setFrame:[updateView frame]];
[[[self window] contentView] replaceSubview:updateView with:[updateController view]];
updateView = [updateController view];
+
+ [[preambleController view] setFrame:[preambleView frame]];
+ [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]];
+ preambleView = [preambleController view];
}
- (IBAction)switchView:(id)sender {