From fb3c144564ade55d31d7adef96acc71eda3701b4 Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Fri, 11 Aug 2023 23:12:22 +0300 Subject: [PATCH] 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 --- .gitignore | 4 ---- meson.build | 2 +- src/icons/gq-icon-flip.png | Bin 714 -> 0 bytes src/icons/gq-icon-info.png | Bin 1202 -> 0 bytes src/icons/gq-icon-mirror.png | Bin 818 -> 0 bytes src/icons/gq-icon-rotate-clockwise.png | Bin 1621 -> 0 bytes src/icons/gq-icon-rotate-counter-clockwise.png | Bin 1631 -> 0 bytes src/icons/icons.gresource.xml | 5 ----- src/layout-util.cc | 12 ++++++------ src/main.h | 13 ++++++++----- src/meson.build | 10 ---------- src/pixbuf-util.cc | 5 ----- src/pixbuf-util.h | 5 ----- src/ui-misc.cc | 2 +- src/ui-tabcomp.cc | 12 +----------- src/ui_tabcomp.png | Bin 167 -> 0 bytes 16 files changed, 17 insertions(+), 53 deletions(-) delete mode 100644 src/icons/gq-icon-flip.png delete mode 100644 src/icons/gq-icon-info.png delete mode 100644 src/icons/gq-icon-mirror.png delete mode 100644 src/icons/gq-icon-rotate-clockwise.png delete mode 100644 src/icons/gq-icon-rotate-counter-clockwise.png delete mode 100644 src/ui_tabcomp.png diff --git a/.gitignore b/.gitignore index 34bfc0aa..eab6477d 100644 --- 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 8dc761f3..40de5d90 100644 --- 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 index 5dfa4086bfb90714cb90fd5d6c55c6cd03289d46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 714 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 BG|K=0 diff --git a/src/icons/gq-icon-rotate-clockwise.png b/src/icons/gq-icon-rotate-clockwise.png deleted file mode 100644 index aee82a41d04d12bcd66050a98fdf23d62c97fef1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1621 zcmV-b2CDgqP)4Mb}1aOuFzvYwe&L zt)$&mF@}gS4J@j0;Rc4bhP2W|ETW0LqTykHfpLLj2ind#_ug~w{qAu8XM6AY&i9`= z=l^}@o<~lS)r~cT1cU^H1cU^H1cU^vTI9G`cZ5nRsi2%vZlQ?v%M6g#N@1TV7a=AXaK=5I4i2m6U?S&8xz9ZcJ_ z^r@R2p~Xgn7U-st0?W1vXrzk;8y4Sj%l(%vH)VX-3o)iF+dbfp?purZXJ}!g z5zECK<{yiqXgn^cuo(7yL77qeWqfJL{$Z*!6lX(_@vyGimMEqJt*Foj9@h$b zH~3D#2CV?uMo9FHMz!@wK)pswzp|cvsrA1dDQMS7kSz-JTN?R(xflYRAvTNS2LqLRk6wjPSDpW1os?ewZLd=Q11gn@J0O;TON=R=&>%n+ z;rIINWGv&Fu_DFWst+s2;JD(E_k1QGmrmDKm~@h>4kz{rkUMvl=f#&+F`QLA_Naiq zzL{a;?hmthsdClA*Gdt?T`iMF-JiU&`1&u!qs2l-{Ca~6v=i*UQn6~LJztFIH5((K zIlWrd!;sR!K;?-}35@1CVuadrWG%8;H zQ|xqzt|Z1YuU!xFl$eerUQ_zg5n)bI#eU>MC5e+dTW;eD0y>b4Op01u5JEu*kkH9&MeAJU5VQ)3#!9XpO%Or`-_FgQ}$gtbVYJ9DcR_xAZ0)nzw z+C>Coxx9-A!iEV~A%Dw^>yW)^$`i=lHs=wfZk+TzxAu4ItjCF^w9V6=L)P|rUm)cG z1>cY_;s_02QK4Knu<{U<+p~=VJICl0Wfujn`EZbuFdVUUlvWoF!at>G!<)m@e0DK2 zayjAXIK2^i|2t0a55}2hmWALY$z~5!3}i=WS=|HxG#fiqHNbJf`06IW)WOOD&k>v- ztsQtcJzPBtP{_v)c5h?}>|d~uMX-0pMpj`B4VEui$vRlQW+zLbf6-D_qekPZt$?M& zcCd*@sH2W5)_P=77y&8dQAt(Wb$d6lmIyZpBOttYI3yq>AS56pAS56pVAbMZo-_ud T_xmim00000NkvXXu0mjfERF)H diff --git a/src/icons/gq-icon-rotate-counter-clockwise.png b/src/icons/gq-icon-rotate-counter-clockwise.png deleted file mode 100644 index 123a5bcd82ebb2de8adf2e652616b5cdf2c95838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1631 zcmV-l2B7(gP)DR{T+dQql)t&e0E3*T zk2Cbp!)PWEP(&4va6fBVBD`aqll;t2{J?MFe%>m1hc2c_I&4!MV<&fq(e;(QMUP|0 zXSY-Apd>ubKS3)Kt~sA-6C7kypmUf=W46%gy6ZFBaklDJvS&Eqsq?AU&2##kui$%M zoKLmGROoU31{yv1&zt9jkGWBU`x`muyYs1bj!nTjpF<)Im3N~}(MWDk?w4^iQ0G&v zi&eoq`a>$*Pm*MiC;fK+WyaOGpCrjRull*7d{340srG?Cabk>pD&0?#~YKNW8%4ZlsX@R@KNzfaibds^XL;A?B_vWLh%Ra7mnzx1NohU zJwju@2*VsV5EuU_iF8e^6DGS(v(o2%hhAYAwjn)3vQ%fE&+Y@1a7Hw?AJZ}NwD7;b zCXkF&oB`4J94FCZ92d>}4+oZ$d`P4SC!B7jJTKz6jv!Gd8sipcolBy>=D^eP&7!E# zQTQVXdY1=Iz;aQ5{J4F`UkkdeR(ySH?$!&EoJFb#C=?{lHcSUM58?zQirCk*nyJ|xt+KoTkEwaBrmGP?2RT8k@xVEX1b<}8J@`@XI77vhT+)Zkf zJpuO_AGKkX1dPybOr{A4Si*Y472ly1rjgwxNtLfP>S@{v|ER2E$&xIudrl7;PY9O0~o}JJ*NOr&kyl)ucK7f3W4m5WukjEEgAzU#R zTzCHh#R_JDM-8Jqmb$Ql%dWbAnMxJYV7c*d?SI(p;sNIgCCM=;GK}=n%!}(?BcNW5 z5at?pF|NU0SKLpa2QlMluYntqcqnk`vmsz&_6_MuVwbX&VXko{I|u1Vq7Lb^nFNRC zyUD2}YLPyNGB^`XBvFs_ISPbkqdvsa=O7fG4~fu9pY>vBe%MH&F6o+SPoLs8{+@5N(diAE(aHNZ&MWcW--qt|V%fK6xa& z)3(c$B2PGet7)KjCOeb(v)ua^4gqU`1azY)`!0@X7!0%Shqkb? z4gvx#tsOi8ffrW~l7I<5(NSJM7y?v%V8L$!x-%=$ZTpdxnoQf~$f(ckctt?SKD6W> z0n?w_a&@}9E)=AU(ajN#aM=Bit?46Rl2OL^W5(z9y6IuuD|1=VcZVYaA_5`;A_5`; dA_5jI{sB)B4Xfr9q0ImQ002ovPDHLkV1iG>2?+oI diff --git a/src/icons/icons.gresource.xml b/src/icons/icons.gresource.xml index 4d63e4f0..d8a734cc 100644 --- a/src/icons/icons.gresource.xml +++ b/src/icons/icons.gresource.xml @@ -32,23 +32,18 @@ gq-icon-exif.png gq-icon-exposure.png gq-icon-file-filter.png - gq-icon-flip.png gq-icon-float.png gq-icon-grayscale.png gq-icon-heic.png gq-icon-hidetools.png - gq-icon-info.png gq-icon-maintenance.png gq-icon-marks.png - gq-icon-mirror.png gq-icon-move.png gq-icon-original.png gq-icon-panorama.png gq-icon-pdf.png gq-icon-rename.png gq-icon-rotate-180.png - gq-icon-rotate-clockwise.png - gq-icon-rotate-counter-clockwise.png gq-icon-select-all.png gq-icon-select-invert.png gq-icon-select-none.png diff --git a/src/layout-util.cc b/src/layout-util.cc index dc0e6998..5ad4994c 100644 --- a/src/layout-util.cc +++ b/src/layout-util.cc @@ -2604,11 +2604,11 @@ static GtkActionEntry menu_entries[] = { { "Rating4", nullptr, N_("_Rating 4"), "KP_4", N_("Rating 4"), CB(layout_menu_rating_4_cb) }, { "Rating5", nullptr, N_("_Rating 5"), "KP_5", N_("Rating 5"), CB(layout_menu_rating_5_cb) }, { "RatingM1", nullptr, N_("_Rating -1"), "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°"), "R", N_("Image Rotate 180°"), CB(layout_menu_alter_180_cb) }, - { "Mirror", PIXBUF_INLINE_ICON_MIRROR, N_("_Mirror"), "M", N_("Image Mirror"), CB(layout_menu_alter_mirror_cb) }, - { "Flip", PIXBUF_INLINE_ICON_FLIP, N_("_Flip"), "F", N_("Image Flip"), CB(layout_menu_alter_flip_cb) }, + { "Mirror", GQ_ICON_FLIP_HORIZONTAL, N_("_Mirror"), "M", N_("Image Mirror"), CB(layout_menu_alter_mirror_cb) }, + { "Flip", GQ_ICON_FLIP_VERTICAL, N_("_Flip"), "F", N_("Image Flip"), CB(layout_menu_alter_flip_cb) }, { "AlterNone", PIXBUF_INLINE_ICON_ORIGINAL, N_("_Original state"), "O", N_("Image rotate Original state"), CB(layout_menu_alter_none_cb) }, { "Preferences", GQ_ICON_PREFERENCES, N_("P_references..."), "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"), "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"), "K", N_("Info sidebar"), CB(layout_menu_bar_cb), FALSE }, + { "SBar", GQ_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 }, { "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"), "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"), "X", N_("Toggle Exif rotate"), CB(layout_menu_exif_rotate_cb), FALSE }, + { "ExifRotate", GQ_ICON_ROTATE_LEFT, N_("_Exif rotate"), "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"), "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 81a1fa65..93287a34 100644 --- 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 78e39c42..3fecfb7f 100644 --- 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 c88b7fca..10501eda 100644 --- 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 62438cee..74eb252e 100644 --- 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 21704832..f5ed0a4c 100644 --- 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 dd3588f5..5c470bcf 100644 --- 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 index c17beaaf755b54319ec145d917e52f657631ff22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qfiUBxyLEqng6t)pzOL+-xmkFvggKe>K