diff options
44 files changed, 120 insertions, 77 deletions
@@ -347,8 +347,9 @@ fi %{_datadir}/%{name}/*.py* %{_datadir}/%{name}/*.glade %{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/%{name}/icons/hicolor/*/status/* +%{_datadir}/icons/*/*/apps/* +%{_datadir}/icons/*/*/status/* +%{_datadir}/%{name}/icons/*/*/status/* %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop diff --git a/icons/Makefile.am b/icons/Makefile.am index c44b3e1c..4ee1b54c 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,71 +1,109 @@ -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 - +NULL =
+
+public_icons_themes = \
+ hicolor \
+ $(NULL)
+
+private_icons = \
+ hicolor_status_16x16_abrt00.png \
+ hicolor_status_16x16_abrt01.png \
+ hicolor_status_16x16_abrt02.png \
+ hicolor_status_16x16_abrt03.png \
+ hicolor_status_16x16_abrt04.png \
+ hicolor_status_16x16_abrt05.png \
+ hicolor_status_22x22_abrt00.png \
+ hicolor_status_22x22_abrt01.png \
+ hicolor_status_22x22_abrt02.png \
+ hicolor_status_22x22_abrt03.png \
+ hicolor_status_22x22_abrt04.png \
+ hicolor_status_22x22_abrt05.png \
+ hicolor_status_24x24_abrt00.png \
+ hicolor_status_24x24_abrt01.png \
+ hicolor_status_24x24_abrt02.png \
+ hicolor_status_24x24_abrt03.png \
+ hicolor_status_24x24_abrt04.png \
+ hicolor_status_24x24_abrt05.png \
+ hicolor_status_32x32_abrt00.png \
+ hicolor_status_32x32_abrt01.png \
+ hicolor_status_32x32_abrt02.png \
+ hicolor_status_32x32_abrt03.png \
+ hicolor_status_32x32_abrt04.png \
+ hicolor_status_32x32_abrt05.png \
+ hicolor_status_48x48_abrt00.png \
+ hicolor_status_48x48_abrt01.png \
+ hicolor_status_48x48_abrt02.png \
+ hicolor_status_48x48_abrt03.png \
+ hicolor_status_48x48_abrt04.png \
+ hicolor_status_48x48_abrt05.png \
+ $(NULL)
+
+public_icons = hicolor_apps_16x16_abrt.png \
+ hicolor_apps_22x22_abrt.png \
+ hicolor_apps_24x24_abrt.png \
+ hicolor_apps_32x32_abrt.png \
+ hicolor_apps_48x48_abrt.png \
+ hicolor_status_16x16_abrt.png \
+ hicolor_status_22x22_abrt.png \
+ hicolor_status_24x24_abrt.png \
+ hicolor_status_32x32_abrt.png \
+ hicolor_status_48x48_abrt.png \
+ $(NULL)
+
+
+EXTRA_DIST = $(private_icons) $(public_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_apps_16x16_abrt.png b/icons/hicolor_apps_16x16_abrt.png Binary files differnew file mode 100644 index 00000000..bd5def61 --- /dev/null +++ b/icons/hicolor_apps_16x16_abrt.png diff --git a/icons/hicolor_apps_22x22_abrt.png b/icons/hicolor_apps_22x22_abrt.png Binary files differnew file mode 100644 index 00000000..cef91387 --- /dev/null +++ b/icons/hicolor_apps_22x22_abrt.png diff --git a/icons/hicolor_apps_24x24_abrt.png b/icons/hicolor_apps_24x24_abrt.png Binary files differnew file mode 100644 index 00000000..c1c87a26 --- /dev/null +++ b/icons/hicolor_apps_24x24_abrt.png diff --git a/icons/hicolor_apps_32x32_abrt.png b/icons/hicolor_apps_32x32_abrt.png Binary files differnew file mode 100644 index 00000000..cb1a0277 --- /dev/null +++ b/icons/hicolor_apps_32x32_abrt.png diff --git a/icons/hicolor_apps_48x48_abrt.png b/icons/hicolor_apps_48x48_abrt.png Binary files differnew file mode 100644 index 00000000..9c0cb89f --- /dev/null +++ b/icons/hicolor_apps_48x48_abrt.png diff --git a/icons/hicolor_status_16x16_abrt.png b/icons/hicolor_status_16x16_abrt.png Binary files differnew file mode 100644 index 00000000..bd5def61 --- /dev/null +++ b/icons/hicolor_status_16x16_abrt.png diff --git a/icons/hicolor_status_16x16_abrt00.png b/icons/hicolor_status_16x16_abrt00.png Binary files differnew file mode 100644 index 00000000..bd5def61 --- /dev/null +++ b/icons/hicolor_status_16x16_abrt00.png diff --git a/icons/hicolor_status_16x16_abrt01.png b/icons/hicolor_status_16x16_abrt01.png Binary files differnew file mode 100644 index 00000000..bd5def61 --- /dev/null +++ b/icons/hicolor_status_16x16_abrt01.png diff --git a/icons/hicolor_status_16x16_abrt02.png b/icons/hicolor_status_16x16_abrt02.png Binary files differnew file mode 100644 index 00000000..bd5def61 --- /dev/null +++ b/icons/hicolor_status_16x16_abrt02.png diff --git a/icons/hicolor_status_16x16_abrt03.png b/icons/hicolor_status_16x16_abrt03.png Binary files differnew file mode 100644 index 00000000..bd5def61 --- /dev/null +++ b/icons/hicolor_status_16x16_abrt03.png diff --git a/icons/hicolor_status_16x16_abrt04.png b/icons/hicolor_status_16x16_abrt04.png Binary files differnew file mode 100644 index 00000000..bd5def61 --- /dev/null +++ b/icons/hicolor_status_16x16_abrt04.png diff --git a/icons/hicolor_status_16x16_abrt05.png b/icons/hicolor_status_16x16_abrt05.png Binary files differnew file mode 100644 index 00000000..bd5def61 --- /dev/null +++ b/icons/hicolor_status_16x16_abrt05.png diff --git a/icons/hicolor_status_22x22_abrt.png b/icons/hicolor_status_22x22_abrt.png Binary files differnew file mode 100644 index 00000000..cef91387 --- /dev/null +++ b/icons/hicolor_status_22x22_abrt.png diff --git a/icons/hicolor_status_22x22_abrt00.png b/icons/hicolor_status_22x22_abrt00.png Binary files differnew file mode 100644 index 00000000..cef91387 --- /dev/null +++ b/icons/hicolor_status_22x22_abrt00.png diff --git a/icons/hicolor_status_22x22_abrt01.png b/icons/hicolor_status_22x22_abrt01.png Binary files differnew file mode 100644 index 00000000..cef91387 --- /dev/null +++ b/icons/hicolor_status_22x22_abrt01.png diff --git a/icons/hicolor_status_22x22_abrt02.png b/icons/hicolor_status_22x22_abrt02.png Binary files differnew file mode 100644 index 00000000..cef91387 --- /dev/null +++ b/icons/hicolor_status_22x22_abrt02.png diff --git a/icons/hicolor_status_22x22_abrt03.png b/icons/hicolor_status_22x22_abrt03.png Binary files differnew file mode 100644 index 00000000..cef91387 --- /dev/null +++ b/icons/hicolor_status_22x22_abrt03.png diff --git a/icons/hicolor_status_22x22_abrt04.png b/icons/hicolor_status_22x22_abrt04.png Binary files differnew file mode 100644 index 00000000..cef91387 --- /dev/null +++ b/icons/hicolor_status_22x22_abrt04.png diff --git a/icons/hicolor_status_22x22_abrt05.png b/icons/hicolor_status_22x22_abrt05.png Binary files differnew file mode 100644 index 00000000..cef91387 --- /dev/null +++ b/icons/hicolor_status_22x22_abrt05.png diff --git a/icons/hicolor_status_24x24_abrt.png b/icons/hicolor_status_24x24_abrt.png Binary files differnew file mode 100644 index 00000000..c1c87a26 --- /dev/null +++ b/icons/hicolor_status_24x24_abrt.png diff --git a/icons/hicolor_status_24x24_abrt00.png b/icons/hicolor_status_24x24_abrt00.png Binary files differnew file mode 100644 index 00000000..c1c87a26 --- /dev/null +++ b/icons/hicolor_status_24x24_abrt00.png diff --git a/icons/hicolor_status_24x24_abrt01.png b/icons/hicolor_status_24x24_abrt01.png Binary files differnew file mode 100644 index 00000000..c1c87a26 --- /dev/null +++ b/icons/hicolor_status_24x24_abrt01.png diff --git a/icons/hicolor_status_24x24_abrt02.png b/icons/hicolor_status_24x24_abrt02.png Binary files differnew file mode 100644 index 00000000..c1c87a26 --- /dev/null +++ b/icons/hicolor_status_24x24_abrt02.png diff --git a/icons/hicolor_status_24x24_abrt03.png b/icons/hicolor_status_24x24_abrt03.png Binary files differnew file mode 100644 index 00000000..c1c87a26 --- /dev/null +++ b/icons/hicolor_status_24x24_abrt03.png diff --git a/icons/hicolor_status_24x24_abrt04.png b/icons/hicolor_status_24x24_abrt04.png Binary files differnew file mode 100644 index 00000000..c1c87a26 --- /dev/null +++ b/icons/hicolor_status_24x24_abrt04.png diff --git a/icons/hicolor_status_24x24_abrt05.png b/icons/hicolor_status_24x24_abrt05.png Binary files differnew file mode 100644 index 00000000..c1c87a26 --- /dev/null +++ b/icons/hicolor_status_24x24_abrt05.png diff --git a/icons/hicolor_status_32x32_abrt.png b/icons/hicolor_status_32x32_abrt.png Binary files differnew file mode 100644 index 00000000..cb1a0277 --- /dev/null +++ b/icons/hicolor_status_32x32_abrt.png diff --git a/icons/hicolor_status_32x32_abrt00.png b/icons/hicolor_status_32x32_abrt00.png Binary files differnew file mode 100644 index 00000000..cb1a0277 --- /dev/null +++ b/icons/hicolor_status_32x32_abrt00.png diff --git a/icons/hicolor_status_32x32_abrt01.png b/icons/hicolor_status_32x32_abrt01.png Binary files differnew file mode 100644 index 00000000..cb1a0277 --- /dev/null +++ b/icons/hicolor_status_32x32_abrt01.png diff --git a/icons/hicolor_status_32x32_abrt02.png b/icons/hicolor_status_32x32_abrt02.png Binary files differnew file mode 100644 index 00000000..cb1a0277 --- /dev/null +++ b/icons/hicolor_status_32x32_abrt02.png diff --git a/icons/hicolor_status_32x32_abrt03.png b/icons/hicolor_status_32x32_abrt03.png Binary files differnew file mode 100644 index 00000000..cb1a0277 --- /dev/null +++ b/icons/hicolor_status_32x32_abrt03.png diff --git a/icons/hicolor_status_32x32_abrt04.png b/icons/hicolor_status_32x32_abrt04.png Binary files differnew file mode 100644 index 00000000..cb1a0277 --- /dev/null +++ b/icons/hicolor_status_32x32_abrt04.png diff --git a/icons/hicolor_status_32x32_abrt05.png b/icons/hicolor_status_32x32_abrt05.png Binary files differnew file mode 100644 index 00000000..cb1a0277 --- /dev/null +++ b/icons/hicolor_status_32x32_abrt05.png diff --git a/icons/hicolor_status_48x48_abrt.png b/icons/hicolor_status_48x48_abrt.png Binary files differnew file mode 100644 index 00000000..9c0cb89f --- /dev/null +++ b/icons/hicolor_status_48x48_abrt.png diff --git a/icons/hicolor_status_48x48_abrt00.png b/icons/hicolor_status_48x48_abrt00.png Binary files differindex dc24865e..9c0cb89f 100644 --- a/icons/hicolor_status_48x48_abrt00.png +++ b/icons/hicolor_status_48x48_abrt00.png diff --git a/icons/hicolor_status_48x48_abrt01.png b/icons/hicolor_status_48x48_abrt01.png Binary files differindex dc24865e..9c0cb89f 100644 --- a/icons/hicolor_status_48x48_abrt01.png +++ b/icons/hicolor_status_48x48_abrt01.png diff --git a/icons/hicolor_status_48x48_abrt02.png b/icons/hicolor_status_48x48_abrt02.png Binary files differindex 14955826..9c0cb89f 100644 --- a/icons/hicolor_status_48x48_abrt02.png +++ b/icons/hicolor_status_48x48_abrt02.png diff --git a/icons/hicolor_status_48x48_abrt03.png b/icons/hicolor_status_48x48_abrt03.png Binary files differindex cf97a562..9c0cb89f 100644 --- a/icons/hicolor_status_48x48_abrt03.png +++ b/icons/hicolor_status_48x48_abrt03.png diff --git a/icons/hicolor_status_48x48_abrt04.png b/icons/hicolor_status_48x48_abrt04.png Binary files differindex caa6b33b..9c0cb89f 100644 --- a/icons/hicolor_status_48x48_abrt04.png +++ b/icons/hicolor_status_48x48_abrt04.png diff --git a/icons/hicolor_status_48x48_abrt05.png b/icons/hicolor_status_48x48_abrt05.png Binary files differindex 49c442e5..9c0cb89f 100644 --- a/icons/hicolor_status_48x48_abrt05.png +++ b/icons/hicolor_status_48x48_abrt05.png diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp index d890e902..efbed8fd 100644 --- a/src/Applet/CCApplet.cpp +++ b/src/Applet/CCApplet.cpp @@ -83,6 +83,7 @@ static GtkWidget *create_about_dialog() NULL}; const char *artists[] = {"Patrick Connelly <pcon@fedoraproject.org>", + "Lapo Calamandrei" NULL}; const char *comments = _("Notification area applet to notify user about " @@ -141,11 +142,12 @@ CApplet::CApplet(const char* app_name) /* - animation - */ if (m_bIconsLoaded == true) { + //FIXME: animation is disabled for now m_pStatusIcon = gtk_status_icon_new_from_pixbuf(icon_stages_buff[ICON_DEFAULT]); } else { - m_pStatusIcon = gtk_status_icon_new_from_stock(GTK_STOCK_DIALOG_WARNING); + m_pStatusIcon = gtk_status_icon_new_from_icon_name("abrt"); } notify_init(app_name); @@ -417,6 +419,8 @@ void CApplet::stop_animate_icon() bool CApplet::load_icons() { + //FIXME: just a tmp workaround + return false; int stage; for (stage = ICON_DEFAULT; stage < ICON_STAGE_LAST; stage++) { diff --git a/src/Gui/Makefile.am b/src/Gui/Makefile.am index 15df057c..16c9686e 100644 --- a/src/Gui/Makefile.am +++ b/src/Gui/Makefile.am @@ -10,15 +10,15 @@ PYTHON_FILES = CCDBusBackend.py CCDumpList.py CCDump.py CC_gui_functions.py \ GLADE_FILES = ccgui.glade report.glade settings.glade dialogs.glade settings_wizard.glade -EXTRA_DIST = $(PYTHON_FILES) $(GLADE_FILES) abrt-gui abrt.desktop abrt.png +EXTRA_DIST = $(PYTHON_FILES) $(GLADE_FILES) abrt-gui abrt.desktop #ccguidir = $(pkgdatadir) applicationsdir = $(datadir)/applications applications_DATA = abrt.desktop pkgdata_PYTHON = $(PYTHON_FILES) pkgdata_DATA = $(GLADE_FILES) -pixmapdir = $(datadir)/icons/hicolor/48x48/apps/ -pixmap_DATA = abrt.png +#pixmapdir = $(datadir)/icons/hicolor/48x48/apps/ +#pixmap_DATA = abrt.png CLEANFILES := $(notdir $(wildcard *~)) $(notdir $(wildcard *\#)) $(notdir $(wildcard \.\#*)) $(notdir $(wildcard *.pyc)) |
