X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdesktop.h;h=84b8297268f83672b71f2a3c65e6c86bb1bb7fa9;hb=f2c65c84b2e5016ef16907bf15d51ded9c25411e;hp=bc80336de4eb0b9d8de05e972dd4e7cbd6f64286;hpb=a0df1b8dd5b14367c583ce2f72a2ca6bf1cde799;p=inkscape.git

diff --git a/src/desktop.h b/src/desktop.h
index bc80336de..84b829726 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -1,5 +1,5 @@
-#ifndef __SP_DESKTOP_H__
-#define __SP_DESKTOP_H__
+#ifndef SEEN_SP_DESKTOP_H
+#define SEEN_SP_DESKTOP_H
 
 /** \file
  * SPDesktop: an editable view.
@@ -42,13 +42,11 @@ typedef struct _GtkWidget GtkWidget;
 struct SPCanvas;
 struct SPCanvasItem;
 struct SPCanvasGroup;
-struct SPDesktopWidget;
 struct SPEventContext;
 struct SPItem;
 struct SPNamedView;
 struct SPObject;
 struct SPStyle;
-struct SPViewWidget;
 
 namespace Gtk
 {
@@ -59,16 +57,16 @@ typedef int sp_verb_t;
 
 
 
-namespace Inkscape { 
+namespace Inkscape {
   class Application;
   class MessageContext;
-  class Selection; 
+  class Selection;
   class ObjectHierarchy;
   class LayerManager;
   class EventLog;
-  namespace UI { 
-      namespace Dialog { 
-          class DialogManager; 
+  namespace UI {
+      namespace Dialog {
+          class DialogManager;
       }
   }
   namespace Whiteboard {
@@ -115,13 +113,13 @@ struct SPDesktop : public Inkscape::UI::View::View
     /// \todo fixme: This has to be implemented in different way */
     guint guides_active : 1;
 
-    // storage for selected dragger used by GrDrag as it's 
+    // storage for selected dragger used by GrDrag as it's
     // created and deleted by tools
     SPItem *gr_item;
     guint  gr_point_type;
     guint  gr_point_i;
-    bool   gr_fill_or_stroke;   
-    
+    bool   gr_fill_or_stroke;
+
 
     Inkscape::ObjectHierarchy *_layer_hierarchy;
     gchar * _reconstruction_old_layer_id;
@@ -134,45 +132,45 @@ struct SPDesktop : public Inkscape::UI::View::View
     {
         return _document_replaced_signal.connect (slot);
     }
-    
-    sigc::connection connectEventContextChanged (const sigc::slot<void,SPDesktop*,SPEventContext*> & slot) 
+
+    sigc::connection connectEventContextChanged (const sigc::slot<void,SPDesktop*,SPEventContext*> & slot)
     {
         return _event_context_changed_signal.connect (slot);
     }
-    sigc::connection connectSetStyle (const sigc::slot<bool, const SPCSSAttr *> & slot) 
+    sigc::connection connectSetStyle (const sigc::slot<bool, const SPCSSAttr *> & slot)
     {
-	return _set_style_signal.connect (slot);
+        return _set_style_signal.connect (slot);
     }
-    sigc::connection connectQueryStyle (const sigc::slot<int, SPStyle *, int> & slot) 
+    sigc::connection connectQueryStyle (const sigc::slot<int, SPStyle *, int> & slot)
     {
-	return _query_style_signal.connect (slot);
+        return _query_style_signal.connect (slot);
     }
      // subselection is some sort of selection which is specific to the tool, such as a handle in gradient tool, or a text selection
     sigc::connection connectToolSubselectionChanged(const sigc::slot<void, gpointer> & slot) {
-	return _tool_subselection_changed.connect(slot);
+        return _tool_subselection_changed.connect(slot);
     }
-    void emitToolSubselectionChanged(gpointer data); 
+    void emitToolSubselectionChanged(gpointer data);
     sigc::connection connectCurrentLayerChanged(const sigc::slot<void, SPObject *> & slot) {
-	return _layer_changed_signal.connect(slot);
+        return _layer_changed_signal.connect(slot);
     }
