Matthew Barnes
0597b877c5
2008-07-18 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #542125 ** This set of changes migrates CompEditor, CompEditorPage and the various subclasses from using BonoboUI to GtkUIManager for menus and toolbars. It also substantially cleans up the code and streamlines the CompEditorPage API, making more effective use of GObject properties. Core changes: * gui/dialogs/comp-editor-page.c: * gui/dialogs/comp-editor-page.h: * gui/dialogs/comp-editor.c: * gui/dialogs/comp-editor.h: * gui/dialogs/event-editor.c: * gui/dialogs/event-editor.h: * gui/dialogs/event-page.c: * gui/dialogs/event-page.h: * gui/dialogs/memo-editor.c: * gui/dialogs/memo-editor.h: * gui/dialogs/memo-page.c: * gui/dialogs/memo-page.h: * gui/dialogs/recurrence-page.c: * gui/dialogs/recurrence-page.h: * gui/dialogs/schedule-page.c: * gui/dialogs/schedule-page.h: * gui/dialogs/task-details-page.c: * gui/dialogs/task-details-page.h: * gui/dialogs/task-editor.c: * gui/dialogs/task-editor.h: * gui/dialogs/task-page.c: * gui/dialogs/task-page.h: Supporting changes: * gui/calendar-component.c: * gui/comp-editor-factory.c: * gui/e-cal-popup.c: * gui/e-calendar-table.c: * gui/e-calendar-view.c: * gui/e-comp-editor-registry.c: * gui/e-memo-table.c: * gui/e-tasks.c: * gui/gnome-cal.c: * gui/memos-component.c: * gui/tasks-component.c: * gui/dialogs/alarm-dialog.c: * gui/dialogs/comp-editor-util.c: * art/Makefile.am: Move query-free-busy.png to data/icons. svn path=/trunk/; revision=35753
145 lines
5.5 KiB
Makefile
145 lines
5.5 KiB
Makefile
NULL =
|
|
|
|
public_icons = \
|
|
hicolor_apps_16x16_evolution.png \
|
|
hicolor_apps_22x22_evolution.png \
|
|
hicolor_apps_24x24_evolution.png \
|
|
hicolor_apps_32x32_evolution.png \
|
|
hicolor_apps_48x48_evolution.png \
|
|
hicolor_apps_scalable_evolution.svg \
|
|
$(NULL)
|
|
|
|
private_icons = \
|
|
hicolor_actions_16x16_folder-copy.png \
|
|
hicolor_actions_16x16_folder-move.png \
|
|
hicolor_actions_16x16_mail-copy.png \
|
|
hicolor_actions_16x16_mail-move.png \
|
|
hicolor_actions_16x16_go-today.png \
|
|
hicolor_actions_16x16_view-calendar-day.png \
|
|
hicolor_actions_16x16_view-calendar-list.png \
|
|
hicolor_actions_16x16_view-calendar-month.png \
|
|
hicolor_actions_16x16_view-calendar-week.png \
|
|
hicolor_actions_16x16_view-calendar-workweek.png \
|
|
hicolor_actions_22x22_go-today.png \
|
|
hicolor_actions_22x22_view-calendar-day.png \
|
|
hicolor_actions_22x22_view-calendar-list.png \
|
|
hicolor_actions_22x22_view-calendar-month.png \
|
|
hicolor_actions_22x22_view-calendar-week.png \
|
|
hicolor_actions_22x22_view-calendar-workweek.png \
|
|
hicolor_actions_24x24_go-today.png \
|
|
hicolor_actions_24x24_query-free-busy.png \
|
|
hicolor_actions_24x24_view-calendar-day.png \
|
|
hicolor_actions_24x24_view-calendar-list.png \
|
|
hicolor_actions_24x24_view-calendar-month.png \
|
|
hicolor_actions_24x24_view-calendar-week.png \
|
|
hicolor_actions_24x24_view-calendar-workweek.png \
|
|
hicolor_actions_32x32_view-calendar-day.png \
|
|
hicolor_actions_32x32_view-calendar-list.png \
|
|
hicolor_actions_32x32_view-calendar-month.png \
|
|
hicolor_actions_32x32_view-calendar-week.png \
|
|
hicolor_actions_32x32_view-calendar-workweek.png \
|
|
hicolor_actions_scalable_view-calendar-day.svg \
|
|
hicolor_actions_scalable_view-calendar-list.svg \
|
|
hicolor_actions_scalable_view-calendar-month.svg \
|
|
hicolor_actions_scalable_view-calendar-week.svg \
|
|
hicolor_actions_scalable_view-calendar-workweek.svg \
|
|
hicolor_categories_48x48_preferences-autocompletion.png \
|
|
hicolor_categories_48x48_preferences-calendar-and-tasks.png \
|
|
hicolor_categories_48x48_preferences-certificates.png \
|
|
hicolor_categories_48x48_preferences-composer.png \
|
|
hicolor_categories_48x48_preferences-mail.png \
|
|
hicolor_categories_48x48_preferences-mail-accounts.png \
|
|
hicolor_places_16x16_mail-inbox.png \
|
|
hicolor_places_16x16_mail-outbox.png \
|
|
hicolor_places_16x16_mail-sent.png \
|
|
hicolor_places_22x22_mail-inbox.png \
|
|
hicolor_places_22x22_mail-outbox.png \
|
|
hicolor_places_22x22_mail-sent.png \
|
|
hicolor_places_24x24_mail-inbox.png \
|
|
hicolor_places_24x24_mail-outbox.png \
|
|
hicolor_places_24x24_mail-sent.png \
|
|
$(NULL)
|
|
|
|
noinst_DATA = \
|
|
hicolor_actions_16x16_go-today.svg \
|
|
hicolor_actions_16x16_view-calendar-day.svg \
|
|
hicolor_actions_16x16_view-calendar-list.svg \
|
|
hicolor_actions_16x16_view-calendar-month.svg \
|
|
hicolor_actions_16x16_view-calendar-week.svg \
|
|
hicolor_actions_16x16_view-calendar-workweek.svg \
|
|
hicolor_actions_22x22_go-today.svg \
|
|
hicolor_actions_22x22_view-calendar-day.svg \
|
|
hicolor_actions_22x22_view-calendar-list.svg \
|
|
hicolor_actions_22x22_view-calendar-month.svg \
|
|
hicolor_actions_22x22_view-calendar-week.svg \
|
|
hicolor_actions_22x22_view-calendar-workweek.svg \
|
|
hicolor_actions_32x32_view-calendar-day.svg \
|
|
hicolor_actions_32x32_view-calendar-list.svg \
|
|
hicolor_actions_32x32_view-calendar-month.svg \
|
|
hicolor_actions_32x32_view-calendar-week.svg \
|
|
hicolor_actions_32x32_view-calendar-workweek.svg \
|
|
hicolor_places_16x16_mail-inbox.svg \
|
|
hicolor_places_16x16_mail-outbox.svg \
|
|
hicolor_places_16x16_mail-sent.svg \
|
|
hicolor_places_22x22_mail-inbox.svg \
|
|
hicolor_places_22x22_mail-outbox.svg \
|
|
hicolor_places_22x22_mail-sent.svg \
|
|
$(NULL)
|
|
|
|
EXTRA_DIST = \
|
|
$(public_icons) \
|
|
$(private_icons) \
|
|
$(noinst_DATA) \
|
|
$(NULL)
|
|
|
|
###############################################################################
|
|
|
|
gtk_update_icon_cache = gtk-update-icon-cache -f -t
|
|
|
|
update-icon-cache:
|
|
@-if test -z "$(DESTDIR)"; then \
|
|
echo "Updating Gtk icon cache."; \
|
|
$(gtk_update_icon_cache) $(datadir)/icons/hicolor; \
|
|
else \
|
|
echo "*** Icon cache not updated. After (un)install, run this:"; \
|
|
echo "*** $(gtk_update_icon_cache) $(datadir)/icons/hicolor"; \
|
|
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)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \
|
|
$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/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)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
|
|
done
|
|
|
|
install-data-local: install-icons update-icon-cache
|
|
|
|
uninstall-local: uninstall-icons update-icon-cache
|