Rework dialog management. Use singleton behavior for dialogs when

[inkscape.git] / src / ui / dialog / document-properties.h

diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index b4e303325828bf3567d11d52f896a2a8be89ed01..a6fe48ffa0ea475f22b0a64b4c160f7ef5cf2041 100644 (file)
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -40,7 +40,6 @@ public:
     void  update();
     static DocumentProperties &getInstance();
     static void destroy();
-    sigc::connection _doc_replaced_connection;
 
     void  update_gridspage();
     
@@ -54,12 +53,16 @@ protected:
     void  init();
     virtual void  on_response (int);
 
+    void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
+    void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
+    void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
+
     Gtk::Tooltips _tt;
     Gtk::Notebook  _notebook;
 
     NotebookPage   _page_page, _page_guides;
     NotebookPage   _page_snap, _page_snap_dtls;
-    NotebookPage   _page_grids;
+    Gtk::VBox      _grids_vbox;
 
     //---------------------------------------------------------------
     RegisteredCheckButton _rcb_canb, _rcb_bord, _rcb_shad;
@@ -70,7 +73,7 @@ protected:
     RegisteredCheckButton _rcbgrid;
     RegisteredUnitMenu    _rums;
     //---------------------------------------------------------------
-    RegisteredCheckButton _rcb_sgui;
+    RegisteredCheckButton _rcb_sgui, _rcbsng;
     RegisteredUnitMenu    _rum_gusn;
     RegisteredColorPicker _rcp_gui, _rcp_hgui;
     //---------------------------------------------------------------
@@ -80,13 +83,17 @@ protected:
     ToleranceSlider       _rsu_sno, _rsu_sn, _rsu_gusn;
     RegisteredRadioButtonPair _rrb_pix;
     //---------------------------------------------------------------
-    RegisteredCheckButton _rcbic, _rcbsng;
+    RegisteredCheckButton _rcbic;
     RegisteredCheckButton _rcbsigg, _rcbsils;
-       //---------------------------------------------------------------
+    //---------------------------------------------------------------
     Gtk::Notebook   _grids_notebook;
+    Gtk::HBox       _grids_hbox_crea;
+    Gtk::Label      _grids_label_crea;
     Gtk::Button     _grids_button_new;
     Gtk::Button     _grids_button_remove;
     Gtk::ComboBoxText _grids_combo_gridtype;
+    Gtk::Label      _grids_label_def;
+    Gtk::HBox       _grids_space;
     //---------------------------------------------------------------
 
     gchar const *_prefs_path;