Replace file filter icon with a standard icon

This icon is not particularly appropriate, but it is better than the
hand-made one.

diff --git a/src/icons/gq-icon-file-filter.png b/src/icons/gq-icon-file-filter.png
deleted file mode 100644 (file)
index 321c7cc..0000000
Binary files a/src/icons/gq-icon-file-filter.png and /dev/null differ

diff --git a/src/icons/icons.gresource.xml b/src/icons/icons.gresource.xml
index d8a734c..5eda519 100644 (file)
--- a/src/icons/icons.gresource.xml
+++ b/src/icons/icons.gresource.xml
@@ -31,7 +31,6 @@
     <file>gq-icon-draw-rectangle.png</file>
     <file>gq-icon-exif.png</file>
     <file>gq-icon-exposure.png</file>
-    <file>gq-icon-file-filter.png</file>
     <file>gq-icon-float.png</file>
     <file>gq-icon-grayscale.png</file>
     <file>gq-icon-heic.png</file>

diff --git a/src/layout-util.cc b/src/layout-util.cc
index 5afa757..97caa3a 100644 (file)
--- a/src/layout-util.cc
+++ b/src/layout-util.cc
@@ -2687,7 +2687,7 @@ static GtkActionEntry menu_entries[] = {
 static GtkToggleActionEntry menu_toggle_entries[] = {
   { "Thumbnails",      PIXBUF_INLINE_ICON_THUMB,N_("Show _Thumbnails"),                "T",                    N_("Show Thumbnails"),                  CB(layout_menu_thumb_cb),        FALSE },
   { "ShowMarks",        PIXBUF_INLINE_ICON_MARKS,      N_("Show _Marks"),                      "M",                    N_("Show Marks"),                       CB(layout_menu_marks_cb),        FALSE  },
-  { "ShowFileFilter", PIXBUF_INLINE_ICON_FILE_FILTER,  N_("Show File Filter"), nullptr,        N_("Show File Filter"), CB(layout_menu_file_filter_cb),  FALSE  },
+  { "ShowFileFilter", GQ_ICON_FILE_FILTER,     N_("Show File Filter"), nullptr,        N_("Show File Filter"), CB(layout_menu_file_filter_cb),  FALSE  },
   { "ShowInfoPixel",   GQ_ICON_SELECT_COLOR,   N_("Pi_xel Info"),                      nullptr,                        N_("Show Pixel Info"),                  CB(layout_menu_info_pixel_cb),   FALSE  },
   { "IgnoreAlpha", GQ_ICON_STRIKETHROUGH,           N_("Hide _alpha"),          "<shift>A",     N_("Hide alpha channel"),       CB(layout_menu_alter_ignore_alpha_cb), FALSE},
   { "FloatTools",      PIXBUF_INLINE_ICON_FLOAT,N_("_Float file list"),                "L",                    N_("Float file list"),                  CB(layout_menu_float_cb),        FALSE  },

diff --git a/src/main.h b/src/main.h
index 93287a3..ccf7a7c 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -157,6 +157,7 @@
 #define GQ_ICON_FIND "edit-find"
 #define GQ_ICON_REPLACE "edit-find-replace"
 #define GQ_ICON_PRINT "document-print"
+#define GQ_ICON_FILE_FILTER "preview-file"
 
 #define GQ_ICON_GO_TOP "go-top"
 #define GQ_ICON_GO_BOTTOM "go-bottom"

diff --git a/src/pixbuf-util.cc b/src/pixbuf-util.cc
index 6ba1e28..64a8525 100644 (file)
--- a/src/pixbuf-util.cc
+++ b/src/pixbuf-util.cc
@@ -114,7 +114,6 @@ static PixbufInline inline_pixbuf_data[] = {
        { PIXBUF_INLINE_ICON_DRAW_RECTANGLE,    "gq-icon-draw-rectangle.png" },
        { PIXBUF_INLINE_ICON_EXIF,      "gq-icon-exif.png" },
        { PIXBUF_INLINE_ICON_EXPOSURE,  "gq-icon-exposure.png" },
-       { PIXBUF_INLINE_ICON_FILE_FILTER,       "gq-icon-file-filter.png" },
        { PIXBUF_INLINE_ICON_FLOAT,     "gq-icon-float.png" },
        { PIXBUF_INLINE_ICON_GRAYSCALE, "gq-icon-grayscale.png" },
        { PIXBUF_INLINE_ICON_HEIF,      "gq-icon-heic.png" },

diff --git a/src/pixbuf-util.h b/src/pixbuf-util.h
index da8a4c3..54af971 100644 (file)
--- a/src/pixbuf-util.h
+++ b/src/pixbuf-util.h
@@ -44,7 +44,6 @@ gboolean pixbuf_scale_aspect(gint req_w, gint req_h, gint old_w, gint old_h, gin
 #define PIXBUF_INLINE_ICON_DRAW_RECTANGLE      "gq-icon-draw-rectangle"
 #define PIXBUF_INLINE_ICON_EXIF                "gq-icon-exif"
 #define PIXBUF_INLINE_ICON_EXPOSURE            "gq-icon-exposure"
-#define PIXBUF_INLINE_ICON_FILE_FILTER "gq-icon-file-filter"
 #define PIXBUF_INLINE_ICON_FLOAT       "gq-icon-float"
 #define PIXBUF_INLINE_ICON_GRAYSCALE   "gq-icon-grayscale"
 #define PIXBUF_INLINE_ICON_HEIF                "gq-icon-heic"