End adding no overlap to spray tool

(bzr r14422.1.9)

1 files changed, 16 insertions, 15 deletions

diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index 1d45f1796..6a062bc46 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -15,10 +15,11 @@
  *   Tavmjong Bah <tavmjong@free.fr>
  *   Abhishek Sharma
  *   Kris De Gussem <Kris.DeGussem@gmail.com>
+ *   Jabiertxo Arraiza <jabier.arraiza@marker.es>
  *
  * Copyright (C) 2004 David Turner
  * Copyright (C) 2003 MenTaLguY
- * Copyright (C) 1999-2011 authors
+ * Copyright (C) 1999-2015 authors
  * Copyright (C) 2001-2002 Ximian, Inc.
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -109,11 +110,11 @@ static void sp_spray_offset_value_changed( GtkAdjustment *adj, GObject * /*tbl*/
             gtk_adjustment_get_value(adj));
 }
 
-static void sp_not_overlap( GtkAdjustment *adj, GObject * /*tbl*/ )
+static void sp_toggle_not_overlap( GtkToggleAction* act, gpointer data )
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    prefs->setDouble( "/tools/spray/overlap",
-            gtk_adjustment_get_value(adj));
+    gboolean active = gtk_toggle_action_get_active(act);
+    prefs->setBool("/tools/spray/overlap", active);
 }
 
 void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder)
@@ -279,26 +280,26 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
         g_object_set_data( holder, "spray_scale", eact );
     }
-    
-    /* dont_overlap */
+
     {
-        InkAction* act = ink_action_new( "SprayNotOverlapAction",
-                                          _("Not overlap"),
-                                          _("Not overlap"),
-                                          INKSCAPE_ICON("distribute-randomize"),
-                                          secondarySize );
-        g_signal_connect_after( G_OBJECT(act), "activate", G_CALLBACK(sp_not_overlap), 0 );
+        InkToggleAction* act = ink_toggle_action_new( "SprayNotOverlapAction",
+                                                      _("Not overlap"),
+                                                      _("Not overlap"),
+                                                      INKSCAPE_ICON("distribute-randomize"),
+                                                      secondarySize );
+        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/overlap", true) );
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_not_overlap), desktop) ;
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
     }
     
     /* Offset */
     {
         EgeAdjustmentAction *eact = create_adjustment_action( "SprayToolOffsetAction",
-                                         _("Min offset"), _("Min offset:"),
-                                         _("The min offset size"),
+                                         _("Offset"), _("Offset:"),
+                                         _("Base offset size"),
                                          "/tools/spray/offset", 0.0,
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
-                                         -9000.0, 9000.0, 1.0, 4.0,
+                                         -1000.0, 1000.0, 1.0, 4.0,
                                          0, 0, 0,
                                          sp_spray_offset_value_changed, NULL, 0 , 2);
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );