[Goodies-commits] r2483 - in thunar-thumbnailers/trunk: . agr-thumbnailer raw-thumbnailer

Erlend Davidson erland at xfce.org
Sat Feb 3 17:38:18 CET 2007


Author: erland
Date: 2007-02-03 16:38:18 +0000 (Sat, 03 Feb 2007)
New Revision: 2483

Added:
   thunar-thumbnailers/trunk/agr-thumbnailer/
   thunar-thumbnailers/trunk/agr-thumbnailer/Makefile.am
   thunar-thumbnailers/trunk/agr-thumbnailer/agr-thumbnailer
   thunar-thumbnailers/trunk/agr-thumbnailer/agr-thumbnailer.desktop.in
   thunar-thumbnailers/trunk/agr-thumbnailer/thunar-thumbnailers-agr.xml
   thunar-thumbnailers/trunk/raw-thumbnailer/thunar-thumbnailers-raw.xml
Modified:
   thunar-thumbnailers/trunk/ChangeLog
   thunar-thumbnailers/trunk/Makefile.am
   thunar-thumbnailers/trunk/README
   thunar-thumbnailers/trunk/configure.in.in
   thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am
   thunar-thumbnailers/trunk/raw-thumbnailer/raw-thumbnailer.desktop.in
Log:
Added a .agr (xmgrace) thumbnailer (agr-thumbnailer)
Mimetypes are now installed for the following thumbnailers
	agr-thumbnailer
	raw-thumbnailer

Modified: thunar-thumbnailers/trunk/ChangeLog
===================================================================
--- thunar-thumbnailers/trunk/ChangeLog	2007-02-02 22:38:00 UTC (rev 2482)
+++ thunar-thumbnailers/trunk/ChangeLog	2007-02-03 16:38:18 UTC (rev 2483)
@@ -1,3 +1,10 @@
+2007-02-03	Erlend Davidson <E.R.M.Davidson at sms.ed.ac.uk>
+
+	* Added a .agr (xmgrace) thumbnailer (agr-thumbnailer)
+	* Mimetypes are now installed for the following thumbnailers
+		agr-thumbnailer
+		raw-thumbnailer
+
 2007-01-09	Erlend Davidson <E.R.M.Davidson at sms.ed.ac.uk>
 
 	* Added a .fig (xfig) image thumbnailer (fig-thumbnailer/)

Modified: thunar-thumbnailers/trunk/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/Makefile.am	2007-02-02 22:38:00 UTC (rev 2482)
+++ thunar-thumbnailers/trunk/Makefile.am	2007-02-03 16:38:18 UTC (rev 2483)
@@ -5,7 +5,8 @@
 	tex-thumbnailer							\
 	ps-thumbnailer							\
 	raw-thumbnailer							\
-	fig-thumbnailer
+	fig-thumbnailer							\
+	agr-thumbnailer
 
 distclean-local:
 	rm -rf *.spec *.cache *~
@@ -14,4 +15,9 @@
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
 	@rm -f $(PACKAGE)-$(VERSION).tar.gz
 
+mimedir = $(datadir)/mime
+
+install-data-local:
+	update-mime-database $(mimedir)
+
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Modified: thunar-thumbnailers/trunk/README
===================================================================
--- thunar-thumbnailers/trunk/README	2007-02-02 22:38:00 UTC (rev 2482)
+++ thunar-thumbnailers/trunk/README	2007-02-03 16:38:18 UTC (rev 2483)
@@ -16,8 +16,9 @@
 
 These packages are required for some thumbnailers to work:
 
