diff options
| author | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-13 17:19:56 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-13 17:19:56 +0000 |
| commit | 05ce879e69da6aca5982bf95c2f055d4baecea5b (patch) | |
| tree | da1d0f63c1d9d60f11aea81f73fdc1074562db5e | |
| parent | 4ee50a8cf2b592c2ac98a45da63bde6466a9ee9f (diff) | |
Use the correct style manager for creation tools
| -rw-r--r-- | tikzit/src/gtk/Application.m | 4 | ||||
| -rw-r--r-- | tikzit/src/gtk/CreateEdgeTool.m | 7 | ||||
| -rw-r--r-- | tikzit/src/gtk/CreateNodeTool.m | 7 | ||||
| -rw-r--r-- | tikzit/src/gtk/StyleManager+Storage.m | 1 | ||||
| -rw-r--r-- | tikzit/src/gtk/Tool.h | 1 |
5 files changed, 7 insertions, 13 deletions
diff --git a/tikzit/src/gtk/Application.m b/tikzit/src/gtk/Application.m index 11d0cd7..7055252 100644 --- a/tikzit/src/gtk/Application.m +++ b/tikzit/src/gtk/Application.m @@ -105,8 +105,8 @@ Application* app = nil; tools = [[NSArray alloc] initWithObjects: [SelectTool tool], - [CreateNodeTool tool], - [CreateEdgeTool tool], + [CreateNodeTool toolWithStyleManager:styleManager], + [CreateEdgeTool toolWithStyleManager:styleManager], [BoundingBoxTool tool], [HandTool tool], nil]; diff --git a/tikzit/src/gtk/CreateEdgeTool.m b/tikzit/src/gtk/CreateEdgeTool.m index f420b80..b51e729 100644 --- a/tikzit/src/gtk/CreateEdgeTool.m +++ b/tikzit/src/gtk/CreateEdgeTool.m @@ -32,16 +32,13 @@ @synthesize styleManager; @synthesize configurationWidget=configWidget; -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - + (id) toolWithStyleManager:(StyleManager*)sm { return [[[self alloc] initWithStyleManager:sm] autorelease]; } - (id) init { - return [self initWithStyleManager:[StyleManager manager]]; + [self release]; + return nil; } - (id) initWithStyleManager:(StyleManager*)sm { diff --git a/tikzit/src/gtk/CreateNodeTool.m b/tikzit/src/gtk/CreateNodeTool.m index 8f4a0c1..5c8a884 100644 --- a/tikzit/src/gtk/CreateNodeTool.m +++ b/tikzit/src/gtk/CreateNodeTool.m @@ -32,16 +32,13 @@ @synthesize styleManager; @synthesize configurationWidget=configWidget; -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - + (id) toolWithStyleManager:(StyleManager*)sm { return [[[self alloc] initWithStyleManager:sm] autorelease]; } - (id) init { - return [self initWithStyleManager:[StyleManager manager]]; + [self release]; + return nil; } - (id) initWithStyleManager:(StyleManager*)sm { diff --git a/tikzit/src/gtk/StyleManager+Storage.m b/tikzit/src/gtk/StyleManager+Storage.m index 112b885..f4c8232 100644 --- a/tikzit/src/gtk/StyleManager+Storage.m +++ b/tikzit/src/gtk/StyleManager+Storage.m @@ -27,6 +27,7 @@ static NSString *edgeStyleGroupPrefix = @"EdgeStyle "; - (void) loadStylesUsingConfigurationName:(NSString*)name { if (![Configuration configurationExistsWithName:name]) { + NSLog(@"No styles config found"); return; } NSError *error = nil; diff --git a/tikzit/src/gtk/Tool.h b/tikzit/src/gtk/Tool.h index 6f6ba19..22c983e 100644 --- a/tikzit/src/gtk/Tool.h +++ b/tikzit/src/gtk/Tool.h @@ -36,7 +36,6 @@ @property (readonly) GtkWidget *configurationWidget; - (void) loadConfiguration:(Configuration*)config; - (void) saveConfiguration:(Configuration*)config; -+ (id) tool; @end // vim:ft=objc:ts=8:et:sts=4:sw=4 |