diff options
Diffstat (limited to 'tikzit/src/osx')
-rw-r--r-- | tikzit/src/osx/AppDelegate.m | 4 | ||||
-rw-r--r-- | tikzit/src/osx/PreambleController.h | 11 | ||||
-rw-r--r-- | tikzit/src/osx/PreambleController.m | 30 | ||||
-rw-r--r-- | tikzit/src/osx/PreferenceController.h | 3 | ||||
-rw-r--r-- | tikzit/src/osx/PreferenceController.m | 19 | ||||
-rw-r--r-- | tikzit/src/osx/Preferences.xib | 91 |
6 files changed, 115 insertions, 43 deletions
diff --git a/tikzit/src/osx/AppDelegate.m b/tikzit/src/osx/AppDelegate.m index affb95c..35484b7 100644 --- a/tikzit/src/osx/AppDelegate.m +++ b/tikzit/src/osx/AppDelegate.m @@ -49,7 +49,7 @@ NSString *preamblePlist = [supportDir stringByAppendingPathComponent:@"preambles.plist"]; preambleController = - [[PreambleController alloc] initWithWindowNibName:@"Preamble" + [[PreambleController alloc] initWithNibName:@"Preamble" plist:preamblePlist styles:[stylePaletteController nodeStyles] edges:[stylePaletteController edgeStyles]]; @@ -67,7 +67,7 @@ preambleController:preambleController tempDir:tempDir]; - preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences"]; + preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences" preambleController:preambleController]; // each application has one global preview controller [PreviewController setDefaultPreviewController:previewController]; diff --git a/tikzit/src/osx/PreambleController.h b/tikzit/src/osx/PreambleController.h index fca52ae..3c7a7c3 100644 --- a/tikzit/src/osx/PreambleController.h +++ b/tikzit/src/osx/PreambleController.h @@ -25,17 +25,14 @@ #import "Preambles.h" #import "Preambles+Coder.h" -@interface PreambleController : NSWindowController { +@interface PreambleController : NSViewController { Preambles *preambles; IBOutlet NSTextView *textView; - IBOutlet NSToolbar *toolbar; - IBOutlet NSToolbarItem *defaultToolbarItem; - IBOutlet NSToolbarItem *customToolbarItem; IBOutlet NSDictionaryController *preambleDictionaryController; + NSDictionary *textAttrs; NSAttributedString *preambleText; NSColor *ghostColor; - NSIndexSet *selectionIndexes; } @@ -44,11 +41,13 @@ @property (retain) NSAttributedString *preambleText; @property (retain) NSIndexSet *selectionIndexes; -- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; +- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; - (void)savePreambles:(NSString*)plist; - (NSString*)currentPreamble; - (NSString*)currentPostamble; - (NSString*)buildDocumentForTikz:(NSString*)tikz; + +- (IBAction)setPreambleToDefault:(id)sender; - (IBAction)setPreamble:(id)sender; - (IBAction)insertDefaultStyles:(id)sender; diff --git a/tikzit/src/osx/PreambleController.m b/tikzit/src/osx/PreambleController.m index af9a778..3e55eaf 100644 --- a/tikzit/src/osx/PreambleController.m +++ b/tikzit/src/osx/PreambleController.m @@ -28,8 +28,8 @@ @synthesize preambleText, preambles; -- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { - [super initWithWindowNibName:windowNibName]; +- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { + [super initWithNibName:nibName bundle:Nil]; preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; [preambles setStyles:sty]; @@ -83,17 +83,6 @@ attributes:textAttrs]]; } -- (void)showWindow:(id)sender { - [super showWindow:sender]; - if ([self useDefaultPreamble]) { - [toolbar setSelectedItemIdentifier:[defaultToolbarItem itemIdentifier]]; - } else { - [toolbar setSelectedItemIdentifier:[customToolbarItem itemIdentifier]]; - } - - [self setPreamble:self]; -} - - (void)savePreambles:(NSString*)plist { [self flushText]; [NSKeyedArchiver archiveRootObject:preambles toFile:plist]; @@ -125,11 +114,16 @@ return selectionIndexes; } +- (IBAction)setPreambleToDefault:(id)sender{ + [self setCurrentPreamble:@"default"]; + [textView setBackgroundColor:ghostColor]; +} + - (IBAction)setPreamble:(id)sender { - if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { - [self setCurrentPreamble:@"default"]; - [textView setBackgroundColor:ghostColor]; - } else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { + //if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { + // [self setCurrentPreamble:@"default"]; + // [textView setBackgroundColor:ghostColor]; + //} else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { NSString *key = nil; if ([selectionIndexes count]==1) { int i = [selectionIndexes firstIndex]; @@ -143,7 +137,7 @@ //NSLog(@"preamble set to custom"); } [textView setBackgroundColor:[NSColor whiteColor]]; - } + //} } - (IBAction)insertDefaultStyles:(id)sender { diff --git a/tikzit/src/osx/PreferenceController.h b/tikzit/src/osx/PreferenceController.h index 04fd324..5a14b72 100644 --- a/tikzit/src/osx/PreferenceController.h +++ b/tikzit/src/osx/PreferenceController.h @@ -24,14 +24,17 @@ #import <Cocoa/Cocoa.h> #import "UpdatePreferenceController.h" +#import "PreambleController.h" @interface PreferenceController : NSWindowController{ IBOutlet NSView *engineView; IBOutlet NSView *generalView; IBOutlet NSView *updateView; + IBOutlet NSView *preambleView; UpdatePreferenceController *updateController; + PreambleController *preambleController; int currentViewTag; } 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 { diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index 3cf1677..dc2e979 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -60,7 +60,7 @@ <int key="NSToolbarDisplayMode">1</int> <int key="NSToolbarSizeMode">1</int> <dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems"> - <object class="NSToolbarItem" key="197F9408-AFB0-404B-B2B6-4DB1250B0A80" id="585789983"> + <object class="NSToolbarItem" key="197F9408-AFB0-404B-B2B6-4DB1250B0A80" id="224936444"> <object class="NSMutableString" key="NSToolbarItemIdentifier"> <characters key="NS.bytes">197F9408-AFB0-404B-B2B6-4DB1250B0A80</characters> </object> @@ -104,6 +104,25 @@ <bool key="NSToolbarIsUserRemovable">YES</bool> <int key="NSToolbarItemVisibilityPriority">0</int> </object> + <object class="NSToolbarItem" key="A96DC4D4-2171-4D05-8C08-8D01B3829158" id="285819678"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">A96DC4D4-2171-4D05-8C08-8D01B3829158</characters> + </object> + <string key="NSToolbarItemLabel">Preamble</string> + <string key="NSToolbarItemPaletteLabel">Preamble</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <reference key="NSToolbarItemImage" ref="31080890"/> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">YES</bool> + <int key="NSToolbarItemTag">3</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> <object class="NSToolbarItem" key="F85FE7C2-9847-4E58-8BF6-BE334E918CA7" id="641338426"> <object class="NSMutableString" key="NSToolbarItemIdentifier"> <characters key="NS.bytes">F85FE7C2-9847-4E58-8BF6-BE334E918CA7</characters> @@ -126,13 +145,15 @@ </dictionary> <array class="NSMutableArray" key="NSToolbarIBAllowedItems"> <reference ref="914743654"/> - <reference ref="585789983"/> + <reference ref="224936444"/> <reference ref="641338426"/> + <reference ref="285819678"/> </array> - <array class="NSMutableArray" key="NSToolbarIBDefaultItems"> + <array key="NSToolbarIBDefaultItems"> <reference ref="914743654"/> <reference ref="641338426"/> - <reference ref="585789983"/> + <reference ref="285819678"/> + <reference ref="224936444"/> </array> <array key="NSToolbarIBSelectableItems" id="0"/> </object> @@ -142,7 +163,6 @@ <string key="NSFrameSize">{480, 270}</string> <reference key="NSSuperview"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> @@ -158,7 +178,6 @@ <string key="NSFrame">{{18, 15}, {214, 18}}</string> <reference key="NSSuperview" ref="103531975"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="292348615"> @@ -280,7 +299,6 @@ <string key="NSFrame">{{214, 40}, {53, 17}}</string> <reference key="NSSuperview" ref="596032684"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> <string key="NSReuseIdentifierKey">_NS:1535</string> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="653425178"> @@ -304,14 +322,23 @@ <string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSClassName">NSView</string> </object> - <object class="NSCustomView" id="661139406"> + <object class="NSCustomView" id="169128791"> <reference key="NSNextResponder"/> <int key="NSvFlags">12</int> <array class="NSMutableArray" key="NSSubviews"/> <string key="NSFrameSize">{480, 115}</string> <reference key="NSSuperview"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="940688117"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">12</int> + <array class="NSMutableArray" key="NSSubviews"/> + <string key="NSFrameSize">{557, 354}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> <string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSClassName">NSView</string> </object> @@ -365,7 +392,7 @@ <object class="IBActionConnection" key="connection"> <string key="label">switchView:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="585789983"/> + <reference key="destination" ref="224936444"/> </object> <int key="connectionID">116</int> </object> @@ -373,11 +400,27 @@ <object class="IBOutletConnection" key="connection"> <string key="label">updateView</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="661139406"/> + <reference key="destination" ref="169128791"/> </object> <int key="connectionID">117</int> </object> <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">switchView:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="285819678"/> + </object> + <int key="connectionID">120</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">preambleView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="940688117"/> + </object> + <int key="connectionID">121</int> + </object> + <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="1005"/> @@ -464,7 +507,8 @@ <array class="NSMutableArray" key="children"> <reference ref="641338426"/> <reference ref="914743654"/> - <reference ref="585789983"/> + <reference ref="224936444"/> + <reference ref="285819678"/> </array> <reference key="parent" ref="1005"/> </object> @@ -753,13 +797,23 @@ </object> <object class="IBObjectRecord"> <int key="objectID">64</int> - <reference key="object" ref="661139406"/> + <reference key="object" ref="169128791"/> <array class="NSMutableArray" key="children"/> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">115</int> - <reference key="object" ref="585789983"/> + <reference key="object" ref="224936444"/> + <reference key="parent" ref="338765480"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">118</int> + <reference key="object" ref="940688117"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">119</int> + <reference key="object" ref="285819678"/> <reference key="parent" ref="338765480"/> </object> </array> @@ -773,6 +827,8 @@ <boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/> <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="118.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="119.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <array key="13.IBNSViewMetadataConstraints"> <reference ref="559306534"/> @@ -819,7 +875,7 @@ <nil key="activeLocalization"/> <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">117</int> + <int key="maxID">121</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -848,6 +904,7 @@ <dictionary class="NSMutableDictionary" key="outlets"> <string key="engineView">NSView</string> <string key="generalView">NSView</string> + <string key="preambleView">NSView</string> <string key="updateView">NSView</string> </dictionary> <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> @@ -859,6 +916,10 @@ <string key="name">generalView</string> <string key="candidateClassName">NSView</string> </object> + <object class="IBToOneOutletInfo" key="preambleView"> + <string key="name">preambleView</string> + <string key="candidateClassName">NSView</string> + </object> <object class="IBToOneOutletInfo" key="updateView"> <string key="name">updateView</string> <string key="candidateClassName">NSView</string> |