X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Frect-context.cpp;h=93e7e8470905f4c7ace2660ad4577b3b01d60b14;hb=7b51296159813ffbc382e4decef735f222ee23f8;hp=999aa03b82d5e34a4f8b8ac17f47e5d5f7ef84a1;hpb=4110509ef384636beb9580e78775671170542d59;p=inkscape.git

diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 999aa03b8..93e7e8470 100644
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -39,7 +39,7 @@
 #include "object-edit.h"
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
-#include "prefs-utils.h"
+#include "preferences.h"
 #include "context-fns.h"
 
 //static const double goldenratio = 1.61803398874989484820; // golden ratio
@@ -49,7 +49,7 @@ static void sp_rect_context_init(SPRectContext *rect_context);
 static void sp_rect_context_dispose(GObject *object);
 
 static void sp_rect_context_setup(SPEventContext *ec);
-static void sp_rect_context_set(SPEventContext *ec, gchar const *key, gchar const *val);
+static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val);
 
 static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent *event);
 static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event);
@@ -218,31 +218,29 @@ static void sp_rect_context_setup(SPEventContext *ec)
     sp_event_context_read(ec, "rx");
     sp_event_context_read(ec, "ry");
 
-    if (prefs_get_int_attribute("tools.shapes", "selcue", 0) != 0) {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    if (prefs->getBool("/tools/shapes/selcue")) {
         ec->enableSelectionCue();
     }
 
-    if (prefs_get_int_attribute("tools.shapes", "gradientdrag", 0) != 0) {
+    if (prefs->getBool("/tools/shapes/gradientdrag")) {
         ec->enableGrDrag();
     }
 
     rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack());
 }
 
-static void sp_rect_context_set(SPEventContext *ec, gchar const *key, gchar const *val)
+static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val)
 {
     SPRectContext *rc = SP_RECT_CONTEXT(ec);
 
     /* fixme: Proper error handling for non-numeric data.  Use a locale-independent function like
      * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */
-    if ( strcmp(key, "rx") == 0 ) {
-        rc->rx = ( val
-                         ? g_ascii_strtod (val, NULL)
-                         : 0.0 );
-    } else if ( strcmp(key, "ry") == 0 ) {
-        rc->ry = ( val
-                         ? g_ascii_strtod (val, NULL)
-                         : 0.0 );
+    Glib::ustring name = val->getEntryName();
+    if ( name == "rx" ) {
+        rc->rx = val->getDoubleLimited(); // prevents NaN and +/-Inf from messing up
+    } else if ( name == "ry" ) {
+        rc->ry = val->getDoubleLimited();
     }
 }
 
@@ -279,8 +277,9 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
     Inkscape::Selection *selection = sp_desktop_selection (desktop);
 
     SPRectContext *rc = SP_RECT_CONTEXT(event_context);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
-    event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+    event_context->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
 
     gint ret = FALSE;
     switch (event->type) {
@@ -305,8 +304,8 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
             
             /* Snap center */
             SnapManager &m = desktop->namedview->snap_manager;
-            m.setup(desktop, NULL); //null, because we don't have an item yet
-            m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, button_dt);
+            m.setup(desktop);
+            m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, button_dt);
             rc->center = from_2geom(button_dt);
             
             sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
@@ -476,7 +475,7 @@ static void sp_rect_drag(SPRectContext &rc, NR::Point const pt, guint state)
         Inkscape::XML::Node *repr = xml_doc->createElement("svg:rect");
 
         /* Set style */
-        sp_desktop_apply_style_tool (desktop, repr, "tools.shapes.rect", false);
+        sp_desktop_apply_style_tool (desktop, repr, "/tools/shapes/rect", false);
 
         rc.item = (SPItem *) desktop->currentLayer()->appendChildRepr(repr);
         Inkscape::GC::release(repr);
@@ -486,22 +485,22 @@ static void sp_rect_drag(SPRectContext &rc, NR::Point const pt, guint state)
         sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5);
     }
 
-    NR::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state);
+    Geom::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state);
 
-    sp_rect_position_set(SP_RECT(rc.item), r.min()[NR::X], r.min()[NR::Y], r.dimensions()[NR::X], r.dimensions()[NR::Y]);
+    sp_rect_position_set(SP_RECT(rc.item), r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]);
     if ( rc.rx != 0.0 ) {
         sp_rect_set_rx (SP_RECT(rc.item), TRUE, rc.rx);
     }
     if ( rc.ry != 0.0 ) {
         if (rc.rx == 0.0)
-            sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, MIN(r.dimensions()[NR::X], r.dimensions()[NR::Y])/2));
+            sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2));
         else
-            sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, r.dimensions()[NR::Y]));
+            sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, r.dimensions()[Geom::Y]));
     }
 
     // status text
-    double rdimx = r.dimensions()[NR::X];
-    double rdimy = r.dimensions()[NR::Y];
+    double rdimx = r.dimensions()[Geom::X];
+    double rdimy = r.dimensions()[Geom::Y];
     GString *xs = SP_PX_TO_METRIC_STRING(rdimx, desktop->namedview->getDefaultMetric());
     GString *ys = SP_PX_TO_METRIC_STRING(rdimy, desktop->namedview->getDefaultMetric());
     if (state & GDK_CONTROL_MASK) {