X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-namedview.h;h=7eefdfae53cf345fd6d65281c2273cf3e69b6510;hb=03a65c733a473cd92d50132961d02c3910417f72;hp=b60fb56175a6378ad66fc0d8967835e00807997c;hpb=c87d0307348fcfdc65b6b4ab6999a3cb0de2431f;p=inkscape.git

diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index b60fb5617..7eefdfae5 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -7,6 +7,7 @@
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *
+ * Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
  * Copyright (C) Lauris Kaplinski 2000-2002
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -24,6 +25,10 @@
 #include "sp-metric.h"
 #include "snap.h"
 
+namespace Inkscape {
+class CanvasGrid;
+}
+
 enum {
     SP_BORDER_LAYER_BOTTOM,
     SP_BORDER_LAYER_TOP
@@ -31,7 +36,6 @@ enum {
 
 struct SPNamedView : public SPObjectGroup {
     unsigned int editable : 1;
-    unsigned int showgrid : 1;
     unsigned int showguides : 1;
     unsigned int showborder : 1;
     unsigned int showpageshadow : 1;
@@ -46,12 +50,7 @@ struct SPNamedView : public SPObjectGroup {
     gint window_y;
 
     SnapManager snap_manager;
-
-    SPUnit const *gridunit;
-    /* Grid data is in points regardless of unit */
-    NR::Point gridorigin;
-    gdouble gridspacing[2];
-    gint gridempspacing;
+    GSList * grids;
 
     SPUnit const *doc_units;
 
@@ -64,14 +63,10 @@ struct SPNamedView : public SPObjectGroup {
     SPUnit const *objecttoleranceunit;
     gdouble objecttolerance;
 
-    bool has_abs_tolerance;
-    
     GQuark default_layer_id;
     
     double connector_spacing;
 
-    guint32 gridcolor;
-    guint32 gridempcolor;
     guint32 guidecolor;
     guint32 guidehicolor;
     guint32 bordercolor;
@@ -80,12 +75,12 @@ struct SPNamedView : public SPObjectGroup {
 
     GSList *guides;
     GSList *views;
-    GSList *gridviews;
+    
     gint viewcount;
 
     void show(SPDesktop *desktop);
     void hide(SPDesktop const *desktop);
-    void activateGuides(gpointer desktop, bool active);
+    void activateGuides(gpointer desktop, gboolean active);
     gchar const *getName() const;
     guint getViewCount();
     GSList const *getViewList() const;
@@ -102,9 +97,9 @@ SPNamedView *sp_document_namedview(SPDocument *document, gchar const *name);
 
 void sp_namedview_window_from_document(SPDesktop *desktop);
 void sp_namedview_document_from_window(SPDesktop *desktop);
+void sp_namedview_update_layers_from_document (SPDesktop *desktop);
 
 void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr);
-void sp_namedview_toggle_grid(SPDocument *doc, Inkscape::XML::Node *repr);
 
 #endif /* !INKSCAPE_SP_NAMEDVIEW_H */