diff options
author | Alex Merry <alex.merry@cs.ox.ac.uk> | 2013-02-04 13:47:58 +0000 |
---|---|---|
committer | Alex Merry <alex.merry@cs.ox.ac.uk> | 2013-02-04 14:22:59 +0000 |
commit | fe1b43c7b7c83e392b60ffc71ac29f7e63810f58 (patch) | |
tree | d1834ac7c5a531e56a0fa073ae690054fee0e6a7 /tikzit/src/gtk/Application.m | |
parent | e92425f179ee806eb27c10b47709b7ea2833a90b (diff) |
Put node and edge style editors into settings dialog
Diffstat (limited to 'tikzit/src/gtk/Application.m')
-rw-r--r-- | tikzit/src/gtk/Application.m | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tikzit/src/gtk/Application.m b/tikzit/src/gtk/Application.m index 61fb85d..4c696a2 100644 --- a/tikzit/src/gtk/Application.m +++ b/tikzit/src/gtk/Application.m @@ -23,6 +23,7 @@ #import "PreambleEditor.h" #import "ContextWindow.h" #import "Shape.h" +#import "SettingsDialog.h" #import "StyleManager.h" #import "StyleManager+Storage.h" #import "SupportDir.h" @@ -34,7 +35,6 @@ #import "Preambles.h" #import "Preambles+Storage.h" #import "PreviewWindow.h" -#import "SettingsDialog.h" #endif #import "BoundingBoxTool.h" @@ -287,13 +287,12 @@ Application* app = nil; } - (void) showSettingsDialog { -#ifdef HAVE_POPPLER if (settingsDialog == nil) { - settingsDialog = [[SettingsDialog alloc] initWithConfiguration:configFile]; + settingsDialog = [[SettingsDialog alloc] initWithConfiguration:configFile + andStyleManager:styleManager]; //[settingsDialog setParentWindow:mainWindow]; } [settingsDialog present]; -#endif } - (Configuration*) mainConfiguration { |