summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Moskovcak <jmoskovc@redhat.com>2010-03-01 17:10:47 +0100
committerJiri Moskovcak <jmoskovc@redhat.com>2010-03-01 17:10:47 +0100
commitb99ca6c484e6dca2474b6243251698faffd3d543 (patch)
treef3fef27e71b6fcbb67f004b169aa3ea425cc0712
parentdc0a2bae3695a38da6f36adeeb6835becd5d453c (diff)
downloadabrt-b99ca6c484e6dca2474b6243251698faffd3d543.zip
abrt-b99ca6c484e6dca2474b6243251698faffd3d543.tar.gz
abrt-b99ca6c484e6dca2474b6243251698faffd3d543.tar.xz
icons repackaging
-rw-r--r--abrt.spec17
-rw-r--r--configure.ac1
-rw-r--r--icons/Makefile.am72
-rw-r--r--icons/hicolor_status_48x48_abrt00.pngbin0 -> 2791 bytes
-rw-r--r--icons/hicolor_status_48x48_abrt01.pngbin0 -> 2791 bytes
-rw-r--r--icons/hicolor_status_48x48_abrt02.pngbin0 -> 2800 bytes
-rw-r--r--icons/hicolor_status_48x48_abrt03.pngbin0 -> 2707 bytes
-rw-r--r--icons/hicolor_status_48x48_abrt04.pngbin0 -> 2709 bytes
-rw-r--r--icons/hicolor_status_48x48_abrt05.pngbin0 -> 2729 bytes
-rw-r--r--src/Applet/Makefile.am2
-rw-r--r--src/Gui/Makefile.am2
-rw-r--r--src/Gui/ccgui.glade6
-rw-r--r--src/Gui/settings.glade6
13 files changed, 94 insertions, 12 deletions
diff --git a/abrt.spec b/abrt.spec
index 8d725c3..99478fd 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 ff03cff..c3925ee 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 06e1137..c44b3e1 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 0000000..dc24865
--- /dev/null
+++ b/icons/hicolor_status_48x48_abrt00.png
Binary files differ
diff --git a/icons/hicolor_status_48x48_abrt01.png b/icons/hicolor_status_48x48_abrt01.png
new file mode 100644
index 0000000..dc24865
--- /dev/null
+++ b/icons/hicolor_status_48x48_abrt01.png
Binary files differ
diff --git a/icons/hicolor_status_48x48_abrt02.png b/icons/hicolor_status_48x48_abrt02.png
new file mode 100644
index 0000000..1495582
--- /dev/null
+++ b/icons/hicolor_status_48x48_abrt02.png
Binary files differ
diff --git a/icons/hicolor_status_48x48_abrt03.png b/icons/hicolor_status_48x48_abrt03.png
new file mode 100644
index 0000000..cf97a56
--- /dev/null
+++ b/icons/hicolor_status_48x48_abrt03.png
Binary files differ
diff --git a/icons/hicolor_status_48x48_abrt04.png b/icons/hicolor_status_48x48_abrt04.png
new file mode 100644
index 0000000..caa6b33
--- /dev/null
+++ b/icons/hicolor_status_48x48_abrt04.png
Binary files differ
diff --git a/icons/hicolor_status_48x48_abrt05.png b/icons/hicolor_status_48x48_abrt05.png
new file mode 100644
index 0000000..49c442e
--- /dev/null
+++ b/icons/hicolor_status_48x48_abrt05.png
Binary files differ
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 900ec01..3084462 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 3cac1ee..04f1292 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 3050d65..2291ee6 100644
--- a/src/Gui/ccgui.glade
+++ b/src/Gui/ccgui.glade
@@ -9,7 +9,7 @@
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">470</property>
- <property name="icon">/usr/share/pixmaps/abrt.png</property>
+ <property name="icon_name">abrt</property>
<property name="transient_for">main_window3</property>
<child>
<widget class="GtkVBox" id="vbox1">
@@ -77,7 +77,7 @@
<property name="title" translatable="yes">About ABRT</property>
<property name="resizable">False</property>
<property name="window_position">center-on-parent</property>
- <property name="icon">/usr/share/pixmaps/abrt.png</property>
+ <property name="icon_name">abrt</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<property name="program_name">ABRT</property>
@@ -122,7 +122,7 @@ Patrick Connelly &lt;pcon@fedoraproject.org&gt;</property>
<widget class="GtkWindow" id="main_window3">
<property name="title" translatable="yes">Automatic Bug Reporting Tool</property>
<property name="window_position">center</property>
- <property name="icon">/usr/share/pixmaps/abrt.png</property>
+ <property name="icon_name">abrt</property>
<child>
<widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
diff --git a/src/Gui/settings.glade b/src/Gui/settings.glade
index a9a14f4..41a0749 100644
--- a/src/Gui/settings.glade
+++ b/src/Gui/settings.glade
@@ -8,7 +8,7 @@
<property name="window_position">center-on-parent</property>
<property name="default_width">450</property>
<property name="default_height">400</property>
- <property name="icon">/usr/share/pixmaps/abrt.png</property>
+ <property name="icon_name">abrt</property>
<child>
<object class="GtkVBox" id="vboxabc1">
<property name="visible">True</property>
@@ -260,7 +260,7 @@
<property name="window_position">center-on-parent</property>
<property name="default_width">450</property>
<property name="default_height">400</property>
- <property name="icon">/usr/share/pixmaps/abrt.png</property>
+ <property name="icon_name">abrt</property>
<child>
<object class="GtkVBox" id="gsvbox1">
<property name="visible">True</property>
@@ -755,7 +755,7 @@
<property name="window_position">center-on-parent</property>
<property name="default_width">400</property>
<property name="default_height">400</property>
- <property name="icon">/usr/share/pixmaps/abrt.png</property>
+ <property name="icon_name">abrt</property>
<property name="transient_for">wGlobalSettings</property>
<child>
<object class="GtkVBox" id="gpgkeys_vbox">