gaming/lutris
gaming/lutris
1
0
Fork 0
mirror of https://github.com/lutris/lutris synced 2024-09-15 22:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up spacing around options areas for consistency

Browse source 
There's a spacing of 12 px from the base class, we'll use that alone, and it all lines up nicely. It also makes it a little bit tighter; not a bad thing since the updates box doesn't fit vertically.

Also some spelling and warnings.
This commit is contained in:
Daniel Johnson 2023-12-05 16:53:49 -05:00
parent 8809920565
commit d45ab667c2
8 changed files with 48 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lutris/gui/config/accounts_box.py
View file

@ -16,7 +16,7 @@ class AccountsBox(BaseConfigBox):
_("Select which Steam account is used for Lutris integration and creating Steam shortcuts.")
))
frame = Gtk.Frame(visible=True, shadow_type=Gtk.ShadowType.ETCHED_IN)
self.pack_start(frame, False, False, 12)
self.pack_start(frame, False, False, 0)
vbox = Gtk.VBox(visible=True)
frame.add(vbox)

1
lutris/gui/config/base_config_box.py
View file

@ -22,7 +22,6 @@ class BaseConfigBox(VBox):
label = Gtk.Label(visible=True)
label.set_markup("<b>%s</b>" % text)
label.set_alignment(0, 0.5)
label.set_margin_bottom(8)
return label
def get_description_label(self, text: str) -> Gtk.Label:

2
lutris/gui/config/preferences_box.py
View file

@ -26,7 +26,7 @@ class InterfacePreferencesBox(BaseConfigBox):
frame = Gtk.Frame(visible=True, shadow_type=Gtk.ShadowType.ETCHED_IN)
listbox = Gtk.ListBox(visible=True)
frame.add(listbox)
self.pack_start(frame, False, False, 12)
self.pack_start(frame, False, False, 0)
for setting_key, label in self.settings_options.items():
list_box_row = Gtk.ListBoxRow(visible=True)
list_box_row.set_selectable(False)

4
lutris/gui/config/runners_box.py
View file

@ -23,11 +23,11 @@ class RunnersBox(BaseConfigBox):
"translation layers capable of running games.")
))
self.search_failed_label = Gtk.Label(_("No runners matched the search"))
self.pack_start(self.search_failed_label, False, False, 6)
self.pack_start(self.search_failed_label, False, False, 0)
self.runner_list_frame = Gtk.Frame(visible=True, shadow_type=Gtk.ShadowType.ETCHED_IN)
self.runner_listbox = Gtk.ListBox(visible=True)
self.runner_list_frame.add(self.runner_listbox)
self.pack_start(self.runner_list_frame, False, False, 6)
self.pack_start(self.runner_list_frame, False, False, 0)
def populate_runners(self):
runner_count = 0

2
lutris/gui/config/services_box.py
View file

@ -23,7 +23,7 @@ class ServicesBox(BaseConfigBox):
self.frame = Gtk.Frame(visible=True, shadow_type=Gtk.ShadowType.ETCHED_IN)
self.listbox = Gtk.ListBox(visible=True)
self.frame.add(self.listbox)
self.pack_start(self.frame, False, False, 12)
self.pack_start(self.frame, False, False, 0)
GLib.idle_add(self.populate_services)
def populate_services(self):

23
lutris/gui/config/storage_box.py
View file