- - Tetex (for the tex-thumbnailer)
- - Dcraw (for the raw-thumbnailer)
+ - Tetex (for the tex-thumbnailer) [http://tug.org/teTeX/]
+ - Dcraw (for the raw-thumbnailer) [http://www.cybercom.net/~dcoffin/dcraw/]
+ - Grace (for the agr-thumbnailer) [http://plasma-gate.weizmann.ac.il/Grace/]
 
 
 Installation

Added: thunar-thumbnailers/trunk/agr-thumbnailer/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/agr-thumbnailer/Makefile.am	                        (rev 0)
+++ thunar-thumbnailers/trunk/agr-thumbnailer/Makefile.am	2007-02-03 16:38:18 UTC (rev 2483)
@@ -0,0 +1,25 @@
+# $Id: Makefile.am 2296 2007-01-03 11:30:08Z benny $
+
+mimedir = $(datadir)/mime
+mimepackdir = $(mimedir)/packages
+desktopdir = $(datadir)/thumbnailers
+
+if ENABLE_GRACE
+    libexec_SCRIPTS=agr-thumbnailer
+    desktop_in_files=agr-thumbnailer.desktop.in
+    mimepack_DATA=thunar-thumbnailers-agr.xml
+endif
+
+%.desktop: %.desktop.in
+	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+EXTRA_DIST =								\
+	$(desktop_in_files)						\
+	$(libexec_SCRIPTS)						\
+	$(mimepack_DATA)
+
+DISTCLEANFILES =							\
+	$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Added: thunar-thumbnailers/trunk/agr-thumbnailer/agr-thumbnailer
===================================================================
--- thunar-thumbnailers/trunk/agr-thumbnailer/agr-thumbnailer	                        (rev 0)
+++ thunar-thumbnailers/trunk/agr-thumbnailer/agr-thumbnailer	2007-02-03 16:38:18 UTC (rev 2483)
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# tex-thumbnailer - Thumbnailer script for TEX (TeX/LaTeX) files.
+#
+# Usage: tex-thumbnailer tex-file png-file size
+#
+
+# command line parameters
+ifile=$1
+ofile=$2
+size=$3
+
+filesize=`du ${ifile}`
+
+# don't try and generate thumbnails of huge files...
+if [ ${filesize} -gt 30000 ]; then
+    exit 1
+fi
+
+exec gracebat -hardcopy -hdevice PNG "${ifile}" -printfile - | convert - -scale "$sizex$size" "png:${ofile}"

Added: thunar-thumbnailers/trunk/agr-thumbnailer/agr-thumbnailer.desktop.in
===================================================================
--- thunar-thumbnailers/trunk/agr-thumbnailer/agr-thumbnailer.desktop.in	                        (rev 0)
+++ thunar-thumbnailers/trunk/agr-thumbnailer/agr-thumbnailer.desktop.in	2007-02-03 16:38:18 UTC (rev 2483)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=X-Thumbnailer
+Name=Grace Thumbnailer
+TryExec=gracebat
+MimeType=text/x-agr;
+X-Thumbnailer-Exec=@libexecdir@/agr-thumbnailer %i %o %s

Added: thunar-thumbnailers/trunk/agr-thumbnailer/thunar-thumbnailers-agr.xml
===================================================================
--- thunar-thumbnailers/trunk/agr-thumbnailer/thunar-thumbnailers-agr.xml	                        (rev 0)
+++ thunar-thumbnailers/trunk/agr-thumbnailer/thunar-thumbnailers-agr.xml	2007-02-03 16:38:18 UTC (rev 2483)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+	<mime-type type="text/x-agr">
+		<comment>Grace project file</comment>
+		<comment xml:lang="en">Grace project file</comment>
+		<comment xml:lang="en-GB">Grace project file</comment>
+		<glob pattern="*.agr"/>
+	</mime-type>
+</mime-info>

Modified: thunar-thumbnailers/trunk/configure.in.in
===================================================================
--- thunar-thumbnailers/trunk/configure.in.in	2007-02-02 22:38:00 UTC (rev 2482)
+++ thunar-thumbnailers/trunk/configure.in.in	2007-02-03 16:38:18 UTC (rev 2483)
@@ -20,8 +20,8 @@
 dnl *** Initialize autoconf ***
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2004-2007
-        The Thunar development team. All rights reserved.
-        
+	The Thunar development team. All rights reserved.
+	
 Written for Thunar by Benedikt Meurer <benny at xfce.org>.])
 AC_INIT([thunar-thumbnailers], [tt_version()], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
@@ -41,7 +41,7 @@
 AC_PROG_INSTALL()
 AC_PATH_PROG(CONVERT, convert)
       if test -z "$CONVERT"; then
-      	 AC_MSG_ERROR([ImageMagick is required to build thunar-thumbnailers])
+	 AC_MSG_ERROR([ImageMagick is required to build thunar-thumbnailers])
       fi
 
 dnl *** check if we want raw image thumbnailing ***
@@ -51,9 +51,9 @@
 if test "$enable_raw" = "yes"; then
     dnl *** check to see if dcraw, needed for raw image thumbnailing, is on the path ***
     AC_PATH_PROG(DCRAW, dcraw)
-        if test -z "$DCRAW"; then
-      	    AC_MSG_ERROR([Install dcraw before enabling raw image thumbnailing])
-        fi
+	if test -z "$DCRAW"; then
+	    AC_MSG_ERROR([Install dcraw before enabling raw image thumbnailing])
+	fi
 fi
 AM_CONDITIONAL(ENABLE_RAW, test "$enable_raw" = "yes")
 
@@ -64,12 +64,26 @@
 if test "$enable_tex" = "yes"; then
     dnl *** check to see if latex, needed for tex thumbnailing, is on the path ***
     AC_PATH_PROG(LATEX, latex)
-        if test -z "$LATEX"; then
-      	    AC_MSG_ERROR([Install tetex before enabling latex thumbnailing])
-        fi
+	if test -z "$LATEX"; then
+	    AC_MSG_ERROR([Install tetex before enabling latex thumbnailing])
+	fi
 fi
 AM_CONDITIONAL(ENABLE_TEX, test "$enable_tex" = "yes")
 
+dnl *** check if we want grace (agr) thumbnailing ***
+AC_ARG_ENABLE(enable-grace,
+   [ --enable-grace Enables thumbnailing of xmgrace / grace (.agr) files (requires grace). ],
+   enable_grace=yes)
+if test "$enable_grace" = "yes"; then
+    dnl *** check to see if gracebat, needed for tex thumbnailing, is on the path ***
+    AC_PATH_PROG(GRACE, gracebat)
+	if test -z "$GRACE"; then
+	    AC_MSG_ERROR([Install grace before enabling grace/xmgrace thumbnailing])
+	fi
+fi
+AM_CONDITIONAL(ENABLE_GRACE, test "$enable_grace" = "yes")
+
+
 AC_OUTPUT([
 Makefile
 eps-thumbnailer/Makefile
@@ -77,4 +91,5 @@
 ps-thumbnailer/Makefile
 raw-thumbnailer/Makefile
 fig-thumbnailer/Makefile
+agr-thumbnailer/Makefile
 ])

Modified: thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am	2007-02-02 22:38:00 UTC (rev 2482)
+++ thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am	2007-02-03 16:38:18 UTC (rev 2483)
@@ -1,7 +1,11 @@
 # $Id: Makefile.am 2296 2007-01-03 11:30:08Z benny $
 
+mimedir = $(datadir)/mime
+mimepackdir = $(mimedir)/packages
+
 if ENABLE_RAW
     libexec_SCRIPTS=raw-thumbnailer
+    mimepack_DATA=thunar-thumbnailers-raw.xml
 endif
 
 desktopdir = $(datadir)/thumbnailers
@@ -16,9 +20,10 @@
 
 EXTRA_DIST =								\
 	$(desktop_in_files)						\
-	$(libexec_SCRIPTS)
+	$(libexec_SCRIPTS)						\
+	$(mimepack_DATA)
 
 DISTCLEANFILES =							\
 	$(desktop_DATA)
 
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
\ No newline at end of file

Modified: thunar-thumbnailers/trunk/raw-thumbnailer/raw-thumbnailer.desktop.in
===================================================================
--- thunar-thumbnailers/trunk/raw-thumbnailer/raw-thumbnailer.desktop.in	2007-02-02 22:38:00 UTC (rev 2482)
+++ thunar-thumbnailers/trunk/raw-thumbnailer/raw-thumbnailer.desktop.in	2007-02-03 16:38:18 UTC (rev 2483)
@@ -4,5 +4,5 @@
 Type=X-Thumbnailer
 Name=Raw Thumbnailer
 TryExec=dcraw
-MimeType=image/x-canon-crw;image/x-fuji-raf;image/x-minolta-mrw;image/x-nikon-nef;image/x-kodak-dcr;image/x-kodak-kdc;image/x-olympus;
+MimeType=image/x-canon-crw;image/x-fuji-raf;image/x-minolta-mrw;image/x-nikon-nef;image/x-kodak-dcr;image/x-kodak-kdc;image/x-olympus-orf;
 X-Thumbnailer-Exec=@libexecdir@/raw-thumbnailer %i %o %s

Added: thunar-thumbnailers/trunk/raw-thumbnailer/thunar-thumbnailers-raw.xml
===================================================================
--- thunar-thumbnailers/trunk/raw-thumbnailer/thunar-thumbnailers-raw.xml	                        (rev 0)
+++ thunar-thumbnailers/trunk/raw-thumbnailer/thunar-thumbnailers-raw.xml	2007-02-03 16:38:18 UTC (rev 2483)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+	<mime-type type="image/x-canon-crw">
+		<comment>Canon raw image</comment>
+		<comment xml:lang="en">Canon raw image</comment>
+		<comment xml:lang="en-GB">Canon raw image</comment>
+		<glob pattern="*.cr2"/>
+	</mime-type>
+	<mime-type type="image/x-canon-crw">
+		<comment>Canon raw image</comment>
+		<comment xml:lang="en">Canon raw image</comment>
+		<comment xml:lang="en-GB">Canon raw image</comment>
+		<glob pattern="*.crw"/>
+	</mime-type>
+	<mime-type type="image/x-fuji-raf">
+		<comment>Fuji raw image</comment>
+		<comment xml:lang="en">Fuji raw image</comment>
+		<comment xml:lang="en-GB">Fuji raw image</comment>
+		<glob pattern="*.raf"/>
+	</mime-type>
+	<mime-type type="image/x-minolta-mrw">
+		<comment>Minolta raw image</comment>
+		<comment xml:lang="en">Minolta raw image</comment>
+		<comment xml:lang="en-GB">Minolta raw image</comment>
+		<glob pattern="*.mrw"/>
+	</mime-type>
+	<mime-type type="image/x-nikon-nef">
+		<comment>Nikon raw image</comment>
+		<comment xml:lang="en">Nikon raw image</comment>
+		<comment xml:lang="en-GB">Nikon raw image</comment>
+		<glob pattern="*.nef"/>
+	</mime-type>
+	<mime-type type="image/x-kodac-dcr">
+		<comment>Kodak raw image</comment>
+		<comment xml:lang="en">Kodac raw image</comment>
+		<comment xml:lang="en-GB">Kodac raw image</comment>
+		<glob pattern="*.dcr"/>
+	</mime-type>
+	<mime-type type="image/x-kodac-kdc">
+		<comment>Kodak raw image</comment>
+		<comment xml:lang="en">Kodac raw image</comment>
+		<comment xml:lang="en-GB">Kodac raw image</comment>
+		<glob pattern="*.kdc"/>
+	</mime-type>
+	<mime-type type="image/x-olympus-orf">
+		<comment>Olympus raw image</comment>
+		<comment xml:lang="en">Olympus raw image</comment>
+		<comment xml:lang="en-GB">Olympus raw image</comment>
+		<glob pattern="*.orf"/>
+	</mime-type>
+</mime-info>




More information about the Goodies-commits mailing list