summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Storz <eduard.braun2@gmx.de>2019-07-19 18:05:20 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-07-19 19:01:15 +0000
commit27a724af2f5169e6d5c8403d1f422328e25ba88e (patch)
tree71c61b3944c3b98ca04b53c67282c0d2e5b89c86
parenticons: Fix non-symbolic icon that got symbolic by accident (diff)
downloadinkscape-27a724af2f5169e6d5c8403d1f422328e25ba88e.tar.gz
inkscape-27a724af2f5169e6d5c8403d1f422328e25ba88e.zip
icons: replace deprecated gtk stock icons
They seems to be missing in some environments already... Fixes https://gitlab.com/inkscape/inkscape/issues/335
-rw-r--r--share/icons/hicolor/scalable/actions/edit.svg27
-rw-r--r--share/icons/hicolor/symbolic/actions/edit-symbolic.svg4
-rw-r--r--src/verbs.cpp2
-rw-r--r--src/widgets/gradient-selector.cpp3
4 files changed, 33 insertions, 3 deletions
diff --git a/share/icons/hicolor/scalable/actions/edit.svg b/share/icons/hicolor/scalable/actions/edit.svg
new file mode 100644
index 000000000..f6089d14a
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/edit.svg
@@ -0,0 +1,27 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
+<defs>
+ <linearGradient id="linearGradient5669" x1="989.88" x2="990.57" y1="185.19" y2="179.19" gradientTransform="translate(-.067673 -.23813)" gradientUnits="userSpaceOnUse" inkscape:collect="always">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient5644" x1="974.44" x2="974.44" y1="172.44" y2="174.94" gradientTransform="matrix(.7 0 0 1 311.2 8.5)" gradientUnits="userSpaceOnUse" inkscape:collect="always">
+ <stop stop-color="#f3ff49" offset="0"/>
+ <stop stop-color="#ffa01e" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient5658" x1="994.15" x2="992.74" y1="181.56" y2="185" gradientUnits="userSpaceOnUse" inkscape:collect="always">
+ <stop stop-color="#5a5a5a" offset="0"/>
+ <stop offset="1"/>
+ </linearGradient>
+ </defs>
+ <g id="edit" transform="matrix(.95818 .85308 -.84839 .95291 -784.16 -1015.4)" inkscape:label="#edit">
+ <g transform="rotate(-90,994,185)">
+ <path transform="translate(20,8)" d="m965.5 174.5 4 2v-4z" fill="#fff" fill-rule="evenodd" inkscape:connector-curvature="0"/>
+ <path d="m997.11 180.46v4l-7.7653-0.0124c0.4462-1.0601 0.42018-3.0999-0.0144-4.0269z" fill="url(#linearGradient5644)" fill-rule="evenodd" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+ <path d="m998.07 180.46h-9.5l-3.0682 2.041 3 2 9.6142-0.041c0.6968-1.102 0.6872-2.9601-0.046-4z" fill="none" stroke="url(#linearGradient5658)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78163" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+ <path d="m988.88 184.4c0.5-0.6892 0.54607-2.9485 0.0461-3.9485" fill="none" stroke="url(#linearGradient5669)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78163" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+ <path d="m996.61 180.46h1.5073c0.5024 1 0.5024 3 0 4h-1.5073z" fill="#c80000" fill-rule="evenodd" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+ </g>
+ <rect x="989.96" y="180.89" width="1" height="1.0048" color="#000000" fill="#fff" fill-rule="evenodd"/>
+ <path d="m990.46 183.4v5.0242" fill="none" stroke="#fff" stroke-linecap="round" stroke-width="1.0028px" inkscape:connector-curvature="0"/>
+ </g>
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/edit-symbolic.svg b/share/icons/hicolor/symbolic/actions/edit-symbolic.svg
new file mode 100644
index 000000000..0d77437ec
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/edit-symbolic.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+ <path d="M2.679 10.293l5.849-5.851 3 3-5.83 5.873-4.026 1.072z"/>
+ <path d="M11.637 1.676c-.2 0-.4.077-.554.23l-1.77 1.768 3.053 3.053 1.77-1.77a.783.783 0 0 0 0-1.109l-1.944-1.941a.782.782 0 0 0-.555-.23z"/>
+</svg>
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 8fc6c258c..faa34b387 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -3087,7 +3087,7 @@ Verb *Verb::_base_verbs[] = {
// Technically what we show are unicode code points and not glyphs. The actual glyphs shown are determined by the
// shaping engines.
new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("_Unicode Characters..."),
- N_("Select Unicode characters from a palette"), INKSCAPE_ICON("gtk-select-font")),
+ N_("Select Unicode characters from a palette"), INKSCAPE_ICON("accessories-character-map")),
// FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon
// TRANSLATORS: "Swatches" means: color samples
new DialogVerb(SP_VERB_DIALOG_SWATCHES, "DialogSwatches", N_("S_watches..."),
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index cb0ce09f2..755dfa439 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -186,9 +186,8 @@ static void sp_gradient_selector_init(SPGradientSelector *sel)
gtk_button_set_relief(GTK_BUTTON(sel->add), GTK_RELIEF_NONE);
gtk_widget_set_tooltip_text( sel->add, _("Create a duplicate gradient"));
- // FIXME: Probably better to either use something from the icon naming spec or ship our own "edit-gradient" icon
sel->edit = gtk_button_new();
- gradsel_style_button(sel->edit, INKSCAPE_ICON("gtk-edit"));
+ gradsel_style_button(sel->edit, INKSCAPE_ICON("edit"));
sel->nonsolid.push_back(sel->edit);
gtk_box_pack_start (GTK_BOX (hb), sel->edit, FALSE, FALSE, 0);