From fb91a55f3021ef88803b52a2bcfba45573622b39 Mon Sep 17 00:00:00 2001
From: loathingKernel <142770+loathingKernel@users.noreply.github.com>
Date: Mon, 22 Jan 2024 01:26:27 +0200
Subject: [PATCH] Dialogs: Use consistent dialog titles for the launcher's
dialogs
---
rare/components/dialogs/install_dialog.py | 6 +++---
rare/components/dialogs/move_dialog.py | 6 +++---
rare/components/dialogs/selective_dialog.py | 6 +++---
rare/components/dialogs/uninstall_dialog.py | 6 +++---
rare/components/tabs/settings/widgets/wrappers.py | 4 ++--
rare/launcher/__init__.py | 2 +-
rare/launcher/cloud_sync_dialog.py | 6 +++---
rare/launcher/console_dialog.py | 14 ++++++++++----
rare/ui/launcher/console_env.py | 6 +++---
rare/ui/launcher/console_env.ui | 2 +-
rare/widgets/dialogs.py | 4 ++--
11 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/rare/components/dialogs/install_dialog.py b/rare/components/dialogs/install_dialog.py
index 6fafcae7..00c7f49e 100644
--- a/rare/components/dialogs/install_dialog.py
+++ b/rare/components/dialogs/install_dialog.py
@@ -15,7 +15,7 @@ from rare.ui.components.dialogs.install_dialog import Ui_InstallDialog
from rare.ui.components.dialogs.install_dialog_advanced import Ui_InstallDialogAdvanced
from rare.utils.misc import format_size, icon
from rare.widgets.collapsible_widget import CollapsibleFrame
-from rare.widgets.dialogs import ActionDialog, dialog_title_game
+from rare.widgets.dialogs import ActionDialog, game_title
from rare.widgets.indicator_edit import PathEdit, IndicatorReasonsCommon
from rare.widgets.selective_widget import SelectiveWidget
@@ -74,8 +74,8 @@ class InstallDialog(ActionDialog):
elif options.reset_sdl:
header = self.tr("Modify")
bicon = icon("fa.gear")
- self.setWindowTitle(dialog_title_game(header, rgame.app_title))
- self.setSubtitle(dialog_title_game(header, rgame.app_title))
+ self.setWindowTitle(game_title(header, rgame.app_title))
+ self.setSubtitle(game_title(header, rgame.app_title))
install_widget = QWidget(self)
self.ui = Ui_InstallDialog()
diff --git a/rare/components/dialogs/move_dialog.py b/rare/components/dialogs/move_dialog.py
index b7406444..a9bf56e4 100644
--- a/rare/components/dialogs/move_dialog.py
+++ b/rare/components/dialogs/move_dialog.py
@@ -11,7 +11,7 @@ from rare.models.install import MoveGameModel
from rare.models.game import RareGame
from rare.shared import RareCore
from rare.utils.misc import path_size, format_size, icon
-from rare.widgets.dialogs import ActionDialog, dialog_title_game
+from rare.widgets.dialogs import ActionDialog, game_title
from rare.widgets.elide_label import ElideLabel
from rare.widgets.indicator_edit import PathEdit, IndicatorReasons, IndicatorReasonsCommon
@@ -33,8 +33,8 @@ class MoveDialog(ActionDialog):
def __init__(self, rgame: RareGame, parent=None):
super(MoveDialog, self).__init__(parent=parent)
header = self.tr("Move")
- self.setWindowTitle(dialog_title_game(header, rgame.app_title))
- self.setSubtitle(dialog_title_game(header, rgame.app_title))
+ self.setWindowTitle(game_title(header, rgame.app_title))
+ self.setSubtitle(game_title(header, rgame.app_title))
self.rcore = RareCore.instance()
self.core = RareCore.instance().core()
diff --git a/rare/components/dialogs/selective_dialog.py b/rare/components/dialogs/selective_dialog.py
index 50386b1f..3bdab291 100644
--- a/rare/components/dialogs/selective_dialog.py
+++ b/rare/components/dialogs/selective_dialog.py
@@ -4,7 +4,7 @@ from PyQt5.QtWidgets import QVBoxLayout, QGroupBox
from rare.models.game import RareGame
from rare.models.install import SelectiveDownloadsModel
from rare.utils.misc import icon
-from rare.widgets.dialogs import ButtonDialog, dialog_title_game
+from rare.widgets.dialogs import ButtonDialog, game_title
from rare.widgets.selective_widget import SelectiveWidget
@@ -14,8 +14,8 @@ class SelectiveDialog(ButtonDialog):
def __init__(self, rgame: RareGame, parent=None):
super(SelectiveDialog, self).__init__(parent=parent)
header = self.tr("Optional downloads for")
- self.setWindowTitle(dialog_title_game(header, rgame.app_title))
- self.setSubtitle(dialog_title_game(header, rgame.app_title))
+ self.setWindowTitle(game_title(header, rgame.app_title))
+ self.setSubtitle(game_title(header, rgame.app_title))
self.rgame = rgame
self.selective_widget = SelectiveWidget(rgame, rgame.igame.platform, self)
diff --git a/rare/components/dialogs/uninstall_dialog.py b/rare/components/dialogs/uninstall_dialog.py
index 07befe14..a935e07b 100644
--- a/rare/components/dialogs/uninstall_dialog.py
+++ b/rare/components/dialogs/uninstall_dialog.py
@@ -7,7 +7,7 @@ from PyQt5.QtWidgets import (
from rare.models.game import RareGame
from rare.models.install import UninstallOptionsModel
from rare.utils.misc import icon
-from rare.widgets.dialogs import ButtonDialog, dialog_title_game
+from rare.widgets.dialogs import ButtonDialog, game_title
class UninstallDialog(ButtonDialog):
@@ -16,8 +16,8 @@ class UninstallDialog(ButtonDialog):
def __init__(self, rgame: RareGame, options: UninstallOptionsModel, parent=None):
super(UninstallDialog, self).__init__(parent=parent)
header = self.tr("Uninstall")
- self.setWindowTitle(dialog_title_game(header, rgame.app_title))
- self.setSubtitle(dialog_title_game(header, rgame.app_title))
+ self.setWindowTitle(game_title(header, rgame.app_title))
+ self.setSubtitle(game_title(header, rgame.app_title))
self.keep_files = QCheckBox(self.tr("Keep files"))
self.keep_files.setChecked(bool(options.keep_files))
diff --git a/rare/components/tabs/settings/widgets/wrappers.py b/rare/components/tabs/settings/widgets/wrappers.py
index 10b15856..81b91c67 100644
--- a/rare/components/tabs/settings/widgets/wrappers.py
+++ b/rare/components/tabs/settings/widgets/wrappers.py
@@ -22,7 +22,7 @@ from PyQt5.QtWidgets import (
from rare.models.wrapper import Wrapper
from rare.shared import RareCore
from rare.utils.misc import icon
-from rare.widgets.dialogs import ButtonDialog, dialog_title_game
+from rare.widgets.dialogs import ButtonDialog, game_title
if pf.system() in {"Linux", "FreeBSD"}:
from rare.utils.runners import proton
@@ -40,7 +40,7 @@ class WrapperDialog(ButtonDialog):
else:
header = self.tr("Add wrapper")
self.setWindowTitle(header)
- self.setSubtitle(dialog_title_game(header, wrapper_name) if wrapper_name else header)
+ self.setSubtitle(game_title(header, wrapper_name) if wrapper_name else header)
self.line_edit = QLineEdit(wrapper_command, self)
self.line_edit.textChanged.connect(self.__on_text_changed)
diff --git a/rare/launcher/__init__.py b/rare/launcher/__init__.py
index 978b7854..cd26bf45 100644
--- a/rare/launcher/__init__.py
+++ b/rare/launcher/__init__.py
@@ -147,7 +147,7 @@ class RareLauncher(RareApp):
self.load_translator(lang)
if QSettings(self).value(*options.log_games):
- self.console = ConsoleDialog()
+ self.console = ConsoleDialog(game.app_title)
self.console.show()
self.game_process.finished.connect(self.__process_finished)
diff --git a/rare/launcher/cloud_sync_dialog.py b/rare/launcher/cloud_sync_dialog.py
index 741298c1..5af0de0f 100644
--- a/rare/launcher/cloud_sync_dialog.py
+++ b/rare/launcher/cloud_sync_dialog.py
@@ -10,7 +10,7 @@ from legendary.models.game import InstalledGame
from rare.ui.components.tabs.games.game_info.cloud_sync_widget import Ui_CloudSyncWidget
from rare.utils.misc import icon
-from rare.widgets.dialogs import ButtonDialog, dialog_title_game
+from rare.widgets.dialogs import ButtonDialog, game_title
logger = getLogger("CloudSyncDialog")
@@ -28,9 +28,9 @@ class CloudSyncDialog(ButtonDialog):
def __init__(self, igame: InstalledGame, dt_local: datetime, dt_remote: datetime, parent=None):
super(CloudSyncDialog, self).__init__(parent=parent)
header = self.tr("Cloud saves for")
- self.setWindowTitle(dialog_title_game(header, igame.title))
+ self.setWindowTitle(game_title(header, igame.title))
- title_label = QLabel(f"{dialog_title_game(header, igame.title)}
", self)
+ title_label = QLabel(f"{game_title(header, igame.title)}
", self)
sync_widget = QWidget(self)
self.sync_ui = Ui_CloudSyncWidget()
diff --git a/rare/launcher/console_dialog.py b/rare/launcher/console_dialog.py
index bd108ca7..65023ae4 100644
--- a/rare/launcher/console_dialog.py
+++ b/rare/launcher/console_dialog.py
@@ -14,6 +14,7 @@ from PyQt5.QtWidgets import (
)
from rare.ui.launcher.console_env import Ui_ConsoleEnv
+from rare.widgets.dialogs import dialog_title, game_title
class ConsoleDialog(QDialog):
@@ -21,10 +22,12 @@ class ConsoleDialog(QDialog):
kill = pyqtSignal()
env: QProcessEnvironment
- def __init__(self, parent=None):
+ def __init__(self, app_title: str, parent=None):
super(ConsoleDialog, self).__init__(parent=parent)
self.setAttribute(Qt.WA_DeleteOnClose, True)
- self.setWindowTitle("Rare - Console")
+ self.setWindowTitle(
+ dialog_title(game_title(self.tr("Console"), app_title))
+ )
self.setGeometry(0, 0, 640, 480)
layout = QVBoxLayout()
@@ -61,7 +64,7 @@ class ConsoleDialog(QDialog):
self.setLayout(layout)
- self.env_variables = ConsoleEnv(self)
+ self.env_variables = ConsoleEnv(app_title, self)
self.env_variables.hide()
self.accept_close = False
@@ -139,11 +142,14 @@ class ConsoleDialog(QDialog):
class ConsoleEnv(QDialog):
- def __init__(self, parent=None):
+ def __init__(self, app_title: str, parent=None):
super(ConsoleEnv, self).__init__(parent=parent)
self.setAttribute(Qt.WA_DeleteOnClose, False)
self.ui = Ui_ConsoleEnv()
self.ui.setupUi(self)
+ self.setWindowTitle(
+ dialog_title(game_title(self.tr("Environment"), app_title))
+ )
def setTable(self, env: QProcessEnvironment):
self.ui.table.clearContents()
diff --git a/rare/ui/launcher/console_env.py b/rare/ui/launcher/console_env.py
index 31e97ce8..2d25305f 100644
--- a/rare/ui/launcher/console_env.py
+++ b/rare/ui/launcher/console_env.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
-# Form implementation generated from reading ui file 'rare/ui/components/extra/console_env.ui'
+# Form implementation generated from reading ui file 'rare/ui/launcher/console_env.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.10
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
@@ -15,6 +15,7 @@ class Ui_ConsoleEnv(object):
def setupUi(self, ConsoleEnv):
ConsoleEnv.setObjectName("ConsoleEnv")
ConsoleEnv.resize(600, 400)
+ ConsoleEnv.setWindowTitle("ConsoleEnv")
self.layout = QtWidgets.QVBoxLayout(ConsoleEnv)
self.layout.setObjectName("layout")
self.table = QtWidgets.QTableWidget(ConsoleEnv)
@@ -48,7 +49,6 @@ class Ui_ConsoleEnv(object):
def retranslateUi(self, ConsoleEnv):
_translate = QtCore.QCoreApplication.translate
- ConsoleEnv.setWindowTitle(_translate("ConsoleEnv", "Rare - Console Environment"))
self.table.setSortingEnabled(True)
item = self.table.horizontalHeaderItem(0)
item.setText(_translate("ConsoleEnv", "Variable"))
diff --git a/rare/ui/launcher/console_env.ui b/rare/ui/launcher/console_env.ui
index 91283242..c9d430c4 100644
--- a/rare/ui/launcher/console_env.ui
+++ b/rare/ui/launcher/console_env.ui
@@ -11,7 +11,7 @@
- Rare - Console Environment
+ ConsoleEnv
-
diff --git a/rare/widgets/dialogs.py b/rare/widgets/dialogs.py
index cf887247..83628d1f 100644
--- a/rare/widgets/dialogs.py
+++ b/rare/widgets/dialogs.py
@@ -17,7 +17,7 @@ from PyQt5.QtWidgets import (
from rare.utils.misc import icon
-def dialog_title_game(text: str, app_title: str) -> str:
+def game_title(text: str, app_title: str) -> str:
return f"{text} '{app_title}'"
@@ -213,7 +213,7 @@ class ActionDialog(ButtonDialog):
super(BaseDialog, self).closeEvent(a0)
-__all__ = ["dialog_title", "dialog_title_game", "BaseDialog", "ButtonDialog", "ActionDialog"]
+__all__ = ["dialog_title", "game_title", "BaseDialog", "ButtonDialog", "ActionDialog"]
class TestDialog(BaseDialog):