[gimp] themes: install all icons in an icon theme in share/themes/Default/icons
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] themes: install all icons in an icon theme in share/themes/Default/icons
- Date: Tue, 6 May 2014 20:47:45 +0000 (UTC)
commit ff8e5f9381427c0e2523367fdc2ae7984796d8c1
Author: Michael Natterer <mitch gimp org>
Date: Tue May 6 22:38:11 2014 +0200
themes: install all icons in an icon theme in share/themes/Default/icons
themes/Default/gtkrc | 8 +-
themes/Default/images/Makefile.am | 319 +++++++++++++++++++------------------
themes/Small/gtkrc | 8 +-
3 files changed, 168 insertions(+), 167 deletions(-)
---
diff --git a/themes/Default/gtkrc b/themes/Default/gtkrc
index b3fa812..5be1c6c 100644
--- a/themes/Default/gtkrc
+++ b/themes/Default/gtkrc
@@ -21,19 +21,19 @@ style "gimp-default-style"
{
stock["gtk-dialog-error"] =
{
- { "images/stock-error-64.png", *, *, "gtk-dialog" }
+ { "icons/hicolor/64x64/apps/gimp-error.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-info"] =
{
- { "images/stock-info-64.png", *, *, "gtk-dialog" }
+ { "icons/hicolor/64x64/apps/gimp-info.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-question"] =
{
- { "images/stock-question-64.png", *, *, "gtk-dialog" }
+ { "icons/hicolor/64x64/apps/gimp-question.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-warning"] =
{
- { "images/stock-warning-64.png", *, *, "gtk-dialog" }
+ { "icons/hicolor/64x64/apps/gimp-warning.png", *, *, "gtk-dialog" }
}
GtkPaned::handle-size = 6
diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am
index 4a0448e..0b2ae4b 100644
--- a/themes/Default/images/Makefile.am
+++ b/themes/Default/images/Makefile.am
@@ -3,6 +3,15 @@
SUBDIRS = preferences
themedatadir = $(gimpdatadir)/themes/Default/images
+themedata12dir = $(gimpdatadir)/themes/Default/icons/hicolor/12x12/apps
+themedata16dir = $(gimpdatadir)/themes/Default/icons/hicolor/16x16/apps
+themedata18dir = $(gimpdatadir)/themes/Default/icons/hicolor/18x18/apps
+themedata20dir = $(gimpdatadir)/themes/Default/icons/hicolor/20x20/apps
+themedata22dir = $(gimpdatadir)/themes/Default/icons/hicolor/22x22/apps
+themedata24dir = $(gimpdatadir)/themes/Default/icons/hicolor/24x24/apps
+themedata32dir = $(gimpdatadir)/themes/Default/icons/hicolor/32x32/apps
+themedata48dir = $(gimpdatadir)/themes/Default/icons/hicolor/48x48/apps
+themedata64dir = $(gimpdatadir)/themes/Default/icons/hicolor/64x64/apps
## A warning Wilber that is used from the core
@@ -16,17 +25,20 @@ CORE_VARIABLES = \
## Compiled in stock icons
-STOCK_MENU_IMAGES = \
- 12/gimp-close.png \
- 12/gimp-default-colors.png \
- 12/gimp-eye.png \
- 12/gimp-menu-left.png \
- 12/gimp-menu-right.png \
- 12/gimp-quick-mask-off.png \
- 12/gimp-quick-mask-on.png \
- 12/gimp-swap-colors.png \
- 12/gimp-zoom-follow-window.png \
- \
+themedata12_DATA = \
+ 12/gimp-close.png \
+ 12/gimp-default-colors.png \
+ 12/gimp-eye.png \
+ 12/gimp-linked.png \
+ 12/gimp-menu-left.png \
+ 12/gimp-menu-right.png \
+ 12/gimp-quick-mask-off.png \
+ 12/gimp-quick-mask-on.png \
+ 12/gimp-swap-colors.png \
+ 12/gimp-zoom-follow-window.png
+
+themedata16_DATA = \
+ 16/gimp-anchor.png \
16/gimp-cap-butt.png \
16/gimp-cap-round.png \
16/gimp-cap-square.png \
@@ -39,6 +51,8 @@ STOCK_MENU_IMAGES = \
16/gimp-channel-red.png \
16/gimp-channel.png \
16/gimp-channels.png \
+ 16/gimp-color-pick-from-screen.png \
+ 16/gimp-color-triangle.png \
16/gimp-colormap.png \
16/gimp-controller-keyboard.png \
16/gimp-controller-linux-input.png \
@@ -49,6 +63,8 @@ STOCK_MENU_IMAGES = \
16/gimp-convert-indexed.png \
16/gimp-convert-rgb.png \
16/gimp-cursor.png \
+ 16/gimp-curve-free.png \
+ 16/gimp-curve-smooth.png \
16/gimp-device-status.png \
16/gimp-display-filter-colorblind.png \
16/gimp-display-filter-contrast.png \
@@ -56,7 +72,9 @@ STOCK_MENU_IMAGES = \
16/gimp-display-filter-lcms.png \
16/gimp-display-filter-proof.png \
16/gimp-display-filter.png \
+ 16/gimp-duplicate.png \
16/gimp-dynamics.png \
+ 16/gimp-edit.png \
16/gimp-flip-horizontal.png \
16/gimp-flip-vertical.png \
16/gimp-floating-selection.png \
@@ -93,11 +111,15 @@ STOCK_MENU_IMAGES = \
16/gimp-merge-down.png \
16/gimp-move-to-screen.png \
16/gimp-navigation.png \
+ 16/gimp-paste-as-new.png \
+ 16/gimp-paste-into.png \
+ 16/gimp-path-stroke.png \
16/gimp-path.png \
16/gimp-paths.png \
16/gimp-plugin.png \
16/gimp-portrait.png \
16/gimp-print-resolution.png \
+ 16/gimp-reset.png \
16/gimp-reshow-filter.png \
16/gimp-resize.png \
16/gimp-rotate-180.png \
@@ -105,11 +127,18 @@ STOCK_MENU_IMAGES = \
16/gimp-rotate-90.png \
16/gimp-sample-point.png \
16/gimp-scale.png \
+ 16/gimp-selection-add.png \
16/gimp-selection-all.png \
16/gimp-selection-border.png \
16/gimp-selection-grow.png \
+ 16/gimp-selection-intersect.png \
16/gimp-selection-none.png \
+ 16/gimp-selection-replace.png \
16/gimp-selection-shrink.png \
+ 16/gimp-selection-stroke.png \
+ 16/gimp-selection-subtract.png \
+ 16/gimp-selection-to-channel.png \
+ 16/gimp-selection-to-path.png \
16/gimp-selection.png \
16/gimp-shape-circle.png \
16/gimp-shape-diamond.png \
@@ -117,8 +146,53 @@ STOCK_MENU_IMAGES = \
16/gimp-template.png \
16/gimp-text-layer.png \
16/gimp-toilet-paper.png \
+ 16/gimp-tool-airbrush.png \
+ 16/gimp-tool-align.png \
+ 16/gimp-tool-blend.png \
+ 16/gimp-tool-blur.png \
+ 16/gimp-tool-brightness-contrast.png \
+ 16/gimp-tool-bucket-fill.png \
+ 16/gimp-tool-by-color-select.png \
+ 16/gimp-tool-cage.png \
+ 16/gimp-tool-clone.png \
+ 16/gimp-tool-color-balance.png \
+ 16/gimp-tool-color-picker.png \
+ 16/gimp-tool-colorize.png \
+ 16/gimp-tool-crop.png \
+ 16/gimp-tool-curves.png \
+ 16/gimp-tool-desaturate.png \
+ 16/gimp-tool-dodge.png \
+ 16/gimp-tool-ellipse-select.png \
+ 16/gimp-tool-eraser.png \
+ 16/gimp-tool-flip.png \
+ 16/gimp-tool-foreground-select.png \
+ 16/gimp-tool-free-select.png \
+ 16/gimp-tool-fuzzy-select.png \
+ 16/gimp-tool-heal.png \
+ 16/gimp-tool-hue-saturation.png \
+ 16/gimp-tool-ink.png \
+ 16/gimp-tool-iscissors.png \
+ 16/gimp-tool-levels.png \
+ 16/gimp-tool-measure.png \
+ 16/gimp-tool-move.png \
16/gimp-tool-options.png \
+ 16/gimp-tool-paintbrush.png \
+ 16/gimp-tool-path.png \
+ 16/gimp-tool-pencil.png \
+ 16/gimp-tool-perspective-clone.png \
+ 16/gimp-tool-perspective.png \
+ 16/gimp-tool-posterize.png \
16/gimp-tool-preset.png \
+ 16/gimp-tool-rect-select.png \
+ 16/gimp-tool-rotate.png \
+ 16/gimp-tool-scale.png \
+ 16/gimp-tool-shear.png \
+ 16/gimp-tool-smudge.png \
+ 16/gimp-tool-text.png \
+ 16/gimp-tool-threshold.png \
+ 16/gimp-tool-unified-transform.png \
+ 16/gimp-tool-warp.png \
+ 16/gimp-tool-zoom.png \
16/gimp-tools.png \
16/gimp-transparency.png \
16/gimp-undo-history.png \
@@ -126,39 +200,18 @@ STOCK_MENU_IMAGES = \
16/gimp-video.png \
16/gimp-warning.png \
16/gimp-web.png \
- 16/gimp-wilber.png \
- \
- 22/gimp-tool-preset.png
+ 16/gimp-wilber.png
-STOCK_BUTTON_IMAGES = \
- 12/gimp-linked.png \
- \
- 16/gimp-anchor.png \
- 16/gimp-color-pick-from-screen.png \
- 16/gimp-color-triangle.png \
- 16/gimp-curve-free.png \
- 16/gimp-curve-smooth.png \
- 16/gimp-duplicate.png \
- 16/gimp-edit.png \
- 16/gimp-paste-as-new.png \
- 16/gimp-paste-into.png \
- 16/gimp-path-stroke.png \
- 16/gimp-reset.png \
- 16/gimp-selection-add.png \
- 16/gimp-selection-intersect.png \
- 16/gimp-selection-replace.png \
- 16/gimp-selection-stroke.png \
- 16/gimp-selection-subtract.png \
- 16/gimp-selection-to-channel.png \
- 16/gimp-selection-to-path.png \
- \
+themedata18_DATA = \
18/gimp-color-picker-black.png \
18/gimp-color-picker-gray.png \
- 18/gimp-color-picker-white.png \
- \
+ 18/gimp-color-picker-white.png
+
+themedata20_DATA = \
20/gimp-eye.png \
- 20/gimp-linked.png \
- \
+ 20/gimp-linked.png
+
+themedata22_DATA = \
22/gimp-char-picker.png \
22/gimp-dynamics.png \
22/gimp-gegl.png \
@@ -168,8 +221,55 @@ STOCK_BUTTON_IMAGES = \
22/gimp-line-spacing.png \
22/gimp-path.png \
22/gimp-paths.png \
- 22/gimp-wilber.png \
- \
+ 22/gimp-tool-airbrush.png \
+ 22/gimp-tool-align.png \
+ 22/gimp-tool-blend.png \
+ 22/gimp-tool-blur.png \
+ 22/gimp-tool-brightness-contrast.png \
+ 22/gimp-tool-bucket-fill.png \
+ 22/gimp-tool-by-color-select.png \
+ 22/gimp-tool-cage.png \
+ 22/gimp-tool-clone.png \
+ 22/gimp-tool-color-balance.png \
+ 22/gimp-tool-color-picker.png \
+ 22/gimp-tool-colorize.png \
+ 22/gimp-tool-crop.png \
+ 22/gimp-tool-curves.png \
+ 22/gimp-tool-desaturate.png \
+ 22/gimp-tool-dodge.png \
+ 22/gimp-tool-ellipse-select.png \
+ 22/gimp-tool-eraser.png \
+ 22/gimp-tool-flip.png \
+ 22/gimp-tool-foreground-select.png \
+ 22/gimp-tool-free-select.png \
+ 22/gimp-tool-fuzzy-select.png \
+ 22/gimp-tool-heal.png \
+ 22/gimp-tool-hue-saturation.png \
+ 22/gimp-tool-ink.png \
+ 22/gimp-tool-iscissors.png \
+ 22/gimp-tool-levels.png \
+ 22/gimp-tool-measure.png \
+ 22/gimp-tool-move.png \
+ 22/gimp-tool-paintbrush.png \
+ 22/gimp-tool-path.png \
+ 22/gimp-tool-pencil.png \
+ 22/gimp-tool-perspective-clone.png \
+ 22/gimp-tool-perspective.png \
+ 22/gimp-tool-posterize.png \
+ 22/gimp-tool-preset.png \
+ 22/gimp-tool-rect-select.png \
+ 22/gimp-tool-rotate.png \
+ 22/gimp-tool-scale.png \
+ 22/gimp-tool-shear.png \
+ 22/gimp-tool-smudge.png \
+ 22/gimp-tool-text.png \
+ 22/gimp-tool-threshold.png \
+ 22/gimp-tool-unified-transform.png \
+ 22/gimp-tool-warp.png \
+ 22/gimp-tool-zoom.png \
+ 22/gimp-wilber.png
+
+themedata24_DATA = \
24/gimp-center.png \
24/gimp-channel-alpha.png \
24/gimp-channel-blue.png \
@@ -233,7 +333,7 @@ STOCK_BUTTON_IMAGES = \
24/gimp-warning.png \
24/gimp-web.png
-STOCK_DND_IMAGES = \
+themedata32_DATA = \
32/gimp-channel-alpha.png \
32/gimp-channel-blue.png \
32/gimp-channel-gray.png \
@@ -248,7 +348,7 @@ STOCK_DND_IMAGES = \
32/gimp-text-layer.png \
32/gimp-user-manual.png
-STOCK_DIALOG_IMAGES = \
+themedata48_DATA = \
48/gimp-channel-alpha.png \
48/gimp-channel-blue.png \
48/gimp-channel-gray.png \
@@ -260,8 +360,9 @@ STOCK_DIALOG_IMAGES = \
48/gimp-image.png \
48/gimp-layer-mask.png \
48/gimp-layer.png \
- 48/gimp-text-layer.png \
- \
+ 48/gimp-text-layer.png
+
+themedata64_DATA = \
64/gimp-error.png \
64/gimp-frame.png \
64/gimp-info.png \
@@ -272,119 +373,19 @@ STOCK_DIALOG_IMAGES = \
64/gimp-wilber-eek.png \
64/gimp-wilber.png
-STOCK_TOOL_IMAGES = \
- 16/gimp-tool-airbrush.png \
- 16/gimp-tool-align.png \
- 16/gimp-tool-blend.png \
- 16/gimp-tool-blur.png \
- 16/gimp-tool-brightness-contrast.png \
- 16/gimp-tool-bucket-fill.png \
- 16/gimp-tool-by-color-select.png \
- 16/gimp-tool-cage.png \
- 16/gimp-tool-clone.png \
- 16/gimp-tool-color-balance.png \
- 16/gimp-tool-color-picker.png \
- 16/gimp-tool-colorize.png \
- 16/gimp-tool-crop.png \
- 16/gimp-tool-curves.png \
- 16/gimp-tool-desaturate.png \
- 16/gimp-tool-dodge.png \
- 16/gimp-tool-ellipse-select.png \
- 16/gimp-tool-eraser.png \
- 16/gimp-tool-flip.png \
- 16/gimp-tool-foreground-select.png \
- 16/gimp-tool-free-select.png \
- 16/gimp-tool-fuzzy-select.png \
- 16/gimp-tool-heal.png \
- 16/gimp-tool-hue-saturation.png \
- 16/gimp-tool-ink.png \
- 16/gimp-tool-iscissors.png \
- 16/gimp-tool-levels.png \
- 16/gimp-tool-measure.png \
- 16/gimp-tool-move.png \
- 16/gimp-tool-paintbrush.png \
- 16/gimp-tool-path.png \
- 16/gimp-tool-pencil.png \
- 16/gimp-tool-perspective-clone.png \
- 16/gimp-tool-perspective.png \
- 16/gimp-tool-posterize.png \
- 16/gimp-tool-rect-select.png \
- 16/gimp-tool-rotate.png \
- 16/gimp-tool-scale.png \
- 16/gimp-tool-shear.png \
- 16/gimp-tool-smudge.png \
- 16/gimp-tool-text.png \
- 16/gimp-tool-threshold.png \
- 16/gimp-tool-unified-transform.png \
- 16/gimp-tool-warp.png \
- 16/gimp-tool-zoom.png \
- \
- 22/gimp-tool-airbrush.png \
- 22/gimp-tool-align.png \
- 22/gimp-tool-blend.png \
- 22/gimp-tool-blur.png \
- 22/gimp-tool-brightness-contrast.png \
- 22/gimp-tool-bucket-fill.png \
- 22/gimp-tool-by-color-select.png \
- 22/gimp-tool-cage.png \
- 22/gimp-tool-clone.png \
- 22/gimp-tool-color-balance.png \
- 22/gimp-tool-color-picker.png \
- 22/gimp-tool-colorize.png \
- 22/gimp-tool-crop.png \
- 22/gimp-tool-curves.png \
- 22/gimp-tool-desaturate.png \
- 22/gimp-tool-dodge.png \
- 22/gimp-tool-ellipse-select.png \
- 22/gimp-tool-eraser.png \
- 22/gimp-tool-flip.png \
- 22/gimp-tool-foreground-select.png \
- 22/gimp-tool-free-select.png \
- 22/gimp-tool-fuzzy-select.png \
- 22/gimp-tool-heal.png \
- 22/gimp-tool-hue-saturation.png \
- 22/gimp-tool-ink.png \
- 22/gimp-tool-iscissors.png \
- 22/gimp-tool-levels.png \
- 22/gimp-tool-measure.png \
- 22/gimp-tool-move.png \
- 22/gimp-tool-paintbrush.png \
- 22/gimp-tool-path.png \
- 22/gimp-tool-pencil.png \
- 22/gimp-tool-perspective-clone.png \
- 22/gimp-tool-perspective.png \
- 22/gimp-tool-posterize.png \
- 22/gimp-tool-rect-select.png \
- 22/gimp-tool-rotate.png \
- 22/gimp-tool-scale.png \
- 22/gimp-tool-shear.png \
- 22/gimp-tool-smudge.png \
- 22/gimp-tool-text.png \
- 22/gimp-tool-threshold.png \
- 22/gimp-tool-unified-transform.png \
- 22/gimp-tool-warp.png \
- 22/gimp-tool-zoom.png
-
-STOCK_IMAGES = \
- $(STOCK_MENU_IMAGES) \
- $(STOCK_BUTTON_IMAGES) \
- $(STOCK_DND_IMAGES) \
- $(STOCK_DIALOG_IMAGES) \
- $(STOCK_TOOL_IMAGES)
-
-
-themedata_DATA = \
- 64/gimp-error.png \
- 64/gimp-info.png \
- 64/gimp-question.png \
- 64/gimp-warning.png
-
+ICON_IMAGES = \
+ $(themedata12_DATA) \
+ $(themedata16_DATA) \
+ $(themedata18_DATA) \
+ $(themedata20_DATA) \
+ $(themedata22_DATA) \
+ $(themedata24_DATA) \
+ $(themedata32_DATA) \
+ $(themedata48_DATA) \
+ $(themedata64_DATA)
EXTRA_DIST = \
- $(themedata_DATA) \
- $(CORE_IMAGES) \
- $(STOCK_IMAGES) \
- $(WILBER_IMAGES) \
+ $(ICON_IMAGES) \
gimp-dialog-icons.xcf.gz
noinst_DATA = \
@@ -394,9 +395,9 @@ noinst_DATA = \
CLEANFILES = $(noinst_DATA) stock-icons.list
-stock-icons.list: $(STOCK_IMAGES) Makefile.am
+stock-icons.list: $(ICON_IMAGES) Makefile.am
$(AM_V_GEN) ( rm -f $@; \
- for image in $(STOCK_IMAGES); do \
+ for image in $(ICON_IMAGES); do \
echo $$image | \
sed -e 's|\(.*\)/\(.*\).png|\2-\1.png|' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \
echo " $(srcdir)/$$image" >> $@; \
diff --git a/themes/Small/gtkrc b/themes/Small/gtkrc
index de80109..c78d350 100644
--- a/themes/Small/gtkrc
+++ b/themes/Small/gtkrc
@@ -15,19 +15,19 @@ style "gimp-default-style"
{
stock["gtk-dialog-error"] =
{
- { "../Default/images/stock-error-64.png", *, *, "gtk-dialog" }
+ { "../Default/icons/hicolor/64x64/apps/gimp-error.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-info"] =
{
- { "../Default/images/stock-info-64.png", *, *, "gtk-dialog" }
+ { "../Default/icons/hicolor/64x64/apps/gimp-info.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-question"] =
{
- { "../Default/images/stock-question-64.png", *, *, "gtk-dialog" }
+ { "../Default/icons/hicolor/64x64/apps/gimp-question.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-warning"] =
{
- { "../Default/images/stock-warning-64.png", *, *, "gtk-dialog" }
+ { "../Default/icons/hicolor/64x64/apps/gimp-warning.png", *, *, "gtk-dialog" }
}
# Uncommenting this line allows to set a different (smaller) font for GIMP.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
