New 'spiro spline mode' in pen/pencil tool which automatically adds the spiro spline...

diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index 0130f2378a6b2f5409dae49dcfe073860bba623d..6e919d81d1a7f186aceca886dabd2c994b95b142 100644 (file)
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
@@ -249,8 +249,17 @@ sp_draw_context_root_handler(SPEventContext *ec, GdkEvent *event)
 void
 spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item)
 {
-    if (item && dc->waiting_LPE != Inkscape::LivePathEffect::INVALID_LPE) {
-        Inkscape::LivePathEffect::Effect::createAndApply(dc->waiting_LPE, dc->desktop->doc(), item);
+    using namespace Inkscape::LivePathEffect;
+
+    // TODO: sort this out as soon as we use automatic LPE application for other things than spiro mode, too
+    if (item) {
+        if (prefs_get_int_attribute("tools.freehand", "spiro-spline-mode", 0)) {
+            Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
+            return;
+        }
+        if (dc->waiting_LPE != INVALID_LPE) {
+            Effect::createAndApply(dc->waiting_LPE, dc->desktop->doc(), item);
+        }
     }
 }
 

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index e01d1687582cea886ee7817dc12619100b82a4a8..a72ae49fdcfeab282e1a966acd0c980f848a7fc1 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -54,6 +54,7 @@
 #include <glibmm/i18n.h>
 #include "helper/unit-menu.h"
 #include "helper/units.h"
+#include "live_effects/effect.h"
 
 #include "inkscape.h"
 #include "conn-avoid-ref.h"
@@ -64,6 +65,7 @@
 
 #include "connector-context.h"
 #include "node-context.h"
+#include "draw-context.h"
 #include "shape-editor.h"
 #include "tweak-context.h"
 #include "sp-rect.h"
@@ -360,9 +362,11 @@ static gchar const * ui_descr =
         "  </toolbar>"
 
         "  <toolbar name='PenToolbar'>"
+        "    <toolitem action='SpiroSplineModeActionPen' />"
         "  </toolbar>"
 
         "  <toolbar name='PencilToolbar'>"
+        "    <toolitem action='SpiroSplineModeActionPencil' />"
         "  </toolbar>"
 
         "  <toolbar name='CalligraphyToolbar'>"
@@ -3078,15 +3082,35 @@ static void sp_spiral_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActio
 //##     Pen/Pencil    ##
 //########################
 
+static void sp_pc_spiro_spline_mode_changed(GtkToggleAction *act, GObject* /*tbl*/)
+{
+    prefs_set_int_attribute("tools.freehand", "spiro-spline-mode", gtk_toggle_action_get_active(act) ? 1 : 0);
+}
 
-static void sp_pen_toolbox_prep(SPDesktop */*desktop*/, GtkActionGroup* /*mainActions*/, GObject* /*holder*/)
+static void sp_add_spiro_toggle(GtkActionGroup* mainActions, GObject* holder, const char* action_name)
 {
-    // Put stuff here
+    /* Spiro Spline Mode toggle button */
+    {
+        InkToggleAction* act = ink_toggle_action_new(action_name,
+                                                     _("Spiro Spline Mode"),
+                                                     _("Automatically apply the 'Spiro Spline' live path effect to newly drawn paths"),
+                                                     "spiro_splines_mode",
+                                                     Inkscape::ICON_SIZE_DECORATION );
+        gtk_action_group_add_action(mainActions, GTK_ACTION(act));
+        g_signal_connect_after(G_OBJECT(act), "toggled", G_CALLBACK(sp_pc_spiro_spline_mode_changed), holder);
+        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act), prefs_get_int_attribute("tools.freehand", "spiro-spline-mode", 0));
+        g_object_set_data( holder, "spiro_spline_mode", act );
+    }
 }
 
-static void sp_pencil_toolbox_prep(SPDesktop */*desktop*/, GtkActionGroup* /*mainActions*/, GObject* /*holder*/)
+static void sp_pen_toolbox_prep(SPDesktop */*desktop*/, GtkActionGroup* mainActions, GObject* holder)
 {
-    // Put stuff here
+    sp_add_spiro_toggle(mainActions, holder, "SpiroSplineModeActionPen");
+}
+
+static void sp_pencil_toolbox_prep(SPDesktop */*desktop*/, GtkActionGroup* mainActions, GObject* holder)
+{
+    sp_add_spiro_toggle(mainActions, holder, "SpiroSplineModeActionPencil");
 }
 
 //########################
@@ -3783,7 +3807,7 @@ static void sp_calligraphy_toolbox_prep(SPDesktop *desktop, GtkActionGroup* main
             gtk_action_set_sensitive( act, TRUE );
             g_object_set_data( holder, "profile_save_delete", act );
         }
-    }    
+    }
 }