Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove deprecated STOCK constant

This commit is contained in:
oscfdezdz 2023-04-08 12:34:48 +02:00
parent 47a02d7217
commit ee813f22a4
No known key found for this signature in database
GPG Key ID: 929F7771BD54F7FE
4 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/diffuse/dialogs.py
View File

@ -77,7 +77,7 @@ class FileChooserDialog(Gtk.FileChooserDialog):
def __init__(self, title, parent, prefs, action, accept, rev=False): def __init__(self, title, parent, prefs, action, accept, rev=False):
Gtk.FileChooserDialog.__init__(self, title=title, transient_for=parent, action=action) Gtk.FileChooserDialog.__init__(self, title=title, transient_for=parent, action=action)
self.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL) self.add_button(_('_Cancel'), Gtk.ResponseType.CANCEL)
self.add_button(accept, Gtk.ResponseType.OK) self.add_button(accept, Gtk.ResponseType.OK)
self.prefs = prefs self.prefs = prefs
hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0, border_width=5) hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0, border_width=5)
@ -120,8 +120,8 @@ class FileChooserDialog(Gtk.FileChooserDialog):
class NumericDialog(Gtk.Dialog): class NumericDialog(Gtk.Dialog):
def __init__(self, parent, title, text, val, lower, upper, step=1, page=0): def __init__(self, parent, title, text, val, lower, upper, step=1, page=0):
Gtk.Dialog.__init__(self, title=title, transient_for=parent, destroy_with_parent=True) Gtk.Dialog.__init__(self, title=title, transient_for=parent, destroy_with_parent=True)
self.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT) self.add_button(_('_Cancel'), Gtk.ResponseType.REJECT)
self.add_button(Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT) self.add_button(_('_OK'), Gtk.ResponseType.ACCEPT)
vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
vbox.set_border_width(10) vbox.set_border_width(10)
@ -164,8 +164,8 @@ class SearchDialog(Gtk.Dialog):
title=_('Find...'), title=_('Find...'),
transient_for=parent, transient_for=parent,
destroy_with_parent=True) destroy_with_parent=True)
self.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT) self.add_button(_('_Cancel'), Gtk.ResponseType.REJECT)
self.add_button(Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT) self.add_button(_('_OK'), Gtk.ResponseType.ACCEPT)
vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
vbox.set_border_width(10) vbox.set_border_width(10)

8
src/diffuse/preferences.py
View File

@ -257,8 +257,8 @@ class Preferences:
# button was pressed # button was pressed
def runDialog(self, parent: Gtk.Widget) -> None: def runDialog(self, parent: Gtk.Widget) -> None:
dialog = Gtk.Dialog(_('Preferences'), parent=parent, destroy_with_parent=True) dialog = Gtk.Dialog(_('Preferences'), parent=parent, destroy_with_parent=True)
dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT) dialog.add_button(_('_Cancel'), Gtk.ResponseType.REJECT)
dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK) dialog.add_button(_('_OK'), Gtk.ResponseType.OK)
widgets: Dict[str, Gtk.Widget] = {} widgets: Dict[str, Gtk.Widget] = {}
w = self._buildPrefsDialog(parent, widgets, self.template) w = self._buildPrefsDialog(parent, widgets, self.template)
@ -473,7 +473,7 @@ class _FileEntry(Gtk.Box):
entry.show() entry.show()
button = Gtk.Button() button = Gtk.Button()
image = Gtk.Image() image = Gtk.Image()
image.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.MENU) image.set_from_icon_name('document-open-symbolic', Gtk.IconSize.MENU)
button.add(image) button.add(image)
image.show() image.show()
button.connect('clicked', self.chooseFile) button.connect('clicked', self.chooseFile)
@ -486,7 +486,7 @@ class _FileEntry(Gtk.Box):
self.title, self.title,
self.toplevel, self.toplevel,
Gtk.FileChooserAction.OPEN, Gtk.FileChooserAction.OPEN,
(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK)) (_('_Cancel'), Gtk.ResponseType.CANCEL, _('_Open'), Gtk.ResponseType.OK))
dialog.set_current_folder(os.path.realpath(os.curdir)) dialog.set_current_folder(os.path.realpath(os.curdir))
if dialog.run() == Gtk.ResponseType.OK: if dialog.run() == Gtk.ResponseType.OK:
self.entry.set_text(dialog.get_filename()) self.entry.set_text(dialog.get_filename())