@ -15,7 +15,7 @@ class StorageBox(BaseConfigBox):
super().__init__()
self.add(self.get_section_label(_("Paths")))
path_widgets = self.get_path_widgets()
self.pack_start(self._get_framed_options_list_box(path_widgets), False, False, 16)
self.pack_start(self._get_framed_options_list_box(path_widgets), False, False, 0)
def get_path_widgets(self):
widgets = []
@ -46,8 +46,8 @@ class StorageBox(BaseConfigBox):
def get_directory_chooser(self, path_setting):
label = Label()
label.set_markup("<b>%s</b>" % path_setting["name"])
chooser_wrapper = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=4, visible=True)
chooser_wrapper.set_margin_top(16)
wrapper = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=4, visible=True)
wrapper.set_margin_top(16)
default_path = path_setting["default"]
directory_chooser = FileChooserEntry(
@ -57,21 +57,20 @@ class StorageBox(BaseConfigBox):
default_path=default_path
)
directory_chooser.connect("changed", self.on_file_chooser_changed, path_setting)
chooser_wrapper.pack_start(label, False, False, 0)
chooser_wrapper.pack_start(directory_chooser, True, True, 0)
wrapper.pack_start(label, False, False, 0)
wrapper.pack_start(directory_chooser, True, True, 0)
if path_setting["help"]:
help_wrapper = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=4, visible=True)
help_wrapper.add(chooser_wrapper)
help_wrapper.add(wrapper)
help_label = Label()
help_label.set_markup("<i>%s</i>" % path_setting["help"])
help_wrapper.add(help_label)
help_wrapper.set_margin_bottom(16)
help_wrapper.set_margin_start(16)
return help_wrapper
chooser_wrapper.set_margin_start(16)
chooser_wrapper.set_margin_bottom(16)
wrapper = help_wrapper
wrapper.set_margin_start(16)
wrapper.set_margin_end(16)
wrapper.set_margin_bottom(16)
return chooser_wrapper
return wrapper
def on_file_chooser_changed(self, entry, setting):
text = entry.get_text()

60
lutris/gui/config/updates_box.py
View file

