X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Fdocument-properties.cpp;h=519f795db1527929601125d5eaded7ff16fb5e2f;hb=ba885512446fff2803585a4aaec34e7742841f05;hp=3d241d6714b6e8cba849cf5364be9710dabd4ff4;hpb=94dbc6815a2905121e25184ad31b8534f53dfe4c;p=inkscape.git diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 3d241d671..519f795db 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -8,8 +8,10 @@ * Lauris Kaplinski * Jon Phillips * Ralf Stephan (Gtkmm) + * Diederik van Lierop * - * Copyright (C) 2000 - 2005 Authors + * Copyright (C) 2006-2008 Johan Engelen + * Copyright (C) 2000 - 2008 Authors * * Released under GNU GPL. Read the file 'COPYING' for more information */ @@ -20,11 +22,13 @@ +#include #include "ui/widget/color-picker.h" #include "ui/widget/scalar-unit.h" #include "xml/node-event-vector.h" #include "helper/units.h" +#include "prefs-utils.h" #include "inkscape.h" #include "verbs.h" @@ -32,9 +36,11 @@ #include "desktop-handles.h" #include "desktop.h" #include "sp-namedview.h" - +#include "widgets/icon.h" #include "document-properties.h" +#include "display/canvas-grid.h" + using std::pair; namespace Inkscape { @@ -44,64 +50,105 @@ namespace Dialog { #define SPACE_SIZE_X 15 #define SPACE_SIZE_Y 10 +#define INKSCAPE_ICON_GRID_XY "grid_xy" +#define INKSCAPE_ICON_GRID_AXONOM "grid_axonom" + + //=================================================== //--------------------------------------------------- -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 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 */ }; -DocumentProperties* -DocumentProperties::create() +DocumentProperties & +DocumentProperties::getInstance() { - if (_instance) return _instance; - _instance = new DocumentProperties; - _instance->init(); - return _instance; -} + DocumentProperties &instance = *new DocumentProperties(); + instance.init(); -void -DocumentProperties::destroy() -{ - if (_instance) - { - delete _instance; - _instance = 0; - } + return instance; } -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() + : UI::Widget::Panel ("", "dialogs.documentoptions", SP_VERB_DIALOG_NAMEDVIEW), + _page_page(1, 1), _page_guides(1, 1), + _page_snap(1, 1), _page_snap_dtls(1, 1), + //--------------------------------------------------------------- + _rcb_canb(_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false), + _rcb_bord(_("Border on _top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false), + _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), + _rcbsng(_("_Snap guides while dragging"), _("While dragging a guide, snap to object nodes or bounding box corners ('Snap to nodes' or 'snap to bounding box corners' must be enabled in the 'Snap' tab; only a small part of the guide near the cursor will snap)"), + "inkscape:snap-guide", _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), + //--------------------------------------------------------------- + _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"), + "inkscape:snap-nodes", _wr), + //Options for snapping to objects + _rcbsnop(_("Snap to path_s"), _("Snap nodes to object paths"), "inkscape:object-paths", _wr), + _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), + _rcbsigg(_("_Grid with guides"), _("Snap to grid-guide intersections"), "inkscape:snap-intersection-grid-guide", _wr), + _rcbsils(_("_Line segments"), _("Snap to intersections of line segments ('snap to paths' must be enabled, see the previous tab)"), + "inkscape:snap-intersection-line-segments", _wr), + //--------------------------------------------------------------- + _grids_label_crea("", Gtk::ALIGN_LEFT), + //TRANSLATORS: In Grid|_New translate only the word _New. It ref to grid + _grids_button_new(Q_("Grid|_New"), _("Create new grid.")), + _grids_button_remove(_("_Remove"), _("Remove selected grid.")), + _grids_label_def("", Gtk::ALIGN_LEFT), + //--------------------------------------------------------------- _prefs_path("dialogs.documentoptions") { - hide(); - set_resizable (false); _tt.enable(); - get_vbox()->set_spacing (4); - get_vbox()->pack_start (_notebook, true, true); + _getContents()->set_spacing (4); + _getContents()->pack_start(_notebook, true, true); _notebook.append_page(_page_page, _("Page")); - _notebook.append_page(_page_grid, _("Grid/Guides")); + _notebook.append_page(_page_guides, _("Guides")); + _notebook.append_page(_grids_vbox, _("Grids")); _notebook.append_page(_page_snap, _("Snap")); + _notebook.append_page(_page_snap_dtls, _("Snap points")); build_page(); - build_grid(); + build_guides(); + build_gridspage(); build_snap(); + build_snap_dtls(); + + _grids_button_new.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onNewGrid)); + _grids_button_remove.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onRemoveGrid)); + + signalDocumentReplaced().connect(sigc::mem_fun(*this, &DocumentProperties::_handleDocumentReplaced)); + signalActivateDesktop().connect(sigc::mem_fun(*this, &DocumentProperties::_handleActivateDesktop)); + signalDeactiveDesktop().connect(sigc::mem_fun(*this, &DocumentProperties::_handleDeactivateDesktop)); } void @@ -109,66 +156,61 @@ DocumentProperties::init() { update(); - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop())); repr->addListener (&_repr_events, this); + Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(getDesktop())->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(); + _grids_button_remove.hide(); } -DocumentProperties::~DocumentProperties() +DocumentProperties::~DocumentProperties() { - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop())); repr->removeListenerByData (this); - _doc_replaced_connection.disconnect(); + Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(getDesktop())->root); + root->removeListenerByData (this); } //======================================================================== /** - * 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); } } @@ -181,98 +223,51 @@ DocumentProperties::build_page() { _page_page.show(); - _rcp_bg.init (_("Back_ground:"), _("Background color"), _("Color and transparency of the page background (also used for bitmap export)"), - "pagecolor", "inkscape:pageopacity", _wr); - _rcb_canb.init (_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false); - _rcb_bord.init (_("Border on _top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false); - _rcp_bord.init (_("Border _color:"), _("Page border color"), - _("Color of the page border"), - "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); Gtk::Label* label_gen = manage (new Gtk::Label); label_gen->set_markup (_("General")); Gtk::Label* label_bor = manage (new Gtk::Label); label_bor->set_markup (_("Border")); Gtk::Label *label_for = manage (new Gtk::Label); label_for->set_markup (_("Format")); - _page_sizer.init (_wr); + _page_sizer.init(); - const Gtk::Widget* widget_array[] = + Gtk::Widget *const widget_array[] = { label_gen, 0, - _rum_deflt._label, _rum_deflt._sel, - _rcp_bg._label, _rcp_bg._cp, - 0, 0, + 0, &_rum_deflt, + _rcp_bg._label, &_rcp_bg, + 0, 0, label_for, 0, 0, &_page_sizer, - 0, 0, + 0, 0, label_bor, 0, - 0, _rcb_canb._button, - 0, _rcb_bord._button, - 0, _rcb_shad._button, - _rcp_bord._label, _rcp_bord._cp, + 0, &_rcb_canb, + 0, &_rcb_bord, + 0, &_rcb_shad, + _rcp_bord._label, &_rcp_bord, }; - - 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"), - _("Color of guidelines"), "guidecolor", "guideopacity", _wr); - _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, + label_gui, 0, + 0, &_rcb_sgui, + _rcp_gui._label, &_rcp_gui, + _rcp_hgui._label, &_rcp_hgui, + 0, &_rcbsng, }; - attach_all (_page_grid.table(), widget_array, sizeof(widget_array)); + attach_all(_page_guides.table(), widget_array, G_N_ELEMENTS(widget_array)); } void @@ -280,84 +275,197 @@ 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); - _rcbsnon.init (_("Snap to object _nodes"), - _("Snap to other object nodes"), - "inkscape:object-nodes", _wr); - _rsu_sno.init (_("Snap s_ensitivity:"), _(""), - _("Controls max. snapping distance from object"), + _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); - _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:"), _(""), - _("Controls max. snapping distance from grid"), + + //Options for snapping to grids + _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); - _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:"), _(""), - _("Controls max. snapping distance from guides"), "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); + + //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); + + //Other options to locate here: e.g. visual snapping indicators on/off + + std::list slaves; + slaves.push_back(&_rcbsnop); + slaves.push_back(&_rcbsnon); + _rcbsnn.setSlaveWidgets(slaves); + + slaves.clear(); + slaves.push_back(&_rcbsnbbp); + slaves.push_back(&_rcbsnbbn); + _rcbsnbb.setSlaveWidgets(slaves); + + slaves.clear(); + slaves.push_back(&_rcbsnn); + slaves.push_back(&_rcbsnbb); + slaves.push_back(&_rcbsi); + + _rcbs.setSlaveWidgets(slaves); + + Gtk::Label *label_g = manage (new Gtk::Label); + label_g->set_markup (_("Snapping")); + Gtk::Label *label_w = manage (new Gtk::Label); + label_w->set_markup (_("What snaps")); Gtk::Label *label_o = manage (new Gtk::Label); - label_o->set_markup (_("Object Snapping")); + label_o->set_markup (_("Snap to objects")); Gtk::Label *label_gr = manage (new Gtk::Label); - label_gr->set_markup (_("Grid Snapping")); + label_gr->set_markup (_("Snap to grids")); Gtk::Label *label_gu = manage (new Gtk::Label); - label_gu->set_markup (_("Guide Snapping")); - - const Gtk::Widget* array[] = + label_gu->set_markup (_("Snap to guides")); + + Gtk::Widget *const array[] = { + label_g, 0, + 0, &_rcbs, + 0, &_rcbsi, + 0, 0, + label_w, 0, + 0, &_rcbsnn, + 0, &_rcbsnbb, + 0, 0, label_o, 0, - 0, _rcbsnbo._button, - 0, _rcbsnnob._button, - 0, _rcbsnop._button, - 0, _rcbsnon._button, - 0, _rsu_sno._hbox, - 0, 0, + 0, &_rcbsnop, + 0, &_rcbsnon, + 0, &_rcbsnbbp, + 0, &_rcbsnbbn, + 0, &_rcbsnpb, + 0, _rsu_sno._vbox, + 0, 0, label_gr, 0, - 0, _rcbsnbb._button, - 0, _rcbsnnod._button, - 0, _rsu_sn._hbox, - 0, 0, - label_gu, 0, - 0, _rcb_snpgui._button, - 0, _rcb_snbgui._button, - 0, _rsu_gusn._hbox, - 0, 0, - 0, _rrb_pix._hbox, + 0, _rsu_sn._vbox, + 0, 0, + label_gu, 0, + 0, _rsu_gusn._vbox }; - attach_all (_page_snap.table(), array, sizeof(array)); + attach_all(_page_snap.table(), array, G_N_ELEMENTS(array)); } +void +DocumentProperties::build_snap_dtls() +{ + _page_snap_dtls.show(); + + //Other options to locate here: e.g. visual snapping indicators on/off + + 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 (_("Special points to consider")); + + Gtk::Widget *const array[] = + { + label_i, 0, + 0, &_rcbsigg, + 0, &_rcbsils, + 0, 0, + label_m, 0, + 0, &_rcbic, + }; + + attach_all(_page_snap_dtls.table(), array, G_N_ELEMENTS(array)); +} + +/** +* Called for _updating_ the dialog (e.g. when a new grid was manually added in XML) +*/ +void +DocumentProperties::update_gridspage() +{ + SPDesktop *dt = getDesktop(); + SPNamedView *nv = sp_desktop_namedview(dt); + + //remove all tabs + while (_grids_notebook.get_n_pages() != 0) { + _grids_notebook.remove_page(-1); // this also deletes the page. + } + + //add tabs + bool grids_present = false; + for (GSList const * l = nv->grids; l != NULL; l = l->next) { + Inkscape::CanvasGrid * grid = (Inkscape::CanvasGrid*) l->data; + if (!grid->repr->attribute("id")) continue; // update_gridspage is called again when "id" is added + Glib::ustring name(grid->repr->attribute("id")); + const char *icon = NULL; + switch (grid->getGridType()) { + case GRID_RECTANGULAR: + icon = INKSCAPE_ICON_GRID_XY; + break; + case GRID_AXONOMETRIC: + icon = INKSCAPE_ICON_GRID_AXONOM; + break; + default: + break; + } + _grids_notebook.append_page(*grid->newWidget(), _createPageTabLabel(name, icon)); + grids_present = true; + } + _grids_notebook.show_all(); + + if (grids_present) + _grids_button_remove.set_sensitive(true); + else + _grids_button_remove.set_sensitive(false); +} + +/** + * Build grid page of dialog. + */ +void +DocumentProperties::build_gridspage() +{ + /// \todo FIXME: gray out snapping when grid is off. + /// Dissenting view: you want snapping without grid. + + SPDesktop *dt = getDesktop(); + SPNamedView *nv = sp_desktop_namedview(dt); + (void)nv; + + _grids_label_crea.set_markup(_("Creation")); + _grids_label_def.set_markup(_("Defined grids")); + _grids_hbox_crea.pack_start(_grids_combo_gridtype, true, true); + _grids_hbox_crea.pack_start(_grids_button_new, true, true); + + 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) ); + + _grids_space.set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y); + + _grids_vbox.set_spacing(4); + _grids_vbox.pack_start(_grids_label_crea, false, false); + _grids_vbox.pack_start(_grids_hbox_crea, false, false); + _grids_vbox.pack_start(_grids_space, false, false); + _grids_vbox.pack_start(_grids_label_def, false, false); + _grids_vbox.pack_start(_grids_notebook, false, false); + _grids_vbox.pack_start(_grids_button_remove, false, false); + + update_gridspage(); +} + + + /** - * Update dialog widgets from desktop. + * 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_DT_NAMEDVIEW(dt); + + SPDesktop *dt = getDesktop(); + SPNamedView *nv = sp_desktop_namedview(dt); + _wr.setUpdating (true); set_sensitive (true); @@ -367,60 +475,64 @@ 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_DT_DOCUMENT(dt)); - double const doc_h_px = sp_document_height(SP_DT_DOCUMENT(dt)); + 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->object_snapper.getSnapTo(Inkscape::Snapper::BBOX_POINT)); - _rcbsnnob.setActive (nv->object_snapper.getSnapTo(Inkscape::Snapper::SNAP_POINT)); - _rcbsnop.setActive (nv->object_snapper.getSnapToPaths()); - _rcbsnop.setActive (nv->object_snapper.getSnapToNodes()); - _rsu_sno.setValue (nv->objecttolerance, nv->has_abs_tolerance); - - _rcbsnbb.setActive (nv->grid_snapper.getSnapTo(Inkscape::Snapper::BBOX_POINT)); - _rcbsnnod.setActive (nv->grid_snapper.getSnapTo(Inkscape::Snapper::SNAP_POINT)); - _rsu_sn.setValue (nv->gridtolerance, nv->has_abs_tolerance); - - _rcb_snpgui.setActive (nv->guide_snapper.getSnapTo(Inkscape::Snapper::BBOX_POINT)); - _rcb_snbgui.setActive (nv->guide_snapper.getSnapTo(Inkscape::Snapper::SNAP_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()); + _rcbsigg.setActive (nv->snap_manager.getSnapIntersectionGG()); + _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); + + _rcbs.setActive (nv->snap_manager.getSnapEnabledGlobally()); + _rcbsi.setActive (nv->snapindicator); + + //-----------------------------------------------------------grids page + + update_gridspage(); _wr.setUpdating (false); } +// TODO: copied from fill-and-stroke.cpp factor out into new ui/widget file? +Gtk::HBox& +DocumentProperties::_createPageTabLabel(const Glib::ustring& label, const char *label_image) +{ + Gtk::HBox *_tab_label_box = manage(new Gtk::HBox(false, 0)); + _tab_label_box->set_spacing(4); + _tab_label_box->pack_start(*Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_DECORATION, + label_image))); + + Gtk::Label *_tab_label = manage(new Gtk::Label(label, true)); + _tab_label_box->pack_start(*_tab_label); + _tab_label_box->show_all(); + + return *_tab_label_box; +} + //-------------------------------------------------------------------- void @@ -430,60 +542,113 @@ 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(); } -/** - * Called when XML node attribute changed; updates dialog widgets. - */ -static void -on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer) +void +DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *document) { - if (!_instance) - return; + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop)); + repr->addListener(&_repr_events, this); + Inkscape::XML::Node *root = SP_OBJECT_REPR(document->root); + root->addListener(&_repr_events, this); + update(); +} - _instance->update(); +void +DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop) +{ + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop)); + repr->addListener(&_repr_events, this); + Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(desktop)->root); + root->addListener(&_repr_events, this); + update(); } -static void -on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*) +void +DocumentProperties::_handleDeactivateDesktop(Inkscape::Application *, SPDesktop *desktop) { - if (!_instance) - return; + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop)); + repr->removeListenerByData(this); + Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(desktop)->root); + root->removeListenerByData(this); +} - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); - repr->addListener (&_repr_events, _instance); - _instance->_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced)); - _instance->update(); +static void +on_child_added(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data) +{ + if (DocumentProperties *dialog = static_cast(data)) + dialog->update_gridspage(); } -static void -on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*) +static void +on_child_removed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data) { - if (!_instance) - return; + if (DocumentProperties *dialog = static_cast(data)) + dialog->update_gridspage(); +} + - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); - repr->removeListenerByData (_instance); - _instance->_doc_replaced_connection.disconnect(); + +/** + * Called when XML node attribute changed; updates dialog widgets. + */ +static void +on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer data) +{ + if (DocumentProperties *dialog = static_cast(data)) + dialog->update(); } -static void -on_doc_replaced (SPDesktop* dt, SPDocument* doc) + +/*######################################################################## +# BUTTON CLICK HANDLERS (callbacks) +########################################################################*/ + +void +DocumentProperties::onNewGrid() { - if (!_instance) - return; + SPDesktop *dt = getDesktop(); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt)); + SPDocument *doc = sp_desktop_document(dt); - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt)); - repr->addListener (&_repr_events, _instance); - _instance->update(); + Glib::ustring typestring = _grids_combo_gridtype.get_active_text(); + CanvasGrid::writeNewGridToRepr(repr, doc, CanvasGrid::getGridTypeFromName(typestring.c_str())); + + // toggle grid showing to ON: + dt->showGrids(true); +} + + +void +DocumentProperties::onRemoveGrid() +{ + gint pagenum = _grids_notebook.get_current_page(); + if (pagenum == -1) // no pages + return; + + SPDesktop *dt = getDesktop(); + SPNamedView *nv = sp_desktop_namedview(dt); + Inkscape::CanvasGrid * found_grid = NULL; + int i = 0; + for (GSList const * l = nv->grids; l != NULL; l = l->next, i++) { // not a very nice fix, but works. + Inkscape::CanvasGrid * grid = (Inkscape::CanvasGrid*) l->data; + if (pagenum == i) { + 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")); + } }