![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index b4199c6784e205c9960efc802f5e802c7fc393b2..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-2008 Johan Engelen <johan@shouraizou.nl>
- * Copyright (C) 2000 - 2005 Authors
+ * Copyright (C) 2000 - 2008 Authors
*
* Released under GNU GPL. Read the file 'COPYING' for more information
*/
_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),
_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),
//---------------------------------------------------------------
- _rcbsg(_("_Enable snapping"), _("Toggle snapping on or off"), "inkscape:snap-global", _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"),
_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),
{
_page_page.show();
- _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,
+ 0, &_rum_deflt,
_rcp_bg._label, &_rcp_bg,
0, 0,
label_for, 0,
{
_page_snap.show();
- _rsu_sno.init (_("Snap _distance"), _("Snap only when _closer than:"),
- _("Snapping distance, in screen pixels, for snapping to objects"),
+ _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 d_istance"), _("Snap only when c_loser than:"),
- _("Snapping distance, in screen pixels, for snapping to grid"),
+ _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 only when close_r than:"),
- _("Snapping distance, in screen pixels, for snapping to guides"),
+ //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);
slaves.push_back(&_rcbsnbbp);
slaves.push_back(&_rcbsnbbn);
_rcbsnbb.setSlaveWidgets(slaves);
-
+
slaves.clear();
slaves.push_back(&_rcbsnn);
slaves.push_back(&_rcbsnbb);
-
- _rcbsg.setSlaveWidgets(slaves);
+ slaves.push_back(&_rcbsi);
+
+ _rcbs.setSlaveWidgets(slaves);
Gtk::Label *label_g = manage (new Gtk::Label);
label_g->set_markup (_("<b>Snapping</b>"));
Gtk::Label *label_w = manage (new Gtk::Label);
- label_w->set_markup (_("<b>What snaps</b>"));
+ label_w->set_markup (_("<b>What snaps</b>"));
Gtk::Label *label_o = manage (new Gtk::Label);
label_o->set_markup (_("<b>Snap to objects</b>"));
Gtk::Label *label_gr = manage (new Gtk::Label);
label_gr->set_markup (_("<b>Snap to grids</b>"));
Gtk::Label *label_gu = manage (new Gtk::Label);
label_gu->set_markup (_("<b>Snap to guides</b>"));
-
+
Gtk::Widget *const array[] =
{
label_g, 0,
- 0, &_rcbsg,
+ 0, &_rcbs,
+ 0, &_rcbsi,
0, 0,
label_w, 0,
0, &_rcbsnn,
0, &_rcbsnbb,
- 0, 0,
+ 0, 0,
label_o, 0,
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));
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>Snapping to special nodes</b>"));
+ label_m->set_markup (_("<b>Special points to consider</b>"));
Gtk::Widget *const array[] =
{
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>"));
_rcbsng.setActive (nv->snap_manager.getSnapModeGuide());
_rcbic.setActive (nv->snap_manager.getIncludeItemCenter());
_rcbsigg.setActive (nv->snap_manager.getSnapIntersectionGG());
- _rcbsils.setActive (nv->snap_manager.getSnapIntersectionLS());
+ _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);
-
- _rcbsg.setActive (nv->snap_manager.getSnapEnabledGlobally());
+
+ _rcbs.setActive (nv->snap_manager.getSnapEnabledGlobally());
+ _rcbsi.setActive (nv->snapindicator);
//-----------------------------------------------------------grids page
hide();
}
-void
+void
DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *document)
{
Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
@@ -551,7 +560,7 @@ DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *docu
update();
}
-void
+void
DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop)
{
Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
on_child_added(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data)
{
if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
- dialog->update_gridspage();
+ dialog->update_gridspage();
}
static void
on_child_removed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data)
{
if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
- dialog->update_gridspage();
+ dialog->update_gridspage();
}
on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer data)
{
if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
- dialog->update();
+ dialog->update();
}
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:
*/