16
src/diffuse/widgets.py
View File

@ -1854,16 +1854,16 @@ class FileDiffViewerBase(Gtk.Grid):
can_swap = (f != self.current_pane) can_swap = (f != self.current_pane)
menu = self._create_menu([ menu = self._create_menu([
[_('Align with Selection'), self.align_with_selection_cb, [f, i], Gtk.STOCK_EXECUTE, can_align], # noqa: E501 [_('Align with Selection'), self.align_with_selection_cb, [f, i], 'system-run-symbolic', can_align], # noqa: E501
[_('Isolate'), self.button_cb, 'isolate', None, can_isolate], [_('Isolate'), self.button_cb, 'isolate', None, can_isolate],
[_('Merge Selection'), self.merge_lines_cb, f, None, can_merge], [_('Merge Selection'), self.merge_lines_cb, f, None, can_merge],
[], [],
[_('Cut'), self.button_cb, 'cut', Gtk.STOCK_CUT, can_select], [_('Cut'), self.button_cb, 'cut', 'edit-cut-symbolic', can_select],
[_('Copy'), self.button_cb, 'copy', Gtk.STOCK_COPY, can_select], [_('Copy'), self.button_cb, 'copy', 'edit-copy-symbolic', can_select],
[_('Paste'), self.button_cb, 'paste', Gtk.STOCK_PASTE, can_select], [_('Paste'), self.button_cb, 'paste', 'edit-paste-symbolic', can_select],
[], [],
[_('Select All'), self.button_cb, 'select-all', None, can_select], [_('Select All'), self.button_cb, 'select-all', None, can_select],
[_('Clear Edits'), self.button_cb, 'clear-edits', Gtk.STOCK_CLEAR, can_isolate], # noqa: E501 [_('Clear Edits'), self.button_cb, 'clear-edits', 'edit-clear-symbolic', can_isolate], # noqa: E501
[], [],
[_('Swap with Selected Pane'), self.swap_panes_cb, f, None, can_swap] [_('Swap with Selected Pane'), self.swap_panes_cb, f, None, can_swap]
]) ])
@ -1875,13 +1875,13 @@ class FileDiffViewerBase(Gtk.Grid):
menu = Gtk.Menu() menu = Gtk.Menu()
for spec in specs: for spec in specs:
if len(spec) > 0: if len(spec) > 0:
(label, cb, cb_data, image_stock_name, sensitive) = spec (label, cb, cb_data, image_icon_name, sensitive) = spec
item = Gtk.ImageMenuItem.new_with_mnemonic(label) item = Gtk.ImageMenuItem.new_with_mnemonic(label)
item.set_use_underline(True) item.set_use_underline(True)
item.set_sensitive(sensitive) item.set_sensitive(sensitive)
if image_stock_name is not None: if image_icon_name is not None:
image = Gtk.Image() image = Gtk.Image()
image.set_from_stock(image_stock_name, Gtk.IconSize.MENU) image.set_from_icon_name(image_icon_name, Gtk.IconSize.MENU)
item.set_image(image) item.set_image(image)
if cb is not None: if cb is not None:
item.connect('activate', cb, cb_data) item.connect('activate', cb, cb_data)

75
src/diffuse/window.py
View File

