Dockable dialogs patch applied

(https://sourceforge.net/tracker/?func=detail&atid=604308&aid=1688508&group_id=93438)

(bzr r3613)

6 files changed, 34 insertions, 32 deletions

diff --git a/src/dialogs/iconpreview.cpp b/src/dialogs/iconpreview.cpp
index 90f48a4a6..d0b8b4a8f 100644
--- a/src/dialogs/iconpreview.cpp
+++ b/src/dialogs/iconpreview.cpp
@@ -49,16 +49,16 @@ namespace Dialogs {
 
 IconPreviewPanel* IconPreviewPanel::instance = 0;
 
-
-IconPreviewPanel& IconPreviewPanel::getInstance()
+IconPreviewPanel*
+IconPreviewPanel::create(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory)
 {
     if ( !instance ) {
-        instance = new IconPreviewPanel();
+        instance = new IconPreviewPanel(behavior_factory);
     }
 
     instance->refreshPreview();
 
-    return *instance;
+    return instance;
 }
 
 //#########################################################################
@@ -72,7 +72,7 @@ void IconPreviewPanel::on_button_clicked(int which)
 
         hot = which;
         updateMagnify();
-        queue_draw();
+        get_vbox()->queue_draw();
     }
 }
 
@@ -85,8 +85,8 @@ void IconPreviewPanel::on_button_clicked(int which)
 /**
  * Constructor
  */
-IconPreviewPanel::IconPreviewPanel() :
-    Panel(),
+IconPreviewPanel::IconPreviewPanel(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory) :
+    Inkscape::UI::Dialog::Dialog(behavior_factory, "dialogs.iconpreview", SP_VERB_VIEW_ICON_PREVIEW),
     hot(1),
     refreshButton(0),
     selectionButton(0)
@@ -186,7 +186,7 @@ IconPreviewPanel::IconPreviewPanel() :
 
 
     Gtk::HButtonBox* holder = new Gtk::HButtonBox( Gtk::BUTTONBOX_END );
-    _getContents()->pack_end( *holder, false, false );
+    get_vbox()->pack_end( *holder, false, false );
 
     selectionButton = new Gtk::ToggleButton(_("Selection")); // , GTK_RESPONSE_APPLY
     holder->pack_start( *selectionButton, false, false );
@@ -202,7 +202,7 @@ IconPreviewPanel::IconPreviewPanel() :
     refreshButton->signal_clicked().connect( sigc::mem_fun(*this, &IconPreviewPanel::refreshPreview) );
 
 
-    _getContents()->pack_start(iconBox, Gtk::PACK_EXPAND_WIDGET);
+    get_vbox()->pack_start(iconBox, Gtk::PACK_EXPAND_WIDGET);
 
     show_all_children();
 }
diff --git a/src/dialogs/iconpreview.h b/src/dialogs/iconpreview.h
index e4be831d3..9cfe81b11 100644
--- a/src/dialogs/iconpreview.h
+++ b/src/dialogs/iconpreview.h
@@ -18,9 +18,10 @@
 #include <gtkmm/label.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/image.h>
+#include <gtkmm/togglebutton.h>
 #include <gtkmm/toggletoolbutton.h>
 
-#include "ui/widget/panel.h"
+#include "ui/dialog/dialog.h"
 
 struct SPObject;
 
