[gimp] icons, themes, app: move the preferences images into the icon theme
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] icons, themes, app: move the preferences images into the icon theme
- Date: Mon, 12 May 2014 01:26:33 +0000 (UTC)
commit 033719bfa2ea9323cc04118a0d4576b6505bec9f
Author: Michael Natterer <mitch gimp org>
Date: Mon May 12 03:24:09 2014 +0200
icons, themes, app: move the preferences images into the icon theme
app/dialogs/preferences-dialog.c | 75 +++------
configure.ac | 2 -
.../16/gimp-prefs-folders-brushes.png | Bin 635 -> 635 bytes
.../16/gimp-prefs-folders-dynamics.png | Bin 722 -> 722 bytes
.../16/gimp-prefs-folders-environ.png | Bin 860 -> 860 bytes
.../16/gimp-prefs-folders-fonts.png | Bin 548 -> 548 bytes
.../16/gimp-prefs-folders-gradients.png | Bin 383 -> 383 bytes
.../16/gimp-prefs-folders-interp.png | Bin 609 -> 609 bytes
.../16/gimp-prefs-folders-modules.png | Bin 851 -> 851 bytes
.../16/gimp-prefs-folders-palettes.png | Bin 910 -> 910 bytes
.../16/gimp-prefs-folders-patterns.png | Bin 822 -> 822 bytes
.../16/gimp-prefs-folders-plug-ins.png | Bin 719 -> 719 bytes
.../16/gimp-prefs-folders-scripts.png | Bin 609 -> 609 bytes
.../16/gimp-prefs-folders-themes.png | Bin 652 -> 652 bytes
.../16/gimp-prefs-folders-tool-plug-ins.png | Bin 900 -> 900 bytes
.../16/gimp-prefs-folders-tool-presets.png | Bin 656 -> 656 bytes
.../16/gimp-prefs-folders-tools.png | Bin 635 -> 635 bytes
.../16/gimp-prefs-image-windows.png | Bin 518 -> 518 bytes
.../16/gimp-prefs-interface.png | Bin 501 -> 501 bytes
.../theme-16.png => icons/16/gimp-prefs-theme.png | Bin 479 -> 479 bytes
.../16/gimp-prefs-toolbox.png | Bin 495 -> 495 bytes
.../16/gimp-prefs-window-management.png | Bin 322 -> 322 bytes
.../22/gimp-prefs-color-management.png | Bin 1073 -> 1073 bytes
.../22/gimp-prefs-controllers.png | Bin 1312 -> 1312 bytes
.../22/gimp-prefs-default-grid.png | Bin 865 -> 865 bytes
.../22/gimp-prefs-display.png | Bin 1066 -> 1066 bytes
.../22/gimp-prefs-environment.png | Bin 848 -> 848 bytes
.../22/gimp-prefs-folders-brushes.png | Bin 885 -> 885 bytes
.../22/gimp-prefs-folders-dynamics.png | Bin 997 -> 997 bytes
.../22/gimp-prefs-folders-environ.png | Bin 1283 -> 1283 bytes
.../22/gimp-prefs-folders-fonts.png | Bin 858 -> 858 bytes
.../22/gimp-prefs-folders-gradients.png | Bin 602 -> 602 bytes
.../22/gimp-prefs-folders-interp.png | Bin 1357 -> 1357 bytes
.../22/gimp-prefs-folders-modules.png | Bin 1301 -> 1301 bytes
.../22/gimp-prefs-folders-palettes.png | Bin 1264 -> 1264 bytes
.../22/gimp-prefs-folders-patterns.png | Bin 1255 -> 1255 bytes
.../22/gimp-prefs-folders-plug-ins.png | Bin 1110 -> 1110 bytes
.../22/gimp-prefs-folders-scripts.png | Bin 991 -> 991 bytes
.../22/gimp-prefs-folders-themes.png | Bin 971 -> 971 bytes
.../22/gimp-prefs-folders-tool-plug-ins.png | Bin 1356 -> 1356 bytes
.../22/gimp-prefs-folders-tool-presets.png | Bin 933 -> 933 bytes
.../22/gimp-prefs-folders-tools.png | Bin 885 -> 885 bytes
.../22/gimp-prefs-folders.png | Bin 665 -> 665 bytes
.../22/gimp-prefs-help-system.png | Bin 1518 -> 1518 bytes
.../22/gimp-prefs-image-title.png | Bin 612 -> 612 bytes
.../22/gimp-prefs-image-windows.png | Bin 748 -> 748 bytes
.../22/gimp-prefs-input-devices.png | Bin 1110 -> 1110 bytes
.../22/gimp-prefs-interface.png | Bin 1027 -> 1027 bytes
.../22/gimp-prefs-new-image.png | Bin 1032 -> 1032 bytes
.../22/gimp-prefs-session.png | Bin 1486 -> 1486 bytes
.../theme-22.png => icons/22/gimp-prefs-theme.png | Bin 785 -> 785 bytes
.../22/gimp-prefs-tool-options.png | Bin 1053 -> 1053 bytes
.../22/gimp-prefs-toolbox.png | Bin 850 -> 850 bytes
.../22/gimp-prefs-window-management.png | Bin 437 -> 437 bytes
.../48/gimp-prefs-color-management.png | Bin 3245 -> 3245 bytes
.../48/gimp-prefs-controllers.png | Bin 3417 -> 3417 bytes
.../48/gimp-prefs-default-comment.png | Bin 3023 -> 3023 bytes
.../48/gimp-prefs-default-grid.png | Bin 2519 -> 2519 bytes
.../display.png => icons/48/gimp-prefs-display.png | Bin 2870 -> 2870 bytes
.../48/gimp-prefs-environment.png | Bin 2588 -> 2588 bytes
.../48/gimp-prefs-folders-brushes.png | Bin 2323 -> 2323 bytes
.../48/gimp-prefs-folders-dynamics.png | Bin 2062 -> 2062 bytes
.../48/gimp-prefs-folders-environ.png | Bin 2478 -> 2478 bytes
.../48/gimp-prefs-folders-fonts.png | Bin 1864 -> 1864 bytes
.../48/gimp-prefs-folders-gradients.png | Bin 1706 -> 1706 bytes
.../48/gimp-prefs-folders-interp.png | Bin 3389 -> 3389 bytes
.../48/gimp-prefs-folders-modules.png | Bin 2437 -> 2437 bytes
.../48/gimp-prefs-folders-palettes.png | Bin 2409 -> 2409 bytes
.../48/gimp-prefs-folders-patterns.png | Bin 2959 -> 2959 bytes
.../48/gimp-prefs-folders-plug-ins.png | Bin 2335 -> 2335 bytes
.../48/gimp-prefs-folders-scripts.png | Bin 2204 -> 2204 bytes
.../48/gimp-prefs-folders-themes.png | Bin 1972 -> 1972 bytes
.../48/gimp-prefs-folders-tool-plug-ins.png | Bin 2852 -> 2852 bytes
.../48/gimp-prefs-folders-tool-presets.png | Bin 2276 -> 2276 bytes
.../48/gimp-prefs-folders-tools.png | Bin 2323 -> 2323 bytes
.../folders.png => icons/48/gimp-prefs-folders.png | Bin 1023 -> 1023 bytes
.../48/gimp-prefs-help-system.png | Bin 4634 -> 4634 bytes
.../48/gimp-prefs-image-title.png | Bin 1316 -> 1316 bytes
.../48/gimp-prefs-image-windows.png | Bin 2254 -> 2254 bytes
.../48/gimp-prefs-input-devices.png | Bin 3598 -> 3598 bytes
.../48/gimp-prefs-interface.png | Bin 1954 -> 1954 bytes
.../48/gimp-prefs-new-image.png | Bin 3517 -> 3517 bytes
.../session.png => icons/48/gimp-prefs-session.png | Bin 5356 -> 5356 bytes
.../theme.png => icons/48/gimp-prefs-theme.png | Bin 2243 -> 2243 bytes
.../48/gimp-prefs-tool-options.png | Bin 2674 -> 2674 bytes
.../toolbox.png => icons/48/gimp-prefs-toolbox.png | Bin 1467 -> 1467 bytes
.../48/gimp-prefs-window-management.png | Bin 852 -> 852 bytes
icons/Makefile.am | 171 +++++++++++++++++---
themes/Default/Makefile.am | 2 -
themes/Default/images/.gitignore | 2 -
themes/Default/images/Makefile.am | 3 -
themes/Default/images/preferences/.gitignore | 4 -
themes/Default/images/preferences/Makefile.am | 75 ---------
93 files changed, 176 insertions(+), 158 deletions(-)
---
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 2b967f4..1276b22 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1211,43 +1211,22 @@ prefs_idle_unref (gpointer data)
static GdkPixbuf *
prefs_get_pixbufs (Gimp *gimp,
+ GtkWidget *widget,
const gchar *name,
GdkPixbuf **small_pixbuf)
{
GdkPixbuf *pixbuf = NULL;
- gchar *basename;
- gchar *filename;
-
- *small_pixbuf = NULL;
-
- basename = g_strconcat (name, ".png", NULL);
- filename = themes_get_theme_file (gimp, "images", "preferences",
- basename, NULL);
-
- if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
- pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ gchar *icon_name;
- g_free (filename);
- g_free (basename);
-
- basename = g_strconcat (name, "-22.png", NULL);
- filename = themes_get_theme_file (gimp, "images", "preferences",
- basename, NULL);
+ icon_name = g_strconcat ("gimp-prefs-", name, NULL);
- if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
- *small_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- else if (pixbuf)
- *small_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
- 22, 22, GDK_INTERP_BILINEAR);
-
- g_free (filename);
- g_free (basename);
+ pixbuf = gimp_widget_load_icon (widget, icon_name, 48);
+ g_idle_add (prefs_idle_unref, pixbuf);
- if (pixbuf)
- g_idle_add (prefs_idle_unref, pixbuf);
+ *small_pixbuf = gimp_widget_load_icon (widget, icon_name, 22);
+ g_idle_add (prefs_idle_unref, *small_pixbuf);
- if (*small_pixbuf)
- g_idle_add (prefs_idle_unref, *small_pixbuf);
+ g_free (icon_name);
return pixbuf;
}
@@ -1322,7 +1301,7 @@ prefs_dialog_new (Gimp *gimp,
/*****************/
/* Environment */
/*****************/
- pixbuf = prefs_get_pixbufs (gimp, "environment", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "environment", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Environment"),
pixbuf,
@@ -1397,7 +1376,7 @@ prefs_dialog_new (Gimp *gimp,
/***************/
/* Interface */
/***************/
- pixbuf = prefs_get_pixbufs (gimp, "interface", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "interface", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("User Interface"),
pixbuf,
@@ -1478,7 +1457,7 @@ prefs_dialog_new (Gimp *gimp,
/***********/
/* Theme */
/***********/
- pixbuf = prefs_get_pixbufs (gimp, "theme", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "theme", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Theme"),
pixbuf,
@@ -1580,7 +1559,7 @@ prefs_dialog_new (Gimp *gimp,
/*****************/
/* Help System */
/*****************/
- pixbuf = prefs_get_pixbufs (gimp, "help-system", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "help-system", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Help System"),
pixbuf,
@@ -1681,7 +1660,7 @@ prefs_dialog_new (Gimp *gimp,
/******************/
/* Tool Options */
/******************/
- pixbuf = prefs_get_pixbufs (gimp, "tool-options", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "tool-options", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
C_("preferences", "Tool Options"),
pixbuf,
@@ -1770,7 +1749,7 @@ prefs_dialog_new (Gimp *gimp,
/*************/
/* Toolbox */
/*************/
- pixbuf = prefs_get_pixbufs (gimp, "toolbox", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "toolbox", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Toolbox"),
pixbuf,
@@ -1816,7 +1795,7 @@ prefs_dialog_new (Gimp *gimp,
/***********************/
/* Default New Image */
/***********************/
- pixbuf = prefs_get_pixbufs (gimp, "new-image", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "new-image", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Default New Image"),
pixbuf,
@@ -1868,7 +1847,7 @@ prefs_dialog_new (Gimp *gimp,
/******************/
/* Default Grid */
/******************/
- pixbuf = prefs_get_pixbufs (gimp, "default-grid", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "default-grid", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Default Image Grid"),
pixbuf,
@@ -1890,7 +1869,7 @@ prefs_dialog_new (Gimp *gimp,
/*******************/
/* Image Windows */
/*******************/
- pixbuf = prefs_get_pixbufs (gimp, "image-windows", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "image-windows", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Image Windows"),
pixbuf,
@@ -1971,7 +1950,7 @@ prefs_dialog_new (Gimp *gimp,
/********************************/
/* Image Windows / Appearance */
/********************************/
- pixbuf = prefs_get_pixbufs (gimp, "image-windows", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "image-windows", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Image Window Appearance"),
pixbuf,
@@ -1995,7 +1974,7 @@ prefs_dialog_new (Gimp *gimp,
/****************************************************/
/* Image Windows / Image Title & Statusbar Format */
/****************************************************/
- pixbuf = prefs_get_pixbufs (gimp, "image-title", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "image-title", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Image Title & Statusbar Format"),
pixbuf,
@@ -2120,7 +2099,7 @@ prefs_dialog_new (Gimp *gimp,
/********************************/
/* Image Windows / Behavior */
/********************************/
- pixbuf = prefs_get_pixbufs (gimp, "tool-options", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "tool-options", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Image Window Drawing Behavior"),
pixbuf,
@@ -2143,7 +2122,7 @@ prefs_dialog_new (Gimp *gimp,
/*************/
/* Display */
/*************/
- pixbuf = prefs_get_pixbufs (gimp, "display", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "display", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Display"),
pixbuf,
@@ -2269,7 +2248,7 @@ prefs_dialog_new (Gimp *gimp,
/**********************/
/* Color Management */
/**********************/
- pixbuf = prefs_get_pixbufs (gimp, "color-management", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "color-management", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Color Management"),
pixbuf,
@@ -2419,7 +2398,7 @@ prefs_dialog_new (Gimp *gimp,
/*******************/
/* Input Devices */
/*******************/
- pixbuf = prefs_get_pixbufs (gimp, "input-devices", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "input-devices", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Input Devices"),
pixbuf,
@@ -2465,7 +2444,7 @@ prefs_dialog_new (Gimp *gimp,
/****************************/
/* Additional Controllers */
/****************************/
- pixbuf = prefs_get_pixbufs (gimp, "controllers", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "controllers", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Additional Input Controllers"),
pixbuf,
@@ -2483,7 +2462,7 @@ prefs_dialog_new (Gimp *gimp,
/***********************/
/* Window Management */
/***********************/
- pixbuf = prefs_get_pixbufs (gimp, "window-management", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "window-management", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Window Management"),
pixbuf,
@@ -2540,7 +2519,7 @@ prefs_dialog_new (Gimp *gimp,
/*************/
/* Folders */
/*************/
- pixbuf = prefs_get_pixbufs (gimp, "folders", &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, "folders", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Folders"),
pixbuf,
@@ -2660,7 +2639,7 @@ prefs_dialog_new (Gimp *gimp,
{
GtkWidget *editor;
- pixbuf = prefs_get_pixbufs (gimp, paths[i].icon, &small_pixbuf);
+ pixbuf = prefs_get_pixbufs (gimp, dialog, paths[i].icon, &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
gettext (paths[i].label),
pixbuf,
diff --git a/configure.ac b/configure.ac
index 1fce724..642aa3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2277,8 +2277,6 @@ cursors/Makefile
icons/Makefile
themes/Makefile
themes/Default/Makefile
-themes/Default/images/Makefile
-themes/Default/images/preferences/Makefile
themes/Small/Makefile
data/Makefile
data/brushes/Makefile
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 1c5d29d..934f8cf 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -26,7 +26,7 @@ CORE_VARIABLES = \
icons_DATA = \
index.theme
-icons12_DATA = \
+icons12_IMAGES = \
12/gimp-close.png \
12/gimp-default-colors.png \
12/gimp-linked.png \
@@ -38,7 +38,10 @@ icons12_DATA = \
12/gimp-visible.png \
12/gimp-zoom-follow-window.png
-icons16_DATA = \
+icons12_DATA = \
+ $(icons12_IMAGES)
+
+icons16_IMAGES = \
16/gimp-anchor.png \
16/gimp-cap-butt.png \
16/gimp-cap-round.png \
@@ -203,16 +206,48 @@ icons16_DATA = \
16/gimp-web.png \
16/gimp-wilber.png
-icons18_DATA = \
+icons16_NOSTOCK_IMAGES = \
+ 16/gimp-prefs-folders-brushes.png \
+ 16/gimp-prefs-folders-dynamics.png \
+ 16/gimp-prefs-folders-environ.png \
+ 16/gimp-prefs-folders-fonts.png \
+ 16/gimp-prefs-folders-gradients.png \
+ 16/gimp-prefs-folders-interp.png \
+ 16/gimp-prefs-folders-modules.png \
+ 16/gimp-prefs-folders-palettes.png \
+ 16/gimp-prefs-folders-patterns.png \
+ 16/gimp-prefs-folders-plug-ins.png \
+ 16/gimp-prefs-folders-scripts.png \
+ 16/gimp-prefs-folders-themes.png \
+ 16/gimp-prefs-folders-tool-plug-ins.png \
+ 16/gimp-prefs-folders-tool-presets.png \
+ 16/gimp-prefs-folders-tools.png \
+ 16/gimp-prefs-image-windows.png \
+ 16/gimp-prefs-interface.png \
+ 16/gimp-prefs-theme.png \
+ 16/gimp-prefs-toolbox.png \
+ 16/gimp-prefs-window-management.png
+
+icons16_DATA = \
+ $(icons16_IMAGES) \
+ $(icons16_NOSTOCK_IMAGES)
+
+icons18_IMAGES = \
18/gimp-color-picker-black.png \
18/gimp-color-picker-gray.png \
18/gimp-color-picker-white.png
-icons20_DATA = \
+icons18_DATA = \
+ $(icons18_IMAGES)
+
+icons20_IMAGES = \
20/gimp-linked.png \
20/gimp-visible.png
-icons22_DATA = \
+icons20_DATA = \
+ $(icons20_IMAGES)
+
+icons22_IMAGES = \
22/gimp-char-picker.png \
22/gimp-dynamics.png \
22/gimp-gegl.png \
@@ -270,7 +305,45 @@ icons22_DATA = \
22/gimp-tool-zoom.png \
22/gimp-wilber.png
-icons24_DATA = \
+icons22_NOSTOCK_IMAGES = \
+ 22/gimp-prefs-color-management.png \
+ 22/gimp-prefs-controllers.png \
+ 22/gimp-prefs-default-grid.png \
+ 22/gimp-prefs-display.png \
+ 22/gimp-prefs-environment.png \
+ 22/gimp-prefs-folders-brushes.png \
+ 22/gimp-prefs-folders-dynamics.png \
+ 22/gimp-prefs-folders-environ.png \
+ 22/gimp-prefs-folders-fonts.png \
+ 22/gimp-prefs-folders-gradients.png \
+ 22/gimp-prefs-folders-interp.png \
+ 22/gimp-prefs-folders-modules.png \
+ 22/gimp-prefs-folders-palettes.png \
+ 22/gimp-prefs-folders-patterns.png \
+ 22/gimp-prefs-folders-plug-ins.png \
+ 22/gimp-prefs-folders-scripts.png \
+ 22/gimp-prefs-folders-themes.png \
+ 22/gimp-prefs-folders-tool-plug-ins.png \
+ 22/gimp-prefs-folders-tool-presets.png \
+ 22/gimp-prefs-folders-tools.png \
+ 22/gimp-prefs-folders.png \
+ 22/gimp-prefs-help-system.png \
+ 22/gimp-prefs-image-title.png \
+ 22/gimp-prefs-image-windows.png \
+ 22/gimp-prefs-input-devices.png \
+ 22/gimp-prefs-interface.png \
+ 22/gimp-prefs-new-image.png \
+ 22/gimp-prefs-session.png \
+ 22/gimp-prefs-theme.png \
+ 22/gimp-prefs-tool-options.png \
+ 22/gimp-prefs-toolbox.png \
+ 22/gimp-prefs-window-management.png
+
+icons22_DATA = \
+ $(icons22_IMAGES) \
+ $(icons22_NOSTOCK_IMAGES)
+
+icons24_IMAGES = \
24/gimp-center.png \
24/gimp-channel-alpha.png \
24/gimp-channel-blue.png \
@@ -334,7 +407,10 @@ icons24_DATA = \
24/gimp-warning.png \
24/gimp-web.png
-icons32_DATA = \
+icons24_DATA = \
+ $(icons24_IMAGES)
+
+icons32_IMAGES = \
32/gimp-channel-alpha.png \
32/gimp-channel-blue.png \
32/gimp-channel-gray.png \
@@ -349,7 +425,10 @@ icons32_DATA = \
32/gimp-text-layer.png \
32/gimp-user-manual.png
-icons48_DATA = \
+icons32_DATA = \
+ $(icons32_IMAGES)
+
+icons48_IMAGES = \
48/gimp-channel-alpha.png \
48/gimp-channel-blue.png \
48/gimp-channel-gray.png \
@@ -363,7 +442,46 @@ icons48_DATA = \
48/gimp-layer.png \
48/gimp-text-layer.png
-icons64_DATA = \
+icons48_NOSTOCK_IMAGES = \
+ 48/gimp-prefs-color-management.png \
+ 48/gimp-prefs-controllers.png \
+ 48/gimp-prefs-default-comment.png \
+ 48/gimp-prefs-default-grid.png \
+ 48/gimp-prefs-display.png \
+ 48/gimp-prefs-environment.png \
+ 48/gimp-prefs-folders-brushes.png \
+ 48/gimp-prefs-folders-dynamics.png \
+ 48/gimp-prefs-folders-environ.png \
+ 48/gimp-prefs-folders-fonts.png \
+ 48/gimp-prefs-folders-gradients.png \
+ 48/gimp-prefs-folders-interp.png \
+ 48/gimp-prefs-folders-modules.png \
+ 48/gimp-prefs-folders-palettes.png \
+ 48/gimp-prefs-folders-patterns.png \
+ 48/gimp-prefs-folders-plug-ins.png \
+ 48/gimp-prefs-folders-scripts.png \
+ 48/gimp-prefs-folders-themes.png \
+ 48/gimp-prefs-folders-tool-plug-ins.png \
+ 48/gimp-prefs-folders-tool-presets.png \
+ 48/gimp-prefs-folders-tools.png \
+ 48/gimp-prefs-folders.png \
+ 48/gimp-prefs-help-system.png \
+ 48/gimp-prefs-image-title.png \
+ 48/gimp-prefs-image-windows.png \
+ 48/gimp-prefs-input-devices.png \
+ 48/gimp-prefs-interface.png \
+ 48/gimp-prefs-new-image.png \
+ 48/gimp-prefs-session.png \
+ 48/gimp-prefs-theme.png \
+ 48/gimp-prefs-tool-options.png \
+ 48/gimp-prefs-toolbox.png \
+ 48/gimp-prefs-window-management.png
+
+icons48_DATA = \
+ $(icons48_IMAGES) \
+ $(icons48_NOSTOCK_IMAGES)
+
+icons64_IMAGES = \
64/gimp-error.png \
64/gimp-frame.png \
64/gimp-info.png \
@@ -374,20 +492,29 @@ icons64_DATA = \
64/gimp-wilber-eek.png \
64/gimp-wilber.png
-ICON_IMAGES = \
- $(icons12_DATA) \
- $(icons16_DATA) \
- $(icons18_DATA) \
- $(icons20_DATA) \
- $(icons22_DATA) \
- $(icons24_DATA) \
- $(icons32_DATA) \
- $(icons48_DATA) \
- $(icons64_DATA)
+icons64_DATA = \
+ $(icons64_IMAGES)
+
+STOCK_IMAGES = \
+ $(icons12_IMAGES) \
+ $(icons16_IMAGES) \
+ $(icons18_IMAGES) \
+ $(icons20_IMAGES) \
+ $(icons22_IMAGES) \
+ $(icons24_IMAGES) \
+ $(icons32_IMAGES) \
+ $(icons48_IMAGES) \
+ $(icons64_IMAGES)
+
+NOSTOCK_IMAGES = \
+ $(icons16_NOSTOCK_IMAGES) \
+ $(icons48_NOSTOCK_IMAGES) \
+ $(icons22_NOSTOCK_IMAGES)
EXTRA_DIST = \
$(icons_DATA) \
- $(ICON_IMAGES) \
+ $(STOCK_IMAGES) \
+ $(NOSTOCK_IMAGES) \
gimp-dialog-icons.xcf.gz
noinst_DATA = \
@@ -397,9 +524,9 @@ noinst_DATA = \
CLEANFILES = $(noinst_DATA) stock-icons.list
-stock-icons.list: $(ICON_IMAGES) Makefile.am
+stock-icons.list: $(STOCK_IMAGES) Makefile.am
$(AM_V_GEN) ( rm -f $@; \
- for image in $(ICON_IMAGES); do \
+ for image in $(STOCK_IMAGES); do \
echo $$image | \
sed -e 's|\(.*\)/\(.*\).png|\2-\1.png|' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \
echo " $(srcdir)/$$image" >> $@; \
diff --git a/themes/Default/Makefile.am b/themes/Default/Makefile.am
index 003b09a..e623ef3 100644
--- a/themes/Default/Makefile.am
+++ b/themes/Default/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = images
-
themedatadir = $(gimpdatadir)/themes/Default
themedata_DATA = gtkrc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
