r11516@tres: ted | 2006-04-26 21:30:18 -0700

[inkscape.git] / src / gradient-context.cpp

diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp
index 84bed562d98cdfe777327fcb2fdc34ff7b39d5a8..aaf86d863e5d0a930c803bb6f8bbe1ce050ea5ca 100644 (file)
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
@@ -121,7 +121,7 @@ static void sp_gradient_context_setup(SPEventContext *ec)
 
     ec->enableGrDrag();
 
-    rc->_message_context = new Inkscape::MessageContext(SP_DT_MSGSTACK(ec->desktop));
+    rc->_message_context = new Inkscape::MessageContext(sp_desktop_message_stack(ec->desktop));
 }
 
 static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
@@ -129,8 +129,8 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
     static bool dragging;
 
     SPDesktop *desktop = event_context->desktop;
-    Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
- 
+    Inkscape::Selection *selection = sp_desktop_selection (desktop);
+
     SPGradientContext *rc = SP_GRADIENT_CONTEXT(event_context);
 
     event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
@@ -148,13 +148,13 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
                 SPGradientType new_type = (SPGradientType) prefs_get_int_attribute ("tools.gradient", "newgradient", SP_GRADIENT_TYPE_LINEAR);
                 guint new_fill = prefs_get_int_attribute ("tools.gradient", "newfillorstroke", 1);
 
-                SPGradient *vector = sp_gradient_vector_for_object(SP_DT_DOCUMENT(desktop), desktop,                                                                                   SP_OBJECT (item), new_fill);
+                SPGradient *vector = sp_gradient_vector_for_object(sp_desktop_document(desktop), desktop,                                                                                   SP_OBJECT (item), new_fill);
 
                 SPGradient *priv = sp_item_set_gradient(item, vector, new_type, new_fill);
                 sp_gradient_reset_to_userspace(priv, item);
             }
 
-            sp_document_done (SP_DT_DOCUMENT (desktop));
+            sp_document_done (sp_desktop_document (desktop));
 
             ret = TRUE;
         }
@@ -200,7 +200,7 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
             NR::Point const motion_w(event->motion.x,
                                      event->motion.y);
             NR::Point const motion_dt = event_context->desktop->w2d(motion_w);
-            
+
             sp_gradient_drag(*rc, motion_dt, event->motion.state, event->motion.time);
 
             ret = TRUE;
@@ -359,7 +359,7 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
                     }
                 }
                 // we did an undoable action
-                sp_document_done (SP_DT_DOCUMENT (desktop));
+                sp_document_done (sp_desktop_document (desktop));
                 ret = TRUE;
             }
             break;
@@ -399,8 +399,8 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE
 static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint state, guint32 etime)
 {
     SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
-    Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
-    SPDocument *document = SP_DT_DOCUMENT(desktop);
+    Inkscape::Selection *selection = sp_desktop_selection(desktop);
+    SPDocument *document = sp_desktop_document(desktop);
     SPEventContext *ec = SP_EVENT_CONTEXT(&rc);
 
     if (!selection->isEmpty()) {
@@ -441,17 +441,21 @@ static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint st
             ec->_grdrag->local_change = true;
             // give the grab out-of-bounds values of xp/yp because we're already dragging
             // and therefore are already out of tolerance
-            ec->_grdrag->grabKnot (SP_ITEM(selection->itemList()->data), 
-                                   type == SP_GRADIENT_TYPE_LINEAR? POINT_LG_P2 : POINT_RG_R1, 
+            ec->_grdrag->grabKnot (SP_ITEM(selection->itemList()->data),
+                                   type == SP_GRADIENT_TYPE_LINEAR? POINT_LG_P2 : POINT_RG_R1,
                                    fill_or_stroke, 99999, 99999, etime);
         }
         // We did an undoable action, but sp_document_done will be called by the knot when released
 
         // status text; we do not track coords because this branch is run once, not all the time
         // during drag
-        rc._message_context->setF(Inkscape::NORMAL_MESSAGE, _("<b>Gradient</b> for %d objects; with <b>Ctrl</b> to snap angle"), g_slist_length((GSList *) selection->itemList()));
+        int n_objects = g_slist_length((GSList *) selection->itemList());
+        rc._message_context->setF(Inkscape::NORMAL_MESSAGE,
+                                  ngettext("<b>Gradient</b> for %d object; with <b>Ctrl</b> to snap angle",
+                                           "<b>Gradient</b> for %d objects; with <b>Ctrl</b> to snap angle", n_objects),
+                                  n_objects);
     } else {
-        SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>objects</b> on which to create gradient."));
+        sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>objects</b> on which to create gradient."));
     }
 }