Dinamic toolbar enlacements, now in clone mode on spray tool and in pencil toolbar

(bzr r14628)

3 files changed, 14 insertions, 6 deletions

diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 7ca09b4d1..07313874f 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -1218,9 +1218,9 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, Inkscape::XML::N
         if(to_guides) {
             gchar *cross_number;
             if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)) {
-                cross_number= g_strdup_printf(_("Crossing %lu"), idx);
+                cross_number= g_strdup_printf(_("Crossing %u"), idx);
             } else {
-                cross_number= g_strdup_printf(_("Crossing %lu"), idx + 1);
+                cross_number= g_strdup_printf(_("Crossing %u"), idx + 1);
             }
             if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true) && idx == 0) {
                 setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::deg_to_rad(90), "");
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index 94875ecc1..55127206c 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -164,6 +164,7 @@ static void freehand_simplify_lpe(InkToggleAction* itact, GObject *dataKludge) {
     gint simplify = gtk_toggle_action_get_active( GTK_TOGGLE_ACTION(itact) );
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setInt(freehand_tool_name(dataKludge) + "/simplify", simplify);
+    gtk_action_set_visible( GTK_ACTION( g_object_get_data(dataKludge, "flatten_simplify") ), simplify );
 }
 
 /**
@@ -363,7 +364,7 @@ private:
 void sp_pencil_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder)
 {
     sp_add_freehand_mode_toggle(mainActions, holder, true);
-
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     EgeAdjustmentAction* eact = 0;
 
     /* Tolerance */
@@ -420,6 +421,10 @@ void sp_pencil_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
                                           Inkscape::ICON_SIZE_SMALL_TOOLBAR );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_simplify_flatten), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
+        g_object_set_data( holder, "flatten_simplify", inky );
+        if (!prefs->getInt("/tools/freehand/pencil/simplify", 0)) {
+            gtk_action_set_visible( GTK_ACTION( g_object_get_data(holder, "flatten_simplify") ), false );
+        }
     }
 
     g_signal_connect( holder, "destroy", G_CALLBACK(purge_repr_listener), holder );
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index 4ff469257..95b4df9a2 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -102,7 +102,7 @@ static void sp_spray_init( GObject *tbl){
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int mode = prefs->getInt("/tools/spray/mode", 0);
     bool show = true;
-    if(mode == 3){
+    if(mode == 3 || mode == 2){
         show = false;
     }
     gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "no_overlap") ), show );
@@ -115,11 +115,14 @@ static void sp_spray_init( GObject *tbl){
     gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "pick_center") ), show );
     gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "picker") ), show );
     gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "offset") ), show );
-    gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "spray_rotation") ), show );
     gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "pick_fill") ), show );
     gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "pick_stroke") ), show );
     gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "pick_inverse_value") ), show );
     gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "pick_center") ), show );
+    if(mode == 2){
+        show = true;
+    }
+    gtk_action_set_visible( GTK_ACTION( g_object_get_data(tbl, "spray_rotation") ), show );
     sp_stb_update_widgets( tbl );
 }
 
@@ -362,7 +365,7 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Spray with clones"),
-                            1, _("Spray clones of the initial selection"),
+                            1, _("Spray clones of the initial selection. Unset paint on fill or strokes to apply color picker changes"),
                             2, INKSCAPE_ICON("spray-mode-clone"),
                             -1 );