From 05ce879e69da6aca5982bf95c2f055d4baecea5b Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@cs.ox.ac.uk>
Date: Thu, 13 Dec 2012 17:19:56 +0000
Subject: Use the correct style manager for creation tools

---
 tikzit/src/gtk/Application.m          | 4 ++--
 tikzit/src/gtk/CreateEdgeTool.m       | 7 ++-----
 tikzit/src/gtk/CreateNodeTool.m       | 7 ++-----
 tikzit/src/gtk/StyleManager+Storage.m | 1 +
 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
-- 
cgit v1.2.3