Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / desktop.h

diff --git a/src/desktop.h b/src/desktop.h
index f9e7f6a17eeb1347e5e3cc50ccc18d38b476cb83..957c3b342509629fe39367dfd64d75f7723185ca 100644 (file)
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -11,6 +11,8 @@
  *   Ralf Stephan <ralf@ark.in-berlin.de>
  *   John Bintz <jcoswell@coswellproductions.org>
  *   Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
+ *   Jon A. Cruz <jon@joncruz.org>get
+ *   Abhishek Sharma
  *
  * Copyright (C) 2007 Johan Engelen
  * Copyright (C) 2006 John Bintz
@@ -38,10 +40,7 @@
 #include "display/rendermode.h"
 #include "display/snap-indicator.h"
 
-class NRRect;
 class SPCSSAttr;
-struct _GtkWidget;
-typedef struct _GtkWidget GtkWidget;
 struct SPCanvas;
 struct SPCanvasItem;
 struct SPCanvasGroup;
@@ -87,8 +86,9 @@ namespace Inkscape {
  *
  * @see \ref desktop-handles.h for desktop macros.
  */
-struct SPDesktop : public Inkscape::UI::View::View
+class SPDesktop : public Inkscape::UI::View::View
 {
+public:
     Inkscape::UI::Dialog::DialogManager *_dlg_mgr;
     SPNamedView               *namedview;
     SPCanvas                  *canvas;
@@ -143,7 +143,12 @@ struct SPDesktop : public Inkscape::UI::View::View
     sigc::signal<void, SPObject *>     _layer_changed_signal;
     sigc::signal<bool, const SPCSSAttr *>::accumulated<StopOnTrue> _set_style_signal;
     sigc::signal<int, SPStyle *, int>::accumulated<StopOnNonZero> _query_style_signal;
-    sigc::connection connectDocumentReplaced (const sigc::slot<void,SPDesktop*,Document*> & slot)
+    
+    /// Emitted when the zoom factor changes (not emitted when scrolling).
+    /// The parameter is the new zoom factor
+    sigc::signal<void, double> signal_zoom_changed;
+    
+    sigc::connection connectDocumentReplaced (const sigc::slot<void,SPDesktop*,SPDocument*> & slot)
     {
         return _document_replaced_signal.connect (slot);
     }
@@ -180,7 +185,7 @@ struct SPDesktop : public Inkscape::UI::View::View
 #endif
 
     SPDesktop();
-    void init (SPNamedView* nv, SPCanvas* canvas);
+    void init (SPNamedView* nv, SPCanvas* canvas, Inkscape::UI::View::EditWidgetInterface *widget);
     virtual ~SPDesktop();
     void destroy();
 
@@ -201,9 +206,11 @@ struct SPDesktop : public Inkscape::UI::View::View
     void setDisplayModeOutline() {
         _setDisplayMode(Inkscape::RENDERMODE_OUTLINE);
     }
+//    void setDisplayModePrintColorsPreview() {
+//        _setDisplayMode(Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW);
+//    }
     void displayModeToggle();
     Inkscape::RenderMode _display_mode;
-    Inkscape::RenderMode _saved_display_mode;
     Inkscape::RenderMode getMode() const { return _display_mode; }
 
     Inkscape::UI::Widget::Dock* getDock() { return _widget->getDock(); }
@@ -219,15 +226,15 @@ struct SPDesktop : public Inkscape::UI::View::View
     bool itemIsHidden(SPItem const *item) const;
 
     void activate_guides (bool activate);
-    void change_document (Document *document);
+    void change_document (SPDocument *document);
 
     void set_event_context (GtkType type, const gchar *config);
     void push_event_context (GtkType type, const gchar *config, unsigned int key);
 
     void set_coordinate_status (Geom::Point p);
-    SPItem *item_from_list_at_point_bottom (const GSList *list, Geom::Point const p) const;
-    SPItem *item_at_point (Geom::Point const p, bool into_groups, SPItem *upto = NULL) const;
-    SPItem *group_at_point (Geom::Point const p) const;
+    SPItem *getItemFromListAtPointBottom(const GSList *list, Geom::Point const p) const;
+    SPItem *getItemAtPoint(Geom::Point const p, bool into_groups, SPItem *upto = NULL) const;
+    SPItem *getGroupAtPoint(Geom::Point const p) const;
     Geom::Point point() const;
 
     Geom::Rect get_display_area() const;
@@ -251,8 +258,9 @@ struct SPDesktop : public Inkscape::UI::View::View
     void prev_zoom();
     void next_zoom();
     void zoom_quick(bool enable = true);
-       /** \brief  Returns whether the desktop is in quick zoom mode or not */
-       bool quick_zoomed(void) { return _quick_zoom_enabled; }
+
+    /** \brief  Returns whether the desktop is in quick zoom mode or not */
+    bool quick_zoomed(void) { return _quick_zoom_enabled; }
 
     bool scroll_to_point (Geom::Point const &s_dt, gdouble autoscrollspeed = 0);
     void scroll_world (double dx, double dy, bool is_scrolling = false);
@@ -304,9 +312,6 @@ struct SPDesktop : public Inkscape::UI::View::View
     void fullscreen();
     void focusMode(bool mode = true);
 
-    void registerEditWidget (Inkscape::UI::View::EditWidgetInterface *widget)
-    { _widget = widget; }
-
     Geom::Matrix w2d() const; //transformation from window to desktop coordinates (used for zooming)
     Geom::Point w2d(Geom::Point const &p) const;
     Geom::Point d2w(Geom::Point const &p) const;
@@ -315,7 +320,7 @@ struct SPDesktop : public Inkscape::UI::View::View
     Geom::Point doc2dt(Geom::Point const &p) const;
     Geom::Point dt2doc(Geom::Point const &p) const;
 
-    virtual void setDocument (Document* doc);
+    virtual void setDocument (SPDocument* doc);
     virtual bool shutdown();
     virtual void mouseover() {}
     virtual void mouseout() {}
@@ -323,6 +328,8 @@ struct SPDesktop : public Inkscape::UI::View::View
     virtual bool onDeleteUI (GdkEventAny*);
     virtual bool onWindowStateEvent (GdkEventWindowState* event);
 
+    void applyCurrentOrToolStyle(SPObject *obj, Glib::ustring const &tool_path, bool with_text);
+
 private:
     Inkscape::UI::View::EditWidgetInterface       *_widget;
     Inkscape::Application     *_inkscape;
@@ -337,7 +344,7 @@ private:
 
     void push_current_zoom (GList**);
 
-    sigc::signal<void,SPDesktop*,Document*>     _document_replaced_signal;
+    sigc::signal<void,SPDesktop*,SPDocument*>     _document_replaced_signal;
     sigc::signal<void>                 _activate_signal;
     sigc::signal<void>                 _deactivate_signal;
     sigc::signal<void,SPDesktop*,SPEventContext*> _event_context_changed_signal;