@@ -32,13 +33,13 @@ namespace Dialogs {
 /**
  * A panel that displays an icon preview
  */
-class IconPreviewPanel : public Inkscape::UI::Widget::Panel
+class IconPreviewPanel : public Inkscape::UI::Dialog::Dialog
 {
 public:
-    IconPreviewPanel();
+    IconPreviewPanel(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory);
     //IconPreviewPanel(Glib::ustring const &label);
 
-    static IconPreviewPanel& getInstance();
+    static IconPreviewPanel *create(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory);
 
     void refreshPreview();
     void modeToggled();
diff --git a/src/dialogs/layers-panel.cpp b/src/dialogs/layers-panel.cpp
index 32a52a373..383d11f57 100644
--- a/src/dialogs/layers-panel.cpp
+++ b/src/dialogs/layers-panel.cpp
@@ -46,13 +46,14 @@ namespace Dialogs {
 
 LayersPanel* LayersPanel::instance = 0;
 
-LayersPanel& LayersPanel::getInstance()
+LayersPanel*
+LayersPanel::create(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory)
 {
     if ( !instance ) {
-        instance = new LayersPanel();
+        instance = new LayersPanel(behavior_factory);
     }
 
-    return *instance;
+    return instance;
 }
 
 enum {
@@ -707,8 +708,8 @@ void LayersPanel::_opacityChanged()
 /**
  * Constructor
  */
-LayersPanel::LayersPanel() :
-    Inkscape::UI::Widget::Panel( Glib::ustring(), "dialogs.layers" ),
+LayersPanel::LayersPanel(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory) :
+    Inkscape::UI::Dialog::Dialog(behavior_factory, "dialogs.layers", SP_VERB_DIALOG_LAYERS),
     _maxNestDepth(20),
     _mgr(0),
     _desktop(0),
@@ -775,10 +776,10 @@ LayersPanel::LayersPanel() :
     _opacityBox.pack_end( _spinBtn, Gtk::PACK_SHRINK );
     _watching.push_back( &_opacityBox );
 
-    _getContents()->pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
+    get_vbox()->pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
 
-    _getContents()->pack_end(_opacityBox, Gtk::PACK_SHRINK);
-    _getContents()->pack_end(_buttonsRow, Gtk::PACK_SHRINK);
+    get_vbox()->pack_end(_opacityBox, Gtk::PACK_SHRINK);
+    get_vbox()->pack_end(_buttonsRow, Gtk::PACK_SHRINK);
 
     _opacityConnection = _opacity.get_adjustment()->signal_value_changed().connect( sigc::mem_fun(*this, &LayersPanel::_opacityChanged) );
 
@@ -859,7 +860,7 @@ LayersPanel::LayersPanel() :
 
     show_all_children();
 
-    restorePanelPrefs();
+    // restorePanelPrefs();
 }
 
 LayersPanel::~LayersPanel()
@@ -892,7 +893,7 @@ void LayersPanel::setDesktop( SPDesktop* desktop )
 
         _desktop = SP_ACTIVE_DESKTOP;
         if ( _desktop ) {
-            setLabel( _desktop->doc()->name );
+            //setLabel( _desktop->doc()->name );
 
             _mgr = _desktop->layer_manager;
             if ( _mgr ) {
diff --git a/src/dialogs/layers-panel.h b/src/dialogs/layers-panel.h
index b253aae27..83c5089fc 100644
--- a/src/dialogs/layers-panel.h
+++ b/src/dialogs/layers-panel.h
@@ -21,8 +21,8 @@
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/spinbutton.h>
 
-#include "ui/widget/panel.h"
 //#include "ui/previewholder.h"
+#include "ui/dialog/dialog.h"
 
 class SPObject;
 
@@ -37,14 +37,14 @@ namespace Dialogs {
 /**
  * A panel that displays layers.
  */
-class LayersPanel : public Inkscape::UI::Widget::Panel
+class LayersPanel : public Inkscape::UI::Dialog::Dialog
 {
 public:
-    LayersPanel();
+    LayersPanel(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory);
     virtual ~LayersPanel();
 
-    static LayersPanel& getInstance();
     //virtual void setOrientation( Gtk::AnchorType how );
+    static LayersPanel *create(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory);
 
     void setDesktop( SPDesktop* desktop );
 
diff --git a/src/dialogs/tiledialog.cpp b/src/dialogs/tiledialog.cpp
index 75311ddd0..e46b6e127 100644
--- a/src/dialogs/tiledialog.cpp
+++ b/src/dialogs/tiledialog.cpp
@@ -612,8 +612,8 @@ static void updateSelectionCallback(Inkscape::Application *inkscape, Inkscape::S
 /**
  * Constructor
  */
-TileDialog::TileDialog()
-    : Dialog ("dialogs.gridtiler", SP_VERB_SELECTION_GRIDTILE)
+TileDialog::TileDialog(Behavior::BehaviorFactory behavior_factory)
+    : Dialog (behavior_factory, "dialogs.gridtiler", SP_VERB_SELECTION_GRIDTILE)
 {
      // bool used by spin button callbacks to stop loops where they change each other.
     updating = false;
diff --git a/src/dialogs/tiledialog.h b/src/dialogs/tiledialog.h
index 69a5ea3e2..5fe114d83 100644
--- a/src/dialogs/tiledialog.h
+++ b/src/dialogs/tiledialog.h
@@ -40,13 +40,13 @@ public:
     /**
      * Constructor
      */
-    TileDialog() ;
-
+    TileDialog(Behavior::BehaviorFactory behavior_factory) ;
 
     /**
      * Factory method
      */
-    static TileDialog *create() { return new TileDialog(); }
+    static TileDialog *create(Behavior::BehaviorFactory behavior_factory)
+    { return new TileDialog(behavior_factory); }
 
     /**
      * Destructor