From 46d894569372dea8c3e3f698b361f68d6bbebde6 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Thu, 24 Jan 2013 18:21:59 +0000 Subject: Default preamble will include edges in osx. Added checks for null colour as coloured edges is not an option in osx. --- tikzit/src/osx/AppDelegate.m | 4 +++- tikzit/src/osx/PreambleController.h | 2 +- tikzit/src/osx/PreambleController.m | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'tikzit/src/osx') diff --git a/tikzit/src/osx/AppDelegate.m b/tikzit/src/osx/AppDelegate.m index edfaf19..bb1b5d6 100644 --- a/tikzit/src/osx/AppDelegate.m +++ b/tikzit/src/osx/AppDelegate.m @@ -51,7 +51,9 @@ preambleController = [[PreambleController alloc] initWithWindowNibName:@"Preamble" plist:preamblePlist - styles:[stylePaletteController nodeStyles]]; + styles:[stylePaletteController nodeStyles] + edges:[stylePaletteController edgeStyles]]; + char template[] = "/tmp/tikzit_tmp_XXXXXXX"; char *dir = mkdtemp(template); diff --git a/tikzit/src/osx/PreambleController.h b/tikzit/src/osx/PreambleController.h index 4f7fb33..2d5a8ab 100644 --- a/tikzit/src/osx/PreambleController.h +++ b/tikzit/src/osx/PreambleController.h @@ -44,7 +44,7 @@ @property (retain) NSAttributedString *preambleText; @property (retain) NSIndexSet *selectionIndexes; -- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty; +- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; - (void)savePreambles:(NSString*)plist; - (NSString*)currentPreamble; - (NSString*)currentPostamble; diff --git a/tikzit/src/osx/PreambleController.m b/tikzit/src/osx/PreambleController.m index e09a3fc..e424e7b 100644 --- a/tikzit/src/osx/PreambleController.m +++ b/tikzit/src/osx/PreambleController.m @@ -28,11 +28,12 @@ @synthesize preambleText, preambles; -- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty { +- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { [super initWithWindowNibName:windowNibName]; preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; [preambles setStyles:sty]; + [preambles setEdges:edg]; if (preambles == nil) preambles = [[Preambles alloc] init]; preambleText = nil; -- cgit v1.2.3