diff --git a/rare/models/install.py b/rare/models/install.py index 4e1420857a..b7b2bd218e 100644 --- a/rare/models/install.py +++ b/rare/models/install.py @@ -27,7 +27,7 @@ class InstallOptionsModel: ignore_space: bool = False reset_sdl: bool = False disable_https: bool = False - always_use_signed_urls: bool = False + always_use_signed_urls: bool = True skip_dlcs: bool = False with_dlcs: bool = False # Rare's internal arguments diff --git a/rare/ui/components/tabs/library/details/details.py b/rare/ui/components/tabs/library/details/details.py index c7a74d1414..268580cf1e 100644 --- a/rare/ui/components/tabs/library/details/details.py +++ b/rare/ui/components/tabs/library/details/details.py @@ -17,7 +17,6 @@ QGroupBox, QHBoxLayout, QLabel, - QLayout, QProgressBar, QPushButton, QSizePolicy, @@ -34,7 +33,7 @@ class Ui_GameDetails(object): def setupUi(self, GameDetails): if not GameDetails.objectName(): GameDetails.setObjectName(u"GameDetails") - GameDetails.resize(888, 603) + GameDetails.resize(870, 601) GameDetails.setWindowTitle(u"GameDetails") self.main_layout = QHBoxLayout(GameDetails) self.main_layout.setObjectName(u"main_layout") @@ -73,36 +72,115 @@ def setupUi(self, GameDetails): self.right_layout = QGridLayout() self.right_layout.setSpacing(24) self.right_layout.setObjectName(u"right_layout") - self.details_layout = QFormLayout() + self.description_field = QTextBrowser(GameDetails) + self.description_field.setObjectName(u"description_field") + self.description_field.setMinimumSize(QSize(450, 0)) + self.description_field.setOpenExternalLinks(True) + + self.right_layout.addWidget(self.description_field, 1, 0, 1, 1) + + self.requirements_group = QFrame(GameDetails) + self.requirements_group.setObjectName(u"requirements_group") + self.requirements_group.setFrameShape(QFrame.Shape.StyledPanel) + self.requirements_group.setFrameShadow(QFrame.Shadow.Sunken) + self.requirements_layout = QHBoxLayout(self.requirements_group) + self.requirements_layout.setObjectName(u"requirements_layout") + + self.right_layout.addWidget(self.requirements_group, 2, 0, 2, 2) + + self.achievements_group = QWidget(GameDetails) + self.achievements_group.setObjectName(u"achievements_group") + self.achievements_layout = QVBoxLayout(self.achievements_group) + self.achievements_layout.setObjectName(u"achievements_layout") + self.achievements_layout.setContentsMargins(0, 0, 0, 0) + self.achievement_stats_layout = QHBoxLayout() + self.achievement_stats_layout.setObjectName(u"achievement_stats_layout") + self.achievement_stats_layout.setContentsMargins(0, -1, 0, -1) + self.progress_label = QLabel(self.achievements_group) + self.progress_label.setObjectName(u"progress_label") + font = QFont() + font.setBold(True) + self.progress_label.setFont(font) + + self.achievement_stats_layout.addWidget(self.progress_label) + + self.progress_field = QLabel(self.achievements_group) + self.progress_field.setObjectName(u"progress_field") + + self.achievement_stats_layout.addWidget(self.progress_field) + + self.exp_label = QLabel(self.achievements_group) + self.exp_label.setObjectName(u"exp_label") + self.exp_label.setFont(font) + + self.achievement_stats_layout.addWidget(self.exp_label) + + self.exp_field = QLabel(self.achievements_group) + self.exp_field.setObjectName(u"exp_field") + + self.achievement_stats_layout.addWidget(self.exp_field) + + self.achievement_stats_layout.setStretch(1, 1) + self.achievement_stats_layout.setStretch(3, 1) + + self.achievements_layout.addLayout(self.achievement_stats_layout) + + self.achievements_toolbox = QToolBox(self.achievements_group) + self.achievements_toolbox.setObjectName(u"achievements_toolbox") + self.ach_progress_page = QWidget() + self.ach_progress_page.setObjectName(u"ach_progress_page") + self.ach_progress_page.setGeometry(QRect(0, 0, 274, 417)) + self.achievements_toolbox.addItem(self.ach_progress_page, u"In progress") + self.ach_completed_page = QWidget() + self.ach_completed_page.setObjectName(u"ach_completed_page") + self.ach_completed_page.setGeometry(QRect(0, 0, 274, 371)) + self.achievements_toolbox.addItem(self.ach_completed_page, u"Completed") + self.ach_uninitiated_page = QWidget() + self.ach_uninitiated_page.setObjectName(u"ach_uninitiated_page") + self.ach_uninitiated_page.setGeometry(QRect(0, 0, 274, 371)) + self.achievements_toolbox.addItem(self.ach_uninitiated_page, u"Uninitiated") + self.ach_hidden_page = QWidget() + self.ach_hidden_page.setObjectName(u"ach_hidden_page") + self.ach_hidden_page.setGeometry(QRect(0, 0, 274, 371)) + self.achievements_toolbox.addItem(self.ach_hidden_page, u"Hidden") + + self.achievements_layout.addWidget(self.achievements_toolbox) + + + self.right_layout.addWidget(self.achievements_group, 0, 1, 2, 1) + + self.details_widget = QWidget(GameDetails) + self.details_widget.setObjectName(u"details_widget") + sizePolicy.setHeightForWidth(self.details_widget.sizePolicy().hasHeightForWidth()) + self.details_widget.setSizePolicy(sizePolicy) + self.details_widget.setMinimumSize(QSize(450, 0)) + self.details_layout = QFormLayout(self.details_widget) self.details_layout.setObjectName(u"details_layout") - self.details_layout.setSizeConstraint(QLayout.SizeConstraint.SetFixedSize) self.details_layout.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow) self.details_layout.setLabelAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setHorizontalSpacing(12) self.details_layout.setVerticalSpacing(12) - self.details_layout.setContentsMargins(12, -1, -1, -1) - self.dev_label = QLabel(GameDetails) + self.details_layout.setContentsMargins(12, 0, 0, 0) + self.dev_label = QLabel(self.details_widget) self.dev_label.setObjectName(u"dev_label") sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred) sizePolicy2.setHorizontalStretch(0) sizePolicy2.setVerticalStretch(0) sizePolicy2.setHeightForWidth(self.dev_label.sizePolicy().hasHeightForWidth()) self.dev_label.setSizePolicy(sizePolicy2) - font = QFont() - font.setBold(True) self.dev_label.setFont(font) self.dev_label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setWidget(0, QFormLayout.ItemRole.LabelRole, self.dev_label) - self.dev = QLabel(GameDetails) + self.dev = QLabel(self.details_widget) self.dev.setObjectName(u"dev") self.dev.setText(u"error") self.dev.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse) self.details_layout.setWidget(0, QFormLayout.ItemRole.FieldRole, self.dev) - self.app_name_label = QLabel(GameDetails) + self.app_name_label = QLabel(self.details_widget) self.app_name_label.setObjectName(u"app_name_label") sizePolicy2.setHeightForWidth(self.app_name_label.sizePolicy().hasHeightForWidth()) self.app_name_label.setSizePolicy(sizePolicy2) @@ -111,14 +189,14 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(1, QFormLayout.ItemRole.LabelRole, self.app_name_label) - self.app_name = QLabel(GameDetails) + self.app_name = QLabel(self.details_widget) self.app_name.setObjectName(u"app_name") self.app_name.setText(u"error") self.app_name.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse) self.details_layout.setWidget(1, QFormLayout.ItemRole.FieldRole, self.app_name) - self.version_label = QLabel(GameDetails) + self.version_label = QLabel(self.details_widget) self.version_label.setObjectName(u"version_label") sizePolicy2.setHeightForWidth(self.version_label.sizePolicy().hasHeightForWidth()) self.version_label.setSizePolicy(sizePolicy2) @@ -127,14 +205,14 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(2, QFormLayout.ItemRole.LabelRole, self.version_label) - self.version = QLabel(GameDetails) + self.version = QLabel(self.details_widget) self.version.setObjectName(u"version") self.version.setText(u"error") self.version.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse) self.details_layout.setWidget(2, QFormLayout.ItemRole.FieldRole, self.version) - self.grade_label = QLabel(GameDetails) + self.grade_label = QLabel(self.details_widget) self.grade_label.setObjectName(u"grade_label") sizePolicy2.setHeightForWidth(self.grade_label.sizePolicy().hasHeightForWidth()) self.grade_label.setSizePolicy(sizePolicy2) @@ -143,14 +221,14 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(3, QFormLayout.ItemRole.LabelRole, self.grade_label) - self.grade = QLabel(GameDetails) + self.grade = QLabel(self.details_widget) self.grade.setObjectName(u"grade") self.grade.setText(u"error") self.grade.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse) self.details_layout.setWidget(3, QFormLayout.ItemRole.FieldRole, self.grade) - self.install_size_label = QLabel(GameDetails) + self.install_size_label = QLabel(self.details_widget) self.install_size_label.setObjectName(u"install_size_label") sizePolicy2.setHeightForWidth(self.install_size_label.sizePolicy().hasHeightForWidth()) self.install_size_label.setSizePolicy(sizePolicy2) @@ -159,14 +237,14 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(4, QFormLayout.ItemRole.LabelRole, self.install_size_label) - self.install_size = QLabel(GameDetails) + self.install_size = QLabel(self.details_widget) self.install_size.setObjectName(u"install_size") self.install_size.setText(u"error") self.install_size.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse) self.details_layout.setWidget(4, QFormLayout.ItemRole.FieldRole, self.install_size) - self.install_path_label = QLabel(GameDetails) + self.install_path_label = QLabel(self.details_widget) self.install_path_label.setObjectName(u"install_path_label") sizePolicy2.setHeightForWidth(self.install_path_label.sizePolicy().hasHeightForWidth()) self.install_path_label.setSizePolicy(sizePolicy2) @@ -175,7 +253,7 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(5, QFormLayout.ItemRole.LabelRole, self.install_path_label) - self.install_path = QLabel(GameDetails) + self.install_path = QLabel(self.details_widget) self.install_path.setObjectName(u"install_path") self.install_path.setText(u"error") self.install_path.setWordWrap(True) @@ -183,7 +261,7 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(5, QFormLayout.ItemRole.FieldRole, self.install_path) - self.platform_label = QLabel(GameDetails) + self.platform_label = QLabel(self.details_widget) self.platform_label.setObjectName(u"platform_label") sizePolicy2.setHeightForWidth(self.platform_label.sizePolicy().hasHeightForWidth()) self.platform_label.setSizePolicy(sizePolicy2) @@ -192,13 +270,13 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(6, QFormLayout.ItemRole.LabelRole, self.platform_label) - self.platform = QLabel(GameDetails) + self.platform = QLabel(self.details_widget) self.platform.setObjectName(u"platform") self.platform.setText(u"error") self.details_layout.setWidget(6, QFormLayout.ItemRole.FieldRole, self.platform) - self.actions_label = QLabel(GameDetails) + self.actions_label = QLabel(self.details_widget) self.actions_label.setObjectName(u"actions_label") sizePolicy2.setHeightForWidth(self.actions_label.sizePolicy().hasHeightForWidth()) self.actions_label.setSizePolicy(sizePolicy2) @@ -207,12 +285,9 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(7, QFormLayout.ItemRole.LabelRole, self.actions_label) - self.actions_stack = QStackedWidget(GameDetails) + self.actions_stack = QStackedWidget(self.details_widget) self.actions_stack.setObjectName(u"actions_stack") - sizePolicy.setHeightForWidth(self.actions_stack.sizePolicy().hasHeightForWidth()) - self.actions_stack.setSizePolicy(sizePolicy) self.actions_stack.setMinimumSize(QSize(300, 0)) - self.actions_stack.setMaximumSize(QSize(300, 16777215)) self.installed_page = QWidget() self.installed_page.setObjectName(u"installed_page") self.installed_layout = QVBoxLayout(self.installed_page) @@ -323,79 +398,7 @@ def setupUi(self, GameDetails): self.details_layout.setWidget(7, QFormLayout.ItemRole.FieldRole, self.actions_stack) - self.right_layout.addLayout(self.details_layout, 0, 0, 1, 1) - - self.description_field = QTextBrowser(GameDetails) - self.description_field.setObjectName(u"description_field") - self.description_field.setOpenExternalLinks(True) - - self.right_layout.addWidget(self.description_field, 1, 0, 1, 1) - - self.requirements_group = QFrame(GameDetails) - self.requirements_group.setObjectName(u"requirements_group") - self.requirements_group.setFrameShape(QFrame.Shape.StyledPanel) - self.requirements_group.setFrameShadow(QFrame.Shadow.Sunken) - self.requirements_layout = QHBoxLayout(self.requirements_group) - self.requirements_layout.setObjectName(u"requirements_layout") - - self.right_layout.addWidget(self.requirements_group, 2, 0, 2, 2) - - self.achievements_group = QWidget(GameDetails) - self.achievements_group.setObjectName(u"achievements_group") - self.achievements_layout = QVBoxLayout(self.achievements_group) - self.achievements_layout.setObjectName(u"achievements_layout") - self.achievements_layout.setContentsMargins(0, 0, 0, 0) - self.achievement_stats_layout = QHBoxLayout() - self.achievement_stats_layout.setObjectName(u"achievement_stats_layout") - self.achievement_stats_layout.setContentsMargins(0, -1, 0, -1) - self.progress_label = QLabel(self.achievements_group) - self.progress_label.setObjectName(u"progress_label") - self.progress_label.setFont(font) - - self.achievement_stats_layout.addWidget(self.progress_label) - - self.progress_field = QLabel(self.achievements_group) - self.progress_field.setObjectName(u"progress_field") - - self.achievement_stats_layout.addWidget(self.progress_field) - - self.exp_label = QLabel(self.achievements_group) - self.exp_label.setObjectName(u"exp_label") - self.exp_label.setFont(font) - - self.achievement_stats_layout.addWidget(self.exp_label) - - self.exp_field = QLabel(self.achievements_group) - self.exp_field.setObjectName(u"exp_field") - - self.achievement_stats_layout.addWidget(self.exp_field) - - self.achievement_stats_layout.setStretch(1, 1) - self.achievement_stats_layout.setStretch(3, 1) - - self.achievements_layout.addLayout(self.achievement_stats_layout) - - self.achievements_toolbox = QToolBox(self.achievements_group) - self.achievements_toolbox.setObjectName(u"achievements_toolbox") - self.ach_progress_page = QWidget() - self.ach_progress_page.setObjectName(u"ach_progress_page") - self.ach_progress_page.setGeometry(QRect(0, 0, 320, 419)) - self.achievements_toolbox.addItem(self.ach_progress_page, u"In progress") - self.ach_completed_page = QWidget() - self.ach_completed_page.setObjectName(u"ach_completed_page") - self.ach_completed_page.setGeometry(QRect(0, 0, 320, 419)) - self.achievements_toolbox.addItem(self.ach_completed_page, u"Completed") - self.ach_uninitiated_page = QWidget() - self.ach_uninitiated_page.setObjectName(u"ach_uninitiated_page") - self.achievements_toolbox.addItem(self.ach_uninitiated_page, u"Uninitiated") - self.ach_hidden_page = QWidget() - self.ach_hidden_page.setObjectName(u"ach_hidden_page") - self.achievements_toolbox.addItem(self.ach_hidden_page, u"Hidden") - - self.achievements_layout.addWidget(self.achievements_toolbox) - - - self.right_layout.addWidget(self.achievements_group, 0, 1, 2, 1) + self.right_layout.addWidget(self.details_widget, 0, 0, 1, 1) self.right_layout.setRowStretch(1, 1) self.right_layout.setColumnStretch(1, 1) @@ -406,10 +409,10 @@ def setupUi(self, GameDetails): self.retranslateUi(GameDetails) - self.actions_stack.setCurrentIndex(0) + self.achievements_toolbox.setCurrentIndex(0) + self.actions_stack.setCurrentIndex(1) self.verify_stack.setCurrentIndex(0) self.move_stack.setCurrentIndex(0) - self.achievements_toolbox.setCurrentIndex(0) # setupUi @@ -419,6 +422,14 @@ def retranslateUi(self, GameDetails): self.add_tag_button.setToolTip(QCoreApplication.translate("GameDetails", u"Add custom tag", None)) #endif // QT_CONFIG(tooltip) self.add_tag_button.setText(QCoreApplication.translate("GameDetails", u"Add tag", None)) + self.progress_label.setText(QCoreApplication.translate("GameDetails", u"Progress:", None)) + self.progress_field.setText(QCoreApplication.translate("GameDetails", u"progress_error", None)) + self.exp_label.setText(QCoreApplication.translate("GameDetails", u"Experience:", None)) + self.exp_field.setText(QCoreApplication.translate("GameDetails", u"xp_error", None)) + self.achievements_toolbox.setItemText(self.achievements_toolbox.indexOf(self.ach_progress_page), QCoreApplication.translate("GameDetails", u"In progress", None)) + self.achievements_toolbox.setItemText(self.achievements_toolbox.indexOf(self.ach_completed_page), QCoreApplication.translate("GameDetails", u"Completed", None)) + self.achievements_toolbox.setItemText(self.achievements_toolbox.indexOf(self.ach_uninitiated_page), QCoreApplication.translate("GameDetails", u"Uninitiated", None)) + self.achievements_toolbox.setItemText(self.achievements_toolbox.indexOf(self.ach_hidden_page), QCoreApplication.translate("GameDetails", u"Hidden", None)) self.dev_label.setText(QCoreApplication.translate("GameDetails", u"Developer", None)) self.app_name_label.setText(QCoreApplication.translate("GameDetails", u"Application name", None)) self.version_label.setText(QCoreApplication.translate("GameDetails", u"Version", None)) @@ -434,14 +445,6 @@ def retranslateUi(self, GameDetails): self.uninstall_button.setText(QCoreApplication.translate("GameDetails", u"Uninstall", None)) self.install_button.setText(QCoreApplication.translate("GameDetails", u"Install", None)) self.import_button.setText(QCoreApplication.translate("GameDetails", u"Import", None)) - self.progress_label.setText(QCoreApplication.translate("GameDetails", u"Progress:", None)) - self.progress_field.setText(QCoreApplication.translate("GameDetails", u"progress_error", None)) - self.exp_label.setText(QCoreApplication.translate("GameDetails", u"Experience:", None)) - self.exp_field.setText(QCoreApplication.translate("GameDetails", u"xp_error", None)) - self.achievements_toolbox.setItemText(self.achievements_toolbox.indexOf(self.ach_progress_page), QCoreApplication.translate("GameDetails", u"In progress", None)) - self.achievements_toolbox.setItemText(self.achievements_toolbox.indexOf(self.ach_completed_page), QCoreApplication.translate("GameDetails", u"Completed", None)) - self.achievements_toolbox.setItemText(self.achievements_toolbox.indexOf(self.ach_uninitiated_page), QCoreApplication.translate("GameDetails", u"Uninitiated", None)) - self.achievements_toolbox.setItemText(self.achievements_toolbox.indexOf(self.ach_hidden_page), QCoreApplication.translate("GameDetails", u"Hidden", None)) pass # retranslateUi diff --git a/rare/ui/components/tabs/library/details/details.ui b/rare/ui/components/tabs/library/details/details.ui index c3369b32f2..dde10c0758 100644 --- a/rare/ui/components/tabs/library/details/details.ui +++ b/rare/ui/components/tabs/library/details/details.ui @@ -6,8 +6,8 @@ 0 0 - 842 - 603 + 870 + 601 @@ -57,497 +57,14 @@ 24 - - - - QLayout::SizeConstraint::SetFixedSize - - - QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - 12 - - - 12 - - - 12 - - - - - - 0 - 0 - - - - - true - - - - Developer - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - error - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - true - - - - Application name - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - error - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - true - - - - Version - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - error - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - true - - - - ProtonDB grade - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - error - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - true - - - - Installation size - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - error - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - true - - - - Installation path - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - error - - - true - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - true - - - - Platform - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - error - - - - - - - - 0 - 0 - - - - - true - - - - Actions - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - - 300 - 0 - - - - - 300 - 16777215 - - - - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Modify - - - - - - - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Verify - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 24 - - - - - - - - - - - Repair - - - - - - - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Move - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 24 - - - - - - - - - - - Uninstall - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Install - - - - - - - Import - - - - - - - Qt::Orientation::Vertical - - - - 0 - 0 - - - - - - - - - - + + + 450 + 0 + + true @@ -638,7 +155,7 @@ 0 0 274 - 419 + 417 @@ -651,7 +168,7 @@ 0 0 274 - 419 + 371 @@ -664,7 +181,7 @@ 0 0 274 - 419 + 371 @@ -677,7 +194,7 @@ 0 0 274 - 419 + 371 @@ -689,6 +206,503 @@ + + + + + 0 + 0 + + + + + 450 + 0 + + + + + QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + 12 + + + 12 + + + 12 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + true + + + + Developer + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + error + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + true + + + + Application name + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + error + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + true + + + + Version + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + error + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + true + + + + ProtonDB grade + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + error + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + true + + + + Installation size + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + error + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + true + + + + Installation path + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + error + + + true + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + true + + + + Platform + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + error + + + + + + + + 0 + 0 + + + + + true + + + + Actions + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 300 + 0 + + + + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Modify + + + + + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Verify + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 24 + + + + + + + + + + + Repair + + + + + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + Move + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 24 + + + + + + + + + + + Uninstall + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Install + + + + + + + Import + + + + + + + Qt::Orientation::Vertical + + + + 0 + 0 + + + + + + + + + + + diff --git a/rare/ui/components/tabs/store/details.py b/rare/ui/components/tabs/store/details.py index be7b70e02f..3503f4521d 100644 --- a/rare/ui/components/tabs/store/details.py +++ b/rare/ui/components/tabs/store/details.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'details.ui' ## -## Created by: Qt User Interface Compiler version 6.9.1 +## Created by: Qt User Interface Compiler version 6.10.1 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -29,7 +29,7 @@ class Ui_StoreDetailsWidget(object): def setupUi(self, StoreDetailsWidget): if not StoreDetailsWidget.objectName(): StoreDetailsWidget.setObjectName(u"StoreDetailsWidget") - StoreDetailsWidget.resize(706, 302) + StoreDetailsWidget.resize(850, 492) StoreDetailsWidget.setWindowTitle(u"StoreDetailsWidget") self.main_layout = QHBoxLayout(StoreDetailsWidget) self.main_layout.setObjectName(u"main_layout") @@ -54,15 +54,41 @@ def setupUi(self, StoreDetailsWidget): self.right_layout = QGridLayout() self.right_layout.setSpacing(24) self.right_layout.setObjectName(u"right_layout") - self.details_layout = QFormLayout() + self.requirements_frame = QFrame(StoreDetailsWidget) + self.requirements_frame.setObjectName(u"requirements_frame") + sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed) + sizePolicy1.setHorizontalStretch(0) + sizePolicy1.setVerticalStretch(0) + sizePolicy1.setHeightForWidth(self.requirements_frame.sizePolicy().hasHeightForWidth()) + self.requirements_frame.setSizePolicy(sizePolicy1) + self.requirements_frame.setFrameShape(QFrame.Shape.StyledPanel) + self.requirements_frame.setFrameShadow(QFrame.Shadow.Sunken) + self.requirements_layout = QHBoxLayout(self.requirements_frame) + self.requirements_layout.setObjectName(u"requirements_layout") + self.requirements_layout.setContentsMargins(0, 0, 0, 0) + + self.right_layout.addWidget(self.requirements_frame, 2, 0, 1, 2, Qt.AlignmentFlag.AlignBottom) + + self.description_label = QTextBrowser(StoreDetailsWidget) + self.description_label.setObjectName(u"description_label") + self.description_label.setMinimumSize(QSize(450, 0)) + self.description_label.setOpenExternalLinks(True) + + self.right_layout.addWidget(self.description_label, 1, 0, 1, 1) + + self.details_widget = QWidget(StoreDetailsWidget) + self.details_widget.setObjectName(u"details_widget") + sizePolicy1.setHeightForWidth(self.details_widget.sizePolicy().hasHeightForWidth()) + self.details_widget.setSizePolicy(sizePolicy1) + self.details_widget.setMinimumSize(QSize(450, 0)) + self.details_layout = QFormLayout(self.details_widget) self.details_layout.setObjectName(u"details_layout") - self.details_layout.setSizeConstraint(QLayout.SizeConstraint.SetFixedSize) self.details_layout.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow) self.details_layout.setLabelAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setHorizontalSpacing(12) self.details_layout.setVerticalSpacing(12) - self.details_layout.setContentsMargins(12, -1, -1, -1) - self.title_label = QLabel(StoreDetailsWidget) + self.details_layout.setContentsMargins(12, 0, 0, 0) + self.title_label = QLabel(self.details_widget) self.title_label.setObjectName(u"title_label") font = QFont() font.setBold(True) @@ -71,88 +97,88 @@ def setupUi(self, StoreDetailsWidget): self.details_layout.setWidget(0, QFormLayout.ItemRole.LabelRole, self.title_label) - self.title = QLabel(StoreDetailsWidget) + self.title = QLabel(self.details_widget) self.title.setObjectName(u"title") self.title.setText(u"title") self.title.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse) self.details_layout.setWidget(0, QFormLayout.ItemRole.FieldRole, self.title) - self.developer_label = QLabel(StoreDetailsWidget) + self.developer_label = QLabel(self.details_widget) self.developer_label.setObjectName(u"developer_label") self.developer_label.setFont(font) self.developer_label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setWidget(1, QFormLayout.ItemRole.LabelRole, self.developer_label) - self.developer = QLabel(StoreDetailsWidget) + self.developer = QLabel(self.details_widget) self.developer.setObjectName(u"developer") self.developer.setText(u"developer") self.developer.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse) self.details_layout.setWidget(1, QFormLayout.ItemRole.FieldRole, self.developer) - self.publisher_label = QLabel(StoreDetailsWidget) + self.publisher_label = QLabel(self.details_widget) self.publisher_label.setObjectName(u"publisher_label") self.publisher_label.setFont(font) self.publisher_label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setWidget(2, QFormLayout.ItemRole.LabelRole, self.publisher_label) - self.publisher = QLabel(StoreDetailsWidget) + self.publisher = QLabel(self.details_widget) self.publisher.setObjectName(u"publisher") self.publisher.setText(u"publisher") self.publisher.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse) self.details_layout.setWidget(2, QFormLayout.ItemRole.FieldRole, self.publisher) - self.status_label = QLabel(StoreDetailsWidget) + self.status_label = QLabel(self.details_widget) self.status_label.setObjectName(u"status_label") self.status_label.setFont(font) self.status_label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setWidget(3, QFormLayout.ItemRole.LabelRole, self.status_label) - self.status = QLabel(StoreDetailsWidget) + self.status = QLabel(self.details_widget) self.status.setObjectName(u"status") self.details_layout.setWidget(3, QFormLayout.ItemRole.FieldRole, self.status) - self.price_label = QLabel(StoreDetailsWidget) + self.price_label = QLabel(self.details_widget) self.price_label.setObjectName(u"price_label") self.price_label.setFont(font) self.price_label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setWidget(4, QFormLayout.ItemRole.LabelRole, self.price_label) - self.tags_label = QLabel(StoreDetailsWidget) + self.tags_label = QLabel(self.details_widget) self.tags_label.setObjectName(u"tags_label") self.tags_label.setFont(font) self.tags_label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setWidget(5, QFormLayout.ItemRole.LabelRole, self.tags_label) - self.tags = QLabel(StoreDetailsWidget) + self.tags = QLabel(self.details_widget) self.tags.setObjectName(u"tags") self.tags.setText(u"tags") self.details_layout.setWidget(5, QFormLayout.ItemRole.FieldRole, self.tags) - self.social_links_label = QLabel(StoreDetailsWidget) + self.social_links_label = QLabel(self.details_widget) self.social_links_label.setObjectName(u"social_links_label") self.social_links_label.setFont(font) self.social_links_label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setWidget(6, QFormLayout.ItemRole.LabelRole, self.social_links_label) - self.actions_label = QLabel(StoreDetailsWidget) + self.actions_label = QLabel(self.details_widget) self.actions_label.setObjectName(u"actions_label") self.actions_label.setFont(font) self.actions_label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.details_layout.setWidget(7, QFormLayout.ItemRole.LabelRole, self.actions_label) - self.social_links = QWidget(StoreDetailsWidget) + self.social_links = QWidget(self.details_widget) self.social_links.setObjectName(u"social_links") self.social_links_layout = QHBoxLayout(self.social_links) self.social_links_layout.setObjectName(u"social_links_layout") @@ -161,15 +187,9 @@ def setupUi(self, StoreDetailsWidget): self.details_layout.setWidget(6, QFormLayout.ItemRole.FieldRole, self.social_links) - self.actions_widget = QWidget(StoreDetailsWidget) + self.actions_widget = QWidget(self.details_widget) self.actions_widget.setObjectName(u"actions_widget") - sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred) - sizePolicy1.setHorizontalStretch(0) - sizePolicy1.setVerticalStretch(0) - sizePolicy1.setHeightForWidth(self.actions_widget.sizePolicy().hasHeightForWidth()) - self.actions_widget.setSizePolicy(sizePolicy1) self.actions_widget.setMinimumSize(QSize(300, 0)) - self.actions_widget.setMaximumSize(QSize(300, 16777215)) self.actions_layout = QVBoxLayout(self.actions_widget) self.actions_layout.setObjectName(u"actions_layout") self.actions_layout.setContentsMargins(0, 0, 0, 0) @@ -186,10 +206,13 @@ def setupUi(self, StoreDetailsWidget): self.details_layout.setWidget(7, QFormLayout.ItemRole.FieldRole, self.actions_widget) - self.price = QWidget(StoreDetailsWidget) + self.price = QWidget(self.details_widget) self.price.setObjectName(u"price") - sizePolicy1.setHeightForWidth(self.price.sizePolicy().hasHeightForWidth()) - self.price.setSizePolicy(sizePolicy1) + sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred) + sizePolicy2.setHorizontalStretch(0) + sizePolicy2.setVerticalStretch(0) + sizePolicy2.setHeightForWidth(self.price.sizePolicy().hasHeightForWidth()) + self.price.setSizePolicy(sizePolicy2) self.price_layout = QHBoxLayout(self.price) self.price_layout.setObjectName(u"price_layout") self.price_layout.setSizeConstraint(QLayout.SizeConstraint.SetFixedSize) @@ -211,28 +234,7 @@ def setupUi(self, StoreDetailsWidget): self.details_layout.setWidget(4, QFormLayout.ItemRole.FieldRole, self.price) - self.right_layout.addLayout(self.details_layout, 0, 0, 1, 1) - - self.description_label = QTextBrowser(StoreDetailsWidget) - self.description_label.setObjectName(u"description_label") - self.description_label.setOpenExternalLinks(True) - - self.right_layout.addWidget(self.description_label, 0, 1, 1, 1) - - self.requirements_frame = QFrame(StoreDetailsWidget) - self.requirements_frame.setObjectName(u"requirements_frame") - sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed) - sizePolicy2.setHorizontalStretch(0) - sizePolicy2.setVerticalStretch(0) - sizePolicy2.setHeightForWidth(self.requirements_frame.sizePolicy().hasHeightForWidth()) - self.requirements_frame.setSizePolicy(sizePolicy2) - self.requirements_frame.setFrameShape(QFrame.Shape.StyledPanel) - self.requirements_frame.setFrameShadow(QFrame.Shadow.Sunken) - self.requirements_layout = QHBoxLayout(self.requirements_frame) - self.requirements_layout.setObjectName(u"requirements_layout") - self.requirements_layout.setContentsMargins(0, 0, 0, 0) - - self.right_layout.addWidget(self.requirements_frame, 1, 0, 1, 2, Qt.AlignmentFlag.AlignBottom) + self.right_layout.addWidget(self.details_widget, 0, 0, 1, 1) self.right_layout.setRowStretch(1, 1) self.right_layout.setColumnStretch(1, 1) diff --git a/rare/ui/components/tabs/store/details.ui b/rare/ui/components/tabs/store/details.ui index babc23dc74..15f2b7e006 100644 --- a/rare/ui/components/tabs/store/details.ui +++ b/rare/ui/components/tabs/store/details.ui @@ -6,8 +6,8 @@ 0 0 - 706 - 302 + 850 + 492 @@ -41,335 +41,82 @@ - + 24 - - - - QLayout::SizeConstraint::SetFixedSize - - - QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - 12 + + + + + 0 + 0 + - - 12 + + QFrame::Shape::StyledPanel - - 12 + + QFrame::Shadow::Sunken - - - - - true - - - - Title - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - title - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - true - - - - Developer - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - developer - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - true - - - - Publisher - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - publisher - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - - true - - - - Status - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - You already own this game - - - - - - - - true - - - - Price - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - true - - - - Tags - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - tags - - - - - - - - true - - - - Links - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - true - - - - Actions - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - QLayout::SizeConstraint::SetFixedSize - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - 0 - 0 - - - - - 300 - 0 - - - - - 300 - 16777215 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Buy in Epic Games Store - - - - - - - Add to wishlist - - - - - - - - - - - 0 - 0 - - - - - QLayout::SizeConstraint::SetFixedSize - - - 0 - - - 0 - - - 0 - - - 0 - - - - - orignal - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse - - - - - - - discount - - - - - - - + + + 0 + + + 0 + + + 0 + + + 0 + + + - + + + + 450 + 0 + + true - - + + 0 0 - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Sunken + + + 450 + 0 + - + + + QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + 12 + + + 12 + - 0 + 12 0 @@ -380,6 +127,273 @@ 0 + + + + + true + + + + Title + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + title + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + true + + + + Developer + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + developer + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + true + + + + Publisher + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + publisher + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + + true + + + + Status + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + You already own this game + + + + + + + + true + + + + Price + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + true + + + + Tags + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + tags + + + + + + + + true + + + + Links + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + true + + + + Actions + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + QLayout::SizeConstraint::SetFixedSize + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + 300 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Buy in Epic Games Store + + + + + + + Add to wishlist + + + + + + + + + + + 0 + 0 + + + + + QLayout::SizeConstraint::SetFixedSize + + + 0 + + + 0 + + + 0 + + + 0 + + + + + orignal + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + + + + + discount + + + + + +