diff --git a/src/desktop.h b/src/desktop.h
index 8e31e2e7dab590b85a3de3b47b9bf0c8525f0463..1770af9f5d7b45aa84d27f4629e037fdc01d01e8 100644 (file)
--- a/src/desktop.h
+++ b/src/desktop.h
* Frank Felfe <innerspace@iname.com>
* bulia byak <buliabyak@users.sf.net>
* Ralf Stephan <ralf@ark.in-berlin.de>
+ * John Bintz <jcoswell@coswellproductions.org>
+ * Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
*
+ * Copyright (C) 2007 Johan Engelen
+ * Copyright (C) 2006 John Bintz
* Copyright (C) 1999-2005 authors
* Copyright (C) 2000-2001 Ximian, Inc.
*
class Selection;
class ObjectHierarchy;
class LayerManager;
+ class EventLog;
namespace UI {
namespace Dialog {
class DialogManager;
Inkscape::Selection *selection;
SPEventContext *event_context;
Inkscape::LayerManager *layer_manager;
+ Inkscape::EventLog *event_log;
SPCanvasItem *acetate;
SPCanvasGroup *main;
unsigned int dkey;
unsigned int number;
bool is_fullscreen;
+ unsigned int interaction_disabled_counter;
+ bool waiting_cursor;
/// \todo fixme: This has to be implemented in different way */
guint guides_active : 1;
// storage for selected dragger used by GrDrag as it's
// created and deleted by tools
SPItem *gr_item;
- guint gr_point_num;
+ guint gr_point_type;
+ guint gr_point_i;
bool gr_fill_or_stroke;
+
Inkscape::ObjectHierarchy *_layer_hierarchy;
gchar * _reconstruction_old_layer_id;
void setDisplayModeNormal();
void setDisplayModeOutline();
+ void displayModeToggle();
+ int displayMode;
+ int getMode() const { return displayMode; }
void set_active (bool new_active);
SPObject *currentRoot() const;
void next_zoom();
bool scroll_to_point (NR::Point const *s_dt, gdouble autoscrollspeed = 0);
- void scroll_world (double dx, double dy);
- void scroll_world (NR::Point const scroll)
+ void scroll_world (double dx, double dy, bool is_scrolling = false);
+ void scroll_world (NR::Point const scroll, bool is_scrolling = false)
{
using NR::X;
- using NR::Y;
- scroll_world(scroll[X], scroll[Y]);
+ using NR::Y;
+ scroll_world(scroll[X], scroll[Y], is_scrolling);
}
void getWindowGeometry (gint &x, gint &y, gint &w, gint &h);
void setToolboxAdjustmentValue (gchar const* id, double val);
bool isToolboxButtonActive (gchar const *id);
void updateNow();
+ void updateCanvasNow();
+
+ void enableInteraction();
+ void disableInteraction();
+
+ void setWaitingCursor();
+ void clearWaitingCursor();
+
+ void toggleGrid();
void fullscreen();
sigc::connection _reconstruction_start_connection;
sigc::connection _reconstruction_finish_connection;
sigc::connection _commit_connection;
+ sigc::connection _modified_connection;
virtual void onPositionSet (double, double);
virtual void onResized (double, double);