[gimp/icons-wip] icons: Bug 759904
- From: Klaus Staedtler <klausstaedtler src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/icons-wip] icons: Bug 759904
- Date: Thu, 30 Jun 2016 18:14:08 +0000 (UTC)
commit 8847b75c50f82b9274e213858e3d4f0784d87b32
Author: klausstaedtler <staedtler-przyborski web de>
Date: Thu Jun 30 20:13:29 2016 +0200
icons: Bug 759904
add;
gimp-prefs-system
patch:
replace "preferences-system" by "gimp-prefs-system"
gimp/plug-ins/ifs-compose/ifs-compose.c: { "options", "preferences-system",
gimp/app/actions/dialogs-actions.c: { "dialogs-preferences", "preferences-system",
gimp/app/dialogs/preferences-dialog.c: button = prefs_button_add ("preferences-system",
gimp/app/dialogs/preferences-dialog.c: button = prefs_button_add ("preferences-system",
app/actions/dialogs-actions.c | 2 +-
app/dialogs/preferences-dialog.c | 4 +-
icons/Color/16/gimp-prefs-system.png | Bin 0 -> 1058 bytes
icons/Color/scalable/gimp-prefs-system.svg | 114 ++++++++++++++++++++++++
icons/Prototype/Color/16/gimp-configure.png | Bin 948 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-configure.png | Bin 859 -> 0 bytes
icons/Symbolic/16/gimp-prefs-system.png | Bin 0 -> 681 bytes
icons/Symbolic/scalable/gimp-prefs-system.svg | 73 +++++++++++++++
icons/icon-list.mk | 2 +
libgimpwidgets/gimpicons.c | 1 +
libgimpwidgets/gimpicons.h | 2 +
plug-ins/ifs-compose/ifs-compose.c | 2 +-
12 files changed, 196 insertions(+), 4 deletions(-)
---
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index 34b93cf..0b783cd 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -240,7 +240,7 @@ gint n_dialogs_dockable_actions = G_N_ELEMENTS (dialogs_dockable_actions);
static const GimpStringActionEntry dialogs_toplevel_actions[] =
{
- { "dialogs-preferences", "preferences-system",
+ { "dialogs-preferences", GIMP_STOCK_PREFS_SYSTEM,
NC_("dialogs-action", "_Preferences"), NULL,
NC_("dialogs-action", "Open the preferences dialog"),
"gimp-preferences-dialog",
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 65339b1..4570df4 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1704,7 +1704,7 @@ prefs_dialog_new (Gimp *gimp,
_("_Use dynamic keyboard shortcuts"),
GTK_BOX (vbox2));
- button = prefs_button_add ("preferences-system",
+ button = prefs_button_add (GIMP_STOCK_PREFS_SYSTEM,
_("Configure _Keyboard Shortcuts..."),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
@@ -2543,7 +2543,7 @@ prefs_dialog_new (Gimp *gimp,
vbox2 = prefs_frame_new (_("Extended Input Devices"),
GTK_CONTAINER (vbox), FALSE);
- button = prefs_button_add ("preferences-system",
+ button = prefs_button_add (GIMP_STOCK_PREFS_SYSTEM,
_("Configure E_xtended Input Devices..."),
GTK_BOX (vbox2));
g_signal_connect (button, "clicked",
diff --git a/icons/Color/16/gimp-prefs-system.png b/icons/Color/16/gimp-prefs-system.png
new file mode 100644
index 0000000..da2f1c2
Binary files /dev/null and b/icons/Color/16/gimp-prefs-system.png differ
diff --git a/icons/Color/scalable/gimp-prefs-system.svg b/icons/Color/scalable/gimp-prefs-system.svg
new file mode 100644
index 0000000..4805c74
--- /dev/null
+++ b/icons/Color/scalable/gimp-prefs-system.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+ width="16"
+ height="16"
+ id="svg11300"
+ sodipodi:version="0.32"
+ inkscape:version="0.92pre1 unknown"
+ sodipodi:docname="gimp-prefs-system.svg"
+ version="1.1"
+ viewBox="0 0 16 16">
+ <defs
+ id="defs3" />
+ <sodipodi:namedview
+ stroke="#204a87"
+ fill="#3465a4"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.25490196"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="6"
+ inkscape:cx="8"
+ inkscape:cy="9.0833333"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1016"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4233" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title />
+ </cc:Agent>
+ </dc:creator>
+ <dc:source />
+ <cc:license
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ <dc:title />
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>preferences</rdf:li>
+ <rdf:li>settings</rdf:li>
+ <rdf:li>control panel</rdf:li>
+ <rdf:li>tweaks</rdf:li>
+ <rdf:li>system</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-32)">
+ <g
+ id="g4287"
+ transform="matrix(0.40296593,0,0,0.39312274,-1.9421927,30.115325)">
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cczcccccccccsc"
+ id="path2140"
+ d="M 17.906713,21.215676 36.899302,40.6474 c 0.768486,0.87827 3.20351,1.557061 4.830485,0
1.571126,-1.503613 1.207621,-3.622864 -0.329351,-5.159837 L 23.176333,15.946056 c 2.25,-6.25
-2.303889,-11.499568 -8.178889,-10.374568 l -1.262514,1.1527294 3.952215,3.7326476 0.219568,3.293516
-2.950842,2.693603 -3.526399,-0.388144 -3.6228634,-3.403296 c 0,0 -1.2701213,1.254904 -1.2701213,1.254904
-0.5907635,5.641317 5.3077257,10.683228 11.3702257,7.308228 z"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1.25162303;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"
/>
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccc"
+ id="path2144"
+ d="M 22.498794,30.12538 C 23.332335,29.410917 35.782628,16.676871 35.782628,16.676871 l
3.073945,-0.219568 4.830485,-6.6968124 -4.024327,-3.5851919 -6.257674,5.3794063 v 3.073946 L
20.670142,27.857593 c -0.60381,0.60381 1.060166,2.926489 1.828652,2.267787 z"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1.25162303;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"
/>
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccscc"
+ id="path2142"
+ d="m 8.4653111,43.611561 c 1.3165875,1.465229 4.9736849,2.128165 6.5954439,-0.709914
0.707107,-1.237436 2.093943,-4.702802 8.281128,-10.271268 1.039146,-0.934171 2.139909,-3.071138
1.206747,-4.223867 l -2.415243,-2.415243 c -0.988053,-1.097837 -3.734414,-0.585749 -4.861175,0.950876
-3.358757,4.596194 -8.8460727,8.25488 -10.0835097,8.696822 -2.3679195,0.845685 -2.1014106,4.336149
-0.5348231,5.996487 z"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.24774945;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"
/>
+ </g>
+ </g>
+</svg>
diff --git a/icons/Symbolic/16/gimp-prefs-system.png b/icons/Symbolic/16/gimp-prefs-system.png
new file mode 100644
index 0000000..399f40e
Binary files /dev/null and b/icons/Symbolic/16/gimp-prefs-system.png differ
diff --git a/icons/Symbolic/scalable/gimp-prefs-system.svg b/icons/Symbolic/scalable/gimp-prefs-system.svg
new file mode 100644
index 0000000..ef6313c
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-prefs-system.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+ id="svg7384"
+ height="16"
+ width="16"
+ version="1.1"
+ sodipodi:docname="gimp-prefs-systemc.svg"
+ viewBox="0 0 16 16"
+ inkscape:version="0.92pre1 unknown">
+ <defs
+ id="defs10" />
+ <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="namedview8"
+ showgrid="true"
+ inkscape:zoom="43.1875"
+ inkscape:cx="5.725592"
+ inkscape:cy="8"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg7384">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4233" />
+ </sodipodi:namedview>
+ <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>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <title
+ id="title9167">Gnome Symbolic Icon Theme</title>
+ <g
+ id="g4953"
+ transform="matrix(1.0088031,0,0,1.0014609,-445.94089,-462.66315)">
+ <path
+ id="path3908"
+ style="color:#000000;text-indent:0;text-transform:none;fill:#bebebe"
+ d="m 445.55,462.09 c -0.39933,0 -0.78638,0.0916 -1.1433,0.21572 l 1.8849,1.8797 c 0.38735,0.38627
0.38735,1.0004 0,1.3867 l -0.71069,0.70874 c -0.38735,0.38628 -1.0031,0.38628 -1.3905,0 l -1.8849,-1.8797 c
-0.12444,0.35591 -0.2163,0.74191 -0.2163,1.1402 0,1.9061 1.5494,3.4513 3.4608,3.4513 0.39933,0
0.78638,-0.0916 1.1433,-0.2157 l 1.1742,1.171 a 2.4722,2.4654 0 0 1 0.0618,0 l 2.0703,-2.0646 -1.2051,-1.2018
c 0.12444,-0.35592 0.2163,-0.74191 0.2163,-1.1402 0,-1.9061 -1.5494,-3.4513 -3.4608,-3.4513 z m 6.5507,7.8886
-2.0703,2.0646 a 2.4722,2.4654 0 0 1 0.0309,0.0924 l 1.1433,1.1402 c -0.12444,0.35596 -0.2163,0.74196
-0.2163,1.1402 0,1.9061 1.5494,3.4513 3.4608,3.4513 0.43346,0 0.8536,-0.10141 1.236,-0.24653 l -2.0085,-2.003
c -0.38735,-0.38629 -0.38735,-1.0312 0,-1.4175 l 0.67979,-0.67792 c 0.19367,-0.19315 0.45794,-0.30816
0.71069,-0.30816 0.25276,0 0.51702,0.11501 0.7107,0.30816 l 1.9467,1.9413 c 0.10485,-0.32958 0.1854,-0.68351
0.1854,-1.0477 0,-1.9061 -1.5494,-3.45
13 -3.4608,-3.4513 -0.39933,0 -0.78639,0.0916 -1.1433,0.2157 l -1.2051,-1.2018 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path3910"
+ style="color:#000000;text-indent:0;text-transform:none;fill:#bebebe"
+ d="m 455.86,462 -1.5425,1.4375 c -0.45151,0.42079 -0.5292,1.1488 -0.2663,1.7065 l -5.8882,5.9958 a
1.4917,1.4876 0 0 0 -0.0311,2.5e-4 1.4917,1.4876 0 0 0 -0.84016,-0.1484 1.4917,1.4876 0 0 0 -0.86663,0.44059
l -3.9462,3.9973 a 1.49411,1.49001 0 1 0 2.1294,2.0907 l 3.9462,-3.9973 a 1.4917,1.4876 0 0 0 0.29713,-1.7377
l 5.8885,-5.9648 c 0.55782,0.24837 1.2732,0.14697 1.7068,-0.2922 l 1.41,-1.57 -2,-1.97 z"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index 32b1b44..830532e 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -191,6 +191,7 @@ scalable_images = \
scalable/gimp-prefs-new-image.svg \
scalable/gimp-prefs-playground.svg \
scalable/gimp-prefs-session.svg \
+ scalable/gimp-prefs-system.svg \
scalable/gimp-prefs-system-resources.svg \
scalable/gimp-prefs-theme.svg \
scalable/gimp-prefs-toolbox.svg \
@@ -636,6 +637,7 @@ icons16_images = \
16/gimp-prefs-icon-theme.png \
16/gimp-prefs-image-windows.png \
16/gimp-prefs-interface.png \
+ 16/gimp-prefs-system.png \
16/gimp-prefs-theme.png \
16/gimp-prefs-toolbox.png \
16/gimp-prefs-window-management.png \
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index 5a8928d..816ccc1 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -101,6 +101,7 @@ static const GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_VIEW_FULLSCREEN, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_VIEW_REFRESH, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_WINDOW_NEW, NULL, 0, 0, LIBGIMP_DOMAIN },
+ { GIMP_STOCK_PREFS_SYSTEM, 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 269e1cc..8bf59d6 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -76,6 +76,8 @@ G_BEGIN_DECLS
#define GIMP_STOCK_VIEW_FULLSCREEN "gimp-view-fullscreen"
#define GIMP_STOCK_VIEW_REFRESH "gimp-view-refresh"
#define GIMP_STOCK_WINDOW_NEW "gimp-window-new"
+#define GIMP_STOCK_PREFS_SYSTEM "gimp-prefs-system"
+
#define GIMP_STOCK_GRADIENT_LINEAR "gimp-gradient-linear"
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index 39e5780..c26c885 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -1047,7 +1047,7 @@ design_op_menu_create (GtkWidget *window)
N_("Re_center"), "<control>C", N_("Recompute Center"),
G_CALLBACK (recompute_center_cb) },
- { "options", "preferences-system",
+ { "options", GIMP_STOCK_PREFS_SYSTEM,
N_("Render Options"), NULL, NULL,
G_CALLBACK (ifs_compose_options_callback) }
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]