![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 4f38eb3d9d472805d99912ec420c8d7fdb9b39ab..8d7b6ac52291d88ce86a8fe786095af59862df9f 100644 (file)
* Jon Phillips <jon@rejon.org>
* Ralf Stephan <ralf@ark.in-berlin.de> (Gtkmm)
*
- * Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
+ * Copyright (C) 2006-2007 Johan Engelen <johan@shouraizou.nl>
* Copyright (C) 2000 - 2005 Authors
*
* Released under GNU GPL. Read the file 'COPYING' for more information
//---------------------------------------------------
-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 = {
on_child_added, /* child_added */
};
-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), _page_grids(1, 1),
- _prefs_path("dialogs.documentoptions"),
+ : 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),
+ _grids_label_crea("", Gtk::ALIGN_LEFT),
_grids_button_new(_("_New"), _("Create new grid.")),
- _grids_button_remove(_("_Remove"), _("Remove selected grid."))
+ _grids_button_remove(_("_Remove"), _("Remove selected grid.")),
+ _grids_label_def("", Gtk::ALIGN_LEFT),
+ _prefs_path("dialogs.documentoptions")
{
- 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_grids, _("Grids setup"));
+ _notebook.append_page(_page_snap_dtls, _("Snap points"));
build_page();
- build_grid();
- build_snap();
+ 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
{
update();
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_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(SP_ACTIVE_DESKTOP)->root);
+ 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();
- if (prefs_get_int_attribute("dialogs.documentoptions", "axonomgrid_enabled", 0) != 1) {
- _rrb_gridtype._hbox->hide();
- _rsu_ax.getSU()->hide();
- _rsu_az.getSU()->hide();
- }
-
- present();
+ _grids_button_remove.hide();
}
DocumentProperties::~DocumentProperties()
{
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop()));
repr->removeListenerByData (this);
- Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(SP_ACTIVE_DESKTOP)->root);
+ Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(getDesktop())->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<size/sizeof(Gtk::Widget*); i+=2)
+ for (unsigned i = 0, r = start; i < n; i += 2)
{
if (arr[i] && arr[i+1])
{
- table.attach (const_cast<Gtk::Widget&>(*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<Gtk::Widget&>(*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<Gtk::Widget&>(*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<Gtk::Label&> (const_cast<Gtk::Widget&>(*arr[i]));
+ Gtk::Label& label = reinterpret_cast<Gtk::Label&>(*arr[i]);
label.set_alignment (0.0);
table.attach (label, 0, 3, r, r+1,
Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
label_for->set_markup (_("<b>Format</b>"));
_page_sizer.init (_wr);
- const Gtk::Widget* widget_array[] =
+ Gtk::Widget *const widget_array[] =
{
label_gen, 0,
_rum_deflt._label, _rum_deflt._sel,
_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();
-
- /// \todo FIXME: gray out snapping when grid is off.
- /// Dissenting view: you want snapping without grid.
+ _page_guides.show();
- _rcbgrid.init (_("_Show grid"), _("Show or hide grid"), "showgrid", _wr);
- _rrb_gridtype.init (_("Grid type:"), _("Normal (2D)"), _("Axonometric (3D)"),
- _("The normal grid with vertical and horizontal lines."),
- _("A grid with vertical lines and two diagonal line groups, each representing the projection of a primary axis."),
- "gridtype", _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 between vertical grid lines"),
- "gridspacingx", _rumg, _wr);
- _rsu_sy.init (_("Spacing _Y:"), _("Distance between horizontal grid lines"),
- "gridspacingy", _rumg, _wr);
- _rsu_ax.init (_("Angle X:"), _("Angle of x-axis of axonometric grid"),
- "gridanglex", _rumg, _wr);
- _rsu_az.init (_("Angle Z:"), _("Angle of z-axis of axonometric grid"),
- "gridanglez", _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 (_("<b>Grid</b>"));
+
+ _rcbsng.init (_("_Snap guides while dragging"),
+ _("While dragging a guide, snap to object nodes or bounding box corners ('Nodes' or 'Bounding box corners' must be enabled in the 'Snap' tab)"),
+ "inkscape:snap-guide", _wr);
+
Gtk::Label *label_gui = manage (new Gtk::Label);
label_gui->set_markup (_("<b>Guides</b>"));
- const Gtk::Widget* widget_array[] =
+ Gtk::Widget *const widget_array[] =
{
- label_grid, 0,
- 0, _rcbgrid._button,
- 0, _rrb_gridtype._hbox,
- _rumg._label, _rumg._sel,
- 0, _rsu_ox.getSU(),
- 0, _rsu_oy.getSU(),
- 0, _rsu_sx.getSU(),
- 0, _rsu_sy.getSU(),
- 0, _rsu_ax.getSU(),
- 0, _rsu_az.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,
+ 0, _rcbsng._button,
};
- 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 (Snapping of bounding boxes is only available in 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);
+
+ //Options for snapping to objects
+ _rcbsnop.init (_("Snap to pat_hs"),
+ _("Snap nodes to object paths"),
"inkscape:object-paths", _wr);
- _rcbsnon.init (_("Snap to object _nodes"),
- _("Snap to other object nodes"),
+ _rcbsnon.init (_("Snap to n_odes"),
+ _("Snap nodes and guides to 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"),
+ _rcbsnbbn.init (_("Snap to bounding box co_rners"),
+ _("Snap bounding box corners to other bounding box corners"),
+ "inkscape:bbox-nodes", _wr);
+ _rcbsnbbp.init (_("Snap to bounding box _edges"),
+ _("Snap bounding box corners and guides to bounding box edges"),
+ "inkscape:bbox-paths", _wr);
+
+ _rsu_sno.init (_("Snap _distance"), _("Snap at any d_istance"),
+ _("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 di_stance"), _("Snap at any dis_tance"),
+ _("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 dist_ance"), _("Snap at any distan_ce"),
+ _("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);
+
+ //Other options to locate here: e.g. visual snapping indicators on/off
+
+ std::list<Gtk::ToggleButton*> slaves;
+ slaves.push_back(_rcbsnop._button);
+ slaves.push_back(_rcbsnon._button);
+ _rcbsnn.setSlaveButton(slaves);
+
+ slaves.clear();
+ slaves.push_back(_rcbsnbbp._button);
+ slaves.push_back(_rcbsnbbn._button);
+ _rcbsnbb.setSlaveButton(slaves);
+
+ Gtk::Label *label_g = manage (new Gtk::Label);
+ label_g->set_markup (_("<b>Snapping of</b>"));
Gtk::Label *label_o = manage (new Gtk::Label);
- label_o->set_markup (_("<b>Object Snapping</b>"));
+ label_o->set_markup (_("<b>Snapping to objects</b>"));
Gtk::Label *label_gr = manage (new Gtk::Label);
- label_gr->set_markup (_("<b>Grid Snapping</b>"));
+ label_gr->set_markup (_("<b>Snapping to grids</b>"));
Gtk::Label *label_gu = manage (new Gtk::Label);
- label_gu->set_markup (_("<b>Guide Snapping</b>"));
+ label_gu->set_markup (_("<b>Snapping to guides</b>"));
+ Gtk::Label *label_m = manage (new Gtk::Label);
+ label_m->set_markup (_("<b>Miscellaneous</b>"));
- const Gtk::Widget* array[] =
+ Gtk::Widget *const array[] =
{
+ label_g, 0,
+ 0, _rcbsnn._button,
+ 0, _rcbsnbb._button,
+ 0, 0,
+ 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, _rcbsnbbp._button,
+ 0, _rcbsnbbn._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
};
- 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();
+
+ _rcbsigg.init (_("_Grid with guides"),
+ _("Snap to grid-guide intersections"),
+ "inkscape:snap-intersection-grid-guide", _wr);
+
+ _rcbsils.init (_("_Line segments"),
+ _("Snap to intersections of line segments ('snap to paths' must be enabled, see the previous tab)"),
+ "inkscape:snap-intersection-line-segments", _wr);
+
+ //Applies to both nodes and guides, but not to bboxes, that's why its located here
+ _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);
+
+ //Other options to locate here: e.g. visual snapping indicators on/off
+
+ Gtk::Label *label_i= manage (new Gtk::Label);
+ label_i->set_markup (_("<b>Snapping to intersections of</b>"));
+ Gtk::Label *label_m = manage (new Gtk::Label);
+ label_m->set_markup (_("<b>Miscellaneous</b>"));
+
+ Gtk::Widget *const array[] =
+ {
+ label_i, 0,
+ 0, _rcbsigg._button,
+ 0, _rcbsils._button,
+ 0, 0,
+ label_m, 0,
+ 0, _rcbic._button,
+ };
+
+ 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 = SP_ACTIVE_DESKTOP;
+ SPDesktop *dt = getDesktop();
SPNamedView *nv = sp_desktop_namedview(dt);
//remove all tabs
}
//add tabs
+ bool grids_present = false;
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_present = true;
}
_grids_notebook.show_all();
- const Gtk::Widget* widget_array[] =
- {
- (Gtk::Widget*) &_grids_notebook, 0
- };
- attach_all (_page_grids.table(), widget_array, sizeof(widget_array),3); // FIXME: a hack to let GTK show all tabs, otherwise XML manually added grids setting widgets do no show.
+ if (grids_present)
+ _grids_button_remove.show();
+ else
+ _grids_button_remove.hide();
}
/**
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;
+ SPDesktop *dt = getDesktop();
SPNamedView *nv = sp_desktop_namedview(dt);
- Gtk::Label* label_crea = manage (new Gtk::Label);
- label_crea->set_markup (_("<b>Creation</b>"));
- Gtk::Label* label_crea_type = manage (new Gtk::Label);
- label_crea_type->set_markup (_("Gridtype"));
-
- _grids_entry_gridtype.set_text(Glib::ustring("xygrid"));
-
- Gtk::Label* label_def = manage (new Gtk::Label);
- label_def->set_markup (_("<b>Defined grids</b>"));
+ _grids_label_crea.set_markup(_("<b>Creation</b>"));
+ _grids_label_def.set_markup(_("<b>Defined grids</b>"));
+ _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) );
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"));
}
- const Gtk::Widget* widget_array[] =
- {
- label_crea, 0,
- label_crea_type, (Gtk::Widget*) &_grids_entry_gridtype,
- (Gtk::Widget*) &_grids_button_new, (Gtk::Widget*) &_grids_button_remove,
- label_def, 0,
- (Gtk::Widget*) &_grids_notebook, 0
- };
+ _grids_space.set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
- attach_all (_page_grids.table(), widget_array, sizeof(widget_array));
+ _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);
+ _grids_button_remove.hide();
}
{
if (_wr.isUpdating()) return;
- SPDesktop *dt = SP_ACTIVE_DESKTOP;
+ SPDesktop *dt = getDesktop();
SPNamedView *nv = sp_desktop_namedview(dt);
_wr.setUpdating (true);
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);
- _rrb_gridtype.setValue (nv->gridtype);
- _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);
-
- val = nv->gridangle[0];
- _rsu_ax.setValue (val);
- val = nv->gridangle[1];
- _rsu_az.setValue (val);
-
- _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_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());
- _rcbsnop.setActive (nv->snap_manager.object.getSnapToNodes());
- _rsu_sno.setValue (nv->objecttolerance, nv->has_abs_tolerance);
- _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, nv->has_abs_tolerance);
+ _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());
+ _rcbsnbbp.setActive(nv->snap_manager.object.getSnapToBBoxPath());
+ _rcbsnbbn.setActive(nv->snap_manager.object.getSnapToBBoxNode());
+ _rsu_sno.setValue (nv->objecttolerance);
+
+ _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, nv->has_abs_tolerance);
-// _rrb_pix.setValue (true);
+ _rsu_gusn.setValue (nv->guidetolerance);
//-----------------------------------------------------------grids page
{
_rcp_bg.closeWindow();
_rcp_bord.closeWindow();
- _rcp_gcol.closeWindow();
- _rcp_gmcol.closeWindow();
_rcp_gui.closeWindow();
_rcp_hgui.closeWindow();
}
hide();
}
-
-
-static void
-on_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data)
+void
+DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *document)
{
- if (!_instance)
- return;
-
- _instance->update_gridspage();
+ 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();
}
-static void
-on_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data)
+void
+DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop)
{
- if (!_instance)
- return;
-
- _instance->update_gridspage();
+ 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();
}
-
-
-/**
- * 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::_handleDeactivateDesktop(Inkscape::Application *, SPDesktop *desktop)
{
- if (!_instance)
- return;
-
- _instance->update();
+ 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);
}
static void
-on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
+on_child_added(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data)
{
- if (!_instance)
- return;
-
- 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();
+ if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
+ dialog->update_gridspage();
}
static void
-on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
+on_child_removed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void *data)
{
- if (!_instance)
- return;
-
- 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();
+ if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
+ dialog->update_gridspage();
}
+
+
+/**
+ * Called when XML node attribute changed; updates dialog widgets.
+ */
static void
-on_doc_replaced (SPDesktop* dt, SPDocument* doc)
+on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer data)
{
- if (!_instance)
- return;
-
- 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();
+ if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
+ dialog->update();
}
-
-
/*########################################################################
# BUTTON CLICK HANDLERS (callbacks)
########################################################################*/
void
DocumentProperties::onNewGrid()
{
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
+ SPDesktop *dt = getDesktop();
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
+ SPDocument *doc = sp_desktop_document(dt);
- Glib::ustring typestring = _grids_entry_gridtype.get_text();
- CanvasGrid::writeNewGridToRepr(repr, typestring.c_str()); // FIXME ofcourse user should supply choice for gridtype
+ Glib::ustring typestring = _grids_combo_gridtype.get_active_text();
+ CanvasGrid::writeNewGridToRepr(repr, doc, CanvasGrid::getGridTypeFromName(typestring.c_str()));
}
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;
+ SPDesktop *dt = getDesktop();
SPNamedView *nv = sp_desktop_namedview(dt);
Inkscape::CanvasGrid * found_grid = NULL;
for (GSList const * l = nv->grids; l != NULL; l = l->next) {
// 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"));
}
}