summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-08-23 15:40:00 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-08-23 15:40:00 +0200
commit8e0aba68c505a43561ca9b63a18ebcc0591ec22e (patch)
tree38adaa38ee4f7f95dd2043efc3751d93f4e14b63
parent67e41d607413d8e95124b1d28b6ae74924e74ab9 (diff)
Deprecate the --collage option (aka collage mode)
It is pretty random and I doubt anyone actually uses it. Also, after removing it, there are only two duplicates of the image index code instead of three...
-rw-r--r--ChangeLog1
-rw-r--r--man/feh.pre18
-rw-r--r--src/collage.c3
-rw-r--r--src/help.raw1
4 files changed, 5 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index bb3e154..ff6f0f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ git HEAD
* Add --draw-tinted options to make overlay text (filename, caption etc.)
better readable
<https://github.com/derf/feh/issues/60>
+ * The --collage option (aka collage mode) is now deprecated
Tue, 16 Aug 2011 22:48:06 +0200 Daniel Friesel <derf@finalrewind.org>
diff --git a/man/feh.pre b/man/feh.pre
index 5e5235d..598231a 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -70,11 +70,6 @@ viewed or saved, and its size can be limited by height, width or both.
.
.Pp
.
-Collage mode is very similar to montage mode, except the images are distributed
-randomly and may overlap each other.
-.
-.Pp
-.
Index mode forms an index print from the filelist. Image thumbnails are shown
along with the filename, filesize and pixel size, printed using a truetype
font of your choice. The resulting image can be viewed or saved, and its size
@@ -168,17 +163,6 @@ and viewing image
the caption will be looked for in
.Qq images/captions/foo.jpg.txt .
.
-.It Cm -c , --collage
-.
-Enable collage mode. Collage mode is very similar to montage mode, except
-the images are distributed randomly.
-When using collage mode, you should also specify
-.Cm --limit-width
-and
-.Cm --limit-height .
-See also
-.Sx MONTAGE MODE OPTIONS .
-.
.It Cm -L , --customlist Ar format
.
Use
@@ -578,7 +562,7 @@ Don't require CTRL+Button for blurring - just use the button.
.
.Sh MONTAGE MODE OPTIONS
.
-These additional options can be used for collage, index, montage and
+These additional options can be used for index, montage and
.Pq partially
thumbnail mode.
.
diff --git a/src/collage.c b/src/collage.c
index 4ea88a9..076aff2 100644
--- a/src/collage.c
+++ b/src/collage.c
@@ -45,6 +45,9 @@ void init_collage_mode(void)
mode = "collage";
+ weprintf("the --collage option (aka collage mode) is deprecated\n"
+ "and will be removed soon\n");
+
/* Use bg image dimensions for default size */
if (opt.bg && opt.bg_file) {
if (!strcmp(opt.bg_file, "trans"))
diff --git a/src/help.raw b/src/help.raw
index bbe5e37..d2bd8ff 100644
--- a/src/help.raw
+++ b/src/help.raw
@@ -51,7 +51,6 @@ OPTIONS
-G, --draw-actions Show the defined actions in the image window
--force-aliasing Disable antialiasing
-m, --montage Enable montage mode
- -c, --collage Montage mode with randomly distributed thumbnails
-i, --index Create an index print of all images
--info CMD Run CMD and show its output in the image window
-t, --thumbnails Show images as clickable thumbnails