Code

Super duper mega (fun!) commit: replaced encoding=utf-8 with fileencoding=utf-8 in...
[inkscape.git] / src / ui / dialog / document-properties.cpp
index 9bf2d761d2c9eb9278079365c17c7aa8012fe010..f22509496ec8685cc96c32241da718e55b660524 100644 (file)
@@ -1,16 +1,16 @@
-/** \file
- *
- * Document properties dialog, Gtkmm-style
- *
- * Authors:
+/** @file
+ * @brief Document properties dialog, Gtkmm-style
+ */
+/* Authors:
  *   bulia byak <buliabyak@users.sf.net>
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Jon Phillips <jon@rejon.org>
  *   Ralf Stephan <ralf@ark.in-berlin.de> (Gtkmm)
+ *   Diederik van Lierop <mail@diedenrezi.nl>
  *
- * Copyright (C) 2006-2007 Johan Engelen  <johan@shouraizou.nl>
- * Copyright (C) 2000 - 2005 Authors
+ * Copyright (C) 2006-2008 Johan Engelen  <johan@shouraizou.nl>
+ * Copyright (C) 2000 - 2008 Authors
  *
  * Released under GNU GPL.  Read the file 'COPYING' for more information
  */
 # include <config.h>
 #endif
 
-
-
-#include <gtkmm.h>
-#include "ui/widget/color-picker.h"
-#include "ui/widget/scalar-unit.h"
-
-#include "xml/node-event-vector.h"
-#include "helper/units.h"
-#include "prefs-utils.h"
-
-#include "inkscape.h"
-#include "verbs.h"
+#include "display/canvas-grid.h"
+#include "document-properties.h"
 #include "document.h"
 #include "desktop-handles.h"
 #include "desktop.h"
+#include <gtkmm.h>
+#include "helper/units.h"
+#include "inkscape.h"
+#include "io/sys.h"
+#include "preferences.h"
 #include "sp-namedview.h"
+#include "sp-object-repr.h"
+#include "sp-root.h"
+#include "sp-script.h"
+#include "ui/widget/color-picker.h"
+#include "ui/widget/scalar-unit.h"
+#include "verbs.h"
+#include "widgets/icon.h"
+#include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
-#include "document-properties.h"
-
-#include "display/canvas-grid.h"
+#if ENABLE_LCMS
+#include <lcms.h>
+//#include "color-profile-fns.h"
+#include "color-profile.h"
+#endif // ENABLE_LCMS
 
 using std::pair;
 
@@ -49,72 +55,85 @@ namespace Dialog {
 #define SPACE_SIZE_X 15
 #define SPACE_SIZE_Y 10
 
+
 //===================================================
 
 //---------------------------------------------------
 
-static DocumentProperties *_instance = 0;
-
 static void on_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data);
 static void on_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data);
 static void on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer);
-static void on_doc_replaced (SPDesktop* dt, SPDocument* doc);
-static void on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*);
-static void on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*);
 
 static Inkscape::XML::NodeEventVector const _repr_events = {
-    on_child_added, /* child_added */
-    on_child_removed, /* child_removed */
+    on_child_added, // child_added
+    on_child_removed, // child_removed
     on_repr_attr_changed,
-    NULL, /* content_changed */
-    NULL  /* order_changed */
+    NULL, // content_changed
+    NULL  // order_changed
 };
 
 
-DocumentProperties*
-DocumentProperties::create()
+DocumentProperties &
+DocumentProperties::getInstance()
 {
-    if (_instance) return _instance;
-    _instance = new DocumentProperties;
-    _instance->init();
-    return _instance;
-}
+    DocumentProperties &instance = *new DocumentProperties();
+    instance.init();
 
-void
-DocumentProperties::destroy()
-{
-    if (_instance)
-    {
-        delete _instance;
-        _instance = 0;
-    }
+    return instance;
 }
 
 DocumentProperties::DocumentProperties()
