Index: ui/dialog/panel-dialog.h
===================================================================
--- ui/dialog/panel-dialog.h	(revision 16644)
+++ ui/dialog/panel-dialog.h	(working copy)
@@ -33,16 +33,25 @@
 static void handle_activate_desktop(Inkscape::Application *, SPDesktop *, void *);
 static void handle_deactivate_desktop(Inkscape::Application *, SPDesktop *, void *);
 
-struct PanelDialogBase {
-    virtual void present() =0;
-    virtual Panel &getPanel() =0;
+
+class PanelDialogBase {
+public: 
+    PanelDialogBase(Panel &panel, char const *prefs_path, int const verb_num, 
+                    Glib::ustring const &apply_label) :
+      _panel (panel) { }
+
+    virtual void present() = 0;
     virtual ~PanelDialogBase() {}
 
-private:
-    virtual void _propagateDocumentReplaced(SPDesktop* desktop, SPDocument *document) =0;
-    virtual void _propagateDesktopActivated(Inkscape::Application *, SPDesktop *) =0;
-    virtual void _propagateDesktopDeactivated(Inkscape::Application *, SPDesktop *) =0;
+    virtual Panel &getPanel() { return _panel; }
 
+protected:
+    inline virtual void _propagateDocumentReplaced(SPDesktop* desktop, SPDocument *document);
+    inline virtual void _propagateDesktopActivated(Inkscape::Application *, SPDesktop *);
+    inline virtual void _propagateDesktopDeactivated(Inkscape::Application *, SPDesktop *);
+
+    Panel &_panel;
+    sigc::connection _document_replaced_connection;
     friend void handle_activate_desktop(Inkscape::Application *, SPDesktop *, void *);
     friend void handle_deactivate_desktop(Inkscape::Application *, SPDesktop *, void *);
 };
@@ -59,28 +68,66 @@
     template <typename T>
     static PanelDialog<Behavior> *create();
 
-    virtual void present();
+    virtual void present() { Dialog::present(); }
 
-    Panel &getPanel() { return _panel; }
-
 private:
-    void _propagateDocumentReplaced(SPDesktop* desktop, SPDocument *document);
-    void _propagateDesktopActivated(Inkscape::Application *, SPDesktop *);
-    void _propagateDesktopDeactivated(Inkscape::Application *, SPDesktop *);
-
-    Panel &_panel;
-    sigc::connection _document_replaced_connection;
-
     PanelDialog();  // no constructor without params
     PanelDialog(PanelDialog<Behavior> const &d);                      // no copy
     PanelDialog<Behavior>& operator=(PanelDialog<Behavior> const &d); // no assign
+};
 
+
+template <>
+class PanelDialog<Behavior::FloatingBehavior> : 
+        public PanelDialogBase, public Inkscape::UI::Dialog::Dialog {
+
+public:
+    inline PanelDialog(Panel &contents, char const *prefs_path, int const verb_num, 
+                       Glib::ustring const &apply_label);
+
+    virtual ~PanelDialog() {}
+
+    template <typename T>
+    static PanelDialog<Behavior::FloatingBehavior> *create();
+
+    virtual void present() { Dialog::present(); }
+
+private:
+    PanelDialog();  // no constructor without params
+    PanelDialog(PanelDialog<Behavior::FloatingBehavior> const &d); // no copy
+    PanelDialog<Behavior::FloatingBehavior>& 
+    operator=(PanelDialog<Behavior::FloatingBehavior> const &d);   // no assign
 };
 
+
+
+void
+PanelDialogBase::_propagateDocumentReplaced(SPDesktop *desktop, SPDocument *document)
+{
+    _panel.signalDocumentReplaced().emit(desktop, document);
+}
+
+void
+PanelDialogBase::_propagateDesktopActivated(Inkscape::Application *application, SPDesktop *desktop)
+{
+    _document_replaced_connection = 
+        desktop->connectDocumentReplaced(sigc::mem_fun(*this, &PanelDialogBase::_propagateDocumentReplaced));
+    _panel.signalActivateDesktop().emit(application, desktop);
+}
+
+void
+PanelDialogBase::_propagateDesktopDeactivated(Inkscape::Application *application, SPDesktop *desktop)
+{
+    _document_replaced_connection.disconnect();
+    _panel.signalDeactiveDesktop().emit(application, desktop);
+}
+
+
 template <typename B>
