episodeselector: Remove GtkStock usage

* Rename gPodderEpisodeSelector constructor kwarg 'stock_ok_button'
   to 'ok_button'. Change callers in main.py to use it with text labels
   instead of Gtk.STOCK_* values
 * Set transient for parent widget
This commit is contained in:
Teemu Ikonen 2021-08-14 16:05:32 +03:00
parent a3700e6a3d
commit ce66b5fa62
2 changed files with 14 additions and 16 deletions

View File

@ -59,12 +59,9 @@ class gPodderEpisodeSelector(BuilderWidget):
- title: (optional) The title of the window + heading
- instructions: (optional) A one-line text describing what the
user should select / what the selection is for
- stock_ok_button: (optional) Will replace the "OK" button with
another GTK+ stock item to be used for the
affirmative button of the dialog (e.g. can
be Gtk.STOCK_DELETE when the episodes to be
selected will be deleted after closing the
dialog)
- ok_button: (optional) Will replace the "OK" button label with this
string (e.g. can be '_Delete' when the episodes to be
selected will be deleted after closing the dialog)
- selection_buttons: (optional) A dictionary with labels as
keys and callbacks as values; for each
key a button will be generated, and when
@ -89,6 +86,7 @@ class gPodderEpisodeSelector(BuilderWidget):
COLUMN_ADDITIONAL = 3
def new(self):
self.gPodderEpisodeSelector.set_transient_for(self.parent_widget)
if hasattr(self, 'title'):
self.gPodderEpisodeSelector.set_title(self.title)
@ -134,13 +132,13 @@ class gPodderEpisodeSelector(BuilderWidget):
self.labelInstructions.set_text(self.instructions)
self.labelInstructions.show_all()
if hasattr(self, 'stock_ok_button'):
if self.stock_ok_button == 'gpodder-download':
if hasattr(self, 'ok_button'):
if self.ok_button == 'gpodder-download':
self.btnOK.set_image(Gtk.Image.new_from_icon_name('go-down', Gtk.IconSize.BUTTON))
self.btnOK.set_label(_('Download'))
else:
self.btnOK.set_label(self.stock_ok_button)
self.btnOK.set_use_stock(True)
self.btnOK.set_image(None)
self.btnOK.set_label(self.ok_button)
# check/uncheck column
toggle_cell = Gtk.CellRendererToggle()
@ -326,9 +324,9 @@ class gPodderEpisodeSelector(BuilderWidget):
self.btnOK.set_sensitive(count > 0)
self.btnRemoveAction.set_sensitive(count > 0)
if count > 0:
self.btnCancel.set_label(Gtk.STOCK_CANCEL)
self.btnCancel.set_label(_('_Cancel'))
else:
self.btnCancel.set_label(Gtk.STOCK_CLOSE)
self.btnCancel.set_label(_('_Close'))
else:
self.btnOK.set_sensitive(False)
self.btnRemoveAction.set_sensitive(False)

View File

@ -572,7 +572,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
episodes=changes,
columns=columns,
size_attribute=None,
stock_ok_button=Gtk.STOCK_APPLY,
ok_button=_('_Apply'),
callback=execute_podcast_actions,
_config=self.config)
@ -2985,7 +2985,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
self.main_window, title=_('Delete episodes'),
instructions=instructions,
episodes=episodes, selected=selected, columns=columns,
stock_ok_button='edit-delete', callback=self.delete_episode_list,
ok_button=_('_Delete'), callback=self.delete_episode_list,
selection_buttons=selection_buttons, _config=self.config)
def on_selected_episodes_status_changed(self):
@ -3177,7 +3177,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
episodes=episodes,
columns=columns,
selected=selected,
stock_ok_button='gpodder-download',
ok_button='gpodder-download',
callback=download_episodes_callback,
remove_callback=lambda e: e.mark_old(),
remove_action=_('Mark as old'),
@ -3313,7 +3313,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
episodes=self.channels,
columns=columns,
size_attribute=None,
stock_ok_button=_('Delete'),
ok_button=_('_Delete'),
callback=self.remove_podcast_list,
_config=self.config)