LPE: implement NEW path-along-path effect, i think that old one has become obsolete...

[inkscape.git] / src / desktop.h

diff --git a/src/desktop.h b/src/desktop.h
index fa6602651bc1b8c8dd2b8fc4ade2a99146e7fe22..2a811a72383e4e1edc3367891495d70d1f77327f 100644 (file)
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -34,7 +34,6 @@
 #include "libnr/nr-rect.h"
 #include "ui/view/view.h"
 #include "ui/view/edit-widget-interface.h"
-#include "perspective3d.h"
 
 class NRRect;
 class SPCSSAttr;
@@ -113,9 +112,6 @@ struct SPDesktop : public Inkscape::UI::View::View
     unsigned int interaction_disabled_counter;
     bool waiting_cursor;
 
-    // All 3D perspectives that are present in the current desktop
-    GSList *perspectives;
-
     /// \todo fixme: This has to be implemented in different way */
     guint guides_active : 1;
 
@@ -185,6 +181,8 @@ struct SPDesktop : public Inkscape::UI::View::View
     int displayMode;
     int getMode() const { return displayMode; }
 
+    Inkscape::UI::Widget::Dock* getDock() { return _widget->getDock(); }
+
     void set_active (bool new_active);
     SPObject *currentRoot() const;
     SPObject *currentLayer() const;
@@ -206,10 +204,6 @@ struct SPDesktop : public Inkscape::UI::View::View
     SPItem *group_at_point (NR::Point const p) const;
     NR::Point point() const;
 
-    // Methods to handle 3D perspective
-    void add_perspective (Box3D::Perspective3D * const persp);
-    void remove_perspective (Box3D::Perspective3D * const persp);
-
     NR::Rect get_display_area() const;
     void set_display_area (double x0, double y0, double x1, double y1, double border, bool log = true);
     void set_display_area(NR::Rect const &a, NR::Coord border, bool log = true);
@@ -255,6 +249,7 @@ struct SPDesktop : public Inkscape::UI::View::View
     void destroyWidget();
     void setToolboxFocusTo (gchar const* label);
     void setToolboxAdjustmentValue (gchar const* id, double val);
+    void setToolboxSelectOneValue (gchar const* id, gint val);
     bool isToolboxButtonActive (gchar const *id);
     void updateNow();
     void updateCanvasNow();
@@ -265,9 +260,10 @@ struct SPDesktop : public Inkscape::UI::View::View
     void setWaitingCursor();
     void clearWaitingCursor();
     
-    void toggleGrid();
+    void toggleGrids();
     bool gridsEnabled() { return grids_visible; }
-    
+    void showGrids(bool show);
+
     bool is_iconified();
     bool is_maximized();
     bool is_fullscreen();
@@ -291,8 +287,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;
@@ -302,9 +298,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;
@@ -312,7 +309,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;
@@ -321,7 +318,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();