Commit ca8ef2e3 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

desktop/Makefile.am removed.

2006-03-29  Sven Neumann  <sven@gimp.org>

        * desktop/Makefile.am
        * desktop/gimp.png: removed.

        * desktop/16x16/gimp.png
        * desktop/22x22/gimp.png
        * desktop/24x24/gimp.png
        * desktop/32x32/gimp.png
        * desktop/48x48/gimp.png
        * desktop/64x64/gimp.png
        * desktop/scalable/gimp.svg: new application icons in different
        sizes, contributed by Jakub Steiner.

        * themes/Default/images/Makefile.am
        * themes/Default/images/stock-wilber-32.png
        * themes/Default/images/stock-wilber-48.png: removed.

        * libgimpwidgets/Makefile.am
        * libgimpwidgets/wilber-16.png
        * libgimpwidgets/wilber-32.png
        * libgimpwidgets/wilber-48.png
        * libgimpwidgets/wilber-64.png: new window icons, identical to the
        new application icons.

        * libgimpwidgets/gimpwidgets-private.c: use the new window icons.
parent 25f5647e
2006-03-29 Sven Neumann <sven@gimp.org>
* desktop/Makefile.am
* desktop/gimp.png: removed.
* desktop/16x16/gimp.png
* desktop/22x22/gimp.png
* desktop/24x24/gimp.png
* desktop/32x32/gimp.png
* desktop/48x48/gimp.png
* desktop/64x64/gimp.png
* desktop/scalable/gimp.svg: new application icons in different
sizes, contributed by Jakub Steiner.
* themes/Default/images/Makefile.am
* themes/Default/images/stock-wilber-32.png
* themes/Default/images/stock-wilber-48.png: removed.
* libgimpwidgets/Makefile.am
* libgimpwidgets/wilber-16.png
* libgimpwidgets/wilber-32.png
* libgimpwidgets/wilber-48.png
* libgimpwidgets/wilber-64.png: new window icons, identical to the
new application icons.
* libgimpwidgets/gimpwidgets-private.c: use the new window icons.
2006-03-29 Sven Neumann <sven@gimp.org>
* app/plug-in/plug-in-message.c
......
......@@ -9,15 +9,34 @@ if DESKTOP_DATADIR
applicationsdir = @DESKTOP_DATADIR@/applications
applications_DATA = $(desktop_files)
iconsdir = @DESKTOP_DATADIR@/icons/hicolor/48x48/apps
icons_DATA = gimp.png
mimeinfodir = @DESKTOP_DATADIR@/mime-info
mimeinfo_DATA = gimp.keys
registrydir = @DESKTOP_DATADIR@/application-registry
registry_DATA = gimp.applications
icons16dir = @DESKTOP_DATADIR@/icons/hicolor/16x16/apps
icons16_DATA = 16x16/gimp.png
icons22dir = @DESKTOP_DATADIR@/icons/hicolor/22x22/apps
icons22_DATA = 22x22/gimp.png
icons24dir = @DESKTOP_DATADIR@/icons/hicolor/24x24/apps
icons24_DATA = 24x24/gimp.png
icons32dir = @DESKTOP_DATADIR@/icons/hicolor/32x32/apps
icons32_DATA = 32x32/gimp.png
icons48dir = @DESKTOP_DATADIR@/icons/hicolor/48x48/apps
icons48_DATA = 48x48/gimp.png
icons64dir = @DESKTOP_DATADIR@/icons/hicolor/64x64/apps
icons64_DATA = 64x64/gimp.png
iconsscalabledir = @DESKTOP_DATADIR@/icons/hicolor/scalable/apps
iconsscalable_DATA = scalable/gimp.svg
endif
......@@ -25,8 +44,13 @@ EXTRA_DIST = \
gimp.applications.in \
gimp.desktop.in.in \
gimp.keys.in \
gimp.png
16x16/gimp.png \
22x22/gimp.png \
24x24/gimp.png \
32x32/gimp.png \
48x48/gimp.png \
64x64/gimp.png \
scalable/gimp.svg
DISTCLEANFILES = $(desktop_files)
......
This diff is collapsed.
......@@ -8,4 +8,5 @@ _libs
*.la
gimpwidgetsmarshal.h
gimpwidgetsmarshal.c
gimp-wilber-pixbufs.h
test-preview-area
......@@ -158,15 +158,11 @@ libgimpwidgets_2_0_la_sources = \
libgimpwidgets_2_0_la_built_sources = \
gimpwidgetsenums.c \
gimpwidgetsmarshal.c \
gimpwidgetsmarshal.h
gimpwidgetsmarshal.h \
gimp-wilber-pixbufs.h
libgimpwidgets_2_0_la_extra_sources = gimpwidgetsmarshal.list
EXTRA_DIST = \
makefile.msc \
gimpwidgets.def \
$(libgimpwidgets_2_0_la_extra_sources)
libgimpwidgets_2_0_la_SOURCES = \
$(libgimpwidgets_2_0_la_built_sources) \
$(libgimpwidgets_2_0_la_sources)
......@@ -234,6 +230,29 @@ libgimpwidgets_2_0_la_LIBADD = \
libgimpwidgets_2_0_la_DEPENDENCIES = $(gimpwidgets_def)
## Wilber icons for the window managaer, compiled in
WILBER_IMAGES = \
wilber-16.png \
wilber-32.png \
wilber-48.png \
wilber-64.png
WILBER_VARIABLES = \
wilber_16 $(srcdir)/wilber-16.png \
wilber_32 $(srcdir)/wilber-32.png \
wilber_48 $(srcdir)/wilber-48.png \
wilber_64 $(srcdir)/wilber-64.png
EXTRA_DIST = \
makefile.msc \
gimpwidgets.def \
$(libgimpwidgets_2_0_la_extra_sources) \
$(WILBER_IMAGES)
#
# rules to generate built sources
#
......@@ -267,6 +286,10 @@ $(srcdir)/gimpwidgetsmarshal.c: $(srcdir)/gimpwidgetsmarshal.h
&& rm -f xgen-wmc xgen-wmc~
$(srcdir)/gimp-wilber-pixbufs.h: $(WILBER_IMAGES) Makefile.am
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(WILBER_VARIABLES) > $(@F)
#
# test programs, not to be built by default and never installed
#
......
......@@ -32,7 +32,7 @@
#include "gimpstock.h"
#include "gimpwidgets-private.h"
#include "themes/Default/images/gimp-wilber-pixbufs.h"
#include "gimp-wilber-pixbufs.h"
GimpHelpFunc _gimp_standard_help_func = NULL;
......@@ -55,10 +55,10 @@ gimp_widgets_init (GimpHelpFunc standard_help_func,
const guint8 *inline_pixbufs[] =
{
stock_wilber_64,
stock_wilber_48,
stock_wilber_32,
stock_wilber_16
wilber_64,
wilber_48,
wilber_32,
wilber_16
};
g_return_if_fail (standard_help_func != NULL);
......
......@@ -5,4 +5,3 @@ Makefile.in
stock-icons.list
gimp-core-pixbufs.h
gimp-stock-pixbufs.h
gimp-wilber-pixbufs.h
......@@ -14,22 +14,7 @@ CORE_VARIABLES = \
stock_question_64 $(srcdir)/stock-question-64.png
## Wilber icons for the window managaer, compiled in
WILBER_IMAGES = \
stock-wilber-16.png \
stock-wilber-32.png \
stock-wilber-48.png \
stock-wilber-64.png
WILBER_VARIABLES = \
stock_wilber_16 $(srcdir)/stock-wilber-16.png \
stock_wilber_32 $(srcdir)/stock-wilber-32.png \
stock_wilber_48 $(srcdir)/stock-wilber-48.png \
stock_wilber_64 $(srcdir)/stock-wilber-64.png
## Below are compiled in stock icons
## Compiled in stock icons
STOCK_MENU_IMAGES = \
stock-cap-butt-16.png \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment