From b99ca6c484e6dca2474b6243251698faffd3d543 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Mon, 1 Mar 2010 17:10:47 +0100 Subject: icons repackaging --- abrt.spec | 17 +++++++- configure.ac | 1 - icons/Makefile.am | 72 +++++++++++++++++++++++++++++++++- icons/hicolor_status_48x48_abrt00.png | Bin 0 -> 2791 bytes icons/hicolor_status_48x48_abrt01.png | Bin 0 -> 2791 bytes icons/hicolor_status_48x48_abrt02.png | Bin 0 -> 2800 bytes icons/hicolor_status_48x48_abrt03.png | Bin 0 -> 2707 bytes icons/hicolor_status_48x48_abrt04.png | Bin 0 -> 2709 bytes icons/hicolor_status_48x48_abrt05.png | Bin 0 -> 2729 bytes src/Applet/Makefile.am | 2 +- src/Gui/Makefile.am | 2 +- src/Gui/ccgui.glade | 6 +-- src/Gui/settings.glade | 6 +-- 13 files changed, 94 insertions(+), 12 deletions(-) create mode 100644 icons/hicolor_status_48x48_abrt00.png create mode 100644 icons/hicolor_status_48x48_abrt01.png create mode 100644 icons/hicolor_status_48x48_abrt02.png create mode 100644 icons/hicolor_status_48x48_abrt03.png create mode 100644 icons/hicolor_status_48x48_abrt04.png create mode 100644 icons/hicolor_status_48x48_abrt05.png diff --git a/abrt.spec b/abrt.spec index 8d725c3e..99478fd4 100644 --- a/abrt.spec +++ b/abrt.spec @@ -259,6 +259,13 @@ exit 0 %post /sbin/chkconfig --add %{name}d +%post gui +# update icon cache +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor || : +fi + %post libs -p /sbin/ldconfig %preun @@ -269,6 +276,12 @@ fi %postun libs -p /sbin/ldconfig +%postun gui +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %posttrans if [ "$1" -eq "0" ]; then service %{name}d condrestart >/dev/null 2>&1 || : @@ -313,8 +326,8 @@ fi %{_bindir}/%{name}-gui %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/pixmaps/abrt.png -%{_datadir}/icons/hicolor/48x48/apps/*.png +%{_datadir}/icons/hicolor/*/apps/abrt.png +%{_datadir}/%{name}/icons/hicolor/*/status/*.png %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop diff --git a/configure.ac b/configure.ac index ff03cff9..c3925eec 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,6 @@ AC_CONFIG_FILES([ inc/Makefile po/Makefile.in icons/Makefile - icons/48/Makefile ]) AC_OUTPUT diff --git a/icons/Makefile.am b/icons/Makefile.am index 06e11378..c44b3e1c 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1 +1,71 @@ -SUBDIRS = 48 \ No newline at end of file +NULL = + +public_icons_themes = \ + hicolor \ + $(NULL) + +private_icons = hicolor_status_48x48_abrt00.png \ + hicolor_status_48x48_abrt02.png \ + hicolor_status_48x48_abrt04.png \ + hicolor_status_48x48_abrt01.png \ + hicolor_status_48x48_abrt03.png \ + hicolor_status_48x48_abrt05.png + + +EXTRA_DIST = $(private_icons) + +############################################################################### + +gtk_update_icon_cache = gtk-update-icon-cache -f -t + +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + for theme in $(public_icons_themes); do \ + $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ + done; \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + for theme in $(public_icons_themes); do \ + echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ + done; \ + fi + +install-icons: + for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done; \ + for icon in $(private_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +uninstall-icons: + -for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done; \ + for icon in $(private_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +install-data-local: install-icons update-icon-cache + +uninstall-local: uninstall-icons update-icon-cache + diff --git a/icons/hicolor_status_48x48_abrt00.png b/icons/hicolor_status_48x48_abrt00.png new file mode 100644 index 00000000..dc24865e Binary files /dev/null and b/icons/hicolor_status_48x48_abrt00.png differ diff --git a/icons/hicolor_status_48x48_abrt01.png b/icons/hicolor_status_48x48_abrt01.png new file mode 100644 index 00000000..dc24865e Binary files /dev/null and b/icons/hicolor_status_48x48_abrt01.png differ diff --git a/icons/hicolor_status_48x48_abrt02.png b/icons/hicolor_status_48x48_abrt02.png new file mode 100644 index 00000000..14955826 Binary files /dev/null and b/icons/hicolor_status_48x48_abrt02.png differ diff --git a/icons/hicolor_status_48x48_abrt03.png b/icons/hicolor_status_48x48_abrt03.png new file mode 100644 index 00000000..cf97a562 Binary files /dev/null and b/icons/hicolor_status_48x48_abrt03.png differ diff --git a/icons/hicolor_status_48x48_abrt04.png b/icons/hicolor_status_48x48_abrt04.png new file mode 100644 index 00000000..caa6b33b Binary files /dev/null and b/icons/hicolor_status_48x48_abrt04.png differ diff --git a/icons/hicolor_status_48x48_abrt05.png b/icons/hicolor_status_48x48_abrt05.png new file mode 100644 index 00000000..49c442e5 Binary files /dev/null and b/icons/hicolor_status_48x48_abrt05.png differ diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am index 900ec019..30844624 100644 --- a/src/Applet/Makefile.am +++ b/src/Applet/Makefile.am @@ -15,7 +15,7 @@ abrt_applet_CPPFLAGS = \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ - -DICON_DIR=\"${datadir}/icons/hicolor/48x48/apps\" \ + -DICON_DIR=\"${datadir}/abrt/icons/hicolor/48x48/status\" \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS) \ -D_GNU_SOURCE diff --git a/src/Gui/Makefile.am b/src/Gui/Makefile.am index 3cac1ee8..04f12926 100644 --- a/src/Gui/Makefile.am +++ b/src/Gui/Makefile.am @@ -17,7 +17,7 @@ applicationsdir = $(datadir)/applications applications_DATA = abrt.desktop pkgdata_PYTHON = $(PYTHON_FILES) pkgdata_DATA = $(GLADE_FILES) -pixmapdir = $(datadir)/pixmaps +pixmapdir = $(datadir)/icons/hicolor/48x48/apps/ pixmap_DATA = abrt.png CLEANFILES := $(notdir $(wildcard *~)) $(notdir $(wildcard *\#)) $(notdir $(wildcard \.\#*)) $(notdir $(wildcard *.pyc)) diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade index 3050d656..2291ee6f 100644 --- a/src/Gui/ccgui.glade +++ b/src/Gui/ccgui.glade @@ -9,7 +9,7 @@ True center-on-parent 470 - /usr/share/pixmaps/abrt.png + abrt main_window3 @@ -77,7 +77,7 @@ About ABRT False center-on-parent - /usr/share/pixmaps/abrt.png + abrt dialog False ABRT @@ -122,7 +122,7 @@ Patrick Connelly <pcon@fedoraproject.org> Automatic Bug Reporting Tool center - /usr/share/pixmaps/abrt.png + abrt True diff --git a/src/Gui/settings.glade b/src/Gui/settings.glade index a9a14f43..41a07499 100644 --- a/src/Gui/settings.glade +++ b/src/Gui/settings.glade @@ -8,7 +8,7 @@ center-on-parent 450 400 - /usr/share/pixmaps/abrt.png + abrt True @@ -260,7 +260,7 @@ center-on-parent 450 400 - /usr/share/pixmaps/abrt.png + abrt True @@ -755,7 +755,7 @@ center-on-parent 400 400 - /usr/share/pixmaps/abrt.png + abrt wGlobalSettings -- cgit