Mercurial > emacs
annotate lisp/tumme.el @ 75519:b271481fb8d2
(url-get-authentication): Fix typo in docstring.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Mon, 29 Jan 2007 16:58:37 +0000 |
parents | e3694f1cb928 |
children | 95d0cdf160ea |
rev | line source |
---|---|
67302 | 1 ;;; tumme.el --- use dired to browse and manipulate your images |
2 ;; | |
75347 | 3 ;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. |
67302 | 4 ;; |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
5 ;; Version: 0.4.11 |
68404 | 6 ;; Keywords: multimedia |
67302 | 7 ;; Author: Mathias Dahl <mathias.rem0veth1s.dahl@gmail.com> |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
24 ;; Boston, MA 02110-1301, USA. | |
25 | |
26 ;;; Commentary: | |
27 ;; | |
28 ;; BACKGROUND | |
29 ;; ========== | |
30 ;; | |
31 ;; I needed a program to browse, organize and tag my pictures. I got | |
32 ;; tired of the old gallery program I used as it did not allow | |
33 ;; multi-file operations easily. Also, it put things out of my | |
34 ;; control. Image viewing programs I tested did not allow multi-file | |
35 ;; operations or did not do what I wanted it to. | |
36 ;; | |
37 ;; So, I got the idea to use the wonderful functionality of Emacs and | |
38 ;; `dired' to do it. It would allow me to do almost anything I wanted, | |
39 ;; which is basically just to browse all my pictures in an easy way, | |
40 ;; letting me manipulate and tag them in various ways. `dired' already | |
41 ;; provide all the file handling and navigation facilities; I only | |
42 ;; needed to add some functions to display the images. | |
43 ;; | |
44 ;; I briefly tried out thumbs.el, and although it seemed more | |
45 ;; powerful than this package, it did not work the way I wanted to. It | |
46 ;; was too slow to created thumbnails of all files in a directory (I | |
47 ;; currently keep all my 2000+ images in the same directory) and | |
48 ;; browsing the thumbnail buffer was slow too. tumme.el will not | |
49 ;; create thumbnails until they are needed and the browsing is done | |
50 ;; quickly and easily in dired. I copied a great deal of ideas and | |
51 ;; code from there though... :) | |
52 ;; | |
53 ;; About the name: tumme means thumb in Swedish and it is used for | |
54 ;; working with thumbnails, so... :) If you want to know how to | |
55 ;; pronounce it, go to the page on EmacsWiki and download the .ogg | |
56 ;; file from there. | |
57 ;; | |
58 ;; `tumme' stores the thumbnail files in `tumme-dir' using the file | |
59 ;; name format ORIGNAME.thumb.ORIGEXT. For example | |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
60 ;; ~/.emacs.d/tumme/myimage01.thumb.jpg. The "database" is for now |
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
61 ;; just a plain text file with the following format: |
67302 | 62 ;; |
63 ;; file-name-non-directory;comment:comment-text;tag1;tag2;tag3;...;tagN | |
64 ;; | |
65 ;; | |
66 ;; PREREQUISITES | |
67 ;; ============= | |
68 ;; | |
69 ;; * The ImageMagick package. Currently, `convert' and `mogrify' are | |
70 ;; used. Find it here: http://www.imagemagick.org. | |
71 ;; | |
72 ;; * For non-lossy rotation of JPEG images, the JpegTRAN program is | |
73 ;; needed. | |
74 ;; | |
75 ;; * For `tumme-get-exif-data' and `tumme-write-exif-data' to work, | |
76 ;; the command line tool `exiftool' is needed. It can be found here: | |
77 ;; http://www.sno.phy.queensu.ca/~phil/exiftool/. These two functions | |
78 ;; are, among other things, used for writing comments to image files | |
79 ;; using `tumme-thumbnail-set-image-description' and to create | |
80 ;; "unique" file names using `tumme-get-exif-file-name' (used by | |
81 ;; `tumme-copy-with-exif-file-name'). | |
82 ;; | |
83 ;; | |
84 ;; USAGE | |
85 ;; ===== | |
86 ;; | |
72093
e75e38c3a62f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72091
diff
changeset
|
87 ;; This information has been moved to the manual. Type `C-h r' to open |
70890
6bb61012beed
Removed most of the information in the USAGE section. The manual does a better job.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70888
diff
changeset
|
88 ;; the Emacs manual and go to the node Thumbnails by typing `g |
6bb61012beed
Removed most of the information in the USAGE section. The manual does a better job.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70888
diff
changeset
|
89 ;; Thumbnails RET'. |
67302 | 90 ;; |
70890
6bb61012beed
Removed most of the information in the USAGE section. The manual does a better job.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70888
diff
changeset
|
91 ;; Quickstart: M-x tumme RET DIRNAME RET |
67302 | 92 ;; |
70890
6bb61012beed
Removed most of the information in the USAGE section. The manual does a better job.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70888
diff
changeset
|
93 ;; where DIRNAME is a directory containing image files. |
67302 | 94 ;; |
95 ;; LIMITATIONS | |
96 ;; =========== | |
97 ;; | |
98 ;; * Supports all image formats that Emacs and convert supports, but | |
99 ;; the thumbnails are hard-coded to JPEG format. | |
100 ;; | |
101 ;; * WARNING: The "database" format used might be changed so keep a | |
102 ;; backup of `tumme-db-file' when testing new versions. | |
103 ;; | |
104 ;; | |
105 ;; TODO | |
106 ;; ==== | |
107 ;; | |
108 ;; * Support gallery creation when using per-directory thumbnail | |
109 ;; storage. | |
110 ;; | |
111 ;; * Some sort of auto-rotate function based on rotate info in the | |
112 ;; EXIF data. | |
113 ;; | |
114 ;; * Check if exiftool exist before trying to call it to give a better | |
115 ;; error message. | |
116 ;; | |
117 ;; * Investigate if it is possible to also write the tags to the image | |
118 ;; files. | |
119 ;; | |
120 ;; * From thumbs.el: Add an option for clean-up/max-size functionality | |
68754
9c1ca2e3695c
Added a few todo items.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68682
diff
changeset
|
121 ;; for thumbnail directory. |
67302 | 122 ;; |
123 ;; * From thumbs.el: Add setroot function. | |
124 ;; | |
68754
9c1ca2e3695c
Added a few todo items.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68682
diff
changeset
|
125 ;; * From thumbs.el: Add image resizing, if useful (tumme's automatic |
9c1ca2e3695c
Added a few todo items.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68682
diff
changeset
|
126 ;; "image fit" might be enough) |
9c1ca2e3695c
Added a few todo items.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68682
diff
changeset
|
127 ;; |
9c1ca2e3695c
Added a few todo items.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68682
diff
changeset
|
128 ;; * From thumbs.el: Add the "modify" commands (emboss, negate, |
9c1ca2e3695c
Added a few todo items.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68682
diff
changeset
|
129 ;; monochrome etc). |
9c1ca2e3695c
Added a few todo items.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68682
diff
changeset
|
130 ;; |
67302 | 131 ;; * Asynchronous creation of thumbnails. |
132 ;; | |
133 ;; * Add `tumme-display-thumbs-ring' and functions to cycle that. Find | |
134 ;; out which is best, saving old batch just before inserting new, or | |
135 ;; saving the current batch in the ring when inserting it. Adding it | |
136 ;; probably needs rewriting `tumme-display-thumbs' to be more general. | |
137 ;; | |
138 ;; * Find some way of toggling on and off really nice keybindings in | |
69284
692ff61f94dc
Changes in whitespace.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68851
diff
changeset
|
139 ;; dired (for example, using C-n or <down> instead of C-S-n). Richard |
67302 | 140 ;; suggested that we could keep C-t as prefix for tumme commands as it |
69284
692ff61f94dc
Changes in whitespace.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68851
diff
changeset
|
141 ;; is currently not used in dired. He also suggested that |
67302 | 142 ;; `dired-next-line' and `dired-previous-line' figure out if tumme is |
143 ;; enabled in the current buffer and, if it is, call | |
144 ;; `tumme-dired-next-line' and `tumme-dired-previous-line', | |
69284
692ff61f94dc
Changes in whitespace.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68851
diff
changeset
|
145 ;; respectively. Update: This is partly done; some bindings have now |
68806
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
146 ;; been added to dired. |
67302 | 147 ;; |
148 ;; * Enhanced gallery creation with basic CSS-support and pagination | |
149 ;; of tag pages with many pictures. | |
150 ;; | |
151 ;; * Rewrite `tumme-modify-mark-on-thumb-original-file' to be less | |
152 ;; ugly. | |
153 ;; | |
154 ;; * In some way keep track of buffers and windows and stuff so that | |
155 ;; it works as the user expects. | |
156 ;; | |
157 ;; * More/better documentation | |
158 ;; | |
159 ;; | |
160 ;;; Code: | |
161 | |
162 (require 'dired) | |
163 (require 'format-spec) | |
72019
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
164 (require 'widget) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
165 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
166 (eval-when-compile |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
167 (require 'wid-edit)) |
67302 | 168 |
169 (defgroup tumme nil | |
170 "Use dired to browse your images as thumbnails, and more." | |
171 :prefix "tumme-" | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
172 :group 'multimedia) |
67302 | 173 |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
174 (defcustom tumme-dir "~/.emacs.d/tumme/" |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
175 "Directory where thumbnail images are stored." |
67302 | 176 :type 'string |
177 :group 'tumme) | |
178 | |
179 (defcustom tumme-thumbnail-storage 'use-tumme-dir | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
180 "How to store tumme's thumbnail files. |
67302 | 181 Tumme can store thumbnail files in one of two ways and this is |
182 controlled by this variable. \"Use tumme dir\" means that the | |
183 thumbnails are stored in a central directory. \"Per directory\" | |
184 means that each thumbnail is stored in a subdirectory called | |
68833
207844891bb3
(tumme-thumbnail-storage): Updated docstring. Added
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68815
diff
changeset
|
185 \".tumme\" in the same directory where the image file is. |
207844891bb3
(tumme-thumbnail-storage): Updated docstring. Added
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68815
diff
changeset
|
186 \"Thumbnail Managing Standard\" means that the thumbnails are |
68851
ef6240377b78
(tumme-thumbnail-storage): Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
68835
diff
changeset
|
187 stored and generated according to the Thumbnail Managing Standard |
ef6240377b78
(tumme-thumbnail-storage): Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
68835
diff
changeset
|
188 that allows sharing of thumbnails across different programs." |
67302 | 189 :type '(choice :tag "How to store thumbnail files" |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
190 (const :tag "Thumbnail Managing Standard" standard) |
67302 | 191 (const :tag "Use tumme-dir" use-tumme-dir) |
192 (const :tag "Per-directory" per-directory)) | |
193 :group 'tumme) | |
194 | |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
195 (defcustom tumme-db-file "~/.emacs.d/tumme/.tumme_db" |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
196 "Database file where file names and their associated tags are stored." |
67302 | 197 :type 'string |
198 :group 'tumme) | |
199 | |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
200 (defcustom tumme-temp-image-file "~/.emacs.d/tumme/.tumme_temp" |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
201 "Name of temporary image file used by various commands." |
67302 | 202 :type 'string |
203 :group 'tumme) | |
204 | |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
205 (defcustom tumme-gallery-dir "~/.emacs.d/tumme/.tumme_gallery" |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
206 "Directory to store generated gallery html pages. |
67302 | 207 This path needs to be \"shared\" to the public so that it can access |
208 the index.html page that tumme creates." | |
209 :type 'string | |
210 :group 'tumme) | |
211 | |
212 (defcustom tumme-gallery-image-root-url | |
213 "http://your.own.server/tummepics" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
214 "URL where the full size images are to be found. |
67302 | 215 Note that this path has to be configured in your web server. Tumme |
216 expects to find pictures in this directory." | |
217 :type 'string | |
218 :group 'tumme) | |
219 | |
220 (defcustom tumme-gallery-thumb-image-root-url | |
221 "http://your.own.server/tummethumbs" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
222 "URL where the thumbnail images are to be found. |
67302 | 223 Note that this path has to be configured in your web server. Tumme |
224 expects to find pictures in this directory." | |
225 :type 'string | |
226 :group 'tumme) | |
227 | |
228 (defcustom tumme-cmd-create-thumbnail-program | |
229 "convert" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
230 "Executable used to create thumbnail. |
67302 | 231 Used together with `tumme-cmd-create-thumbnail-options'." |
232 :type 'string | |
233 :group 'tumme) | |
234 | |
235 (defcustom tumme-cmd-create-thumbnail-options | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
236 "%p -size %wx%h \"%f\" -resize %wx%h +profile \"*\" jpeg:\"%t\"" |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
237 "Format of command used to create thumbnail image. |
67302 | 238 Available options are %p which is replaced by |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
239 `tumme-cmd-create-thumbnail-program', %w which is replaced by |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
240 `tumme-thumb-width', %h which is replaced by `tumme-thumb-height', |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
241 %f which is replaced by the file name of the original image and %t |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
242 which is replaced by the file name of the thumbnail file." |
67302 | 243 :type 'string |
244 :group 'tumme) | |
245 | |
246 (defcustom tumme-cmd-create-temp-image-program | |
247 "convert" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
248 "Executable used to create temporary image. |
67302 | 249 Used together with `tumme-cmd-create-temp-image-options'." |
250 :type 'string | |
251 :group 'tumme) | |
252 | |
253 (defcustom tumme-cmd-create-temp-image-options | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
254 "%p -size %wx%h \"%f\" -resize %wx%h +profile \"*\" jpeg:\"%t\"" |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
255 "Format of command used to create temporary image for display window. |
67302 | 256 Available options are %p which is replaced by |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
257 `tumme-cmd-create-temp-image-program', %w and %h which is replaced by |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
258 the calculated max size for width and height in the image display window, |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
259 %f which is replaced by the file name of the original image and %t which |
67302 | 260 is replaced by the file name of the temporary file." |
261 :type 'string | |
262 :group 'tumme) | |
263 | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
264 (defcustom tumme-cmd-pngnq-program (executable-find "pngnq") |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
265 "The file name of the `pngnq' program. |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
266 It quantizes colors of PNG images down to 256 colors." |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
267 :type '(choice (const :tag "Not Set" nil) string) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
268 :group 'tumme) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
269 |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
270 (defcustom tumme-cmd-pngcrush-program (executable-find "pngcrush") |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
271 "The file name of the `pngcrush' program. |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
272 It optimizes the compression of PNG images. Also it adds PNG textual chunks |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
273 with the information required by the Thumbnail Managing Standard." |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
274 :type '(choice (const :tag "Not Set" nil) string) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
275 :group 'tumme) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
276 |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
277 (defcustom tumme-cmd-create-standard-thumbnail-command |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
278 (concat |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
279 tumme-cmd-create-thumbnail-program " " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
280 "-size %wx%h \"%f\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
281 (unless (or tumme-cmd-pngcrush-program tumme-cmd-pngnq-program) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
282 (concat |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
283 "-set \"Thumb::MTime\" \"%m\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
284 "-set \"Thumb::URI\" \"file://%f\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
285 "-set \"Description\" \"Thumbnail of file://%f\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
286 "-set \"Software\" \"" (emacs-version) "\" ")) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
287 "-thumbnail %wx%h png:\"%t\"" |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
288 (if tumme-cmd-pngnq-program |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
289 (concat |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
290 " ; " tumme-cmd-pngnq-program " -f \"%t\"" |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
291 (unless tumme-cmd-pngcrush-program |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
292 " ; mv %q %t"))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
293 (if tumme-cmd-pngcrush-program |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
294 (concat |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
295 (unless tumme-cmd-pngcrush-program |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
296 " ; cp %t %q") |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
297 " ; " tumme-cmd-pngcrush-program " -q " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
298 "-text b \"Description\" \"Thumbnail of file://%f\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
299 "-text b \"Software\" \"" (emacs-version) "\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
300 ;; "-text b \"Thumb::Image::Height\" \"%oh\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
301 ;; "-text b \"Thumb::Image::Mimetype\" \"%mime\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
302 ;; "-text b \"Thumb::Image::Width\" \"%ow\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
303 "-text b \"Thumb::MTime\" \"%m\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
304 ;; "-text b \"Thumb::Size\" \"%b\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
305 "-text b \"Thumb::URI\" \"file://%f\" " |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
306 "%q %t" |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
307 " ; rm %q"))) |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
308 "Command to create thumbnails according to the Thumbnail Managing Standard." |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
309 :type 'string |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
310 :group 'tumme) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
311 |
67302 | 312 (defcustom tumme-cmd-rotate-thumbnail-program |
313 "mogrify" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
314 "Executable used to rotate thumbnail. |
67302 | 315 Used together with `tumme-cmd-rotate-thumbnail-options'." |
316 :type 'string | |
317 :group 'tumme) | |
318 | |
319 (defcustom tumme-cmd-rotate-thumbnail-options | |
320 "%p -rotate %d \"%t\"" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
321 "Format of command used to rotate thumbnail image. |
67302 | 322 Available options are %p which is replaced by |
323 `tumme-cmd-rotate-thumbnail-program', %d which is replaced by the | |
324 number of (positive) degrees to rotate the image, normally 90 or 270 | |
325 \(for 90 degrees right and left), %t which is replaced by the file name | |
326 of the thumbnail file." | |
327 :type 'string | |
328 :group 'tumme) | |
329 | |
330 (defcustom tumme-cmd-rotate-original-program | |
331 "jpegtran" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
332 "Executable used to rotate original image. |
67302 | 333 Used together with `tumme-cmd-rotate-original-options'." |
334 :type 'string | |
335 :group 'tumme) | |
336 | |
337 (defcustom tumme-cmd-rotate-original-options | |
75215
831d902bd854
(tumme-cmd-rotate-original-options): Add -outfile
Mathias Dahl <mathias.dahl@gmail.com>
parents:
75146
diff
changeset
|
338 "%p -rotate %d -copy all -outfile %t \"%o\"" |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
339 "Format of command used to rotate original image. |
67302 | 340 Available options are %p which is replaced by |
341 `tumme-cmd-rotate-original-program', %d which is replaced by the | |
342 number of (positive) degrees to rotate the image, normally 90 or | |
343 270 \(for 90 degrees right and left), %o which is replaced by the | |
344 original image file name and %t which is replaced by | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
345 `tumme-temp-image-file'." |
67302 | 346 :type 'string |
347 :group 'tumme) | |
348 | |
349 (defcustom tumme-temp-rotate-image-file | |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
350 "~/.emacs.d/tumme/.tumme_rotate_temp" |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
351 "Temporary file for rotate operations." |
67302 | 352 :type 'string |
353 :group 'tumme) | |
354 | |
355 (defcustom tumme-rotate-original-ask-before-overwrite t | |
356 "Confirm overwrite of original file after rotate operation. | |
357 If non-nil, ask user for confirmation before overwriting the | |
358 original file with `tumme-temp-rotate-image-file'." | |
359 :type 'boolean | |
360 :group 'tumme) | |
361 | |
362 (defcustom tumme-cmd-write-exif-data-program | |
363 "exiftool" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
364 "Program used to write EXIF data to image. |
67302 | 365 Used together with `tumme-cmd-write-exif-data-options'." |
366 :type 'string | |
367 :group 'tumme) | |
368 | |
369 (defcustom tumme-cmd-write-exif-data-options | |
370 "%p -%t=\"%v\" \"%f\"" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
371 "Format of command used to write EXIF data. |
67302 | 372 Available options are %p which is replaced by |
373 `tumme-cmd-write-exif-data-program', %f which is replaced by the | |
374 image file name, %t which is replaced by the tag name and %v | |
375 which is replaced by the tag value." | |
376 :type 'string | |
377 :group 'tumme) | |
378 | |
379 (defcustom tumme-cmd-read-exif-data-program | |
380 "exiftool" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
381 "Program used to read EXIF data to image. |
67302 | 382 Used together with `tumme-cmd-read-exif-data-program-options'." |
383 :type 'string | |
384 :group 'tumme) | |
385 | |
386 (defcustom tumme-cmd-read-exif-data-options | |
387 "%p -s -s -s -%t \"%f\"" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
388 "Format of command used to read EXIF data. |
67302 | 389 Available options are %p which is replaced by |
390 `tumme-cmd-write-exif-data-options', %f which is replaced | |
391 by the image file name and %t which is replaced by the tag name." | |
392 :type 'string | |
393 :group 'tumme) | |
394 | |
395 (defcustom tumme-gallery-hidden-tags | |
396 (list "private" "hidden" "pending") | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
397 "List of \"hidden\" tags. |
67302 | 398 Used by `tumme-gallery-generate' to leave out \"hidden\" images." |
399 :type '(repeat string) | |
400 :group 'tumme) | |
401 | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
402 (defcustom tumme-thumb-size (if (eq 'standard tumme-thumbnail-storage) 128 100) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
403 "Size of thumbnails, in pixels. |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
404 This is the default size for both `tumme-thumb-width' and `tumme-thumb-height'." |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
405 :type 'integer |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
406 :group 'tumme) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
407 |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
408 (defcustom tumme-thumb-width tumme-thumb-size |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
409 "Width of thumbnails, in pixels." |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
410 :type 'integer |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
411 :group 'tumme) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
412 |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
413 (defcustom tumme-thumb-height tumme-thumb-size |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
414 "Height of thumbnails, in pixels." |
67302 | 415 :type 'integer |
416 :group 'tumme) | |
417 | |
418 (defcustom tumme-thumb-relief 2 | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
419 "Size of button-like border around thumbnails." |
67302 | 420 :type 'integer |
421 :group 'tumme) | |
422 | |
423 (defcustom tumme-thumb-margin 2 | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
424 "Size of the margin around thumbnails. |
67302 | 425 This is where you see the cursor." |
426 :type 'integer | |
427 :group 'tumme) | |
428 | |
429 (defcustom tumme-line-up-method 'dynamic | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
430 "Default method for line-up of thumbnails in thumbnail buffer. |
67302 | 431 Used by `tumme-display-thumbs' and other functions that needs to |
432 line-up thumbnails. Dynamic means to use the available width of the | |
433 window containing the thumbnail buffer, Fixed means to use | |
434 `tumme-thumbs-per-row', Interactive is for asking the user, and No | |
435 line-up means that no automatic line-up will be done." | |
436 :type '(choice :tag "Default line-up method" | |
437 (const :tag "Dynamic" dynamic) | |
438 (const :tag "Fixed" fixed) | |
439 (const :tag "Interactive" interactive) | |
440 (const :tag "No line-up" none)) | |
441 :group 'tumme) | |
442 | |
443 (defcustom tumme-thumbs-per-row 3 | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
444 "Number of thumbnails to display per row in thumb buffer." |
67302 | 445 :type 'integer |
446 :group 'tumme) | |
447 | |
448 (defcustom tumme-display-window-width-correction 1 | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
449 "Number to be used to correct image display window width. |
67302 | 450 Change if the default (1) does not work (i.e. if the image does not |
451 completely fit)." | |
452 :type 'integer | |
453 :group 'tumme) | |
454 | |
455 (defcustom tumme-display-window-height-correction 0 | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
456 "Number to be used to correct image display window height. |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
457 Change if the default (0) does not work (i.e. if the image does not |
67302 | 458 completely fit)." |
459 :type 'integer | |
460 :group 'tumme) | |
461 | |
70893
c6ca6d20fb3d
Movement tracking on by default. I have tested this for over a year now and it seems to be stable and fast enough for everyday use.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70891
diff
changeset
|
462 (defcustom tumme-track-movement t |
67302 | 463 "The current state of the tracking and mirroring. |
464 For more information, see the documentation for | |
465 `tumme-toggle-movement-tracking'." | |
466 :type 'boolean | |
467 :group 'tumme) | |
468 | |
469 (defcustom tumme-append-when-browsing nil | |
470 "Append thumbnails in thumbnail buffer when browsing. | |
471 If non-nil, using `tumme-next-line-and-display' and | |
472 `tumme-previous-line-and-display' will leave a trail of thumbnail | |
473 images in the thumbnail buffer. If you enable this and want to clean | |
474 the thumbnail buffer because it is filled with too many thumbmnails, | |
475 just call `tumme-display-thumb' to display only the image at point. | |
476 This value can be toggled using `tumme-toggle-append-browsing'." | |
477 :type 'boolean | |
478 :group 'tumme) | |
479 | |
480 (defcustom tumme-dired-disp-props t | |
481 "If non-nil, display properties for dired file when browsing. | |
482 Used by `tumme-next-line-and-display', | |
483 `tumme-previous-line-and-display' and `tumme-mark-and-display-next'. | |
484 If the database file is large, this can slow down image browsing in | |
485 dired and you might want to turn it off." | |
486 :type 'boolean | |
487 :group 'tumme) | |
488 | |
489 (defcustom tumme-display-properties-format "%b: %f (%t): %c" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
490 "Display format for thumbnail properties. |
67302 | 491 %b is replaced with associated dired buffer name, %f with file name |
492 \(without path) of original image file, %t with the list of tags and %c | |
493 with the comment." | |
494 :type 'string | |
495 :group 'tumme) | |
496 | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
497 (defcustom tumme-external-viewer |
71780 | 498 ;; TODO: Use mailcap, dired-guess-shell-alist-default, |
499 ;; dired-view-command-alist. | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
500 (cond ((executable-find "display")) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
501 ((executable-find "xli")) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
502 ((executable-find "qiv") "qiv -t")) |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
503 "Name of external viewer. |
67302 | 504 Including parameters. Used when displaying original image from |
505 `tumme-thumbnail-mode'." | |
506 :type 'string | |
507 :group 'tumme) | |
508 | |
509 (defcustom tumme-main-image-directory "~/pics/" | |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
510 "Name of main image directory, if any. |
67302 | 511 Used by `tumme-copy-with-exif-file-name'." |
512 :type 'string | |
513 :group 'tumme) | |
514 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
515 (defcustom tumme-show-all-from-dir-max-files 50 |
72501
645850634432
Remove * in defcustoms's docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72129
diff
changeset
|
516 "Maximum number of files to show using `tumme-show-all-from-dir'. |
68757
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
517 before warning the user." |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
518 :type 'integer |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
519 :group 'tumme) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
520 |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
521 (defun tumme-dir () |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
522 "Return the current thumbnails directory (from variable `tumme-dir'). |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
523 Create the thumbnails directory if it does not exist." |
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
524 (let ((tumme-dir (file-name-as-directory |
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
525 (expand-file-name tumme-dir)))) |
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
526 (unless (file-directory-p tumme-dir) |
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
527 (make-directory tumme-dir t) |
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
528 (message "Creating thumbnails directory")) |
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
529 tumme-dir)) |
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
530 |
67302 | 531 (defun tumme-insert-image (file type relief margin) |
532 "Insert image FILE of image TYPE, using RELIEF and MARGIN, at point." | |
533 | |
534 (let ((i `(image :type ,type | |
535 :file ,file | |
536 :relief ,relief | |
537 :margin ,margin))) | |
538 (insert-image i))) | |
539 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
540 (defun tumme-get-thumbnail-image (file) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
541 "Return the image descriptor for a thumbnail of image file FILE." |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
542 (unless (string-match (image-file-name-regexp) file) |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
543 (error "%s is not a valid image file" file)) |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
544 (let ((thumb-file (tumme-thumb-name file))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
545 (unless (and (file-exists-p thumb-file) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
546 (<= (float-time (nth 5 (file-attributes file))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
547 (float-time (nth 5 (file-attributes thumb-file))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
548 (tumme-create-thumb file thumb-file)) |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
549 (create-image thumb-file) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
550 ;; (list 'image :type 'jpeg |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
551 ;; :file thumb-file |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
552 ;; :relief tumme-thumb-relief :margin tumme-thumb-margin) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
553 )) |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
554 |
67302 | 555 (defun tumme-insert-thumbnail (file original-file-name |
556 associated-dired-buffer) | |
557 "Insert thumbnail image FILE. | |
558 Add text properties ORIGINAL-FILE-NAME and ASSOCIATED-DIRED-BUFFER." | |
559 (let (beg end) | |
560 (setq beg (point)) | |
561 (tumme-insert-image file | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
562 ;; TODO: this should depend on the real file type |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
563 (if (eq 'standard tumme-thumbnail-storage) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
564 'png 'jpeg) |
67302 | 565 tumme-thumb-relief |
566 tumme-thumb-margin) | |
567 (setq end (point)) | |
568 (add-text-properties | |
569 beg end | |
570 (list 'tumme-thumbnail t | |
571 'original-file-name original-file-name | |
572 'associated-dired-buffer associated-dired-buffer | |
573 'tags (tumme-list-tags original-file-name) | |
574 'mouse-face 'highlight | |
575 'comment (tumme-get-comment original-file-name))))) | |
576 | |
577 (defun tumme-thumb-name (file) | |
578 "Return thumbnail file name for FILE. | |
579 Depending on the value of `tumme-thumbnail-storage', the file | |
580 name will vary. For central thumbnail file storage, make a | |
581 MD5-hash of the image file's directory name and add that to make | |
582 the thumbnail file name unique. For per-directory storage, just | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
583 add a subdirectory. For standard storage, produce the file name |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
584 according to the Thumbnail Managing Standard." |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
585 (cond ((eq 'standard tumme-thumbnail-storage) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
586 (expand-file-name |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
587 (concat "~/.thumbnails/normal/" |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
588 (md5 (concat "file://" (expand-file-name file))) ".png"))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
589 ((eq 'use-tumme-dir tumme-thumbnail-storage) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
590 (let* ((f (expand-file-name file)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
591 (md5-hash |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
592 ;; Is MD5 hashes fast enough? The checksum of a |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
593 ;; thumbnail file name need not be that |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
594 ;; "cryptographically" good so a faster one could |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
595 ;; be used here. |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
596 (md5 (file-name-as-directory (file-name-directory f))))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
597 (format "%s%s%s.thumb.%s" |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
598 (file-name-as-directory (expand-file-name (tumme-dir))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
599 (file-name-sans-extension (file-name-nondirectory f)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
600 (if md5-hash (concat "_" md5-hash) "") |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
601 (file-name-extension f)))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
602 ((eq 'per-directory tumme-thumbnail-storage) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
603 (let ((f (expand-file-name file))) |
68851
ef6240377b78
(tumme-thumbnail-storage): Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
68835
diff
changeset
|
604 (format "%s.tumme/%s.thumb.%s" |
ef6240377b78
(tumme-thumbnail-storage): Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
68835
diff
changeset
|
605 (file-name-directory f) |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
606 (file-name-sans-extension (file-name-nondirectory f)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
607 (file-name-extension f)))))) |
67302 | 608 |
609 (defun tumme-create-thumb (original-file thumbnail-file) | |
610 "For ORIGINAL-FILE, create thumbnail image named THUMBNAIL-FILE." | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
611 (let* ((width (int-to-string tumme-thumb-width)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
612 (height (int-to-string tumme-thumb-height)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
613 (modif-time (format "%.0f" (float-time (nth 5 (file-attributes |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
614 original-file))))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
615 (thumbnail-nq8-file (replace-regexp-in-string ".png\\'" "-nq8.png" |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
616 thumbnail-file)) |
67302 | 617 (command |
618 (format-spec | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
619 (if (eq 'standard tumme-thumbnail-storage) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
620 tumme-cmd-create-standard-thumbnail-command |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
621 tumme-cmd-create-thumbnail-options) |
67302 | 622 (list |
623 (cons ?p tumme-cmd-create-thumbnail-program) | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
624 (cons ?w width) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
625 (cons ?h height) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
626 (cons ?m modif-time) |
67302 | 627 (cons ?f original-file) |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
628 (cons ?q thumbnail-nq8-file) |
67302 | 629 (cons ?t thumbnail-file)))) |
630 thumbnail-dir) | |
631 (when (not (file-exists-p | |
632 (setq thumbnail-dir (file-name-directory thumbnail-file)))) | |
633 (message "Creating thumbnail directory.") | |
634 (make-directory thumbnail-dir)) | |
71808 | 635 (call-process shell-file-name nil nil nil shell-command-switch command))) |
67302 | 636 |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
637 ;;;###autoload |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
638 (defun tumme-dired-insert-marked-thumbs () |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
639 "Insert thumbnails before file names of marked files in the dired buffer." |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
640 (interactive) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
641 (dired-map-over-marks |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
642 (let* ((image-pos (dired-move-to-filename)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
643 (image-file (dired-get-filename)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
644 (thumb-file (tumme-get-thumbnail-image image-file)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
645 overlay) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
646 ;; If image is not already added, then add it. |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
647 (unless (delq nil (mapcar (lambda (o) (overlay-get o 'put-image)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
648 ;; Can't use (overlays-at (point)), BUG? |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
649 (overlays-in (point) (1+ (point))))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
650 (put-image thumb-file image-pos) |
72093
e75e38c3a62f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72091
diff
changeset
|
651 (setq |
71780 | 652 overlay |
653 (car (delq nil (mapcar (lambda (o) (and (overlay-get o 'put-image) o)) | |
654 (overlays-in (point) (1+ (point))))))) | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
655 (overlay-put overlay 'image-file image-file) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
656 (overlay-put overlay 'thumb-file thumb-file))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
657 nil) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
658 (add-hook 'dired-after-readin-hook 'tumme-dired-after-readin-hook nil t)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
659 |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
660 (defun tumme-dired-after-readin-hook () |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
661 "Relocate existing thumbnail overlays in dired buffer after reverting. |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
662 Move them to their corresponding files if they are still exist. |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
663 Otherwise, delete overlays." |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
664 (mapc (lambda (overlay) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
665 (when (overlay-get overlay 'put-image) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
666 (let* ((image-file (overlay-get overlay 'image-file)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
667 (image-pos (dired-goto-file image-file))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
668 (if image-pos |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
669 (move-overlay overlay image-pos image-pos) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
670 (delete-overlay overlay))))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
671 (overlays-in (point-min) (point-max)))) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
672 |
67302 | 673 (defun tumme-next-line-and-display () |
674 "Move to next dired line and display thumbnail image." | |
675 (interactive) | |
676 (dired-next-line 1) | |
677 (tumme-display-thumbs | |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
678 t (or tumme-append-when-browsing nil) t) |
67302 | 679 (if tumme-dired-disp-props |
680 (tumme-dired-display-properties))) | |
681 | |
682 (defun tumme-previous-line-and-display () | |
683 "Move to previous dired line and display thumbnail image." | |
684 (interactive) | |
685 (dired-previous-line 1) | |
686 (tumme-display-thumbs | |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
687 t (or tumme-append-when-browsing nil) t) |
67302 | 688 (if tumme-dired-disp-props |
689 (tumme-dired-display-properties))) | |
690 | |
691 (defun tumme-toggle-append-browsing () | |
692 "Toggle `tumme-append-when-browsing'." | |
693 (interactive) | |
694 (setq tumme-append-when-browsing | |
695 (not tumme-append-when-browsing)) | |
696 (message "Append browsing %s." | |
697 (if tumme-append-when-browsing | |
698 "on" | |
699 "off"))) | |
700 | |
701 (defun tumme-mark-and-display-next () | |
702 "Mark current file in dired and display next thumbnail image." | |
703 (interactive) | |
704 (dired-mark 1) | |
705 (tumme-display-thumbs | |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
706 t (or tumme-append-when-browsing nil) t) |
67302 | 707 (if tumme-dired-disp-props |
708 (tumme-dired-display-properties))) | |
709 | |
710 (defun tumme-toggle-dired-display-properties () | |
711 "Toggle `tumme-dired-disp-props'." | |
712 (interactive) | |
713 (setq tumme-dired-disp-props | |
714 (not tumme-dired-disp-props)) | |
715 (message "Dired display properties %s." | |
716 (if tumme-dired-disp-props | |
717 "on" | |
718 "off"))) | |
719 | |
720 (defvar tumme-thumbnail-buffer "*tumme*" | |
721 "Tumme's thumbnail buffer.") | |
722 | |
723 (defun tumme-create-thumbnail-buffer () | |
724 "Create thumb buffer and set `tumme-thumbnail-mode'." | |
725 (let ((buf (get-buffer-create tumme-thumbnail-buffer))) | |
71780 | 726 (with-current-buffer buf |
67302 | 727 (setq buffer-read-only t) |
728 (if (not (eq major-mode 'tumme-thumbnail-mode)) | |
729 (tumme-thumbnail-mode))) | |
730 buf)) | |
731 | |
732 (defvar tumme-display-image-buffer "*tumme-display-image*" | |
733 "Where larger versions of the images are display.") | |
734 | |
735 (defun tumme-create-display-image-buffer () | |
736 "Create image display buffer and set `tumme-display-image-mode'." | |
737 (let ((buf (get-buffer-create tumme-display-image-buffer))) | |
71780 | 738 (with-current-buffer buf |
67302 | 739 (setq buffer-read-only t) |
740 (if (not (eq major-mode 'tumme-display-image-mode)) | |
741 (tumme-display-image-mode))) | |
742 buf)) | |
743 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
744 (defvar tumme-saved-window-configuration nil |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
745 "Saved window configuration.") |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
746 |
68404 | 747 ;;;###autoload |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
748 (defun tumme-dired-with-window-configuration (dir &optional arg) |
67302 | 749 "Open directory DIR and create a default window configuration. |
750 | |
751 Convenience command that: | |
752 | |
753 - Opens dired in folder DIR | |
754 - Splits windows in most useful (?) way | |
755 - Set `truncate-lines' to t | |
756 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
757 After the command has finished, you would typically mark some |
68757
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
758 image files in dired and type |
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
759 \\[tumme-display-thumbs] (`tumme-display-thumbs'). |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
760 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
761 If called with prefix argument ARG, skip splitting of windows. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
762 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
763 The current window configuration is saved and can be restored by |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
764 calling `tumme-restore-window-configuration'." |
67302 | 765 (interactive "DDirectory: \nP") |
766 (let ((buf (tumme-create-thumbnail-buffer)) | |
767 (buf2 (tumme-create-display-image-buffer))) | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
768 (setq tumme-saved-window-configuration |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
769 (current-window-configuration)) |
67302 | 770 (dired dir) |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
771 (delete-other-windows) |
67302 | 772 (when (not arg) |
773 (split-window-horizontally) | |
774 (setq truncate-lines t) | |
775 (save-excursion | |
776 (other-window 1) | |
777 (switch-to-buffer buf) | |
778 (split-window-vertically) | |
779 (other-window 1) | |
780 (switch-to-buffer buf2) | |
781 (other-window -2))))) | |
782 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
783 (defun tumme-restore-window-configuration () |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
784 "Restore window configuration. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
785 Restore any changes to the window configuration made by calling |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
786 `tumme-dired-with-window-configuration'." |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
787 (interactive) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
788 (if tumme-saved-window-configuration |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
789 (set-window-configuration tumme-saved-window-configuration) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
790 (message "No saved window configuration"))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
791 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
792 ;;;###autoload |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
793 (defun tumme-display-thumbs (&optional arg append do-not-pop) |
67302 | 794 "Display thumbnails of all marked files, in `tumme-thumbnail-buffer'. |
795 If a thumbnail image does not exist for a file, it is created on the | |
796 fly. With prefix argument ARG, display only thumbnail for file at | |
797 point (this is useful if you have marked some files but want to show | |
798 another one). | |
799 | |
800 Recommended usage is to split the current frame horizontally so that | |
801 you have the dired buffer in the left window and the | |
802 `tumme-thumbnail-buffer' buffer in the right window. | |
803 | |
804 With optional argument APPEND, append thumbnail to thumbnail buffer | |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
805 instead of erasing it first. |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
806 |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
807 Option argument DO-NOT-POP controls if `pop-to-buffer' should be |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
808 used or not. If non-nil, use `display-buffer' instead of |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
809 `pop-to-buffer'. This is used from functions like |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
810 `tumme-next-line-and-display' and |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
811 `tumme-previous-line-and-display' where we do not want the |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
812 thumbnail buffer to be selected." |
67302 | 813 (interactive "P") |
814 (let ((buf (tumme-create-thumbnail-buffer)) | |
815 curr-file thumb-name files count dired-buf beg) | |
816 (if arg | |
817 (setq files (list (dired-get-filename))) | |
818 (setq files (dired-get-marked-files))) | |
819 (setq dired-buf (current-buffer)) | |
71780 | 820 (with-current-buffer buf |
67302 | 821 (let ((inhibit-read-only t)) |
822 (if (not append) | |
823 (erase-buffer) | |
824 (goto-char (point-max))) | |
825 (mapcar | |
826 (lambda (curr-file) | |
827 (setq thumb-name (tumme-thumb-name curr-file)) | |
828 (if (and (not (file-exists-p thumb-name)) | |
829 (not (= 0 (tumme-create-thumb curr-file thumb-name)))) | |
830 (message "Thumb could not be created for file %s" curr-file) | |
831 (tumme-insert-thumbnail thumb-name curr-file dired-buf))) | |
832 files)) | |
833 (cond ((eq 'dynamic tumme-line-up-method) | |
834 (tumme-line-up-dynamic)) | |
835 ((eq 'fixed tumme-line-up-method) | |
836 (tumme-line-up)) | |
837 ((eq 'interactive tumme-line-up-method) | |
838 (tumme-line-up-interactive)) | |
839 ((eq 'none tumme-line-up-method) | |
840 nil) | |
841 (t | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
842 (tumme-line-up-dynamic)))) |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
843 (if do-not-pop |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
844 (display-buffer tumme-thumbnail-buffer) |
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
845 (pop-to-buffer tumme-thumbnail-buffer)))) |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
846 |
71023
613d5f4255bd
(tumme-show-all-from-dir-max-files): Fix typo.
Nick Roberts <nickrob@snap.net.nz>
parents:
71001
diff
changeset
|
847 ;;;###autoload |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
848 (defun tumme-show-all-from-dir (dir) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
849 "Make a preview buffer for all images in DIR and display it. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
850 If the number of files in DIR matching `image-file-name-regexp' |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
851 exceeds `tumme-show-all-from-dir-max-files', a warning will be |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
852 displayed." |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
853 (interactive "DDir: ") |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
854 (dired dir) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
855 (dired-mark-files-regexp (image-file-name-regexp)) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
856 (let ((files (dired-get-marked-files))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
857 (if (or (<= (length files) tumme-show-all-from-dir-max-files) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
858 (and (> (length files) tumme-show-all-from-dir-max-files) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
859 (y-or-n-p |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
860 (format |
68757
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
861 "Directory contains more than %d image files. Proceed? " |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
862 tumme-show-all-from-dir-max-files)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
863 (progn |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
864 (tumme-display-thumbs) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
865 (pop-to-buffer tumme-thumbnail-buffer)) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
866 (message "Cancelled.")))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
867 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
868 ;;;###autoload |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
869 (defalias 'tumme 'tumme-show-all-from-dir) |
67302 | 870 |
72085
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
871 (defun tumme-write-tags (file-tags) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
872 "Write file tags to database. |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
873 Write each file and tag in FILE-TAGS to the database. FILE-TAGS |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
874 is an alist in the following form: |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
875 ((FILE . TAG) ... )" |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
876 (let (end file tag) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
877 (with-temp-file tumme-db-file |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
878 (insert-file-contents tumme-db-file) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
879 (dolist (elt file-tags) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
880 (setq file (car elt) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
881 tag (cdr elt)) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
882 (goto-char (point-min)) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
883 (if (search-forward-regexp (format "^%s.*$" file) nil t) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
884 (progn |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
885 (setq end (point)) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
886 (beginning-of-line) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
887 (when (not (search-forward (format ";%s" tag) end t)) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
888 (end-of-line) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
889 (insert (format ";%s" tag)))) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
890 (goto-char (point-max)) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
891 (insert (format "\n%s;%s" file tag))))))) |
eeafd2670b7f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72083
diff
changeset
|
892 |
67302 | 893 (defun tumme-remove-tag (files tag) |
894 "For all FILES, remove TAG from the image database." | |
895 (save-excursion | |
896 (let (end buf start) | |
897 (setq buf (find-file tumme-db-file)) | |
898 (if (not (listp files)) | |
899 (if (stringp files) | |
900 (setq files (list files)) | |
901 (error "Files must be a string or a list of strings!"))) | |
902 (mapcar | |
903 (lambda (file) | |
904 (goto-char (point-min)) | |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
905 (when (search-forward-regexp |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
906 (format "^%s" file) nil t) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
907 (end-of-line) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
908 (setq end (point)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
909 (beginning-of-line) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
910 (when (search-forward-regexp (format "\\(;%s\\)" tag) end t) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
911 (delete-region (match-beginning 1) (match-end 1)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
912 ;; Check if file should still be in the database. If |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
913 ;; it has no tags or comments, it will be removed. |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
914 (end-of-line) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
915 (setq end (point)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
916 (beginning-of-line) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
917 (when (not (search-forward ";" end t)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
918 (kill-line 1) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
919 ;; If on empty line at end of buffer |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
920 (when (and (eobp) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
921 (looking-at "^$")) |
71001
95bd5a8f89a3
Change a lot of `(if .. (progn ..)' to `(when ..)'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70996
diff
changeset
|
922 (delete-backward-char 1)))))) |
95bd5a8f89a3
Change a lot of `(if .. (progn ..)' to `(when ..)'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70996
diff
changeset
|
923 files) |
95bd5a8f89a3
Change a lot of `(if .. (progn ..)' to `(when ..)'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70996
diff
changeset
|
924 (save-buffer) |
95bd5a8f89a3
Change a lot of `(if .. (progn ..)' to `(when ..)'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70996
diff
changeset
|
925 (kill-buffer buf)))) |
67302 | 926 |
927 (defun tumme-list-tags (file) | |
928 "Read all tags for image FILE from the image database." | |
929 (save-excursion | |
930 (let (end buf (tags "")) | |
931 (setq buf (find-file tumme-db-file)) | |
932 (goto-char (point-min)) | |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
933 (when (search-forward-regexp |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
934 (format "^%s" file) nil t) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
935 (end-of-line) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
936 (setq end (point)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
937 (beginning-of-line) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
938 (if (search-forward ";" end t) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
939 (if (search-forward "comment:" end t) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
940 (if (search-forward ";" end t) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
941 (setq tags (buffer-substring (point) end))) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
942 (setq tags (buffer-substring (point) end))))) |
67302 | 943 (kill-buffer buf) |
944 (split-string tags ";")))) | |
945 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
946 ;;;###autoload |
67302 | 947 (defun tumme-tag-files (arg) |
948 "Tag marked file(s) in dired. With prefix ARG, tag file at point." | |
949 (interactive "P") | |
70807
ce0e66acbc05
Added information to the add-tags prompt.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
69284
diff
changeset
|
950 (let ((tag (read-string "Tags to add (separate tags with a semicolon): ")) |
67302 | 951 curr-file files) |
952 (if arg | |
72089
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
953 (setq files (list (dired-get-filename))) |
67302 | 954 (setq files (dired-get-marked-files))) |
72089
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
955 (tumme-write-tags |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
956 (mapcar |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
957 (lambda (x) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
958 (cons x tag)) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
959 files)))) |
67302 | 960 |
961 (defun tumme-tag-thumbnail () | |
962 "Tag current thumbnail." | |
963 (interactive) | |
70807
ce0e66acbc05
Added information to the add-tags prompt.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
69284
diff
changeset
|
964 (let ((tag (read-string "Tags to add (separate tags with a semicolon): "))) |
72089
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
965 (tumme-write-tags (list (cons (tumme-original-file-name) tag)))) |
67302 | 966 (tumme-update-property |
967 'tags (tumme-list-tags (tumme-original-file-name)))) | |
968 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
969 ;;;###autoload |
70982
9200b8713856
(tumme-delete-tag): Rename from `tumme-tag-remove'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70916
diff
changeset
|
970 (defun tumme-delete-tag (arg) |
67302 | 971 "Remove tag for selected file(s). |
972 With prefix argument ARG, remove tag from file at point." | |
973 (interactive "P") | |
974 (let ((tag (read-string "Tag to remove: ")) | |
975 files) | |
976 (if arg | |
977 (setq files (list (dired-get-filename))) | |
978 (setq files (dired-get-marked-files))) | |
979 (tumme-remove-tag files tag))) | |
980 | |
981 (defun tumme-tag-thumbnail-remove () | |
982 "Remove tag from thumbnail." | |
983 (interactive) | |
984 (let ((tag (read-string "Tag to remove: "))) | |
985 (tumme-remove-tag (tumme-original-file-name) tag)) | |
986 (tumme-update-property | |
987 'tags (tumme-list-tags (tumme-original-file-name)))) | |
988 | |
989 (defun tumme-original-file-name () | |
990 "Get original file name for thumbnail or display image at point." | |
991 (get-text-property (point) 'original-file-name)) | |
992 | |
993 (defun tumme-associated-dired-buffer () | |
994 "Get associated dired buffer at point." | |
995 (get-text-property (point) 'associated-dired-buffer)) | |
996 | |
997 (defun tumme-get-buffer-window (buf) | |
998 "Return window where buffer BUF is." | |
999 (get-window-with-predicate | |
1000 (lambda (window) | |
1001 (equal (window-buffer window) buf)) | |
1002 nil t)) | |
1003 | |
1004 (defun tumme-track-original-file () | |
1005 "Track the original file in the associated dired buffer. | |
1006 See documentation for `tumme-toggle-movement-tracking'. Interactive | |
1007 use only useful if `tumme-track-movement' is nil." | |
1008 (interactive) | |
1009 (let ((old-buf (current-buffer)) | |
1010 (dired-buf (tumme-associated-dired-buffer)) | |
1011 (file-name (tumme-original-file-name))) | |
72119
c57307165d5e
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72093
diff
changeset
|
1012 (when (and (buffer-live-p dired-buf) file-name) |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1013 (setq file-name (file-name-nondirectory file-name)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1014 (set-buffer dired-buf) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1015 (goto-char (point-min)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1016 (if (not (search-forward file-name nil t)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1017 (message "Could not track file") |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1018 (dired-move-to-filename) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1019 (set-window-point |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1020 (tumme-get-buffer-window dired-buf) (point))) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1021 (set-buffer old-buf)))) |
67302 | 1022 |
1023 (defun tumme-toggle-movement-tracking () | |
1024 "Turn on and off `tumme-track-movement'. | |
1025 Tracking of the movements between thumbnail and dired buffer so that | |
1026 they are \"mirrored\" in the dired buffer. When this is on, moving | |
1027 around in the thumbnail or dired buffer will find the matching | |
1028 position in the other buffer." | |
1029 (interactive) | |
1030 (setq tumme-track-movement (not tumme-track-movement)) | |
1031 (message "Tracking %s" (if tumme-track-movement "on" "off"))) | |
1032 | |
1033 (defun tumme-track-thumbnail () | |
1034 "Track current dired file's thumb in `tumme-thumbnail-buffer'. | |
1035 This is almost the same as what `tumme-track-original-file' does, but | |
1036 the other way around." | |
1037 (let ((file (dired-get-filename)) | |
1038 (old-buf (current-buffer)) | |
1039 prop-val found) | |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1040 (when (get-buffer tumme-thumbnail-buffer) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1041 (set-buffer tumme-thumbnail-buffer) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1042 (goto-char (point-min)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1043 (while (and (not (eobp)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1044 (not found)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1045 (if (and (setq prop-val |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1046 (get-text-property (point) 'original-file-name)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1047 (string= prop-val file)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1048 (setq found t)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1049 (if (not found) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1050 (forward-char 1))) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1051 (when found |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1052 (set-window-point |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1053 (tumme-thumbnail-window) (point)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1054 (tumme-display-thumb-properties)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1055 (set-buffer old-buf)))) |
67302 | 1056 |
1057 (defun tumme-dired-next-line (&optional arg) | |
1058 "Call `dired-next-line', then track thumbnail. | |
1059 This can safely replace `dired-next-line'. With prefix argument, move | |
1060 ARG lines." | |
1061 (interactive "P") | |
1062 (dired-next-line (or arg 1)) | |
1063 (if tumme-track-movement | |
1064 (tumme-track-thumbnail))) | |
1065 | |
1066 (defun tumme-dired-previous-line (&optional arg) | |
1067 "Call `dired-previous-line', then track thumbnail. | |
1068 This can safely replace `dired-previous-line'. With prefix argument, | |
1069 move ARG lines." | |
1070 (interactive "P") | |
1071 (dired-previous-line (or arg 1)) | |
1072 (if tumme-track-movement | |
1073 (tumme-track-thumbnail))) | |
1074 | |
72129
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1075 (defun tumme-forward-image (&optional arg) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1076 "Move to next image and display properties. |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1077 Optional prefix ARG says how many images to move; default is one |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1078 image." |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1079 (interactive "p") |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1080 (let (pos (steps (or arg 1))) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1081 (dotimes (i steps) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1082 (if (and (not (eobp)) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1083 (save-excursion |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1084 (forward-char) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1085 (while (and (not (eobp)) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1086 (not (tumme-image-at-point-p))) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1087 (forward-char)) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1088 (setq pos (point)) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1089 (tumme-image-at-point-p))) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1090 (goto-char pos) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1091 (error "At last image")))) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1092 (when tumme-track-movement |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1093 (tumme-track-original-file)) |
67302 | 1094 (tumme-display-thumb-properties)) |
1095 | |
72129
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1096 (defun tumme-backward-image (&optional arg) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1097 "Move to previous image and display properties. |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1098 Optional prefix ARG says how many images to move; default is one |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1099 image." |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1100 (interactive "p") |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1101 (let (pos (steps (or arg 1))) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1102 (dotimes (i steps) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1103 (if (and (not (bobp)) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1104 (save-excursion |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1105 (backward-char) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1106 (while (and (not (bobp)) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1107 (not (tumme-image-at-point-p))) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1108 (backward-char)) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1109 (setq pos (point)) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1110 (tumme-image-at-point-p))) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1111 (goto-char pos) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1112 (error "At first image")))) |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1113 (when tumme-track-movement |
b5439b7a1ef1
(tumme-backward-image): Add prefix argument. Add error
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72124
diff
changeset
|
1114 (tumme-track-original-file)) |
67302 | 1115 (tumme-display-thumb-properties)) |
1116 | |
1117 (defun tumme-next-line () | |
1118 "Move to next line and display properties." | |
1119 (interactive) | |
1120 (next-line 1) | |
1121 ;; If we end up in an empty spot, back up to the next thumbnail. | |
1122 (if (not (tumme-image-at-point-p)) | |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1123 (tumme-backward-image)) |
67302 | 1124 (if tumme-track-movement |
1125 (tumme-track-original-file)) | |
1126 (tumme-display-thumb-properties)) | |
1127 | |
1128 | |
1129 (defun tumme-previous-line () | |
1130 "Move to previous line and display properties." | |
1131 (interactive) | |
1132 (previous-line 1) | |
1133 ;; If we end up in an empty spot, back up to the next | |
1134 ;; thumbnail. This should only happen if the user deleted a | |
1135 ;; thumbnail and did not refresh, so it is not very common. But we | |
1136 ;; can handle it in a good manner, so why not? | |
1137 (if (not (tumme-image-at-point-p)) | |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1138 (tumme-backward-image)) |
67302 | 1139 (if tumme-track-movement |
1140 (tumme-track-original-file)) | |
1141 (tumme-display-thumb-properties)) | |
1142 | |
1143 (defun tumme-format-properties-string (buf file props comment) | |
1144 "Format display properties. | |
1145 BUF is the associated dired buffer, FILE is the original image file | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
1146 name, PROPS is a list of tags and COMMENT is the image files's |
67302 | 1147 comment." |
1148 (format-spec | |
1149 tumme-display-properties-format | |
1150 (list | |
72119
c57307165d5e
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72093
diff
changeset
|
1151 (cons ?b (or buf "")) |
67302 | 1152 (cons ?f file) |
1153 (cons ?t (or (princ props) "")) | |
1154 (cons ?c (or comment ""))))) | |
1155 | |
1156 (defun tumme-display-thumb-properties () | |
1157 "Display thumbnail properties in the echo area." | |
1158 (if (not (eobp)) | |
1159 (let ((file-name (file-name-nondirectory (tumme-original-file-name))) | |
1160 (dired-buf (buffer-name (tumme-associated-dired-buffer))) | |
1161 (props (mapconcat | |
1162 'princ | |
1163 (get-text-property (point) 'tags) | |
1164 ", ")) | |
1165 (comment (get-text-property (point) 'comment))) | |
1166 (if file-name | |
1167 (message | |
1168 (tumme-format-properties-string | |
1169 dired-buf | |
1170 file-name | |
1171 props | |
1172 comment)))))) | |
1173 | |
1174 (defun tumme-dired-file-marked-p () | |
1175 "Check whether file on current line is marked or not." | |
1176 (save-excursion | |
1177 (beginning-of-line) | |
1178 (not (looking-at "^ .*$")))) | |
1179 | |
1180 (defun tumme-modify-mark-on-thumb-original-file (command) | |
1181 "Modify mark in dired buffer. | |
1182 This is quite ugly but I don't know how to implemented in a better | |
1183 way. COMMAND is one of 'mark for marking file in dired, 'unmark for | |
1184 unmarking file in dired or 'flag for flagging file for delete in | |
1185 dired." | |
1186 (let ((file-name (tumme-original-file-name)) | |
1187 (dired-buf (tumme-associated-dired-buffer))) | |
1188 (if (not (and dired-buf file-name)) | |
1189 (message "No image, or image with correct properties, at point.") | |
71780 | 1190 (with-current-buffer dired-buf |
67302 | 1191 (message file-name) |
1192 (setq file-name (file-name-nondirectory file-name)) | |
1193 (goto-char (point-min)) | |
1194 (if (search-forward file-name nil t) | |
1195 (cond ((eq command 'mark) (dired-mark 1)) | |
1196 ((eq command 'unmark) (dired-unmark 1)) | |
1197 ((eq command 'toggle) | |
1198 (if (tumme-dired-file-marked-p) | |
1199 (dired-unmark 1) | |
1200 (dired-mark 1))) | |
1201 ((eq command 'flag) (dired-flag-file-deletion 1)))))))) | |
1202 | |
1203 (defun tumme-mark-thumb-original-file () | |
1204 "Mark original image file in associated dired buffer." | |
1205 (interactive) | |
1206 (tumme-modify-mark-on-thumb-original-file 'mark) | |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1207 (tumme-forward-image)) |
67302 | 1208 |
1209 (defun tumme-unmark-thumb-original-file () | |
1210 "Unmark original image file in associated dired buffer." | |
1211 (interactive) | |
1212 (tumme-modify-mark-on-thumb-original-file 'unmark) | |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1213 (tumme-forward-image)) |
67302 | 1214 |
1215 (defun tumme-flag-thumb-original-file () | |
1216 "Flag original image file for deletion in associated dired buffer." | |
1217 (interactive) | |
1218 (tumme-modify-mark-on-thumb-original-file 'flag) | |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1219 (tumme-forward-image)) |
67302 | 1220 |
1221 (defun tumme-toggle-mark-thumb-original-file () | |
1222 "Toggle mark on original image file in associated dired buffer." | |
1223 (interactive) | |
1224 (tumme-modify-mark-on-thumb-original-file 'toggle)) | |
1225 | |
1226 (defun tumme-jump-original-dired-buffer () | |
1227 "Jump to the dired buffer associated with the current image file. | |
1228 You probably want to use this together with | |
1229 `tumme-track-original-file'." | |
1230 (interactive) | |
1231 (let ((buf (tumme-associated-dired-buffer)) | |
1232 window frame) | |
1233 (setq window (tumme-get-buffer-window buf)) | |
1234 (if window | |
1235 (progn | |
1236 (if (not (equal (selected-frame) (setq frame (window-frame window)))) | |
1237 (select-frame-set-input-focus frame)) | |
1238 (select-window window)) | |
1239 (message "Associated dired buffer not visible")))) | |
1240 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1241 ;;;###autoload |
67302 | 1242 (defun tumme-jump-thumbnail-buffer () |
1243 "Jump to thumbnail buffer." | |
1244 (interactive) | |
1245 (let ((window (tumme-thumbnail-window)) | |
1246 frame) | |
1247 (if window | |
1248 (progn | |
1249 (if (not (equal (selected-frame) (setq frame (window-frame window)))) | |
1250 (select-frame-set-input-focus frame)) | |
1251 (select-window window)) | |
1252 (message "Thumbnail buffer not visible")))) | |
1253 | |
1254 (defvar tumme-thumbnail-mode-map (make-sparse-keymap) | |
1255 "Keymap for `tumme-thumbnail-mode'.") | |
1256 | |
1257 (defvar tumme-thumbnail-mode-line-up-map (make-sparse-keymap) | |
1258 "Keymap for line-up commands in `tumme-thumbnail-mode'.") | |
1259 | |
1260 (defvar tumme-thumbnail-mode-tag-map (make-sparse-keymap) | |
1261 "Keymap for tag commands in `tumme-thumbnail-mode'.") | |
1262 | |
1263 (defun tumme-define-thumbnail-mode-keymap () | |
1264 "Define keymap for `tumme-thumbnail-mode'." | |
1265 | |
1266 ;; Keys | |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1267 (define-key tumme-thumbnail-mode-map [right] 'tumme-forward-image) |
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1268 (define-key tumme-thumbnail-mode-map [left] 'tumme-backward-image) |
67302 | 1269 (define-key tumme-thumbnail-mode-map [up] 'tumme-previous-line) |
1270 (define-key tumme-thumbnail-mode-map [down] 'tumme-next-line) | |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1271 (define-key tumme-thumbnail-mode-map "\C-f" 'tumme-forward-image) |
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
1272 (define-key tumme-thumbnail-mode-map "\C-b" 'tumme-backward-image) |
67302 | 1273 (define-key tumme-thumbnail-mode-map "\C-p" 'tumme-previous-line) |
1274 (define-key tumme-thumbnail-mode-map "\C-n" 'tumme-next-line) | |
1275 | |
1276 (define-key tumme-thumbnail-mode-map "d" 'tumme-flag-thumb-original-file) | |
1277 (define-key tumme-thumbnail-mode-map [delete] | |
1278 'tumme-flag-thumb-original-file) | |
1279 (define-key tumme-thumbnail-mode-map "m" 'tumme-mark-thumb-original-file) | |
1280 (define-key tumme-thumbnail-mode-map "u" 'tumme-unmark-thumb-original-file) | |
1281 (define-key tumme-thumbnail-mode-map "." 'tumme-track-original-file) | |
1282 (define-key tumme-thumbnail-mode-map [tab] 'tumme-jump-original-dired-buffer) | |
1283 | |
1284 ;; add line-up map | |
1285 (define-key tumme-thumbnail-mode-map "g" tumme-thumbnail-mode-line-up-map) | |
1286 | |
1287 ;; map it to "g" so that the user can press it more quickly | |
1288 (define-key tumme-thumbnail-mode-line-up-map "g" 'tumme-line-up-dynamic) | |
1289 ;; "f" for "fixed" number of thumbs per row | |
1290 (define-key tumme-thumbnail-mode-line-up-map "f" 'tumme-line-up) | |
1291 ;; "i" for "interactive" | |
1292 (define-key tumme-thumbnail-mode-line-up-map "i" 'tumme-line-up-interactive) | |
1293 | |
1294 ;; add tag map | |
1295 (define-key tumme-thumbnail-mode-map "t" tumme-thumbnail-mode-tag-map) | |
1296 | |
1297 ;; map it to "t" so that the user can press it more quickly | |
1298 (define-key tumme-thumbnail-mode-tag-map "t" 'tumme-tag-thumbnail) | |
1299 ;; "r" for "remove" | |
1300 (define-key tumme-thumbnail-mode-tag-map "r" 'tumme-tag-thumbnail-remove) | |
1301 | |
1302 (define-key tumme-thumbnail-mode-map "\C-m" | |
1303 'tumme-display-thumbnail-original-image) | |
1304 (define-key tumme-thumbnail-mode-map [C-return] | |
1305 'tumme-thumbnail-display-external) | |
1306 | |
1307 (define-key tumme-thumbnail-mode-map "l" 'tumme-rotate-thumbnail-left) | |
1308 (define-key tumme-thumbnail-mode-map "r" 'tumme-rotate-thumbnail-right) | |
1309 | |
1310 (define-key tumme-thumbnail-mode-map "L" 'tumme-rotate-original-left) | |
1311 (define-key tumme-thumbnail-mode-map "R" 'tumme-rotate-original-right) | |
1312 | |
71780 | 1313 (define-key tumme-thumbnail-mode-map "D" |
1314 'tumme-thumbnail-set-image-description) | |
67302 | 1315 |
1316 (define-key tumme-thumbnail-mode-map "\C-d" 'tumme-delete-char) | |
1317 (define-key tumme-thumbnail-mode-map " " | |
1318 'tumme-display-next-thumbnail-original) | |
1319 (define-key tumme-thumbnail-mode-map | |
1320 (kbd "DEL") 'tumme-display-previous-thumbnail-original) | |
1321 (define-key tumme-thumbnail-mode-map "c" 'tumme-comment-thumbnail) | |
1322 (define-key tumme-thumbnail-mode-map "q" 'tumme-kill-buffer-and-window) | |
1323 | |
1324 ;; Mouse | |
1325 (define-key tumme-thumbnail-mode-map [mouse-2] 'tumme-mouse-display-image) | |
1326 (define-key tumme-thumbnail-mode-map [mouse-1] 'tumme-mouse-select-thumbnail) | |
1327 | |
1328 ;; Seems I must first set C-down-mouse-1 to undefined, or else it | |
1329 ;; will trigger the buffer menu. If I try to instead bind | |
1330 ;; C-down-mouse-1 to `tumme-mouse-toggle-mark', I get a message | |
1331 ;; about C-mouse-1 not being defined afterwards. Annoying, but I | |
1332 ;; probably do not completely understand mouse events. | |
1333 | |
1334 (define-key tumme-thumbnail-mode-map [C-down-mouse-1] 'undefined) | |
1335 (define-key tumme-thumbnail-mode-map [C-mouse-1] 'tumme-mouse-toggle-mark) | |
1336 | |
1337 ;; Menu | |
1338 (define-key tumme-thumbnail-mode-map [menu-bar tumme] | |
1339 (cons "Tumme" (make-sparse-keymap "Tumme"))) | |
1340 | |
1341 (define-key tumme-thumbnail-mode-map | |
1342 [menu-bar tumme tumme-kill-buffer-and-window] | |
1343 '("Quit" . tumme-kill-buffer-and-window)) | |
1344 | |
1345 (define-key tumme-thumbnail-mode-map | |
1346 [menu-bar tumme tumme-delete-char] | |
1347 '("Delete thumbnail from buffer" . tumme-delete-char)) | |
1348 | |
1349 (define-key tumme-thumbnail-mode-map | |
1350 [menu-bar tumme tumme-tag-thumbnail-remove] | |
1351 '("Remove tag from thumbnail" . tumme-tag-thumbnail-remove)) | |
1352 | |
1353 (define-key tumme-thumbnail-mode-map | |
1354 [menu-bar tumme tumme-tag-thumbnail] | |
1355 '("Tag thumbnail" . tumme-tag-thumbnail)) | |
1356 | |
1357 (define-key tumme-thumbnail-mode-map | |
1358 [menu-bar tumme tumme-comment-thumbnail] | |
1359 '("Comment thumbnail" . tumme-comment-thumbnail)) | |
1360 | |
1361 (define-key tumme-thumbnail-mode-map | |
1362 [menu-bar tumme tumme-refresh-thumb] | |
1363 '("Refresh thumb" . tumme-refresh-thumb)) | |
1364 (define-key tumme-thumbnail-mode-map | |
1365 [menu-bar tumme tumme-line-up-dynamic] | |
1366 '("Dynamic line up" . tumme-line-up-dynamic)) | |
1367 (define-key tumme-thumbnail-mode-map | |
1368 [menu-bar tumme tumme-line-up] | |
1369 '("Line up thumbnails" . tumme-line-up)) | |
1370 | |
1371 (define-key tumme-thumbnail-mode-map | |
1372 [menu-bar tumme tumme-rotate-thumbnail-left] | |
1373 '("Rotate thumbnail left" . tumme-rotate-thumbnail-left)) | |
1374 (define-key tumme-thumbnail-mode-map | |
1375 [menu-bar tumme tumme-rotate-thumbnail-right] | |
1376 '("Rotate thumbnail right" . tumme-rotate-thumbnail-right)) | |
1377 | |
1378 (define-key tumme-thumbnail-mode-map | |
1379 [menu-bar tumme tumme-rotate-original-left] | |
1380 '("Rotate original left" . tumme-rotate-original-left)) | |
1381 (define-key tumme-thumbnail-mode-map | |
1382 [menu-bar tumme tumme-rotate-original-right] | |
1383 '("Rotate original right" . tumme-rotate-original-right)) | |
1384 | |
1385 (define-key tumme-thumbnail-mode-map | |
1386 [menu-bar tumme tumme-toggle-movement-tracking] | |
1387 '("Toggle movement tracking on/off" . tumme-toggle-movement-tracking)) | |
1388 | |
1389 (define-key tumme-thumbnail-mode-map | |
1390 [menu-bar tumme tumme-jump-original-dired-buffer] | |
1391 '("Jump to dired buffer" . tumme-jump-original-dired-buffer)) | |
1392 (define-key tumme-thumbnail-mode-map | |
1393 [menu-bar tumme tumme-track-original-file] | |
1394 '("Track original" . tumme-track-original-file)) | |
1395 | |
1396 (define-key tumme-thumbnail-mode-map | |
1397 [menu-bar tumme tumme-flag-thumb-original-file] | |
1398 '("Flag original for deletion" . tumme-flag-thumb-original-file)) | |
1399 (define-key tumme-thumbnail-mode-map | |
1400 [menu-bar tumme tumme-unmark-thumb-original-file] | |
1401 '("Unmark original" . tumme-unmark-thumb-original-file)) | |
1402 (define-key tumme-thumbnail-mode-map | |
1403 [menu-bar tumme tumme-mark-thumb-original-file] | |
1404 '("Mark original" . tumme-mark-thumb-original-file)) | |
1405 | |
1406 (define-key tumme-thumbnail-mode-map | |
1407 [menu-bar tumme tumme-thumbnail-display-external] | |
1408 '("Display in external viewer" . tumme-thumbnail-display-external)) | |
1409 (define-key tumme-thumbnail-mode-map | |
1410 [menu-bar tumme tumme-display-thumbnail-original-image] | |
1411 '("Display image" . tumme-display-thumbnail-original-image))) | |
1412 | |
1413 (defvar tumme-display-image-mode-map (make-sparse-keymap) | |
1414 "Keymap for `tumme-display-image-mode'.") | |
1415 | |
1416 (defun tumme-define-display-image-mode-keymap () | |
1417 "Define keymap for `tumme-display-image-mode'." | |
1418 | |
1419 ;; Keys | |
1420 (define-key tumme-display-image-mode-map "q" 'tumme-kill-buffer-and-window) | |
1421 | |
1422 (define-key tumme-display-image-mode-map "f" | |
1423 'tumme-display-current-image-full) | |
1424 | |
1425 (define-key tumme-display-image-mode-map "s" | |
1426 'tumme-display-current-image-sized) | |
1427 | |
1428 ;; Menu | |
1429 (define-key tumme-display-image-mode-map [menu-bar tumme] | |
1430 (cons "Tumme" (make-sparse-keymap "Tumme"))) | |
1431 | |
1432 (define-key tumme-display-image-mode-map | |
1433 [menu-bar tumme tumme-kill-buffer-and-window] | |
1434 '("Quit" . tumme-kill-buffer-and-window)) | |
1435 | |
1436 (define-key tumme-display-image-mode-map | |
1437 [menu-bar tumme tumme-display-current-image-sized] | |
1438 '("Display original, sized to fit" . tumme-display-current-image-sized)) | |
1439 | |
1440 (define-key tumme-display-image-mode-map | |
1441 [menu-bar tumme tumme-display-current-image-full] | |
1442 '("Display original, full size" . tumme-display-current-image-full)) | |
1443 | |
1444 ) | |
1445 | |
1446 (defun tumme-display-current-image-full () | |
1447 "Display current image in full size." | |
1448 (interactive) | |
1449 (let ((file (tumme-original-file-name))) | |
1450 (if file | |
1451 (progn | |
1452 (tumme-display-image file t) | |
1453 (message "Full size image displayed")) | |
1454 (error "No original file name at point")))) | |
1455 | |
1456 (defun tumme-display-current-image-sized () | |
1457 "Display current image in sized to fit window dimensions." | |
1458 (interactive) | |
1459 (let ((file (tumme-original-file-name))) | |
1460 (if file | |
1461 (progn | |
1462 (tumme-display-image file) | |
1463 (message "Full size image displayed")) | |
1464 (error "No original file name at point")))) | |
1465 | |
1466 (define-derived-mode tumme-thumbnail-mode | |
1467 fundamental-mode "tumme-thumbnail" | |
1468 "Browse and manipulate thumbnail images using dired. | |
1469 Use `tumme-dired' and `tumme-setup-dired-keybindings' to get a | |
1470 nice setup to start with." | |
1471 (tumme-define-thumbnail-mode-keymap) | |
1472 (message "tumme-thumbnail-mode enabled")) | |
1473 | |
1474 (define-derived-mode tumme-display-image-mode | |
1475 fundamental-mode "tumme-image-display" | |
1476 "Mode for displaying and manipulating original image. | |
1477 Resized or in full-size." | |
1478 (tumme-define-display-image-mode-keymap) | |
1479 (message "tumme-display-image-mode enabled")) | |
1480 | |
68404 | 1481 ;;;###autoload |
67302 | 1482 (defun tumme-setup-dired-keybindings () |
1483 "Setup easy-to-use keybindings for the commands to be used in dired mode. | |
1484 Note that n, p and <down> and <up> will be hijacked and bound to | |
1485 `tumme-dired-x-line'." | |
1486 (interactive) | |
1487 | |
1488 ;; Hijack previous and next line movement. Let C-p and C-b be | |
1489 ;; though... | |
1490 | |
1491 (define-key dired-mode-map "p" 'tumme-dired-previous-line) | |
1492 (define-key dired-mode-map "n" 'tumme-dired-next-line) | |
1493 (define-key dired-mode-map [up] 'tumme-dired-previous-line) | |
1494 (define-key dired-mode-map [down] 'tumme-dired-next-line) | |
1495 | |
1496 (define-key dired-mode-map (kbd "C-S-n") 'tumme-next-line-and-display) | |
1497 (define-key dired-mode-map (kbd "C-S-p") 'tumme-previous-line-and-display) | |
1498 (define-key dired-mode-map (kbd "C-S-m") 'tumme-mark-and-display-next) | |
1499 | |
1500 (define-key dired-mode-map "\C-td" 'tumme-display-thumbs) | |
1501 (define-key dired-mode-map "\C-tt" 'tumme-tag-files) | |
70982
9200b8713856
(tumme-delete-tag): Rename from `tumme-tag-remove'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70916
diff
changeset
|
1502 (define-key dired-mode-map "\C-tr" 'tumme-delete-tag) |
67302 | 1503 (define-key dired-mode-map [tab] 'tumme-jump-thumbnail-buffer) |
70891
96a49e1507ec
Renamed `tumme-display-dired-image' to `tumme-dired-display-image'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70890
diff
changeset
|
1504 (define-key dired-mode-map "\C-ti" 'tumme-dired-display-image) |
67302 | 1505 (define-key dired-mode-map "\C-tx" 'tumme-dired-display-external) |
1506 (define-key dired-mode-map "\C-ta" 'tumme-display-thumbs-append) | |
1507 (define-key dired-mode-map "\C-t." 'tumme-display-thumb) | |
1508 (define-key dired-mode-map "\C-tc" 'tumme-dired-comment-files) | |
1509 (define-key dired-mode-map "\C-tf" 'tumme-mark-tagged-files) | |
1510 | |
1511 ;; Menu for dired | |
1512 (define-key dired-mode-map [menu-bar tumme] | |
1513 (cons "Tumme" (make-sparse-keymap "Tumme"))) | |
1514 | |
1515 (define-key dired-mode-map [menu-bar tumme tumme-copy-with-exif-file-name] | |
1516 '("Copy with EXIF file name" . tumme-copy-with-exif-file-name)) | |
1517 | |
1518 (define-key dired-mode-map [menu-bar tumme tumme-dired-comment-files] | |
1519 '("Comment files" . tumme-dired-comment-files)) | |
1520 | |
1521 (define-key dired-mode-map [menu-bar tumme tumme-mark-tagged-files] | |
1522 '("Mark tagged files" . tumme-mark-tagged-files)) | |
1523 | |
70982
9200b8713856
(tumme-delete-tag): Rename from `tumme-tag-remove'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70916
diff
changeset
|
1524 (define-key dired-mode-map [menu-bar tumme tumme-delete-tag] |
9200b8713856
(tumme-delete-tag): Rename from `tumme-tag-remove'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70916
diff
changeset
|
1525 '("Remove tag from files" . tumme-delete-tag)) |
67302 | 1526 |
1527 (define-key dired-mode-map [menu-bar tumme tumme-tag-files] | |
1528 '("Tag files" . tumme-tag-files)) | |
1529 | |
1530 (define-key dired-mode-map [menu-bar tumme tumme-jump-thumbnail-buffer] | |
1531 '("Jump to thumbnail buffer" . tumme-jump-thumbnail-buffer)) | |
1532 | |
1533 (define-key dired-mode-map [menu-bar tumme tumme-toggle-movement-tracking] | |
1534 '("Toggle movement tracking" . tumme-toggle-movement-tracking)) | |
1535 | |
1536 (define-key dired-mode-map | |
1537 [menu-bar tumme tumme-toggle-append-browsing] | |
1538 '("Toggle append browsing" . tumme-toggle-append-browsing)) | |
1539 | |
1540 (define-key dired-mode-map | |
1541 [menu-bar tumme tumme-toggle-disp-props] | |
1542 '("Toggle display properties" . tumme-toggle-dired-display-properties)) | |
1543 | |
1544 (define-key dired-mode-map | |
1545 [menu-bar tumme tumme-dired-display-external] | |
1546 '("Display in external viewer" . tumme-dired-display-external)) | |
1547 (define-key dired-mode-map | |
70891
96a49e1507ec
Renamed `tumme-display-dired-image' to `tumme-dired-display-image'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70890
diff
changeset
|
1548 [menu-bar tumme tumme-dired-display-image] |
96a49e1507ec
Renamed `tumme-display-dired-image' to `tumme-dired-display-image'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70890
diff
changeset
|
1549 '("Display image" . tumme-dired-display-image)) |
67302 | 1550 (define-key dired-mode-map |
1551 [menu-bar tumme tumme-display-thumb] | |
1552 '("Display this thumbnail" . tumme-display-thumb)) | |
1553 (define-key dired-mode-map | |
1554 [menu-bar tumme tumme-display-thumbs-append] | |
1555 '("Display thumbnails append" . tumme-display-thumbs-append)) | |
1556 (define-key dired-mode-map | |
1557 [menu-bar tumme tumme-display-thumbs] | |
1558 '("Display thumbnails" . tumme-display-thumbs)) | |
1559 | |
1560 (define-key dired-mode-map | |
1561 [menu-bar tumme tumme-create-thumbs] | |
1562 '("Create thumbnails for marked files" . tumme-create-thumbs)) | |
1563 | |
1564 (define-key dired-mode-map | |
1565 [menu-bar tumme tumme-mark-and-display-next] | |
1566 '("Mark and display next" . tumme-mark-and-display-next)) | |
1567 (define-key dired-mode-map | |
1568 [menu-bar tumme tumme-previous-line-and-display] | |
1569 '("Display thumb for previous file" . tumme-previous-line-and-display)) | |
1570 (define-key dired-mode-map | |
1571 [menu-bar tumme tumme-next-line-and-display] | |
1572 '("Display thumb for next file" . tumme-next-line-and-display))) | |
1573 | |
1574 (defun tumme-create-thumbs (&optional arg) | |
1575 "Create thumbnail images for all marked files in dired. | |
1576 With prefix argument ARG, create thumbnails even if they already exist | |
68757
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
1577 \(i.e. use this to refresh your thumbnails)." |
67302 | 1578 (interactive "P") |
1579 (let (curr-file thumb-name files count) | |
1580 (setq files (dired-get-marked-files)) | |
1581 (mapcar | |
1582 (lambda (curr-file) | |
1583 (setq thumb-name (tumme-thumb-name curr-file)) | |
1584 ;; If the user overrides the exist check, we must clear the | |
1585 ;; image cache so that if the user wants to display the | |
1586 ;; thumnail, it is not fetched from cache. | |
1587 (if arg | |
1588 (clear-image-cache)) | |
1589 (if (or (not (file-exists-p thumb-name)) | |
1590 arg) | |
1591 (if (not (= 0 (tumme-create-thumb curr-file | |
1592 (tumme-thumb-name curr-file)))) | |
1593 (error "Thumb could not be created")))) | |
1594 files))) | |
1595 | |
1596 (defvar tumme-slideshow-timer nil | |
1597 "Slideshow timer.") | |
1598 | |
1599 (defvar tumme-slideshow-count 0 | |
1600 "Keeping track on number of images in slideshow.") | |
1601 | |
1602 (defvar tumme-slideshow-times 0 | |
1603 "Number of pictures to display in slideshow.") | |
1604 | |
1605 (defun tumme-slideshow-step () | |
1606 "Step to next file, if `tumme-slideshow-times' has not been reached." | |
1607 (if (< tumme-slideshow-count tumme-slideshow-times) | |
1608 (progn | |
1609 (message "%s" (1+ tumme-slideshow-count)) | |
1610 (setq tumme-slideshow-count (1+ tumme-slideshow-count)) | |
1611 (tumme-next-line-and-display)) | |
1612 (tumme-slideshow-stop))) | |
1613 | |
1614 (defun tumme-slideshow-start () | |
1615 "Start slideshow. | |
1616 Ask user for number of images to show and the delay in between." | |
1617 (interactive) | |
1618 (setq tumme-slideshow-count 0) | |
1619 (setq tumme-slideshow-times (string-to-number (read-string "How many: "))) | |
1620 (let ((repeat (string-to-number | |
1621 (read-string | |
1622 "Delay, in seconds. Decimals are accepted : " "1")))) | |
1623 (setq tumme-slideshow-timer | |
1624 (run-with-timer | |
1625 0 repeat | |
1626 'tumme-slideshow-step)))) | |
1627 | |
1628 (defun tumme-slideshow-stop () | |
1629 "Cancel slideshow." | |
1630 (interactive) | |
1631 (cancel-timer tumme-slideshow-timer)) | |
1632 | |
1633 (defun tumme-delete-char () | |
1634 "Remove current thumbnail from thumbnail buffer and line up." | |
1635 (interactive) | |
1636 (let ((inhibit-read-only t)) | |
1637 (delete-char 1) | |
1638 (if (looking-at " ") | |
1639 (delete-char 1)))) | |
1640 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1641 ;;;###autoload |
67302 | 1642 (defun tumme-display-thumbs-append () |
1643 "Append thumbnails to `tumme-thumbnail-buffer'." | |
1644 (interactive) | |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
1645 (tumme-display-thumbs nil t t)) |
67302 | 1646 |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1647 ;;;###autoload |
67302 | 1648 (defun tumme-display-thumb () |
75146
2292818dab8e
(tumme-display-thumb): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
72501
diff
changeset
|
1649 "Shorthand for `tumme-display-thumbs' with prefix argument." |
67302 | 1650 (interactive) |
70888
b84970723553
Added new parameter to `tumme-display-thumbs' to be used from `tumme-next-line-and-display' and similar commands.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70807
diff
changeset
|
1651 (tumme-display-thumbs t nil t)) |
67302 | 1652 |
1653 (defun tumme-line-up () | |
1654 "Line up thumbnails according to `tumme-thumbs-per-row'. | |
1655 See also `tumme-line-up-dynamic'." | |
1656 (interactive) | |
1657 (let ((inhibit-read-only t)) | |
1658 (goto-char (point-min)) | |
1659 (while (and (not (tumme-image-at-point-p)) | |
1660 (not (eobp))) | |
1661 (delete-char 1)) | |
1662 (while (not (eobp)) | |
1663 (forward-char) | |
1664 (while (and (not (tumme-image-at-point-p)) | |
1665 (not (eobp))) | |
1666 (delete-char 1))) | |
1667 (goto-char (point-min)) | |
1668 (let ((count 0)) | |
1669 (while (not (eobp)) | |
1670 (forward-char) | |
1671 (if (= tumme-thumbs-per-row 1) | |
1672 (insert "\n") | |
1673 (insert " ") | |
1674 (setq count (1+ count)) | |
72083
bb51418c995c
Add extra check for end of buffer.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72019
diff
changeset
|
1675 (when (and (= count (- tumme-thumbs-per-row 1)) |
bb51418c995c
Add extra check for end of buffer.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72019
diff
changeset
|
1676 (not (eobp))) |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1677 (forward-char) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1678 (insert "\n") |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
1679 (setq count 0))))) |
67302 | 1680 (goto-char (point-min)))) |
1681 | |
1682 (defun tumme-line-up-dynamic () | |
1683 "Line up thumbnails images dynamically. | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
1684 Calculate how many thumbnails fit." |
67302 | 1685 (interactive) |
1686 (let* ((char-width (frame-char-width)) | |
1687 (width (tumme-window-width-pixels (tumme-thumbnail-window))) | |
1688 (tumme-thumbs-per-row | |
1689 (/ width | |
1690 (+ (* 2 tumme-thumb-relief) | |
1691 (* 2 tumme-thumb-margin) | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
1692 tumme-thumb-width char-width)))) |
67302 | 1693 (tumme-line-up))) |
1694 | |
1695 (defun tumme-line-up-interactive () | |
1696 "Line up thumbnails interactively. | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
1697 Ask user how many thumbnails should be displayed per row." |
67302 | 1698 (interactive) |
1699 (let ((tumme-thumbs-per-row | |
1700 (string-to-number (read-string "How many thumbs per row: ")))) | |
1701 (if (not (> tumme-thumbs-per-row 0)) | |
1702 (message "Number must be greater than 0") | |
1703 (tumme-line-up)))) | |
1704 | |
1705 (defun tumme-thumbnail-display-external () | |
1706 "Display original image for thumbnail at point using external viewer." | |
1707 (interactive) | |
1708 (let ((file (tumme-original-file-name))) | |
1709 (if (not (tumme-image-at-point-p)) | |
1710 (message "No thumbnail at point") | |
1711 (if (not file) | |
1712 (message "No original file name found") | |
71808 | 1713 (call-process shell-file-name nil nil nil shell-command-switch |
71780 | 1714 (format "%s \"%s\"" tumme-external-viewer file)))))) |
67302 | 1715 |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1716 ;;;###autoload |
67302 | 1717 (defun tumme-dired-display-external () |
1718 "Display file at point using an external viewer." | |
1719 (interactive) | |
1720 (let ((file (dired-get-filename))) | |
71808 | 1721 (call-process shell-file-name nil nil nil shell-command-switch |
71780 | 1722 (format "%s \"%s\"" tumme-external-viewer file)))) |
67302 | 1723 |
1724 (defun tumme-window-width-pixels (window) | |
1725 "Calculate WINDOW width in pixels." | |
1726 (* (window-width window) (frame-char-width))) | |
1727 | |
1728 (defun tumme-window-height-pixels (window) | |
1729 "Calculate WINDOW height in pixels." | |
1730 ;; Note: The mode-line consumes one line | |
1731 (* (- (window-height window) 1) (frame-char-height))) | |
1732 | |
1733 (defun tumme-display-window () | |
1734 "Return window where `tumme-display-image-buffer' is visible." | |
1735 (get-window-with-predicate | |
1736 (lambda (window) | |
1737 (equal (buffer-name (window-buffer window)) tumme-display-image-buffer)) | |
1738 nil t)) | |
1739 | |
1740 (defun tumme-thumbnail-window () | |
1741 "Return window where `tumme-thumbnail-buffer' is visible." | |
1742 (get-window-with-predicate | |
1743 (lambda (window) | |
1744 (equal (buffer-name (window-buffer window)) tumme-thumbnail-buffer)) | |
1745 nil t)) | |
1746 | |
1747 (defun tumme-associated-dired-buffer-window () | |
1748 "Return window where associated dired buffer is visible." | |
1749 (let (buf) | |
1750 (if (tumme-image-at-point-p) | |
1751 (progn | |
1752 (setq buf (tumme-associated-dired-buffer)) | |
1753 (get-window-with-predicate | |
1754 (lambda (window) | |
1755 (equal (window-buffer window) buf)))) | |
1756 (error "No thumbnail image at point")))) | |
1757 | |
1758 (defun tumme-display-window-width () | |
1759 "Return width, in pixels, of tumme's image display window." | |
1760 (- (tumme-window-width-pixels (tumme-display-window)) | |
1761 tumme-display-window-width-correction)) | |
1762 | |
1763 (defun tumme-display-window-height () | |
1764 "Return height, in pixels, of tumme's image display window." | |
1765 (- (tumme-window-height-pixels (tumme-display-window)) | |
1766 tumme-display-window-height-correction)) | |
1767 | |
1768 (defun tumme-display-image (file &optional original-size) | |
1769 "Display image FILE in image buffer. | |
70916
dfbe62ceddcf
* tumme.el (tumme-display-image): Changed documentation string
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70893
diff
changeset
|
1770 Use this when you want to display the image, semi sized, in a new |
dfbe62ceddcf
* tumme.el (tumme-display-image): Changed documentation string
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70893
diff
changeset
|
1771 window. The image is sized to fit the display window (using a |
dfbe62ceddcf
* tumme.el (tumme-display-image): Changed documentation string
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70893
diff
changeset
|
1772 temporary file, don't worry). Because of this, it will not be as |
dfbe62ceddcf
* tumme.el (tumme-display-image): Changed documentation string
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70893
diff
changeset
|
1773 quick as opening it directly, but on most modern systems it |
dfbe62ceddcf
* tumme.el (tumme-display-image): Changed documentation string
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70893
diff
changeset
|
1774 should feel snappy enough. |
67302 | 1775 |
1776 If optional argument ORIGINAL-SIZE is non-nil, display image in its | |
1777 original size." | |
1778 (let ((new-file (expand-file-name tumme-temp-image-file)) | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
1779 width height command ret) |
67302 | 1780 (setq file (expand-file-name file)) |
1781 (if (not original-size) | |
1782 (progn | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
1783 (setq width (tumme-display-window-width)) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
1784 (setq height (tumme-display-window-height)) |
67302 | 1785 (setq command |
1786 (format-spec | |
1787 tumme-cmd-create-temp-image-options | |
1788 (list | |
1789 (cons ?p tumme-cmd-create-temp-image-program) | |
68815
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
1790 (cons ?w width) |
3e8cc27a9bcf
Remove todo item about Thumbnail Managing Standard.
Juri Linkov <juri@jurta.org>
parents:
68811
diff
changeset
|
1791 (cons ?h height) |
67302 | 1792 (cons ?f file) |
1793 (cons ?t new-file)))) | |
71808 | 1794 (setq ret (call-process shell-file-name nil nil nil |
1795 shell-command-switch command)) | |
67302 | 1796 (if (not (= 0 ret)) |
1797 (error "Could not resize image"))) | |
1798 (copy-file file new-file t)) | |
71780 | 1799 (with-current-buffer (tumme-create-display-image-buffer) |
67302 | 1800 (let ((inhibit-read-only t)) |
1801 (erase-buffer) | |
1802 (clear-image-cache) | |
1803 (tumme-insert-image tumme-temp-image-file 'jpeg 0 0) | |
1804 (goto-char (point-min)) | |
1805 (tumme-update-property 'original-file-name file))))) | |
1806 | |
1807 (defun tumme-display-thumbnail-original-image (&optional arg) | |
1808 "Display current thumbnail's original image in display buffer. | |
1809 See documentation for `tumme-display-image' for more information. | |
1810 With prefix argument ARG, display image in its original size." | |
1811 (interactive "P") | |
1812 (let ((file (tumme-original-file-name))) | |
1813 (if (not (string-equal major-mode "tumme-thumbnail-mode")) | |
1814 (message "Not in tumme-thumbnail-mode") | |
1815 (if (not (tumme-image-at-point-p)) | |
1816 (message "No thumbnail at point") | |
1817 (if (not file) | |
1818 (message "No original file name found") | |
72017
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
1819 (tumme-create-display-image-buffer) |
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
1820 (display-buffer tumme-display-image-buffer) |
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
1821 (tumme-display-image file arg)))))) |
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
1822 |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
1823 |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
1824 ;;;###autoload |
70891
96a49e1507ec
Renamed `tumme-display-dired-image' to `tumme-dired-display-image'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70890
diff
changeset
|
1825 (defun tumme-dired-display-image (&optional arg) |
67302 | 1826 "Display current image file. |
1827 See documentation for `tumme-display-image' for more information. | |
1828 With prefix argument ARG, display image in its original size." | |
1829 (interactive "P") | |
72017
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
1830 (tumme-create-display-image-buffer) |
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
1831 (display-buffer tumme-display-image-buffer) |
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
1832 (tumme-display-image (dired-get-filename) arg)) |
67302 | 1833 |
1834 (defun tumme-image-at-point-p () | |
1835 "Return true if there is a tumme thumbnail at point." | |
1836 (get-text-property (point) 'tumme-thumbnail)) | |
1837 | |
1838 (defun tumme-rotate-thumbnail (degrees) | |
1839 "Rotate thumbnail DEGREES degrees." | |
1840 (if (not (tumme-image-at-point-p)) | |
1841 (message "No thumbnail at point") | |
1842 (let ((file (tumme-thumb-name (tumme-original-file-name))) | |
1843 command) | |
1844 (setq command (format-spec | |
1845 tumme-cmd-rotate-thumbnail-options | |
1846 (list | |
1847 (cons ?p tumme-cmd-rotate-thumbnail-program) | |
1848 (cons ?d degrees) | |
1849 (cons ?t (expand-file-name file))))) | |
71808 | 1850 (call-process shell-file-name nil nil nil shell-command-switch command) |
67302 | 1851 ;; Clear the cache to refresh image. I wish I could just refresh |
1852 ;; the current file but I do not know how to do that. Yet... | |
1853 (clear-image-cache)))) | |
1854 | |
1855 (defun tumme-rotate-thumbnail-left () | |
1856 "Rotate thumbnail left (counter clockwise) 90 degrees. | |
1857 The result of the rotation is displayed in the image display area | |
1858 and a confirmation is needed before the original image files is | |
1859 overwritten. This confirmation can be turned off using | |
1860 `tumme-rotate-original-ask-before-overwrite'." | |
1861 (interactive) | |
1862 (tumme-rotate-thumbnail "270")) | |
1863 | |
1864 (defun tumme-rotate-thumbnail-right () | |
1865 "Rotate thumbnail counter right (clockwise) 90 degrees. | |
1866 The result of the rotation is displayed in the image display area | |
1867 and a confirmation is needed before the original image files is | |
1868 overwritten. This confirmation can be turned off using | |
1869 `tumme-rotate-original-ask-before-overwrite'." | |
1870 (interactive) | |
1871 (tumme-rotate-thumbnail "90")) | |
1872 | |
1873 (defun tumme-refresh-thumb () | |
1874 "Force creation of new image for current thumbnail." | |
1875 (interactive) | |
1876 (let ((file (tumme-original-file-name))) | |
1877 (clear-image-cache) | |
1878 (tumme-create-thumb file (tumme-thumb-name file)))) | |
1879 | |
1880 (defun tumme-rotate-original (degrees) | |
1881 "Rotate original image DEGREES degrees." | |
1882 (if (not (tumme-image-at-point-p)) | |
1883 (message "No image at point") | |
1884 (let ((file (tumme-original-file-name)) | |
1885 command temp-file) | |
1886 (if (not (string-match "\.[jJ][pP[eE]?[gG]$" file)) | |
1887 (error "Only JPEG images can be rotated!")) | |
1888 (setq command (format-spec | |
1889 tumme-cmd-rotate-original-options | |
1890 (list | |
1891 (cons ?p tumme-cmd-rotate-original-program) | |
1892 (cons ?d degrees) | |
1893 (cons ?o (expand-file-name file)) | |
1894 (cons ?t tumme-temp-rotate-image-file)))) | |
71808 | 1895 (if (not (= 0 (call-process shell-file-name nil nil nil |
1896 shell-command-switch command))) | |
67302 | 1897 (error "Could not rotate image") |
1898 (tumme-display-image tumme-temp-rotate-image-file) | |
1899 (if (or (and tumme-rotate-original-ask-before-overwrite | |
71780 | 1900 (y-or-n-p |
1901 "Rotate to temp file OK. Overwrite original image? ")) | |
67302 | 1902 (not tumme-rotate-original-ask-before-overwrite)) |
1903 (progn | |
1904 (copy-file tumme-temp-rotate-image-file file t) | |
1905 (tumme-refresh-thumb)) | |
1906 (tumme-display-image file)))))) | |
1907 | |
1908 (defun tumme-rotate-original-left () | |
1909 "Rotate original image left (counter clockwise) 90 degrees." | |
1910 (interactive) | |
1911 (tumme-rotate-original "270")) | |
1912 | |
1913 (defun tumme-rotate-original-right () | |
1914 "Rotate original image right (clockwise) 90 degrees." | |
1915 (interactive) | |
1916 (tumme-rotate-original "90")) | |
1917 | |
1918 (defun tumme-get-exif-file-name (file) | |
1919 "Use the image's EXIF information to return a unique file name. | |
1920 The file name should be unique as long as you do not take more than | |
1921 one picture per second. The original file name is suffixed at the end | |
1922 for traceability. The format of the returned file name is | |
1923 YYYY_MM_DD_HH_MM_DD_ORIG_FILE_NAME.jpg. Used from | |
1924 `tumme-copy-with-exif-file-name'." | |
1925 (let (data no-exif-data-found) | |
1926 (if (not (string-match "\.[Jj][Pp][Ee]?[Gg]$" (expand-file-name file))) | |
1927 (progn | |
1928 (setq no-exif-data-found t) | |
1929 (setq data | |
1930 (format-time-string | |
1931 "%Y:%m:%d %H:%M:%S" | |
1932 (nth 5 (file-attributes (expand-file-name file)))))) | |
71780 | 1933 (setq data (tumme-get-exif-data (expand-file-name file) |
1934 "DateTimeOriginal"))) | |
67302 | 1935 (while (string-match "[ :]" data) |
1936 (setq data (replace-match "_" nil nil data))) | |
1937 (format "%s%s%s" data | |
1938 (if no-exif-data-found | |
1939 "_noexif_" | |
1940 "_") | |
1941 (file-name-nondirectory file)))) | |
1942 | |
1943 (defun tumme-thumbnail-set-image-description () | |
1944 "Set the ImageDescription EXIF tag for the original image. | |
1945 If the image already has a value for this tag, it is used as the | |
1946 default value at the prompt." | |
1947 (interactive) | |
1948 (if (not (tumme-image-at-point-p)) | |
1949 (message "No thumbnail at point") | |
1950 (let* ((file (tumme-original-file-name)) | |
1951 (old-value (tumme-get-exif-data file "ImageDescription"))) | |
1952 (if (eq 0 | |
1953 (tumme-set-exif-data file "ImageDescription" | |
71780 | 1954 (read-string "Value of ImageDescription: " |
1955 old-value))) | |
67302 | 1956 (message "Successfully wrote ImageDescription tag.") |
1957 (error "Could not write ImageDescription tag"))))) | |
1958 | |
1959 (defun tumme-set-exif-data (file tag-name tag-value) | |
1960 "In FILE, set EXIF tag TAG-NAME to value TAG-VALUE." | |
1961 (let (command) | |
1962 (setq command (format-spec | |
1963 tumme-cmd-write-exif-data-options | |
1964 (list | |
1965 (cons ?p tumme-cmd-write-exif-data-program) | |
1966 (cons ?f (expand-file-name file)) | |
1967 (cons ?t tag-name) | |
1968 (cons ?v tag-value)))) | |
71808 | 1969 (call-process shell-file-name nil nil nil shell-command-switch command))) |
67302 | 1970 |
1971 (defun tumme-get-exif-data (file tag-name) | |
1972 "From FILE, return EXIF tag TAG-NAME." | |
1973 (let ((buf (get-buffer-create "*tumme-get-exif-data*")) | |
1974 command tag-value) | |
1975 (setq command (format-spec | |
1976 tumme-cmd-read-exif-data-options | |
1977 (list | |
1978 (cons ?p tumme-cmd-read-exif-data-program) | |
1979 (cons ?f file) | |
1980 (cons ?t tag-name)))) | |
71780 | 1981 (with-current-buffer buf |
67302 | 1982 (delete-region (point-min) (point-max)) |
71808 | 1983 (if (not (eq (call-process shell-file-name nil t nil |
1984 shell-command-switch command) 0)) | |
67302 | 1985 (error "Could not get EXIF tag") |
1986 (goto-char (point-min)) | |
1987 ;; Clean buffer from newlines and carriage returns before | |
1988 ;; getting final info | |
1989 (while (search-forward-regexp "[\n\r]" nil t) | |
1990 (replace-match "" nil t)) | |
1991 (setq tag-value (buffer-substring (point-min) (point-max))))) | |
1992 tag-value)) | |
1993 | |
1994 (defun tumme-copy-with-exif-file-name () | |
1995 "Copy file with unique name to main image directory. | |
68757
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
1996 Copy current or all marked files in dired to a new file in your |
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
1997 main image directory, using a file name generated by |
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
1998 `tumme-get-exif-file-name'. A typical usage for this if when |
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
1999 copying images from a digital camera into the image directory. |
67302 | 2000 |
68757
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
2001 Typically, you would open up the folder with the incoming |
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
2002 digital images, mark the files to be copied, and execute this |
67302 | 2003 function. The result is a couple of new files in |
68757
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
2004 `tumme-main-image-directory' called |
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
2005 2005_05_08_12_52_00_dscn0319.jpg, |
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
2006 2005_05_08_14_27_45_dscn0320.jpg etc." |
67302 | 2007 (interactive) |
2008 (let (new-name | |
2009 (files (dired-get-marked-files))) | |
2010 (mapcar | |
2011 (lambda (curr-file) | |
2012 (setq new-name | |
2013 (format "%s/%s" | |
2014 (file-name-as-directory | |
2015 (expand-file-name tumme-main-image-directory)) | |
2016 (tumme-get-exif-file-name curr-file))) | |
2017 (message "Copying %s to %s" curr-file new-name) | |
2018 (copy-file curr-file new-name)) | |
2019 files))) | |
2020 | |
2021 (defun tumme-display-next-thumbnail-original () | |
2022 "In thubnail buffer, move to next thumbnail and display the image." | |
2023 (interactive) | |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
2024 (tumme-forward-image) |
67302 | 2025 (tumme-display-thumbnail-original-image)) |
2026 | |
2027 (defun tumme-display-previous-thumbnail-original () | |
68673
5a7d4aa73d2d
(tumme-get-thumbnail-image): Add missing arg to `error'.
Juanma Barranquero <lekktu@gmail.com>
parents:
68658
diff
changeset
|
2028 "Move to previous thumbnail and display image." |
67302 | 2029 (interactive) |
72124
46e335881cbf
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72121
diff
changeset
|
2030 (tumme-backward-image) |
67302 | 2031 (tumme-display-thumbnail-original-image)) |
2032 | |
72087
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2033 (defun tumme-write-comments (file-comments) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2034 "Write file comments to database. |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2035 Write file comments to one or more files. FILE-COMMENTS is an alist on |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2036 the following form: |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2037 ((FILE . COMMENT) ... )" |
72121
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2038 (let (end comment-beg-pos comment-end-pos file comment) |
72087
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2039 (with-temp-file tumme-db-file |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2040 (insert-file-contents tumme-db-file) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2041 (dolist (elt file-comments) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2042 (setq file (car elt) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2043 comment (cdr elt)) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2044 (goto-char (point-min)) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2045 (if (search-forward-regexp (format "^%s.*$" file) nil t) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2046 (progn |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2047 (setq end (point)) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2048 (beginning-of-line) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2049 ;; Delete old comment, if any |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2050 (when (search-forward ";comment:" end t) |
72121
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2051 (setq comment-beg-pos (match-beginning 0)) |
72087
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2052 ;; Any tags after the comment? |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2053 (if (search-forward ";" end t) |
72121
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2054 (setq comment-end-pos (- (point) 1)) |
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2055 (setq comment-end-pos end)) |
72087
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2056 ;; Delete comment tag and comment |
72121
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2057 (delete-region comment-beg-pos comment-end-pos)) |
72087
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2058 ;; Insert new comment |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2059 (beginning-of-line) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2060 (unless (search-forward ";" end t) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2061 (end-of-line) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2062 (insert ";")) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2063 (insert (format "comment:%s;" comment))) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2064 ;; File does not exist in database - add it. |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2065 (goto-char (point-max)) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2066 (insert (format "\n%s;comment:%s" file comment))))))) |
585ed6ff296a
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72085
diff
changeset
|
2067 |
67302 | 2068 (defun tumme-update-property (prop value) |
2069 "Update text property PROP with value VALUE at point." | |
2070 (let ((inhibit-read-only t)) | |
2071 (put-text-property | |
2072 (point) (1+ (point)) | |
2073 prop | |
2074 value))) | |
2075 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
2076 ;;;###autoload |
67302 | 2077 (defun tumme-dired-comment-files () |
2078 "Add comment to current or marked files in dired." | |
2079 (interactive) | |
72089
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2080 (let ((comment (tumme-read-comment))) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2081 (tumme-write-comments |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2082 (mapcar |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2083 (lambda (curr-file) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2084 (cons curr-file comment)) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2085 (dired-get-marked-files))))) |
67302 | 2086 |
2087 (defun tumme-comment-thumbnail () | |
2088 "Add comment to current thumbnail in thumbnail buffer." | |
2089 (interactive) | |
2090 (let* ((file (tumme-original-file-name)) | |
2091 (comment (tumme-read-comment file))) | |
72089
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2092 (tumme-write-comments (list (cons file comment))) |
67302 | 2093 (tumme-update-property 'comment comment)) |
2094 (tumme-display-thumb-properties)) | |
2095 | |
2096 (defun tumme-read-comment (&optional file) | |
68806
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2097 "Read comment for an image. |
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2098 Read comment for an image, optionally using old comment from FILE |
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2099 as initial value." |
67302 | 2100 (let ((comment |
2101 (read-string | |
2102 "Comment: " | |
2103 (if file (tumme-get-comment file))))) | |
2104 comment)) | |
2105 | |
2106 (defun tumme-get-comment (file) | |
2107 "Get comment for file FILE." | |
2108 (save-excursion | |
72121
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2109 (let (end buf comment-beg-pos comment-end-pos comment) |
67302 | 2110 (setq buf (find-file tumme-db-file)) |
2111 (goto-char (point-min)) | |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
2112 (when (search-forward-regexp |
71919
9bf2fbfa2516
Fix bug in `tumme-get-comment'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71808
diff
changeset
|
2113 (format "^%s" file) nil t) |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
2114 (end-of-line) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
2115 (setq end (point)) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
2116 (beginning-of-line) |
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
2117 (cond ((search-forward ";comment:" end t) |
72121
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2118 (setq comment-beg-pos (point)) |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
2119 (if (search-forward ";" end t) |
72121
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2120 (setq comment-end-pos (- (point) 1)) |
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2121 (setq comment-end-pos end)) |
70996
0074ea910aa8
* tumme.el: Replace a lot of `if ... progn' with `when'.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
70982
diff
changeset
|
2122 (setq comment (buffer-substring |
72121
2df19ee49e28
(tumme-track-original-file): Add `buffer-live-p' check.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72119
diff
changeset
|
2123 comment-beg-pos comment-end-pos))))) |
67302 | 2124 (kill-buffer buf) |
2125 comment))) | |
2126 | |
68682
23eaa0d773ea
Added more autoload cookies.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68675
diff
changeset
|
2127 ;;;###autoload |
67302 | 2128 (defun tumme-mark-tagged-files () |
68806
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2129 "Use regexp to mark files with matching tag. |
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2130 A `tag' is a keyword, a piece of meta data, associated with an |
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2131 image file and stored in tumme's database file. This command |
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2132 lets you input a regexp and this will be matched against all tags |
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2133 on all image files in the database file. The files that have a |
3e96b0954fa1
Enhanced some docstrings. Added todo item about the Thumbnail
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68783
diff
changeset
|
2134 matching tags will be marked in the dired buffer." |
67302 | 2135 (interactive) |
2136 (let ((tag (read-string "Mark tagged files (regexp): ")) | |
2137 (hits 0) | |
2138 files buf) | |
2139 (save-excursion | |
2140 (setq buf (find-file tumme-db-file)) | |
2141 (goto-char (point-min)) | |
2142 ;; Collect matches | |
2143 (while (search-forward-regexp | |
68811 | 2144 (concat "\\(^[^;\n]+\\);.*" tag ".*$") nil t) |
67302 | 2145 (setq files (append (list (match-string 1)) files))) |
2146 (kill-buffer buf) | |
2147 ;; Mark files | |
2148 (mapcar | |
2149 ;; I tried using `dired-mark-files-regexp' but it was | |
2150 ;; waaaay to slow. | |
2151 (lambda (curr-file) | |
2152 ;; Don't bother about hits found in other directories than | |
2153 ;; the current one. | |
2154 (when (string= (file-name-as-directory | |
2155 (expand-file-name default-directory)) | |
2156 (file-name-as-directory | |
2157 (file-name-directory curr-file))) | |
2158 (setq curr-file (file-name-nondirectory curr-file)) | |
2159 (goto-char (point-min)) | |
2160 (when (search-forward-regexp (format "\\s %s$" curr-file) nil t) | |
2161 (setq hits (+ hits 1)) | |
2162 (dired-mark 1)))) | |
2163 files)) | |
2164 (message "%d files with matching tag marked." hits))) | |
2165 | |
2166 (defun tumme-mouse-display-image (event) | |
2167 "Use mouse EVENT, call `tumme-display-image' to display image. | |
2168 Track this in associated dired buffer if `tumme-track-movement' is | |
2169 non-nil." | |
2170 (interactive "e") | |
2171 (let (file) | |
2172 (mouse-set-point event) | |
2173 (goto-char (posn-point (event-end event))) | |
2174 (setq file (tumme-original-file-name)) | |
2175 (if tumme-track-movement | |
2176 (tumme-track-original-file)) | |
72017
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
2177 (tumme-create-display-image-buffer) |
0ec82e7ecc2f
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
71919
diff
changeset
|
2178 (display-buffer tumme-display-image-buffer) |
67302 | 2179 (tumme-display-image file))) |
2180 | |
2181 (defun tumme-mouse-select-thumbnail (event) | |
2182 "Use mouse EVENT to select thumbnail image. | |
2183 Track this in associated dired buffer if `tumme-track-movement' is | |
2184 non-nil." | |
2185 (interactive "e") | |
2186 (let (file) | |
2187 (mouse-set-point event) | |
2188 (goto-char (posn-point (event-end event))) | |
2189 (if tumme-track-movement | |
2190 (tumme-track-original-file))) | |
2191 (tumme-display-thumb-properties)) | |
2192 | |
2193 (defun tumme-mouse-toggle-mark (event) | |
2194 "Use mouse EVENT to toggle dired mark for thumbnail. | |
2195 Track this in associated dired buffer if `tumme-track-movement' is | |
2196 non-nil." | |
2197 (interactive "e") | |
2198 (let (file) | |
2199 (mouse-set-point event) | |
2200 (goto-char (posn-point (event-end event))) | |
2201 (if tumme-track-movement | |
2202 (tumme-track-original-file))) | |
2203 (tumme-toggle-mark-thumb-original-file)) | |
2204 | |
2205 (defun tumme-dired-display-properties () | |
2206 "Display properties for dired file in the echo area." | |
2207 (interactive) | |
2208 (let* ((file (dired-get-filename)) | |
2209 (file-name (file-name-nondirectory file)) | |
2210 (dired-buf (buffer-name (current-buffer))) | |
2211 (props (mapconcat | |
2212 'princ | |
2213 (tumme-list-tags file) | |
2214 ", ")) | |
2215 (comment (tumme-get-comment file))) | |
2216 (if file-name | |
2217 (message | |
2218 (tumme-format-properties-string | |
2219 dired-buf | |
2220 file-name | |
2221 props | |
2222 comment))))) | |
2223 | |
2224 (defvar tumme-tag-file-list nil | |
2225 "List to store tag-file structure.") | |
2226 | |
2227 (defvar tumme-file-tag-list nil | |
2228 "List to store file-tag structure.") | |
2229 | |
2230 (defvar tumme-file-comment-list nil | |
2231 "List to store file comments.") | |
2232 | |
2233 (defun tumme-add-to-tag-file-list (tag file) | |
2234 "Add relation between TAG and FILE." | |
2235 (let (curr) | |
2236 (if tumme-tag-file-list | |
2237 (if (setq curr (assoc tag tumme-tag-file-list)) | |
2238 (if (not (member file curr)) | |
2239 (setcdr curr (cons file (cdr curr)))) | |
2240 (setcdr tumme-tag-file-list | |
2241 (cons (list tag file) (cdr tumme-tag-file-list)))) | |
2242 (setq tumme-tag-file-list (list (list tag file)))))) | |
2243 | |
2244 (defun tumme-add-to-tag-file-lists (tag file) | |
2245 "Helper function used from `tumme-create-gallery-lists'. | |
2246 | |
2247 Add TAG to FILE in one list and FILE to TAG in the other. | |
2248 | |
2249 Lisp structures look like the following: | |
2250 | |
2251 tumme-file-tag-list: | |
2252 | |
2253 ((\"filename1\" \"tag1\" \"tag2\" \"tag3\" ...) | |
2254 (\"filename2\" \"tag1\" \"tag2\" \"tag3\" ...) | |
2255 ...) | |
2256 | |
2257 tumme-tag-file-list: | |
2258 | |
2259 ((\"tag1\" \"filename1\" \"filename2\" \"filename3\" ...) | |
2260 (\"tag2\" \"filename1\" \"filename2\" \"filename3\" ...) | |
2261 ...)" | |
2262 ;; Add tag to file list | |
2263 (let (curr) | |
2264 (if tumme-file-tag-list | |
2265 (if (setq curr (assoc file tumme-file-tag-list)) | |
2266 (setcdr curr (cons tag (cdr curr))) | |
2267 (setcdr tumme-file-tag-list | |
2268 (cons (list file tag) (cdr tumme-file-tag-list)))) | |
2269 (setq tumme-file-tag-list (list (list file tag)))) | |
2270 ;; Add file to tag list | |
2271 (if tumme-tag-file-list | |
2272 (if (setq curr (assoc tag tumme-tag-file-list)) | |
2273 (if (not (member file curr)) | |
2274 (setcdr curr (cons file (cdr curr)))) | |
2275 (setcdr tumme-tag-file-list | |
2276 (cons (list tag file) (cdr tumme-tag-file-list)))) | |
2277 (setq tumme-tag-file-list (list (list tag file)))))) | |
2278 | |
2279 (defun tumme-add-to-file-comment-list (file comment) | |
2280 "Helper function used from `tumme-create-gallery-lists'. | |
2281 | |
2282 For FILE, add COMMENT to list. | |
2283 | |
2284 Lisp structure looks like the following: | |
2285 | |
2286 tumme-file-comment-list: | |
2287 | |
2288 ((\"filename1\" . \"comment1\") | |
2289 (\"filename2\" . \"comment2\") | |
2290 ...)" | |
2291 (if tumme-file-comment-list | |
2292 (if (not (assoc file tumme-file-comment-list)) | |
2293 (setcdr tumme-file-comment-list | |
2294 (cons (cons file comment) | |
2295 (cdr tumme-file-comment-list)))) | |
2296 (setq tumme-file-comment-list (list (cons file comment))))) | |
2297 | |
2298 (defun tumme-create-gallery-lists () | |
2299 "Create temporary lists used by `tumme-gallery-generate'." | |
2300 (let ((buf (find-file tumme-db-file)) | |
2301 end beg file row-tags) | |
2302 (setq tumme-tag-file-list nil) | |
2303 (setq tumme-file-tag-list nil) | |
2304 (setq tumme-file-comment-list nil) | |
2305 (goto-char (point-min)) | |
2306 (while (search-forward-regexp "^." nil t) | |
2307 (end-of-line) | |
2308 (setq end (point)) | |
2309 (beginning-of-line) | |
2310 (setq beg (point)) | |
2311 (if (not (search-forward ";" end nil)) | |
2312 (error "Something is really wrong, check format of database")) | |
2313 (setq row-tags (split-string | |
2314 (buffer-substring beg end) ";")) | |
2315 (setq file (car row-tags)) | |
2316 (mapc | |
2317 (lambda (x) | |
2318 (if (not (string-match "^comment:\\(.*\\)" x)) | |
2319 (tumme-add-to-tag-file-lists x file) | |
2320 (tumme-add-to-file-comment-list file (match-string 1 x)))) | |
2321 (cdr row-tags))) | |
2322 (kill-buffer buf)) | |
2323 ;; Sort tag-file list | |
2324 (setq tumme-tag-file-list | |
2325 (sort tumme-tag-file-list | |
2326 (lambda (x y) | |
2327 (string< (car x) (car y)))))) | |
2328 | |
2329 (defun tumme-hidden-p (file) | |
2330 "Return t if image FILE has a \"hidden\" tag." | |
2331 (let (hidden) | |
2332 (mapc | |
2333 (lambda (tag) | |
2334 (if (member tag tumme-gallery-hidden-tags) | |
2335 (setq hidden t))) | |
2336 (cdr (assoc file tumme-file-tag-list))) | |
2337 hidden)) | |
2338 | |
2339 (defun tumme-gallery-generate () | |
2340 "Generate gallery pages. | |
2341 First we create a couple of Lisp structures from the database to make | |
2342 it easier to generate, then HTML-files are created in | |
2343 `tumme-gallery-dir'" | |
2344 (interactive) | |
2345 (if (eq 'per-directory tumme-thumbnail-storage) | |
2346 (error "Currently, gallery generation is not supported \ | |
2347 when using per-directory thumbnail file storage")) | |
2348 (tumme-create-gallery-lists) | |
2349 (let ((tags tumme-tag-file-list) | |
2350 count curr tag index-buf tag-buf | |
2351 comment file-tags tag-link tag-link-list) | |
2352 ;; Make sure gallery root exist | |
2353 (if (file-exists-p tumme-gallery-dir) | |
2354 (if (not (file-directory-p tumme-gallery-dir)) | |
68757
3c76b1d6eff0
Tried to make docstring less `colloquial'...
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68754
diff
changeset
|
2355 (error "Variable tumme-gallery-dir is not a directory")) |
67302 | 2356 (make-directory tumme-gallery-dir)) |
2357 ;; Open index file | |
2358 (setq index-buf (find-file | |
2359 (format "%s/index.html" tumme-gallery-dir))) | |
2360 (erase-buffer) | |
2361 (insert "<html>\n") | |
2362 (insert " <body>\n") | |
2363 (insert " <h2>Tumme Gallery</h2>\n") | |
2364 (insert (format "<p>\n Gallery generated %s\n <p>\n" | |
2365 (current-time-string))) | |
2366 (insert " <h3>Tag index</h3>\n") | |
2367 (setq count 1) | |
2368 ;; Pre-generate list of all tag links | |
2369 (mapc | |
2370 (lambda (curr) | |
2371 (setq tag (car curr)) | |
2372 (when (not (member tag tumme-gallery-hidden-tags)) | |
2373 (setq tag-link (format "<a href=\"%d.html\">%s</a>" count tag)) | |
2374 (if tag-link-list | |
2375 (setq tag-link-list | |
2376 (append tag-link-list (list (cons tag tag-link)))) | |
2377 (setq tag-link-list (list (cons tag tag-link)))) | |
2378 (setq count (1+ count)))) | |
2379 tags) | |
2380 (setq count 1) | |
2381 ;; Main loop where we generated thumbnail pages per tag | |
2382 (mapc | |
2383 (lambda (curr) | |
2384 (setq tag (car curr)) | |
2385 ;; Don't display hidden tags | |
2386 (when (not (member tag tumme-gallery-hidden-tags)) | |
2387 ;; Insert link to tag page in index | |
2388 (insert (format " %s<br>\n" (cdr (assoc tag tag-link-list)))) | |
2389 ;; Open per-tag file | |
2390 (setq tag-buf (find-file | |
2391 (format "%s/%s.html" tumme-gallery-dir count))) | |
2392 (erase-buffer) | |
2393 (insert "<html>\n") | |
2394 (insert " <body>\n") | |
2395 (insert " <p><a href=\"index.html\">Index</a></p>\n") | |
2396 (insert (format " <h2>Images with tag "%s"</h2>" tag)) | |
2397 ;; Main loop for files per tag page | |
2398 (mapc | |
2399 (lambda (file) | |
2400 (when (not (tumme-hidden-p file)) | |
2401 ;; Insert thumbnail with link to full image | |
2402 (insert | |
2403 (format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n" | |
71780 | 2404 tumme-gallery-image-root-url |
2405 (file-name-nondirectory file) | |
67302 | 2406 tumme-gallery-thumb-image-root-url |
2407 (file-name-nondirectory (tumme-thumb-name file)) file)) | |
2408 ;; Insert comment, if any | |
2409 (if (setq comment (cdr (assoc file tumme-file-comment-list))) | |
2410 (insert (format "<br>\n%s<br>\n" comment)) | |
2411 (insert "<br>\n")) | |
2412 ;; Insert links to other tags, if any | |
2413 (when (> (length | |
2414 (setq file-tags (assoc file tumme-file-tag-list))) 2) | |
2415 (insert "[ ") | |
2416 (mapc | |
2417 (lambda (extra-tag) | |
2418 ;; Only insert if not file name or the main tag | |
2419 (if (and (not (equal extra-tag tag)) | |
2420 (not (equal extra-tag file))) | |
2421 (insert | |
2422 (format "%s " (cdr (assoc extra-tag tag-link-list)))))) | |
2423 file-tags) | |
2424 (insert "]<br>\n")))) | |
2425 (cdr curr)) | |
2426 (insert " <p><a href=\"index.html\">Index</a></p>\n") | |
2427 (insert " </body>\n") | |
2428 (insert "</html>\n") | |
2429 (save-buffer) | |
2430 (kill-buffer tag-buf) | |
2431 (setq count (1+ count)))) | |
2432 tags) | |
2433 (insert " </body>\n") | |
2434 (insert "</html>") | |
2435 (save-buffer) | |
2436 (kill-buffer index-buf))) | |
2437 | |
2438 (defun tumme-kill-buffer-and-window () | |
2439 "Kill the current buffer and, if possible, also the window." | |
2440 (interactive) | |
2441 (let ((buffer (current-buffer))) | |
2442 (condition-case nil | |
2443 (delete-window (selected-window)) | |
2444 (error nil)) | |
2445 (kill-buffer buffer))) | |
2446 | |
72019
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2447 (defvar tumme-widget-list nil |
72093
e75e38c3a62f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72091
diff
changeset
|
2448 "List to keep track of meta data in edit buffer.") |
72019
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2449 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2450 ;;;###autoload |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2451 (defun tumme-dired-edit-comment-and-tags () |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2452 "Edit comment and tags of current or marked image files. |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2453 Edit comment and tags for all marked image files in an |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2454 easy-to-use form." |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2455 (interactive) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2456 (setq tumme-widget-list nil) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2457 ;; Setup buffer. |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2458 (let ((files (dired-get-marked-files))) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2459 (switch-to-buffer "*Tumme Edit Meta Data*") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2460 (kill-all-local-variables) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2461 (make-local-variable 'widget-example-repeat) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2462 (let ((inhibit-read-only t)) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2463 (erase-buffer)) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2464 (remove-overlays) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2465 ;; Some help for the user. |
72093
e75e38c3a62f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72091
diff
changeset
|
2466 (widget-insert |
72019
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2467 "\nEdit comments and tags for each image. Separate multiple tags |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2468 with a comma. Move forward between fields using TAB or RET. |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2469 Move to the previous field using backtab (S-TAB). Save by |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2470 activating the Save button at the bottom of the form or cancel |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2471 the operation by activating the Cancel button.\n\n") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2472 ;; Here comes all images and a comment and tag field for each |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2473 ;; image. |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2474 (let (thumb-file img comment-widget tag-widget) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2475 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2476 (dolist (file files) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2477 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2478 (setq thumb-file (tumme-thumb-name file) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2479 img (create-image thumb-file)) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2480 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2481 (insert-image img) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2482 (widget-insert "\n\nComment: ") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2483 (setq comment-widget |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2484 (widget-create 'editable-field |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2485 :size 60 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2486 :format "%v " |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2487 :value (or (tumme-get-comment file) ""))) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2488 (widget-insert "\nTags: ") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2489 (setq tag-widget |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2490 (widget-create 'editable-field |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2491 :size 60 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2492 :format "%v " |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2493 :value (or (mapconcat |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2494 (lambda (tag) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2495 tag) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2496 (tumme-list-tags file) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2497 ",") ""))) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2498 ;; Save information in all widgets so that we can use it when |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2499 ;; the user saves the form. |
72093
e75e38c3a62f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72091
diff
changeset
|
2500 (setq tumme-widget-list |
e75e38c3a62f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72091
diff
changeset
|
2501 (append tumme-widget-list |
72019
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2502 (list (list file comment-widget tag-widget)))) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2503 (widget-insert "\n\n"))) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2504 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2505 ;; Footer with Save and Cancel button. |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2506 (widget-insert "\n") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2507 (widget-create 'push-button |
72093
e75e38c3a62f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72091
diff
changeset
|
2508 :notify |
72019
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2509 (lambda (&rest ignore) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2510 (tumme-save-information-from-widgets) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2511 (bury-buffer) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2512 (message "Done.")) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2513 "Save") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2514 (widget-insert " ") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2515 (widget-create 'push-button |
72093
e75e38c3a62f
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72091
diff
changeset
|
2516 :notify |
72019
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2517 (lambda (&rest ignore) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2518 (bury-buffer) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2519 (message "Operation canceled.")) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2520 "Cancel") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2521 (widget-insert "\n") |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2522 (use-local-map widget-keymap) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2523 (widget-setup) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2524 ;; Jump to the first widget. |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2525 (widget-forward 1))) |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2526 |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2527 (defun tumme-save-information-from-widgets () |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2528 "Save information found in `tumme-widget-list'. |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2529 Use the information in `tumme-widget-list' to save comments and |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2530 tags to their respective image file. Internal function used by |
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2531 `tumme-dired-edit-comment-and-tags'." |
72089
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2532 (let (file comment tag-string tag-list lst) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2533 (tumme-write-comments |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2534 (mapcar |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2535 (lambda (widget) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2536 (setq file (car widget) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2537 comment (widget-value (cadr widget))) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2538 (cons file comment)) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2539 tumme-widget-list)) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2540 (tumme-write-tags |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2541 (dolist (widget tumme-widget-list lst) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2542 (setq file (car widget) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2543 tag-string (widget-value (car (cddr widget))) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2544 tag-list (split-string tag-string ",")) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2545 (dolist (tag tag-list) |
d2f7e6fe7dbf
(tumme-write-tags): Add.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72087
diff
changeset
|
2546 (push (cons file tag) lst)))))) |
72019
43d3a49f9bd4
(tumme-display-thumbnail-original-image): Make sure
Mathias Dahl <mathias.dahl@gmail.com>
parents:
72017
diff
changeset
|
2547 |
67302 | 2548 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2549 ;;;;;;;;; TEST-SECTION ;;;;;;;;;;; | |
2550 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2551 | |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2552 ;; (defvar tumme-dir-max-size 12300000) |
67302 | 2553 |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2554 ;; (defun tumme-test-clean-old-files () |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2555 ;; "Clean `tumme-dir' from old thumbnail files. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2556 ;; \"Oldness\" measured using last access time. If the total size of all |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2557 ;; thumbnail files in `tumme-dir' is larger than 'tumme-dir-max-size', |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2558 ;; old files are deleted until the max size is reached." |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2559 ;; (let* ((files |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2560 ;; (sort |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2561 ;; (mapcar |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2562 ;; (lambda (f) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2563 ;; (let ((fattribs (file-attributes f))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2564 ;; ;; Get last access time and file size |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2565 ;; `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f))) |
68783
86813076a765
(tumme-dir): Changed default value to "~/.emacs-d/tumme"
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68757
diff
changeset
|
2566 ;; (directory-files (tumme-dir) t ".+\.thumb\..+$")) |
68658
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2567 ;; ;; Sort function. Compare time between two files. |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2568 ;; '(lambda (l1 l2) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2569 ;; (time-less-p (car l1) (car l2))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2570 ;; (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2571 ;; (while (> dirsize tumme-dir-max-size) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2572 ;; (y-or-n-p |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2573 ;; (format "Size of thumbnail directory: %d, delete old file %s? " |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2574 ;; dirsize (cadr (cdar files)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2575 ;; (delete-file (cadr (cdar files))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2576 ;; (setq dirsize (- dirsize (car (cdar files)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2577 ;; (setq files (cdr files))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2578 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2579 ;;;;;;;;;;;;;;;;;;;;;;, |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2580 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2581 ;; (defun dired-speedbar-buttons (dired-buffer) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2582 ;; (when (and (boundp 'tumme-use-speedbar) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2583 ;; tumme-use-speedbar) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2584 ;; (let ((filename (with-current-buffer dired-buffer |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2585 ;; (dired-get-filename)))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2586 ;; (when (and (not (string-equal filename (buffer-string))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2587 ;; (string-match (image-file-name-regexp) filename)) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2588 ;; (erase-buffer) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2589 ;; (insert (propertize |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2590 ;; filename |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2591 ;; 'display |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2592 ;; (tumme-get-thumbnail-image filename))))))) |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2593 |
80719021c770
Some user interface changes: added command `tumme', etc.
Mathias Dahl <mathias.dahl@gmail.com>
parents:
68651
diff
changeset
|
2594 ;; (setq tumme-use-speedbar t) |
67302 | 2595 |
2596 (provide 'tumme) | |
2597 | |
67318 | 2598 ;; arch-tag: 9d11411d-331f-4380-8b44-8adfe3a0343e |
67302 | 2599 ;;; tumme.el ends here |