[gimp/icons-wip] icons: Bug 759904 final (hopefully)
- From: Klaus Staedtler <klausstaedtler src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/icons-wip] icons: Bug 759904 final (hopefully)
- Date: Fri, 1 Jul 2016 16:25:56 +0000 (UTC)
commit f6c3bdab73161253c06bb19a9d61a9e0bcfe5915
Author: klausstaedtler <staedtler-przyborski web de>
Date: Fri Jul 1 18:25:29 2016 +0200
icons: Bug 759904 final (hopefully)
add:
gimp-help-about
patch:
replace "help-about" by "gimp-help-about"
gimp/app/actions/dialogs-actions.c: { "dialogs-about", "help-about",
patch:
replace "help-browser" by "gimp-prefs-help-system"
gimp/plug-ins/common/animation-play.c: { "help", "help-browser",
gimp/app/actions/actions.c: { "help", N_("Help"), "help-browser",
gimp/app/actions/help-actions.c: { "help-help", "help-browser",
gimp/app/actions/help-actions.c: { "help-context-help", "help-browser",
app/actions/actions.c | 2 +-
app/actions/dialogs-actions.c | 2 +-
app/actions/help-actions.c | 4 +-
icons/Color/16/gimp-help-about.png | Bin 0 -> 551 bytes
icons/Color/scalable/gimp-help-about.svg | 77 +++++++++++++++++++++++++++
icons/Symbolic/16/gimp-help-about.png | Bin 0 -> 521 bytes
icons/Symbolic/scalable/gimp-help-about.svg | 73 +++++++++++++++++++++++++
icons/icon-list.mk | 2 +
libgimpwidgets/gimpicons.c | 1 +
libgimpwidgets/gimpicons.h | 1 +
plug-ins/common/animation-play.c | 2 +-
11 files changed, 159 insertions(+), 5 deletions(-)
---
diff --git a/app/actions/actions.c b/app/actions/actions.c
index 695f9bb..8dbbad5 100644
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@@ -179,7 +179,7 @@ static const GimpActionFactoryEntry action_groups[] =
{ "tool-preset-editor", N_("Tool Preset Editor"), GIMP_STOCK_TOOL_PRESET,
tool_preset_editor_actions_setup,
tool_preset_editor_actions_update },
- { "help", N_("Help"), "help-browser",
+ { "help", N_("Help"), GIMP_STOCK_PREFS_HELP_SYSTEM,
help_actions_setup,
help_actions_update },
{ "image", N_("Image"), GIMP_STOCK_IMAGE,
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index a601849..677abee 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -270,7 +270,7 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
"gimp-tips-dialog",
GIMP_HELP_TIPS_DIALOG },
- { "dialogs-about", "help-about",
+ { "dialogs-about", GIMP_STOCK_HELP_ABOUT,
#if defined(G_OS_WIN32)
NC_("dialogs-action", "About GIMP"),
#elif defined(PLATFORM_OSX)
diff --git a/app/actions/help-actions.c b/app/actions/help-actions.c
index 2ddc74f..9a48cd2 100644
--- a/app/actions/help-actions.c
+++ b/app/actions/help-actions.c
@@ -37,13 +37,13 @@ static const GimpActionEntry help_actions[] =
{
{ "help-menu", NULL, NC_("help-action", "_Help") },
- { "help-help", "help-browser",
+ { "help-help", GIMP_STOCK_PREFS_HELP_SYSTEM,
NC_("help-action", "_Help"), "F1",
NC_("help-action", "Open the GIMP user manual"),
G_CALLBACK (help_help_cmd_callback),
GIMP_HELP_HELP },
- { "help-context-help", "help-browser",
+ { "help-context-help", GIMP_STOCK_PREFS_HELP_SYSTEM,
NC_("help-action", "_Context Help"), "<shift>F1",
NC_("help-action", "Show the help for a specific user interface item"),
G_CALLBACK (help_context_help_cmd_callback),
diff --git a/icons/Color/16/gimp-help-about.png b/icons/Color/16/gimp-help-about.png
new file mode 100644
index 0000000..54aa3ed
Binary files /dev/null and b/icons/Color/16/gimp-help-about.png differ
diff --git a/icons/Color/scalable/gimp-help-about.svg b/icons/Color/scalable/gimp-help-about.svg
new file mode 100644
index 0000000..6b898dc
--- /dev/null
+++ b/icons/Color/scalable/gimp-help-about.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ 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";
+ height="16"
+ id="svg7384"
+ version="1.1"
+ width="16"
+ sodipodi:docname="gimp-help-about.svg"
+ viewBox="0 0 16 16"
+ inkscape:version="0.92pre1 unknown">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1016"
+ id="namedview18"
+ showgrid="false"
+ inkscape:zoom="48"
+ inkscape:cx="8"
+ inkscape:cy="8"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg7384" />
+ <metadata
+ id="metadata90">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs7386" />
+ <g
+ id="g4256">
+ <rect
+
style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1.35169733;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
fill markers"
+ id="rect4257"
+ width="15.999999"
+ height="15.999999"
+ x="6.6613381e-16"
+ y="1e-06" />
+ </g>
+ <path
+ d="m 7.9549515,15.20505 c -0.736079,0 -1.8727276,-4.246301 -2.3932141,-4.766787 C 5.0412509,9.9177761
0.79494952,8.7811279 0.79494953,8.0450489 0.79494954,7.3089699 5.041251,6.1723213 5.5617374,5.6518348
6.0822239,5.1313484 7.2188721,0.88504695 7.9549511,0.88504696 c 0.736079,10e-9 1.8727276,4.24630144
2.3932139,4.76678794 0.520487,0.5204864 4.766788,1.6571346 4.766788,2.3932136 0,0.736079 -4.246301,1.8727276
-4.766788,2.3932145 -0.5204863,0.520486 -1.6571345,4.766787 -2.3932135,4.766787 z"
+ id="path67"
+ inkscape:flatsided="false"
+ inkscape:randomized="0"
+ inkscape:rounded="0.13800197"
+ sodipodi:arg1="1.5707963"
+ sodipodi:arg2="2.3561945"
+ sodipodi:cx="7.9549513"
+ sodipodi:cy="8.0450487"
+ sodipodi:r1="7.1600018"
+ sodipodi:r2="3.3845155"
+ sodipodi:sides="4"
+ sodipodi:type="star"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:1.01697958px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+ transform="matrix(0.97800065,0,0,0.97804133,0.21984218,0.13150819)" />
+</svg>
diff --git a/icons/Symbolic/16/gimp-help-about.png b/icons/Symbolic/16/gimp-help-about.png
new file mode 100644
index 0000000..c5bbf74
Binary files /dev/null and b/icons/Symbolic/16/gimp-help-about.png differ
diff --git a/icons/Symbolic/scalable/gimp-help-about.svg b/icons/Symbolic/scalable/gimp-help-about.svg
new file mode 100644
index 0000000..8b38685
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-help-about.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ 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";
+ height="16"
+ id="svg7384"
+ version="1.1"
+ width="16"
+ sodipodi:docname="gimp-help-about.svg"
+ viewBox="0 0 16 16"
+ inkscape:version="0.92pre1 unknown">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1016"
+ id="namedview18"
+ showgrid="false"
+ inkscape:zoom="43.1875"
+ inkscape:cx="15.901585"
+ inkscape:cy="8.301013"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg7384" />
+ <metadata
+ id="metadata90">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>elementary Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <title
+ id="title9167" />
+ <defs
+ id="defs7386" />
+ <g
+ id="g4256">
+ <rect
+
style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1.35169733;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
fill markers"
+ id="rect4257"
+ width="15.999999"
+ height="15.999999"
+ x="6.6613381e-16"
+ y="1e-06" />
+ <g
+ transform="translate(-573.0004,-48)"
+ style="display:inline"
+ id="layer12">
+ <path
+ inkscape:connector-curvature="0"
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+ id="path27906"
+ d="m 573.5004,54.01484 h 5.5 l 2,-5.5 2,5.5 h 5.5 l -4.25,3.5 2,5.75 -5.25,-2.5 -5.25,2.5 2,-5.75
z" />
+ </g>
+ </g>
+</svg>
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index 76ecb93..81ba0fb 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -94,6 +94,7 @@ scalable_images = \
scalable/gimp-hcenter.svg \
scalable/gimp-hchain-broken.svg \
scalable/gimp-hchain.svg \
+ scalable/gimp-help-about.svg \
scalable/gimp-hfill.svg \
scalable/gimp-histogram-linear.svg \
scalable/gimp-histogram-logarithmic.svg \
@@ -570,6 +571,7 @@ icons16_images = \
16/gimp-gradient-square.png \
16/gimp-grid.png \
16/gimp-group-layer.png \
+ 16/gimp-help-about.png \
16/gimp-histogram-linear.png \
16/gimp-histogram-logarithmic.png \
16/gimp-histogram.png \
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index 7a6ecb2..a1f9101 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -105,6 +105,7 @@ static const GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_SYSTEM_RUN, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_PROCESS_STOP, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_DETACH, NULL, 0, 0, LIBGIMP_DOMAIN },
+ { GIMP_STOCK_HELP_ABOUT, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_GRADIENT_LINEAR, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_GRADIENT_BILINEAR, NULL, 0, 0, LIBGIMP_DOMAIN },
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 7f34bd6..439abcf 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -80,6 +80,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_SYSTEM_RUN "gimp-system-run"
#define GIMP_STOCK_PROCESS_STOP "gimp-process-stop"
#define GIMP_STOCK_DETACH "gimp-detach"
+#define GIMP_STOCK_HELP_ABOUT "gimp-help-about"
#define GIMP_STOCK_GRADIENT_LINEAR "gimp-gradient-linear"
#define GIMP_STOCK_GRADIENT_BILINEAR "gimp-gradient-bilinear"
diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c
index 5c3baf4..eec2bdf 100644
--- a/plug-ins/common/animation-play.c
+++ b/plug-ins/common/animation-play.c
@@ -604,7 +604,7 @@ ui_manager_new (GtkWidget *window)
NULL, "<control>R", N_("Reload the image"),
G_CALLBACK (refresh_callback) },
- { "help", "help-browser",
+ { "help", "gimp-prefs-help-system",
NULL, NULL, NULL,
G_CALLBACK (help_callback) },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
