Merge lp:ical-tcl into lp:~sergii/ical-tcl/main

[Guillaume Ballin]

Adding a desktop file to ical and a modern color icon.
Update autotools files to avoid warnings.

[Guillaume Ballin (geballin)]

review: Approve

[Sergei Golubchik (sergii)]

I'm no longer using ical, or bzr fwiw.

Would you like to take over maintaining it?

[Guillaume Ballin (geballin)]

Hi,

I'm OK in maintaining it if that can make it continue to live and evolve.
I'm already actually the maintainer of the Arch linux package for iCal on AUR.

[Sergei Golubchik (sergii)]

Hi, Guillaume!

On Apr 09, Guillaume Ballin wrote:
> Hi,
>
> I'm OK in maintaining it if that can make it continue to live and evolve.
> I'm already actually the maintainer of the Arch linux package for iCal on AUR.

Here you are, you're the new maintainer.

Thanks!

Regards,
Sergei

[lp:ical-tcl]

47. By Guillaume Ballin on 2019-04-13

Merge for creating Ical 3.0.4
Adding ical.desktop and new modern icon.

Unmerged revisions

47. By Guillaume Ballin on 2019-04-13

Merge for creating Ical 3.0.4
Adding ical.desktop and new modern icon.

=== modified file 'Makefile.am'
--- Makefile.am	2017-02-23 09:11:34 +0000
+++ Makefile.am	2019-04-13 01:05:11 +0000
@@ -6,9 +6,10 @@
 icallib_DATA = $(builddir)/startup.tcl $(builddir)/ps_header.tcl
 EXTRA_DIST = startup.tcl.in ps_header.ps doc/ical.html doc/interface.html \
 	     COPYRIGHT.ORIG Makefile.am
-CLEANFILES = $(icallib_DATA)
 dist_man1_MANS = doc/ical.man
 
+appdir = $(prefix)/share/applications
+app_DATA = ical.desktop
 ical_SOURCES = cal_tcl.C dateeditor.C dispatch.C ical.C ical_tcl.C \
 	       item_tcl.C object.C time_tcl.C main.C
 ical_CPPFLAGS = -DICALLIBDIR='"$(icallibdir)"' -I$(srcdir)/calendar -I$(srcdir)/types -I$(srcdir)/time @TK_XINCLUDES@
@@ -29,6 +30,8 @@
 
 libtypes_a_SOURCES = types/bitvec.C types/hashfuncs.C types/intset.C
 
+CLEANFILES = $(icallib_DATA) $(app_DATA)
+
 ps_header.tcl: ps_header.ps
 	echo  'proc ps_header {} { set val {}' > $@;
 	@SED@ -e 's/\[/\\[/g' \
@@ -36,6 +39,18 @@
 	      -e 's/.*/  set val "$$val&\\n"/' < $< >> $@;
 	echo '  return $$val\n}' >> $@
 
+ical.desktop:
+	echo "[Desktop Entry]" >$@
+	echo "Name=Ical" >>$@
+	echo "Comment=Ical calendar package" >>$@
+	echo "Exec=ical" >>$@
+	echo  'Icon=$(icallibdir)/contrib/ical_icon.png' >>$@
+	echo "Terminal=false" >>$@
+	echo "Type=Application" >>$@
+	echo "Categories=Office" >>$@
+	echo "StartupNotify=true;" >>$@
+	chmod 644 $@
+
 # cannot do it in configure, as libdir is not known there :(
 startup.tcl: startup.tcl.in
 	@SED@ -e 's!@''PACKAGE_VERSION''@!@PACKAGE_VERSION@!g' \
 
=== modified file 'configure.ac'
--- configure.ac	2018-02-11 11:25:00 +0000
+++ configure.ac	2019-04-13 01:05:11 +0000
@@ -1,5 +1,5 @@
 AC_INIT([ical], [3.0.4])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
 
 # Create config files
 AC_CONFIG_HEADER(config.h)
 
=== added file 'contrib/ical_icon.png'
 Binary files contrib/ical_icon.png	1970-01-01 00:00:00 +0000 and contrib/ical_icon.png	2019-04-13 01:05:11 +0000 differ
=== modified file 'dayview.tcl'
--- dayview.tcl	2011-01-12 11:31:47 +0000
+++ dayview.tcl	2019-04-13 01:05:11 +0000
@@ -7,8 +7,10 @@
 # A DayView shows the notices and appointments for one day.
 
 set dayview_id 0
+set ICAL_ICON [file join [file dirname [info script]] contrib ical_icon.png]
 
 class DayView {} {
+    global ICAL_ICON
     # Generate new id for window
     global dayview_id
     incr dayview_id
@@ -47,7 +49,8 @@
 
     wm title $n Calendar
     wm iconname $n ical
-    wm iconbitmap $n ical_icon
+    image create photo applicationIcon -file $ICAL_ICON;wm iconphoto $n -default applicationIcon   
+
     wm protocol $n WM_DELETE_WINDOW [list ical_close_view $n]
 
     $self set_date [date today]