summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/dialog-manager.cpp
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2012-01-19 19:45:06 +0000
committerKris <Kris.De.Gussem@hotmail.com>2012-01-19 19:45:06 +0000
commit28dcdf10f9fef7f4c7d7bf7664040aa3c26126fe (patch)
tree446c523f5a28f31ce6423086a293cdfff81f2b8f /src/ui/dialog/dialog-manager.cpp
parentUpdate and documentation of sp-attribute-widget (diff)
downloadinkscape-28dcdf10f9fef7f4c7d7bf7664040aa3c26126fe.tar.gz
inkscape-28dcdf10f9fef7f4c7d7bf7664040aa3c26126fe.zip
Gtkmmification of object attributes dialog: image and link attributes now editable in dockable dialog (Bug #592323)
(bzr r10910)
Diffstat (limited to 'src/ui/dialog/dialog-manager.cpp')
-rw-r--r--src/ui/dialog/dialog-manager.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 95486c5e3..4781e55ba 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -45,6 +45,7 @@
//#include "ui/dialog/print-colors-preview-dialog.h"
#include "util/ege-appear-time-tracker.h"
#include "preferences.h"
+#include "ui/dialog/object-attributes.h"
#include "ui/dialog/object-properties.h"
@@ -108,7 +109,8 @@ DialogManager::DialogManager() {
registerFactory("LivePathEffect", &create<LivePathEffectEditor, FloatingBehavior>);
registerFactory("Memory", &create<Memory, FloatingBehavior>);
registerFactory("Messages", &create<Messages, FloatingBehavior>);
- registerFactory("ObjectProperties", &create<ObjectProperties, FloatingBehavior>);
+ registerFactory("ObjectAttributes", &create<ObjectAttributes, FloatingBehavior>);
+ registerFactory("ObjectProperties", &create<ObjectProperties, FloatingBehavior>);
// registerFactory("PrintColorsPreviewDialog", &create<PrintColorsPreviewDialog, FloatingBehavior>);
registerFactory("Script", &create<ScriptDialog, FloatingBehavior>);
#ifdef ENABLE_SVG_FONTS
@@ -137,7 +139,8 @@ DialogManager::DialogManager() {
registerFactory("LivePathEffect", &create<LivePathEffectEditor, DockBehavior>);
registerFactory("Memory", &create<Memory, DockBehavior>);
registerFactory("Messages", &create<Messages, DockBehavior>);
- registerFactory("ObjectProperties", &create<ObjectProperties, DockBehavior>);
+ registerFactory("ObjectAttributes", &create<ObjectAttributes, DockBehavior>);
+ registerFactory("ObjectProperties", &create<ObjectProperties, DockBehavior>);
// registerFactory("PrintColorsPreviewDialog", &create<PrintColorsPreviewDialog, DockBehavior>);
registerFactory("Script", &create<ScriptDialog, DockBehavior>);
#ifdef ENABLE_SVG_FONTS