X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Fdocument-properties.cpp;h=e2dc2c0b9156ad6fb403c462d699bff94b10ca26;hb=e38df2ff7d95236e712464a1a8c472f2d9636e53;hp=f84b1192071d4276df337c34392abd0e65343d29;hpb=3d7616e3b1a716d7db8b2a763d790edb316a9fd3;p=inkscape.git diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index f84b11920..e2dc2c0b9 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -72,10 +72,10 @@ static Inkscape::XML::NodeEventVector const _repr_events = { DocumentProperties* -DocumentProperties::create() +DocumentProperties::create(Behavior::BehaviorFactory behavior_factory) { if (_instance) return _instance; - _instance = new DocumentProperties; + _instance = new DocumentProperties(behavior_factory); _instance->init(); return _instance; } @@ -90,8 +90,8 @@ DocumentProperties::destroy() } } -DocumentProperties::DocumentProperties() - : Dialog ("dialogs.documentoptions", SP_VERB_DIALOG_NAMEDVIEW), +DocumentProperties::DocumentProperties(Behavior::BehaviorFactory behavior_factory) + : Dialog (behavior_factory, "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.")), @@ -152,32 +152,32 @@ DocumentProperties::~DocumentProperties() //======================================================================== /** - * Helper function that attachs widgets in a 3xn table. The widgets come in an + * Helper function that attaches widgets in a 3xn table. The widgets come in an * array that has two entries per table row. The two entries code for four * possible cases: (0,0) means insert space in first column; (0, non-0) means * widget in columns 2-3; (non-0, 0) means label in columns 1-3; and * (non-0, non-0) means two widgets in columns 2 and 3. **/ inline void -attach_all (Gtk::Table &table, const Gtk::Widget *arr[], unsigned size, int start = 0) +attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned const n, int start = 0) { - for (unsigned i=0, r=start; i(*arr[i]), 1, 2, r, r+1, + table.attach(*arr[i], 1, 2, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); - table.attach (const_cast(*arr[i+1]), 2, 3, r, r+1, + table.attach(*arr[i+1], 2, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); } else { if (arr[i+1]) - table.attach (const_cast(*arr[i+1]), 1, 3, r, r+1, + table.attach(*arr[i+1], 1, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); else if (arr[i]) { - Gtk::Label& label = reinterpret_cast (const_cast(*arr[i])); + Gtk::Label& label = reinterpret_cast(*arr[i]); label.set_alignment (0.0); table.attach (label, 0, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); @@ -217,7 +217,7 @@ DocumentProperties::build_page() label_for->set_markup (_("Format")); _page_sizer.init (_wr); - const Gtk::Widget* widget_array[] = + Gtk::Widget *const widget_array[] = { label_gen, 0, _rum_deflt._label, _rum_deflt._sel, @@ -233,7 +233,7 @@ DocumentProperties::build_page() _rcp_bord._label, _rcp_bord._cp, }; - attach_all (_page_page.table(), widget_array, sizeof(widget_array)); + attach_all(_page_page.table(), widget_array, G_N_ELEMENTS(widget_array)); } void @@ -250,7 +250,7 @@ DocumentProperties::build_guides() Gtk::Label *label_gui = manage (new Gtk::Label); label_gui->set_markup (_("Guides")); - const Gtk::Widget* widget_array[] = + Gtk::Widget *const widget_array[] = { label_gui, 0, 0, _rcb_sgui._button, @@ -258,54 +258,94 @@ DocumentProperties::build_guides() _rcp_hgui._label, _rcp_hgui._cp, }; - attach_all (_page_guides.table(), widget_array, sizeof(widget_array)); + attach_all(_page_guides.table(), widget_array, G_N_ELEMENTS(widget_array)); } void DocumentProperties::build_snap() { _page_snap.show(); - - _rcbsnop.init (_("Snap to object _paths"), - _("Snap to other object paths"), + //General options + _rcbsnbb.init (_("Bounding _box corners"), + _("Snap bounding box corners to grid lines, to guides, and to other bounding boxes (only applicable to 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); + _rcbsng.init (_("_Guides"), + _("While dragging a guide, snap to object nodes. (In 'Snapping to objects', 'Snap to nodes' must also be enabled)"), + "inkscape:snap-guide", _wr); + + //Options for snapping to objects + _rcbsnop.init (_("Snap to p_aths"), + _("Snap nodes to 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"), + _rcbsnon.init (_("Snap to n_odes"), + _("Snap nodes or guides to object nodes"), + "inkscape:object-nodes", _wr); + _rsu_sno.init (_("Snap _distance"), _("Snap at any dist_ance"), _("Snapping distance, in screen pixels, for snapping to objects"), _("If set, objects snap to the nearest object, regardless of distance"), "objecttolerance", _wr); - _rsu_sn.init (_("Snap sens_itivity:"), _("Always snap"), + + //Options for snapping to grids + _rsu_sn.init (_("Snap d_istance"), _("Snap at any distan_ce"), _("Snapping distance, in screen pixels, for snapping to grid"), _("If set, objects snap to the nearest grid line, regardless of distance"), "gridtolerance", _wr); - _rsu_gusn.init (_("Snap sensiti_vity:"), _("Always snap"), + + //Options for snapping to guides + _rsu_gusn.init (_("Snap di_stance"), _("Snap at any distanc_e"), _("Snapping distance, in screen pixels, for snapping to guides"), _("If set, objects snap to the nearest guide, regardless of distance"), "guidetolerance", _wr); + + //Some other options + _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); + //Applies to both nodes and guides, but not to bboxes, that's why its located here + //Other options to locate here: e.g. visual snapping indicators on/off + + Gtk::Label *label_g = manage (new Gtk::Label); + label_g->set_markup (_("Snapping of")); Gtk::Label *label_o = manage (new Gtk::Label); - label_o->set_markup (_("Object Snapping")); + label_o->set_markup (_("Snapping to objects")); Gtk::Label *label_gr = manage (new Gtk::Label); - label_gr->set_markup (_("Grid Snapping")); + label_gr->set_markup (_("Snapping to grids")); Gtk::Label *label_gu = manage (new Gtk::Label); - label_gu->set_markup (_("Guide Snapping")); + label_gu->set_markup (_("Snapping to guides")); + Gtk::Label *label_m = manage (new Gtk::Label); + label_m->set_markup (_("Miscellaneous")); - const Gtk::Widget* array[] = + Gtk::Widget *const array[] = { + label_g, 0, + 0, _rcbsnn._button, + //0, 0, //_rcbic._button will be inserted here + 0, _rcbsnbb._button, + 0, _rcbsng._button, + 0, 0, + 0, 0, + 0, 0, label_o, 0, - 0, _rcbsnop._button, - 0, _rcbsnon._button, + 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, + 0, 0, + 0, 0, + 0, 0, + label_m, 0, + 0, _rcbic._button }; - attach_all (_page_snap.table(), array, sizeof(array)); + attach_all(_page_snap.table(), array, G_N_ELEMENTS(array)); } /** @@ -352,9 +392,10 @@ DocumentProperties::build_gridspage() Gtk::Label* label_crea_type = manage (new Gtk::Label); label_crea_type->set_markup (_("Gridtype")); - _grids_combo_gridtype.append_text(Glib::ustring("xygrid")); - _grids_combo_gridtype.append_text(Glib::ustring("axonometric")); - _grids_combo_gridtype.set_active_text(Glib::ustring("xygrid")); + 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 (_("Defined grids")); @@ -364,16 +405,16 @@ DocumentProperties::build_gridspage() _grids_notebook.append_page(grid->getWidget(), grid->repr->attribute("id")); } - const Gtk::Widget* widget_array[] = + 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, - (Gtk::Widget*) &_grids_notebook, 0 + label_def, 0 }; - - attach_all (_page_grids.table(), widget_array, sizeof(widget_array)); + 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); } @@ -412,8 +453,13 @@ DocumentProperties::update() _rcp_hgui.setRgba32 (nv->guidehicolor); //-----------------------------------------------------------snap - _rcbsnop.setActive (nv->snap_manager.object.getSnapToPaths()); - _rcbsnon.setActive (nv->snap_manager.object.getSnapToNodes()); + + _rcbsnbb.setActive (nv->snap_manager.getSnapModeBBox()); + _rcbsnn.setActive (nv->snap_manager.getSnapModeNode()); + _rcbsng.setActive (nv->snap_manager.getSnapModeGuide()); + _rcbic.setActive (nv->snap_manager.getIncludeItemCenter()); + _rcbsnop.setActive(nv->snap_manager.object.getSnapToItemPath()); + _rcbsnon.setActive(nv->snap_manager.object.getSnapToItemNode()); _rsu_sno.setValue (nv->objecttolerance); _rsu_sn.setValue (nv->gridtolerance); @@ -528,10 +574,12 @@ 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 = SP_ACTIVE_DESKTOP; + 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, typestring.c_str()); + CanvasGrid::writeNewGridToRepr(repr, doc, CanvasGrid::getGridTypeFromName(typestring.c_str())); } @@ -563,6 +611,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")); } }