CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-05-18 11:32:50 +12:00
Code Issues Projects Releases Wiki Activity

Dialogs: Use consistent dialog titles for the launcher's dialogs

Browse source
This commit is contained in:
loathingKernel 2024-01-22 01:26:27 +02:00
parent e8e4ed739b
commit fb91a55f30
11 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rare/components/dialogs/install_dialog.py
View file

@ -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()

6
rare/components/dialogs/move_dialog.py
View file

@ -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()

6
rare/components/dialogs/selective_dialog.py
View file

@ -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)

6
rare/components/dialogs/uninstall_dialog.py
View file

@ -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))

4
rare/components/tabs/settings/widgets/wrappers.py
View file

@ -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)

2
rare/launcher/__init__.py
View file

@ -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)

6
rare/launcher/cloud_sync_dialog.py
View file

@ -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"<h4>{dialog_title_game(header, igame.title)}</h4>", self)
title_label = QLabel(f"<h4>{game_title(header, igame.title)}</h4>", self)
sync_widget = QWidget(self)
self.sync_ui = Ui_CloudSyncWidget()

14
rare/launcher/console_dialog.py
View file

@ -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()

6
rare/ui/launcher/console_env.py
View file

@ -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"))

2
rare/ui/launcher/console_env.ui
View file

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Rare - Console Environment</string>
<string notr="true">ConsoleEnv</string>
</property>
<layout class="QVBoxLayout" name="layout">
<item>

4
rare/widgets/dialogs.py
View file

@ -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):