X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Fdocument-properties.cpp;h=0817b06aba7418c8e5cb774cf6fcf2ed1fdd5f4c;hb=c2d52ded82a4cb5fbe07a704db134588cceb9b8c;hp=af847149ec7386901cd467b04556162af46c678f;hpb=33157dcbd3c93dbc3087cdbdd20a0851a515b907;p=inkscape.git diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index af847149e..0817b06ab 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -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,7 +258,7 @@ 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 @@ -266,12 +266,6 @@ DocumentProperties::build_snap() { _page_snap.show(); -/* _rcbsnbo.init (_("_Snap bounding boxes to objects"), - _("Snap the edges of the object bounding boxes to other objects"), - "inkscape:object-bbox", _wr); - _rcbsnnob.init (_("Snap nodes _to objects"), - _("Snap the nodes of objects to other objects"), - "inkscape:object-points", _wr);*/ _rcbsnop.init (_("Snap to object _paths"), _("Snap to other object paths"), "inkscape:object-paths", _wr); @@ -282,22 +276,10 @@ DocumentProperties::build_snap() _("Snapping distance, in screen pixels, for snapping to objects"), _("If set, objects snap to the nearest object, regardless of distance"), "objecttolerance", _wr); -/* _rcbsnbb.init (_("Snap _bounding boxes to grid"), - _("Snap the edges of the object bounding boxes"), - "inkscape:grid-bbox", _wr); - _rcbsnnod.init (_("Snap nodes to _grid"), - _("Snap path nodes, text baselines, ellipse centers, etc."), - "inkscape:grid-points", _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"), "gridtolerance", _wr); -/* _rcb_snpgui.init (_("Snap bounding boxes to g_uides"), - _("Snap the edges of the object bounding boxes"), - "inkscape:guide-bbox", _wr); - _rcb_snbgui.init (_("Snap p_oints to guides"), - _("Snap path nodes, text baselines, ellipse centers, etc."), - "inkscape:guide-points", _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"), @@ -309,27 +291,21 @@ DocumentProperties::build_snap() Gtk::Label *label_gu = manage (new Gtk::Label); label_gu->set_markup (_("Guide Snapping")); - const Gtk::Widget* array[] = + Gtk::Widget *const array[] = { label_o, 0, -// 0, _rcbsnbo._button, -// 0, _rcbsnnob._button, 0, _rcbsnop._button, 0, _rcbsnon._button, 0, _rsu_sno._vbox, 0, 0, label_gr, 0, -// 0, _rcbsnbb._button, -// 0, _rcbsnnod._button, 0, _rsu_sn._vbox, 0, 0, label_gu, 0, -// 0, _rcb_snpgui._button, -// 0, _rcb_snbgui._button, 0, _rsu_gusn._vbox, }; - attach_all (_page_snap.table(), array, sizeof(array)); + attach_all(_page_snap.table(), array, G_N_ELEMENTS(array)); } /** @@ -376,9 +352,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")); @@ -388,16 +365,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); } @@ -436,18 +413,12 @@ DocumentProperties::update() _rcp_hgui.setRgba32 (nv->guidehicolor); //-----------------------------------------------------------snap - //_rcbsnbo.setActive (nv->snap_manager.object.getSnapTo(Inkscape::Snapper::BBOX_POINT)); - //_rcbsnnob.setActive (nv->snap_manager.object.getSnapTo(Inkscape::Snapper::SNAP_POINT)); _rcbsnop.setActive (nv->snap_manager.object.getSnapToPaths()); _rcbsnon.setActive (nv->snap_manager.object.getSnapToNodes()); _rsu_sno.setValue (nv->objecttolerance); - //_rcbsnbb.setActive (nv->snap_manager.grid.getSnapTo(Inkscape::Snapper::BBOX_POINT)); - //_rcbsnnod.setActive (nv->snap_manager.grid.getSnapTo(Inkscape::Snapper::SNAP_POINT)); _rsu_sn.setValue (nv->gridtolerance); - //_rcb_snpgui.setActive (nv->snap_manager.guide.getSnapTo(Inkscape::Snapper::BBOX_POINT)); - //_rcb_snbgui.setActive (nv->snap_manager.guide.getSnapTo(Inkscape::Snapper::SNAP_POINT)); _rsu_gusn.setValue (nv->guidetolerance); //-----------------------------------------------------------grids page @@ -558,10 +529,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())); } @@ -593,6 +566,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")); } }