X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-namedview.h;h=cfc57d1c4cab6688481796e6f86932f6312622b3;hb=6259f7850956b7fcacd79f7c6e7c561891cb6f97;hp=619bf02ccb062c95f237f32901938bdadca8995c;hpb=897161421d6290362c35cd776bde8fc3668b66e0;p=inkscape.git

diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index 619bf02cc..cfc57d1c4 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -25,6 +25,10 @@
 #include "sp-metric.h"
 #include "snap.h"
 
+namespace Inkscape {
+class CanvasGrid;
+}
+
 enum {
     SP_BORDER_LAYER_BOTTOM,
     SP_BORDER_LAYER_TOP
@@ -32,8 +36,6 @@ enum {
 
 struct SPNamedView : public SPObjectGroup {
     unsigned int editable : 1;
-    unsigned int showgrid : 1;
-    unsigned int gridtype : 1; // 0=normal 1=axonometric
     unsigned int showguides : 1;
     unsigned int showborder : 1;
     unsigned int showpageshadow : 1;
@@ -48,14 +50,9 @@ struct SPNamedView : public SPObjectGroup {
     gint window_y;
 
     SnapManager snap_manager;
-    //GridManager grid_manager;
-
-    SPUnit const *gridunit;
-    /* Grid data is in points regardless of unit */
-    NR::Point gridorigin;
-    gdouble gridspacing[2];
-    gdouble gridangle[2];   // for axonometric grid
-    gint gridempspacing;
+    GSList * grids;
+    bool grids_visible;
+    bool snapindicator;
 
     SPUnit const *doc_units;
 
@@ -68,14 +65,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;
@@ -84,8 +77,7 @@ struct SPNamedView : public SPObjectGroup {
 
     GSList *guides;
     GSList *views;
-    GSList *gridviews;
-    
+
     gint viewcount;
 
     void show(SPDesktop *desktop);
@@ -95,6 +87,9 @@ struct SPNamedView : public SPObjectGroup {
     guint getViewCount();
     GSList const *getViewList() const;
     SPMetric getDefaultMetric() const;
+
+    void translateGuides(NR::translate const &translation);
+    void scrollAllDesktops(double dx, double dy, bool is_scrolling);
 };
 
 struct SPNamedViewClass {
@@ -110,8 +105,8 @@ 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);
-void sp_namedview_set_gridtype(unsigned int type, SPDocument *doc, Inkscape::XML::Node *repr);
+void sp_namedview_show_grids(SPNamedView *namedview, bool show, bool dirty_document);
+Inkscape::CanvasGrid * sp_namedview_get_first_enabled_grid(SPNamedView *namedview);
 
 #endif /* !INKSCAPE_SP_NAMEDVIEW_H */