update to trunk

(bzr r13708.1.39)

1 files changed, 75 insertions, 7 deletions

diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index 1f79b50f2..45989936f 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -57,6 +57,13 @@ static void sp_erc_width_value_changed( GtkAdjustment *adj, GObject *tbl )
     update_presets_list(tbl);
 }
 
+static void sp_erc_mass_value_changed( GtkAdjustment *adj, GObject* tbl )
+{
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setDouble( "/tools/eraser/mass", gtk_adjustment_get_value(adj) );
+    update_presets_list(tbl);
+}
+
 static void sp_erasertb_mode_changed( EgeSelectOneAction *act, GObject *tbl )
 {
     SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data( tbl, "desktop" ));
@@ -65,7 +72,18 @@ static void sp_erasertb_mode_changed( EgeSelectOneAction *act, GObject *tbl )
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         prefs->setBool( "/tools/eraser/mode", eraserMode );
     }
-
+    GtkAction *split = GTK_ACTION( g_object_get_data(tbl, "split") );
+    GtkAction *mass = GTK_ACTION( g_object_get_data(tbl, "mass") );
+    GtkAction *width = GTK_ACTION( g_object_get_data(tbl, "width") );
+    if(eraserMode == TRUE){
+        gtk_action_set_visible( split, TRUE );
+        gtk_action_set_visible( mass, TRUE );
+        gtk_action_set_visible( width, TRUE );
+    } else {
+        gtk_action_set_visible( split, FALSE );
+        gtk_action_set_visible( mass, FALSE );
+        gtk_action_set_visible( width, FALSE );
+    }
     // only take action if run by the attr_changed listener
     if (!g_object_get_data( tbl, "freeze" )) {
         // in turn, prevent listener from responding
@@ -82,11 +100,20 @@ static void sp_erasertb_mode_changed( EgeSelectOneAction *act, GObject *tbl )
     }
 }
 
+static void sp_toogle_break_apart( GtkToggleAction* act, gpointer data )
+{
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    gboolean active = gtk_toggle_action_get_active(act);
+    prefs->setBool("/tools/eraser/break_apart", active);
+}
+
 void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder)
 {
+    Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    gint eraserMode = FALSE;
     {
         GtkListStore* model = gtk_list_store_new( 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING );
-
         GtkTreeIter iter;
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
@@ -113,29 +140,70 @@ void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
         ege_select_one_action_set_icon_column( act, 2 );
         ege_select_one_action_set_tooltip_column( act, 1  );
 
-        /// @todo Convert to boolean?
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0;
+        eraserMode = prefs->getBool("/tools/eraser/mode") ? TRUE : FALSE;
         ege_select_one_action_set_active( act, eraserMode );
         g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(sp_erasertb_mode_changed), holder );
     }
 
     {
         /* Width */
-        gchar const* labels[] = {_("(hairline)"), 0, 0, 0, _("(default)"), 0, 0, 0, 0, _("(broad stroke)")};
-        gdouble values[] = {1, 3, 5, 10, 15, 20, 30, 50, 75, 100};
+        gchar const* labels[] = {_("(no width)"),_("(hairline)"), 0, 0, 0, _("(default)"), 0, 0, 0, 0, _("(broad stroke)")};
+        gdouble values[] = {0, 1, 3, 5, 10, 15, 20, 30, 50, 75, 100};
         EgeAdjustmentAction *eact = create_adjustment_action( "EraserWidthAction",
                                                               _("Pen Width"), _("Width:"),
                                                               _("The width of the eraser pen (relative to the visible canvas area)"),
                                                               "/tools/eraser/width", 15,
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-eraser",
-                                                              1, 100, 1.0, 10.0,
+                                                              0, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
                                                               sp_erc_width_value_changed, NULL /*unit tracker*/, 1, 0);
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
+        g_object_set_data( holder, "width", eact );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
     }
+    {
+        /* Mass */
+            gchar const* labels[] = {_("(no inertia)"), _("(slight smoothing, default)"), _("(noticeable lagging)"), 0, 0, _("(maximum inertia)")};
+        gdouble values[] = {0.0, 2, 10, 20, 50, 100};
+        EgeAdjustmentAction* eact = create_adjustment_action( "EraserMassAction",
+                                                              _("Eraser Mass"), _("Mass:"),
+                                                              _("Increase to make the eraser drag behind, as if slowed by inertia"),
+                                                              "/tools/eraser/mass", 10.0,
+                                                              GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
+                                                              0.0, 100, 1, 10.0,
+                                                              labels, values, G_N_ELEMENTS(labels),
+                                                              sp_erc_mass_value_changed, NULL /*unit tracker*/, 1, 0);
+        ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
+        g_object_set_data( holder, "mass", eact );
+        gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
+        gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
+    }
+    /* Overlap */
+    {
+        InkToggleAction* act = ink_toggle_action_new( "EraserBreakAppart",
+                                                      _("Break appart cutted items"),
+                                                      _("Break appart cutted itemss"),
+                                                      INKSCAPE_ICON("distribute-randomize"),
+                                                      secondarySize );
+        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/eraser/break_apart", false) );
+        g_object_set_data( holder, "split", act );
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toogle_break_apart), holder) ;
+        gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
+    }
+    GtkAction *split = GTK_ACTION( g_object_get_data(holder, "split") );
+    GtkAction *mass = GTK_ACTION( g_object_get_data(holder, "mass") );
+    GtkAction *width = GTK_ACTION( g_object_get_data(holder, "width") );
+    if(eraserMode == TRUE){
+        gtk_action_set_visible( split, TRUE );
+        gtk_action_set_visible( mass, TRUE );
+        gtk_action_set_visible( width, TRUE );
+    } else {
+        gtk_action_set_visible( split, FALSE );
+        gtk_action_set_visible( mass, FALSE );
+        gtk_action_set_visible( width, FALSE );
+    }
 
 }