X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=src%2Fsp-namedview.cpp;h=44c3bf62013c42d84cffbf5f6facce5f66a42c01;hb=62dad53172661dfa1ef8dd3ed07e06d2ea2523a4;hp=aeaa8dc14640e8a426c0065a2e50b5be3591cab8;hpb=c121bcbb9bc68cc95a5a5c2e5eb288a9a1c82524;p=inkscape.git diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index aeaa8dc14..44c3bf620 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -8,15 +8,18 @@ * bulia byak * * Copyright (C) 2006 Johan Engelen - * Copyright (C) 1999-2005 Authors + * Copyright (C) 1999-2008 Authors * Copyright (C) 2000-2001 Ximian, Inc. * * Released under GNU GPL, read the file 'COPYING' for more information */ #include "config.h" +#include +#include #include "display/canvas-grid.h" +#include "display/guideline.h" #include "helper/units.h" #include "svg/svg-color.h" #include "xml/repr.h" @@ -28,13 +31,10 @@ #include "sp-guide.h" #include "sp-item-group.h" #include "sp-namedview.h" -#include "prefs-utils.h" +#include "preferences.h" #include "desktop.h" #include "conn-avoid-ref.h" // for defaultConnSpacing. -#include "isnan.h" //temp fix for isnan(). include last - -#define DEFAULTTOLERANCE 0.4 #define DEFAULTGRIDCOLOR 0x3f3fff25 #define DEFAULTGRIDEMPCOLOR 0x3f3fff60 #define DEFAULTGRIDEMPSPACING 5 @@ -51,12 +51,12 @@ static void sp_namedview_release(SPObject *object); static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *value); static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref); static void sp_namedview_remove_child(SPObject *object, Inkscape::XML::Node *child); -static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); +static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); static void sp_namedview_setup_guides(SPNamedView * nv); +static void sp_namedview_show_single_guide(SPGuide* guide, bool show); 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); static SPObjectGroupClass * parent_class; @@ -68,15 +68,15 @@ sp_namedview_get_type() if (!namedview_type) { GTypeInfo namedview_info = { sizeof(SPNamedViewClass), - NULL, /* base_init */ - NULL, /* base_finalize */ + NULL, /* base_init */ + NULL, /* base_finalize */ (GClassInitFunc) sp_namedview_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ + NULL, /* class_finalize */ + NULL, /* class_data */ sizeof(SPNamedView), - 16, /* n_preallocs */ + 16, /* n_preallocs */ (GInstanceInitFunc) sp_namedview_init, - NULL, /* value_table */ + NULL, /* value_table */ }; namedview_type = g_type_register_static(SP_TYPE_OBJECTGROUP, "SPNamedView", &namedview_info, (GTypeFlags)0); } @@ -105,6 +105,7 @@ static void sp_namedview_init(SPNamedView *nv) { nv->editable = TRUE; nv->showguides = TRUE; + nv->grids_visible = false; nv->showborder = TRUE; nv->showpageshadow = TRUE; @@ -119,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; @@ -154,17 +243,29 @@ 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:window-maximized"); + 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-from-guide"); sp_object_read_attr(object, "inkscape:snap-center"); + sp_object_read_attr(object, "inkscape:snap-smooth-nodes"); + sp_object_read_attr(object, "inkscape:snap-midpoints"); + sp_object_read_attr(object, "inkscape:snap-object-midpoints"); + sp_object_read_attr(object, "inkscape:snap-bbox-edge-midpoints"); + sp_object_read_attr(object, "inkscape:snap-bbox-midpoints"); + sp_object_read_attr(object, "inkscape:snap-to-guides"); + sp_object_read_attr(object, "inkscape:snap-grids"); + sp_object_read_attr(object, "inkscape:snap-intersection-paths"); 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:snap-page"); 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); @@ -172,6 +273,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) @@ -185,9 +289,9 @@ 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) { @@ -200,6 +304,7 @@ static void sp_namedview_release(SPObject *object) static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *value) { SPNamedView *nv = SP_NAMEDVIEW(object); + // TODO investigate why we grab this and then never use it SPUnit const &px = sp_unit_get_by_id(SP_UNIT_PX); switch (key) { @@ -217,7 +322,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); @@ -225,27 +330,15 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_GRIDTOLERANCE: - nv->gridtoleranceunit = &px; - nv->gridtolerance = DEFAULTTOLERANCE; - if (value) { - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &nv->gridtolerance, &nv->gridtoleranceunit); - } - object->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; + nv->snap_manager.snapprefs.setGridTolerance(value ? g_ascii_strtod(value, NULL) : 10000); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; case SP_ATTR_GUIDETOLERANCE: - nv->guidetoleranceunit = &px; - nv->guidetolerance = DEFAULTTOLERANCE; - if (value) { - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &nv->guidetolerance, &nv->guidetoleranceunit); - } + nv->snap_manager.snapprefs.setGuideTolerance(value ? g_ascii_strtod(value, NULL) : 20); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_OBJECTTOLERANCE: - nv->objecttoleranceunit = &px; - nv->objecttolerance = DEFAULTTOLERANCE; - if (value) { - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &nv->objecttolerance, &nv->objecttoleranceunit); - } + nv->snap_manager.snapprefs.setObjectTolerance(value ? g_ascii_strtod(value, NULL) : 20); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_GUIDECOLOR: @@ -300,12 +393,12 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va } object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_BORDEROPACITY: + case SP_ATTR_BORDEROPACITY: nv->bordercolor = (nv->bordercolor & 0xffffff00) | (DEFAULTBORDERCOLOR & 0xff); sp_nv_read_opacity(value, &nv->bordercolor); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_PAGECOLOR: + case SP_ATTR_PAGECOLOR: nv->pagecolor = (nv->pagecolor & 0xff) | (DEFAULTPAGECOLOR & 0xffffff00); if (value) { nv->pagecolor = (nv->pagecolor & 0xff) | sp_svg_read_color(value, nv->pagecolor); @@ -346,35 +439,87 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_INKSCAPE_WINDOW_X: - nv->window_x = value ? atoi(value) : -1; // -1 means not set + nv->window_x = value ? atoi(value) : 0; object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_INKSCAPE_WINDOW_Y: - nv->window_y = value ? atoi(value) : -1; // -1 means not set + nv->window_y = value ? atoi(value) : 0; + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_WINDOW_MAXIMIZED: + nv->window_maximized = value ? atoi(value) : 0; + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_GLOBAL: + nv->snap_manager.snapprefs.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); + nv->snap_manager.snapprefs.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); + nv->snap_manager.snapprefs.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); + nv->snap_manager.snapprefs.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); + case SP_ATTR_INKSCAPE_SNAP_GRIDS: + nv->snap_manager.snapprefs.setSnapToGrids(value ? sp_str_to_bool(value) : TRUE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_TO_GUIDES: + nv->snap_manager.snapprefs.setSnapToGuides(value ? sp_str_to_bool(value) : TRUE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_SMOOTH_NODES: + nv->snap_manager.snapprefs.setSnapSmoothNodes(value ? sp_str_to_bool(value) : FALSE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_LINE_MIDPOINTS: + nv->snap_manager.snapprefs.setSnapLineMidpoints(value ? sp_str_to_bool(value) : FALSE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_OBJECT_MIDPOINTS: + nv->snap_manager.snapprefs.setSnapObjectMidpoints(value ? sp_str_to_bool(value) : FALSE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_BBOX_EDGE_MIDPOINTS: + nv->snap_manager.snapprefs.setSnapBBoxEdgeMidpoints(value ? sp_str_to_bool(value) : FALSE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_BBOX_MIDPOINTS: + nv->snap_manager.snapprefs.setSnapBBoxMidpoints(value ? sp_str_to_bool(value) : FALSE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_FROM_GUIDE: + nv->snap_manager.snapprefs.setSnapModeGuide(value ? sp_str_to_bool(value) : TRUE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_INTERS_PATHS: + nv->snap_manager.snapprefs.setSnapIntersectionCS(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); + nv->snap_manager.snapprefs.setSnapToItemPath(value ? sp_str_to_bool(value) : FALSE); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_INKSCAPE_OBJECT_NODES: - nv->snap_manager.object.setSnapToItemNode(value ? sp_str_to_bool(value) : FALSE); + nv->snap_manager.snapprefs.setSnapToItemNode(value ? sp_str_to_bool(value) : FALSE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_BBOX_PATHS: + nv->snap_manager.snapprefs.setSnapToBBoxPath(value ? sp_str_to_bool(value) : FALSE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_BBOX_NODES: + nv->snap_manager.snapprefs.setSnapToBBoxNode(value ? sp_str_to_bool(value) : FALSE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_PAGE: + nv->snap_manager.snapprefs.setSnapToPageBorder(value ? sp_str_to_bool(value) : FALSE); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_INKSCAPE_CURRENT_LAYER: @@ -454,18 +599,12 @@ sp_namedview_add_grid(SPNamedView *nv, Inkscape::XML::Node *repr, SPDesktop *des 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); + if (!nv->document) { + g_warning("sp_namedview_add_grid - how come doc is null here?!"); + return NULL; + } + grid = Inkscape::CanvasGrid::NewGrid(nv, repr, nv->document, 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) { @@ -490,12 +629,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; @@ -508,15 +647,7 @@ static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *chil 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)); - } - } + sp_namedview_show_single_guide(SP_GUIDE(g), nv->showguides); } } } @@ -554,7 +685,7 @@ static void sp_namedview_remove_child(SPObject *object, Inkscape::XML::Node *chi } } -static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) +static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) { if ( ( flags & SP_OBJECT_WRITE_EXT ) && repr != SP_OBJECT_REPR(object) ) @@ -562,8 +693,7 @@ static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML:: if (repr) { repr->mergeFrom(SP_OBJECT_REPR(object), "id"); } else { - /// \todo FIXME: Plumb an appropriate XML::Document into this - repr = SP_OBJECT_REPR(object)->duplicate(NULL); + repr = SP_OBJECT_REPR(object)->duplicate(doc); } } @@ -577,15 +707,7 @@ void SPNamedView::show(SPDesktop *desktop) if (desktop->guides_active) { sp_guide_sensitize(SP_GUIDE(l->data), sp_desktop_canvas(desktop), TRUE); } - if (showguides) { - for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { - sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); - } - } else { - for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { - sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); - } - } + sp_namedview_show_single_guide(SP_GUIDE(l->data), showguides); } views = g_slist_prepend(views, desktop); @@ -600,7 +722,7 @@ void SPNamedView::show(SPDesktop *desktop) } } - desktop->showGrids(grids_visible); + desktop->showGrids(grids_visible, false); } #define MIN_ONSCREEN_DISTANCE 50 @@ -611,31 +733,36 @@ void SPNamedView::show(SPDesktop *desktop) void sp_namedview_window_from_document(SPDesktop *desktop) { SPNamedView *nv = desktop->namedview; - gint geometry_from_file = - (1==prefs_get_int_attribute("options.savewindowgeometry", "value", 0)); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool geometry_from_file = prefs->getBool("/options/savewindowgeometry/value"); // 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)); - } + if (nv->window_maximized) { + Gtk::Window *win = desktop->getToplevel(); + if (win){ + win->maximize(); + } + } else { + gint w = MIN(gdk_screen_width(), nv->window_width); + gint h = MIN(gdk_screen_height(), nv->window_height); + // prevent the window from moving off the screen to the right or to the bottom + gint x = MIN(gdk_screen_width() - MIN_ONSCREEN_DISTANCE, nv->window_x); + gint y = MIN(gdk_screen_height() - MIN_ONSCREEN_DISTANCE, nv->window_y); + // prevent the window from moving off the screen to the left or to the top + x = MAX(MIN_ONSCREEN_DISTANCE - nv->window_width, x); + y = MAX(MIN_ONSCREEN_DISTANCE - nv->window_height, y); + if (w>0 && h>0) { + desktop->setWindowSize(w, h); + desktop->setWindowPosition(Geom::Point(x, y)); + } + } } // restore zoom and view - if (nv->zoom != 0 && nv->zoom != HUGE_VAL && !isNaN(nv->zoom) - && nv->cx != HUGE_VAL && !isNaN(nv->cx) - && nv->cy != HUGE_VAL && !isNaN(nv->cy)) { + if (nv->zoom != 0 && nv->zoom != HUGE_VAL && !IS_NAN(nv->zoom) + && nv->cx != HUGE_VAL && !IS_NAN(nv->cx) + && nv->cy != HUGE_VAL && !IS_NAN(nv->cy)) { desktop->zoom_absolute(nv->cx, nv->cy, nv->zoom); } else if (sp_desktop_document(desktop)) { // document without saved zoom, zoom to its page desktop->zoom_page(); @@ -679,29 +806,30 @@ void sp_namedview_update_layers_from_document (SPDesktop *desktop) void sp_namedview_document_from_window(SPDesktop *desktop) { - gint save_geometry_in_file = - (1==prefs_get_int_attribute("options.savewindowgeometry", "value", 0)); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool save_geometry_in_file = prefs->getBool("/options/savewindowgeometry/value", 0); Inkscape::XML::Node *view = SP_OBJECT_REPR(desktop->namedview); - NR::Rect const r = desktop->get_display_area(); + Geom::Rect const r = desktop->get_display_area(); // saving window geometry is not undoable bool saved = sp_document_get_undo_sensitive(sp_desktop_document(desktop)); sp_document_set_undo_sensitive(sp_desktop_document(desktop), false); sp_repr_set_svg_double(view, "inkscape:zoom", desktop->current_zoom()); - sp_repr_set_svg_double(view, "inkscape:cx", r.midpoint()[NR::X]); - sp_repr_set_svg_double(view, "inkscape:cy", r.midpoint()[NR::Y]); + sp_repr_set_svg_double(view, "inkscape:cx", r.midpoint()[Geom::X]); + sp_repr_set_svg_double(view, "inkscape:cy", r.midpoint()[Geom::Y]); if (save_geometry_in_file) { - gint w, h, x, y; + gint w, h, x, y; desktop->getWindowGeometry(x, y, w, h); sp_repr_set_int(view, "inkscape:window-width", w); sp_repr_set_int(view, "inkscape:window-height", h); sp_repr_set_int(view, "inkscape:window-x", x); sp_repr_set_int(view, "inkscape:window-y", y); + sp_repr_set_int(view, "inkscape:window-maximized", desktop->is_maximized()); } - view->setAttribute("inkscape:current-layer", SP_OBJECT_ID(desktop->currentLayer())); + view->setAttribute("inkscape:current-layer", desktop->currentLayer()->getId()); // restore undoability sp_document_set_undo_sensitive(sp_desktop_document(desktop), saved); @@ -717,13 +845,6 @@ void SPNamedView::hide(SPDesktop const *desktop) } 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) @@ -741,18 +862,23 @@ void SPNamedView::activateGuides(gpointer desktop, gboolean active) static void sp_namedview_setup_guides(SPNamedView *nv) { for (GSList *l = nv->guides; l != NULL; l = l->next) { - if (nv->showguides) { - for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { - sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); - } - } else { - for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { - sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); - } - } + sp_namedview_show_single_guide(SP_GUIDE(l->data), nv->showguides); } } +static void sp_namedview_show_single_guide(SPGuide* guide, bool show) +{ + for (GSList *v = guide->views; v != NULL; v = v->next) { + if (show) { + sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); + sp_canvas_item_show(SP_CANVAS_ITEM(SP_GUIDELINE(v->data)->origin)); + } else { + sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); + sp_canvas_item_hide(SP_CANVAS_ITEM(SP_GUIDELINE(v->data)->origin)); + } + } +} + void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr) { unsigned int v; @@ -765,14 +891,13 @@ void sp_namedview_toggle_guides(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, "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) +void sp_namedview_show_grids(SPNamedView * namedview, bool show, bool dirty_document) { namedview->grids_visible = show; @@ -781,11 +906,14 @@ void sp_namedview_show_grids(SPNamedView * namedview, bool show) bool saved = sp_document_get_undo_sensitive(doc); sp_document_set_undo_sensitive(doc, false); - sp_repr_set_boolean(repr, "showgrid", namedview->grids_visible); - - doc->rroot->setAttribute("sodipodi:modified", "true"); 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->setModifiedSinceSave(); + } } gchar const *SPNamedView::getName() const @@ -821,58 +949,6 @@ static gboolean sp_str_to_bool(const gchar *str) return FALSE; } -/* fixme: Collect all these length parsing methods and think common sane API */ - -static gboolean sp_nv_read_length(const gchar *str, guint base, gdouble *val, const SPUnit **unit) -{ - if (!str) { - return FALSE; - } - - gchar *u; - gdouble v = g_ascii_strtod(str, &u); - if (!u) { - return FALSE; - } - while (isspace(*u)) { - u += 1; - } - - if (!*u) { - /* No unit specified - keep default */ - *val = v; - return TRUE; - } - - if (base & SP_UNIT_DEVICE) { - if (u[0] && u[1] && !isalnum(u[2]) && !strncmp(u, "px", 2)) { - *unit = &sp_unit_get_by_id(SP_UNIT_PX); - *val = v; - return TRUE; - } - } - - if (base & SP_UNIT_ABSOLUTE) { - if (!strncmp(u, "pt", 2)) { - *unit = &sp_unit_get_by_id(SP_UNIT_PT); - } else if (!strncmp(u, "mm", 2)) { - *unit = &sp_unit_get_by_id(SP_UNIT_MM); - } else if (!strncmp(u, "cm", 2)) { - *unit = &sp_unit_get_by_id(SP_UNIT_CM); - } else if (!strncmp(u, "m", 1)) { - *unit = &sp_unit_get_by_id(SP_UNIT_M); - } else if (!strncmp(u, "in", 2)) { - *unit = &sp_unit_get_by_id(SP_UNIT_IN); - } else { - return FALSE; - } - *val = v; - return TRUE; - } - - return FALSE; -} - static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color) { if (!str) { @@ -902,7 +978,7 @@ SPNamedView *sp_document_namedview(SPDocument *document, const gchar *id) return (SPNamedView *) nv; } - while (nv && strcmp(nv->id, id)) { + while (nv && strcmp(nv->getId(), id)) { nv = sp_item_group_get_child_by_name((SPGroup *) document->root, nv, "sodipodi:namedview"); } @@ -921,6 +997,37 @@ 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; +} + +void SPNamedView::translateGuides(Geom::Translate const &tr) { + for (GSList *l = guides; l != NULL; l = l->next) { + SPGuide &guide = *SP_GUIDE(l->data); + Geom::Point point_on_line = guide.point_on_line; + point_on_line[0] += tr[0]; + point_on_line[1] += tr[1]; + sp_guide_moveto(guide, point_on_line, true); + } +} + +void SPNamedView::scrollAllDesktops(double dx, double dy, bool is_scrolling) { + for(GSList *l = views; l; l = l->next) { + SPDesktop *desktop = static_cast(l->data); + desktop->scroll_world_in_svg_coords(dx, dy, is_scrolling); + } +} + /* Local Variables: