Fix #649: Tell Git to ignore .desktop files globally

https://github.com/BestImageViewer/geeqie/pull/649

diff --git a/.gitignore b/.gitignore
index af6579c..fdcda09 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@ Makefile.in
 *.rej
 *.orig
 
+# GNOME .desktop files
+*.desktop
+
 # /
 /aclocal.m4
 /autom4te.cache
@@ -32,23 +35,10 @@ Makefile.in
 /depcomp
 /auxdir
 /stamp-h1
-/geeqie.desktop
 /intltool-extract.in
 /intltool-update.in
 /intltool-merge.in
 
-# /plugins/import/
-/plugins/import/*.desktop
-
-# /plugins/rotate/
-/plugins/rotate/*.desktop
-
-# /plugins/symlink/
-/plugins/symlink/*.desktop
-
-# /plugins/ufraw/
-/plugins/ufraw/*.desktop
-
 # /po/
 /po/Makefile.in.in
 /po/POTFILES

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b0b5d65..957df07 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,9 @@
 
 SUBDIRS = rotate symlink ufraw import geocode-parameters export-jpeg tethered-photography camera-import image-crop
 qq_desktoptemplatedir = $(appdir)
-qq_desktoptemplate_DATA = template.desktop
+qq_desktoptemplate_in_files = template.desktop.in
+qq_desktoptemplate_DATA = $(qq_desktoptemplate_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(qq_desktoptemplate_DATA)
+EXTRA_DIST = $(qq_desktoptemplate_in_files)
+CLEANFILES = $(qq_desktoptemplate_DATA)

diff --git a/plugins/template.desktop.in b/plugins/template.desktop.in
new file mode 100644 (file)
index 0000000..d43690c
--- /dev/null
+++ b/plugins/template.desktop.in
@@ -0,0 +1,94 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+# The name which appears in the menu:
+_Name=Template
+#Name[cs]=
+#Name[fr]=
+#Name[de]=Vorlage
+
+# Replace "command" with the actual command or script:
+Exec=command %f
+
+# %f    A single file name, even if multiple files are selected. The
+#        system reading the desktop entry should recognize that the program in
+#        question cannot handle multiple file arguments, and it should should
+#        probably spawn and execute multiple copies of a program for each
+#        selected file if the program is not able to handle additional file
+#        arguments. If files are not on the local file system (i.e. are on HTTP
+#        or FTP locations), the files will be copied to the local file system
+#        and %f will be expanded to point at the temporary file. Used for
+#        programs that do not understand the URL syntax.
+#
+# %F   A list of files. Use for apps that can open several local files
+#       at once. Each file is passed as a separate argument to the executable
+#       program.
+#
+# %u   A single URL. Local files may either be passed as file: URLs or
+#       as file path.
+#
+# %U   A list of URLs. Each URL is passed as a separate argument to
+#       the executable program. Local files may either be passed as file: URLs
+#       or as file path.
+
+# Change the following line to point to an icon of your choosing
+Icon=gtk-file
+
+# Use the following to only show this menu entry if the command is installed
+#TryExec=command
+
+# Desktop files that are usable only in Geeqie should be marked like this:
+Categories=X-Geeqie;
+OnlyShowIn=X-Geeqie;
+
+# Uncomment the following line to include in a Geeqie menu,
+# other than in the default path of EditMenu/ExternalMenu
+#X-Geeqie-Menu-Path=<FileMenuPath>
+
+# e.g.
+#X-Geeqie-Menu-Path=SelectMenu/SelectSection
+
+# Valid sections are:
+#    FileMenu
+#    FileMenu/OpenSection
+#    FileMenu/SearchSection
+#    FileMenu/PrintSection
+#    FileMenu/FileOpsSection
+#    FileMenu/QuitSection
+#    GoMenu
+#    SelectMenu
+#    SelectMenu/SelectSection
+#    SelectMenu/ClipboardSection
+#    SelectMenu/MarksSection
+#    EditMenu
+#    EditMenu/EditSection
+#    EditMenu/OrientationMenu
+#    EditMenu/RatingMenu
+#    EditMenu/PropertiesSection
+#    EditMenu/PreferencesSection
+#    PluginsMenu
+#    ViewMenu
+#    ViewMenu/WindowSection
+#    ViewMenu/FileDirMenu
+#    ViewMenu/FileDirMenu/FolderSection
+#    ViewMenu/FileDirMenu/ListSection
+#    ViewMenu/DirSection
+#    ViewMenu/ZoomMenu
+#    ViewMenu/ZoomMenu/ConnectZoomMenu
+#    ViewMenu/SplitMenu
+#    ViewMenu/StereoMenu
+#    ViewMenu/ColorMenu
+#    ViewMenu/OverlayMenu
+#    ViewMenu/ViewSection
+#    ViewMenu/ToolsSection
+#    ViewMenu/SlideShowSection
+#    HelpMenu
+#    HelpMenu/HelpSection
+
+# This is a filter - see symlink.desktop and geeqie-symlink for an example
+# how to use this feature
+#X-Geeqie-Filter=true
+
+# It can be made verbose
+#X-Geeqie-Verbose=true

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5db6035..54f9211 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ plugins/camera-import/camera-import.desktop.in
 plugins/image-crop/image-crop.desktop.in
 plugins/rotate/rotate.desktop.in
 plugins/symlink/symlink.desktop.in
+plugins/template.desktop.in
 plugins/ufraw/geeqie-ufraw.desktop.in
 plugins/ufraw/geeqie-ufraw-id.desktop.in
 plugins/ufraw/geeqie-ufraw-recursive.desktop.in
@@ -49,9 +50,12 @@ src/histogram.c
 src/history_list.c
 src/image.c
 src/image-load.c
+src/image_load_collection.c
+src/image_load_dds.c
 src/image_load_ffmpegthumbnailer.c
 src/image_load_gdk.c
 src/image_load_jpeg.c
+src/image_load_pdf.c
 src/image_load_tiff.c
 src/image-overlay.c
 src/img-view.c
@@ -116,3 +120,4 @@ src/view_file/view_file.c
 src/view_file/view_file_icon.c
 src/view_file/view_file_list.c
 src/window.c
+src/zonedetect.c