-    : Dialog ("dialogs.documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
-      _page_page(1, 1), _page_guides(1, 1),
-      _page_snap(1, 1), _page_grids(1, 1),
-      _grids_button_new(_("_New"), _("Create new grid.")),
-      _grids_button_remove(_("_Remove"), _("Remove selected grid.")),
-      _prefs_path("dialogs.documentoptions")
+    : UI::Widget::Panel ("", "/dialogs/documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
+      _page_page(1, 1, true, true), _page_guides(1, 1),
+      _page_snap(1, 1), _page_cms(1, 1), _page_scripting(1, 1),
+    //---------------------------------------------------------------
+      _rcb_canb(_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false),
+      _rcb_bord(_("Border on _top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false),
+      _rcb_shad(_("_Show border shadow"), _("If set, page border shows a shadow on its right and lower side"), "inkscape:showpageshadow", _wr, false),
+      _rcp_bg(_("Back_ground:"), _("Background color"), _("Color and transparency of the page background (also used for bitmap export)"), "pagecolor", "inkscape:pageopacity", _wr),
+      _rcp_bord(_("Border _color:"), _("Page border color"), _("Color of the page border"), "bordercolor", "borderopacity", _wr),
+      _rum_deflt(_("Default _units:"), "inkscape:document-units", _wr),
+      _page_sizer(_wr),
+    //---------------------------------------------------------------
+      //General snap options
+      _rcb_sgui(_("Show _guides"), _("Show or hide guides"), "showguides", _wr),
+      _rcbsng(_("_Snap guides while dragging"), _("While dragging a guide, snap to object nodes or bounding box corners ('Snap to nodes' or 'snap to bounding box corners' must be enabled; only a small part of the guide near the cursor will snap)"),
+                  "inkscape:snap-from-guide", _wr),
+      _rcp_gui(_("Guide co_lor:"), _("Guideline color"), _("Color of guidelines"), "guidecolor", "guideopacity", _wr),
+      _rcp_hgui(_("_Highlight color:"), _("Highlighted guideline color"), _("Color of a guideline when it is under mouse"), "guidehicolor", "guidehiopacity", _wr),
+    //---------------------------------------------------------------
+      _grids_label_crea("", Gtk::ALIGN_LEFT),
+      _grids_button_new(C_("Grid", "_New"), _("Create new grid.")),
+      _grids_button_remove(C_("Grid", "_Remove"), _("Remove selected grid.")),
+      _grids_label_def("", Gtk::ALIGN_LEFT)
+    //---------------------------------------------------------------
 {
-    set_resizable (false);
     _tt.enable();
-    get_vbox()->set_spacing (4);
-    get_vbox()->pack_start (_notebook, true, true);
+    _getContents()->set_spacing (4);
+    _getContents()->pack_start(_notebook, true, true);
 
     _notebook.append_page(_page_page,      _("Page"));
     _notebook.append_page(_page_guides,    _("Guides"));
-    _notebook.append_page(_page_grids,     _("Grids"));
-    _notebook.append_page(_page_snap,      _("Snapping"));
+    _notebook.append_page(_grids_vbox,     _("Grids"));
+    _notebook.append_page(_page_snap,      _("Snap"));
+    _notebook.append_page(_page_cms, _("Color Management"));
+    _notebook.append_page(_page_scripting, _("Scripting"));
 
     build_page();
     build_guides();
     build_gridspage();
     build_snap();
+#if ENABLE_LCMS
+    build_cms();
+#endif // ENABLE_LCMS
+    build_scripting();
 
     _grids_button_new.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onNewGrid));
     _grids_button_remove.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onRemoveGrid));
+
+    signalDocumentReplaced().connect(sigc::mem_fun(*this, &DocumentProperties::_handleDocumentReplaced));
+    signalActivateDesktop().connect(sigc::mem_fun(*this, &DocumentProperties::_handleActivateDesktop));
+    signalDeactiveDesktop().connect(sigc::mem_fun(*this, &DocumentProperties::_handleDeactivateDesktop));
 }
 
 void
@@ -122,31 +141,21 @@ DocumentProperties::init()
 {
     update();
 
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop()));
     repr->addListener (&_repr_events, this);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(SP_ACTIVE_DESKTOP)->root);
+    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(getDesktop())->root);
     root->addListener (&_repr_events, this);
 
-    _doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced));
-
-    g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop",
-                     G_CALLBACK(on_activate_desktop), 0);
-
-    g_signal_connect(G_OBJECT(INKSCAPE), "deactivate_desktop",
-                     G_CALLBACK(on_deactivate_desktop), 0);
-
     show_all_children();
-
-    present();
+    _grids_button_remove.hide();
 }
 
 DocumentProperties::~DocumentProperties()
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop()));
     repr->removeListenerByData (this);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(SP_ACTIVE_DESKTOP)->root);
+    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(getDesktop())->root);
     root->removeListenerByData (this);
-    _doc_replaced_connection.disconnect();
 }
 
 //========================================================================
