diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-05-09 08:46:15 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-05-09 08:46:15 +0000 |
| commit | 6f43db26b0b07cf96664ba2bfbeeb1d622ecd14f (patch) | |
| tree | ad088651637edf691a57860c519a751a8a26d8fb /src/widgets | |
| parent | Style rewrite: prevent crash when fill/stroke set to "currentColor". (diff) | |
| parent | Merging Jabier's spirolive+bspline branch (diff) | |
| download | inkscape-6f43db26b0b07cf96664ba2bfbeeb1d622ecd14f.tar.gz inkscape-6f43db26b0b07cf96664ba2bfbeeb1d622ecd14f.zip | |
Update to tip.
(bzr r13341.1.2)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/icon.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/mappings.xml | 1 | ||||
| -rw-r--r-- | src/widgets/pencil-toolbar.cpp | 7 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index eb16cfece..a96f47124 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -685,6 +685,7 @@ void IconImpl::setupLegacyNaming() { legacyNames["draw-star"] ="star_angled"; legacyNames["path-mode-bezier"] ="bezier_mode"; legacyNames["path-mode-spiro"] ="spiro_splines_mode"; + legacyNames["path-mode-bspline"] ="bspline_mode"; legacyNames["path-mode-polyline"] ="polylines_mode"; legacyNames["path-mode-polyline-paraxial"] ="paraxial_lines_mode"; legacyNames["draw-use-tilt"] ="guse_tilt"; diff --git a/src/widgets/mappings.xml b/src/widgets/mappings.xml index 2de3ff545..089bf76ea 100644 --- a/src/widgets/mappings.xml +++ b/src/widgets/mappings.xml @@ -197,6 +197,7 @@ <!-- bezier toolbar --> <remap id='bezier_mode' newid='path-mode-bezier'/> <remap id='spiro_splines_mode' newid='path-mode-spiro'/> + <remap id='bspline_mode' newid='path-mode-bspline'/> <remap id='polylines_mode' newid='path-mode-polyline'/> <remap id='paraxial_lines_mode' newid='path-mode-polyline-paraxial'/> diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index 682de8594..772107101 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -104,7 +104,12 @@ static void sp_add_freehand_mode_toggle(GtkActionGroup* mainActions, GObject* ho 1, _("Create Spiro path"), 2, INKSCAPE_ICON("path-mode-spiro"), -1 ); - + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("BSpline"), + 1, _("Create BSpline path"), + 2, INKSCAPE_ICON("path-mode-bspline"), + -1 ); if (!tool_is_pencil) { gtk_list_store_append( model, &iter ); gtk_list_store_set( model, &iter, |