Mercurial > hg > forks > geeqie
changeset 2894:a4836631689a
Tell Git to ignore .desktop files globally
These files are all generated by the build, with the exception of the
template.desktop file, so:
* Have Git ignore all *.desktop files.
* Rename template.desktop to template.desktop.in to
avoid a clash with this new ignore rule.
* Remove the checked-in image-crop.desktop file, which is built
anyway.
| author | Dave Lambert <dave@davelambert.org> |
|---|---|
| date | Mon, 26 Nov 2018 12:11:40 +0000 |
| parents | b20a96b979a3 |
| children | 790a598fc09e |
| files | .gitignore plugins/Makefile.am plugins/image-crop/image-crop.desktop plugins/template.desktop plugins/template.desktop.in src/main.h |
| diffstat | 6 files changed, 99 insertions(+), 126 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitignore Sat Nov 03 17:53:31 2018 +0000 +++ b/.gitignore Mon Nov 26 12:11:40 2018 +0000 @@ -6,6 +6,9 @@ *.rej *.orig +# GNOME .desktop files +*.desktop + # / /aclocal.m4 /autom4te.cache @@ -32,23 +35,10 @@ /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
--- a/plugins/Makefile.am Sat Nov 03 17:53:31 2018 +0000 +++ b/plugins/Makefile.am Mon Nov 26 12:11:40 2018 +0000 @@ -1,6 +1,6 @@ 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_DATA = template.desktop.in EXTRA_DIST = $(qq_desktoptemplate_DATA)
--- a/plugins/image-crop/image-crop.desktop Sat Nov 03 17:53:31 2018 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Image crop - -# Requires ImageMagick and exiftools - -Exec=geeqie-image-crop %f - -# Desktop files that are usable only in Geeqie should be marked like this: -Categories=X-Geeqie; -OnlyShowIn=X-Geeqie; - -# It can be made verbose -#X-Geeqie-Verbose=true - -Icon=geeqie
--- a/plugins/template.desktop Sat Nov 03 17:53:31 2018 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -[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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/template.desktop.in Mon Nov 26 12:11:40 2018 +0000 @@ -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
--- a/src/main.h Sat Nov 03 17:53:31 2018 +0000 +++ b/src/main.h Mon Nov 26 12:11:40 2018 +0000 @@ -123,7 +123,7 @@ #include "debug.h" #include "options.h" -#define DESKTOP_FILE_TEMPLATE GQ_APP_DIR "/template.desktop" +#define DESKTOP_FILE_TEMPLATE GQ_APP_DIR "/template.desktop.in" #define TIMEZONE_DATABASE "timezone21.bin"