X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdesktop.h;h=7653f0857bd38844c33b3b2a06230155bb6d5f73;hb=c87b166f1c3ba0af0656b0b634d1a444e6a316ff;hp=fa6602651bc1b8c8dd2b8fc4ade2a99146e7fe22;hpb=d81a973b81c26fcef48f46fc665eef88d386af07;p=inkscape.git diff --git a/src/desktop.h b/src/desktop.h index fa6602651..7653f0857 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. @@ -34,7 +34,8 @@ #include "libnr/nr-rect.h" #include "ui/view/view.h" #include "ui/view/edit-widget-interface.h" -#include "perspective3d.h" + +#include "display/rendermode.h" class NRRect; class SPCSSAttr; @@ -43,13 +44,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 { @@ -60,21 +59,26 @@ 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 { class SessionManager; } + namespace Display { + class TemporaryItemList; + class TemporaryItem; + class SnapIndicator; + } } /** @@ -93,6 +97,9 @@ struct SPDesktop : public Inkscape::UI::View::View Inkscape::LayerManager *layer_manager; Inkscape::EventLog *event_log; + Inkscape::Display::TemporaryItemList *temporary_item_list; + Inkscape::Display::SnapIndicator *snapindicator; + SPCanvasItem *acetate; SPCanvasGroup *main; SPCanvasGroup *gridgroup; @@ -100,6 +107,7 @@ struct SPDesktop : public Inkscape::UI::View::View SPCanvasItem *drawing; SPCanvasGroup *sketch; SPCanvasGroup *controls; + SPCanvasGroup *tempgroup; ///< contains temporary canvas items SPCanvasItem *table; ///< outside-of-page background SPCanvasItem *page; ///< page background SPCanvasItem *page_border; ///< page border @@ -113,19 +121,16 @@ 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; - // 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; @@ -138,52 +143,66 @@ struct SPDesktop : public Inkscape::UI::View::View { return _document_replaced_signal.connect (slot); } - - sigc::connection connectEventContextChanged (const sigc::slot & slot) + + sigc::connection connectEventContextChanged (const sigc::slot & slot) { return _event_context_changed_signal.connect (slot); } - sigc::connection connectSetStyle (const sigc::slot & slot) + sigc::connection connectSetStyle (const sigc::slot & slot) { - return _set_style_signal.connect (slot); + return _set_style_signal.connect (slot); } - sigc::connection connectQueryStyle (const sigc::slot & slot) + sigc::connection connectQueryStyle (const sigc::slot & 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 & 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 & 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(); - void setDisplayModeOutline(); + Inkscape::Display::TemporaryItem * add_temporary_canvasitem (SPCanvasItem *item, guint lifetime, bool move_to_bottom = true); + void remove_temporary_canvasitem (Inkscape::Display::TemporaryItem * tempitem); + + void _setDisplayMode(Inkscape::RenderMode mode); + void setDisplayModeNormal() { + _setDisplayMode(Inkscape::RENDERMODE_NORMAL); + } + void setDisplayModeNoFilters() { + _setDisplayMode(Inkscape::RENDERMODE_NO_FILTERS); + } + void setDisplayModeOutline() { + _setDisplayMode(Inkscape::RENDERMODE_OUTLINE); + } void displayModeToggle(); - int displayMode; - int getMode() const { return displayMode; } + Inkscape::RenderMode _display_mode; + Inkscape::RenderMode _saved_display_mode; + Inkscape::RenderMode getMode() const { return _display_mode; } + + Inkscape::UI::Widget::Dock* getDock() { return _widget->getDock(); } void set_active (bool new_active); SPObject *currentRoot() const; @@ -193,7 +212,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); @@ -206,10 +225,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); @@ -229,7 +244,7 @@ struct SPDesktop : public Inkscape::UI::View::View void zoom_drawing(); void zoom_selection(); void zoom_grab_focus(); - double current_zoom() const { return _d2w.expansion(); } + double current_zoom() const { return NR::expansion(_d2w); } void prev_zoom(); void next_zoom(); @@ -255,19 +270,24 @@ 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(); - + 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(); @@ -291,8 +311,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 +322,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 _document_replaced_signal; @@ -312,7 +333,7 @@ private: sigc::signal _deactivate_signal; sigc::signal _event_context_changed_signal; sigc::signal _tool_subselection_changed; - + sigc::connection _activate_connection; sigc::connection _deactivate_connection; sigc::connection _sel_modified_connection; @@ -321,7 +342,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(); @@ -334,7 +355,7 @@ private: static void _onSelectionModified (Inkscape::Selection *selection, guint flags, SPDesktop *dt); }; -#endif +#endif // SEEN_SP_DESKTOP_H /* Local Variables: