Commit 1a2fc6b7 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

No -Q for exif=1, long option and key binding are enough

parent 1ab71d9d

src/help.raw

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ OPTIONS 
 -x, --borderless          Create borderless windows

 -d, --draw-filename       Show the filename in the image window

     --draw-tinted         Show overlay texts on semi-transparent background

 -Q, --draw-exif           Show some Exif information

     --draw-exif           Show some Exif information (if compiled with exif=1)

 -^, --title TITLE         Set window title (see FORMAT SPECIFIERS)

 -D, --slideshow-delay NUM Set delay between automatically changing slides

     --cycle-once          Exit after one loop through the slideshow

src/options.c

+9 −13
Original line number Diff line number Diff line
@@ -301,11 +301,7 @@ static void feh_getopt_theme(int argc, char **argv) 
static void feh_parse_option_array(int argc, char **argv, int finalrun)

{

	static char stropts[] =

#ifdef HAVE_LIBEXIF

		"a:A:b:B:cC:dD:e:E:f:Fg:GhH:iIj:J:kK:lL:mM:nNo:O:pPQqrR:sS:tT:uUvVwW:xXy:YzZ"

#else		

		"a:A:b:B:cC:dD:e:E:f:Fg:GhH:iIj:J:kK:lL:mM:nNo:O:pPqrR:sS:tT:uUvVwW:xXy:YzZ"

#endif

		".@:^:~:):|:+:";



	/* (*name, has_arg, *flag, val) See: struct option in getopts.h */
@@ -333,9 +329,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
		{"auto-zoom"     , 0, 0, 'Z'},

		{"ignore-aspect" , 0, 0, 'X'},

		{"draw-filename" , 0, 0, 'd'},

#ifdef HAVE_LIBEXIF

		{"draw-exif"     , 0, 0, 'Q'},

#endif

		{"preload"       , 0, 0, 'p'},

		{"reverse"       , 0, 0, 'n'},

		{"thumbnails"    , 0, 0, 't'},
@@ -347,6 +340,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
		{"cycle-once"    , 0, 0, 224},

		{"no-xinerama"   , 0, 0, 225},

		{"draw-tinted"   , 0, 0, 229},

#ifdef HAVE_LIBEXIF

		{"draw-exif"     , 0, 0, 223},

#endif



		{"output"        , 1, 0, 'o'},

		{"output-only"   , 1, 0, 'O'},
@@ -483,11 +479,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
		case 'd':

			opt.draw_filename = 1;

			break;

#ifdef HAVE_LIBEXIF

		case 'Q':

			opt.draw_exif = 1;

			break;

#endif

		case 'F':

			opt.full_screen = 1;

			break;
@@ -697,6 +688,11 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
		case 'P':

			opt.cache_thumbnails = 1;

			break;

#ifdef HAVE_LIBEXIF

		case 223:

			opt.draw_exif = 1;

			break;

#endif

		case 224:

			opt.cycle_once = 1;

			break;