![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 03cc4bdadea08fb80755622656dd0dbc137e23da..cc7adeaa8250ed8ab1a2f089aa44dca94033bdf7 100644 (file)
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
*/
#include "config.h"
+#include <cstring>
+#include <string>
#include "display/canvas-grid.h"
#include "helper/units.h"
{
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;
@@ -154,12 +245,13 @@ 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-snap-intersection-line-segments");
+ 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");
@@ -168,7 +260,6 @@ static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape:
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);
@@ -176,6 +267,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)
// delete grids:
while ( namedview->grids ) {
- Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)namedview->grids->data;
+ Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)namedview->grids->data; // get first entry
delete gr;
- namedview->grids = g_slist_remove_link(namedview->grids, namedview->grids);
+ namedview->grids = g_slist_remove_link(namedview->grids, namedview->grids); // deletes first entry
}
if (((SPObjectClass *) parent_class)->release) {
@@ -221,7 +315,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
case SP_ATTR_SHOWGRIDS:
- if (!value) { // show grids if not specified, for backwards compatibility
+ 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);
@@ -357,6 +451,10 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
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);
@@ -374,7 +472,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
case SP_ATTR_INKSCAPE_SNAP_INTERS_GRIDGUIDE:
- nv->snap_manager.setSnapIntersectionGG(value ? sp_str_to_bool(value) : FALSE);
+ 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:
@@ -479,6 +577,10 @@ sp_namedview_add_grid(SPNamedView *nv, Inkscape::XML::Node *repr, SPDesktop *des
doc = sp_desktop_document(desktop);
else
doc = sp_desktop_document(static_cast<SPDesktop*>(nv->views->data));
+ if (!doc) {
+ g_warning("sp_namedview_add_grid - how come doc is null here?!");
+ return NULL;
+ }
grid = Inkscape::CanvasGrid::NewGrid(nv, repr, doc, gridtype);
nv->grids = g_slist_append(nv->grids, grid);
//Initialize the snapping parameters for the new grid
@@ -510,12 +612,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;
}
views = g_slist_remove(views, desktop);
-
- // delete grids:
- while ( grids ) {
- Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)grids->data;
- delete gr;
- grids = g_slist_remove_link(grids, grids);
- }
}
void SPNamedView::activateGuides(gpointer desktop, gboolean active)
bool saved = sp_document_get_undo_sensitive(doc);
sp_document_set_undo_sensitive(doc, false);
-
sp_repr_set_boolean(repr, "showguides", v);
-
- doc->rroot->setAttribute("sodipodi:modified", "true");
sp_document_set_undo_sensitive(doc, saved);
+
+ doc->setModifiedSinceSave();
}
void sp_namedview_show_grids(SPNamedView * namedview, bool show, bool dirty_document)
@@ -801,15 +895,14 @@ void sp_namedview_show_grids(SPNamedView * namedview, bool show, bool dirty_docu
bool saved = sp_document_get_undo_sensitive(doc);
sp_document_set_undo_sensitive(doc, false);
-
sp_repr_set_boolean(repr, "showgrid", namedview->grids_visible);
+ sp_document_set_undo_sensitive(doc, saved);
/* 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");
+ doc->setModifiedSinceSave();
}
- sp_document_set_undo_sensitive(doc, saved);
}
gchar const *SPNamedView::getName() const
}
}
+/**
+ * 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: