'End' of picker work

(bzr r14422.1.35)

5 files changed, 53 insertions, 57 deletions

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index da6cc5192..e842cf78f 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -785,11 +785,6 @@ CloneTiler::CloneTiler () :
 #endif
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
 
-            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-            if(prefs->getBool("/dialogs/clonetiler/opentrace", false)){
-                gtk_notebook_set_current_page (GTK_NOTEBOOK(nb),5);
-            }
-
             b  = gtk_check_button_new_with_label (_("Trace the drawing under the tiles/spray tool"));
             g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
             bool old = prefs->getBool(prefs_path + "dotrace");
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 0b54d3779..d9a5de377 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -173,9 +173,9 @@ SprayTool::SprayTool()
     , is_dilating(false)
     , has_dilated(false)
     , dilate_area(NULL)
-    , overlap(false)
+    , nooverlap(false)
     , picker(false)
-    , pickinversescale(false)
+    , pickinversesize(false)
     , pickfill(false)
     , pickstroke(false)
     , visible(false)
@@ -256,11 +256,11 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
-    sp_event_context_read(this, "pickinversescale");
+    sp_event_context_read(this, "pickinversesize");
     sp_event_context_read(this, "pickfill");
     sp_event_context_read(this, "pickstroke");
     sp_event_context_read(this, "visible");
-    sp_event_context_read(this, "overlap");
+    sp_event_context_read(this, "nooverlap");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/tools/spray/selcue")) {
@@ -306,16 +306,16 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
     } else if (path == "picker") {
         this->picker =  val.getBool();
-    } else if (path == "pickinversescale") {
-        this->pickinversescale =  val.getBool();
+    } else if (path == "pickinversesize") {
+        this->pickinversesize =  val.getBool();
     } else if (path == "pickfill") {
         this->pickfill =  val.getBool();
     } else if (path == "pickstroke") {
         this->pickstroke =  val.getBool();
     } else if (path == "visible") {
         this->visible =  val.getBool();
-    } else if (path == "overlap") {
-        this->overlap = val.getBool();
+    } else if (path == "nooverlap") {
+        this->nooverlap = val.getBool();
     }
 }
 
@@ -440,11 +440,11 @@ static bool fit_item(SPDesktop *desktop,
                      double &_scale,
                      double scale,
                      bool picker,
-                     bool pickinversescale,
+                     bool pickinversesize,
                      bool pickfill,
                      bool pickstroke,
                      bool visible,
-                     bool overlap,
+                     bool nooverlap,
                      double offset,
                      SPCSSAttr *css,
                      bool trace_scale)
@@ -506,7 +506,7 @@ static bool fit_item(SPDesktop *desktop,
                 (item_down->getAttribute("inkscape:spray-origin") && 
                 strcmp(item_down->getAttribute("inkscape:spray-origin"),spray_origin) == 0 ))
             {
-                if(overlap){
+                if(nooverlap){
                     if(!(offset_min < 0 && std::abs(bbox_left - bbox_left_main) > std::abs(offset_min) && 
                 std::abs(bbox_top - bbox_top_main) > std::abs(offset_min))){
                         return false;
@@ -520,7 +520,7 @@ static bool fit_item(SPDesktop *desktop,
     }
     if(picker || visible){
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        if(!overlap){
+        if(!nooverlap){
             doc->ensureUpToDate();
         }
         int    pick = prefs->getInt("/dialogs/clonetiler/pick");
@@ -625,12 +625,12 @@ static bool fit_item(SPDesktop *desktop,
             rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
             if (pick_to_size) {
                 if(!trace_scale){
-                    if(pickinversescale){
+                    if(pickinversesize) {
                         _scale = 1.0 - val;
                     } else {
                         _scale = val;
                     }
-                    if _scale == 0.0){
+                    if(_scale == 0.0) {
                         return false;
                     }
                     if(!fit_item(desktop,
@@ -642,11 +642,11 @@ static bool fit_item(SPDesktop *desktop,
                          _scale,
                          scale,
                          picker,
-                         pickinversescale,
+                         pickinversesize,
                          pickfill,
                          pickstroke,
                          visible,
-                         overlap,
+                         nooverlap,
                          offset,
                          css,
                          true)){
@@ -682,7 +682,7 @@ static bool fit_item(SPDesktop *desktop,
                 return false;
             }
         }
-        if(!overlap && (picker || visible)){
+        if(!nooverlap && (picker || visible)){
             for (std::vector<SPItem *>::const_iterator k=items_down.begin(); k!=items_down.end(); k++) {
                 SPItem *item_hidden = *k;
                 item_hidden->setHidden(false);
@@ -710,9 +710,9 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                double tilt,
                                double rotation_variation,
                                gint _distrib,
-                               bool overlap,
+                               bool nooverlap,
                                bool picker,
-                               bool pickinversescale,
+                               bool pickinversesize,
                                bool pickfill,
                                bool pickstroke,
                                bool visible,
@@ -756,8 +756,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center = item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversescale, pickfill, pickstroke, visible, overlap, offset, css, false)){
+                if(nooverlap || picker || visible){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversesize, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -863,8 +863,8 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point center=item->getCenter();
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
-                if(overlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversescale, pickfill, pickstroke, visible, overlap, offset, css, false)){
+                if(nooverlap || picker || visible){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversesize, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -942,7 +942,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->overlap, tc->picker, tc->pickinversescale, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversesize, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 89a06dee9..212948c77 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -89,9 +89,9 @@ public:
     bool has_dilated;
     Geom::Point last_push;
     SPCanvasItem *dilate_area;
-    bool overlap;
+    bool nooverlap;
     bool picker;
-    bool pickinversescale;
+    bool pickinversesize;
     bool pickfill;
     bool pickstroke;
     bool visible;
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index ce37ac9f7..c7013b6a1 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -66,14 +66,14 @@ static void sp_stb_sensitivize( GObject *tbl )
     GtkAction* spray_scale = GTK_ACTION( g_object_get_data(tbl, "spray_scale") );
     GtkAdjustment *adj_offset = ege_adjustment_action_get_adjustment( EGE_ADJUSTMENT_ACTION(offset) );
     GtkAdjustment *adj_scale = ege_adjustment_action_get_adjustment( EGE_ADJUSTMENT_ACTION(spray_scale) );
-    GtkToggleAction *overlap = GTK_TOGGLE_ACTION( g_object_get_data(tbl, "overlap") );
+    GtkToggleAction *nooverlap = GTK_TOGGLE_ACTION( g_object_get_data(tbl, "nooverlap") );
     GtkToggleAction *picker = GTK_TOGGLE_ACTION( g_object_get_data(tbl, "picker") );
     GtkToggleAction *usepressurescale = GTK_TOGGLE_ACTION( g_object_get_data(tbl, "usepressurescale") );
     GtkAction *pickfill = GTK_ACTION( g_object_get_data(tbl, "pickfill") );
     GtkAction *pickstroke = GTK_ACTION( g_object_get_data(tbl, "pickstroke") );
-    GtkAction *pickinversescale = GTK_ACTION( g_object_get_data(tbl, "pickinversescale") );
+    GtkAction *pickinversesize = GTK_ACTION( g_object_get_data(tbl, "pickinversesize") );
     gtk_adjustment_set_value( adj_offset, 100.0 );
-    if (gtk_toggle_action_get_active(overlap)) {
+    if (gtk_toggle_action_get_active(nooverlap)) {
         gtk_action_set_sensitive( offset, TRUE );
     } else {
         gtk_action_set_sensitive( offset, FALSE );
@@ -87,11 +87,11 @@ static void sp_stb_sensitivize( GObject *tbl )
     if(gtk_toggle_action_get_active(picker)){
         gtk_action_set_sensitive( pickfill, TRUE );
         gtk_action_set_sensitive( pickstroke, TRUE );
-        gtk_action_set_sensitive( pickinversescale, TRUE );
+        gtk_action_set_sensitive( pickinversesize, TRUE );
     } else {
         gtk_action_set_sensitive( pickfill, FALSE );
         gtk_action_set_sensitive( pickstroke, FALSE );
-        gtk_action_set_sensitive( pickinversescale, FALSE );
+        gtk_action_set_sensitive( pickinversesize, FALSE );
     }
 }
 
@@ -165,11 +165,11 @@ static void sp_spray_offset_value_changed( GtkAdjustment *adj, GObject * /*tbl*/
             gtk_adjustment_get_value(adj));
 }
 
-static void sp_toggle_not_overlap( GtkToggleAction* act, gpointer data)
+static void sp_toggle_nooverlap( GtkToggleAction* act, gpointer data)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
-    prefs->setBool("/tools/spray/overlap", active);
+    prefs->setBool("/tools/spray/nooverlap", active);
     GObject *tbl = G_OBJECT(data);
     sp_stb_sensitivize(tbl);
 }
@@ -210,21 +210,21 @@ static void sp_toggle_picker( GtkToggleAction* act, gpointer data )
     sp_stb_sensitivize(tbl);
 }
 
-static void sp_toggle_pickfill( GtkToggleAction* act, gpointer data )
+static void sp_toggle_pick_fill( GtkToggleAction* act, gpointer data )
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
     prefs->setBool("/tools/spray/pickfill", active);
 }
 
-static void sp_toggle_pickinversescale( GtkToggleAction* act, gpointer data )
+static void sp_toggle_pick_inverse_size( GtkToggleAction* act, gpointer data )
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
-    prefs->setBool("/tools/spray/pickinversescale", active);
+    prefs->setBool("/tools/spray/pickinversesize", active);
 }
 
-static void sp_toggle_pickstroke( GtkToggleAction* act, gpointer data )
+static void sp_toggle_pick_stroke( GtkToggleAction* act, gpointer data )
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
@@ -434,16 +434,16 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
     }
 
-    /* Inverse Scale */
+    /* Inverse Value Size */
     {
-        InkToggleAction* act = ink_toggle_action_new( "SprayOverPickInverseScaleAction",
-                                                      _("Apply inversed scale to pick"),
-                                                      _("Apply inversed scale to pick"),
+        InkToggleAction* act = ink_toggle_action_new( "SprayOverPickInverseSizeAction",
+                                                      _("Apply inversed to pick value size"),
+                                                      _("Apply inversed to pick value size"),
                                                       INKSCAPE_ICON("object-tweak-shrink"),
                                                       secondarySize );
-        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/pickinversescale", false) );
-        g_object_set_data( holder, "pickinversescale", act );
-        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_pickinversescale), holder) ;
+        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/pickinversesize", false) );
+        g_object_set_data( holder, "pickinversesize", act );
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_pick_inverse_size), holder) ;
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
     }
 
@@ -456,7 +456,7 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
                                                       secondarySize );
         gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/pickfill", false) );
         g_object_set_data( holder, "pickfill", act );
-        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_pickfill), holder) ;
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_pick_fill), holder) ;
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
     }
 
@@ -469,7 +469,7 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
                                                       secondarySize );
         gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/pickstroke", false) );
         g_object_set_data( holder, "pickstroke", act );
