Use more standard icons

- Replace ui_tabcomp.png with go-last named icon,
  fixing gdk_pixbuf_new_from_inline deprecate warning
- Replace gq-icon-rotate-counter-clockwise.png with object-rotate-left named icon
- Replace gq-icon-rotate-clockwise.png with object-rotate-right named icon
- Replace gq-icon-filp.png with object-flip-vertical named icon
- Replace gq-icon-mirror.png with object-flip-horizontal named icon
- Replace gq-icon-info.png with document-properties named icon
- Use recommended pan-{down,up}-symbolic named icons

diff --git a/.gitignore b/.gitignore
index 34bfc0a..eab6477 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -48,10 +48,6 @@ Makefile.in
 # /src/
 /src/.deps
 /src/geeqie
-/src/ui_icons.h
-
-# /src/icons/
-/src/icons/icons_inline.h
 
 # /src/pan-view/
 /src/pan-view/.deps

diff --git a/meson.build b/meson.build
index 8dc761f..40de5d9 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -48,7 +48,7 @@ project(
     default_options : ['cpp_std=c++14', 'warning_level=3', 'buildtype=debugoptimized', 'cpp_link_args=-rdynamic']
 )
 
-# To inhibit warnings from the generated files icons_inline.h and ui_icons.h
+# To inhibit warnings from the generated file icons.h
 add_global_arguments('-Wno-overlength-strings', language : 'c')
 
 # To compile originally-C files as C++

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

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

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

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

diff --git a/src/icons/gq-icon-rotate-counter-clockwise.png b/src/icons/gq-icon-rotate-counter-clockwise.png
deleted file mode 100644 (file)
index 123a5bc..0000000
Binary files a/src/icons/gq-icon-rotate-counter-clockwise.png and /dev/null differ

diff --git a/src/icons/icons.gresource.xml b/src/icons/icons.gresource.xml
index 4d63e4f..d8a734c 100644 (file)
--- a/src/icons/icons.gresource.xml
+++ b/src/icons/icons.gresource.xml
@@ -32,23 +32,18 @@
     <file>gq-icon-exif.png</file>
     <file>gq-icon-exposure.png</file>
     <file>gq-icon-file-filter.png</file>
-    <file>gq-icon-flip.png</file>
     <file>gq-icon-float.png</file>
     <file>gq-icon-grayscale.png</file>
     <file>gq-icon-heic.png</file>
     <file>gq-icon-hidetools.png</file>
-    <file>gq-icon-info.png</file>
     <file>gq-icon-maintenance.png</file>
     <file>gq-icon-marks.png</file>
-    <file>gq-icon-mirror.png</file>
     <file>gq-icon-move.png</file>
     <file>gq-icon-original.png</file>
     <file>gq-icon-panorama.png</file>
     <file>gq-icon-pdf.png</file>
     <file>gq-icon-rename.png</file>
     <file>gq-icon-rotate-180.png</file>
-    <file>gq-icon-rotate-clockwise.png</file>
-    <file>gq-icon-rotate-counter-clockwise.png</file>
     <file>gq-icon-select-all.png</file>
     <file>gq-icon-select-invert.png</file>
     <file>gq-icon-select-none.png</file>