-    
-	// Whiteboard changes
+
+    // Whiteboard changes
 
 #ifdef WITH_INKBOARD
-	Inkscape::Whiteboard::SessionManager* whiteboard_session_manager() {
-	return _whiteboard_session_manager;
-	}
+    Inkscape::Whiteboard::SessionManager* whiteboard_session_manager() {
+        return _whiteboard_session_manager;
+    }
 
-	Inkscape::Whiteboard::SessionManager* _whiteboard_session_manager;
+    Inkscape::Whiteboard::SessionManager* _whiteboard_session_manager;
 #endif
-   
+
     SPDesktop();
     void init (SPNamedView* nv, SPCanvas* canvas);
-    ~SPDesktop();
+    virtual ~SPDesktop();
     void destroy();
 
     Inkscape::MessageContext *guidesMessageContext() const {
-	return _guides_message_context;
+        return _guides_message_context;
     }
 
     void setDisplayModeNormal();
@@ -191,7 +189,7 @@ struct SPDesktop : public Inkscape::UI::View::View
     bool isLayer(SPObject *object) const;
     bool isWithinViewport(SPItem *item) const;
     bool itemIsHidden(SPItem const *item) const;
-    
+
     void activate_guides (bool activate);
     void change_document (SPDocument *document);
 
@@ -253,16 +251,20 @@ struct SPDesktop : public Inkscape::UI::View::View
     bool isToolboxButtonActive (gchar const *id);
     void updateNow();
     void updateCanvasNow();
-    
+
     void enableInteraction();
     void disableInteraction();
 
     void setWaitingCursor();
     void clearWaitingCursor();
-    
-    void toggleGrid();
+
+    void toggleColorProfAdjust();
+
+    void toggleGrids();
+    void toggleSnapping();
     bool gridsEnabled() { return grids_visible; }
-    
+    void showGrids(bool show, bool dirty_document = true);
+
     bool is_iconified();
     bool is_maximized();
     bool is_fullscreen();
@@ -286,8 +288,8 @@ struct SPDesktop : public Inkscape::UI::View::View
     virtual void mouseover() {}
     virtual void mouseout() {}
 
-	virtual bool onDeleteUI (GdkEventAny*);
-	virtual bool onWindowStateEvent (GdkEventWindowState* event);
+    virtual bool onDeleteUI (GdkEventAny*);
+    virtual bool onWindowStateEvent (GdkEventWindowState* event);
 
 private:
     Inkscape::UI::View::EditWidgetInterface       *_widget;
@@ -297,9 +299,10 @@ private:
     NR::Matrix _w2d;
     NR::Matrix _d2w;
     NR::Matrix _doc2dt;
-    
-    bool grids_visible;
-    
+
+    bool grids_visible; /* don't set this variable directly, use the method below */
+    void set_grids_visible(bool visible);
+
     void push_current_zoom (GList**);
 
     sigc::signal<void,SPDesktop*,SPDocument*>     _document_replaced_signal;
@@ -307,7 +310,7 @@ private:
     sigc::signal<void>                 _deactivate_signal;
     sigc::signal<void,SPDesktop*,SPEventContext*> _event_context_changed_signal;
     sigc::signal<void, gpointer>       _tool_subselection_changed;
-  
+
     sigc::connection _activate_connection;
     sigc::connection _deactivate_connection;
     sigc::connection _sel_modified_connection;
@@ -316,7 +319,7 @@ private:
     sigc::connection _reconstruction_finish_connection;
     sigc::connection _commit_connection;
     sigc::connection _modified_connection;
-    
+
     virtual void onPositionSet (double, double);
     virtual void onResized (double, double);
     virtual void onRedrawRequested();
@@ -329,7 +332,7 @@ private:
     static void _onSelectionModified (Inkscape::Selection *selection, guint flags, SPDesktop *dt);
 };
 
-#endif
+#endif // SEEN_SP_DESKTOP_H
 
 /*
   Local Variables: