Commit 8e0aba68 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

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...
parent 67e41d60

ChangeLog

+1 −0
Original line number Diff line number Diff line
@@ -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>

man/feh.pre

+1 −17
Original line number Diff line number Diff line
@@ -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.

.

src/collage.c

+3 −0
Original line number Diff line number Diff line
@@ -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"))

src/help.raw

+0 −1
Original line number Diff line number Diff line
@@ -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