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 0000000000000000000000000000000000000000..3f79f0571c4ccf3f2121cbfa161b16bdadd274a1 --- /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 0000000000000000000000000000000000000000..67597d17d2ade81acbe24bb62595864a81d1eea9 --- /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/Tango/scalable/actions/off-outline.svg b/share/icons/Tango/scalable/actions/off-outline.svg new file mode 100644 index 0000000000000000000000000000000000000000..7febf77a296824a82d9c926f74f7c76d13350eaf --- /dev/null +++ b/share/icons/Tango/scalable/actions/off-outline.svg @@ -0,0 +1,105 @@ + + + + + + + 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 0000000000000000000000000000000000000000..dbb394e358f577132020a20f876220420567a95e --- /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/info-outline.svg b/share/icons/hicolor/scalable/actions/info-outline.svg new file mode 100644 index 0000000000000000000000000000000000000000..3f79f0571c4ccf3f2121cbfa161b16bdadd274a1 --- /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 a660d5ef8c67e0c0417ffa8c16854f87f34f9043..67597d17d2ade81acbe24bb62595864a81d1eea9 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/scalable/actions/off-outline.svg b/share/icons/hicolor/scalable/actions/off-outline.svg new file mode 100644 index 0000000000000000000000000000000000000000..72dd9910b0bcfc87ff5dfbaa6c0efb13ba47f19d --- /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 0000000000000000000000000000000000000000..dbb394e358f577132020a20f876220420567a95e --- /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 new file mode 100644 index 0000000000000000000000000000000000000000..f54b4afc8a4e9565a2b94d3314c4eb00f97033c7 --- /dev/null +++ b/share/icons/hicolor/symbolic/actions/info-outline-symbolic.svg @@ -0,0 +1,79 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/symbolic/actions/info-symbolic.svg b/share/icons/hicolor/symbolic/actions/info-symbolic.svg new file mode 100644 index 0000000000000000000000000000000000000000..09ba0cee4c53a1b9c25513af2e02c4ebca7a0684 --- /dev/null +++ b/share/icons/hicolor/symbolic/actions/info-symbolic.svg @@ -0,0 +1,68 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + 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 cf9694e4c2d31d922c965c15e349a4b7428675ed..0000000000000000000000000000000000000000 --- 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/icons/hicolor/symbolic/actions/infopop-symbolic.svg b/share/icons/hicolor/symbolic/actions/infopop-symbolic.svg deleted file mode 100644 index f0daf6a3cad4d6bfbe5fed18685abfd0ceffac3b..0000000000000000000000000000000000000000 --- a/share/icons/hicolor/symbolic/actions/infopop-symbolic.svg +++ /dev/null @@ -1,67 +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/icons/hicolor/symbolic/actions/off-outline-symbolic.svg b/share/icons/hicolor/symbolic/actions/off-outline-symbolic.svg new file mode 100644 index 0000000000000000000000000000000000000000..65cedbe69518b83b4bc2dd1aa5b8db566eefea52 --- /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 8f34d380dd764e73847862eeaeac9da7aa9106ae..54c6a332277a1b45bce3ccb31a649b2af7bb7e08 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 0000000000000000000000000000000000000000..addffb8c722026b78b2a36cd0d31c20274460051 --- /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 d52e80a8ed0f3ef085e6cb38e447a76dc20c008f..ab66e4b9b3810465c61d9ae65a385d998365e720 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/share/ui/dialog-livepatheffect-effect.glade b/share/ui/dialog-livepatheffect-effect.glade index d08ff7484881f6059a86b05a23816324a6c44375..bee2189008c27c013a5567bbc522f698700b149c 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 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); - 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); + 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("info", 20); + Gtk::EventBox *infoeventbox = Gtk::manage(new Gtk::EventBox()); + infoeventbox->add(*info); + infoeventbox->set_tooltip_markup((tooltip + def + ove).c_str()); + 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(sigc::mem_fun(*this, &Effect::unsetDefaultParam), pref_path, tooltip, param, parameter_label, set, unset)); - - set->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Effect::setDefaultParam), 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, info, set, unset)); if (!valid) { unset->set_sensitive(false); } @@ -1605,8 +1621,8 @@ Effect::onDefaultsExpanderChanged(Gtk::Expander * expander) defaultsopen = expander->get_expanded(); } -void -Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, Parameter *param, Gtk::Label *parameter_label, 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(); @@ -1617,11 +1633,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) +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(); @@ -1632,7 +1648,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()); + info->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 de237b8bbfcc827c73d62e763d4f97951fd3c154..f3b315c0f41269a9dc77fba70d22fc4cb418356b 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -8,12 +8,13 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include -#include <2geom/forward.h> +#include "effect-enum.h" +#include "parameter/bool.h" #include "ui/widget/registry.h" +#include <2geom/forward.h> +#include +#include #include -#include "parameter/bool.h" -#include "effect-enum.h" #define LPE_CONVERSION_TOLERANCE 0.01 // FIXME: find good solution for this. @@ -185,8 +186,10 @@ 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; diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index f101e63f25569108bee7441ec1861c6adb895f45..3b6ca85d4a48bb073b1d3bb235d2e7a9d95d6f28 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 b6548a13c6bba3c5f148fd18e3f685fc26de4924..81b167ebf8401a4f78b3a5a6233e1ad407fac66b 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/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index b8d73a122aa61d69b3b2b807ea3758198d9239ce..15471ae44afb8e2bd3bb8375b776093ca6872dc1 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -210,7 +210,7 @@ PathParam::param_newWidget() Gtk::Image * pIcon = nullptr; Gtk::Button * pButton = nullptr; if (_edit_button) { - pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("tool-node-editor"), Gtk::ICON_SIZE_BUTTON)); + pIcon = Gtk::manage(sp_get_icon_image("tool-node-editor", Gtk::ICON_SIZE_BUTTON)); pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -222,7 +222,7 @@ PathParam::param_newWidget() } if (_copy_button) { - pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("edit-copy"), Gtk::ICON_SIZE_BUTTON)); + pIcon = Gtk::manage(sp_get_icon_image("edit-copy", Gtk::ICON_SIZE_BUTTON)); pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -234,7 +234,7 @@ PathParam::param_newWidget() } if (_paste_button) { - pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("edit-paste"), Gtk::ICON_SIZE_BUTTON)); + pIcon = Gtk::manage(sp_get_icon_image("edit-paste", Gtk::ICON_SIZE_BUTTON)); pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -245,7 +245,7 @@ PathParam::param_newWidget() pButton->set_tooltip_text(_("Paste path")); } if (_link_button) { - pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("edit-clone"), Gtk::ICON_SIZE_BUTTON)); + pIcon = Gtk::manage(sp_get_icon_image("edit-clone", Gtk::ICON_SIZE_BUTTON)); pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/ui/dialog/attrdialog.cpp b/src/ui/dialog/attrdialog.cpp index 7368fc806ecb045664f45427a2dcb09f6ef4db51..5921d334d805012649fc088a3ccdef2ec22f738c 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); diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index 34e06c3fe21af533b9ca62c2ab7a8b0e21e58635..edc88ba00ef0b6c319042efa6409e6f629c7b5bd 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -2699,7 +2699,7 @@ GtkWidget * CloneTiler::table_x_y_rand(int values) auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous(GTK_BOX(hb), FALSE); - GtkWidget *i = sp_get_icon_image(INKSCAPE_ICON("object-rows"), GTK_ICON_SIZE_MENU); + GtkWidget *i = sp_get_icon_image("object-rows", GTK_ICON_SIZE_MENU); gtk_box_pack_start(GTK_BOX(hb), i, FALSE, FALSE, 2); GtkWidget *l = gtk_label_new(""); @@ -2713,7 +2713,7 @@ GtkWidget * CloneTiler::table_x_y_rand(int values) auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous(GTK_BOX(hb), FALSE); - GtkWidget *i = sp_get_icon_image(INKSCAPE_ICON("object-columns"), GTK_ICON_SIZE_MENU); + GtkWidget *i = sp_get_icon_image("object-columns", GTK_ICON_SIZE_MENU); gtk_box_pack_start(GTK_BOX(hb), i, FALSE, FALSE, 2); GtkWidget *l = gtk_label_new("");