-PanelDialog<B>::PanelDialog(Panel &panel, char const *prefs_path, int const verb_num, Glib::ustring const &apply_label) :
-    Dialog(&B::create, prefs_path, verb_num, apply_label),
-    _panel (panel)
+PanelDialog<B>::PanelDialog(Panel &panel, char const *prefs_path, int const verb_num, 
+                            Glib::ustring const &apply_label) :
+    PanelDialogBase(panel, prefs_path, verb_num, apply_label),
+    Dialog(&B::create, prefs_path, verb_num, apply_label)
 {
     Gtk::VBox *vbox = get_vbox();
     _panel.signalResponse().connect(sigc::mem_fun(*this, &PanelDialog::_handleResponse));
@@ -115,11 +162,42 @@
     return new PanelDialog<B>(panel, panel.getPrefsPath(), panel.getVerb(), panel.getApplyLabel());
 }
 
+
+PanelDialog<Behavior::FloatingBehavior>::PanelDialog(Panel &panel, char const *prefs_path, 
+                                                     int const verb_num, Glib::ustring const &apply_label) :
+    PanelDialogBase(panel, prefs_path, verb_num, apply_label),
+    Dialog(&Behavior::FloatingBehavior::create, prefs_path, verb_num, apply_label)
+{
+    Gtk::VBox *vbox = get_vbox();
+    _panel.signalResponse().connect(sigc::mem_fun(*this, &PanelDialog::_handleResponse));
+    _panel.signalPresent().connect(sigc::mem_fun(*this, &PanelDialog::present));
+
+    vbox->pack_start(_panel, true, true, 0);
+
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+
+    _propagateDesktopActivated(INKSCAPE, desktop);
+
+    _document_replaced_connection = 
+        desktop->connectDocumentReplaced(sigc::mem_fun(*this, &PanelDialog::_propagateDocumentReplaced));
+
+    if (prefs_get_int_attribute ("dialogs", "showclose", 0) || !apply_label.empty()) {
+        // TODO: make the order of buttons obey the global preference
+        if (!apply_label.empty()) {
+            panel.addResponseButton(apply_label, Gtk::RESPONSE_APPLY);
+            panel.setDefaultResponse(Gtk::RESPONSE_APPLY);
+        }
+        panel.addResponseButton(Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE);
+    }
+
+    show_all_children();
+}
+
 /** 
  * Specialize factory method for panel dialogs with floating behavior in order to make them work as
  * singletons, i.e. allow them track the current active desktop.
  */
-template <> template <typename P>
+template <typename P>
 PanelDialog<Behavior::FloatingBehavior> *
 PanelDialog<Behavior::FloatingBehavior>::create()
 {
@@ -134,38 +212,7 @@
     return instance;
 }
 
-template <typename B>
-void
-PanelDialog<B>::present()
-{
-    Dialog::present();
-}
 
-template <typename B>
-void
-PanelDialog<B>::_propagateDocumentReplaced(SPDesktop *desktop, SPDocument *document)
-{
-    _panel.signalDocumentReplaced().emit(desktop, document);
-}
-
-template <typename B>
-void
-PanelDialog<B>::_propagateDesktopActivated(Inkscape::Application *application, SPDesktop *desktop)
-{
-    _document_replaced_connection = 
-        desktop->connectDocumentReplaced(sigc::mem_fun(*this, &PanelDialog::_propagateDocumentReplaced));
-    _panel.signalActivateDesktop().emit(application, desktop);
-}
-
-template <typename B>
-void
-PanelDialog<B>::_propagateDesktopDeactivated(Inkscape::Application *application, SPDesktop *desktop)
-{
-    _document_replaced_connection.disconnect();
-    _panel.signalDeactiveDesktop().emit(application, desktop);
-}
-
-
 static void
 handle_activate_desktop(Inkscape::Application *application, SPDesktop *desktop, void *data)
 {