# HG changeset patch # User nadvornik # Date 1246177947 0 # Node ID 5bb036e67d6d7f14e5256cf48f4400cd6f01f847 # Parent 0035002fad2667a3d65a955983f830fc780cd4d8 added script for importing GQView and Geeqie-alpha metadata diff -r 0035002fad26 -r 5bb036e67d6d configure.in --- a/configure.in Sat Jun 27 23:12:52 2009 +0000 +++ b/configure.in Sun Jun 28 08:32:27 2009 +0000 @@ -413,6 +413,7 @@ plugins/symlink/Makefile plugins/rotate/Makefile plugins/ufraw/Makefile + plugins/import/Makefile geeqie.spec ]) diff -r 0035002fad26 -r 5bb036e67d6d plugins/Makefile.am --- a/plugins/Makefile.am Sat Jun 27 23:12:52 2009 +0000 +++ b/plugins/Makefile.am Sun Jun 28 08:32:27 2009 +0000 @@ -1,6 +1,6 @@ #FIXME enable or disable individual plugins from configure -SUBDIRS = rotate symlink ufraw +SUBDIRS = rotate symlink ufraw import qq_desktoptemplatedir = $(pkgdatadir) qq_desktoptemplate_DATA = template.desktop diff -r 0035002fad26 -r 5bb036e67d6d plugins/import/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/import/Makefile.am Sun Jun 28 08:32:27 2009 +0000 @@ -0,0 +1,9 @@ +dist_pkglib_SCRIPTS = geeqie-import + +gq_desktopdir = $(pkgdatadir)/applications +gq_desktop_in_files = geeqie-import-geeqie.desktop.in geeqie-import-gqview.desktop.in +gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + +EXTRA_DIST = \ + $(qq_desktop_DATA) diff -r 0035002fad26 -r 5bb036e67d6d plugins/import/geeqie-import --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/import/geeqie-import Sun Jun 28 08:32:27 2009 +0000 @@ -0,0 +1,34 @@ +#!/bin/bash + +case "$1" in + gqview) + srcdir=$HOME/.gqview/metadata + ;; + geeqie-1-alpha) + srcdir=$HOME/.geeqie/metadata + ;; + *) + echo Unknown argument $1 + exit 1 + ;; +esac + +destdir=$HOME/.local/share/geeqie/metadata + +if [ ! -d $HOME/.local/share/geeqie ] ; then + echo \"$HOME/.local/share/geeqie\" does not exist + exit 1 +fi + +for ext in .meta .gq.xmp ; do + find "$srcdir" -type f -name "*$ext" -print | while read src ; do + img="${src#$srcdir}" + img="${img%$ext}" + dest="$destdir$img$ext" + if [ -f "$img" -a ! -f "$dest" ] ; then + mkdir -p "${dest%/*}" + cp -pr "$src" "$dest" + echo Importing $ext metadata for \"$img\" + fi + done +done diff -r 0035002fad26 -r 5bb036e67d6d plugins/import/geeqie-import-gqview.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/import/geeqie-import-gqview.desktop.in Sun Jun 28 08:32:27 2009 +0000 @@ -0,0 +1,17 @@ +[Desktop Entry] +Version=1.0 +Type=Application +_Name=Import GQView metadata + +# call the helper script +Exec=geeqie-import gqview + +# Desktop files that are usable only in Geeqie should be marked like this: +Categories=X-Geeqie; +OnlyShowIn=X-Geeqie; + +# Show in menu "File" +X-Geeqie-Menu-Path=EditMenu/PreferencesMenu + +# It can be made verbose +X-Geeqie-Verbose=true diff -r 0035002fad26 -r 5bb036e67d6d po/POTFILES.in --- a/po/POTFILES.in Sat Jun 27 23:12:52 2009 +0000 +++ b/po/POTFILES.in Sun Jun 28 08:32:27 2009 +0000 @@ -3,6 +3,9 @@ plugins/symlink/symlink.desktop.in plugins/ufraw/geeqie-ufraw-recursive.desktop.in plugins/ufraw/geeqie-ufraw.desktop.in +plugins/ufraw/geeqie-ufraw-id.desktop.in +plugins/ufraw/geeqie-import-gqview.desktop.in +plugins/ufraw/geeqie-import-geeqie.desktop.in src/advanced_exif.c src/bar.c src/bar_comment.c