@ -26,12 +26,12 @@ class UpdatesBox(BaseConfigBox):
update_channel_radio_buttons = self.get_update_channel_radio_buttons()
update_label_text, update_button_text = self.get_wine_update_texts()
self.update_runnners_box = UpdateButtonBox(update_label_text,
update_button_text,
clicked=self.on_runners_update_clicked)
self.update_runners_box = UpdateButtonBox(update_label_text,
update_button_text,
clicked=self.on_runners_update_clicked)
self.pack_start(self._get_framed_options_list_box(update_channel_radio_buttons), False, False, 12)
self.pack_start(self._get_framed_options_list_box([self.update_runnners_box]), False, False, 12)
self.pack_start(self._get_framed_options_list_box(update_channel_radio_buttons), False, False, 0)
self.pack_start(self._get_framed_options_list_box([self.update_runners_box]), False, False, 0)
self.add(self.get_section_label(_("Runtime updates")))
self.add(self.get_description_label(
@ -47,12 +47,12 @@ class UpdatesBox(BaseConfigBox):
default=True,
extra_widget=self.update_runtime_box
)
self.pack_start(self._get_framed_options_list_box([update_runtime_box]), False, False, 12)
self.pack_start(self._get_framed_options_list_box([update_runtime_box]), False, False, 0)
self.add(self.get_section_label(_("Media updates")))
self.update_media_box = UpdateButtonBox("",
_("Download Missing Media"),
clicked=self.on_download_media_clicked)
self.pack_start(self._get_framed_options_list_box([self.update_media_box]), False, False, 12)
self.pack_start(self._get_framed_options_list_box([self.update_media_box]), False, False, 0)
def get_update_channel_radio_buttons(self):
update_channel = settings.read_setting("wine-update-channel", UPDATE_CHANNEL_STABLE)
@ -100,7 +100,11 @@ class UpdatesBox(BaseConfigBox):
"You don't have the recommended Wine version: <b>%s</b>"
) % wine_version_info['version']
update_button_text = _("Download %s") % wine_version_info['version']
return (update_label_text, update_button_text)
return update_label_text, update_button_text
def apply_wine_update_texts(self, completion_markup: str = "") -> None:
label_markup, _button_label = self.get_wine_update_texts()
self.update_runners_box.show_completion_markup(label_markup, completion_markup)
def _get_radio_button(self, label_markup, active, group, margin=12):
radio_button = Gtk.RadioButton.new_from_widget(group)
@ -126,7 +130,7 @@ class UpdatesBox(BaseConfigBox):
if error:
self.update_media_box.show_error(error)
elif not result:
self.update_media_box.show_completion_markup(_("Nothing to update"))
self.update_media_box.show_completion_markup("", _("Nothing to update"))
elif any(result.values()):
update_text = _("Updated: ")
names = {
@ -139,13 +143,13 @@ class UpdatesBox(BaseConfigBox):
if not update_text.endswith(": "):
update_text += ", "
update_text += f"{value} {names[key]}{'s' if value > 1 else ''}"
self.update_media_box.show_completion_markup(update_text)
self.update_media_box.show_completion_markup("", update_text)
application = Gio.Application.get_default()
if application and application.window:
application.window.queue_draw()
else:
self.update_media_box.show_completion_markup(_("No new media found."))
self.update_media_box.show_completion_markup("", _("No new media found."))
def _get_main_window(self):
application = Gio.Application.get_default()
@ -155,6 +159,7 @@ class UpdatesBox(BaseConfigBox):
return application.window
def on_runners_update_clicked(self, _widget):
window = self._get_main_window()
if not window:
return
@ -163,23 +168,19 @@ class UpdatesBox(BaseConfigBox):
component_updaters = updater.create_component_updaters()
if component_updaters:
def on_complete(_result):
self.update_runnners_box.show_completion_markup("")
update_label, _update_button = self.get_wine_update_texts()
self.update_runnners_box.label.set_markup(update_label)
self.apply_wine_update_texts()
started = window.install_runtime_component_updates(component_updaters, updater,
completion_function=on_complete,
error_function=self.update_runnners_box.show_error)
error_function=self.update_runners_box.show_error)
if started:
self.update_runnners_box.show_running_markup(_("<i>Downloading...</i>"))
self.update_runners_box.show_running_markup(_("<i>Downloading...</i>"))
else:
NoticeDialog(_("Updates are already being downloaded and installed."),
parent=self.get_toplevel())
else:
self.update_runnners_box.show_completion_markup(_("No updates are required at this time."))
update_label, _update_button = self.get_wine_update_texts()
self.update_runnners_box.label.set_markup(update_label)
self.apply_wine_update_texts(_("No updates are required at this time."))
def on_runtime_update_clicked(self, _widget):
def get_updater():
@ -200,10 +201,10 @@ class UpdatesBox(BaseConfigBox):
if component_updaters:
def on_complete(_result):
if len(component_updaters) == 1:
update_box.show_completion_markup(_("1 component has been updated."))
update_box.show_completion_markup("", _("1 component has been updated."))
else:
update_box.show_completion_markup(
_("%d components have been updated.") % len(component_updaters))
update_box.show_completion_markup("",
_("%d components have been updated.") % len(component_updaters))
started = window.install_runtime_component_updates(component_updaters, updater,
completion_function=on_complete,
@ -215,7 +216,7 @@ class UpdatesBox(BaseConfigBox):
NoticeDialog(_("Updates are already being downloaded and installed."),
parent=self.get_toplevel())
else:
update_box.show_completion_markup(_("No updates are required at this time."))
update_box.show_completion_markup("", _("No updates are required at this time."))
def on_update_channel_toggled(self, checkbox, value):
"""Update setting when update channel is toggled
@ -234,7 +235,7 @@ class UpdateButtonBox(Gtk.Box):
"""A box containing a button to start updating something, with methods to show a result
when done."""
def __init__(self, label: str, button_label: str, clicked):
def __init__(self, label: str, button_label: str, clicked: Callable[[Gtk.Widget], None]):
super().__init__(orientation=Gtk.Orientation.HORIZONTAL, margin=12, spacing=6, visible=True)
self.label = Gtk.Label(visible=True, xalign=0)
@ -250,23 +251,24 @@ class UpdateButtonBox(Gtk.Box):
self.result_label = Gtk.Label()
self.pack_end(self.result_label, False, False, 0)
def show_running_markup(self, markup):
def show_running_markup(self, markup: str) -> None:
self.button.hide()
self.result_label.set_markup(markup)
self.result_label.show()
self.spinner.show()
self.spinner.start()
def show_completion_markup(self, markup):
def show_completion_markup(self, label_markup: str, completion_markup: str) -> None:
self.button.hide()
self.result_label.show()
self.spinner.stop()
self.spinner.hide()
self.result_label.set_markup(markup)
self.label.set_markup(label_markup)
self.result_label.set_markup(completion_markup)
def show_error(self, error):
def show_error(self, error: Exception) -> None:
self.button.hide()
self.result_label.show()
self.spinner.stop()
self.spinner.hide()
self.result_label.set_markup("<b>Error:</b>%s" % gtk_safe(error))
self.result_label.set_markup("<b>Error:</b>%s" % gtk_safe(str(error)))

1
lutris/util/portals.py
View file

@ -1,4 +1,5 @@
import os
from gi.repository import Gio, GLib, GObject
PORTAL_BUS_NAME = "org.freedesktop.portal.Desktop"