@@ -172,9 +181,15 @@ attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned const n, int st
         }
         else
         {
-            if (arr[i+1])
+            if (arr[i+1]) {
+                Gtk::AttachOptions yoptions = (Gtk::AttachOptions)0;
+                if (dynamic_cast<Inkscape::UI::Widget::PageSizer*>(arr[i+1])) {
+                    // only the PageSizer in Document Properties|Page should be stretched vertically
+                    yoptions = Gtk::FILL|Gtk::EXPAND;
+                }
                 table.attach(*arr[i+1], 1, 3, r, r+1,
-                      Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+                      Gtk::FILL|Gtk::EXPAND, yoptions, 0,0);
+            }
             else if (arr[i])
             {
                 Gtk::Label& label = reinterpret_cast<Gtk::Label&>(*arr[i]);
@@ -199,38 +214,28 @@ DocumentProperties::build_page()
 {
     _page_page.show();
 
-    _rcp_bg.init (_("Back_ground:"), _("Background color"), _("Color and transparency of the page background (also used for bitmap export)"),
-                   "pagecolor", "inkscape:pageopacity", _wr);
-    _rcb_canb.init (_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false);
-    _rcb_bord.init (_("Border on _top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false);
-    _rcp_bord.init (_("Border _color:"), _("Page border color"),
-                    _("Color of the page border"),
-                    "bordercolor", "borderopacity", _wr);
-    _rcb_shad.init (_("_Show border shadow"), _("If set, page border shows a shadow on its right and lower side"), "inkscape:showpageshadow", _wr, false);
-    _rum_deflt.init (_("Default _units:"), "inkscape:document-units", _wr);
-
     Gtk::Label* label_gen = manage (new Gtk::Label);
     label_gen->set_markup (_("<b>General</b>"));
     Gtk::Label* label_bor = manage (new Gtk::Label);
     label_bor->set_markup (_("<b>Border</b>"));
     Gtk::Label *label_for = manage (new Gtk::Label);
-    label_for->set_markup (_("<b>Format</b>"));
-    _page_sizer.init (_wr);
+    label_for->set_markup (_("<b>Page Size</b>"));
+    _page_sizer.init();
 
     Gtk::Widget *const widget_array[] =
     {
         label_gen,         0,
-        _rum_deflt._label, _rum_deflt._sel,
-        _rcp_bg._label,    _rcp_bg._cp,
+        0,                 &_rum_deflt,
+        _rcp_bg._label,    &_rcp_bg,
         0,                 0,
         label_for,         0,
         0,                 &_page_sizer,
         0,                 0,
         label_bor,         0,
-        0,                 _rcb_canb._button,
-        0,                 _rcb_bord._button,
-        0,                 _rcb_shad._button,
-        _rcp_bord._label,  _rcp_bord._cp,
+        0,                 &_rcb_canb,
+        0,                 &_rcb_bord,
+        0,                 &_rcb_shad,
+        _rcp_bord._label,  &_rcp_bord,
     };
 
     attach_all(_page_page.table(), widget_array, G_N_ELEMENTS(widget_array));
@@ -241,21 +246,16 @@ DocumentProperties::build_guides()
 {
     _page_guides.show();
 
-    _rcb_sgui.init (_("Show _guides"), _("Show or hide guides"), "showguides", _wr);
-    _rcp_gui.init (_("Guide co_lor:"), _("Guideline color"),
-                   _("Color of guidelines"), "guidecolor", "guideopacity", _wr);
-    _rcp_hgui.init (_("_Highlight color:"), _("Highlighted guideline color"),
-                    _("Color of a guideline when it is under mouse"),
-                    "guidehicolor", "guidehiopacity", _wr);
     Gtk::Label *label_gui = manage (new Gtk::Label);
     label_gui->set_markup (_("<b>Guides</b>"));
 
     Gtk::Widget *const widget_array[] =
     {
-        label_gui,       0,
-        0,               _rcb_sgui._button,
-        _rcp_gui._label, _rcp_gui._cp,
-        _rcp_hgui._label, _rcp_hgui._cp,
+        label_gui,        0,
+        0,                &_rcb_sgui,
+        _rcp_gui._label,  &_rcp_gui,
+        _rcp_hgui._label, &_rcp_hgui,
+        0,                &_rcbsng,
     };
 
     attach_all(_page_guides.table(), widget_array, G_N_ELEMENTS(widget_array));
@@ -266,71 +266,474 @@ DocumentProperties::build_snap()
 {
     _page_snap.show();
 
-    _rcbsnop.init (_("Snap to object _paths"),
-                _("Snap to other object paths"),
-                "inkscape:object-paths", _wr);
-    _rcbsnon.init (_("Snap to object _nodes"),
-                _("Snap to other object nodes"),
-                "inkscape:object-nodes", _wr);
-    _rsu_sno.init (_("Snap s_ensitivity:"), _("Always snap"),
-                  _("Snapping distance, in screen pixels, for snapping to objects"),
-                  _("If set, objects snap to the nearest object, regardless of distance"),
+    _rsu_sno.init (_("Snap _distance"), _("Snap only when _closer than:"), _("Always snap"),
+                  _("Snapping distance, in screen pixels, for snapping to objects"), _("Always snap to objects, regardless of their distance"),
+                  _("If set, objects only snap to another object when it's within the range specified below"),
                   "objecttolerance", _wr);
-    _rsu_sn.init (_("Snap sens_itivity:"), _("Always snap"),
-                  _("Snapping distance, in screen pixels, for snapping to grid"),
-                  _("If set, objects snap to the nearest grid line, regardless of distance"),
+
+    //Options for snapping to grids
+    _rsu_sn.init (_("Snap d_istance"), _("Snap only when c_loser than:"), _("Always snap"),
+                  _("Snapping distance, in screen pixels, for snapping to grid"), _("Always snap to grids, regardless of the distance"),
+                  _("If set, objects only snap to a grid line when it's within the range specified below"),
                   "gridtolerance", _wr);
-    _rsu_gusn.init (_("Snap sensiti_vity:"), _("Always snap"),
-                _("Snapping distance, in screen pixels, for snapping to guides"),
-                _("If set, objects snap to the nearest guide, regardless of distance"),
+
+    //Options for snapping to guides
+    _rsu_gusn.init (_("Snap dist_ance"), _("Snap only when close_r than:"), _("Always snap"),
+                _("Snapping distance, in screen pixels, for snapping to guides"), _("Always snap to guides, regardless of the distance"),
+                _("If set, objects only snap to a guide when it's within the range specified below"),
                 "guidetolerance", _wr);
+
     Gtk::Label *label_o = manage (new Gtk::Label);
-    label_o->set_markup (_("<b>Object Snapping</b>"));
+    label_o->set_markup (_("<b>Snap to objects</b>"));
     Gtk::Label *label_gr = manage (new Gtk::Label);
-    label_gr->set_markup (_("<b>Grid Snapping</b>"));
+    label_gr->set_markup (_("<b>Snap to grids</b>"));
     Gtk::Label *label_gu = manage (new Gtk::Label);
-    label_gu->set_markup (_("<b>Guide Snapping</b>"));
+    label_gu->set_markup (_("<b>Snap to guides</b>"));
 
     Gtk::Widget *const array[] =
     {
         label_o,            0,
-        0,                  _rcbsnop._button,
-        0,                  _rcbsnon._button,
         0,                  _rsu_sno._vbox,
-        0, 0,
+        0,                  0,
         label_gr,           0,
         0,                  _rsu_sn._vbox,
-        0, 0,
-        label_gu,         0,
-        0,                _rsu_gusn._vbox,
+        0,                  0,
+        label_gu,           0,
+        0,                  _rsu_gusn._vbox
     };
 
     attach_all(_page_snap.table(), array, G_N_ELEMENTS(array));
  }
 
+#if ENABLE_LCMS
+static void
+lcms_profile_get_name (cmsHPROFILE   profile, const gchar **name)
+{
+  if (profile)
+    {
+      *name = cmsTakeProductDesc (profile);
+
+      if (! *name)
+        *name = cmsTakeProductName (profile);
+
+      if (*name && ! g_utf8_validate (*name, -1, NULL))
+        *name = _("(invalid UTF-8 string)");
+    }
+  else
+    {
+      *name = _("None");
+    }
+}
+
+void
+DocumentProperties::populate_available_profiles(){
+    Glib::ListHandle<Gtk::Widget*> children = _menu.get_children();
+    for ( Glib::ListHandle<Gtk::Widget*>::iterator it2 = children.begin(); it2 != children.end(); ++it2 ) {
+        _menu.remove(**it2);
+        delete(*it2);
+    }
+
+    std::list<Glib::ustring> files = ColorProfile::getProfileFiles();
+    for ( std::list<Glib::ustring>::const_iterator it = files.begin(); it != files.end(); ++it ) {
+        cmsHPROFILE hProfile = cmsOpenProfileFromFile(it->c_str(), "r");
+        if ( hProfile ){
+            const gchar* name = 0;
+            lcms_profile_get_name(hProfile, &name);
+            Gtk::MenuItem* mi = manage(new Gtk::MenuItem());
+            mi->set_data("filepath", g_strdup(it->c_str()));
+            mi->set_data("name", g_strdup(name));
+            Gtk::HBox *hbox = manage(new Gtk::HBox());
+            hbox->show();
+            Gtk::Label* lbl = manage(new Gtk::Label(name));
+            lbl->show();
+            hbox->pack_start(*lbl, true, true, 0);
+            mi->add(*hbox);
+            mi->show_all();
+            _menu.append(*mi);
+//            g_free((void*)name);
+            cmsCloseProfile(hProfile);
+        }
+    }
+
+    _menu.show_all();
+}
+
+/**
+ * Cleans up name to remove disallowed characters.
+ * Some discussion at http://markmail.org/message/bhfvdfptt25kgtmj
+ * Allowed ASCII first characters:  ':', 'A'-'Z', '_', 'a'-'z'
+ * Allowed ASCII remaining chars add: '-', '.', '0'-'9', 
+ *
+ * @param str the string to clean up.
+ */
+static void sanitizeName( Glib::ustring& str )
+{
+    if (str.size() > 1) {
+        char val = str.at(0);
+        if (((val < 'A') || (val > 'Z'))
+            && ((val < 'a') || (val > 'z'))
+            && (val != '_')
+            && (val != ':')) {
+            str.replace(0, 1, "-");
+        }
+        for (Glib::ustring::size_type i = 1; i < str.size(); i++) {
+            char val = str.at(i);
+            if (((val < 'A') || (val > 'Z'))
+                && ((val < 'a') || (val > 'z'))
+                && ((val < '0') || (val > '9'))
+                && (val != '_')
+                && (val != ':')
+                && (val != '-')
+                && (val != '.')) {
+                str.replace(i, 1, "-");
+            }
+        }
+    }
+}
+
+void
+DocumentProperties::linkSelectedProfile()
+{
+//store this profile in the SVG document (create <color-profile> element in the XML)
+    // TODO remove use of 'active' desktop
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if (!desktop){
+        g_warning("No active desktop");
+    } else {
+        if (!_menu.get_active()){
+            g_warning("No color profile available.");
+            return;
+        }
+        Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+        Inkscape::XML::Node *cprofRepr = xml_doc->createElement("svg:color-profile");
+        gchar* tmp = static_cast<gchar*>(_menu.get_active()->get_data("name"));
+        Glib::ustring nameStr = tmp ? tmp : "profile"; // TODO add some auto-numbering to avoid collisions
+        sanitizeName(nameStr);
+        cprofRepr->setAttribute("name", nameStr.c_str());
+        cprofRepr->setAttribute("xlink:href", (gchar*) _menu.get_active()->get_data("filepath"));
+
+        // Checks whether there is a defs element. Creates it when needed
+        Inkscape::XML::Node *defsRepr = sp_repr_lookup_name(xml_doc, "svg:defs");
+        if (!defsRepr){
+            defsRepr = xml_doc->createElement("svg:defs");
+            xml_doc->root()->addChild(defsRepr, NULL);
+        }
+
+        g_assert(SP_ROOT(desktop->doc()->root)->defs);
+        defsRepr->addChild(cprofRepr, NULL);
+
+        // TODO check if this next line was sometimes needed. It being there caused an assertion.
+        //Inkscape::GC::release(defsRepr);
+
+        // inform the document, so we can undo
+        sp_document_done(desktop->doc(), SP_VERB_EDIT_LINK_COLOR_PROFILE, _("Link Color Profile"));
+
+        populate_linked_profiles_box();
+    }
+}
+
+void
+DocumentProperties::populate_linked_profiles_box()
+{
+    _LinkedProfilesListStore->clear();
+    const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "iccprofile" );
+    if (current) _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
+    while ( current ) {
+        SPObject* obj = SP_OBJECT(current->data);
+        Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
+        Gtk::TreeModel::Row row = *(_LinkedProfilesListStore->append());
+        row[_LinkedProfilesListColumns.nameColumn] = prof->name;
+//        row[_LinkedProfilesListColumns.previewColumn] = "Color Preview";
+        current = g_slist_next(current);
+    }
+}
+
+void DocumentProperties::external_scripts_list_button_release(GdkEventButton* event)
+{
+    if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
+        _ExternalScriptsContextMenu.popup(event->button, event->time);
+    }
+}
+
+void DocumentProperties::linked_profiles_list_button_release(GdkEventButton* event)
+{
+    if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
+        _EmbProfContextMenu.popup(event->button, event->time);
+    }
+}
+
+void DocumentProperties::cms_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem)
+{
+    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    _EmbProfContextMenu.append(*mi);
+    mi->signal_activate().connect(rem);
+    mi->show();
+    _EmbProfContextMenu.accelerate(parent);
+}
+
+
+void DocumentProperties::scripting_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem)
+{
+    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    _ExternalScriptsContextMenu.append(*mi);
+    mi->signal_activate().connect(rem);
+    mi->show();
+    _ExternalScriptsContextMenu.accelerate(parent);
+}
+
+void DocumentProperties::removeSelectedProfile(){
+    Glib::ustring name;
+    if(_LinkedProfilesList.get_selection()) {
+        Gtk::TreeModel::iterator i = _LinkedProfilesList.get_selection()->get_selected();
+
+        if(i){
+            name = (*i)[_LinkedProfilesListColumns.nameColumn];
+        } else {
+            return;
+        }
+    }
+
+    const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "iccprofile" );
+    while ( current ) {
+        SPObject* obj = SP_OBJECT(current->data);
+        Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
+        if (!name.compare(prof->name)){
+            sp_repr_unparent(obj->repr);
+            sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_COLOR_PROFILE, _("Remove linked color profile"));
+        }
+        current = g_slist_next(current);
+    }
+
+    populate_linked_profiles_box();
+}
+
+void
+DocumentProperties::build_cms()
+{
+    _page_cms.show();
+
+    Gtk::Label *label_link= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
+    label_link->set_markup (_("<b>Linked Color Profiles:</b>"));
+    Gtk::Label *label_avail = manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
+    label_avail->set_markup (_("<b>Available Color Profiles:</b>"));
+
+    _link_btn.set_label(_("Link Profile"));
+
+    _page_cms.set_spacing(4);
+    gint row = 0;
+
+    label_link->set_alignment(0.0);
+    _page_cms.table().attach(*label_link, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    row++;
+    _page_cms.table().attach(_LinkedProfilesListScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    row++;
+
+    Gtk::HBox* spacer = Gtk::manage(new Gtk::HBox());
+    spacer->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
+    _page_cms.table().attach(*spacer, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    row++;
+
+    label_avail->set_alignment(0.0);
+    _page_cms.table().attach(*label_avail, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    row++;
+    _page_cms.table().attach(_combo_avail, 0, 2, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_cms.table().attach(_link_btn, 2, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+
+    populate_available_profiles();
+
+    _combo_avail.set_menu(_menu);
+    _combo_avail.set_history(0);
+    _combo_avail.show_all();
+
+    //# Set up the Linked Profiles combo box
+    _LinkedProfilesListStore = Gtk::ListStore::create(_LinkedProfilesListColumns);
+    _LinkedProfilesList.set_model(_LinkedProfilesListStore);
+    _LinkedProfilesList.append_column(_("Profile Name"), _LinkedProfilesListColumns.nameColumn);
+//    _LinkedProfilesList.append_column(_("Color Preview"), _LinkedProfilesListColumns.previewColumn);
+    _LinkedProfilesList.set_headers_visible(false);
+// TODO restore?    _LinkedProfilesList.set_fixed_height_mode(true);
+
+    populate_linked_profiles_box();
+
+    _LinkedProfilesListScroller.add(_LinkedProfilesList);
+    _LinkedProfilesListScroller.set_shadow_type(Gtk::SHADOW_IN);
+    _LinkedProfilesListScroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
+    _LinkedProfilesListScroller.set_size_request(-1, 90);
+
+    _link_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::linkSelectedProfile));
+
+    _LinkedProfilesList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::linked_profiles_list_button_release));
+    cms_create_popup_menu(_LinkedProfilesList, sigc::mem_fun(*this, &DocumentProperties::removeSelectedProfile));
+
+    const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "defs" );
+    if (current) {
+        _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
+    }
+    _emb_profiles_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_linked_profiles_box));
+}
+#endif // ENABLE_LCMS
+
+void
+DocumentProperties::build_scripting()
+{
+    _page_scripting.show();
+
+    Gtk::Label *label_script= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
+    label_script->set_markup (_("<b>External script files:</b>"));
+
+    _add_btn.set_label(_("Add"));
+
+    _page_scripting.set_spacing(4);
+    gint row = 0;
+
+    label_script->set_alignment(0.0);
+    _page_scripting.table().attach(*label_script, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    row++;
+    _page_scripting.table().attach(_ExternalScriptsListScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    row++;
+
+    Gtk::HBox* spacer = Gtk::manage(new Gtk::HBox());
+    spacer->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
+    _page_scripting.table().attach(*spacer, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    row++;
+
+    _page_scripting.table().attach(_script_entry, 0, 2, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    _page_scripting.table().attach(_add_btn, 2, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+    row++;
+
+    //# Set up the External Scripts box
+    _ExternalScriptsListStore = Gtk::ListStore::create(_ExternalScriptsListColumns);
+    _ExternalScriptsList.set_model(_ExternalScriptsListStore);
+    _ExternalScriptsList.append_column(_("Filename"), _ExternalScriptsListColumns.filenameColumn);
+    _ExternalScriptsList.set_headers_visible(true);
+// TODO restore?    _ExternalScriptsList.set_fixed_height_mode(true);
+
+    populate_external_scripts_box();
+
+    _ExternalScriptsListScroller.add(_ExternalScriptsList);
+    _ExternalScriptsListScroller.set_shadow_type(Gtk::SHADOW_IN);
+    _ExternalScriptsListScroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
+    _ExternalScriptsListScroller.set_size_request(-1, 90);
+
+    _add_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::addExternalScript));
+
+#if ENABLE_LCMS
+    _ExternalScriptsList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::external_scripts_list_button_release));
+    scripting_create_popup_menu(_ExternalScriptsList, sigc::mem_fun(*this, &DocumentProperties::removeExternalScript));
+#endif // ENABLE_LCMS
+
+//TODO: review this observers code:
+    const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "script" );
+    if (current) {
+        _ext_scripts_observer.set(SP_OBJECT(current->data)->parent);
+    }
+    _ext_scripts_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_external_scripts_box));
+}
+
+
+void DocumentProperties::addExternalScript(){
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if (!desktop){
+        g_warning("No active desktop");
+    } else {
+        Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+        Inkscape::XML::Node *scriptRepr = xml_doc->createElement("svg:script");
+        scriptRepr->setAttribute("xlink:href", (gchar*) _script_entry.get_text().c_str());
+        _script_entry.set_text("");
+
+        xml_doc->root()->addChild(scriptRepr, NULL);
+
+        // inform the document, so we can undo
+        sp_document_done(desktop->doc(), SP_VERB_EDIT_ADD_EXTERNAL_SCRIPT, _("Add external script..."));
+
+        populate_external_scripts_box();
+    }
+}
+
+void DocumentProperties::removeExternalScript(){
+    Glib::ustring name;
+    if(_ExternalScriptsList.get_selection()) {
+        Gtk::TreeModel::iterator i = _ExternalScriptsList.get_selection()->get_selected();
+
+        if(i){
+            name = (*i)[_ExternalScriptsListColumns.filenameColumn];
+        } else {
+            return;
+        }
+    }
+
+    const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "script" );
+    while ( current ) {
+        SPObject* obj = SP_OBJECT(current->data);
+        SPScript* script = (SPScript*) obj;
+        if (name == script->xlinkhref){
+            sp_repr_unparent(obj->repr);
+            sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_EXTERNAL_SCRIPT, _("Remove external script"));
+        }
+        current = g_slist_next(current);
+    }
+
+    populate_external_scripts_box();
+
+}
+
+void DocumentProperties::populate_external_scripts_box(){
+    _ExternalScriptsListStore->clear();
+    const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "script" );
+    if (current) _ext_scripts_observer.set(SP_OBJECT(current->data)->parent);
+    while ( current ) {
+        SPObject* obj = SP_OBJECT(current->data);
+        SPScript* script = (SPScript*) obj;
+        if (script->xlinkhref)
+        {
+            Gtk::TreeModel::Row row = *(_ExternalScriptsListStore->append());
+            row[_ExternalScriptsListColumns.filenameColumn] = script->xlinkhref;
+        }
+
+        current = g_slist_next(current);
+    }
+}
+
 /**
 * Called for _updating_ the dialog (e.g. when a new grid was manually added in XML)
 */
 void
 DocumentProperties::update_gridspage()
 {
-    SPDesktop *dt = SP_ACTIVE_DESKTOP;
+    SPDesktop *dt = getDesktop();
     SPNamedView *nv = sp_desktop_namedview(dt);
 
     //remove all tabs
-    while (_grids_notebook.get_current_page() != -1) {
-        _grids_notebook.remove_page(-1);
+    while (_grids_notebook.get_n_pages() != 0) {
+        _grids_notebook.remove_page(-1); // this also deletes the page.
     }
 
     //add tabs
+    bool grids_present = false;
     for (GSList const * l = nv->grids; l != NULL; l = l->next) {
         Inkscape::CanvasGrid * grid = (Inkscape::CanvasGrid*) l->data;
-        _grids_notebook.append_page(grid->getWidget(), grid->repr->attribute("id"));
-
+        if (!grid->repr->attribute("id")) continue; // update_gridspage is called again when "id" is added
+        Glib::ustring name(grid->repr->attribute("id"));
+        const char *icon = NULL;
+        switch (grid->getGridType()) {
+            case GRID_RECTANGULAR:
+                icon = "grid-rectangular";
+                break;
+            case GRID_AXONOMETRIC:
+                icon = "grid-axonometric";
+                break;
+            default:
+                break;
+        }
+        _grids_notebook.append_page(*grid->newWidget(), _createPageTabLabel(name, icon));
+        grids_present = true;
     }
     _grids_notebook.show_all();
 
-    _page_grids.table().resize_children();
+    if (grids_present)
+        _grids_button_remove.set_sensitive(true);
+    else
+        _grids_button_remove.set_sensitive(false);
 }
 
 /**
@@ -339,42 +742,34 @@ DocumentProperties::update_gridspage()
 void
 DocumentProperties::build_gridspage()
 {
-    _page_grids.show();
-
     /// \todo FIXME: gray out snapping when grid is off.
     /// Dissenting view: you want snapping without grid.
 
-    SPDesktop *dt = SP_ACTIVE_DESKTOP;
+    SPDesktop *dt = getDesktop();
     SPNamedView *nv = sp_desktop_namedview(dt);
+    (void)nv;
+
+    _grids_label_crea.set_markup(_("<b>Creation</b>"));
+    _grids_label_def.set_markup(_("<b>Defined grids</b>"));
+    _grids_hbox_crea.pack_start(_grids_combo_gridtype, true, true);
+    _grids_hbox_crea.pack_start(_grids_button_new, true, true);
 
-    Gtk::Label* label_crea = manage (new Gtk::Label);
-    label_crea->set_markup (_("<b>Creation</b>"));
-    Gtk::Label* label_crea_type = manage (new Gtk::Label);
-    label_crea_type->set_markup (_("Gridtype"));
-    
     for (gint t = 0; t <= GRID_MAXTYPENR; t++) {
         _grids_combo_gridtype.append_text( CanvasGrid::getName( (GridType) t ) );
     }
     _grids_combo_gridtype.set_active_text( CanvasGrid::getName(GRID_RECTANGULAR) );
-    
-    Gtk::Label* label_def = manage (new Gtk::Label);
-    label_def->set_markup (_("<b>Defined grids</b>"));
 
-    for (GSList const * l = nv->grids; l != NULL; l = l->next) {
-        Inkscape::CanvasGrid * grid = (Inkscape::CanvasGrid*) l->data;
-        _grids_notebook.append_page(grid->getWidget(), grid->repr->attribute("id"));
-    }
+    _grids_space.set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
 
-    Gtk::Widget *const widget_array[] =
-    {
-        label_crea, 0,
-        label_crea_type, (Gtk::Widget*) &_grids_combo_gridtype,
-        (Gtk::Widget*) &_grids_button_new,         (Gtk::Widget*) &_grids_button_remove, 
-        label_def,         0
-    };
-    attach_all(_page_grids.table(), widget_array, G_N_ELEMENTS(widget_array));
-    _page_grids.table().attach(_grids_notebook, 0, 3, 4, 5,
-                              Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+    _grids_vbox.set_spacing(4);
+    _grids_vbox.pack_start(_grids_label_crea, false, false);
+    _grids_vbox.pack_start(_grids_hbox_crea, false, false);
+    _grids_vbox.pack_start(_grids_space, false, false);
+    _grids_vbox.pack_start(_grids_label_def, false, false);
+    _grids_vbox.pack_start(_grids_notebook, false, false);
+    _grids_vbox.pack_start(_grids_button_remove, false, false);
+
+    update_gridspage();
 }
 
 
@@ -387,7 +782,7 @@ DocumentProperties::update()
 {
     if (_wr.isUpdating()) return;
 
-    SPDesktop *dt = SP_ACTIVE_DESKTOP;
+    SPDesktop *dt = getDesktop();
     SPNamedView *nv = sp_desktop_namedview(dt);
 
     _wr.setUpdating (true);
@@ -406,28 +801,52 @@ DocumentProperties::update()
     double const doc_w_px = sp_document_width(sp_desktop_document(dt));
     double const doc_h_px = sp_document_height(sp_desktop_document(dt));
     _page_sizer.setDim (doc_w_px, doc_h_px);
+    _page_sizer.updateFitMarginsUI(SP_OBJECT_REPR(nv));
+
+    //-----------------------------------------------------------guide page
 
-    //-----------------------------------------------------------guide
     _rcb_sgui.setActive (nv->showguides);
     _rcp_gui.setRgba32 (nv->guidecolor);
     _rcp_hgui.setRgba32 (nv->guidehicolor);
+    _rcbsng.setActive(nv->snap_manager.snapprefs.getSnapModeGuide());
 
-    //-----------------------------------------------------------snap
-    _rcbsnop.setActive (nv->snap_manager.object.getSnapToPaths());
-    _rcbsnon.setActive (nv->snap_manager.object.getSnapToNodes());
-    _rsu_sno.setValue (nv->objecttolerance);
+    //-----------------------------------------------------------snap page
 
-    _rsu_sn.setValue (nv->gridtolerance);
+    _rsu_sno.setValue (nv->snap_manager.snapprefs.getObjectTolerance());
+    _rsu_sn.setValue (nv->snap_manager.snapprefs.getGridTolerance());
+    _rsu_gusn.setValue (nv->snap_manager.snapprefs.getGuideTolerance());
 
-    _rsu_gusn.setValue (nv->guidetolerance);
 
     //-----------------------------------------------------------grids page
 
     update_gridspage();
 
+    //------------------------------------------------Color Management page
+
+#if ENABLE_LCMS
+    populate_linked_profiles_box();
+    populate_available_profiles();
+#endif // ENABLE_LCMS
+
     _wr.setUpdating (false);
 }
 
+// TODO: copied from fill-and-stroke.cpp factor out into new ui/widget file?
+Gtk::HBox&
+DocumentProperties::_createPageTabLabel(const Glib::ustring& label, const char *label_image)
+{
+    Gtk::HBox *_tab_label_box = manage(new Gtk::HBox(false, 0));
+    _tab_label_box->set_spacing(4);
+    _tab_label_box->pack_start(*Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_DECORATION,
+                                                       label_image)));
+
+    Gtk::Label *_tab_label = manage(new Gtk::Label(label, true));
+    _tab_label_box->pack_start(*_tab_label);
+    _tab_label_box->show_all();
+
+    return *_tab_label_box;
+}
+
 //--------------------------------------------------------------------
 
 void
@@ -445,83 +864,62 @@ DocumentProperties::on_response (int id)
         hide();
 }
 
-
-
-static void
-on_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data)
+void
+DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *document)
 {
-    if (!_instance)
-        return;
-
-    _instance->update_gridspage();
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    repr->addListener(&_repr_events, this);
+    Inkscape::XML::Node *root = SP_OBJECT_REPR(document->root);
+    root->addListener(&_repr_events, this);
+    update();
 }
 
-static void
-on_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data)
+void
+DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop)
 {
-    if (!_instance)
-        return;
-
-    _instance->update_gridspage();
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    repr->addListener(&_repr_events, this);
+    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(desktop)->root);
+    root->addListener(&_repr_events, this);
+    update();
 }
 
-
-
-/**
- * Called when XML node attribute changed; updates dialog widgets.
- */
-static void
-on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer)
+void
+DocumentProperties::_handleDeactivateDesktop(Inkscape::Application *, SPDesktop *desktop)
 {
-    if (!_instance)
-        return;
-
-    _instance->update();
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    repr->removeListenerByData(this);
+    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(desktop)->root);
+    root->removeListenerByData(this);
 }
 
 static void
