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

Add 'Reset' Button for launch config selection in the configuration dialog

Browse source
This commit is contained in:
Daniel Johnson 2022-10-30 14:58:02 -04:00 committed by Mathieu Comandon
parent 9ed0f3cb53
commit e6b667bb99
2 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lutris/game.py
View file

@ -49,6 +49,8 @@ class Game(GObject.Object):
STATE_LAUNCHING = "launching"
STATE_RUNNING = "running"
PRIMARY_LAUNCH_CONFIG_NAME = "(primary)"
__gsignals__ = {
"game-error": (GObject.SIGNAL_RUN_FIRST, None, (object, )),
"game-notice": (GObject.SIGNAL_RUN_FIRST, None, (str, str)),
@ -456,7 +458,7 @@ class Game(GObject.Object):
keymap = Gdk.Keymap.get_default()
if keymap.get_modifier_state() & Gdk.ModifierType.SHIFT_MASK:
config_name_to_save = None
elif preferred_launch_command_name == "(primary)":
elif preferred_launch_command_name == Game.PRIMARY_LAUNCH_CONFIG_NAME:
config_index = 0
elif preferred_launch_command_name:
for index, config in enumerate(configs):
@ -470,8 +472,10 @@ class Game(GObject.Object):
config_index = dlg.config_index
if dlg.dont_show_again:
config_name_to_save = "(primary)" if config_index == 0 else configs[config_index - 1].get(
"name")
if config_index == 0:
config_name_to_save = Game.PRIMARY_LAUNCH_CONFIG_NAME
else:
config_name_to_save = configs[config_index - 1].get("name")
if config_index: # index 0 for no command at all
config = configs[config_index - 1]

35
lutris/gui/config/common.py
View file

@ -105,6 +105,7 @@ class GameDialogCommon(ModelessDialog):
if self.game:
info_box.pack_start(self._get_slug_box(), False, False, 6)
info_box.pack_start(self._get_directory_box(), False, False, 6)
info_box.pack_start(self._get_launch_config_box(), False, False, 6)
info_sw = self.build_scrolled_window(info_box)
self._add_notebook_tab(info_sw, _("Game info"))
@ -152,6 +153,40 @@ class GameDialogCommon(ModelessDialog):
box.pack_start(move_button, False, False, 0)
return box
def _get_launch_config_box(self):
box = Gtk.Box(spacing=12, margin_right=12, margin_left=12, visible=True)
game_config = self.game.config.game_level.get("game", {})
preferred_launch_command_name = game_config.get("preferred_launch_command_name")
if preferred_launch_command_name:
spacer = Gtk.Box()
spacer.set_size_request(230, -1)
box.pack_start(spacer, False, False, 0)
if preferred_launch_command_name == Game.PRIMARY_LAUNCH_CONFIG_NAME:
text = _("The default launch option will be used for this game")
else:
text = _("The '%s' launch option will be used for this game") % preferred_launch_command_name
label = Gtk.Label(text)
label.set_line_wrap(True)
label.set_halign(Gtk.Align.START)
label.set_xalign(0.0)
label.set_valign(Gtk.Align.CENTER)
box.pack_start(label, True, True, 0)
button = Gtk.Button(_("Reset"))
button.connect("clicked", self.on_reset_preferred_launch_command_clicked, box)
button.set_valign(Gtk.Align.CENTER)
box.pack_start(button, False, False, 0)
else:
box.hide()
return box
def on_reset_preferred_launch_command_clicked(self, _button, launch_config_box):
game_config = self.game.config.game_level.get("game", {})
del game_config["preferred_launch_command_name"]
launch_config_box.hide()
def _get_runner_box(self):
runner_box = Gtk.Box(spacing=12, margin_right=12, margin_left=12)