summaryrefslogtreecommitdiff
path: root/tikzit/src/gtk/Application.m
diff options
context:
space:
mode:
authorAlex Merry <alex.merry@cs.ox.ac.uk>2012-12-17 16:15:08 +0000
committerAlex Merry <alex.merry@cs.ox.ac.uk>2012-12-17 16:15:08 +0000
commitf75835e188c1bf8010fb7cc18c7526934ff19eba (patch)
tree4dd93765b1f2834bc9b5a5257e435281fa490830 /tikzit/src/gtk/Application.m
parentbde0c0da1c8d11433d37e905dc9bb4b17e7f6523 (diff)
Use central models for node and edge styles
Diffstat (limited to 'tikzit/src/gtk/Application.m')
-rw-r--r--tikzit/src/gtk/Application.m8
1 files changed, 6 insertions, 2 deletions
diff --git a/tikzit/src/gtk/Application.m b/tikzit/src/gtk/Application.m
index 88293a6..1459355 100644
--- a/tikzit/src/gtk/Application.m
+++ b/tikzit/src/gtk/Application.m
@@ -18,6 +18,8 @@
#import "Application.h"
#import "Configuration.h"
+#import "EdgeStylesModel.h"
+#import "NodeStylesModel.h"
#import "PreambleEditor.h"
#import "PropertiesWindow.h"
#import "Shape.h"
@@ -83,6 +85,8 @@ Application* app = nil;
styleManager = [[StyleManager alloc] init];
[styleManager loadStylesUsingConfigurationName:@"styles"]; // FIXME: error message?
+ NodeStylesModel *nsm = [NodeStylesModel modelWithStyleManager:styleManager];
+ EdgeStylesModel *esm = [EdgeStylesModel modelWithStyleManager:styleManager];
#ifdef HAVE_POPPLER
NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"];
@@ -105,8 +109,8 @@ Application* app = nil;
tools = [[NSArray alloc] initWithObjects:
[SelectTool tool],
- [CreateNodeTool toolWithStyleManager:styleManager],
- [CreateEdgeTool toolWithStyleManager:styleManager],
+ [CreateNodeTool toolWithNodeStylesModel:nsm],
+ [CreateEdgeTool toolWithEdgeStylesModel:esm],
[BoundingBoxTool tool],
[HandTool tool],
nil];