-on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
+on_child_added(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data)
 {
-    if (!_instance)
-        return;
-
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
-    repr->addListener (&_repr_events, _instance);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(SP_ACTIVE_DESKTOP)->root);
-    root->addListener (&_repr_events, _instance);
-    _instance->_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced));
-    _instance->update();
+    if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
+        dialog->update_gridspage();
 }
 
 static void
-on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
+on_child_removed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data)
 {
-    if (!_instance)
-        return;
-
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
-    repr->removeListenerByData (_instance);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(SP_ACTIVE_DESKTOP)->root);
-    root->removeListenerByData (_instance);
-    _instance->_doc_replaced_connection.disconnect();
+    if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
+        dialog->update_gridspage();
 }
 
+
+
+/**
+ * Called when XML node attribute changed; updates dialog widgets.
+ */
 static void
-on_doc_replaced (SPDesktop* dt, SPDocument* doc)
+on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer data)
 {
-    if (!_instance)
-        return;
-
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
-    repr->addListener (&_repr_events, _instance);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(doc->root);
-    root->addListener (&_repr_events, _instance);
-    _instance->update();
+    if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
+        dialog->update();
 }
 
 
-
-
 /*########################################################################
 # BUTTON CLICK HANDLERS    (callbacks)
 ########################################################################*/
