![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 319e0ba39b4f330521942139b2d675d8460fd7cc..f738828e537c398de284bd4bb1e41f05a6c10bff 100644 (file)
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
{
nv->editable = TRUE;
nv->showguides = TRUE;
+ nv->grids_visible = false;
nv->showborder = TRUE;
nv->showpageshadow = TRUE;
new (&nv->snap_manager) SnapManager(nv);
}
+static void sp_namedview_generate_old_grid(SPNamedView * nv, SPDocument *document, Inkscape::XML::Node *repr) {
+ bool old_grid_settings_present = false;
+
+ // set old settings
+ const char* gridspacingx = "1px";
+ const char* gridspacingy = "1px";
+ const char* gridoriginy = "0px";
+ const char* gridoriginx = "0px";
+ const char* gridempspacing = "5";
+ const char* gridcolor = "#0000ff";
+ const char* gridempcolor = "#0000ff";
+ const char* gridopacity = "0.2";
+ const char* gridempopacity = "0.4";
+
+ const char* value = NULL;
+ if ((value = repr->attribute("gridoriginx"))) {
+ gridspacingx = value;
+ old_grid_settings_present = true;
+ }
+ if ((value = repr->attribute("gridoriginy"))) {
+ gridoriginy = value;
+ old_grid_settings_present = true;
+ }
+ if ((value = repr->attribute("gridspacingx"))) {
+ gridspacingx = value;
+ old_grid_settings_present = true;
+ }
+ if ((value = repr->attribute("gridspacingy"))) {
+ gridspacingy = value;
+ old_grid_settings_present = true;
+ }
+ if ((value = repr->attribute("gridcolor"))) {
+ gridcolor = value;
+ old_grid_settings_present = true;
+ }
+ if ((value = repr->attribute("gridempcolor"))) {
+ gridempcolor = value;
+ old_grid_settings_present = true;
+ }
+ if ((value = repr->attribute("gridempspacing"))) {
+ gridempspacing = value;
+ old_grid_settings_present = true;
+ }
+ if ((value = repr->attribute("gridopacity"))) {
+ gridopacity = value;
+ old_grid_settings_present = true;
+ }
+ if ((value = repr->attribute("gridempopacity"))) {
+ gridempopacity = value;
+ old_grid_settings_present = true;
+ }
+
+ if (old_grid_settings_present) {
+ // generate new xy grid with the correct settings
+ // first create the child xml node, then hook it to repr. This order is important, to not set off listeners to repr before the new node is complete.
+
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
+ Inkscape::XML::Node *newnode = xml_doc->createElement("inkscape:grid");
+ newnode->setAttribute("id", "GridFromPre046Settings");
+ newnode->setAttribute("type", Inkscape::CanvasGrid::getSVGName(Inkscape::GRID_RECTANGULAR));
+ newnode->setAttribute("originx", gridoriginx);
+ newnode->setAttribute("originy", gridoriginy);
+ newnode->setAttribute("spacingx", gridspacingx);
+ newnode->setAttribute("spacingy", gridspacingy);
+ newnode->setAttribute("color", gridcolor);
+ newnode->setAttribute("empcolor", gridempcolor);
+ newnode->setAttribute("opacity", gridopacity);
+ newnode->setAttribute("empopacity", gridempopacity);
+ newnode->setAttribute("empspacing", gridempspacing);
+
+ repr->appendChild(newnode);
+ Inkscape::GC::release(newnode);
+
+ // remove all old settings
+ repr->setAttribute("gridoriginx", NULL);
+ repr->setAttribute("gridoriginy", NULL);
+ repr->setAttribute("gridspacingx", NULL);
+ repr->setAttribute("gridspacingy", NULL);
+ repr->setAttribute("gridcolor", NULL);
+ repr->setAttribute("gridempcolor", NULL);
+ repr->setAttribute("gridopacity", NULL);
+ repr->setAttribute("gridempopacity", NULL);
+ repr->setAttribute("gridempspacing", NULL);
+
+// sp_document_done(doc, SP_VERB_DIALOG_NAMEDVIEW, _("Create new grid from pre0.46 grid settings"));
+ }
+}
+
static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
SPNamedView *nv = (SPNamedView *) object;
@@ -131,6 +220,7 @@ static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape:
sp_object_read_attr(object, "inkscape:document-units");
sp_object_read_attr(object, "viewonly");
sp_object_read_attr(object, "showguides");
+ sp_object_read_attr(object, "showgrid");
sp_object_read_attr(object, "gridtolerance");
sp_object_read_attr(object, "guidetolerance");
sp_object_read_attr(object, "objecttolerance");
@@ -153,16 +243,21 @@ static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape:
sp_object_read_attr(object, "inkscape:window-height");
sp_object_read_attr(object, "inkscape:window-x");
sp_object_read_attr(object, "inkscape:window-y");
- sp_object_read_attr(object, "inkscape:snap-bbox");
+ sp_object_read_attr(object, "inkscape:snap-global");
+ sp_object_read_attr(object, "inkscape:snap-bbox");
sp_object_read_attr(object, "inkscape:snap-nodes");
+ sp_object_read_attr(object, "inkscape:snap-guide");
sp_object_read_attr(object, "inkscape:snap-center");
+ sp_object_read_attr(object, "inkscape:snap-intersection-grid-guide");
+ sp_object_read_attr(object, "inkscape:snap-intersection-line-segments");
sp_object_read_attr(object, "inkscape:object-paths");
sp_object_read_attr(object, "inkscape:object-nodes");
+ sp_object_read_attr(object, "inkscape:bbox-paths");
+ sp_object_read_attr(object, "inkscape:bbox-nodes");
sp_object_read_attr(object, "inkscape:current-layer");
sp_object_read_attr(object, "inkscape:connector-spacing");
/* Construct guideline list */
-
for (SPObject *o = sp_object_first_child(SP_OBJECT(og)) ; o != NULL; o = SP_OBJECT_NEXT(o) ) {
if (SP_IS_GUIDE(o)) {
SPGuide * g = SP_GUIDE(o);
@@ -170,6 +265,9 @@ static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape:
g_object_set(G_OBJECT(g), "color", nv->guidecolor, "hicolor", nv->guidehicolor, NULL);
}
}
+
+ // backwards compatibility with grid settings (pre 0.46)
+ sp_namedview_generate_old_grid(nv, document, repr);
}
static void sp_namedview_release(SPObject *object)
@@ -201,11 +299,11 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
SPUnit const &px = sp_unit_get_by_id(SP_UNIT_PX);
switch (key) {
- case SP_ATTR_VIEWONLY:
+ case SP_ATTR_VIEWONLY:
nv->editable = (!value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_SHOWGUIDES:
+ case SP_ATTR_SHOWGUIDES:
if (!value) { // show guides if not specified, for backwards compatibility
nv->showguides = TRUE;
} else {
@@ -214,7 +312,15 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
sp_namedview_setup_guides(nv);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_GRIDTOLERANCE:
+ case SP_ATTR_SHOWGRIDS:
+ if (!value) { // don't show grids if not specified, for backwards compatibility
+ nv->grids_visible = false;
+ } else {
+ nv->grids_visible = sp_str_to_bool(value);
+ }
+ object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
+ case SP_ATTR_GRIDTOLERANCE:
nv->gridtoleranceunit = &px;
nv->gridtolerance = DEFAULTTOLERANCE;
if (value) {
@@ -222,7 +328,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_GUIDETOLERANCE:
+ case SP_ATTR_GUIDETOLERANCE:
nv->guidetoleranceunit = &px;
nv->guidetolerance = DEFAULTTOLERANCE;
if (value) {
@@ -238,7 +344,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_GUIDECOLOR:
+ case SP_ATTR_GUIDECOLOR:
nv->guidecolor = (nv->guidecolor & 0xff) | (DEFAULTGUIDECOLOR & 0xffffff00);
if (value) {
nv->guidecolor = (nv->guidecolor & 0xff) | sp_svg_read_color(value, nv->guidecolor);
@@ -248,7 +354,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_GUIDEOPACITY:
+ case SP_ATTR_GUIDEOPACITY:
nv->guidecolor = (nv->guidecolor & 0xffffff00) | (DEFAULTGUIDECOLOR & 0xff);
sp_nv_read_opacity(value, &nv->guidecolor);
for (GSList *l = nv->guides; l != NULL; l = l->next) {
@@ -256,7 +362,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_GUIDEHICOLOR:
+ case SP_ATTR_GUIDEHICOLOR:
nv->guidehicolor = (nv->guidehicolor & 0xff) | (DEFAULTGUIDEHICOLOR & 0xffffff00);
if (value) {
nv->guidehicolor = (nv->guidehicolor & 0xff) | sp_svg_read_color(value, nv->guidehicolor);
@@ -266,7 +372,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_GUIDEHIOPACITY:
+ case SP_ATTR_GUIDEHIOPACITY:
nv->guidehicolor = (nv->guidehicolor & 0xffffff00) | (DEFAULTGUIDEHICOLOR & 0xff);
sp_nv_read_opacity(value, &nv->guidehicolor);
for (GSList *l = nv->guides; l != NULL; l = l->next) {
@@ -274,16 +380,16 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_SHOWBORDER:
+ case SP_ATTR_SHOWBORDER:
nv->showborder = (value) ? sp_str_to_bool (value) : TRUE;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_BORDERLAYER:
+ case SP_ATTR_BORDERLAYER:
nv->borderlayer = SP_BORDER_LAYER_BOTTOM;
if (value && !strcasecmp(value, "true")) nv->borderlayer = SP_BORDER_LAYER_TOP;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_BORDERCOLOR:
+ case SP_ATTR_BORDERCOLOR:
nv->bordercolor = (nv->bordercolor & 0xff) | (DEFAULTBORDERCOLOR & 0xffffff00);
if (value) {
nv->bordercolor = (nv->bordercolor & 0xff) | sp_svg_read_color (value, nv->bordercolor);
@@ -302,12 +408,12 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_PAGEOPACITY:
+ case SP_ATTR_INKSCAPE_PAGEOPACITY:
nv->pagecolor = (nv->pagecolor & 0xffffff00) | (DEFAULTPAGECOLOR & 0xff);
sp_nv_read_opacity(value, &nv->pagecolor);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_PAGESHADOW:
+ case SP_ATTR_INKSCAPE_PAGESHADOW:
nv->pageshadow = value? atoi(value) : 2; // 2 is the default
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
@@ -315,34 +421,38 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
nv->showpageshadow = (value) ? sp_str_to_bool(value) : TRUE;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_ZOOM:
+ case SP_ATTR_INKSCAPE_ZOOM:
nv->zoom = value ? g_ascii_strtod(value, NULL) : 0; // zero means not set
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_CX:
+ case SP_ATTR_INKSCAPE_CX:
nv->cx = value ? g_ascii_strtod(value, NULL) : HUGE_VAL; // HUGE_VAL means not set
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_CY:
+ case SP_ATTR_INKSCAPE_CY:
nv->cy = value ? g_ascii_strtod(value, NULL) : HUGE_VAL; // HUGE_VAL means not set
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_WINDOW_WIDTH:
+ case SP_ATTR_INKSCAPE_WINDOW_WIDTH:
nv->window_width = value? atoi(value) : -1; // -1 means not set
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_WINDOW_HEIGHT:
+ case SP_ATTR_INKSCAPE_WINDOW_HEIGHT:
nv->window_height = value ? atoi(value) : -1; // -1 means not set
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_WINDOW_X:
+ case SP_ATTR_INKSCAPE_WINDOW_X:
nv->window_x = value ? atoi(value) : -1; // -1 means not set
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_WINDOW_Y:
+ case SP_ATTR_INKSCAPE_WINDOW_Y:
nv->window_y = value ? atoi(value) : -1; // -1 means not set
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
+ case SP_ATTR_INKSCAPE_SNAP_GLOBAL:
+ nv->snap_manager.setSnapEnabledGlobally(value ? sp_str_to_bool(value) : TRUE);
+ object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
case SP_ATTR_INKSCAPE_SNAP_BBOX:
nv->snap_manager.setSnapModeBBox(value ? sp_str_to_bool(value) : FALSE);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -355,6 +465,18 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
nv->snap_manager.setIncludeItemCenter(value ? sp_str_to_bool(value) : FALSE);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
+ case SP_ATTR_INKSCAPE_SNAP_GUIDE:
+ nv->snap_manager.setSnapModeGuide(value ? sp_str_to_bool(value) : FALSE);
+ object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
+ case SP_ATTR_INKSCAPE_SNAP_INTERS_GRIDGUIDE:
+ nv->snap_manager.setSnapIntersectionGG(value ? sp_str_to_bool(value) : TRUE);
+ object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
+ case SP_ATTR_INKSCAPE_SNAP_INTERS_LINESEGM:
+ nv->snap_manager.setSnapIntersectionLS(value ? sp_str_to_bool(value) : FALSE);
+ object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
case SP_ATTR_INKSCAPE_OBJECT_PATHS:
nv->snap_manager.object.setSnapToItemPath(value ? sp_str_to_bool(value) : FALSE);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -363,16 +485,24 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
nv->snap_manager.object.setSnapToItemNode(value ? sp_str_to_bool(value) : FALSE);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_CURRENT_LAYER:
+ case SP_ATTR_INKSCAPE_BBOX_PATHS:
+ nv->snap_manager.object.setSnapToBBoxPath(value ? sp_str_to_bool(value) : FALSE);
+ object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
+ case SP_ATTR_INKSCAPE_BBOX_NODES:
+ nv->snap_manager.object.setSnapToBBoxNode(value ? sp_str_to_bool(value) : FALSE);
+ object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
+ case SP_ATTR_INKSCAPE_CURRENT_LAYER:
nv->default_layer_id = value ? g_quark_from_string(value) : 0;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_CONNECTOR_SPACING:
+ case SP_ATTR_INKSCAPE_CONNECTOR_SPACING:
nv->connector_spacing = value ? g_ascii_strtod(value, NULL) :
defaultConnSpacing;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_DOCUMENT_UNITS: {
+ case SP_ATTR_INKSCAPE_DOCUMENT_UNITS: {
/* The default unit if the document doesn't override this: e.g. for files saved as
* `plain SVG', or non-inkscape files, or files created by an inkscape 0.40 &
* earlier.
@@ -412,8 +542,8 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
nv->doc_units = new_unit;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- }
- default:
+ }
+ default:
if (((SPObjectClass *) (parent_class))->set) {
((SPObjectClass *) (parent_class))->set(object, key, value);
}
@@ -425,7 +555,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
* add a grid item from SVG-repr. Check if this namedview already has a gridobject for this one! If desktop=null, add grid-canvasitem to all desktops of this namedview,
* otherwise only add it to the specified desktop.
*/
-static Inkscape::CanvasGrid*
+static Inkscape::CanvasGrid*
sp_namedview_add_grid(SPNamedView *nv, Inkscape::XML::Node *repr, SPDesktop *desktop) {
Inkscape::CanvasGrid* grid = NULL;
//check if namedview already has an object for this grid
@@ -436,7 +566,7 @@ sp_namedview_add_grid(SPNamedView *nv, Inkscape::XML::Node *repr, SPDesktop *des
break;
}
}
-
+
if (!grid) {
//create grid object
Inkscape::GridType gridtype = Inkscape::CanvasGrid::getGridTypeFromSVGName(repr->attribute("type"));
@@ -450,10 +580,10 @@ sp_namedview_add_grid(SPNamedView *nv, Inkscape::XML::Node *repr, SPDesktop *des
//Initialize the snapping parameters for the new grid
bool enabled_node = nv->snap_manager.getSnapModeNode();
bool enabled_bbox = nv->snap_manager.getSnapModeBBox();
- grid->snapper->setSnapFrom(Inkscape::Snapper::SNAPPOINT_NODE, enabled_node);
- grid->snapper->setSnapFrom(Inkscape::Snapper::SNAPPOINT_BBOX, enabled_bbox);
+ grid->snapper->setSnapFrom(Inkscape::Snapper::SNAPPOINT_NODE, enabled_node);
+ grid->snapper->setSnapFrom(Inkscape::Snapper::SNAPPOINT_BBOX, enabled_bbox);
}
-
+
if (!desktop) {
//add canvasitem to all desktops
for (GSList *l = nv->views; l != NULL; l = l->next) {
@@ -476,12 +606,12 @@ static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *chil
(* ((SPObjectClass *) (parent_class))->child_added)(object, child, ref);
}
- const gchar *id = child->attribute("id");
if (!strcmp(child->name(), "inkscape:grid")) {
sp_namedview_add_grid(nv, child, NULL);
} else {
- SPObject *no = object->document->getObjectById(id);
- g_assert(SP_IS_OBJECT(no));
+ SPObject *no = object->document->getObjectByRepr(child);
+ if ( !SP_IS_OBJECT(no) )
+ return;
if (SP_IS_GUIDE(no)) {
SPGuide *g = (SPGuide *) no;
}
}
}
+
+ desktop->showGrids(grids_visible, false);
}
#define MIN_ONSCREEN_DISTANCE 50
void sp_namedview_window_from_document(SPDesktop *desktop)
{
SPNamedView *nv = desktop->namedview;
- gint geometry_from_file =
+ gint geometry_from_file =
(1==prefs_get_int_attribute("options.savewindowgeometry", "value", 0));
// restore window size and position stored with the document
void sp_namedview_document_from_window(SPDesktop *desktop)
{
- gint save_geometry_in_file =
+ gint save_geometry_in_file =
(1==prefs_get_int_attribute("options.savewindowgeometry", "value", 0));
Inkscape::XML::Node *view = SP_OBJECT_REPR(desktop->namedview);
NR::Rect const r = desktop->get_display_area();
sp_document_set_undo_sensitive(doc, saved);
}
+void sp_namedview_show_grids(SPNamedView * namedview, bool show, bool dirty_document)
+{
+ namedview->grids_visible = show;
+
+ SPDocument *doc = SP_OBJECT_DOCUMENT (namedview);
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(namedview);
+
+ bool saved = sp_document_get_undo_sensitive(doc);
+ sp_document_set_undo_sensitive(doc, false);
+
+ sp_repr_set_boolean(repr, "showgrid", namedview->grids_visible);
+
+ /* we don't want the document to get dirty on startup; that's when
+ we call this function with dirty_document = false */
+ if (dirty_document) {
+ doc->rroot->setAttribute("sodipodi:modified", "true");
+ }
+ sp_document_set_undo_sensitive(doc, saved);
+}
+
gchar const *SPNamedView::getName() const
{
SPException ex;
}
}
+/**
+ * Returns the first grid it could find that isEnabled(). Returns NULL, if none is enabled
+ */
+Inkscape::CanvasGrid * sp_namedview_get_first_enabled_grid(SPNamedView *namedview)
+{
+ for (GSList const * l = namedview->grids; l != NULL; l = l->next) {
+ Inkscape::CanvasGrid * grid = (Inkscape::CanvasGrid*) l->data;
+ if (grid->isEnabled())
+ return grid;
+ }
+
+ return NULL;
+}
+
/*
Local Variables: