Include grayscale as a toolbar item

diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index d859b60..e7a3f36 100644 (file)
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -48,7 +48,8 @@ ICONS_INLINE = \
        icon_flip.png \
        icon_original.png \
        icon_trash.png \
-       icon_heic.png
+       icon_heic.png \
+       icon_grayscale.png
 
 ICONS_INLINE_PAIRS = \
        folder_closed           $(srcdir)/folder_closed.png     \
@@ -95,7 +96,8 @@ ICONS_INLINE_PAIRS = \
        icon_flip       $(srcdir)/icon_flip.png \
        icon_original   $(srcdir)/icon_original.png \
        icon_trash      $(srcdir)/icon_trash.png \
-       icon_heic       $(srcdir)/icon_heic.png
+       icon_heic       $(srcdir)/icon_heic.png \
+       icon_grayscale  $(srcdir)/icon_grayscale.png
 
 icons_inline.h: $(ICONS_INLINE) Makefile.in
        @sh -ec "echo '/* Auto generated file, do not edit */'; echo; \

diff --git a/src/layout_util.c b/src/layout_util.c
index 5fd058c..70e27e5 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -2012,7 +2012,7 @@ static GtkToggleActionEntry menu_toggle_entries[] = {
   { "SlideShow",       GTK_STOCK_MEDIA_PLAY,   N_("Toggle _slideshow"),                "S",                    N_("Toggle slideshow"),                 CB(layout_menu_slideshow_cb),    FALSE  },
   { "UseColorProfiles",        GTK_STOCK_SELECT_COLOR, N_("Use _color profiles"),              NULL,                   N_("Use color profiles"),               CB(layout_color_menu_enable_cb), FALSE},
   { "UseImageProfile", NULL,                   N_("Use profile from _image"),          NULL,                   N_("Use profile from image"),           CB(layout_color_menu_use_image_cb), FALSE},
-  { "Grayscale",       NULL,                   N_("Toggle _grayscale"),                "<shift>G",             N_("Toggle grayscale"),                 CB(layout_menu_alter_desaturate_cb), FALSE},
+  { "Grayscale",       PIXBUF_INLINE_ICON_GRAYSCALE,   N_("Toggle _grayscale"),        "<shift>G",             N_("Toggle grayscale"),         CB(layout_menu_alter_desaturate_cb), FALSE},
   { "ImageOverlay",    NULL,                   N_("Image _Overlay"),                   NULL,                   N_("Image Overlay"),                    CB(layout_menu_overlay_cb),      FALSE },
   { "ImageHistogram",  NULL,                   N_("_Show Histogram"),                  NULL,                   N_("Show Histogram"),                   CB(layout_menu_histogram_cb),    FALSE },
   { "ImageGuidelines", PIXBUF_INLINE_ICON_GUIDELINES,          N_("_Show Guidelines"),                 NULL,           N_("Show Guidelines"),                  CB(layout_menu_guidelines_cb),   FALSE },

diff --git a/src/pixbuf_util.c b/src/pixbuf_util.c
index 696b8f9..d758c3e 100644 (file)
--- a/src/pixbuf_util.c
+++ b/src/pixbuf_util.c
@@ -147,6 +147,7 @@ static PixbufInline inline_pixbuf_data[] = {
        { PIXBUF_INLINE_ICON_ORIGINAL,  icon_original },
        { PIXBUF_INLINE_ICON_TRASH,     icon_trash },
        { PIXBUF_INLINE_ICON_HEIF,      icon_heic },
+       { PIXBUF_INLINE_ICON_GRAYSCALE, icon_grayscale },
        { NULL, NULL }
 };
 

diff --git a/src/pixbuf_util.h b/src/pixbuf_util.h
index 901d406..e3142ed 100644 (file)
--- a/src/pixbuf_util.h
+++ b/src/pixbuf_util.h
@@ -75,6 +75,7 @@ gboolean pixbuf_scale_aspect(gint req_w, gint req_h, gint old_w, gint old_h, gin
 #define PIXBUF_INLINE_ICON_FILE_FILTER "icon_file_filter"
 #define PIXBUF_INLINE_ICON_TRASH       "icon_trash"
 #define PIXBUF_INLINE_ICON_HEIF        "icon_heic"
+#define PIXBUF_INLINE_ICON_GRAYSCALE   "icon_grayscale"
 
 #define PIXBUF_INLINE_ICON_CW  "icon_rotate_clockwise"
 #define PIXBUF_INLINE_ICON_CCW "icon_rotate_counter_clockwise"

diff --git a/src/toolbar.c b/src/toolbar.c
index 7325f65..93cc581 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -119,6 +119,7 @@ static const UseableToolbarItems useable_toolbar_items[] = {
        {"Zoom33",      N_("Zoom1:3"), GTK_STOCK_FILE},
        {"Zoom25",      N_("Zoom 1:4"), GTK_STOCK_FILE},
        {"ConnectZoomIn",       N_("Connected Zoom in"), GTK_STOCK_ZOOM_IN},
+       {"Grayscale",   N_("Grayscale"), PIXBUF_INLINE_ICON_GRAYSCALE},
        {"HideTools",   N_("Hide file list"), PIXBUF_INLINE_ICON_HIDETOOLS},
        {"SlideShowPause",      N_("Pause slideshow"), GTK_STOCK_MEDIA_PAUSE},
        {"SlideShowFaster",     N_("Slideshow Faster"), GTK_STOCK_FILE},