X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-namedview.cpp;h=f738828e537c398de284bd4bb1e41f05a6c10bff;hb=50eef40bd47ac82eca272808e2cb39614a2a9895;hp=54805f8725944cfd1de6d23a3691384da1124979;hpb=045f63cbeb581c5d2d4fa35d45396a888ed28f89;p=inkscape.git diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 54805f872..f738828e5 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -17,7 +17,6 @@ #include "config.h" #include "display/canvas-grid.h" -#include "display/canvas-axonomgrid.h" #include "helper/units.h" #include "svg/svg-color.h" #include "xml/repr.h" @@ -56,9 +55,6 @@ static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML:: static void sp_namedview_setup_guides(SPNamedView * nv); -static void sp_namedview_setup_grid(SPNamedView * nv); -static void sp_namedview_setup_grid_item(SPNamedView * nv, SPCanvasItem * item); - static gboolean sp_str_to_bool(const gchar *str); static gboolean sp_nv_read_length(const gchar *str, guint base, gdouble *val, const SPUnit **unit); static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color); @@ -108,14 +104,14 @@ static void sp_namedview_class_init(SPNamedViewClass * klass) static void sp_namedview_init(SPNamedView *nv) { nv->editable = TRUE; - nv->showgrid = FALSE; - nv->gridtype = 0; nv->showguides = TRUE; + nv->grids_visible = false; nv->showborder = TRUE; nv->showpageshadow = TRUE; nv->guides = NULL; nv->viewcount = 0; + nv->grids = NULL; nv->default_layer_id = 0; @@ -124,6 +120,94 @@ static void sp_namedview_init(SPNamedView *nv) 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; @@ -135,24 +219,11 @@ 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, "showgrid"); - sp_object_read_attr(object, "gridtype"); 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"); - sp_object_read_attr(object, "inkscape:has_abs_tolerance"); - sp_object_read_attr(object, "gridoriginx"); - sp_object_read_attr(object, "gridoriginy"); - sp_object_read_attr(object, "gridspacingx"); - sp_object_read_attr(object, "gridspacingy"); - sp_object_read_attr(object, "gridanglex"); - sp_object_read_attr(object, "gridanglez"); - sp_object_read_attr(object, "gridempspacing"); - sp_object_read_attr(object, "gridcolor"); - sp_object_read_attr(object, "gridempcolor"); - sp_object_read_attr(object, "gridopacity"); - sp_object_read_attr(object, "gridempopacity"); sp_object_read_attr(object, "guidecolor"); sp_object_read_attr(object, "guideopacity"); sp_object_read_attr(object, "guidehicolor"); @@ -172,19 +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:grid-bbox"); - sp_object_read_attr(object, "inkscape:guide-bbox"); - sp_object_read_attr(object, "inkscape:object-bbox"); - sp_object_read_attr(object, "inkscape:grid-points"); - sp_object_read_attr(object, "inkscape:guide-points"); - sp_object_read_attr(object, "inkscape:object-points"); + 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); @@ -192,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) @@ -203,9 +279,11 @@ static void sp_namedview_release(SPObject *object) namedview->guides = NULL; } - while (namedview->gridviews) { - gtk_object_unref(GTK_OBJECT(namedview->gridviews->data)); - namedview->gridviews = g_slist_remove(namedview->gridviews, namedview->gridviews->data); + // delete grids: + while ( namedview->grids ) { + Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)namedview->grids->data; + delete gr; + namedview->grids = g_slist_remove_link(namedview->grids, namedview->grids); } if (((SPObjectClass *) parent_class)->release) { @@ -221,23 +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_SHOWGRID: - nv->showgrid = sp_str_to_bool(value); - sp_namedview_setup_grid(nv); - /* Disable grid snaps if the grid is turned off */ - nv->snap_manager.grid.setEnabled(nv->showgrid); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - case SP_ATTR_GRIDTYPE: - nv->gridtype = sp_str_to_bool(value); - sp_namedview_setup_grid(nv); - 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 { @@ -246,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) { @@ -254,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) { @@ -262,7 +336,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va } object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_OBJECTTOLERANCE: + case SP_ATTR_OBJECTTOLERANCE: nv->objecttoleranceunit = &px; nv->objecttolerance = DEFAULTTOLERANCE; if (value) { @@ -270,89 +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_ABS_TOLERANCE: - if (!value) - nv->has_abs_tolerance = true; - else - nv->has_abs_tolerance = (sp_str_to_bool (value) == TRUE); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - case SP_ATTR_GRIDORIGINX: - case SP_ATTR_GRIDORIGINY: - { - unsigned const d = (key == SP_ATTR_GRIDORIGINY); - nv->gridunit = nv->doc_units; - nv->gridorigin[d] = 0.0; - if (value) { - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &nv->gridorigin[d], &nv->gridunit); - } - nv->gridorigin[d] = sp_units_get_pixels(nv->gridorigin[d], *(nv->gridunit)); - sp_namedview_setup_grid(nv); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - } - case SP_ATTR_GRIDSPACINGX: - case SP_ATTR_GRIDSPACINGY: - { - unsigned const d = (key == SP_ATTR_GRIDSPACINGY); - nv->gridunit = nv->doc_units; - nv->gridspacing[d] = 1.0; - if (value) { - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &nv->gridspacing[d], &nv->gridunit); - } - nv->gridspacing[d] = sp_units_get_pixels(nv->gridspacing[d], *(nv->gridunit)); - sp_namedview_setup_grid(nv); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - } - case SP_ATTR_GRIDANGLEX: - case SP_ATTR_GRIDANGLEZ: - { - unsigned const d = (key == SP_ATTR_GRIDANGLEZ); // 0=X 1=Z - nv->gridangle[d] = 30; // 30 deg default - if (value) { - nv->gridangle[d] = g_ascii_strtod(value, NULL); - } - sp_namedview_setup_grid(nv); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - } - case SP_ATTR_GRIDCOLOR: - nv->gridcolor = (nv->gridcolor & 0xff) | (DEFAULTGRIDCOLOR & 0xffffff00); - if (value) { - nv->gridcolor = (nv->gridcolor & 0xff) | sp_svg_read_color(value, nv->gridcolor); - } - sp_namedview_setup_grid(nv); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - case SP_ATTR_GRIDEMPCOLOR: - nv->gridempcolor = (nv->gridempcolor & 0xff) | (DEFAULTGRIDEMPCOLOR & 0xffffff00); - if (value) { - nv->gridempcolor = (nv->gridempcolor & 0xff) | sp_svg_read_color(value, nv->gridempcolor); - } - sp_namedview_setup_grid(nv); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - case SP_ATTR_GRIDOPACITY: - nv->gridcolor = (nv->gridcolor & 0xffffff00) | (DEFAULTGRIDCOLOR & 0xff); - sp_nv_read_opacity(value, &nv->gridcolor); - sp_namedview_setup_grid(nv); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - case SP_ATTR_GRIDEMPOPACITY: - nv->gridempcolor = (nv->gridempcolor & 0xffffff00) | (DEFAULTGRIDEMPCOLOR & 0xff); - sp_nv_read_opacity(value, &nv->gridempcolor); - sp_namedview_setup_grid(nv); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; - case SP_ATTR_GRIDEMPSPACING: - nv->gridempspacing = DEFAULTGRIDEMPSPACING; - if (value != NULL) - nv->gridempspacing = atoi(value); - sp_namedview_setup_grid(nv); - 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); @@ -362,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) { @@ -370,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); @@ -380,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) { @@ -388,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); @@ -416,89 +408,101 @@ 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; - case SP_ATTR_SHOWPAGESHADOW: + case SP_ATTR_SHOWPAGESHADOW: 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_GRID_BBOX: - nv->snap_manager.grid.setSnapTo(Inkscape::Snapper::BBOX_POINT, value ? sp_str_to_bool(value) : TRUE); + 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); + break; + case SP_ATTR_INKSCAPE_SNAP_NODES: + nv->snap_manager.setSnapModeNode(value ? sp_str_to_bool(value) : TRUE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_CENTER: + nv->snap_manager.setIncludeItemCenter(value ? sp_str_to_bool(value) : FALSE); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_INKSCAPE_GRID_POINTS: - nv->snap_manager.grid.setSnapTo(Inkscape::Snapper::SNAP_POINT, value ? sp_str_to_bool(value) : FALSE); + 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_GUIDE_BBOX: - nv->snap_manager.guide.setSnapTo(Inkscape::Snapper::BBOX_POINT, value ? sp_str_to_bool(value) : TRUE); + 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_GUIDE_POINTS: - nv->snap_manager.guide.setSnapTo(Inkscape::Snapper::SNAP_POINT, value ? sp_str_to_bool(value) : FALSE); + 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_BBOX: - nv->snap_manager.object.setSnapTo(Inkscape::Snapper::BBOX_POINT, (value) ? sp_str_to_bool(value) : FALSE); + case SP_ATTR_INKSCAPE_OBJECT_PATHS: + nv->snap_manager.object.setSnapToItemPath(value ? sp_str_to_bool(value) : FALSE); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_INKSCAPE_OBJECT_POINTS: - nv->snap_manager.object.setSnapTo(Inkscape::Snapper::SNAP_POINT, (value) ? sp_str_to_bool(value) : FALSE); + case SP_ATTR_INKSCAPE_OBJECT_NODES: + nv->snap_manager.object.setSnapToItemNode(value ? sp_str_to_bool(value) : FALSE); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_INKSCAPE_OBJECT_PATHS: - nv->snap_manager.object.setSnapToPaths(value ? sp_str_to_bool(value) : TRUE); + 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_OBJECT_NODES: - nv->snap_manager.object.setSnapToNodes(value ? sp_str_to_bool(value) : TRUE); + 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: + 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. @@ -538,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); } @@ -547,6 +551,53 @@ 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* +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 + for (GSList *l = nv->grids; l != NULL; l = l->next) { + Inkscape::CanvasGrid* g = (Inkscape::CanvasGrid*) l->data; + if (repr == g->repr) { + grid = g; + break; + } + } + + if (!grid) { + //create grid object + Inkscape::GridType gridtype = Inkscape::CanvasGrid::getGridTypeFromSVGName(repr->attribute("type")); + SPDocument *doc = NULL; + if (desktop) + doc = sp_desktop_document(desktop); + else + doc = sp_desktop_document(static_cast(nv->views->data)); + grid = Inkscape::CanvasGrid::NewGrid(nv, repr, doc, gridtype); + nv->grids = g_slist_append(nv->grids, grid); + //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); + } + + if (!desktop) { + //add canvasitem to all desktops + for (GSList *l = nv->views; l != NULL; l = l->next) { + SPDesktop *dt = static_cast(l->data); + grid->createCanvasItem(dt); + } + } else { + //add canvasitem only for specified desktop + grid->createCanvasItem(desktop); + } + + return grid; +} + static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref) { SPNamedView *nv = (SPNamedView *) object; @@ -555,28 +606,32 @@ 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"); - SPObject *no = object->document->getObjectById(id); - g_assert(SP_IS_OBJECT(no)); - - if (SP_IS_GUIDE(no)) { - SPGuide *g = (SPGuide *) no; - nv->guides = g_slist_prepend(nv->guides, g); - g_object_set(G_OBJECT(g), "color", nv->guidecolor, "hicolor", nv->guidehicolor, NULL); - if (nv->editable) { - for (GSList *l = nv->views; l != NULL; l = l->next) { - sp_guide_show(g, static_cast(l->data)->guides, (GCallback) sp_dt_guide_event); - if (static_cast(l->data)->guides_active) - sp_guide_sensitize(g, - sp_desktop_canvas(static_cast (l->data)), - TRUE); - if (nv->showguides) { - for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) { - sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); - } - } else { - for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) { - sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); + if (!strcmp(child->name(), "inkscape:grid")) { + sp_namedview_add_grid(nv, child, NULL); + } else { + SPObject *no = object->document->getObjectByRepr(child); + if ( !SP_IS_OBJECT(no) ) + return; + + if (SP_IS_GUIDE(no)) { + SPGuide *g = (SPGuide *) no; + nv->guides = g_slist_prepend(nv->guides, g); + g_object_set(G_OBJECT(g), "color", nv->guidecolor, "hicolor", nv->guidehicolor, NULL); + if (nv->editable) { + for (GSList *l = nv->views; l != NULL; l = l->next) { + sp_guide_show(g, static_cast(l->data)->guides, (GCallback) sp_dt_guide_event); + if (static_cast(l->data)->guides_active) + sp_guide_sensitize(g, + sp_desktop_canvas(static_cast (l->data)), + TRUE); + if (nv->showguides) { + for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) { + sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); + } + } else { + for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) { + sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); + } } } } @@ -588,15 +643,26 @@ static void sp_namedview_remove_child(SPObject *object, Inkscape::XML::Node *chi { SPNamedView *nv = (SPNamedView *) object; - GSList **ref = &nv->guides; - for ( GSList *iter = nv->guides ; iter ; iter = iter->next ) { - if ( SP_OBJECT_REPR((SPObject *)iter->data) == child ) { - *ref = iter->next; - iter->next = NULL; - g_slist_free_1(iter); - break; + if (!strcmp(child->name(), "inkscape:grid")) { + for ( GSList *iter = nv->grids ; iter ; iter = iter->next ) { + Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)iter->data; + if ( gr->repr == child ) { + delete gr; + nv->grids = g_slist_remove_link(nv->grids, iter); + break; + } + } + } else { + GSList **ref = &nv->guides; + for ( GSList *iter = nv->guides ; iter ; iter = iter->next ) { + if ( SP_OBJECT_REPR((SPObject *)iter->data) == child ) { + *ref = iter->next; + iter->next = NULL; + g_slist_free_1(iter); + break; + } + ref = &iter->next; } - ref = &iter->next; } if (((SPObjectClass *) (parent_class))->remove_child) { @@ -612,7 +678,8 @@ static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML:: if (repr) { repr->mergeFrom(SP_OBJECT_REPR(object), "id"); } else { - repr = SP_OBJECT_REPR(object)->duplicate(); + /// \todo FIXME: Plumb an appropriate XML::Document into this + repr = SP_OBJECT_REPR(object)->duplicate(NULL); } } @@ -639,33 +706,46 @@ void SPNamedView::show(SPDesktop *desktop) views = g_slist_prepend(views, desktop); - SPCanvasItem * item = sp_canvas_item_new(sp_desktop_grid(desktop), SP_TYPE_CGRID, NULL); - // since we're keeping a copy, we need to bump up the ref count - gtk_object_ref(GTK_OBJECT(item)); - gridviews = g_slist_prepend(gridviews, item); - - item = sp_canvas_item_new(sp_desktop_grid(desktop), SP_TYPE_CAXONOMGRID, NULL); - // since we're keeping a copy, we need to bump up the ref count - gtk_object_ref(GTK_OBJECT(item)); - gridviews = g_slist_prepend(gridviews, item); + // generate grids specified in SVG: + Inkscape::XML::Node *repr = SP_OBJECT_REPR(this); + if (repr) { + for (Inkscape::XML::Node * child = repr->firstChild() ; child != NULL; child = child->next() ) { + if (!strcmp(child->name(), "inkscape:grid")) { + sp_namedview_add_grid(this, child, desktop); + } + } + } - sp_namedview_setup_grid(this); + desktop->showGrids(grids_visible, false); } +#define MIN_ONSCREEN_DISTANCE 50 + /* - * Restores window geometry from the document settings + * Restores window geometry from the document settings or defaults in prefs */ void sp_namedview_window_from_document(SPDesktop *desktop) { SPNamedView *nv = desktop->namedview; - gint save_geometry = prefs_get_int_attribute("options.savewindowgeometry", "value", 0); - - // restore window size and position - if (save_geometry) { - if (nv->window_width != -1 && nv->window_height != -1) - desktop->setWindowSize(nv->window_width, nv->window_height); - if (nv->window_x != -1 && nv->window_y != -1) - desktop->setWindowPosition(NR::Point(nv->window_x, nv->window_y)); + gint geometry_from_file = + (1==prefs_get_int_attribute("options.savewindowgeometry", "value", 0)); + + // restore window size and position stored with the document + if (geometry_from_file) { + gint w = MIN(gdk_screen_width(), nv->window_width); + gint h = MIN(gdk_screen_height(), nv->window_height); + gint x = MIN(gdk_screen_width() - MIN_ONSCREEN_DISTANCE, nv->window_x); + gint y = MIN(gdk_screen_height() - MIN_ONSCREEN_DISTANCE, nv->window_y); + if (w>0 && h>0 && x>0 && y>0) { + x = MIN(gdk_screen_width() - w, x); + y = MIN(gdk_screen_height() - h, y); + } + if (w>0 && h>0) { + desktop->setWindowSize(w, h); + } + if (x>0 && y>0) { + desktop->setWindowPosition(NR::Point(x, y)); + } } // restore zoom and view @@ -682,9 +762,13 @@ void sp_namedview_window_from_document(SPDesktop *desktop) g_list_free(desktop->zooms_past); desktop->zooms_past = NULL; } +} +void sp_namedview_update_layers_from_document (SPDesktop *desktop) +{ SPObject *layer = NULL; SPDocument *document = desktop->doc(); + SPNamedView *nv = desktop->namedview; if ( nv->default_layer_id != 0 ) { layer = document->getObjectById(g_quark_to_string(nv->default_layer_id)); } @@ -706,12 +790,13 @@ void sp_namedview_window_from_document(SPDesktop *desktop) } // FIXME: find a better place to do this - sp_desktop_document(desktop)->getEventLog().updateUndoVerbs(); + desktop->event_log->updateUndoVerbs(); } void sp_namedview_document_from_window(SPDesktop *desktop) { - gint save_geometry = prefs_get_int_attribute("options.savewindowgeometry", "value", 0); + 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(); @@ -723,7 +808,7 @@ void sp_namedview_document_from_window(SPDesktop *desktop) sp_repr_set_svg_double(view, "inkscape:cx", r.midpoint()[NR::X]); sp_repr_set_svg_double(view, "inkscape:cy", r.midpoint()[NR::Y]); - if (save_geometry) { + if (save_geometry_in_file) { gint w, h, x, y; desktop->getWindowGeometry(x, y, w, h); sp_repr_set_int(view, "inkscape:window-width", w); @@ -749,13 +834,11 @@ void SPNamedView::hide(SPDesktop const *desktop) views = g_slist_remove(views, desktop); - GSList *l; - for (l = gridviews; l != NULL; l = l->next) { - if (SP_CANVAS_ITEM(l->data)->canvas == sp_desktop_canvas(desktop)) { - sp_canvas_item_hide(SP_CANVAS_ITEM(l->data)); - gtk_object_unref(GTK_OBJECT(l->data)); - gridviews = g_slist_remove(gridviews, l->data); - } + // delete grids: + while ( grids ) { + Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)grids->data; + delete gr; + grids = g_slist_remove_link(grids, grids); } } @@ -805,76 +888,26 @@ void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr) sp_document_set_undo_sensitive(doc, saved); } -void sp_namedview_toggle_grid(SPDocument *doc, Inkscape::XML::Node *repr) +void sp_namedview_show_grids(SPNamedView * namedview, bool show, bool dirty_document) { - unsigned int v; - sp_repr_get_boolean(repr, "showgrid", &v); - v = !v; - - bool saved = sp_document_get_undo_sensitive(doc); - sp_document_set_undo_sensitive(doc, false); + namedview->grids_visible = show; - sp_repr_set_boolean(repr, "showgrid", v); - - doc->rroot->setAttribute("sodipodi:modified", "true"); - sp_document_set_undo_sensitive(doc, saved); -} + SPDocument *doc = SP_OBJECT_DOCUMENT (namedview); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(namedview); -void sp_namedview_set_gridtype(bool type, SPDocument *doc, Inkscape::XML::Node *repr) -{ bool saved = sp_document_get_undo_sensitive(doc); sp_document_set_undo_sensitive(doc, false); - sp_repr_set_boolean(repr, "showgrid", type); - - doc->rroot->setAttribute("sodipodi:modified", "true"); - sp_document_set_undo_sensitive(doc, saved); -} - -static void sp_namedview_setup_grid(SPNamedView *nv) -{ - for (GSList *l = nv->gridviews; l != NULL; l = l->next) { - sp_namedview_setup_grid_item(nv, SP_CANVAS_ITEM(l->data)); - } -} - -static void sp_namedview_setup_grid_item(SPNamedView *nv, SPCanvasItem *item) -{ - bool btype = SP_IS_CAXONOMGRID(GTK_OBJECT(item)); + sp_repr_set_boolean(repr, "showgrid", namedview->grids_visible); - if ( nv->showgrid && (nv->gridtype == btype) ) { - sp_canvas_item_show(item); - } else { - sp_canvas_item_hide(item); - } - - if (!btype){ - // CGRID - sp_canvas_item_set((GtkObject *) item, - "color", nv->gridcolor, - "originx", nv->gridorigin[NR::X], - "originy", nv->gridorigin[NR::Y], - "spacingx", nv->gridspacing[NR::X], - "spacingy", nv->gridspacing[NR::Y], - "empcolor", nv->gridempcolor, - "empspacing", nv->gridempspacing, - NULL); - } else { - // CAXONOMGRID - sp_canvas_item_set((GtkObject *) item, - "color", nv->gridcolor, - "originx", nv->gridorigin[NR::X], - "originy", nv->gridorigin[NR::Y], - "spacingy", nv->gridspacing[NR::Y], - "anglex", nv->gridangle[0], - "anglez", nv->gridangle[1], - "empcolor", nv->gridempcolor, - "empspacing", nv->gridempspacing, - NULL); + /* 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; @@ -967,7 +1000,7 @@ static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color) } gchar *u; - gdouble v = strtod(str, &u); + gdouble v = g_ascii_strtod(str, &u); if (!u) { return FALSE; } @@ -1008,6 +1041,21 @@ SPMetric SPNamedView::getDefaultMetric() 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: mode:c++ @@ -1017,4 +1065,4 @@ SPMetric SPNamedView::getDefaultMetric() const fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :