diff --git a/data/ShortcutsWindow.ui b/data/ShortcutsWindow.ui index d7384f3..2c4a367 100644 --- a/data/ShortcutsWindow.ui +++ b/data/ShortcutsWindow.ui @@ -229,13 +229,6 @@ True Search, Album Dialog, Album List and Artist List - - - True - Enqueue selected item - <Control>e - - True diff --git a/src/mpdevil.py b/src/mpdevil.py index 2add5fa..0fd8025 100755 --- a/src/mpdevil.py +++ b/src/mpdevil.py @@ -1337,10 +1337,7 @@ class SongPopover(Gtk.Popover): hbox.pack_end(self._open_button, False, False, 0) if show_buttons: button_box=Gtk.ButtonBox(layout_style=Gtk.ButtonBoxStyle.EXPAND) - data=((_("Append"), "list-add-symbolic", "append"), - (_("Play"), "media-playback-start-symbolic", "play"), - (_("Enqueue"), "insert-object-symbolic", "enqueue") - ) + data=((_("Append"), "list-add-symbolic", "append"), (_("Play"), "media-playback-start-symbolic", "play")) for tooltip, icon, mode in data: button=Gtk.Button(tooltip_text=tooltip, image=Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.BUTTON)) button.connect("clicked", self._on_button_clicked, mode) @@ -1445,9 +1442,7 @@ class SongsList(TreeView): # buttons self.buttons=Gtk.ButtonBox(layout_style=Gtk.ButtonBoxStyle.EXPAND) data=((_("Add all titles to playlist"), "list-add-symbolic", "append"), - (_("Directly play all titles"), "media-playback-start-symbolic", "play"), - (_("Append all titles after the currently playing track and clear the playlist from all other songs"), - "insert-object-symbolic", "enqueue") + (_("Directly play all titles"), "media-playback-start-symbolic", "play") ) for tooltip, icon, mode in data: button=Gtk.Button(image=Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.BUTTON)) @@ -1571,10 +1566,7 @@ class ArtistPopover(Gtk.Popover): # buttons vbox=Gtk.ButtonBox(orientation=Gtk.Orientation.VERTICAL, margin=10) - data=((_("Append"), "list-add-symbolic", "append"), - (_("Play"), "media-playback-start-symbolic", "play"), - (_("Enqueue"), "insert-object-symbolic", "enqueue") - ) + data=((_("Append"), "list-add-symbolic", "append"), (_("Play"), "media-playback-start-symbolic", "play")) for label, icon, mode in data: button=Gtk.ModelButton(label=label, image=Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.BUTTON)) button.get_child().set_property("xalign", 0) @@ -3302,7 +3294,7 @@ class MainWindow(Gtk.ApplicationWindow): action=Gio.SimpleAction.new(name, None) action.connect("activate", self._on_profile, i) self.add_action(action) - for name in ("append","play","enqueue"): + for name in ("append","play"): action=Gio.SimpleAction.new(name, None) action.connect("activate", self._on_add_to_playlist, name) self.add_action(action) @@ -3628,11 +3620,11 @@ class mpdevil(Gtk.Application): ("win.show-help-overlay", ["question"]),("win.toggle-lyrics", ["l"]), ("win.profile-1", ["1"]),("win.profile-2", ["2"]),("win.profile-3", ["3"]), ("win.show-info", ["i","Menu"]),("win.append", ["plus"]),("win.play", ["Return"]), - ("win.enqueue", ["e"]),("win.genre-filter", ["g"]),("win.back-to-current-album", ["Escape"]), - ("win.toggle-search", ["f"]),("mpd.update", ["F5"]),("mpd.clear", ["Delete"]),("mpd.toggle-play", ["space"]), - ("mpd.stop", ["space"]),("mpd.next", ["Down"]),("mpd.prev", ["Up"]),("mpd.repeat", ["r"]), - ("mpd.random", ["n"]),("mpd.single", ["s"]),("mpd.consume", ["o"]), - ("mpd.single-oneshot", ["s"]),("mpd.seek-forward", ["Right"]),("mpd.seek-backward", ["Left"]) + ("win.genre-filter", ["g"]),("win.back-to-current-album", ["Escape"]),("win.toggle-search", ["f"]), + ("mpd.update", ["F5"]),("mpd.clear", ["Delete"]),("mpd.toggle-play", ["space"]),("mpd.stop", ["space"]), + ("mpd.next", ["Down"]),("mpd.prev", ["Up"]),("mpd.repeat", ["r"]),("mpd.random", ["n"]), + ("mpd.single", ["s"]),("mpd.consume", ["o"]),("mpd.single-oneshot", ["s"]), + ("mpd.seek-forward", ["Right"]),("mpd.seek-backward", ["Left"]) ) for action, accels in action_accels: self.set_accels_for_action(action, accels)