X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Fdocument-properties.cpp;h=519f795db1527929601125d5eaded7ff16fb5e2f;hb=ba885512446fff2803585a4aaec34e7742841f05;hp=572f1ef7e974581b4b8f264caafa0a8c24108341;hpb=d6bafd2dc250f41f966e40f48b3084b65ecece7e;p=inkscape.git diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 572f1ef7e..519f795db 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -8,9 +8,10 @@ * Lauris Kaplinski * Jon Phillips * Ralf Stephan (Gtkmm) + * Diederik van Lierop * * Copyright (C) 2006-2008 Johan Engelen - * Copyright (C) 2000 - 2005 Authors + * Copyright (C) 2000 - 2008 Authors * * Released under GNU GPL. Read the file 'COPYING' for more information */ @@ -99,7 +100,8 @@ DocumentProperties::DocumentProperties() _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"), @@ -109,6 +111,7 @@ DocumentProperties::DocumentProperties() _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), @@ -134,7 +137,6 @@ DocumentProperties::DocumentProperties() _notebook.append_page(_page_snap, _("Snap")); _notebook.append_page(_page_snap_dtls, _("Snap points")); - _page_sizer.init(); build_page(); build_guides(); build_gridspage(); @@ -227,6 +229,7 @@ DocumentProperties::build_page() label_bor->set_markup (_("Border")); Gtk::Label *label_for = manage (new Gtk::Label); label_for->set_markup (_("Format")); + _page_sizer.init(); Gtk::Widget *const widget_array[] = { @@ -272,20 +275,20 @@ DocumentProperties::build_snap() { _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"), + _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); @@ -304,8 +307,9 @@ DocumentProperties::build_snap() slaves.clear(); slaves.push_back(&_rcbsnn); slaves.push_back(&_rcbsnbb); + slaves.push_back(&_rcbsi); - _rcbsg.setSlaveWidgets(slaves); + _rcbs.setSlaveWidgets(slaves); Gtk::Label *label_g = manage (new Gtk::Label); label_g->set_markup (_("Snapping")); @@ -321,7 +325,8 @@ DocumentProperties::build_snap() Gtk::Widget *const array[] = { label_g, 0, - 0, &_rcbsg, + 0, &_rcbs, + 0, &_rcbsi, 0, 0, label_w, 0, 0, &_rcbsnn, @@ -332,6 +337,7 @@ DocumentProperties::build_snap() 0, &_rcbsnon, 0, &_rcbsnbbp, 0, &_rcbsnbbn, + 0, &_rcbsnpb, 0, _rsu_sno._vbox, 0, 0, label_gr, 0, @@ -354,7 +360,7 @@ DocumentProperties::build_snap_dtls() Gtk::Label *label_i= manage (new Gtk::Label); label_i->set_markup (_("Snapping to intersections of")); Gtk::Label *label_m = manage (new Gtk::Label); - label_m->set_markup (_("Snapping to special nodes")); + label_m->set_markup (_("Special points to consider")); Gtk::Widget *const array[] = { @@ -494,13 +500,15 @@ DocumentProperties::update() _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