@ -57,13 +57,13 @@ class NotebookTab(Gtk.EventBox):
signals can be connected for MMB and RMB button presses. signals can be connected for MMB and RMB button presses.
""" """
def __init__(self, name: str, stock: str) -> None: def __init__(self, name: str, icon_name: str) -> None:
Gtk.EventBox.__init__(self) Gtk.EventBox.__init__(self)
self.set_visible_window(False) self.set_visible_window(False)
hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0) hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0)
if stock is not None: if icon_name is not None:
image = Gtk.Image() image = Gtk.Image()
image.set_from_stock(stock, Gtk.IconSize.MENU) image.set_from_icon_name(icon_name, Gtk.IconSize.MENU)
hbox.pack_start(image, False, False, 5) hbox.pack_start(image, False, False, 5)
image.show() image.show()
@ -78,7 +78,7 @@ class NotebookTab(Gtk.EventBox):
button = Gtk.Button() button = Gtk.Button()
button.set_relief(Gtk.ReliefStyle.NONE) button.set_relief(Gtk.ReliefStyle.NONE)
image = Gtk.Image() image = Gtk.Image()
image.set_from_stock(Gtk.STOCK_CLOSE, Gtk.IconSize.MENU) image.set_from_icon_name('window-close-symbolic', Gtk.IconSize.MENU)
button.add(image) button.add(image)
image.show() image.show()
button.set_tooltip_text(_('Close Tab')) button.set_tooltip_text(_('Close Tab'))
@ -124,10 +124,10 @@ class PaneHeader(Gtk.Box):
def __init__(self) -> None: def __init__(self) -> None:
Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL, spacing=0) Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL, spacing=0)
button_specs = [ button_specs = [
[Gtk.STOCK_OPEN, self.button_cb, 'open', _('Open File...')], ['document-open-symbolic', self.button_cb, 'open', _('Open File...')],
[Gtk.STOCK_REFRESH, self.button_cb, 'reload', _('Reload File')], ['view-refresh-symbolic', self.button_cb, 'reload', _('Reload File')],
[Gtk.STOCK_SAVE, self.button_cb, 'save', _('Save File')], ['document-save-symbolic', self.button_cb, 'save', _('Save File')],
[Gtk.STOCK_SAVE_AS, self.button_cb, 'save_as', _('Save File As...')] ['document-save-as-symbolic', self.button_cb, 'save_as', _('Save File As...')]
] ]
_append_buttons(self, Gtk.IconSize.MENU, button_specs) _append_buttons(self, Gtk.IconSize.MENU, button_specs)
@ -307,9 +307,9 @@ class FileDiffViewer(FileDiffViewerBase):
Gtk.ButtonsType.NONE, _('Save changes before loading the new file?') Gtk.ButtonsType.NONE, _('Save changes before loading the new file?')
) )
dialog.set_title(constants.APP_NAME) dialog.set_title(constants.APP_NAME)
dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL) dialog.add_button(_('_Cancel'), Gtk.ResponseType.CANCEL)
dialog.add_button(Gtk.STOCK_NO, Gtk.ResponseType.REJECT) dialog.add_button(_('_No'), Gtk.ResponseType.REJECT)
dialog.add_button(Gtk.STOCK_YES, Gtk.ResponseType.OK) dialog.add_button(_('_Yes'), Gtk.ResponseType.OK)
dialog.set_default_response(Gtk.ResponseType.CANCEL) dialog.set_default_response(Gtk.ResponseType.CANCEL)
response = dialog.run() response = dialog.run()
dialog.destroy() dialog.destroy()
@ -444,7 +444,7 @@ class FileDiffViewer(FileDiffViewerBase):
self.get_toplevel(), self.get_toplevel(),
self.prefs, self.prefs,
Gtk.FileChooserAction.OPEN, Gtk.FileChooserAction.OPEN,
Gtk.STOCK_OPEN, _('_Open'),
True True
) )
if info.name is not None: if info.name is not None:
@ -497,7 +497,7 @@ class FileDiffViewer(FileDiffViewerBase):
self.get_toplevel(), self.get_toplevel(),
self.prefs, self.prefs,
Gtk.FileChooserAction.SAVE, Gtk.FileChooserAction.SAVE,
Gtk.STOCK_SAVE _('_Save')
) )
if name is not None: if name is not None:
dialog.set_filename(os.path.abspath(name)) dialog.set_filename(os.path.abspath(name))
@ -917,25 +917,25 @@ class DiffuseWindow(Gtk.ApplicationWindow):
[DIFFUSE_STOCK_NEW_2WAY_MERGE, self.new_2_way_file_merge_cb, None, _('New 2-Way File Merge')], # noqa: E501 [DIFFUSE_STOCK_NEW_2WAY_MERGE, self.new_2_way_file_merge_cb, None, _('New 2-Way File Merge')], # noqa: E501
[DIFFUSE_STOCK_NEW_3WAY_MERGE, self.new_3_way_file_merge_cb, None, _('New 3-Way File Merge')], # noqa: E501 [DIFFUSE_STOCK_NEW_3WAY_MERGE, self.new_3_way_file_merge_cb, None, _('New 3-Way File Merge')], # noqa: E501
[], [],
[Gtk.STOCK_EXECUTE, self.button_cb, 'realign-all', _('Realign All')], ['system-run-symbolic', self.button_cb, 'realign-all', _('Realign All')],
[Gtk.STOCK_GOTO_TOP, self.button_cb, 'first-difference', _('First Difference')], ['go-top-symbolic', self.button_cb, 'first-difference', _('First Difference')],
[Gtk.STOCK_GO_UP, self.button_cb, 'previous-difference', _('Previous Difference')], ['go-up-symbolic', self.button_cb, 'previous-difference', _('Previous Difference')],
[Gtk.STOCK_GO_DOWN, self.button_cb, 'next-difference', _('Next Difference')], ['go-down-symbolic', self.button_cb, 'next-difference', _('Next Difference')],
[Gtk.STOCK_GOTO_BOTTOM, self.button_cb, 'last-difference', _('Last Difference')], ['go-bottom-symbolic', self.button_cb, 'last-difference', _('Last Difference')],
[], [],
[Gtk.STOCK_GOTO_LAST, self.button_cb, 'copy-selection-right', _('Copy Selection Right')], # noqa: E501 ['go-last-symbolic', self.button_cb, 'copy-selection-right', _('Copy Selection Right')], # noqa: E501
[Gtk.STOCK_GOTO_FIRST, self.button_cb, 'copy-selection-left', _('Copy Selection Left')], ['go-first-symbolic', self.button_cb, 'copy-selection-left', _('Copy Selection Left')],
[Gtk.STOCK_GO_FORWARD, self.button_cb, 'copy-left-into-selection', _('Copy Left Into Selection')], # noqa: E501 ['go-next-symbolic', self.button_cb, 'copy-left-into-selection', _('Copy Left Into Selection')], # noqa: E501
[Gtk.STOCK_GO_BACK, self.button_cb, 'copy-right-into-selection', _('Copy Right Into Selection')], # noqa: E501 ['go-previous-symbolic', self.button_cb, 'copy-right-into-selection', _('Copy Right Into Selection')], # noqa: E501
[DIFFUSE_STOCK_LEFT_RIGHT, self.button_cb, 'merge-from-left-then-right', _('Merge From Left Then Right')], # noqa: E501 [DIFFUSE_STOCK_LEFT_RIGHT, self.button_cb, 'merge-from-left-then-right', _('Merge From Left Then Right')], # noqa: E501
[DIFFUSE_STOCK_RIGHT_LEFT, self.button_cb, 'merge-from-right-then-left', _('Merge From Right Then Left')], # noqa: E501 [DIFFUSE_STOCK_RIGHT_LEFT, self.button_cb, 'merge-from-right-then-left', _('Merge From Right Then Left')], # noqa: E501
[], [],
[Gtk.STOCK_UNDO, self.button_cb, 'undo', _('Undo')], ['edit-undo-symbolic', self.button_cb, 'undo', _('Undo')],
[Gtk.STOCK_REDO, self.button_cb, 'redo', _('Redo')], ['edit-redo-symbolic', self.button_cb, 'redo', _('Redo')],
[Gtk.STOCK_CUT, self.button_cb, 'cut', _('Cut')], ['edit-cut-symbolic', self.button_cb, 'cut', _('Cut')],
[Gtk.STOCK_COPY, self.button_cb, 'copy', _('Copy')], ['edit-copy-symbolic', self.button_cb, 'copy', _('Copy')],
[Gtk.STOCK_PASTE, self.button_cb, 'paste', _('Paste')], ['edit-paste-symbolic', self.button_cb, 'paste', _('Paste')],
[Gtk.STOCK_CLEAR, self.button_cb, 'clear-edits', _('Clear Edits')] ['edit-clear-symbolic', self.button_cb, 'clear-edits', _('Clear Edits')]
] ]
_append_buttons(hbox, Gtk.IconSize.LARGE_TOOLBAR, button_specs) _append_buttons(hbox, Gtk.IconSize.LARGE_TOOLBAR, button_specs)
# avoid the button bar from dictating the minimum window size # avoid the button bar from dictating the minimum window size
@ -1170,11 +1170,11 @@ class DiffuseWindow(Gtk.ApplicationWindow):
dialog.vbox.pack_start(sw, True, True, 0) dialog.vbox.pack_start(sw, True, True, 0)
sw.show() sw.show()
# add custom set of action buttons # add custom set of action buttons
dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL) dialog.add_button(_('_Cancel'), Gtk.ResponseType.CANCEL)
button = Gtk.Button.new_with_mnemonic(_('Close _Without Saving')) button = Gtk.Button.new_with_mnemonic(_('Close _Without Saving'))
dialog.add_action_widget(button, Gtk.ResponseType.REJECT) dialog.add_action_widget(button, Gtk.ResponseType.REJECT)
button.show() button.show()
dialog.add_button(Gtk.STOCK_SAVE, Gtk.ResponseType.OK) dialog.add_button(_('_Save'), Gtk.ResponseType.OK)
dialog.set_default_response(Gtk.ResponseType.CANCEL) dialog.set_default_response(Gtk.ResponseType.CANCEL)
response = dialog.run() response = dialog.run()
dialog.destroy() dialog.destroy()
@ -1288,7 +1288,7 @@ class DiffuseWindow(Gtk.ApplicationWindow):
def newFileDiffViewer(self, n: int) -> FileDiffViewer: def newFileDiffViewer(self, n: int) -> FileDiffViewer:
self.viewer_count += 1 self.viewer_count += 1
tabname = _('File Merge %d') % (self.viewer_count, ) tabname = _('File Merge %d') % (self.viewer_count, )
tab = NotebookTab(tabname, Gtk.STOCK_FILE) tab = NotebookTab(tabname, 'text-x-generic-symbolic')
viewer = FileDiffViewer(n, self.prefs, tabname) viewer = FileDiffViewer(n, self.prefs, tabname)
tab.button.connect('clicked', self.remove_tab_cb, viewer) tab.button.connect('clicked', self.remove_tab_cb, viewer)
tab.connect('button-press-event', self.notebooktab_button_press_cb, viewer) tab.connect('button-press-event', self.notebooktab_button_press_cb, viewer)
@ -1476,7 +1476,7 @@ class DiffuseWindow(Gtk.ApplicationWindow):
self.get_toplevel(), self.get_toplevel(),
self.prefs, self.prefs,
Gtk.FileChooserAction.OPEN, Gtk.FileChooserAction.OPEN,
Gtk.STOCK_OPEN, _('_Open'),
True True
) )
dialog.set_default_response(Gtk.ResponseType.OK) dialog.set_default_response(Gtk.ResponseType.OK)
@ -1499,7 +1499,7 @@ class DiffuseWindow(Gtk.ApplicationWindow):
parent, parent,
self.prefs, self.prefs,
Gtk.FileChooserAction.SELECT_FOLDER, Gtk.FileChooserAction.SELECT_FOLDER,
Gtk.STOCK_OPEN _('_Open')
) )
dialog.set_default_response(Gtk.ResponseType.OK) dialog.set_default_response(Gtk.ResponseType.OK)
accept = (dialog.run() == Gtk.ResponseType.OK) accept = (dialog.run() == Gtk.ResponseType.OK)
@ -1522,7 +1522,7 @@ class DiffuseWindow(Gtk.ApplicationWindow):
_('Choose Folder With Commit'), _('Choose Folder With Commit'),
parent, self.prefs, parent, self.prefs,
Gtk.FileChooserAction.SELECT_FOLDER, Gtk.FileChooserAction.SELECT_FOLDER,
Gtk.STOCK_OPEN, _('_Open'),
True True
) )
dialog.set_default_response(Gtk.ResponseType.OK) dialog.set_default_response(Gtk.ResponseType.OK)
@ -1806,12 +1806,15 @@ def _append_buttons(box, size, specs):
"""Convenience method for packing buttons into a container.""" """Convenience method for packing buttons into a container."""
for spec in specs: for spec in specs:
if len(spec) > 0: if len(spec) > 0:
(stock_id, cb, cb_data, label) = spec (icon_name, cb, cb_data, label) = spec
button = Gtk.Button() button = Gtk.Button()
button.set_relief(Gtk.ReliefStyle.NONE) button.set_relief(Gtk.ReliefStyle.NONE)
button.set_can_focus(False) button.set_can_focus(False)
image = Gtk.Image() image = Gtk.Image()
image.set_from_stock(stock_id, size) if icon_name.startswith('diffuse'):
image.set_from_stock(icon_name, size)
else:
image.set_from_icon_name(icon_name, size)
button.add(image) button.add(image)
image.show() image.show()
button.connect('clicked', cb, cb_data) button.connect('clicked', cb, cb_data)