![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index aa608703ad01bc58ed8bffb39d2194cf6c79afbc..519f795db1527929601125d5eaded7ff16fb5e2f 100644 (file)
* 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 "desktop-handles.h"
#include "desktop.h"
#include "sp-namedview.h"
-
+#include "widgets/icon.h"
#include "document-properties.h"
#include "display/canvas-grid.h"
#define SPACE_SIZE_X 15
#define SPACE_SIZE_Y 10
+#define INKSCAPE_ICON_GRID_XY "grid_xy"
+#define INKSCAPE_ICON_GRID_AXONOM "grid_axonom"
+
+
//===================================================
//---------------------------------------------------
-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 */
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()
: UI::Widget::Panel ("", "dialogs.documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
_page_page(1, 1), _page_guides(1, 1),
_page_snap(1, 1), _page_snap_dtls(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 in the 'Snap' tab; only a small part of the guide near the cursor will snap)"),
+ "inkscape:snap-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),
+ //---------------------------------------------------------------
+ _rcbs(_("_Enable snapping"), _("Toggle snapping on or off"), "inkscape:snap-global", _wr),
+ _rcbsi(_("_Enable snap indicator"), _("After snapping, a symbol is drawn at the point that has snapped"), "inkscape:snap-indicator", _wr),
+ _rcbsnbb(_("_Bounding box corners"), _("Only available in the selector tool: snap bounding box corners to guides, to grids, and to other bounding boxes (but not to nodes or paths)"),
+ "inkscape:snap-bbox", _wr),
+ _rcbsnn(_("_Nodes"), _("Snap nodes (e.g. path nodes, special points in shapes, gradient handles, text base points, transformation origins, etc.) to guides, to grids, to paths and to other nodes"),
+ "inkscape:snap-nodes", _wr),
+ //Options for snapping to objects
+ _rcbsnop(_("Snap to path_s"), _("Snap nodes to object paths"), "inkscape:object-paths", _wr),
+ _rcbsnon(_("Snap to n_odes"), _("Snap nodes and guides to object nodes"), "inkscape:object-nodes", _wr),
+ _rcbsnbbp(_("Snap to bounding bo_x edges"), _("Snap bounding box corners and guides to bounding box edges"), "inkscape:bbox-paths", _wr),
+ _rcbsnbbn(_("Snap to bounding box co_rners"), _("Snap bounding box corners to other bounding box corners"), "inkscape:bbox-nodes", _wr),
+ _rcbsnpb(_("Snap to page border"), _("Snap bounding box corners and nodes to the page border"), "inkscape:snap-page", _wr),
+ //---------------------------------------------------------------
+ //Applies to both nodes and guides, but not to bboxes, that's why its located here
+ _rcbic( _("Rotation _center"), _("Consider the rotation center of an object when snapping"), "inkscape:snap-center", _wr),
+ _rcbsigg(_("_Grid with guides"), _("Snap to grid-guide intersections"), "inkscape:snap-intersection-grid-guide", _wr),
+ _rcbsils(_("_Line segments"), _("Snap to intersections of line segments ('snap to paths' must be enabled, see the previous tab)"),
+ "inkscape:snap-intersection-line-segments", _wr),
+ //---------------------------------------------------------------
_grids_label_crea("", Gtk::ALIGN_LEFT),
- _grids_button_new(_("_New"), _("Create new grid.")),
+ //TRANSLATORS: In Grid|_New translate only the word _New. It ref to grid
+ _grids_button_new(Q_("Grid|_New"), _("Create new grid.")),
_grids_button_remove(_("_Remove"), _("Remove selected grid.")),
_grids_label_def("", Gtk::ALIGN_LEFT),
+ //---------------------------------------------------------------
_prefs_path("dialogs.documentoptions")
{
_tt.enable();
_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
{
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();
_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();
}
//========================================================================
{
_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);
+ _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));
{
_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);
-
- _rcbsng.init (_("_Snap guides while dragging"),
- _("While dragging a guide, snap to object nodes or bounding box corners ('Nodes' or 'Bounding box corners' must be enabled in the 'Snap' tab)"),
- "inkscape:snap-guide", _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,
- 0, _rcbsng._button,
+ 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));
DocumentProperties::build_snap()
{
_page_snap.show();
- //General options
- _rcbsnbb.init (_("_Bounding box corners"),
- _("Snap bounding box corners to grid lines, to guides, and to other bounding boxes (Snapping of bounding boxes is only available in the selector tool)"),
- "inkscape:snap-bbox", _wr);
- _rcbsnn.init (_("_Nodes"),
- _("Snap nodes to grid lines, to guides, to paths, and to other nodes"),
- "inkscape:snap-nodes", _wr);
-
- //Options for snapping to objects
- _rcbsnop.init (_("Snap to pat_hs"),
- _("Snap nodes to object paths"),
- "inkscape:object-paths", _wr);
- _rcbsnon.init (_("Snap to n_odes"),
- _("Snap nodes and guides to object nodes"),
- "inkscape:object-nodes", _wr);
- _rcbsnbbn.init (_("Snap to bounding box co_rners"),
- _("Snap bounding box corners to other bounding box corners"),
- "inkscape:bbox-nodes", _wr);
- _rcbsnbbp.init (_("Snap to bounding box _edges"),
- _("Snap bounding box corners and guides to bounding box edges"),
- "inkscape:bbox-paths", _wr);
-
- _rsu_sno.init (_("Snap _distance"), _("Snap at any d_istance"),
- _("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);
//Options for snapping to grids
- _rsu_sn.init (_("Snap di_stance"), _("Snap at any dis_tance"),
- _("Snapping distance, in screen pixels, for snapping to grid"),
- _("If set, objects snap to the nearest grid line, regardless of distance"),
+ _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);
- //Options for snapping to guides
- _rsu_gusn.init (_("Snap dist_ance"), _("Snap at any distan_ce"),
- _("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);
//Other options to locate here: e.g. visual snapping indicators on/off
- std::list<Gtk::ToggleButton*> slaves;
- slaves.push_back(_rcbsnop._button);
- slaves.push_back(_rcbsnon._button);
- _rcbsnn.setSlaveButton(slaves);
+ std::list<Gtk::Widget*> slaves;
+ slaves.push_back(&_rcbsnop);
+ slaves.push_back(&_rcbsnon);
+ _rcbsnn.setSlaveWidgets(slaves);
+
+ slaves.clear();
+ slaves.push_back(&_rcbsnbbp);
+ slaves.push_back(&_rcbsnbbn);
+ _rcbsnbb.setSlaveWidgets(slaves);
slaves.clear();
- slaves.push_back(_rcbsnbbp._button);
- slaves.push_back(_rcbsnbbn._button);
- _rcbsnbb.setSlaveButton(slaves);
+ slaves.push_back(&_rcbsnn);
+ slaves.push_back(&_rcbsnbb);
+ slaves.push_back(&_rcbsi);
+
+ _rcbs.setSlaveWidgets(slaves);
Gtk::Label *label_g = manage (new Gtk::Label);
- label_g->set_markup (_("<b>Snapping of</b>"));
+ label_g->set_markup (_("<b>Snapping</b>"));
+ Gtk::Label *label_w = manage (new Gtk::Label);
+ label_w->set_markup (_("<b>What snaps</b>"));
Gtk::Label *label_o = manage (new Gtk::Label);
- label_o->set_markup (_("<b>Snapping to objects</b>"));
+ label_o->set_markup (_("<b>Snap to objects</b>"));
Gtk::Label *label_gr = manage (new Gtk::Label);
- label_gr->set_markup (_("<b>Snapping to grids</b>"));
+ label_gr->set_markup (_("<b>Snap to grids</b>"));
Gtk::Label *label_gu = manage (new Gtk::Label);
- label_gu->set_markup (_("<b>Snapping to guides</b>"));
- Gtk::Label *label_m = manage (new Gtk::Label);
- label_m->set_markup (_("<b>Miscellaneous</b>"));
+ label_gu->set_markup (_("<b>Snap to guides</b>"));
Gtk::Widget *const array[] =
{
label_g, 0,
- 0, _rcbsnn._button,
- 0, _rcbsnbb._button,
- 0, 0,
+ 0, &_rcbs,
+ 0, &_rcbsi,
+ 0, 0,
+ label_w, 0,
+ 0, &_rcbsnn,
+ 0, &_rcbsnbb,
0, 0,
- 0, 0,
- 0, 0,
label_o, 0,
- 0, _rcbsnop._button,
- 0, _rcbsnon._button,
- 0, _rcbsnbbp._button,
- 0, _rcbsnbbn._button,
+ 0, &_rcbsnop,
+ 0, &_rcbsnon,
+ 0, &_rcbsnbbp,
+ 0, &_rcbsnbbn,
+ 0, &_rcbsnpb,
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));
DocumentProperties::build_snap_dtls()
{
_page_snap_dtls.show();
-
- _rcbsigg.init (_("_Grid with guides"),
- _("Snap to grid-guide intersections"),
- "inkscape:snap-intersection-grid-guide", _wr);
-
- _rcbsils.init (_("_Line segments"),
- _("Snap to intersections of line segments ('snap to paths' must be enabled, see the previous tab)"),
- "inkscape:snap-intersection-line-segments", _wr);
-
- //Applies to both nodes and guides, but not to bboxes, that's why its located here
- _rcbic.init (_("_Include the object's rotation center"),
- _("Also snap the rotation center of an object when snapping nodes or guides"),
- "inkscape:snap-center", _wr);
-
+
//Other options to locate here: e.g. visual snapping indicators on/off
Gtk::Label *label_i= manage (new Gtk::Label);
label_i->set_markup (_("<b>Snapping to intersections of</b>"));
Gtk::Label *label_m = manage (new Gtk::Label);
- label_m->set_markup (_("<b>Miscellaneous</b>"));
+ label_m->set_markup (_("<b>Special points to consider</b>"));
Gtk::Widget *const array[] =
{
label_i, 0,
- 0, _rcbsigg._button,
- 0, _rcbsils._button,
+ 0, &_rcbsigg,
+ 0, &_rcbsils,
0, 0,
label_m, 0,
- 0, _rcbic._button,
+ 0, &_rcbic,
};
attach_all(_page_snap_dtls.table(), array, G_N_ELEMENTS(array));
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 = INKSCAPE_ICON_GRID_XY;
+ break;
+ case GRID_AXONOMETRIC:
+ icon = INKSCAPE_ICON_GRID_AXONOM;
+ break;
+ default:
+ break;
+ }
+ _grids_notebook.append_page(*grid->newWidget(), _createPageTabLabel(name, icon));
grids_present = true;
}
_grids_notebook.show_all();
if (grids_present)
- _grids_button_remove.show();
+ _grids_button_remove.set_sensitive(true);
else
- _grids_button_remove.hide();
+ _grids_button_remove.set_sensitive(false);
}
/**
/// \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_combo_gridtype.set_active_text( CanvasGrid::getName(GRID_RECTANGULAR) );
- 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);
_grids_vbox.set_spacing(4);
_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);
- _grids_button_remove.hide();
+
+ update_gridspage();
}
{
if (_wr.isUpdating()) return;
- SPDesktop *dt = SP_ACTIVE_DESKTOP;
+ SPDesktop *dt = getDesktop();
SPNamedView *nv = sp_desktop_namedview(dt);
_wr.setUpdating (true);
_rcbsnn.setActive (nv->snap_manager.getSnapModeNode());
_rcbsng.setActive (nv->snap_manager.getSnapModeGuide());
_rcbic.setActive (nv->snap_manager.getIncludeItemCenter());
+ _rcbsigg.setActive (nv->snap_manager.getSnapIntersectionGG());
+ _rcbsils.setActive (nv->snap_manager.getSnapIntersectionLS());
_rcbsnop.setActive(nv->snap_manager.object.getSnapToItemPath());
_rcbsnon.setActive(nv->snap_manager.object.getSnapToItemNode());
_rcbsnbbp.setActive(nv->snap_manager.object.getSnapToBBoxPath());
_rcbsnbbn.setActive(nv->snap_manager.object.getSnapToBBoxNode());
+ _rcbsnpb.setActive(nv->snap_manager.object.getSnapToPageBorder());
_rsu_sno.setValue (nv->objecttolerance);
_rsu_sn.setValue (nv->gridtolerance);
_rsu_gusn.setValue (nv->guidetolerance);
+ _rcbs.setActive (nv->snap_manager.getSnapEnabledGlobally());
+ _rcbsi.setActive (nv->snapindicator);
+
//-----------------------------------------------------------grids page
update_gridspage();
_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
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)
########################################################################*/
void
DocumentProperties::onNewGrid()
{
- SPDesktop *dt = 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, doc, CanvasGrid::getGridTypeFromName(typestring.c_str()));
+
+ // toggle grid showing to ON:
+ dt->showGrids(true);
}
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
}
mode:c++
c-file-style:"stroustrup"
c-file-offsets:((innamespace . 0)(inline-open . 0))
- indent-tabs-mode:nilu
+ indent-tabs-mode:nil
fill-column:99
End:
*/