@@ -529,10 +927,15 @@ on_doc_replaced (SPDesktop* dt, SPDocument* doc)
 void
 DocumentProperties::onNewGrid()
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
+    SPDesktop *dt = getDesktop();
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
+    SPDocument *doc = sp_desktop_document(dt);
 
     Glib::ustring typestring = _grids_combo_gridtype.get_active_text();
-    CanvasGrid::writeNewGridToRepr(repr, CanvasGrid::getGridTypeFromName(typestring.c_str()));
+    CanvasGrid::writeNewGridToRepr(repr, doc, CanvasGrid::getGridTypeFromName(typestring.c_str()));
+
+    // toggle grid showing to ON:
+    dt->showGrids(true);
 }
 
 
@@ -542,20 +945,14 @@ DocumentProperties::onRemoveGrid()
     gint pagenum = _grids_notebook.get_current_page();
     if (pagenum == -1) // no pages
       return;
-      
-    Gtk::Widget *page = _grids_notebook.get_nth_page(pagenum);
-    if (!page) return;
-    
-    Glib::ustring tabtext = _grids_notebook.get_tab_label_text(*page);
-    
-    // find the grid with name tabtext (it's id) and delete that one.
-    SPDesktop *dt = SP_ACTIVE_DESKTOP;
+
+    SPDesktop *dt = getDesktop();
     SPNamedView *nv = sp_desktop_namedview(dt);
     Inkscape::CanvasGrid * found_grid = NULL;
