diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-04-01 09:36:46 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-04-01 09:36:46 +0000 |
| commit | ca353feacd19d98d8fee95bcd1bd018431034a1e (patch) | |
| tree | 83f5d0805185028f623ca001a009a06982a9e90b /src/ui/dialog/dialog-manager.cpp | |
| parent | Patch by Daniel_J for 522327 (diff) | |
| download | inkscape-ca353feacd19d98d8fee95bcd1bd018431034a1e.tar.gz inkscape-ca353feacd19d98d8fee95bcd1bd018431034a1e.zip | |
Initial cut of glyph selector dialog is in. Fixes bug #343186.
Fixed bugs:
- https://launchpad.net/bugs/343186
(bzr r9268)
Diffstat (limited to 'src/ui/dialog/dialog-manager.cpp')
| -rw-r--r-- | src/ui/dialog/dialog-manager.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index 30cbed649..6d3bc817e 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -25,6 +25,7 @@ #include "ui/dialog/fill-and-stroke.h" #include "ui/dialog/filter-effects-dialog.h" #include "ui/dialog/find.h" +#include "ui/dialog/glyphs.h" #include "ui/dialog/inkscape-preferences.h" #include "ui/dialog/input.h" #include "ui/dialog/livepatheffect-editor.h" @@ -96,6 +97,7 @@ DialogManager::DialogManager() { registerFactory("FillAndStroke", &create<FillAndStroke, FloatingBehavior>); registerFactory("FilterEffectsDialog", &create<FilterEffectsDialog, FloatingBehavior>); registerFactory("Find", &create<Find, FloatingBehavior>); + registerFactory("Glyphs", &create<GlyphsPanel, FloatingBehavior>); registerFactory("IconPreviewPanel", &create<IconPreviewPanel, FloatingBehavior>); registerFactory("InkscapePreferences", &create<InkscapePreferences, FloatingBehavior>); registerFactory("LayersPanel", &create<LayersPanel, FloatingBehavior>); @@ -123,6 +125,7 @@ DialogManager::DialogManager() { registerFactory("FillAndStroke", &create<FillAndStroke, DockBehavior>); registerFactory("FilterEffectsDialog", &create<FilterEffectsDialog, DockBehavior>); registerFactory("Find", &create<Find, DockBehavior>); + registerFactory("Glyphs", &create<GlyphsPanel, DockBehavior>); registerFactory("IconPreviewPanel", &create<IconPreviewPanel, DockBehavior>); registerFactory("InkscapePreferences", &create<InkscapePreferences, DockBehavior>); registerFactory("LayersPanel", &create<LayersPanel, DockBehavior>); @@ -159,11 +162,11 @@ DialogManager &DialogManager::getInstance() /* Use singleton behavior for floating dialogs */ if (dialogs_type == FLOATING) { static DialogManager *instance = 0; - + if (!instance) instance = new DialogManager(); return *instance; - } + } return *new DialogManager(); } |
