Commit d4d33e40 authored by Jody Goldberg's avatar Jody Goldberg

Move to tango based icons. [#450444]

* Move to tango based icons. [#450444]

svn path=/trunk/; revision=16600
parent 89aef7a5
......@@ -58,6 +58,15 @@
* src/gnumeric-gconf.c: ditto.
* src/gnumeric-gconf.h: ditto.
2008-05-07 Jody Goldberg <jody@gnome.org>
Merge patch from Seán de Búrca [#450444]
* configure.in : add the new icon dirs.
* gnumeric.desktop.in : remove icon suffix.
* icons/Makefile.am : deploy the icons, and do some cleanup.
* src/wbc-gtk.c (wbc_gtk_class_init) : Now we can use the nice simple
gtk_window_set_default_icon_name.
2008-05-04 Jody Goldberg <jody@gnome.org>
* configure.in : post release bump.
......
......@@ -23,6 +23,9 @@ Morten:
* Fix array evaluation problem. [#533953]
* Fix COUNTBLANK crash. [#534204]
Seán de Búrca:
* Move to tango based icons.
--------------------------------------------------------------------------
Gnumeric 1.9.0
......
......@@ -1051,6 +1051,12 @@ gnumeric.spec
Makefile
libspreadsheet.pc
icons/Makefile
icons/16x16/Makefile
icons/22x22/Makefile
icons/24x24/Makefile
icons/32x32/Makefile
icons/48x48/Makefile
icons/scalable/Makefile
src/Makefile
src/dialogs/Makefile
src/pixmaps/Makefile
......
......@@ -4,7 +4,7 @@ _Name=Gnumeric Spreadsheet
_GenericName=Spreadsheet
_Comment=Calculation, Analysis, and Visualization of Information
Exec=gnumeric %F_OR_U
Icon=gnome-gnumeric.png
Icon=gnumeric
Terminal=false
Type=Application
Categories=Application;Office;Spreadsheet;Science;Math;GNOME;GTK;
......
icondir = $(datadir)/icons/hicolor/16x16/apps
icon_DATA = gnumeric.png
EXTRA_DIST = $(icon_DATA)
icondir = $(datadir)/icons/hicolor/22x22/apps
icon_DATA = gnumeric.png
EXTRA_DIST = $(icon_DATA)
icondir = $(datadir)/icons/hicolor/24x24/apps
icon_DATA = gnumeric.png
EXTRA_DIST = $(icon_DATA)
icondir = $(datadir)/icons/hicolor/32x32/apps
icon_DATA = gnumeric.png
EXTRA_DIST = $(icon_DATA)
icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = gnumeric.png
EXTRA_DIST = $(icon_DATA)
iconsdir = $(gnumeric_icondir)
SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
# keep in sync with gnumeric/src/libgnumeric.c:gnm_common_init
appicondir = $(datadir)/pixmaps
appicon_DATA = gnome-gnumeric.png \
gnome-application-x-gnumeric.png \
mimeicondir = $(datadir)/pixmaps
mimeicon_DATA = gnome-application-x-gnumeric.png \
gnome-application-x-xls.png \
gnome-application-x-applix-spreadsheet.png \
gnome-application-vnd.lotus-1-2-3.png \
gnome-application-x-generic-spreadsheet.png \
win32-gnumeric.ico
iconsdir = $(gnumeric_icondir)
icons_DATA = \
$(appicon_DATA) \
$(mimeicon_DATA) \
orient-horizontal.png \
orient-vertical.png \
right-down.png \
down-right.png \
down-right.png \
gnumeric-about.png \
stf-druid.png
plot_icondir = $(gnumeric_icondir)
plot_icon_DATA = \
gnumeric-about.png
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
EXTRA_DIST = $(icons_DATA) $(plot_icon_DATA)
install-data-hook: update-icon-cache
uninstall-hook: update-icon-cache
update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
echo "*** $(gtk_update_icon_cache)"; \
fi
icondir = $(datadir)/icons/hicolor/scalable/apps
icon_DATA = gnumeric.svg
EXTRA_DIST = $(icon_DATA)
This diff is collapsed.
......@@ -4328,16 +4328,8 @@ wbc_gtk_class_init (GObjectClass *gobject_class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0, G_TYPE_NONE);
{
GdkPixbuf *icon = gnumeric_load_pixbuf ("gnome-gnumeric.png");
if (icon != NULL) {
GList *icon_list = g_list_prepend (NULL, icon);
gtk_window_set_default_icon_list (icon_list);
g_list_free (icon_list);
g_object_unref (G_OBJECT (icon));
}
}
gtk_window_set_default_icon_name ("gnumeric");
}
static void
......
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