[evolution-patches] component launchers

From: William Jon McCann <mccannwj pha jhu edu>
To: Evolution Patches <evolution-patches lists ximian com>
Subject: [evolution-patches] component launchers
Date: Thu, 22 Jul 2004 13:43:07 -0400

Hi,

Here is an update of
http://lists.ximian.com/archives/public/evolution-patches/2004-
April/005011.html

The icons are copied from the icon theme.

Is this ok?

Jon

? art/evolution-calendar.png
? art/evolution-contacts.png
? art/evolution-mail.png
? art/evolution-tasks.png
Index: art/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/art/ChangeLog,v
retrieving revision 1.172
diff -p -u -r1.172 ChangeLog
--- art/ChangeLog	20 May 2004 11:58:06 -0000	1.172
+++ art/ChangeLog	22 Jul 2004 17:38:54 -0000
@@ -1,3 +1,11 @@
+2004-07-22  William Jon McCann  <mccann jhu edu>
+
+	* evolution-calendar.png:
+	* evolution-contacts.png:
+	* evolution-mail.png:
+	* evolution-tasks.png:
+	* Makefile.am (images_DATA): Install art for components.
+
 2004-05-20  Rodney Dawes  <dobey ximian com>
 
 	* Makefile.am (EXTRA_DIST): Add README and jump.xpm
Index: art/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/art/Makefile.am,v
retrieving revision 1.120
diff -p -u -r1.120 Makefile.am
--- art/Makefile.am	20 May 2004 11:58:06 -0000	1.120
+++ art/Makefile.am	22 Jul 2004 17:38:54 -0000
@@ -10,6 +10,10 @@ images_DATA = \
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
 	$(INSTALL_DATA) $(srcdir)/evolution.png  $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
+	$(INSTALL_DATA) $(srcdir)/evolution-mail.png  $(DESTDIR)$(datadir)/pixmaps/evolution-mail.png
+	$(INSTALL_DATA) $(srcdir)/evolution-calendar.png  $(DESTDIR)$(datadir)/pixmaps/evolution-calendar.png
+	$(INSTALL_DATA) $(srcdir)/evolution-contacts.png  $(DESTDIR)$(datadir)/pixmaps/evolution-contacts.png
+	$(INSTALL_DATA) $(srcdir)/evolution-tasks.png  $(DESTDIR)$(datadir)/pixmaps/evolution-tasks.png
 if DEFAULT_BINARY
 	cd $(DESTDIR)$(datadir)/pixmaps && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
 endif

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1350
diff -p -u -r1.1350 ChangeLog
--- ChangeLog	21 Jul 2004 19:25:36 -0000	1.1350
+++ ChangeLog	22 Jul 2004 17:33:08 -0000
@@ -1,3 +1,11 @@
+2004-04-02  William Jon McCann  <mccann jhu edu>
+
+	* data/evolution-mail.desktop.in.in: 
+	* data/evolution-calendar.desktop.in.in: 
+	* data/evolution-addressbook.desktop.in.in: 
+	* data/evolution-tasks.desktop.in.in: 
+	* data/Makefile.am: install desktop files for each component.
+
 2004-07-21  Ray Strode  <rstrode redhat com>
 	* evolution/data/evolution.desktop.in.in: Add MimeType line to desktop file
 	new mime sytem.
Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/data/Makefile.am,v
retrieving revision 1.21
diff -p -u -r1.21 Makefile.am
--- data/Makefile.am	30 Apr 2004 16:36:46 -0000	1.21
+++ data/Makefile.am	22 Jul 2004 17:33:08 -0000
@@ -1,8 +1,10 @@
 desktopdir = $(datadir)/applications
-desktop_in_in_file = evolution.desktop.in.in
-desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
+components = evolution-mail evolution-calendar evolution-tasks evolution-addressbook
+desktop_files = $(components:=.desktop)
+desktop_in_files = $(desktop_files:.desktop=.desktop.in)
+desktop_in_in_files = $(desktop_files:.desktop=.desktop.in.in)
 %.desktop.in: %.desktop.in.in
-	sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|" $< > $@
+	sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|g" $< > $@
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -10,7 +12,7 @@ keysdir = $(datadir)/mime-info
 keys_in_file = evolution.keys.in.in
 keys_file = $(keys_in_file:.keys.in.in=.keys) 
 %.keys.in: %.keys.in.in
-	sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|" $< > $@
+	sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|g" $< > $@
 
 @INTLTOOL_KEYS_RULE@
 
@@ -20,12 +22,14 @@ mime_file = evolution.mime
 if HAVE_KDE_APPLNK
 
 kdedesktopdir = $(KDE_APPLNK_DIR)/Applications
-kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
+kdedesktop_files = $(desktop_files)
 
 install-kde-applnk:
 	$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir);	\
-	$(INSTALL_DATA) $(kdedesktop_file) \
-		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
+	for desktop_file in $(kdedesktop_files); do	\
+	base_name=`basename $$desktop_file .desktop`;	\
+	$(INSTALL_DATA) $$desktop_file $(DESTDIR)$(desktopdir)/$$base_name-$(BASE_VERSION).desktop;	\
+	done
 else
 
 install-kde-applnk:
@@ -33,14 +37,16 @@ install-kde-applnk:
 endif
 
 noinst_MANS = evolution.1
-noinst_DATA = $(keys_file) $(desktop_file)
+noinst_DATA = $(keys_file) $(desktop_files)
 
 SUBDIRS = cde_app_root
 
-install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
-	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
-	$(INSTALL_DATA) $(desktop_file)									\
-			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;	\
+install-data-local: install-kde-applnk $(desktop_files) $(keys_file) $(mime_file)
+	-$(mkinstalldirs) $(DESTDIR)$(desktopdir);
+	-for desktop_file in $(desktop_files); do							\
+	base_name=`basename $$desktop_file .desktop`;							\
+	$(INSTALL_DATA) $$desktop_file $(DESTDIR)$(desktopdir)/$$base_name-$(BASE_VERSION).desktop;	\
+	done
 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
 	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
@@ -61,9 +67,12 @@ dtappunintegrate:
 endif
 
 EXTRA_DIST =					\
-	$(desktop_in_in_file)			\
+	$(desktop_in_in_files)			\
 	$(mime_file)				\
 	$(keys_file)				\
 	$(keys_in_file)				\
 	$(noinst_MANS)
 
+CLEANFILES =					\
+	$(desktop_files)			\
+	$(keys_file)
--- /dev/null	2004-02-23 16:02:56.000000000 -0500
+++ data/evolution-addressbook.desktop.in.in	2004-07-22 13:09:33.555094297 -0400
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=Address Book
+_Comment=Manage contact information
+Exec=evolution- BASE_VERSION@ -c contacts
+Icon=evolution-contacts
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Office;X-Red-Hat-Base;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=Ximian
+X-GNOME-Bugzilla-Product=evolution
+X-GNOME-Bugzilla-Component=Contacts
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-alarm-notify;
+MimeType=text/x-vcard
\ No newline at end of file
--- /dev/null	2004-02-23 16:02:56.000000000 -0500
+++ data/evolution-calendar.desktop.in.in	2004-07-22 13:11:52.362377196 -0400
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=Calendars
+_Comment=View calendar and manage schedule
+Exec=evolution- BASE_VERSION@ -c calendar
+Icon=evolution-calendar
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Office;X-Red-Hat-Base;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=Ximian
+X-GNOME-Bugzilla-Product=Evolution
+X-GNOME-Bugzilla-Component=Calendar
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-alarm-notify;
+MimeType=text/x-calendar;text/calendar;
\ No newline at end of file
--- /dev/null	2004-02-23 16:02:56.000000000 -0500
+++ data/evolution-mail.desktop.in.in	2004-07-22 13:12:01.763042035 -0400
@@ -0,0 +1,13 @@
+[Desktop Entry]
+_Name=Mail
+_Comment=Read and send mail
+Exec=evolution- BASE_VERSION@ -c mail
+Icon=evolution-mail
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Network;X-Red-Hat-Base;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=Ximian
+X-GNOME-Bugzilla-Product=Evolution
+X-GNOME-Bugzilla-Component=Mail
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-alarm-notify;
--- /dev/null	2004-02-23 16:02:56.000000000 -0500
+++ data/evolution-tasks.desktop.in.in	2004-07-22 13:12:10.738767249 -0400
@@ -0,0 +1,13 @@
+[Desktop Entry]
+_Name=Tasks
+_Comment=Manage things to do
+Exec=evolution- BASE_VERSION@ -c tasks
+Icon=evolution-tasks
+Terminal=false
+Type=Application
+Categories=GNOME;Application;Office;X-Red-Hat-Base;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=Ximian
+X-GNOME-Bugzilla-Product=Evolution
+X-GNOME-Bugzilla-Component=Tasks
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.0;evolution-alarm-notify;

Attachment: evolution-calendar.png
Description: PNG image

Attachment: evolution-contacts.png
Description: PNG image

Attachment: evolution-mail.png
Description: PNG image

Attachment: evolution-tasks.png
Description: PNG image

Follow-Ups:
- Re: [evolution-patches] component launchers
  - From: JP Rosevear

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]