X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Fdocument-properties.cpp;h=e2dc2c0b9156ad6fb403c462d699bff94b10ca26;hb=e38df2ff7d95236e712464a1a8c472f2d9636e53;hp=9a9deac9f5f7d0fac880757285c774bccdae7465;hpb=a42a6d4d0cc81a03c2e0e36bd48f7bd079ee5390;p=inkscape.git diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 9a9deac9f..e2dc2c0b9 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -9,6 +9,7 @@ * Jon Phillips * Ralf Stephan (Gtkmm) * + * Copyright (C) 2006-2007 Johan Engelen * Copyright (C) 2000 - 2005 Authors * * Released under GNU GPL. Read the file 'COPYING' for more information @@ -20,12 +21,13 @@ +#include #include "ui/widget/color-picker.h" #include "ui/widget/scalar-unit.h" -#include "ui/widget/button.h" #include "xml/node-event-vector.h" #include "helper/units.h" +#include "prefs-utils.h" #include "inkscape.h" #include "verbs.h" @@ -33,10 +35,11 @@ #include "desktop-handles.h" #include "desktop.h" #include "sp-namedview.h" -#include "helper/action.h" #include "document-properties.h" +#include "display/canvas-grid.h" + using std::pair; namespace Inkscape { @@ -52,16 +55,16 @@ namespace Dialog { 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 void fire_fit_canvas_to_selection_or_drawing(); - static Inkscape::XML::NodeEventVector const _repr_events = { - NULL, /* child_added */ - NULL, /* child_removed */ + on_child_added, /* child_added */ + on_child_removed, /* child_removed */ on_repr_attr_changed, NULL, /* content_changed */ NULL /* order_changed */ @@ -69,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; } @@ -87,25 +90,31 @@ DocumentProperties::destroy() } } -DocumentProperties::DocumentProperties() - : Dialog ("dialogs.documentoptions", SP_VERB_DIALOG_NAMEDVIEW), - _page_page(1, 1), _page_grid(1, 1), _page_guides(1, 1), - _page_snap(1, 1), +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.")), + _grids_button_remove(_("_Remove"), _("Remove selected grid.")), _prefs_path("dialogs.documentoptions") { - hide(); set_resizable (false); _tt.enable(); get_vbox()->set_spacing (4); get_vbox()->pack_start (_notebook, true, true); _notebook.append_page(_page_page, _("Page")); - _notebook.append_page(_page_grid, _("Grid/Guides")); - _notebook.append_page(_page_snap, _("Snap")); + _notebook.append_page(_page_guides, _("Guides")); + _notebook.append_page(_page_grids, _("Grids")); + _notebook.append_page(_page_snap, _("Snapping")); build_page(); - build_grid(); + build_guides(); + build_gridspage(); build_snap(); + + _grids_button_new.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onNewGrid)); + _grids_button_remove.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onRemoveGrid)); } void @@ -115,64 +124,69 @@ DocumentProperties::init() Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->addListener (&_repr_events, this); + Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(SP_ACTIVE_DESKTOP)->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(); + present(); } -DocumentProperties::~DocumentProperties() +DocumentProperties::~DocumentProperties() { Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->removeListenerByData (this); + Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(SP_ACTIVE_DESKTOP)->root); + root->removeListenerByData (this); _doc_replaced_connection.disconnect(); } //======================================================================== /** - * 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, + table.attach (label, 0, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); } else { Gtk::HBox *space = manage (new Gtk::HBox); space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y); - table.attach (*space, 0, 1, r, r+1, + table.attach (*space, 0, 1, r, r+1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0,0,0); } } @@ -194,9 +208,7 @@ DocumentProperties::build_page() "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); - Inkscape::UI::Widget::Button* fit_canv = manage(new Inkscape::UI::Widget::Button(_("Fit canvas to selection"), - _("Fit the canvas to the current selection or fit to the drawing when there is no selection."))); - fit_canv->signal_clicked().connect(sigc::ptr_fun(fire_fit_canvas_to_selection_or_drawing)); + Gtk::Label* label_gen = manage (new Gtk::Label); label_gen->set_markup (_("General")); Gtk::Label* label_bor = manage (new Gtk::Label); @@ -205,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, @@ -213,7 +225,6 @@ DocumentProperties::build_page() 0, 0, label_for, 0, 0, &_page_sizer, - 0, fit_canv, 0, 0, label_bor, 0, 0, _rcb_canb._button, @@ -221,155 +232,204 @@ DocumentProperties::build_page() 0, _rcb_shad._button, _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 -DocumentProperties::build_grid() +DocumentProperties::build_guides() { - _page_grid.show(); + _page_guides.show(); - /// \todo FIXME: gray out snapping when grid is off. - /// Dissenting view: you want snapping without grid. - - _rcbgrid.init (_("_Show grid"), _("Show or hide grid"), "showgrid", _wr); - _rumg.init (_("Grid _units:"), "grid_units", _wr); - _rsu_ox.init (_("_Origin X:"), _("X coordinate of grid origin"), - "gridoriginx", _rumg, _wr); - _rsu_oy.init (_("O_rigin Y:"), _("Y coordinate of grid origin"), - "gridoriginy", _rumg, _wr); - _rsu_sx.init (_("Spacing _X:"), _("Distance of vertical grid lines"), - "gridspacingx", _rumg, _wr); - _rsu_sy.init (_("Spacing _Y:"), _("Distance of horizontal grid lines"), - "gridspacingy", _rumg, _wr); - _rcp_gcol.init (_("Grid line _color:"), _("Grid line color"), - _("Color of grid lines"), "gridcolor", "gridopacity", _wr); - _rcp_gmcol.init (_("Ma_jor grid line color:"), _("Major grid line color"), - _("Color of the major (highlighted) grid lines"), - "gridempcolor", "gridempopacity", _wr); - _rsi.init (_("_Major grid line every:"), _("lines"), "gridempspacing", _wr); _rcb_sgui.init (_("Show _guides"), _("Show or hide guides"), "showguides", _wr); - _rcp_gui.init (_("Guide co_lor:"), _("Guideline color"), + _rcp_gui.init (_("Guide co_lor:"), _("Guideline color"), _("Color of guidelines"), "guidecolor", "guideopacity", _wr); - _rcp_hgui.init (_("_Highlight color:"), _("Highlighted guideline color"), + _rcp_hgui.init (_("_Highlight color:"), _("Highlighted guideline color"), _("Color of a guideline when it is under mouse"), "guidehicolor", "guidehiopacity", _wr); - Gtk::Label *label_grid = manage (new Gtk::Label); - label_grid->set_markup (_("Grid")); Gtk::Label *label_gui = manage (new Gtk::Label); label_gui->set_markup (_("Guides")); - const Gtk::Widget* widget_array[] = + Gtk::Widget *const widget_array[] = { - label_grid, 0, - 0, _rcbgrid._button, - _rumg._label, _rumg._sel, - 0, _rsu_ox.getSU(), - 0, _rsu_oy.getSU(), - 0, _rsu_sx.getSU(), - 0, _rsu_sy.getSU(), - _rcp_gcol._label, _rcp_gcol._cp, - 0, 0, - _rcp_gmcol._label, _rcp_gmcol._cp, - _rsi._label, &_rsi._hbox, - 0, 0, label_gui, 0, 0, _rcb_sgui._button, _rcp_gui._label, _rcp_gui._cp, _rcp_hgui._label, _rcp_hgui._cp, }; - attach_all (_page_grid.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(); - - _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"), + //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"), - _("Controls max. snapping distance from object"), - _("If set, objects snap to the nearest object when moved, regardless of distance"), + _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); - _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"), - _("Controls max. snapping distance from grid"), - _("If set, objects snap to the nearest grid line when moved, regardless of distance"), + + //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); - _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"), - _("Controls max. snapping distance from guides"), - _("If set, objects snap to the nearest guide when moved, regardless of distance"), + + //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); -// _rrb_pix.init (_("Sensitivity:"), _("S_creen pixels"), _("p_x units"), -// _("Sensitivity is always the same, regardless of zoom."), -// _("Sensitivity changes with zoom; zooming in will enlarge max. snapping distance."), -// _("inkscape:has_abs_tolerance"), _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")); - - const Gtk::Widget* array[] = + label_gu->set_markup (_("Snapping to guides")); + Gtk::Label *label_m = manage (new Gtk::Label); + label_m->set_markup (_("Miscellaneous")); + + 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, _rcbsnbo._button, - 0, _rcbsnnob._button, - 0, _rcbsnop._button, - 0, _rcbsnon._button, + 0, _rcbsnop._button, + 0, _rcbsnon._button, 0, _rsu_sno._vbox, - 0, 0, + 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, -// 0, 0, -// 0, _rrb_pix._hbox, + 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)); } /** - * Update dialog widgets from desktop. +* Called for _updating_ the dialog (e.g. when a new grid was manually added in XML) +*/ +void +DocumentProperties::update_gridspage() +{ + SPDesktop *dt = SP_ACTIVE_DESKTOP; + SPNamedView *nv = sp_desktop_namedview(dt); + + //remove all tabs + while (_grids_notebook.get_current_page() != -1) { + _grids_notebook.remove_page(-1); + } + + //add tabs + 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_notebook.show_all(); + + _page_grids.table().resize_children(); +} + +/** + * Build grid page of dialog. + */ +void +DocumentProperties::build_gridspage() +{ + _page_grids.show(); + + /// \todo FIXME: gray out snapping when grid is off. + /// Dissenting view: you want snapping without grid. + + SPDesktop *dt = SP_ACTIVE_DESKTOP; + SPNamedView *nv = sp_desktop_namedview(dt); + + Gtk::Label* label_crea = manage (new Gtk::Label); + label_crea->set_markup (_("Creation")); + Gtk::Label* label_crea_type = manage (new Gtk::Label); + label_crea_type->set_markup (_("Gridtype")); + + 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")); + + 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")); + } + + 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 + }; + 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); +} + + + +/** + * Update dialog widgets from desktop. Also call updateWidget routines of the grids. */ void DocumentProperties::update() { if (_wr.isUpdating()) return; - + SPDesktop *dt = SP_ACTIVE_DESKTOP; SPNamedView *nv = sp_desktop_namedview(dt); + _wr.setUpdating (true); set_sensitive (true); @@ -379,56 +439,36 @@ DocumentProperties::update() _rcb_bord.setActive (nv->borderlayer == SP_BORDER_LAYER_TOP); _rcp_bord.setRgba32 (nv->bordercolor); _rcb_shad.setActive (nv->showpageshadow); - - if (nv->doc_units) + + if (nv->doc_units) _rum_deflt.setUnit (nv->doc_units); double const doc_w_px = sp_document_width(sp_desktop_document(dt)); double const doc_h_px = sp_document_height(sp_desktop_document(dt)); _page_sizer.setDim (doc_w_px, doc_h_px); - //-----------------------------------------------------------grid page - _rcbgrid.setActive (nv->showgrid); - _rumg.setUnit (nv->gridunit); - - gdouble val; - val = nv->gridorigin[NR::X]; - val = sp_pixels_get_units (val, *(nv->gridunit)); - _rsu_ox.setValue (val); - val = nv->gridorigin[NR::Y]; - val = sp_pixels_get_units (val, *(nv->gridunit)); - _rsu_oy.setValue (val); - val = nv->gridspacing[NR::X]; - double gridx = sp_pixels_get_units (val, *(nv->gridunit)); - _rsu_sx.setValue (gridx); - val = nv->gridspacing[NR::Y]; - double gridy = sp_pixels_get_units (val, *(nv->gridunit)); - _rsu_sy.setValue (gridy); - - _rcp_gcol.setRgba32 (nv->gridcolor); - _rcp_gmcol.setRgba32 (nv->gridempcolor); - _rsi.setValue (nv->gridempspacing); - //-----------------------------------------------------------guide _rcb_sgui.setActive (nv->showguides); _rcp_gui.setRgba32 (nv->guidecolor); _rcp_hgui.setRgba32 (nv->guidehicolor); //-----------------------------------------------------------snap - _rcbsnbo.setActive (nv->snap_object_bbox); - _rcbsnnob.setActive (nv->snap_object_point); - _rcbsnop.setActive (nv->snap_object_paths); - _rcbsnop.setActive (nv->snap_object_nodes); - _rsu_sno.setValue (nv->objecttolerance, nv->has_abs_tolerance); - - _rcbsnbb.setActive (nv->snap_grid_bbox); - _rcbsnnod.setActive (nv->snap_grid_point); - _rsu_sn.setValue (nv->gridtolerance, nv->has_abs_tolerance); - _rcb_snpgui.setActive (nv->snap_guide_bbox); - _rcb_snbgui.setActive (nv->snap_guide_point); - _rsu_gusn.setValue (nv->guidetolerance, nv->has_abs_tolerance); -// _rrb_pix.setValue (true); + _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); + + _rsu_gusn.setValue (nv->guidetolerance); + + //-----------------------------------------------------------grids page + + update_gridspage(); _wr.setUpdating (false); } @@ -442,16 +482,36 @@ DocumentProperties::on_response (int id) { _rcp_bg.closeWindow(); _rcp_bord.closeWindow(); - _rcp_gcol.closeWindow(); - _rcp_gmcol.closeWindow(); _rcp_gui.closeWindow(); _rcp_hgui.closeWindow(); - } - + } + if (id == Gtk::RESPONSE_CLOSE) hide(); } + + +static void +on_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data) +{ + if (!_instance) + return; + + _instance->update_gridspage(); +} + +static void +on_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data) +{ + if (!_instance) + return; + + _instance->update_gridspage(); +} + + + /** * Called when XML node attribute changed; updates dialog widgets. */ @@ -464,7 +524,7 @@ on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar _instance->update(); } -static void +static void on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*) { if (!_instance) @@ -472,11 +532,13 @@ on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*) 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(); } -static void +static void on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*) { if (!_instance) @@ -484,10 +546,12 @@ on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*) 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(); } -static void +static void on_doc_replaced (SPDesktop* dt, SPDocument* doc) { if (!_instance) @@ -495,20 +559,60 @@ on_doc_replaced (SPDesktop* dt, SPDocument* doc) 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(); } -static void -fire_fit_canvas_to_selection_or_drawing() { + + + +/*######################################################################## +# BUTTON CLICK HANDLERS (callbacks) +########################################################################*/ + +void +DocumentProperties::onNewGrid() +{ SPDesktop *dt = SP_ACTIVE_DESKTOP; - if (!dt) return; - Verb *verb = Verb::get( SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING ); - if (verb) { - SPAction *action = verb->get_action(dt); - if (action) { - sp_action_perform(action, NULL); + 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())); +} + + +void +DocumentProperties::onRemoveGrid() +{ + gint pagenum = _grids_notebook.get_current_page(); + 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; + SPNamedView *nv = sp_desktop_namedview(dt); + Inkscape::CanvasGrid * found_grid = NULL; + for (GSList const * l = nv->grids; l != NULL; l = l->next) { + Inkscape::CanvasGrid * grid = (Inkscape::CanvasGrid*) l->data; + gchar const *idtext = grid->repr->attribute("id"); + if ( !strcmp(tabtext.c_str(), idtext) ) { + found_grid = grid; + break; // break out of for-loop } } + if (found_grid) { + // 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")); + } } @@ -521,7 +625,7 @@ fire_fit_canvas_to_selection_or_drawing() { mode:c++ c-file-style:"stroustrup" c-file-offsets:((innamespace . 0)(inline-open . 0)) - indent-tabs-mode:nil + indent-tabs-mode:nilu fill-column:99 End: */