From: Colin Clark Date: Tue, 19 Sep 2023 15:02:35 +0000 (+0100) Subject: Simplify some icons X-Git-Tag: v2.2~96 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=694a9572d3da4e56b3f4c34f301bf52f8ec7c5ab Simplify some icons --- diff --git a/scripts/modify-downloaded-icons.sh b/scripts/modify-downloaded-icons.sh index f1b7cbc0..cad72cb8 100755 --- a/scripts/modify-downloaded-icons.sh +++ b/scripts/modify-downloaded-icons.sh @@ -27,14 +27,12 @@ ## ## - input_array=" arrows.png gq-icon-zoomfillhor https://www.flaticon.com/free-icon/arrows_9847398 black-and-white.png gq-icon-grayscale https://www.flaticon.com/free-icon/black-and-white_3099713 bookmark.png gq-icon-marks https://www.flaticon.com/free-icon/bookmark_2099170 checkbox.png gq-icon-select-invert https://www.flaticon.com/free-icon/checkbox_6948194 -database-management.png gq-icon-maintenance https://www.flaticon.com/free-icon/database-management_9292424 -data-synchronization.png gq-icon-split-pane-sync https://www.flaticon.com/free-icon/data-synchronization_4882652 +database.png gq-icon-maintenance https://www.flaticon.com/free-icon/replace_10337081 double-arrow-vertical-symbol.png gq-icon-zoomfillvert https://www.flaticon.com/free-icon/double-arrow-vertical-symbol_54668 edit.png gq-icon-rename https://www.flaticon.com/free-icon/edit_1159633 error.png gq-icon-broken https://www.flaticon.com/free-icon/error_3152157 @@ -42,11 +40,14 @@ exif.png gq-icon-exif https://www.flaticon.com/free-icon/exif_6393981 exposure.png gq-icon-exposure https://www.flaticon.com/free-icon/exposure_2214025 frame.png gq-icon-select-rectangle https://www.flaticon.com/free-icon/frame_4864813 heic.png gq-icon-heic https://www.flaticon.com/free-icon/heic_6393991 +letter-i.png gq-icon-properties https://www.flaticon.com/free-icon/letter-i_9003911 +letter-s.png gq-icon-sort https://www.flaticon.com/free-icon/letter-s_5697524 move-right.png gq-icon-move https://www.flaticon.com/free-icon/move-right_10515829 panorama.png gq-icon-panorama https://www.flaticon.com/free-icon/panorama_8207268 paper-pin.png gq-icon-float https://www.flaticon.com/free-icon/paper-pin_3378283 paper.png gq-icon-hidetools https://www.flaticon.com/free-icon/paper_11028332 pdf.png gq-icon-pdf https://www.flaticon.com/free-icon/pdf_201153 +replace.png gq-icon-split-pane-sync https://www.flaticon.com/free-icon/replace_10337081 restore-down.png gq-icon-select-none https://www.flaticon.com/free-icon/restore-down_4903563 rotate.png gq-icon-original https://www.flaticon.com/free-icon/rotate_764623 select.png gq-icon-select-all https://www.flaticon.com/free-icon/select_7043937 @@ -56,7 +57,6 @@ transform.png gq-icon-draw-rectangle https://www.flaticon.com/free-icon/rectangl two-clockwise-circular-rotating-arrows-circle.png gq-icon-rotate-180 https://www.flaticon.com/free-icon/two-clockwise-circular-rotating-arrows-circle_54529 unknown.png gq-icon-unknown https://www.flaticon.com/free-icon/unknown_9166172 video.png gq-icon-video https://www.flaticon.com/free-icon/video_10260807 -workflow.png gq-icon-sort https://www.flaticon.com/free-icon/workflow_3748469 xmp.png gq-icon-metadata https://www.flaticon.com/free-icon/xmp_10260892 zip.png gq-icon-archive-file https://www.flaticon.com/free-icon/zip_201199 " diff --git a/src/icons/gq-icon-maintenance-dark.png b/src/icons/gq-icon-maintenance-dark.png index 427b9a8c..4d4b1b26 100644 Binary files a/src/icons/gq-icon-maintenance-dark.png and b/src/icons/gq-icon-maintenance-dark.png differ diff --git a/src/icons/gq-icon-maintenance.png b/src/icons/gq-icon-maintenance.png index 20881bd7..def1304a 100644 Binary files a/src/icons/gq-icon-maintenance.png and b/src/icons/gq-icon-maintenance.png differ diff --git a/src/icons/gq-icon-properties-dark.png b/src/icons/gq-icon-properties-dark.png new file mode 100644 index 00000000..4670bea4 Binary files /dev/null and b/src/icons/gq-icon-properties-dark.png differ diff --git a/src/icons/gq-icon-properties.png b/src/icons/gq-icon-properties.png new file mode 100644 index 00000000..7b1dd896 Binary files /dev/null and b/src/icons/gq-icon-properties.png differ diff --git a/src/icons/gq-icon-sort-dark.png b/src/icons/gq-icon-sort-dark.png index 08b27a2e..8f4e89f2 100644 Binary files a/src/icons/gq-icon-sort-dark.png and b/src/icons/gq-icon-sort-dark.png differ diff --git a/src/icons/gq-icon-sort.png b/src/icons/gq-icon-sort.png index 04cb6c91..7d422dc8 100644 Binary files a/src/icons/gq-icon-sort.png and b/src/icons/gq-icon-sort.png differ diff --git a/src/icons/gq-icon-split-pane-sync-dark.png b/src/icons/gq-icon-split-pane-sync-dark.png index 978a7d4f..d6dd806e 100644 Binary files a/src/icons/gq-icon-split-pane-sync-dark.png and b/src/icons/gq-icon-split-pane-sync-dark.png differ diff --git a/src/icons/gq-icon-split-pane-sync.png b/src/icons/gq-icon-split-pane-sync.png index b55553de..5c597131 100644 Binary files a/src/icons/gq-icon-split-pane-sync.png and b/src/icons/gq-icon-split-pane-sync.png differ diff --git a/src/icons/icons.gresource.xml b/src/icons/icons.gresource.xml index 447eeb32..1abf9fa6 100644 --- a/src/icons/icons.gresource.xml +++ b/src/icons/icons.gresource.xml @@ -91,5 +91,7 @@ gq-marker.xpm gq-scroller.png gqview-icon.png + gq-icon-properties.png + gq-icon-properties-dark.png diff --git a/src/layout-util.cc b/src/layout-util.cc index f0e8e0dc..235d3c01 100644 --- a/src/layout-util.cc +++ b/src/layout-util.cc @@ -2692,7 +2692,7 @@ static GtkToggleActionEntry menu_toggle_entries[] = { { "ImageOverlay", nullptr, N_("Image _Overlay"), nullptr, N_("Image Overlay"), CB(layout_menu_overlay_cb), FALSE }, { "OverUnderExposed", PIXBUF_INLINE_ICON_EXPOSURE, N_("Over/Under Exposed"), "E", N_("Highlight over/under exposed"), CB(layout_menu_select_overunderexposed_cb), FALSE }, { "RectangularSelection", PIXBUF_INLINE_ICON_SELECT_RECTANGLE, N_("Rectangular Selection"), "R", N_("Rectangular Selection"), CB(layout_menu_rectangular_selection_cb), FALSE }, - { "SBar", GQ_ICON_PROPERTIES, N_("_Info sidebar"), "K", N_("Info sidebar"), CB(layout_menu_bar_cb), FALSE }, + { "SBar", PIXBUF_INLINE_ICON_PROPERTIES, N_("_Info sidebar"), "K", N_("Info sidebar"), CB(layout_menu_bar_cb), FALSE }, { "SBarSort", PIXBUF_INLINE_ICON_SORT, N_("Sort _manager"), "S", N_("Sort manager"), CB(layout_menu_bar_sort_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 }, diff --git a/src/main.h b/src/main.h index 7cfc5c67..3f582ab1 100644 --- a/src/main.h +++ b/src/main.h @@ -219,7 +219,6 @@ #define GQ_ICON_SELECT_COLOR "color-select" #define GQ_ICON_COLOR_MANAGEMENT "preferences-color" // breeze has nicer "color-management" icon, missing in others -#define GQ_ICON_PROPERTIES "document-properties" // not done... plus many more #define GQ_ICON_COLLECTION GTK_STOCK_INDEX #define GQ_ICON_DND GTK_STOCK_DND_MULTIPLE diff --git a/src/pixbuf-util.cc b/src/pixbuf-util.cc index 979475a9..ab1548e9 100644 --- a/src/pixbuf-util.cc +++ b/src/pixbuf-util.cc @@ -124,6 +124,7 @@ static PixbufInline inline_pixbuf_data[] = { { PIXBUF_INLINE_ICON_ORIGINAL, "gq-icon-original" }, { PIXBUF_INLINE_ICON_PANORAMA, "gq-icon-panorama" }, { PIXBUF_INLINE_ICON_PDF, "gq-icon-pdf" }, + { PIXBUF_INLINE_ICON_PROPERTIES, "gq-icon-properties" }, { PIXBUF_INLINE_ICON_RENAME, "gq-icon-rename" }, { PIXBUF_INLINE_ICON_SELECT_ALL, "gq-icon-select-all" }, { PIXBUF_INLINE_ICON_SELECT_INVERT, "gq-icon-select-invert" }, diff --git a/src/pixbuf-util.h b/src/pixbuf-util.h index 3f660151..faf56b69 100644 --- a/src/pixbuf-util.h +++ b/src/pixbuf-util.h @@ -54,6 +54,7 @@ gboolean pixbuf_scale_aspect(gint req_w, gint req_h, gint old_w, gint old_h, gin #define PIXBUF_INLINE_ICON_ORIGINAL "gq-icon-original" #define PIXBUF_INLINE_ICON_PANORAMA "gq-icon-panorama" #define PIXBUF_INLINE_ICON_PDF "gq-icon-pdf" +#define PIXBUF_INLINE_ICON_PROPERTIES "gq-icon-properties" #define PIXBUF_INLINE_ICON_RENAME "gq-icon-rename" #define PIXBUF_INLINE_ICON_SELECT_ALL "gq-icon-select-all" #define PIXBUF_INLINE_ICON_SELECT_INVERT "gq-icon-select-invert" diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc index abeaabd4..19a52184 100644 --- a/src/ui-bookmark.cc +++ b/src/ui-bookmark.cc @@ -26,15 +26,14 @@ #include "ui-bookmark.h" #include "history-list.h" +#include "pixbuf-util.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" -#include "ui-utildlg.h" #include "ui-tabcomp.h" +#include "ui-utildlg.h" #include "uri-utils.h" - - /* *----------------------------------------------------------------------------- * bookmarks @@ -385,7 +384,7 @@ static void bookmark_menu_popup(BookMarkData *bm, GtkWidget *button, gint, guint bm->active_button = b; menu = popup_menu_short_lived(); - menu_item_add_icon_sensitive(menu, _("_Properties..."), GQ_ICON_PROPERTIES, bm->editable, + menu_item_add_icon_sensitive(menu, _("_Properties..."), PIXBUF_INLINE_ICON_PROPERTIES, bm->editable, G_CALLBACK(bookmark_menu_prop_cb), bm); menu_item_add_icon_sensitive(menu, _("Move _up"), GQ_ICON_GO_UP, bm->editable, G_CALLBACK(bookmark_menu_up_cb), bm);