diff --git a/src/layout-util.cc b/src/layout-util.cc
index dc0e699..5ad4994 100644 (file)
--- a/src/layout-util.cc
+++ b/src/layout-util.cc
@@ -2604,11 +2604,11 @@ static GtkActionEntry menu_entries[] = {
   { "Rating4",         nullptr,                        N_("_Rating 4"),        "<alt>KP_4",    N_("Rating 4"),                 CB(layout_menu_rating_4_cb) },
   { "Rating5",         nullptr,                        N_("_Rating 5"),        "<alt>KP_5",    N_("Rating 5"),                 CB(layout_menu_rating_5_cb) },
   { "RatingM1",                nullptr,                        N_("_Rating -1"),       "<alt>KP_Subtract",     N_("Rating -1"),        CB(layout_menu_rating_m1_cb) },
-  { "RotateCW",                PIXBUF_INLINE_ICON_CW,                  N_("_Rotate clockwise 90°"),           "bracketright",         N_("Image Rotate clockwise 90°"),                      CB(layout_menu_alter_90_cb) },
-  { "RotateCCW",       PIXBUF_INLINE_ICON_CCW, N_("Rotate _counterclockwise 90°"),            "bracketleft",          N_("Rotate counterclockwise 90°"),             CB(layout_menu_alter_90cc_cb) },
+  { "RotateCW",                GQ_ICON_ROTATE_RIGHT,                   N_("_Rotate clockwise 90°"),           "bracketright",         N_("Image Rotate clockwise 90°"),                      CB(layout_menu_alter_90_cb) },
+  { "RotateCCW",       GQ_ICON_ROTATE_LEFT,    N_("Rotate _counterclockwise 90°"),            "bracketleft",          N_("Rotate counterclockwise 90°"),             CB(layout_menu_alter_90cc_cb) },
   { "Rotate180",       PIXBUF_INLINE_ICON_180, N_("Rotate 1_80°"),    "<shift>R",             N_("Image Rotate 180°"),                       CB(layout_menu_alter_180_cb) },
-  { "Mirror",          PIXBUF_INLINE_ICON_MIRROR,      N_("_Mirror"),  "<shift>M",             N_("Image Mirror"),                             CB(layout_menu_alter_mirror_cb) },
-  { "Flip",            PIXBUF_INLINE_ICON_FLIP,        N_("_Flip"),    "<shift>F",             N_("Image Flip"),                               CB(layout_menu_alter_flip_cb) },
+  { "Mirror",          GQ_ICON_FLIP_HORIZONTAL,        N_("_Mirror"),  "<shift>M",             N_("Image Mirror"),                             CB(layout_menu_alter_mirror_cb) },
+  { "Flip",            GQ_ICON_FLIP_VERTICAL,          N_("_Flip"),    "<shift>F",             N_("Image Flip"),                               CB(layout_menu_alter_flip_cb) },
   { "AlterNone",       PIXBUF_INLINE_ICON_ORIGINAL,    N_("_Original state"),  "<shift>O",             N_("Image rotate Original state"),                      CB(layout_menu_alter_none_cb) },
   { "Preferences",     GQ_ICON_PREFERENCES,    N_("P_references..."),                  "<control>O",           N_("Preferences..."),                   CB(layout_menu_config_cb) },
   { "Plugins",         GQ_ICON_PREFERENCES,    N_("Configure _Plugins..."),            nullptr,                        N_("Configure Plugins..."),             CB(layout_menu_editors_cb) },
@@ -2692,7 +2692,7 @@ static GtkToggleActionEntry menu_toggle_entries[] = {
   { "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  },
   { "HideToolbar",     nullptr,                        N_("Hide tool_bar"),                    nullptr,                        N_("Hide toolbar"),                     CB(layout_menu_toolbar_cb),      FALSE  },
-  { "SBar",    PIXBUF_INLINE_ICON_INFO,        N_("_Info sidebar"),                    "<control>K",           N_("Info sidebar"),                     CB(layout_menu_bar_cb),          FALSE  },
+  { "SBar",    GQ_ICON_PROPERTIES,                     N_("_Info sidebar"),                    "<control>K",           N_("Info sidebar"),                     CB(layout_menu_bar_cb),          FALSE  },
   { "SBarSort",        PIXBUF_INLINE_ICON_SORT,        N_("Sort _manager"),                    "<shift>S",             N_("Sort manager"),                     CB(layout_menu_bar_sort_cb),     FALSE  },
   { "HideBars",                nullptr,                        N_("Hide Bars"),                        "grave",                N_("Hide Bars"),                        CB(layout_menu_hide_bars_cb),    FALSE  },
   { "SlideShow",       GQ_ICON_PLAY,   N_("Toggle _slideshow"),                "S",                    N_("Toggle slideshow"),                 CB(layout_menu_slideshow_cb),    FALSE  },
@@ -2703,7 +2703,7 @@ static GtkToggleActionEntry menu_toggle_entries[] = {
   { "ImageHistogram",  nullptr,                        N_("_Show Histogram"),                  nullptr,                        N_("Show Histogram"),                   CB(layout_menu_histogram_cb),    FALSE },
   { "RectangularSelection",    PIXBUF_INLINE_ICON_SELECT_RECTANGLE,    N_("Rectangular Selection"),                    "<alt>R",                       N_("Rectangular Selection"),                    CB(layout_menu_rectangular_selection_cb),        FALSE },
   { "Animate", nullptr,        N_("_Animation"),               "A",                    N_("Toggle animation"),                 CB(layout_menu_animate_cb),      FALSE  },
-  { "ExifRotate",      GQ_ICON_ROTATE,                 N_("_Exif rotate"),             "<alt>X",               N_("Toggle Exif rotate"),                       CB(layout_menu_exif_rotate_cb), FALSE },
+  { "ExifRotate",      GQ_ICON_ROTATE_LEFT,    N_("_Exif rotate"),             "<alt>X",               N_("Toggle Exif rotate"),                       CB(layout_menu_exif_rotate_cb), FALSE },
   { "DrawRectangle",   PIXBUF_INLINE_ICON_DRAW_RECTANGLE,                      N_("Draw Rectangle"),           nullptr,                N_("Draw Rectangle"),                   CB(layout_menu_select_rectangle_cb), FALSE },
   { "OverUnderExposed",        PIXBUF_INLINE_ICON_EXPOSURE,    N_("Over/Under Exposed"),       "<shift>E",             N_("Highlight over/under exposed"),             CB(layout_menu_select_overunderexposed_cb), FALSE },
   { "SplitPaneSync",   PIXBUF_INLINE_SPLIT_PANE_SYNC,                  N_("Split Pane Sync"),  nullptr,                N_("Split Pane Sync"),  CB(layout_menu_split_pane_sync_cb), FALSE },

diff --git a/src/main.h b/src/main.h
index 81a1fa6..93287a3 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -168,8 +168,6 @@
 #define GQ_ICON_GO_NEXT "go-next"
 #define GQ_ICON_GO_JUMP "go-jump"
 #define GQ_ICON_HOME "go-home"
-#define GQ_ICON_PAN_DOWN "pan-down"
-#define GQ_ICON_PAN_UP "pan-up"
 
 #define GQ_ICON_PREV_PAGE "media-skip-backward"
 #define GQ_ICON_NEXT_PAGE "media-skip-forward"
@@ -189,11 +187,12 @@
 #define GQ_ICON_HELP "help-contents" // "help-browser"?
 #define GQ_ICON_EXPORT "document-export" // use collection icon?
 
-// not available in some themes?
+// not available in some themes
 #define GQ_ICON_OK "emblem-ok"
 #define GQ_ICON_APPLY "emblem-ok" // need something else?
 #define GQ_ICON_CANCEL "dialog-cancel" // missing in adwaita and others, seen in breeze
-#define GQ_ICON_CALENDAR "office-calendar"
+#define GQ_ICON_PAN_DOWN "pan-down-symbolic" // adwaita, breeze, hicolor supports this
+#define GQ_ICON_PAN_UP "pan-up-symbolic" // adwaita, breeze, hicolor supports this
 
 #define GQ_ICON_DIALOG_ERROR "dialog-error"
 #define GQ_ICON_DIALOG_INFO "dialog-information"
@@ -204,7 +203,11 @@
 #define GQ_ICON_LINK "emblem-symbolic-link"
 #define GQ_ICON_READONLY "emblem-readonly"
 
-#define GQ_ICON_ROTATE "object-rotate-left"
+#define GQ_ICON_FLIP_HORIZONTAL "object-flip-horizontal"
+#define GQ_ICON_FLIP_VERTICAL "object-flip-vertical"
+#define GQ_ICON_ROTATE_LEFT "object-rotate-left"
+#define GQ_ICON_ROTATE_RIGHT "object-rotate-right"
+
 #define GQ_ICON_DIRECTORY "folder"
 #define GQ_ICON_MISSING_IMAGE "image-missing"
 #define GQ_ICON_STRIKETHROUGH "format-text-strikethrough"

diff --git a/src/meson.build b/src/meson.build
index 78e39c4..3fecfb7 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -253,16 +253,6 @@ gq_marshal_pragma = custom_target('gq-marshal-pragma',
 
 project_sources += gq_marshal_pragma
 
-icon_pairs = [
-'icon_tabcomp', files('ui_tabcomp.png'),
-]
-
-ui_icons_h = custom_target('ui_icons', output : 'ui_icons.h',
-                command : [gdk_pixbuf_csource, '--raw', '--extern', '--build-list', icon_pairs],
-                capture : true)
-
-project_sources += ui_icons_h
-
 if conf_data.has('HAVE_LCMS')
     xxd_sh = find_program('generate-ClayRGB1998-icc-h.sh', dirs : join_paths(meson.project_source_root(), 'scripts'))
 

diff --git a/src/pixbuf-util.cc b/src/pixbuf-util.cc
index c88b7fc..10501ed 100644 (file)
--- a/src/pixbuf-util.cc
+++ b/src/pixbuf-util.cc
@@ -108,22 +108,17 @@ static PixbufInline inline_pixbuf_data[] = {
        { PIXBUF_INLINE_ICON,   "gqview-icon.png" },
        { PIXBUF_INLINE_ICON_180,       "gq-icon-rotate-180.png" },
        { PIXBUF_INLINE_ICON_BOOK,      "gq-icon-book.png" },
-       { PIXBUF_INLINE_ICON_CCW,       "gq-icon-rotate-counter-clockwise.png" },
        { PIXBUF_INLINE_ICON_CONFIG,    "gq-icon-config.png" },
-       { PIXBUF_INLINE_ICON_CW,        "gq-icon-rotate-clockwise.png" },
        { 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_FLIP,      "gq-icon-flip.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" },
        { PIXBUF_INLINE_ICON_HIDETOOLS,         "gq-icon-hidetools.png" },
-       { PIXBUF_INLINE_ICON_INFO,      "gq-icon-info.png" },
        { PIXBUF_INLINE_ICON_MAINTENANCE,       "gq-icon-maintenance.png" },
        { PIXBUF_INLINE_ICON_MARKS,     "gq-icon-marks.png" },
-       { PIXBUF_INLINE_ICON_MIRROR,    "gq-icon-mirror.png" },
        { PIXBUF_INLINE_ICON_MOVE,      "gq-icon-move.png" },
        { PIXBUF_INLINE_ICON_ORIGINAL,  "gq-icon-original.png" },
        { PIXBUF_INLINE_ICON_PANORAMA,  "gq-icon-panorama.png" },

diff --git a/src/pixbuf-util.h b/src/pixbuf-util.h
index 62438ce..74eb252 100644 (file)
--- a/src/pixbuf-util.h
+++ b/src/pixbuf-util.h
@@ -39,22 +39,17 @@ gboolean pixbuf_scale_aspect(gint req_w, gint req_h, gint old_w, gint old_h, gin
 #define PIXBUF_INLINE_ICON             "gqview-icon"
 #define PIXBUF_INLINE_ICON_180 "gq-icon-rotate-180"
 #define PIXBUF_INLINE_ICON_BOOK                "gq-icon-book"
-#define PIXBUF_INLINE_ICON_CCW "gq-icon-rotate-counter-clockwise"
 #define PIXBUF_INLINE_ICON_CONFIG      "gq-icon-config"
-#define PIXBUF_INLINE_ICON_CW  "gq-icon-rotate-clockwise"
 #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_FLIP                "gq-icon-flip"
 #define PIXBUF_INLINE_ICON_FLOAT       "gq-icon-float"
 #define PIXBUF_INLINE_ICON_GRAYSCALE   "gq-icon-grayscale"
 #define PIXBUF_INLINE_ICON_HEIF                "gq-icon-heic"
 #define PIXBUF_INLINE_ICON_HIDETOOLS   "gq-icon-hidetools"
-#define PIXBUF_INLINE_ICON_INFO                "gq-icon-info"
 #define PIXBUF_INLINE_ICON_MAINTENANCE "gq-icon-maintenance"
 #define PIXBUF_INLINE_ICON_MARKS       "gq-icon-marks"
-#define PIXBUF_INLINE_ICON_MIRROR      "gq-icon-mirror"
 #define PIXBUF_INLINE_ICON_MOVE                "gq-icon-move"
 #define PIXBUF_INLINE_ICON_ORIGINAL    "gq-icon-original"
 #define PIXBUF_INLINE_ICON_PANORAMA            "gq-icon-panorama"

diff --git a/src/ui-misc.cc b/src/ui-misc.cc
index 2170483..f5ed0a4 100644 (file)
--- a/src/ui-misc.cc
+++ b/src/ui-misc.cc
@@ -1034,7 +1034,7 @@ GtkWidget *date_selection_new()
        g_signal_connect(G_OBJECT(ds->button), "size_allocate",
                         G_CALLBACK(button_size_allocate_cb), ds->spin_y);
 
-       icon = gtk_image_new_from_icon_name(GQ_ICON_CALENDAR, GTK_ICON_SIZE_BUTTON);
+       icon = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON);
        gtk_container_add(GTK_CONTAINER(ds->button), icon);
        gtk_widget_show(icon);
 

diff --git a/src/ui-tabcomp.cc b/src/ui-tabcomp.cc
index dd3588f..5c470bc 100644 (file)
--- a/src/ui-tabcomp.cc
+++ b/src/ui-tabcomp.cc
@@ -29,7 +29,6 @@
 #include "history-list.h"
 #include "misc.h"      /* expand_tilde() */
 #include "ui-fileops.h"
-#include "ui_icons.h"
 #include "ui-utildlg.h"
 
 /* define this to enable a pop-up menu that shows possible matches
@@ -598,23 +597,14 @@ static void tab_completion_button_size_allocate(GtkWidget *button, GtkAllocation
 static GtkWidget *tab_completion_create_complete_button(GtkWidget *entry, GtkWidget *parent)
 {
        GtkWidget *button;
-       GtkWidget *icon;
-       GdkPixbuf *pixbuf;
 
-       button = gtk_button_new();
+       button = gtk_button_new_from_icon_name(GQ_ICON_GO_LAST, GTK_ICON_SIZE_BUTTON);
        gtk_widget_set_can_focus(button, FALSE);
        g_signal_connect(G_OBJECT(button), "size_allocate",
                         G_CALLBACK(tab_completion_button_size_allocate), parent);
        g_signal_connect(G_OBJECT(button), "clicked",
                         G_CALLBACK(tab_completion_button_pressed), entry);
 
-       pixbuf = gdk_pixbuf_new_from_inline(-1, icon_tabcomp, FALSE, nullptr);
-       icon = gtk_image_new_from_pixbuf(pixbuf);
-       g_object_unref(pixbuf);
-
-       gtk_container_add(GTK_CONTAINER(button), icon);
-       gtk_widget_show(icon);
-
        return button;
 }
 

diff --git a/src/ui_tabcomp.png b/src/ui_tabcomp.png
deleted file mode 100644 (file)
index c17beaa..0000000
Binary files a/src/ui_tabcomp.png and /dev/null differ