-        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_pickstroke), holder) ;
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_pick_stroke), holder) ;
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
     }
     
@@ -488,16 +488,16 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
 
     /* Overlap */
     {
-        InkToggleAction* act = ink_toggle_action_new( "SprayNotOverlapAction",
+        InkToggleAction* act = ink_toggle_action_new( "SprayNoOverlapAction",
                                                       _("Prevent overlapping objects"),
                                                       _("Prevent overlapping objects"),
                                                       INKSCAPE_ICON("distribute-randomize"),
                                                       secondarySize );
-        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/overlap", false) );
-        g_object_set_data( holder, "overlap", act );
+        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/nooverlap", false) );
+        g_object_set_data( holder, "nooverlap", act );
         //g_object_set_data (context_object, "holder", holder);
         //g_object_set_data (context_object, "desktop", desktop);
-        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_not_overlap), holder) ;
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_nooverlap), holder) ;
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
     }
     
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 0188beef0..6457b7c7e 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -322,11 +322,12 @@ static gchar const * ui_descr =
         "    <toolitem action='SprayMeanAction' />"
         "    <separator />"
         "    <toolitem action='SprayPickColorAction' />"
-        "    <toolitem action='SprayOverPickInverseScaleAction' />"
+        "    <toolitem action='SprayOverPickInverseSizeAction' />"
         "    <toolitem action='SprayOverPickFillAction' />"
         "    <toolitem action='SprayOverPickStrokeAction' />"
+        "    <separator />"
         "    <toolitem action='SprayOverVisibleAction' />"
-        "    <toolitem action='SprayNotOverlapAction' />"
+        "    <toolitem action='SprayNoOverlapAction' />"
         "    <toolitem action='SprayToolOffsetAction' />"
         
         "  </toolbar>"