Use color if trace dialog is disabled

(bzr r14422.1.43)

3 files changed, 16 insertions, 6 deletions

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index e842cf78f..1ea80e9f7 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -3017,7 +3017,7 @@ void CloneTiler::clonetiler_do_pick_toggled(GtkToggleButton *tb, GtkWidget *dlg)
 void CloneTiler::show_page_trace()
 {
     gtk_notebook_set_current_page(GTK_NOTEBOOK(nb),6);
-    gtk_toggle_button_set_active ((GtkToggleButton *) b, true);
+    gtk_toggle_button_set_active ((GtkToggleButton *) b, false);
 }
 
 
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 03a225b6e..a57d1db5e 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -538,6 +538,7 @@ static bool fit_item(SPDesktop *desktop,
         if(!nooverlap){
             doc->ensureUpToDate();
         }
+        bool   trace = prefs->getBool("/dialogs/clonetiler/dotrace");
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
         bool   pick_to_presence = prefs->getBool("/dialogs/clonetiler/pick_to_presence", false);
         bool   pick_to_color = prefs->getBool("/dialogs/clonetiler/pick_to_color");
@@ -561,7 +562,7 @@ static bool fit_item(SPDesktop *desktop,
             return false;
         }
 
-        if(picker){
+        if(picker && trace){
             float hsl[3];
             sp_color_rgb_to_hsl_floatv (hsl, r, g, b);
 
@@ -675,7 +676,7 @@ static bool fit_item(SPDesktop *desktop,
             if (pick_to_presence) {
                 if (g_random_double_range (0, 1) > val) {
                     //Hidding the element is a way to retain original
-                    //beabiohur of tiled clones for presence option.
+                    //behabiohur of tiled clones for presence option.
                     sp_repr_css_set_property(css, "opacity", "0");
                 }
             }
@@ -692,6 +693,15 @@ static bool fit_item(SPDesktop *desktop,
                 return false;
             }
         }
+        if(!trace){
+            sp_svg_write_color(color_string, sizeof(color_string), rgba);
+            if(pickfill){
+                sp_repr_css_set_property(css, "fill", color_string);
+            }
+            if(pickstroke){
+                sp_repr_css_set_property(css, "stroke", color_string);
+            }
+        }
         if(!nooverlap && (picker || visible)){
             for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
                 SPItem *item_hidden = *k;
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index fa9722bdb..cfd3c6332 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -424,8 +424,8 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
     /* Picker */
     {
         InkToggleAction* act = ink_toggle_action_new( "SprayPickColorAction",
-                                                      _("Pick down. Fill or Stroke must be unset on original when spraying color to clones"),
-                                                      _("Pick down. Fill or Stroke must be unset on original when spraying color to clones"),
+                                                      _("Pick down. You can use trace clones dialog for avanced effects. In clone mode original fill or stroke colors must be unset"),
+                                                      _("Pick down. You can use trace clones dialog for avanced effects. In clone mode original fill or stroke colors must be unset"),
                                                       INKSCAPE_ICON("color-picker"),
                                                       secondarySize );
         gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/picker", false) );
@@ -504,7 +504,7 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
     /* Offset */
     {
         EgeAdjustmentAction *eact = create_adjustment_action( "SprayToolOffsetAction",
-                                         _("Offset precent"), _("Offset percent:"),
+                                         _("Offset %"), _("Offset %:"),
                                          _("Increase to segregate objects more (value in percent)"),
                                          "/tools/spray/offset", 100,
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,