![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop.h b/src/desktop.h
index 7653f0857bd38844c33b3b2a06230155bb6d5f73..957c3b342509629fe39367dfd64d75f7723185ca 100644 (file)
--- a/src/desktop.h
+++ b/src/desktop.h
* 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
#include <gtk/gtktypeutils.h>
#include <sigc++/sigc++.h>
-#include "libnr/nr-matrix.h"
-#include "libnr/nr-matrix-fns.h"
-#include "libnr/nr-rect.h"
+#include <2geom/matrix.h>
+#include <2geom/rect.h>
+
#include "ui/view/view.h"
#include "ui/view/edit-widget-interface.h"
#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;
namespace Display {
class TemporaryItemList;
class TemporaryItem;
- class SnapIndicator;
+ //class SnapIndicator;
}
}
*
* @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;
SPCanvasItem *page; ///< page background
SPCanvasItem *page_border; ///< page border
SPCSSAttr *current; ///< current style
+ bool _focusMode; ///< Whether we're focused working or general working
GList *zooms_past;
GList *zooms_future;
+ bool _quick_zoom_enabled; ///< Signifies that currently we're in quick zoom mode
+ Geom::Rect _quick_zoom_stored_area; ///< The area of the screen before quick zoom
unsigned int dkey;
unsigned int number;
guint window_state;
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;
+
+ /// 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);
#endif
SPDesktop();
- void init (SPNamedView* nv, SPCanvas* canvas);
+ void init (SPNamedView* nv, SPCanvas* canvas, Inkscape::UI::View::EditWidgetInterface *widget);
virtual ~SPDesktop();
void destroy();
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(); }
SPObject *currentRoot() const;
SPObject *currentLayer() const;
void setCurrentLayer(SPObject *object);
+ void toggleLayerSolo(SPObject *object);
SPObject *layerForObject(SPObject *object);
bool isLayer(SPObject *object) const;
bool isWithinViewport(SPItem *item) const;
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 (NR::Point p);
- SPItem *item_from_list_at_point_bottom (const GSList *list, NR::Point const p) const;
- SPItem *item_at_point (NR::Point const p, bool into_groups, SPItem *upto = NULL) const;
- SPItem *group_at_point (NR::Point const p) const;
- NR::Point point() const;
+ void set_coordinate_status (Geom::Point p);
+ 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;
- NR::Rect get_display_area() const;
+ Geom::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);
+ void set_display_area(Geom::Rect const &a, Geom::Coord border, bool log = true);
void zoom_absolute (double cx, double cy, double zoom);
void zoom_relative (double cx, double cy, double zoom);
void zoom_absolute_keep_point (double cx, double cy, double px, double py, double zoom);
void zoom_relative_keep_point (double cx, double cy, double zoom);
- void zoom_relative_keep_point (NR::Point const &c, double const zoom)
+ void zoom_relative_keep_point (Geom::Point const &c, double const zoom)
{
- using NR::X;
- using NR::Y;
- zoom_relative_keep_point (c[X], c[Y], zoom);
+ zoom_relative_keep_point (c[Geom::X], c[Geom::Y], zoom);
}
void zoom_page();
void zoom_drawing();
void zoom_selection();
void zoom_grab_focus();
- double current_zoom() const { return NR::expansion(_d2w); }
+ double current_zoom() const { return _d2w.descrim(); }
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; }
- bool scroll_to_point (NR::Point const *s_dt, gdouble autoscrollspeed = 0);
+ bool scroll_to_point (Geom::Point const &s_dt, gdouble autoscrollspeed = 0);
void scroll_world (double dx, double dy, bool is_scrolling = false);
- void scroll_world (NR::Point const scroll, bool is_scrolling = false)
+ void scroll_world (Geom::Point const scroll, bool is_scrolling = false)
{
- using NR::X;
- using NR::Y;
- scroll_world(scroll[X], scroll[Y], is_scrolling);
+ scroll_world(scroll[Geom::X], scroll[Geom::Y], is_scrolling);
}
+ void scroll_world_in_svg_coords (double dx, double dy, bool is_scrolling = false);
void getWindowGeometry (gint &x, gint &y, gint &w, gint &h);
- void setWindowPosition (NR::Point p);
+ void setWindowPosition (Geom::Point p);
void setWindowSize (gint w, gint h);
void setWindowTransient (void* p, int transient_policy=1);
Gtk::Window* getToplevel();
void setWaitingCursor();
void clearWaitingCursor();
+ bool isWaitingCursor() const { return waiting_cursor; };
void toggleColorProfAdjust();
void toggleGrids();
- void toggleSnapping();
- bool gridsEnabled() { return grids_visible; }
+ void toggleSnapGlobal();
+ bool gridsEnabled() const { return grids_visible; };
void showGrids(bool show, bool dirty_document = true);
bool is_iconified();
bool is_maximized();
bool is_fullscreen();
+ bool is_focusMode();
void iconify();
void maximize();
void fullscreen();
+ void focusMode(bool mode = true);
- void registerEditWidget (Inkscape::UI::View::EditWidgetInterface *widget)
- { _widget = widget; }
-
- NR::Matrix w2d() const; //transformation from window to desktop coordinates (used for zooming)
- NR::Point w2d(NR::Point const &p) const;
- NR::Point d2w(NR::Point const &p) const;
- NR::Matrix doc2dt() const;
- NR::Point doc2dt(NR::Point const &p) const;
- NR::Point dt2doc(NR::Point const &p) const;
+ 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;
+ Geom::Matrix doc2dt() const;
+ Geom::Matrix dt2doc() const;
+ Geom::Point doc2dt(Geom::Point const &p) const;
+ Geom::Point dt2doc(Geom::Point const &p) const;
virtual void setDocument (SPDocument* doc);
virtual bool shutdown();
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;
Inkscape::MessageContext *_guides_message_context;
bool _active;
- NR::Matrix _w2d;
- NR::Matrix _d2w;
- NR::Matrix _doc2dt;
+ Geom::Matrix _w2d;
+ Geom::Matrix _d2w;
+ Geom::Matrix _doc2dt;
bool grids_visible; /* don't set this variable directly, use the method below */
void set_grids_visible(bool visible);