diff --git a/src/select-context.cpp b/src/select-context.cpp
index 7c966c9b9114f44adbf2a123da7d8c3de4761b80..1daf6b0e56967be6363dfba5b2c67f47feb2b4df 100644 (file)
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
#include "desktop.h"
#include "desktop-handles.h"
#include "sp-root.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "tools-switch.h"
#include "message-stack.h"
#include "selection-describer.h"
static void sp_select_context_dispose(GObject *object);
static void sp_select_context_setup(SPEventContext *ec);
-static void sp_select_context_set(SPEventContext *ec, gchar const *key, gchar const *val);
+static void sp_select_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val);
static gint sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event);
static gint sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event);
sp_event_context_read(ec, "show");
sp_event_context_read(ec, "transform");
- if (prefs_get_int_attribute("tools.select", "gradientdrag", 0) != 0) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if (prefs->getBool("/tools/select/gradientdrag")) {
ec->enableGrDrag();
}
}
static void
-sp_select_context_set(SPEventContext *ec, gchar const *key, gchar const *val)
+sp_select_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val)
{
SPSelectContext *sc = SP_SELECT_CONTEXT(ec);
+ Glib::ustring path = val->getEntryName();
- if (!strcmp(key, "show")) {
- if (val && !strcmp(val, "outline")) {
+ if (path == "show") {
+ if (val->getString() == "outline") {
sc->_seltrans->setShow(Inkscape::SelTrans::SHOW_OUTLINE);
} else {
sc->_seltrans->setShow(Inkscape::SelTrans::SHOW_CONTENT);
@@ -293,7 +295,8 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE
SPSelectContext *sc = SP_SELECT_CONTEXT(event_context);
Inkscape::SelTrans *seltrans = sc->_seltrans;
- tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
// make sure we still have valid objects to move around
if (sc->item && SP_OBJECT_DOCUMENT( SP_OBJECT(sc->item))==NULL) {
@@ -330,7 +333,7 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE
sc->item = NULL;
}
sc->item = sp_event_context_find_item (desktop,
- NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE);
+ Geom::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE);
sp_object_ref(sc->item, NULL);
rb_escaped = drag_escaped = 0;
@@ -400,10 +403,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
SPSelectContext *sc = SP_SELECT_CONTEXT(event_context);
Inkscape::SelTrans *seltrans = sc->_seltrans;
Inkscape::Selection *selection = sp_desktop_selection(desktop);
- gdouble const nudge = prefs_get_double_attribute_limited("options.nudgedistance", "value", 2, 0, 1000); // in px
- gdouble const offset = prefs_get_double_attribute_limited("options.defaultscale", "value", 2, 0, 1000);
- tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
- int const snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
+ gdouble const nudge = prefs->getDoubleLimited("/options/nudgedistance/value", 2, 0, 1000); // in px
+ gdouble const offset = prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000);
+ tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
+ int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
// make sure we still have valid objects to move around
if (sc->item && SP_OBJECT_DOCUMENT( SP_OBJECT(sc->item))==NULL) {
yp = (gint) event->button.y;
within_tolerance = true;
- NR::Point const button_pt(event->button.x, event->button.y);
- NR::Point const p(desktop->w2d(button_pt));
+ Geom::Point const button_pt(event->button.x, event->button.y);
+ Geom::Point const p(desktop->w2d(button_pt));
if (event->button.state & GDK_MOD1_MASK)
Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH);
Inkscape::Rubberband::get(desktop)->start(desktop, p);
case GDK_MOTION_NOTIFY:
if (event->motion.state & GDK_BUTTON1_MASK && !event_context->space_panning) {
- NR::Point const motion_pt(event->motion.x, event->motion.y);
- NR::Point const p(desktop->w2d(motion_pt));
+ Geom::Point const motion_pt(event->motion.x, event->motion.y);
+ Geom::Point const p(desktop->w2d(motion_pt));
if ( within_tolerance
&& ( abs( (gint) event->motion.x - xp ) < tolerance )
@@ -497,14 +502,14 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
// and also when we started within tolerance, but trespassed tolerance outside of item
Inkscape::Rubberband::get(desktop)->stop();
SP_EVENT_CONTEXT(sc)->defaultMessageContext()->clear();
- item_at_point = desktop->item_at_point(NR::Point(event->button.x, event->button.y), FALSE);
+ item_at_point = desktop->item_at_point(Geom::Point(event->button.x, event->button.y), FALSE);
if (!item_at_point) // if no item at this point, try at the click point (bug 1012200)
- item_at_point = desktop->item_at_point(NR::Point(xp, yp), FALSE);
+ item_at_point = desktop->item_at_point(Geom::Point(xp, yp), FALSE);
if (item_at_point || sc->moved || sc->button_press_alt) {
// drag only if starting from an item, or if something is already grabbed, or if alt-dragging
if (!sc->moved) {
- item_in_group = desktop->item_at_point(NR::Point(event->button.x, event->button.y), TRUE);
- group_at_point = desktop->group_at_point(NR::Point(event->button.x, event->button.y));
+ item_in_group = desktop->item_at_point(Geom::Point(event->button.x, event->button.y), TRUE);
+ group_at_point = desktop->group_at_point(Geom::Point(event->button.x, event->button.y));
// group-at-point is meant to be topmost item if it's a group,
// not topmost group of all items at point
}
if (!seltrans->isEmpty())
seltrans->moveTo(p, event->button.state);
- desktop->scroll_to_point(&p);
+ desktop->scroll_to_point(p);
gobble_motion_events(GDK_BUTTON1_MASK);
ret = TRUE;
} else {
// this was a rubberband drag
GSList *items = NULL;
if (r->getMode() == RUBBERBAND_MODE_RECT) {
- boost::optional<NR::Rect> const b = r->getRectangle();
+ Geom::OptRect const b = r->getRectangle();
items = sp_document_items_in_box(sp_desktop_document(desktop), desktop->dkey, *b);
} else if (r->getMode() == RUBBERBAND_MODE_TOUCHPATH) {
items = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
@@ -622,12 +627,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
if (sc->button_press_ctrl) {
// go into groups, honoring Alt
item = sp_event_context_find_item (desktop,
- NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, TRUE);
+ Geom::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, TRUE);
sc->button_press_ctrl = FALSE;
} else {
// don't go into groups, honoring Alt
item = sp_event_context_find_item (desktop,
- NR::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE);
+ Geom::Point(event->button.x, event->button.y), event->button.state & GDK_MOD1_MASK, FALSE);
}
if (item) {
} else if ((sc->button_press_ctrl || sc->button_press_alt) && !rb_escaped && !drag_escaped) { // ctrl+click, alt+click
item = sp_event_context_find_item (desktop,
- NR::Point(event->button.x, event->button.y), sc->button_press_alt, sc->button_press_ctrl);
+ Geom::Point(event->button.x, event->button.y), sc->button_press_alt, sc->button_press_ctrl);
sc->button_press_ctrl = FALSE;
sc->button_press_alt = FALSE;