[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 6247540 2/2: Remove :group from defcustoms in image-dired.el
|
From: |
Lars Ingebrigtsen |
|
Subject: |
master 6247540 2/2: Remove :group from defcustoms in image-dired.el |
|
Date: |
Fri, 13 Aug 2021 06:29:04 -0400 (EDT) |
branch: master
commit 62475407231a6504608286cd8632d6940e1d5e6c
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Remove :group from defcustoms in image-dired.el
* lisp/image-dired.el: Remove :group from the defcustoms throughout.
---
lisp/image-dired.el | 137 +++++++++++++++++-----------------------------------
1 file changed, 45 insertions(+), 92 deletions(-)
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 3c59ef9..7092f75 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -164,8 +164,7 @@
(defcustom image-dired-dir (locate-user-emacs-file "image-dired/")
"Directory where thumbnail images are stored."
- :type 'directory
- :group 'image-dired)
+ :type 'directory)
(defcustom image-dired-thumbnail-storage 'use-image-dired-dir
"How to store image-dired's thumbnail files.
@@ -181,51 +180,44 @@ that allows sharing of thumbnails across different
programs."
(const :tag "Use image-dired-dir" use-image-dired-dir)
(const :tag "Thumbnail Managing Standard (normal 128x128)"
standard)
(const :tag "Thumbnail Managing Standard (large 256x256)"
standard-large)
- (const :tag "Per-directory" per-directory))
- :group 'image-dired)
+ (const :tag "Per-directory" per-directory)))
(defcustom image-dired-db-file
(expand-file-name ".image-dired_db" image-dired-dir)
"Database file where file names and their associated tags are stored."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-temp-image-file
(expand-file-name ".image-dired_temp" image-dired-dir)
"Name of temporary image file used by various commands."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-gallery-dir
(expand-file-name ".image-dired_gallery" image-dired-dir)
"Directory to store generated gallery html pages.
This path needs to be \"shared\" to the public so that it can access
the index.html page that image-dired creates."
- :type 'directory
- :group 'image-dired)
+ :type 'directory)
(defcustom image-dired-gallery-image-root-url
"https://your.own.server/image-diredpics";
"URL where the full size images are to be found.
Note that this path has to be configured in your web server. Image-Dired
expects to find pictures in this directory."
- :type 'string
- :group 'image-dired)
+ :type 'string)
(defcustom image-dired-gallery-thumb-image-root-url
"https://your.own.server/image-diredthumbs";
"URL where the thumbnail images are to be found.
Note that this path has to be configured in your web server. Image-Dired
expects to find pictures in this directory."
- :type 'string
- :group 'image-dired)
+ :type 'string)
(defcustom image-dired-cmd-create-thumbnail-program
"convert"
"Executable used to create thumbnail.
Used together with `image-dired-cmd-create-thumbnail-options'."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-cmd-create-thumbnail-options
'("-size" "%wx%h" "%f[0]" "-resize" "%wx%h>" "-strip" "jpeg:%t")
@@ -236,14 +228,12 @@ Available format specifiers are: %w which is replaced by
%f which is replaced by the file name of the original image and %t
which is replaced by the file name of the thumbnail file."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-cmd-create-temp-image-program "convert"
"Executable used to create temporary image.
Used together with `image-dired-cmd-create-temp-image-options'."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-cmd-create-temp-image-options
'("-size" "%wx%h" "%f[0]" "-resize" "%wx%h>" "-strip" "jpeg:%t")
@@ -254,8 +244,7 @@ the calculated max size for width and height in the image
display window,
%f which is replaced by the file name of the original image and %t which
is replaced by the file name of the temporary file."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-cmd-pngnq-program
(or (executable-find "pngnq")
@@ -264,8 +253,7 @@ is replaced by the file name of the temporary file."
It quantizes colors of PNG images down to 256 colors or fewer
using the NeuQuant algorithm."
:version "26.1"
- :type '(choice (const :tag "Not Set" nil) file)
- :group 'image-dired)
+ :type '(choice (const :tag "Not Set" nil) file))
(defcustom image-dired-cmd-pngnq-options
'("-f" "%t")
@@ -273,15 +261,13 @@ using the NeuQuant algorithm."
Available format specifiers are the same as in
`image-dired-cmd-create-thumbnail-options'."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-cmd-pngcrush-program (executable-find "pngcrush")
"The file name of the `pngcrush' program.
It optimizes the compression of PNG images. Also it adds PNG textual chunks
with the information required by the Thumbnail Managing Standard."
- :type '(choice (const :tag "Not Set" nil) file)
- :group 'image-dired)
+ :type '(choice (const :tag "Not Set" nil) file))
(defcustom image-dired-cmd-pngcrush-options
`("-q"
@@ -299,14 +285,12 @@ Available format specifiers are the same as in
`image-dired-cmd-create-thumbnail-options', with %q for a
temporary file name (typically generated by pnqnq)."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-cmd-optipng-program (executable-find "optipng")
"The file name of the `optipng' program."
:version "26.1"
- :type '(choice (const :tag "Not Set" nil) file)
- :group 'image-dired)
+ :type '(choice (const :tag "Not Set" nil) file))
(defcustom image-dired-cmd-optipng-options '("-o5" "%t")
"Arguments passed to `image-dired-cmd-optipng-program'.
@@ -314,8 +298,7 @@ Available format specifiers are described in
`image-dired-cmd-create-thumbnail-options'."
:version "26.1"
:type '(repeat (string :tag "Argument"))
- :link '(url-link "man:optipng(1)")
- :group 'image-dired)
+ :link '(url-link "man:optipng(1)"))
(defcustom image-dired-cmd-create-standard-thumbnail-options
(append '("-size" "%wx%h" "%f[0]")
@@ -331,15 +314,13 @@ Available format specifiers are described in
Available format specifiers are the same as in
`image-dired-cmd-create-thumbnail-options', with %m for file modification
time."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-cmd-rotate-thumbnail-program
"mogrify"
"Executable used to rotate thumbnail.
Used together with `image-dired-cmd-rotate-thumbnail-options'."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-cmd-rotate-thumbnail-options
'("-rotate" "%d" "%t")
@@ -350,15 +331,13 @@ number of (positive) degrees to rotate the image,
normally 90 or 270
\(for 90 degrees right and left), %t which is replaced by the file name
of the thumbnail file."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-cmd-rotate-original-program
"jpegtran"
"Executable used to rotate original image.
Used together with `image-dired-cmd-rotate-original-options'."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-cmd-rotate-original-options
'("-rotate" "%d" "-copy" "all" "-outfile" "%t" "%o")
@@ -370,28 +349,24 @@ number of (positive) degrees to rotate the image,
normally 90 or
original image file name and %t which is replaced by
`image-dired-temp-image-file'."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-temp-rotate-image-file
(expand-file-name ".image-dired_rotate_temp" image-dired-dir)
"Temporary file for rotate operations."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-rotate-original-ask-before-overwrite t
"Confirm overwrite of original file after rotate operation.
If non-nil, ask user for confirmation before overwriting the
original file with `image-dired-temp-rotate-image-file'."
- :type 'boolean
- :group 'image-dired)
+ :type 'boolean)
(defcustom image-dired-cmd-write-exif-data-program
"exiftool"
"Program used to write EXIF data to image.
Used together with `image-dired-cmd-write-exif-data-options'."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-cmd-write-exif-data-options
'("-%t=%v" "%f")
@@ -401,15 +376,13 @@ Available format specifiers are: %f which is replaced by
the image file name, %t which is replaced by the tag name and %v
which is replaced by the tag value."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-cmd-read-exif-data-program
"exiftool"
"Program used to read EXIF data to image.
Used together with `image-dired-cmd-read-exif-data-options'."
- :type 'file
- :group 'image-dired)
+ :type 'file)
(defcustom image-dired-cmd-read-exif-data-options
'("-s" "-s" "-s" "-%t" "%f")
@@ -418,15 +391,13 @@ Used with `image-dired-cmd-read-exif-data-program'.
Available format specifiers are: %f which is replaced
by the image file name and %t which is replaced by the tag name."
:version "26.1"
- :type '(repeat (string :tag "Argument"))
- :group 'image-dired)
+ :type '(repeat (string :tag "Argument")))
(defcustom image-dired-gallery-hidden-tags
(list "private" "hidden" "pending")
"List of \"hidden\" tags.
Used by `image-dired-gallery-generate' to leave out \"hidden\" images."
- :type '(repeat string)
- :group 'image-dired)
+ :type '(repeat string))
(defcustom image-dired-thumb-size
(cond
@@ -436,29 +407,24 @@ Used by `image-dired-gallery-generate' to leave out
\"hidden\" images."
"Size of thumbnails, in pixels.
This is the default size for both `image-dired-thumb-width'
and `image-dired-thumb-height'."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defcustom image-dired-thumb-width image-dired-thumb-size
"Width of thumbnails, in pixels."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defcustom image-dired-thumb-height image-dired-thumb-size
"Height of thumbnails, in pixels."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defcustom image-dired-thumb-relief 2
"Size of button-like border around thumbnails."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defcustom image-dired-thumb-margin 2
"Size of the margin around thumbnails.
This is where you see the cursor."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defcustom image-dired-thumb-visible-marks t
"Make marks visible in thumbnail buffer.
@@ -484,34 +450,29 @@ and No line-up means that no automatic line-up will be
done."
(const :tag "Dynamic" dynamic)
(const :tag "Fixed" fixed)
(const :tag "Interactive" interactive)
- (const :tag "No line-up" none))
- :group 'image-dired)
+ (const :tag "No line-up" none)))
(defcustom image-dired-thumbs-per-row 3
"Number of thumbnails to display per row in thumb buffer."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defcustom image-dired-display-window-width-correction 1
"Number to be used to correct image display window width.
Change if the default (1) does not work (i.e. if the image does not
completely fit)."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defcustom image-dired-display-window-height-correction 0
"Number to be used to correct image display window height.
Change if the default (0) does not work (i.e. if the image does not
completely fit)."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defcustom image-dired-track-movement t
"The current state of the tracking and mirroring.
For more information, see the documentation for
`image-dired-toggle-movement-tracking'."
- :type 'boolean
- :group 'image-dired)
+ :type 'boolean)
(defcustom image-dired-append-when-browsing nil
"Append thumbnails in thumbnail buffer when browsing.
@@ -521,8 +482,7 @@ images in the thumbnail buffer. If you enable this and
want to clean
the thumbnail buffer because it is filled with too many thumbnails,
just call `image-dired-display-thumb' to display only the image at point.
This value can be toggled using `image-dired-toggle-append-browsing'."
- :type 'boolean
- :group 'image-dired)
+ :type 'boolean)
(defcustom image-dired-dired-disp-props t
"If non-nil, display properties for dired file when browsing.
@@ -530,16 +490,14 @@ Used by `image-dired-next-line-and-display',
`image-dired-previous-line-and-display' and
`image-dired-mark-and-display-next'.
If the database file is large, this can slow down image browsing in
dired and you might want to turn it off."
- :type 'boolean
- :group 'image-dired)
+ :type 'boolean)
(defcustom image-dired-display-properties-format "%b: %f (%t): %c"
"Display format for thumbnail properties.
%b is replaced with associated dired buffer name, %f with file name
\(without path) of original image file, %t with the list of tags and %c
with the comment."
- :type 'string
- :group 'image-dired)
+ :type 'string)
(defcustom image-dired-external-viewer
;; TODO: Use mailcap, dired-guess-shell-alist-default,
@@ -552,20 +510,17 @@ Including parameters. Used when displaying original
image from
`image-dired-thumbnail-mode'."
:version "27.1"
:type '(choice string
- (const :tag "Not Set" nil))
- :group 'image-dired)
+ (const :tag "Not Set" nil)))
(defcustom image-dired-main-image-directory "~/pics/"
"Name of main image directory, if any.
Used by `image-dired-copy-with-exif-file-name'."
- :type 'string
- :group 'image-dired)
+ :type 'string)
(defcustom image-dired-show-all-from-dir-max-files 50
"Maximum number of files to show using `image-dired-show-all-from-dir'
before warning the user."
- :type 'integer
- :group 'image-dired)
+ :type 'integer)
(defmacro image-dired--with-db-file (&rest body)
"Run BODY in a temp buffer containing `image-dired-db-file'.
@@ -1648,7 +1603,6 @@ You probably want to use this together with
special-mode "image-dired-thumbnail"
"Browse and manipulate thumbnail images using dired.
Use `image-dired-minor-mode' to get a nice setup."
- :group 'image-dired
(buffer-disable-undo)
(add-hook 'file-name-at-point-functions 'image-dired-file-name-at-point nil
t))
@@ -1656,7 +1610,6 @@ Use `image-dired-minor-mode' to get a nice setup."
special-mode "image-dired-image-display"
"Mode for displaying and manipulating original image.
Resized or in full-size."
- :group 'image-dired
(buffer-disable-undo)
(image-mode-setup-winprops)
(setq cursor-type nil)