summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/dialog-manager.cpp
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-02-16 05:38:08 +0000
committerJohn Smith <removethis.john.q.public@bigmail.com>2012-02-16 05:38:08 +0000
commit9a48c58cd01c6ab3909fc0fa4b883d2fd15e48ee (patch)
treefe4b71445f19cdb3a421eb079464eba6454eaccc /src/ui/dialog/dialog-manager.cpp
parentPrevent false gtk deprecation warnings in canvas-grid and tidy headers (diff)
downloadinkscape-9a48c58cd01c6ab3909fc0fa4b883d2fd15e48ee.tar.gz
inkscape-9a48c58cd01c6ab3909fc0fa4b883d2fd15e48ee.zip
Fix for 930535 : Convert Font and Text dialog to a dockable dialog
(bzr r10989)
Diffstat (limited to 'src/ui/dialog/dialog-manager.cpp')
-rw-r--r--src/ui/dialog/dialog-manager.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 4781e55ba..308a1247c 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -47,6 +47,7 @@
#include "preferences.h"
#include "ui/dialog/object-attributes.h"
#include "ui/dialog/object-properties.h"
+#include "ui/dialog/text-edit.h"
#ifdef ENABLE_SVG_FONTS
@@ -122,6 +123,7 @@ DialogManager::DialogManager() {
registerFactory("Transformation", &create<Transformation, FloatingBehavior>);
registerFactory("UndoHistory", &create<UndoHistory, FloatingBehavior>);
registerFactory("InputDevices", &create<InputDialog, FloatingBehavior>);
+ registerFactory("TextFont", &create<TextEdit, FloatingBehavior>);
} else {
@@ -152,6 +154,7 @@ DialogManager::DialogManager() {
registerFactory("Transformation", &create<Transformation, DockBehavior>);
registerFactory("UndoHistory", &create<UndoHistory, DockBehavior>);
registerFactory("InputDevices", &create<InputDialog, DockBehavior>);
+ registerFactory("TextFont", &create<TextEdit, DockBehavior>);
}
}