diff options
author | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-17 17:51:10 +0000 |
---|---|---|
committer | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-17 18:00:22 +0000 |
commit | 5ac1d383d2a89d22fbf54d688d64bf6a1036df6b (patch) | |
tree | 4633a52220e18eb0be7db5bae90d7b6e286c4d38 /tikzit/src/gtk/Application.m | |
parent | 410fdf146246e014f1598e1880b5326e75159c43 (diff) |
Factor out properties pane from properties window
PropertiesWindow is now ContextWindow.
Preparing for putting more stuff in this window.
Diffstat (limited to 'tikzit/src/gtk/Application.m')
-rw-r--r-- | tikzit/src/gtk/Application.m | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tikzit/src/gtk/Application.m b/tikzit/src/gtk/Application.m index a7f1824..cdf4b4e 100644 --- a/tikzit/src/gtk/Application.m +++ b/tikzit/src/gtk/Application.m @@ -21,7 +21,7 @@ #import "EdgeStylesModel.h" #import "NodeStylesModel.h" #import "PreambleEditor.h" -#import "PropertiesWindow.h" +#import "ContextWindow.h" #import "Shape.h" #import "StyleManager.h" #import "StyleManager+Storage.h" @@ -134,8 +134,9 @@ Application* app = nil; object:toolBox]; [toolBox show]; - propertiesWindow = [[PropertiesWindow alloc] init]; - [propertiesWindow loadConfiguration:configFile]; + contextWindow = [[ContextWindow alloc] initWithNodeStylesModel:nsm + andEdgeStylesModel:esm]; + [contextWindow loadConfiguration:configFile]; app = [self retain]; } @@ -191,7 +192,7 @@ Application* app = nil; [tools release]; [activeTool release]; [toolBox release]; - [propertiesWindow release]; + [contextWindow release]; [super dealloc]; } @@ -270,8 +271,8 @@ Application* app = nil; #endif } -- (void) showPropertyEditor { - [propertiesWindow present]; +- (void) showContextWindow { + [contextWindow present]; } - (void) showPreviewForDocument:(TikzDocument*)doc { @@ -319,7 +320,7 @@ Application* app = nil; } [toolBox saveConfiguration:configFile]; - [propertiesWindow saveConfiguration:configFile]; + [contextWindow saveConfiguration:configFile]; if (lastOpenFolder != nil) { [configFile setStringEntry:@"lastOpenFolder" inGroup:@"Paths" value:lastOpenFolder]; @@ -361,7 +362,7 @@ Application* app = nil; } - (void) windowDocumentChanged:(NSNotification*)n { - [propertiesWindow setDocument:[[n userInfo] objectForKey:@"document"]]; + [contextWindow setDocument:[[n userInfo] objectForKey:@"document"]]; } @end @@ -371,7 +372,7 @@ Application* app = nil; name:@"DocumentChanged" object:nil]; - [propertiesWindow setDocument:[window document]]; + [contextWindow setDocument:[window document]]; [[NSNotificationCenter defaultCenter] addObserver:self |