diff --git a/lutris/gui/config_boxes.py b/lutris/gui/config_boxes.py
index 5544fac05..8fd522a63 100644
--- a/lutris/gui/config_boxes.py
+++ b/lutris/gui/config_boxes.py
@@ -79,8 +79,8 @@ class ConfigBox(VBox):
self.call_widget_generator(option, option_key, value, default)
# Reset button
- icon = Gtk.Image(stock=Gtk.STOCK_CLEAR)
- reset_btn = Gtk.Button(image=icon)
+ reset_btn = Gtk.Button.new_from_icon_name('edit-clear',
+ Gtk.IconSize.MENU)
reset_btn.set_relief(Gtk.ReliefStyle.NONE)
reset_btn.set_tooltip_text("Reset option to global or "
"default config")
diff --git a/lutris/gui/dialogs.py b/lutris/gui/dialogs.py
index 928a6d624..daedc3c04 100644
--- a/lutris/gui/dialogs.py
+++ b/lutris/gui/dialogs.py
@@ -81,8 +81,8 @@ class DirectoryDialog(Gtk.FileChooserDialog):
super(DirectoryDialog, self).__init__(
title=message,
action=Gtk.FileChooserAction.SELECT_FOLDER,
- buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE,
- Gtk.STOCK_OK, Gtk.ResponseType.OK)
+ buttons=('_Cancel', Gtk.ResponseType.CLOSE,
+ '_OK', Gtk.ResponseType.OK)
)
self.result = self.run()
self.folder = self.get_current_folder()
@@ -96,8 +96,8 @@ class FileDialog(Gtk.FileChooserDialog):
message = "Please choose a file"
super(FileDialog, self).__init__(
message, None, Gtk.FileChooserAction.OPEN,
- (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
- Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
+ ('_Cancel', Gtk.ResponseType.CANCEL,
+ '_OK', Gtk.ResponseType.OK)
)
self.set_local_only(False)
response = self.run()
@@ -171,8 +171,8 @@ class PgaSourceDialog(GtkBuilderDialog):
chooser = Gtk.FileChooserDialog(
"Select directory", self.dialog,
Gtk.FileChooserAction.SELECT_FOLDER,
- (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
- "Select", Gtk.ResponseType.OK)
+ ('_Cancel', Gtk.ResponseType.CANCEL,
+ '_OK', Gtk.ResponseType.OK)
)
chooser.set_local_only(False)
response = chooser.run()
diff --git a/lutris/gui/logwindow.py b/lutris/gui/logwindow.py
index ab300ae92..c1d7e212a 100644
--- a/lutris/gui/logwindow.py
+++ b/lutris/gui/logwindow.py
@@ -34,7 +34,7 @@ class LogTextView(Gtk.TextView):
class LogWindow(Dialog):
def __init__(self, title, parent):
super(LogWindow, self).__init__(title, parent, 0,
- (Gtk.STOCK_OK, Gtk.ResponseType.OK))
+ ('_OK', Gtk.ResponseType.OK))
self.set_size_request(640, 480)
self.grid = Gtk.Grid()
self.logtextview = LogTextView()
diff --git a/lutris/gui/runnerinstalldialog.py b/lutris/gui/runnerinstalldialog.py
index 344ded940..090297e0c 100644
--- a/lutris/gui/runnerinstalldialog.py
+++ b/lutris/gui/runnerinstalldialog.py
@@ -18,7 +18,7 @@ class RunnerInstallDialog(Dialog):
def __init__(self, title, parent, runner):
super(RunnerInstallDialog, self).__init__(
- title, parent, 0, (Gtk.STOCK_OK, Gtk.ResponseType.OK)
+ title, parent, 0, ('_OK', Gtk.ResponseType.OK)
)
self.runner = runner
self.runner_info = api.get_runners(self.runner)
diff --git a/lutris/gui/sidebar.py b/lutris/gui/sidebar.py
index 9be03a05c..6c5cd2968 100644
--- a/lutris/gui/sidebar.py
+++ b/lutris/gui/sidebar.py
@@ -91,8 +91,7 @@ class ContextualMenu(Gtk.Menu):
for entry in entries:
name = entry[0]
label = entry[1]
- action = Gtk.Action(name=name, label=label,
- tooltip=None, stock_id=None)
+ action = Gtk.Action(name=name, label=label)
action.connect('activate', entry[2])
menuitem = action.create_menu_item()
menuitem.action_id = name
diff --git a/lutris/gui/widgets.py b/lutris/gui/widgets.py
index 6bc6e97ba..bd6fcf347 100644
--- a/lutris/gui/widgets.py
+++ b/lutris/gui/widgets.py
@@ -100,8 +100,7 @@ class ContextualMenu(Gtk.Menu):
for entry in entries:
name = entry[0]
label = entry[1]
- action = Gtk.Action(name=name, label=label,
- tooltip=None, stock_id=None)
+ action = Gtk.Action(name=name, label=label)
action.connect('activate', entry[2])
menuitem = action.create_menu_item()
menuitem.action_id = name
@@ -485,7 +484,7 @@ class DownloadProgressBox(Gtk.VBox):
self.progressbar.set_margin_right(10)
progress_box.pack_start(self.progressbar, True, True, 0)
- self.cancel_button = Gtk.Button(stock=Gtk.STOCK_CANCEL)
+ self.cancel_button = Gtk.Button('_Cancel')
self.cancel_button.connect('clicked', self.cancel)
if not cancelable:
self.cancel_button.set_sensitive(False)
@@ -574,8 +573,8 @@ class FileChooserEntry(Gtk.Box):
)
self.file_chooser_dlg.add_buttons(
- Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE,
- Gtk.STOCK_OPEN, Gtk.ResponseType.OK
+ '_Cancel', Gtk.ResponseType.CLOSE,
+ '_OK', Gtk.ResponseType.OK
)
if default:
self.file_chooser_dlg.set_current_folder(
diff --git a/share/lutris/ui/LutrisWindow.ui b/share/lutris/ui/LutrisWindow.ui
index f1c8e54a7..2520f0c57 100644
--- a/share/lutris/ui/LutrisWindow.ui
+++ b/share/lutris/ui/LutrisWindow.ui
@@ -6,12 +6,57 @@
+
+
+
+
+
+