summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-04-05 07:22:29 +0000
committerMartin Owens <doctormo@gmail.com>2014-04-05 07:22:29 +0000
commit749e8b0ee6b95f7c704fd326ebe948f9f4a076d2 (patch)
treed95fb579f71deea6592adc59995fbe19f5f091c0 /src
parentAllow command line options -i and -j to effect plain-svg output, this involve... (diff)
downloadinkscape-749e8b0ee6b95f7c704fd326ebe948f9f4a076d2.tar.gz
inkscape-749e8b0ee6b95f7c704fd326ebe948f9f4a076d2.zip
Revert the xml editor to it's dockable behaviour and add a comment for the preferences.
(bzr r13269)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/dialog-manager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 4be796e67..d427e3590 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -96,8 +96,8 @@ DialogManager::DialogManager() {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
int dialogs_type = prefs->getIntLimited("/options/dialogtype/value", DOCK, 0, 1);
+ // The preferences dialog is broken, the DockBehavior code resizes it's floating window to the smallest size
registerFactory("InkscapePreferences", &create<InkscapePreferences, FloatingBehavior>);
- registerFactory("XmlTree", &create<XmlTree, FloatingBehavior>);
if (dialogs_type == FLOATING) {
registerFactory("AlignAndDistribute", &create<AlignAndDistribute, FloatingBehavior>);
@@ -129,6 +129,7 @@ DialogManager::DialogManager() {
registerFactory("SpellCheck", &create<SpellCheck, FloatingBehavior>);
registerFactory("Export", &create<Export, FloatingBehavior>);
registerFactory("CloneTiler", &create<CloneTiler, FloatingBehavior>);
+ registerFactory("XmlTree", &create<XmlTree, FloatingBehavior>);
} else {
@@ -161,6 +162,7 @@ DialogManager::DialogManager() {
registerFactory("SpellCheck", &create<SpellCheck, DockBehavior>);
registerFactory("Export", &create<Export, DockBehavior>);
registerFactory("CloneTiler", &create<CloneTiler, DockBehavior>);
+ registerFactory("XmlTree", &create<XmlTree, DockBehavior>);
}
}