scalable icon and desktop file support

Convert xpm bitmap icon into a scalable svg icon (carefully sized to
64x64 and saved as plain SVG instead of inkscape-extended SVG)

Add a .desktop file.

Have Makefile.am install the desktop file and icons, including bitmap
icons at various resolutions.  This is controlled by configuration-time
option ./configure --enable-icons for conditional installation of icons
and desktop file.  Inkscape is used to convert graphics when available
as it does a better job than ImageMagick convert, which is used as a
fallback.

The icon compiled into the executable is also generated from the
scalable icon.

Add usbview.desktop to distribution tarball.

Author: Barak A. Pearlmutter

Makefile.am

@@ -14,9 +14,72 @@ usbview_SOURCES =		\
 	usbtree.c usbtree.h	\
 	usbparse.c usbparse.h	\
 	configure-dialog.c      \
-	usbview_logo.xpm	\
-	usbview_logo.xcf	\
-	usb_icon.xpm		\
-	usbview.spec
+	usbview_logo.xpm
 
-EXTRA_DIST = $(man_MANS)
+interface.o: $(icon_bitmaps_xpm)
+
+EXTRA_DIST = $(man_MANS) usbview_icon.svg usbview.desktop usbview.spec usbview_logo.xcf
+
+desktopdir = $(datadir)/applications
+if DESKTOP
+desktop_DATA = usbview.desktop
+endif
+
+icondir = $(datadir)/icons
+
+icon_bitmaps_png = \
+       hicolor/16x16/apps/usbview.png \
+       hicolor/22x22/apps/usbview.png \
+       hicolor/32x32/apps/usbview.png \
+       hicolor/48x48/apps/usbview.png \
+       hicolor/64x64/apps/usbview.png \
+       hicolor/256x256/apps/usbview.png
+
+icon_bitmaps_xpm = hicolor/64x64/apps/usbview_icon.xpm
+
+if ICONS
+nobase_icon_DATA = $(icon_scalable) $(icon_bitmaps_png)
+endif
+
+$(icon_bitmaps_png): usbview_icon.svg
+	mkdir -p $$(dirname $@)
+if USE_INKSCAPE
+	$(INKSCAPE) --export-png=$@ --export-width=$$(basename $$(dirname $$(dirname $@))) $<
+else
+if USE_CONVERT
+	$(CONVERT) -geometry $$(basename $$(dirname $$(dirname $@))) $< $@
+else
+	echo "error: unable to generate $@ from $<"
+	exit 1
+endif
+endif
+
+$(icon_bitmaps_xpm): usbview_icon.svg
+	mkdir -p $$(dirname $@)
+if HAVE_CONVERT
+	$(CONVERT) -geometry $$(basename $$(dirname $$(dirname $@))) $< $@
+else
+	echo "error: unable to generate $@ from $<"
+	exit 1
+endif
+
+icon_scalable = hicolor/scalable/apps/usbview.svg
+
+$(icon_scalable): usbview_icon.svg
+	mkdir -p $$(dirname $@)
+	cp $< $@
+
+CLEANFILES = $(icon_scalable) $(icon_bitmaps_png) $(icon_bitmaps_xpm)
+
+# gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; gtk-update-icon-cache -f -t $(datadir)/icons/HighContrast
+#
+# install-data-hook: update-icon-cache
+# uninstall-hook: update-icon-cache
+# update-icon-cache:
+#	@-if test -z "$(DESTDIR)"; then \
+#		echo "Updating Gtk icon cache."; \
+#		$(gtk_update_icon_cache); \
+#	else \
+#		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+#		echo "***   $(gtk_update_icon_cache)"; \
+#	fi

configure.ac

@@ -8,9 +8,43 @@ AC_CONFIG_SRCDIR([usbtree.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall])
 
+# Process options.
+
+AC_MSG_CHECKING([whether to try to install icons])
+AC_ARG_ENABLE(icons,
+	[AS_HELP_STRING([--enable-icons],[try to install icons (default=yes)])],
+	[icons=$enableval],
+	[icons=yes])
+AC_MSG_RESULT([$icons])
+
+AC_MSG_CHECKING([whether to try to install desktop file])
+AC_ARG_ENABLE(desktop,
+	[AS_HELP_STRING([--enable-desktop],[try to install desktop file (default=yes)])],
+	[desktop=$enableval],
+	[desktop=yes])
+AC_MSG_RESULT([$desktop])
+
 # Checks for programs.
 
 AC_PROG_CC
+AC_CHECK_PROG([have_inkscape],[inkscape],[yes],[no])
+AC_CHECK_PROG([have_convert],[convert],[yes],[no])
+
+# Set automake conditionals.
+
+AC_SUBST(INKSCAPE,[inkscape])
+AC_SUBST(CONVERT,[convert])
+AM_CONDITIONAL(USE_INKSCAPE,[test "$have_inkscape" = "yes"])
+AM_CONDITIONAL(USE_CONVERT, [test "$have_inkscape" = "no" && test "$have_convert" = "yes"])
+AM_CONDITIONAL(HAVE_INKSCAPE,[test "$have_inkscape" = "yes"])
+AM_CONDITIONAL(HAVE_CONVERT, [test "$have_convert" = "yes"])
+
+AS_IF([test "$have_inkscape" = "no" && test "$have_convert" = "no"],
+      [AC_MSG_WARN([no bitmap conversion utility, disabling icon installation])
+       icons=no])
+
+AM_CONDITIONAL(DESKTOP,[test x${desktop} = xyes])
+AM_CONDITIONAL(ICONS,[test x${icons} = xyes])
 
 # Checks for libraries.
 

interface.c

@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 
 #include "usbtree.h"
-#include "usb_icon.xpm"
+#include "hicolor/64x64/apps/usbview_icon.xpm"
 
 GtkWidget *treeUSB;
 GtkTreeStore *treeStore;
@@ -55,7 +55,7 @@ create_windowMain ()
 	gtk_window_set_title (GTK_WINDOW (windowMain), "USB Viewer");
 	gtk_window_set_default_size (GTK_WINDOW (windowMain), 600, 300);
 
-	icon = gdk_pixbuf_new_from_xpm_data((const char **)usb_icon_xpm);
+	icon = gdk_pixbuf_new_from_xpm_data((const char **)usbview_icon);
 	gtk_window_set_icon(GTK_WINDOW(windowMain), icon);
 
 	vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

usb_icon.xpm

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=USBView
+Comment=View USB devices attached to system
+Exec=su-to-root -X -c /usr/bin/usbview
+Icon=usbview
+Terminal=false
+Type=Application
+Keywords=USB;devices;connected;removable;
+Categories=GTK;HardwareSettings;Settings;