From f074a3adc5285038eaa439df510385895f2c63b5 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 12 Oct 2019 08:46:15 +0000 Subject: [PATCH 01/15] Add a icon to show infgo popup on default parameter LPE widgets --- src/live_effects/effect.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 647394fb4b..3dd0c45a91 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -1561,12 +1561,14 @@ Effect::defaultParamSet() ove = Glib::ustring(_("Default value overridden: None\n")); } Gtk::HBox * vbox_param = Gtk::manage( new Gtk::HBox(true) ); + Gtk::Image *info = sp_get_icon_image(Glib::ustring("infopop"), 30); + Glib::ustring tooltip = Glib::ustring("") + parameter_label->get_text () + Glib::ustring("\n") + param->param_tooltip + Glib::ustring("\n\n"); + info->set_tooltip_markup((tooltip + def + ove).c_str()); + vbox_param->pack_start(*info, true, true, 2); Gtk::Label *parameter_label = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_START)); parameter_label->set_use_markup(true); parameter_label->set_use_underline(true); - Glib::ustring tooltip = Glib::ustring("") + parameter_label->get_text () + Glib::ustring("\n") + param->param_tooltip + Glib::ustring("\n\n"); parameter_label->set_ellipsize(Pango::ELLIPSIZE_END); - parameter_label->set_tooltip_markup((tooltip + def + ove).c_str()); vbox_param->pack_start(*parameter_label, true, true, 2); Gtk::Button *set = Gtk::manage(new Gtk::Button((Glib::ustring)set_or_upd)); Gtk::Button *unset = Gtk::manage(new Gtk::Button(Glib::ustring(_("Unset")))); -- GitLab From cd002c9a6cbe7c0d92c29afa24a3b11cf3bcfcc6 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 12 Oct 2019 08:51:55 +0000 Subject: [PATCH 02/15] Fix compiling issue --- src/live_effects/effect.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 3dd0c45a91..b8192aec0e 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -75,6 +75,7 @@ #include "xml/sp-css-attr.h" #include "message-stack.h" +#include "ui/icon-loader.h" #include "ui/tools/pen-tool.h" #include "ui/tools/node-tool.h" #include "ui/tools-switch.h" -- GitLab From c830e0492ca2c68d476646c12b4ad4334a883461 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 12 Oct 2019 09:08:28 +0000 Subject: [PATCH 03/15] Fix compiling issue --- src/live_effects/effect.cpp | 20 ++++++++++---------- src/live_effects/effect.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index b8192aec0e..de5f481a49 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -1562,20 +1562,20 @@ Effect::defaultParamSet() ove = Glib::ustring(_("Default value overridden: None\n")); } Gtk::HBox * vbox_param = Gtk::manage( new Gtk::HBox(true) ); - Gtk::Image *info = sp_get_icon_image(Glib::ustring("infopop"), 30); - Glib::ustring tooltip = Glib::ustring("") + parameter_label->get_text () + Glib::ustring("\n") + param->param_tooltip + Glib::ustring("\n\n"); - info->set_tooltip_markup((tooltip + def + ove).c_str()); - vbox_param->pack_start(*info, true, true, 2); Gtk::Label *parameter_label = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_START)); parameter_label->set_use_markup(true); parameter_label->set_use_underline(true); parameter_label->set_ellipsize(Pango::ELLIPSIZE_END); + Glib::ustring tooltip = Glib::ustring("") + parameter_label->get_text () + Glib::ustring("\n") + param->param_tooltip + Glib::ustring("\n\n"); + Gtk::Image *info = sp_get_icon_image(Glib::ustring("infopop"), 30); + info->set_tooltip_markup((tooltip + def + ove).c_str()); + vbox_param->pack_start(*info, true, true, 2); vbox_param->pack_start(*parameter_label, true, true, 2); Gtk::Button *set = Gtk::manage(new Gtk::Button((Glib::ustring)set_or_upd)); Gtk::Button *unset = Gtk::manage(new Gtk::Button(Glib::ustring(_("Unset")))); - unset->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, tooltip, param, parameter_label, set, unset)); + unset->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, tooltip, param, info, set, unset)); - set->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::setDefaultParam), pref_path, tooltip, param, parameter_label, set, unset)); + set->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::setDefaultParam), pref_path, tooltip, param, info, set, unset)); if (!valid) { unset->set_sensitive(false); } @@ -1609,7 +1609,7 @@ Effect::onDefaultsExpanderChanged(Gtk::Expander * expander) } void -Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Label *parameter_label, Gtk::Button *set , Gtk::Button *unset) +Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, Gtk::Button *set , Gtk::Button *unset) { Glib::ustring value = param->param_getSVGValue(); Glib::ustring defvalue = param->param_getDefaultSVGValue(); @@ -1620,11 +1620,11 @@ Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Paramete unset->set_sensitive(true); Glib::ustring def = Glib::ustring(_("Default value: ")) + defvalue + Glib::ustring("\n"); Glib::ustring ove = Glib::ustring(_("Default value overridden: ")) + value + Glib::ustring("\n"); - parameter_label->set_tooltip_markup((tooltip + def + ove).c_str()); + info->set_tooltip_markup((tooltip + def + ove).c_str()); } void -Effect::unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Label *parameter_label, Gtk::Button *set, Gtk::Button *unset) +Effect::unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, Gtk::Button *set, Gtk::Button *unset) { Glib::ustring value = param->param_getSVGValue(); Glib::ustring defvalue = param->param_getDefaultSVGValue(); @@ -1635,7 +1635,7 @@ Effect::unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parame unset->set_sensitive(false); Glib::ustring def = Glib::ustring(_("Default value: ")) + defvalue + Glib::ustring("\n"); Glib::ustring ove = Glib::ustring(_("Default value overridden: None\n")); - parameter_label->set_tooltip_markup((tooltip + def + ove).c_str()); + infor->set_tooltip_markup((tooltip + def + ove).c_str()); } Inkscape::XML::Node *Effect::getRepr() diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index de237b8bbf..80eaaa1e37 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -185,8 +185,8 @@ public: private: void onDefaultsExpanderChanged(Gtk::Expander * expander); - void setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Label *parameter_label, Gtk::Button *set , Gtk::Button *unset); - void unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Label *parameter_label, Gtk::Button *set , Gtk::Button *unset); + void setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, Gtk::Button *set , Gtk::Button *unset); + void unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, Gtk::Button *set , Gtk::Button *unset); bool provides_own_flash_paths; // if true, the standard flash path is suppressed bool is_ready; -- GitLab From 4c3d947bc18b8620a2d9b44e167f38352f861ff7 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 12 Oct 2019 09:17:11 +0000 Subject: [PATCH 04/15] Fix a compiling issue --- src/live_effects/effect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index de5f481a49..b7800b70f9 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -1635,7 +1635,7 @@ Effect::unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parame unset->set_sensitive(false); Glib::ustring def = Glib::ustring(_("Default value: ")) + defvalue + Glib::ustring("\n"); Glib::ustring ove = Glib::ustring(_("Default value overridden: None\n")); - infor->set_tooltip_markup((tooltip + def + ove).c_str()); + info->set_tooltip_markup((tooltip + def + ove).c_str()); } Inkscape::XML::Node *Effect::getRepr() -- GitLab From 7040fc622c388e94191b9ac4608bcc26b7f3bd61 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Sat, 12 Oct 2019 11:22:04 +0200 Subject: [PATCH 05/15] Add tooltip on a image for easieast discoverability --- src/live_effects/effect.cpp | 29 +++++++++++++++++------------ src/live_effects/effect.h | 6 ++++-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index b7800b70f9..13dce34e11 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -74,14 +74,14 @@ #include "xml/node-event-vector.h" #include "xml/sp-css-attr.h" +#include "display/curve.h" +#include "knotholder.h" #include "message-stack.h" +#include "path-chemistry.h" #include "ui/icon-loader.h" -#include "ui/tools/pen-tool.h" -#include "ui/tools/node-tool.h" #include "ui/tools-switch.h" -#include "knotholder.h" -#include "path-chemistry.h" -#include "display/curve.h" +#include "ui/tools/node-tool.h" +#include "ui/tools/pen-tool.h" #include "object/sp-defs.h" #include "object/sp-shape.h" @@ -1566,16 +1566,21 @@ Effect::defaultParamSet() parameter_label->set_use_markup(true); parameter_label->set_use_underline(true); parameter_label->set_ellipsize(Pango::ELLIPSIZE_END); - Glib::ustring tooltip = Glib::ustring("") + parameter_label->get_text () + Glib::ustring("\n") + param->param_tooltip + Glib::ustring("\n\n"); + Glib::ustring tooltip = Glib::ustring("") + parameter_label->get_text() + Glib::ustring("\n") + + param->param_tooltip + Glib::ustring("\n\n"); Gtk::Image *info = sp_get_icon_image(Glib::ustring("infopop"), 30); info->set_tooltip_markup((tooltip + def + ove).c_str()); vbox_param->pack_start(*info, true, true, 2); vbox_param->pack_start(*parameter_label, true, true, 2); Gtk::Button *set = Gtk::manage(new Gtk::Button((Glib::ustring)set_or_upd)); Gtk::Button *unset = Gtk::manage(new Gtk::Button(Glib::ustring(_("Unset")))); - unset->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, tooltip, param, info, set, unset)); + unset->signal_clicked().connect( + sigc::bind( + sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, tooltip, param, info, set, unset)); - set->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::setDefaultParam), pref_path, tooltip, param, info, set, unset)); + set->signal_clicked().connect( + sigc::bind( + sigc::mem_fun(*this, &Effect::setDefaultParam), pref_path, tooltip, param, info, set, unset)); if (!valid) { unset->set_sensitive(false); } @@ -1608,8 +1613,8 @@ Effect::onDefaultsExpanderChanged(Gtk::Expander * expander) defaultsopen = expander->get_expanded(); } -void -Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, Gtk::Button *set , Gtk::Button *unset) +void Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, + Gtk::Button *set, Gtk::Button *unset) { Glib::ustring value = param->param_getSVGValue(); Glib::ustring defvalue = param->param_getDefaultSVGValue(); @@ -1623,8 +1628,8 @@ Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Paramete info->set_tooltip_markup((tooltip + def + ove).c_str()); } -void -Effect::unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, Gtk::Button *set, Gtk::Button *unset) +void Effect::unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, + Gtk::Button *set, Gtk::Button *unset) { Glib::ustring value = param->param_getSVGValue(); Glib::ustring defvalue = param->param_getDefaultSVGValue(); diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index 80eaaa1e37..dbb8d0499d 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -185,8 +185,10 @@ public: private: void onDefaultsExpanderChanged(Gtk::Expander * expander); - void setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, Gtk::Button *set , Gtk::Button *unset); - void unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, Gtk::Button *set , Gtk::Button *unset); + void setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, + Gtk::Button *set, Gtk::Button *unset); + void unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Image *info, + Gtk::Button *set, Gtk::Button *unset); bool provides_own_flash_paths; // if true, the standard flash path is suppressed bool is_ready; -- GitLab From 9628d213ea0b76eefc92c99dab423412d9aa3d0f Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Sat, 12 Oct 2019 13:02:11 +0200 Subject: [PATCH 06/15] Fix popup --- .../symbolic/actions/infopop-symbolic.svg | 170 +++++++++++------- src/live_effects/effect.cpp | 28 ++- 2 files changed, 127 insertions(+), 71 deletions(-) diff --git a/share/icons/hicolor/symbolic/actions/infopop-symbolic.svg b/share/icons/hicolor/symbolic/actions/infopop-symbolic.svg index f0daf6a3ca..c283070b81 100644 --- a/share/icons/hicolor/symbolic/actions/infopop-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/infopop-symbolic.svg @@ -1,67 +1,113 @@ - - - - - - - - - - - - -image/svg+xml - - -fe Editor new Icons proposal -13 Nov 2018 - - -Ramón Miranda - - - - -see the license tab - - - - -icon ui - - -This is a little contribution with Inkscape Project + + + + + + + + + + image/svg+xml + + + fe Editor new Icons proposal + 13 Nov 2018 + + + Ramón Miranda + + + + + see the license tab + + + + + icon ui + + + This is a little contribution with Inkscape Project Ramon Miranda www.ramonmiranda.com (design and SVG file) Jabiertxo (SVG stuff to integrate them in UI) - - - - - - - - -- - - - -Ramon Miranda + + + + + + + + + - + + + + Ramon Miranda Jabier Arraiza - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 13dce34e11..6770c9b3e6 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -1524,6 +1524,11 @@ Effect::newWidget() return dynamic_cast(vbox); } +bool sp_enter_tooltip(GdkEventCrossing *evt, Gtk::Widget *widg){ + widg->trigger_tooltip_query(); + return true; +} + /** * This *creates* a new widget, with default values setter */ @@ -1562,24 +1567,29 @@ Effect::defaultParamSet() ove = Glib::ustring(_("Default value overridden: None\n")); } Gtk::HBox * vbox_param = Gtk::manage( new Gtk::HBox(true) ); + Gtk::HBox * namedicon = Gtk::manage( new Gtk::HBox(true) ); Gtk::Label *parameter_label = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_START)); parameter_label->set_use_markup(true); parameter_label->set_use_underline(true); parameter_label->set_ellipsize(Pango::ELLIPSIZE_END); Glib::ustring tooltip = Glib::ustring("") + parameter_label->get_text() + Glib::ustring("\n") + param->param_tooltip + Glib::ustring("\n\n"); - Gtk::Image *info = sp_get_icon_image(Glib::ustring("infopop"), 30); - info->set_tooltip_markup((tooltip + def + ove).c_str()); - vbox_param->pack_start(*info, true, true, 2); - vbox_param->pack_start(*parameter_label, true, true, 2); + Gtk::Image *info = sp_get_icon_image(Glib::ustring("infopop"), 26); + + Gtk::EventBox *infoeventbox = Gtk::manage(new Gtk::EventBox()); + infoeventbox->signal_enter_notify_event().connect(sigc::bind( + sigc::ptr_fun(&sp_enter_tooltip), *infoeventbox))); + infoeventbox->set_tooltip_markup((tooltip + def + ove).c_str()); + infoeventbox->add(*info); + namedicon->pack_start(*infoeventbox, false, false, 2); + namedicon->pack_start(*parameter_label, true, true, 2) + namedicon->set_homogeneous(false); + vbox_param->pack_start(*namedicon, true, true, 2); Gtk::Button *set = Gtk::manage(new Gtk::Button((Glib::ustring)set_or_upd)); Gtk::Button *unset = Gtk::manage(new Gtk::Button(Glib::ustring(_("Unset")))); - unset->signal_clicked().connect( - sigc::bind( + unset->signal_clicked().connect(sigc::bind( sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, tooltip, param, info, set, unset)); - - set->signal_clicked().connect( - sigc::bind( + set->signal_clicked().connect(sigc::bind( sigc::mem_fun(*this, &Effect::setDefaultParam), pref_path, tooltip, param, info, set, unset)); if (!valid) { unset->set_sensitive(false); -- GitLab From 61ce5aebe06b0dd2763b361b29ba8952c1557187 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Sat, 12 Oct 2019 13:03:42 +0200 Subject: [PATCH 07/15] Add image tooltip to default parameter wiget in LPE's --- src/live_effects/effect.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 6770c9b3e6..50a21281f7 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -1524,7 +1524,8 @@ Effect::newWidget() return dynamic_cast(vbox); } -bool sp_enter_tooltip(GdkEventCrossing *evt, Gtk::Widget *widg){ +bool sp_enter_tooltip(GdkEventCrossing *evt, Gtk::Widget *widg) +{ widg->trigger_tooltip_query(); return true; } @@ -1567,7 +1568,7 @@ Effect::defaultParamSet() ove = Glib::ustring(_("Default value overridden: None\n")); } Gtk::HBox * vbox_param = Gtk::manage( new Gtk::HBox(true) ); - Gtk::HBox * namedicon = Gtk::manage( new Gtk::HBox(true) ); + Gtk::HBox *namedicon = Gtk::manage(new Gtk::HBox(true)); Gtk::Label *parameter_label = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_START)); parameter_label->set_use_markup(true); parameter_label->set_use_underline(true); @@ -1575,22 +1576,21 @@ Effect::defaultParamSet() Glib::ustring tooltip = Glib::ustring("") + parameter_label->get_text() + Glib::ustring("\n") + param->param_tooltip + Glib::ustring("\n\n"); Gtk::Image *info = sp_get_icon_image(Glib::ustring("infopop"), 26); - + Gtk::EventBox *infoeventbox = Gtk::manage(new Gtk::EventBox()); infoeventbox->signal_enter_notify_event().connect(sigc::bind( sigc::ptr_fun(&sp_enter_tooltip), *infoeventbox))); infoeventbox->set_tooltip_markup((tooltip + def + ove).c_str()); infoeventbox->add(*info); namedicon->pack_start(*infoeventbox, false, false, 2); - namedicon->pack_start(*parameter_label, true, true, 2) - namedicon->set_homogeneous(false); + namedicon->pack_start(*parameter_label, true, true, 2) namedicon->set_homogeneous(false); vbox_param->pack_start(*namedicon, true, true, 2); Gtk::Button *set = Gtk::manage(new Gtk::Button((Glib::ustring)set_or_upd)); Gtk::Button *unset = Gtk::manage(new Gtk::Button(Glib::ustring(_("Unset")))); - unset->signal_clicked().connect(sigc::bind( - sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, tooltip, param, info, set, unset)); - set->signal_clicked().connect(sigc::bind( - sigc::mem_fun(*this, &Effect::setDefaultParam), pref_path, tooltip, param, info, set, unset)); + unset->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, + tooltip, param, info, set, unset)); + set->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::setDefaultParam), pref_path, tooltip, + param, info, set, unset)); if (!valid) { unset->set_sensitive(false); } -- GitLab From 652d40cfd8da21073bdb67e85a30b0f3e2e7bbae Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Sat, 12 Oct 2019 15:38:17 +0200 Subject: [PATCH 08/15] Add event box and change icons --- .../Tango/scalable/actions/info-outline.svg | 126 ++++++++++++++++++ share/icons/Tango/scalable/actions/info.svg | 126 ++++++++++++++++++ .../hicolor/scalable/actions/info-outline.svg | 126 ++++++++++++++++++ share/icons/hicolor/scalable/actions/info.svg | 93 +++++++++---- .../actions/info-outline-symbolic.svg | 113 ++++++++++++++++ ...infopop-symbolic.svg => info-symbolic.svg} | 27 ++-- .../actions/infopop-outline-symbolic.svg | 89 ------------- share/ui/dialog-livepatheffect-effect.glade | 2 +- src/live_effects/effect.cpp | 10 +- src/live_effects/effect.h | 1 + src/live_effects/parameter/path.cpp | 8 +- src/ui/dialog/clonetiler.cpp | 4 +- 12 files changed, 584 insertions(+), 141 deletions(-) create mode 100644 share/icons/Tango/scalable/actions/info-outline.svg create mode 100644 share/icons/Tango/scalable/actions/info.svg create mode 100644 share/icons/hicolor/scalable/actions/info-outline.svg create mode 100644 share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg rename share/icons/hicolor/symbolic/actions/{infopop-symbolic.svg => info-symbolic.svg} (58%) delete mode 100644 share/icons/hicolor/symbolic/actions/infopop-outline-symbolic.svg diff --git a/share/icons/Tango/scalable/actions/info-outline.svg b/share/icons/Tango/scalable/actions/info-outline.svg new file mode 100644 index 0000000000..3f79f0571c --- /dev/null +++ b/share/icons/Tango/scalable/actions/info-outline.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + image/svg+xml + + + + 13 Nov 2018 + + + Ramón Miranda + + + + + see the license tab + + + + + icon ui + + + This is a little contribution with Inkscape Project +Ramon Miranda www.ramonmiranda.com (design and SVG file) +Jabiertxo (SVG stuff to integrate them in UI) + + + + + + + + + - + + + + Ramon Miranda +Jabier Arraiza + + + + + + + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/info.svg b/share/icons/Tango/scalable/actions/info.svg new file mode 100644 index 0000000000..67597d17d2 --- /dev/null +++ b/share/icons/Tango/scalable/actions/info.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + image/svg+xml + + + + 13 Nov 2018 + + + Ramón Miranda + + + + + see the license tab + + + + + icon ui + + + This is a little contribution with Inkscape Project +Ramon Miranda www.ramonmiranda.com (design and SVG file) +Jabiertxo (SVG stuff to integrate them in UI) + + + + + + + + + - + + + + Ramon Miranda +Jabier Arraiza + + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/actions/info-outline.svg b/share/icons/hicolor/scalable/actions/info-outline.svg new file mode 100644 index 0000000000..3f79f0571c --- /dev/null +++ b/share/icons/hicolor/scalable/actions/info-outline.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + image/svg+xml + + + + 13 Nov 2018 + + + Ramón Miranda + + + + + see the license tab + + + + + icon ui + + + This is a little contribution with Inkscape Project +Ramon Miranda www.ramonmiranda.com (design and SVG file) +Jabiertxo (SVG stuff to integrate them in UI) + + + + + + + + + - + + + + Ramon Miranda +Jabier Arraiza + + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/actions/info.svg b/share/icons/hicolor/scalable/actions/info.svg index a660d5ef8c..67597d17d2 100644 --- a/share/icons/hicolor/scalable/actions/info.svg +++ b/share/icons/hicolor/scalable/actions/info.svg @@ -1,18 +1,43 @@ - - - - - + + + + + + @@ -24,7 +49,7 @@ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - fe Editor new Icons proposal + 13 Nov 2018 @@ -46,10 +71,10 @@ Ramon Miranda www.ramonmiranda.com (design and SVG file) Jabiertxo (SVG stuff to integrate them in UI) - + - + - @@ -72,16 +97,30 @@ Jabier Arraiza - - + - + id="rect22048" + d="M 0,0 H 16 V 16 H 0 Z" + style="opacity:0;fill:none" + inkscape:connector-curvature="0" /> + + + diff --git a/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg b/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg new file mode 100644 index 0000000000..4381b1b57f --- /dev/null +++ b/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + image/svg+xml + + + + 13 Nov 2018 + + + Ramón Miranda + + + + + see the license tab + + + + + icon ui + + + This is a little contribution with Inkscape Project +Ramon Miranda www.ramonmiranda.com (design and SVG file) +Jabiertxo (SVG stuff to integrate them in UI) + + + + + + + + + - + + + + Ramon Miranda +Jabier Arraiza + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/symbolic/actions/infopop-symbolic.svg b/share/icons/hicolor/symbolic/actions/info-symbolic.svg similarity index 58% rename from share/icons/hicolor/symbolic/actions/infopop-symbolic.svg rename to share/icons/hicolor/symbolic/actions/info-symbolic.svg index c283070b81..4a0edb546c 100644 --- a/share/icons/hicolor/symbolic/actions/infopop-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/info-symbolic.svg @@ -7,32 +7,34 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:version="1.0beta1 (d1b5375, 2019-10-12)" + inkscape:version="1.0beta1 (f5f6674, 2019-10-12)" sodipodi:docname="infopop-symbolic.svg" viewBox="0 0 16 16" height="16" width="16" id="svg1" version="1.1"> - + + objecttolerance="10" + inkscape:snap-global="false"> @@ -47,7 +49,7 @@ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - fe Editor new Icons proposal + 13 Nov 2018 @@ -95,6 +97,10 @@ Jabier Arraiza + style="opacity:0;fill:none" d="M 0,0 H 16 V 16 H 0 Z" id="rect22048" /> - diff --git a/share/icons/hicolor/symbolic/actions/infopop-outline-symbolic.svg b/share/icons/hicolor/symbolic/actions/infopop-outline-symbolic.svg deleted file mode 100644 index cf9694e4c2..0000000000 --- a/share/icons/hicolor/symbolic/actions/infopop-outline-symbolic.svg +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - fe Editor new Icons proposal - 13 Nov 2018 - - - Ramón Miranda - - - - - see the license tab - - - - - icon ui - - - This is a little contribution with Inkscape Project -Ramon Miranda www.ramonmiranda.com (design and SVG file) -Jabiertxo (SVG stuff to integrate them in UI) - - - - - - - - - - - - - - Ramon Miranda -Jabier Arraiza - - - - - - - - - - - - - - - diff --git a/share/ui/dialog-livepatheffect-effect.glade b/share/ui/dialog-livepatheffect-effect.glade index d08ff74848..f886d89821 100644 --- a/share/ui/dialog-livepatheffect-effect.glade +++ b/share/ui/dialog-livepatheffect-effect.glade @@ -177,7 +177,7 @@ end start 23 - infopop-outline + info-outline 2 + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/Tango/scalable/actions/on-outline.svg b/share/icons/Tango/scalable/actions/on-outline.svg new file mode 100644 index 0000000000..dbb394e358 --- /dev/null +++ b/share/icons/Tango/scalable/actions/on-outline.svg @@ -0,0 +1,105 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/actions/off-outline.svg b/share/icons/hicolor/scalable/actions/off-outline.svg new file mode 100644 index 0000000000..72dd9910b0 --- /dev/null +++ b/share/icons/hicolor/scalable/actions/off-outline.svg @@ -0,0 +1,105 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/actions/on-outline.svg b/share/icons/hicolor/scalable/actions/on-outline.svg new file mode 100644 index 0000000000..dbb394e358 --- /dev/null +++ b/share/icons/hicolor/scalable/actions/on-outline.svg @@ -0,0 +1,105 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg b/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg index 4381b1b57f..2b220b8fe1 100644 --- a/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg @@ -8,106 +8,65 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:version="1.0beta1 (f5f6674, 2019-10-12)" - sodipodi:docname="infopop-outline-symbolic.svg" + sodipodi:docname="info-outline-symbolic.svg" viewBox="0 0 16 16" height="16" width="16" id="svg1" version="1.1"> + id="style4788"> + + + + image/svg+xml + + + + + + id="defs2660" /> + objecttolerance="10"> - - - - image/svg+xml - - - - 13 Nov 2018 - - - Ramón Miranda - - - - - see the license tab - - - - - icon ui - - - This is a little contribution with Inkscape Project -Ramon Miranda www.ramonmiranda.com (design and SVG file) -Jabiertxo (SVG stuff to integrate them in UI) - - - - - - - - - - - - - - Ramon Miranda -Jabier Arraiza - - - - - - - - - - - + inkscape:label="00338" + id="info-outline" + transform="translate(-10.48884,-199.5352)"> + d="m 10.48884,199.5352 h 16 v 16 h -16 z" + id="rect23222-9" + inkscape:connector-curvature="0" /> + + diff --git a/share/icons/hicolor/symbolic/actions/info-symbolic.svg b/share/icons/hicolor/symbolic/actions/info-symbolic.svg index 4a0edb546c..1183a1c29c 100644 --- a/share/icons/hicolor/symbolic/actions/info-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/info-symbolic.svg @@ -8,107 +8,60 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:version="1.0beta1 (f5f6674, 2019-10-12)" - sodipodi:docname="infopop-symbolic.svg" + sodipodi:docname="info-symbolic.svg" viewBox="0 0 16 16" height="16" width="16" id="svg1" version="1.1"> + id="style4788"> + + + + image/svg+xml + + + + + + id="defs2660" /> + objecttolerance="10"> - - - - image/svg+xml - - - - 13 Nov 2018 - - - Ramón Miranda - - - - - see the license tab - - - - - icon ui - - - This is a little contribution with Inkscape Project -Ramon Miranda www.ramonmiranda.com (design and SVG file) -Jabiertxo (SVG stuff to integrate them in UI) - - - - - - - - - - - - - - Ramon Miranda -Jabier Arraiza - - - - - - - - - - - + inkscape:label="00338" + id="info" + transform="translate(-10.48884,-199.5352)"> + d="m 10.48884,199.5352 h 16 v 16 h -16 z" + id="rect23222-9" + inkscape:connector-curvature="0" /> + diff --git a/share/icons/hicolor/symbolic/actions/off-outline-symbolic.svg b/share/icons/hicolor/symbolic/actions/off-outline-symbolic.svg new file mode 100644 index 0000000000..65cedbe695 --- /dev/null +++ b/share/icons/hicolor/symbolic/actions/off-outline-symbolic.svg @@ -0,0 +1,78 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/symbolic/actions/off-symbolic.svg b/share/icons/hicolor/symbolic/actions/off-symbolic.svg index 8f34d380dd..54c6a33227 100644 --- a/share/icons/hicolor/symbolic/actions/off-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/off-symbolic.svg @@ -1,13 +1,69 @@ - - - - - + + + + + + + image/svg+xml + + + + + + + + - - - - - - - + + + + + diff --git a/share/icons/hicolor/symbolic/actions/on-outline-symbolic.svg b/share/icons/hicolor/symbolic/actions/on-outline-symbolic.svg new file mode 100644 index 0000000000..addffb8c72 --- /dev/null +++ b/share/icons/hicolor/symbolic/actions/on-outline-symbolic.svg @@ -0,0 +1,73 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/symbolic/actions/on-symbolic.svg b/share/icons/hicolor/symbolic/actions/on-symbolic.svg index d52e80a8ed..ab66e4b9b3 100644 --- a/share/icons/hicolor/symbolic/actions/on-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/on-symbolic.svg @@ -1,12 +1,68 @@ - - - - - + + + + + + + image/svg+xml + + + + + + + + - - - - - - + + + + + diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 3afa45a257..15f0c152ca 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -1577,11 +1577,11 @@ Effect::defaultParamSet() param->param_tooltip + Glib::ustring("\n\n"); Gtk::Image *info = sp_get_icon_image("info-outline", 25); - Gtk::EventBox *infoeventbox = Gtk::manage(new Gtk::EventBox()); + Gtk::Widget *infoeventbox = dynamic_cast(Gtk::manage(new Gtk::EventBox())); infoeventbox->add(*info); infoeventbox->set_tooltip_markup((tooltip + def + ove).c_str()); infoeventbox->signal_enter_notify_event().connect( - sigc::bind(sigc::ptr_fun(sp_enter_tooltip), *infoeventbox)); + sigc::bind(sigc::ptr_fun(sp_enter_tooltip), infoeventbox)); namedicon->pack_start(*infoeventbox, false, false, 2); namedicon->pack_start(*parameter_label, true, true, 2); namedicon->set_homogeneous(false); diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index f101e63f25..3b6ca85d4a 100644 --- a/src/live_effects/lpe-simplify.cpp +++ b/src/live_effects/lpe-simplify.cpp @@ -26,9 +26,9 @@ LPESimplify::LPESimplify(LivePathEffectObject *lpeobject) &wr, this, 0.) , helper_size(_("Helper size:"), _("Helper size"), "helper_size", &wr, this, 5) , simplify_individual_paths(_("Paths separately"), _("Simplifying paths (separately)"), "simplify_individual_paths", - &wr, this, false, "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")) + &wr, this, false, "", INKSCAPE_ICON("on-outline"), INKSCAPE_ICON("off-outline")) , simplify_just_coalesce(_("Just coalesce"), _("Simplify just coalesce"), "simplify_just_coalesce", &wr, this, - false, "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")) + false, "", INKSCAPE_ICON("on-outline"), INKSCAPE_ICON("off-outline")) { registerParameter(&steps); registerParameter(&threshold); diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp index b6548a13c6..81b167ebf8 100644 --- a/src/live_effects/lpe-transform_2pts.cpp +++ b/src/live_effects/lpe-transform_2pts.cpp @@ -29,12 +29,12 @@ namespace LivePathEffect { LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) : Effect(lpeobject), - elastic(_("Elastic"), _("Elastic transform mode"), "elastic", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), - from_original_width(_("From original width"), _("From original width"), "from_original_width", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), - lock_length(_("Lock length"), _("Lock length to current distance"), "lock_length", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), - lock_angle(_("Lock angle"), _("Lock angle"), "lock_angle", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), - flip_horizontal(_("Flip horizontal"), _("Flip horizontal"), "flip_horizontal", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), - flip_vertical(_("Flip vertical"), _("Flip vertical"), "flip_vertical", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), + elastic(_("Elastic"), _("Elastic transform mode"), "elastic", &wr, this, false,"", INKSCAPE_ICON("on-outline"), INKSCAPE_ICON("off-outline")), + from_original_width(_("From original width"), _("From original width"), "from_original_width", &wr, this, false,"", INKSCAPE_ICON("on-outline"), INKSCAPE_ICON("off-outline")), + lock_length(_("Lock length"), _("Lock length to current distance"), "lock_length", &wr, this, false,"", INKSCAPE_ICON("on-outline"), INKSCAPE_ICON("off-outline")), + lock_angle(_("Lock angle"), _("Lock angle"), "lock_angle", &wr, this, false,"", INKSCAPE_ICON("on-outline"), INKSCAPE_ICON("off-outline")), + flip_horizontal(_("Flip horizontal"), _("Flip horizontal"), "flip_horizontal", &wr, this, false,"", INKSCAPE_ICON("on-outline"), INKSCAPE_ICON("off-outline")), + flip_vertical(_("Flip vertical"), _("Flip vertical"), "flip_vertical", &wr, this, false,"", INKSCAPE_ICON("on-outline"), INKSCAPE_ICON("off-outline")), start(_("Start"), _("Start point"), "start", &wr, this, "Start point"), end(_("End"), _("End point"), "end", &wr, this, "End point"), stretch(_("Stretch"), _("Stretch the result"), "stretch", &wr, this, 1), diff --git a/src/ui/dialog/attrdialog.cpp b/src/ui/dialog/attrdialog.cpp index 7368fc806e..5921d334d8 100644 --- a/src/ui/dialog/attrdialog.cpp +++ b/src/ui/dialog/attrdialog.cpp @@ -155,13 +155,13 @@ AttrDialog::AttrDialog() Gtk::Label *helpreturn = Gtk::manage(new Gtk::Label(_("Shift+Return new line"))); helpreturn->get_style_context()->add_class("inksmall"); Gtk::Button *apply = Gtk::manage(new Gtk::Button()); - Gtk::Image *icon = Gtk::manage(sp_get_icon_image("on", 26)); + Gtk::Image *icon = Gtk::manage(sp_get_icon_image("on-outline", 26)); apply->set_relief(Gtk::RELIEF_NONE); icon->show(); apply->add(*icon); apply->signal_clicked().connect(sigc::mem_fun(*this, &AttrDialog::valueEditedPop)); Gtk::Button *cancel = Gtk::manage(new Gtk::Button()); - icon = Gtk::manage(sp_get_icon_image("off", 26)); + icon = Gtk::manage(sp_get_icon_image("off-outline", 26)); cancel->set_relief(Gtk::RELIEF_NONE); icon->show(); cancel->add(*icon); -- GitLab From 29893c1aa8f690c444bde30023f8a45f01548284 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Sat, 12 Oct 2019 20:02:01 +0200 Subject: [PATCH 12/15] Fixing icons --- .../actions/info-outline-symbolic.svg | 73 ++++++++++--------- .../symbolic/actions/info-symbolic.svg | 61 ++++++++-------- share/ui/dialog-livepatheffect-effect.glade | 2 +- 3 files changed, 72 insertions(+), 64 deletions(-) diff --git a/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg b/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg index 2b220b8fe1..f54b4afc8a 100644 --- a/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg @@ -7,13 +7,13 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:version="1.0beta1 (f5f6674, 2019-10-12)" - sodipodi:docname="info-outline-symbolic.svg" - viewBox="0 0 16 16" - height="16" - width="16" + version="1.1" id="svg1" - version="1.1"> + width="16" + height="16" + viewBox="0 0 16 16" + sodipodi:docname="info-outline-symbolic.svg" + inkscape:version="1.0beta1 (d817da3, 2019-10-12)"> image/svg+xml - + + guidetolerance="10" + id="namedview" + showgrid="true" + inkscape:zoom="54.332374" + inkscape:cx="9.6814998" + inkscape:cy="9.9908649" + inkscape:window-width="2560" + inkscape:window-height="1376" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg1" + inkscape:document-rotation="0"> + type="xygrid" + id="grid" /> + inkscape:label="00338"> + d="m 10.48884,199.5352 h 16 v 16 h -16 z" + style="opacity:0;fill:none" /> + d="m 18.488281,200.51953 c -3.917552,0 -7.111325,3.14298 -7.111328,7.01563 -3e-6,3.87265 3.193772,7.01562 7.111328,7.01562 3.917557,0 7.111332,-3.14297 7.111328,-7.01562 -2e-6,-3.87265 -3.193775,-7.01563 -7.111328,-7.01563 z m 0,1 c 3.384924,0 6.111326,2.69134 6.111328,6.01563 3e-6,3.32428 -2.726401,6.01562 -6.111328,6.01562 -3.384927,0 -6.111331,-2.69134 -6.111328,-6.01562 2e-6,-3.32429 2.726405,-6.01563 6.111328,-6.01563 z" + style="opacity:1;stroke-linecap:butt" /> + id="path2124" + d="M 7.8237124,6.0917386 C 7.4538372,6.1251544 6.9287158,6.2340354 6.338185,6.7229692 6.1159435,6.9071131 5.512581,7.4845984 5.4490835,7.7512894 5.4228905,7.8600294 5.5491282,7.9943941 5.6705679,7.9174027 5.8864605,7.7808821 6.267211,7.1555999 6.6672475,6.9397074 6.8648843,6.8333492 7.043145,6.8953551 6.994728,7.1437894 6.9683763,7.2795166 6.6301126,8.0597964 6.4552554,8.5201567 6.1528465,9.3162614 5.7667222,10.093751 5.6373452,10.943829 c -0.043654,0.289713 0.013974,0.634709 0.3227344,0.773614 0.3659066,0.166676 0.8656533,0.04804 1.2466406,-0.117071 C 7.8972592,11.30114 8.7745485,10.532674 8.9959975,10.01834 9.0507655,9.8913486 8.9283595,9.7016506 8.814064,9.7841996 8.5346737,9.9858086 8.1334435,10.621385 7.7715054,10.768224 7.5595863,10.852355 7.4539376,10.712399 7.5626772,10.382208 7.6571311,10.093292 8.2056002,8.6509338 8.4881655,7.879434 8.6461161,7.4436805 8.864496,6.9340962 8.6890835,6.4919926 8.5558967,6.1563358 8.1523935,6.0617281 7.8237124,6.0917386 Z" + style="stroke-width:0.81" /> + diff --git a/share/icons/hicolor/symbolic/actions/info-symbolic.svg b/share/icons/hicolor/symbolic/actions/info-symbolic.svg index 1183a1c29c..09ba0cee4c 100644 --- a/share/icons/hicolor/symbolic/actions/info-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/info-symbolic.svg @@ -7,13 +7,13 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:version="1.0beta1 (f5f6674, 2019-10-12)" - sodipodi:docname="info-symbolic.svg" - viewBox="0 0 16 16" - height="16" - width="16" + version="1.1" id="svg1" - version="1.1"> + width="16" + height="16" + viewBox="0 0 16 16" + sodipodi:docname="info-symbolic.svg" + inkscape:version="1.0beta1 (d817da3, 2019-10-12)"> + guidetolerance="10" + id="namedview" + showgrid="true" + inkscape:zoom="54.332374" + inkscape:cx="9.6814998" + inkscape:cy="9.9908649" + inkscape:window-width="2560" + inkscape:window-height="1376" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg1" + inkscape:document-rotation="0"> + type="xygrid" + id="grid" /> + transform="translate(-10.48884,-199.5352)" + id="info-outline" + inkscape:label="00338"> + d="m 10.48884,199.5352 h 16 v 16 h -16 z" + style="opacity:0;fill:none" /> diff --git a/share/ui/dialog-livepatheffect-effect.glade b/share/ui/dialog-livepatheffect-effect.glade index f886d89821..bee2189008 100644 --- a/share/ui/dialog-livepatheffect-effect.glade +++ b/share/ui/dialog-livepatheffect-effect.glade @@ -238,7 +238,7 @@ start start 23 - on + on-outline 2