Skip to content

fix missing icons on icon themes without deprecated gtk-* stock names #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix missing icons on icon themes without deprecated gtk-* stock names #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions gmusicbrowser.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,8 +1349,44 @@ sub keybinding_longname
( 'gmb-queue0' => 'gmb-queue',
'gmb-queue-window' => 'gmb-queue',
'gmb-random-album' => 'gmb-random',
'gmb-view-fullscreen'=>'gtk-fullscreen',
#'gmb-media-skip-forward'=> 'media-skip-forward',
'gmb-view-fullscreen'=>'view-fullscreen',
# gtk2 stock icon names to freedesktop standard names, for icon themes that no longer provide the gtk-* names
'gtk-add' => 'list-add',
'gtk-apply' => 'emblem-default',
'gtk-cancel' => 'process-stop',
'gtk-clear' => 'edit-clear',
'gtk-close' => 'window-close',
'gtk-copy' => 'edit-copy',
'gtk-delete' => 'edit-delete',
'gtk-edit' => 'document-properties',
'gtk-find' => 'edit-find',
'gtk-fullscreen' => 'view-fullscreen',
'gtk-go-back' => 'go-previous',
'gtk-go-down' => 'go-down',
'gtk-go-forward' => 'go-next',
'gtk-go-up' => 'go-up',
'gtk-goto-bottom' => 'go-bottom',
'gtk-goto-top' => 'go-top',
'gtk-info' => 'dialog-information',
'gtk-jump-to' => 'go-jump',
'gtk-leave-fullscreen' => 'view-restore',
'gtk-media-next' => 'media-skip-forward',
'gtk-media-pause' => 'media-playback-pause',
'gtk-media-play' => 'media-playback-start',
'gtk-media-previous' => 'media-skip-backward',
'gtk-media-stop' => 'media-playback-stop',
'gtk-new' => 'document-new',
'gtk-ok' => 'emblem-default',
'gtk-open' => 'document-open',
'gtk-preferences' => 'preferences-system',
'gtk-quit' => 'application-exit',
'gtk-refresh' => 'view-refresh',
'gtk-remove' => 'list-remove',
'gtk-save' => 'document-save',
'gtk-save-as' => 'document-save-as',
'gtk-sort-ascending' => 'view-sort-ascending',
'gtk-sort-descending' => 'view-sort-descending',
'gtk-stop' => 'process-stop',
);
our %IconsFallbacksCache;
sub check_icon_name
Expand Down
4 changes: 2 additions & 2 deletions gmusicbrowser_list.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3638,8 +3638,8 @@ sub new
$self->set_max_width_chars($opt->{minwidthchar}) if $opt->{minwidthchar};
$self->set_max_width_chars($opt->{maxwidthchar}) if $opt->{maxwidthchar};
unless ($opt->{noselector})
{ $self->set_icon_from_stock('primary','gtk-find');
$self->set_icon_from_stock('secondary','gtk-clear');
{ $self->set_icon_from_icon_name( 'primary', ::check_icon_name('gtk-find') || 'edit-find' );
$self->set_icon_from_icon_name( 'secondary', ::check_icon_name('gtk-clear') || 'edit-clear' );
$self->set_icon_activatable($_,1) for qw/primary secondary/;
$self->set_icon_tooltip_text('primary',_"Search options");
$self->set_icon_tooltip_text('secondary',_"Reset filter");
Expand Down