-    for (GSList const * l = nv->grids; l != NULL; l = l->next) {
+    int i = 0;
+    for (GSList const * l = nv->grids; l != NULL; l = l->next, i++) {  // not a very nice fix, but works.
         Inkscape::CanvasGrid * grid = (Inkscape::CanvasGrid*) l->data;
-        gchar const *idtext = grid->repr->attribute("id");
-        if ( !strcmp(tabtext.c_str(), idtext) ) {
+        if (pagenum == i) {
             found_grid = grid;
             break; // break out of for-loop
         }
@@ -564,7 +961,7 @@ DocumentProperties::onRemoveGrid()
         // delete the grid that corresponds with the selected tab
         // when the grid is deleted from SVG, the SPNamedview handler automatically deletes the object, so found_grid becomes an invalid pointer!
         found_grid->repr->parent()->removeChild(found_grid->repr);
-       sp_document_done(sp_desktop_document(dt), SP_VERB_DIALOG_NAMEDVIEW, _("Remove grid"));
+        sp_document_done(sp_desktop_document(dt), SP_VERB_DIALOG_NAMEDVIEW, _("Remove grid"));
     }
 }
 
@@ -577,9 +974,9 @@ DocumentProperties::onRemoveGrid()
   Local Variables:
   mode:c++
   c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0))
-  indent-tabs-mode:nilu
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
   fill-column:99
   End:
 */
-// vim: filetype=c++:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :