From 7db26a743cf18cdd5b208bb2d528dcac5c4e6f43 Mon Sep 17 00:00:00 2001 From: Dummerle Date: Mon, 4 Oct 2021 20:32:22 +0200 Subject: [PATCH] Remove border from dlc tab --- .../tabs/games/game_info/__init__.py | 2 +- .../tabs/games/game_info/game_dlc.py | 15 +- rare/components/tabs/tab_widget.py | 10 +- .../stylesheets/RareStyle/stylesheet.qss | 4 + .../tabs/games/game_info/game_dlc.py | 100 +++---- .../tabs/games/game_info/game_dlc.ui | 275 +++++++----------- .../tabs/games/game_info/game_dlc_widget.py | 45 +-- .../tabs/games/game_info/game_dlc_widget.ui | 128 ++++---- 8 files changed, 250 insertions(+), 329 deletions(-) diff --git a/rare/components/tabs/games/game_info/__init__.py b/rare/components/tabs/games/game_info/__init__.py index bb240712..ac5ec12f 100644 --- a/rare/components/tabs/games/game_info/__init__.py +++ b/rare/components/tabs/games/game_info/__init__.py @@ -30,7 +30,7 @@ class InfoTabs(QTabWidget): self.addTab(self.settings, self.tr("Settings")) self.tabBar().setCurrentIndex(1) - self.dlc = GameDlc(core, self) + self.dlc = GameDlc(core, signals, self) self.addTab(self.dlc, self.tr("Downloadable Content")) def update_game(self, game: Game, dlcs: list): diff --git a/rare/components/tabs/games/game_info/game_dlc.py b/rare/components/tabs/games/game_info/game_dlc.py index 0225bad4..9513600c 100644 --- a/rare/components/tabs/games/game_info/game_dlc.py +++ b/rare/components/tabs/games/game_info/game_dlc.py @@ -5,6 +5,7 @@ from legendary.core import LegendaryCore from legendary.models.game import Game from rare.ui.components.tabs.games.game_info.game_dlc import Ui_GameDlc from rare.ui.components.tabs.games.game_info.game_dlc_widget import Ui_GameDlcWidget +from rare.utils.models import Signals, InstallOptionsModel from rare.utils.utils import get_pixmap @@ -12,17 +13,18 @@ class GameDlc(QWidget, Ui_GameDlc): install_dlc = pyqtSignal(str, bool) game: Game - def __init__(self, core: LegendaryCore, parent=None): + def __init__(self, core: LegendaryCore, signals: Signals, parent=None): super(GameDlc, self).__init__(parent=parent) self.setupUi(self) self.core = core + self.signals = signals self.installed_dlcs = list() self.installed_dlc_widgets = list() self.available_dlc_widgets = list() def update_dlcs(self, app_name, dlcs: list): self.game = self.core.get_game(app_name) - self.game_title.setText(f"

{self.game.app_title}

") + self.game_title.setText(f"

{self.game.app_title}

") if self.installed_dlc_widgets: for dlc_widget in self.installed_dlc_widgets: @@ -35,30 +37,27 @@ class GameDlc(QWidget, Ui_GameDlc): self.available_dlc_widgets.clear() self.installed_dlcs = [i.app_name for i in self.core.get_installed_dlc_list()] - for dlc in sorted(dlcs[self.game.asset_info.catalog_item_id], key=lambda x: x.app_title): if dlc.app_name in self.installed_dlcs: dlc_widget = GameDlcWidget(dlc, True) self.installed_dlc_widgets.append(dlc_widget) - self.installed_dlc_contents_layout.addWidget(dlc_widget) + self.installed_dlc_group.layout().addWidget(dlc_widget) else: dlc_widget = GameDlcWidget(dlc, False) dlc_widget.install.connect(self.install) self.available_dlc_widgets.append(dlc_widget) - self.available_dlc_contents_layout.addWidget(dlc_widget) + self.available_dlc_group.layout().addWidget(dlc_widget) self.installed_dlc_label.setVisible(not self.installed_dlc_widgets) - self.installed_dlc_scroll.setVisible(bool(self.installed_dlc_widgets)) self.available_dlc_label.setVisible(not self.available_dlc_widgets) - self.available_dlc_scroll.setVisible(bool(self.available_dlc_widgets)) def install(self, app_name): if not self.core.is_installed(self.game.app_name): QMessageBox.warning(self, "Error", self.tr("Base Game is not installed. Please install {} first").format( self.game.app_title)) return - self.install_dlc.emit(app_name, True) + self.signals.dl_tab.emit((Signals.actions.install_game, InstallOptionsModel(app_name, update=True))) class GameDlcWidget(QFrame, Ui_GameDlcWidget): diff --git a/rare/components/tabs/tab_widget.py b/rare/components/tabs/tab_widget.py index e833e579..86cfcd40 100644 --- a/rare/components/tabs/tab_widget.py +++ b/rare/components/tabs/tab_widget.py @@ -6,12 +6,12 @@ from legendary.core import LegendaryCore from rare.components.tabs.account import MiniWidget from rare.components.tabs.cloud_saves import SyncSaves from rare.components.tabs.downloads import DownloadTab -from rare.components.tabs.games.__init__ import GamesTab +from rare.components.tabs.games import GamesTab from rare.components.tabs.settings import SettingsTab from rare.components.tabs.settings.debug_settings import DebugSettings from rare.components.tabs.shop import Shop from rare.components.tabs.tab_utils import TabBar, TabButtonWidget -from rare.utils.models import InstallOptionsModel, Signals +from rare.utils.models import Signals class TabWidget(QTabWidget): @@ -65,12 +65,6 @@ class TabWidget(QTabWidget): self.games_tab.import_widget.update_list.connect(self.game_imported) if not self.offline: - # install dlc - self.games_tab.game_info.dlc.install_dlc.connect( - lambda app_name, update: self.install_game( - InstallOptionsModel(app_name=app_name), - update=update)) - # Finished sync self.cloud_saves.finished.connect(self.finished_sync) # Game finished diff --git a/rare/resources/stylesheets/RareStyle/stylesheet.qss b/rare/resources/stylesheets/RareStyle/stylesheet.qss index 704a8b22..316a56a1 100644 --- a/rare/resources/stylesheets/RareStyle/stylesheet.qss +++ b/rare/resources/stylesheets/RareStyle/stylesheet.qss @@ -22,6 +22,10 @@ QLabel { padding: 0px; } +QScrollArea#noborder { + border-color: transparent; +} + QMenu, QListView, QListWidget, diff --git a/rare/ui/components/tabs/games/game_info/game_dlc.py b/rare/ui/components/tabs/games/game_info/game_dlc.py index 9e07770a..11dca8bb 100644 --- a/rare/ui/components/tabs/games/game_info/game_dlc.py +++ b/rare/ui/components/tabs/games/game_info/game_dlc.py @@ -14,88 +14,61 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_GameDlc(object): def setupUi(self, GameDlc): GameDlc.setObjectName("GameDlc") - GameDlc.resize(287, 366) + GameDlc.resize(650, 518) + GameDlc.setWindowTitle("GameDlc") self.game_dlc_layout = QtWidgets.QVBoxLayout(GameDlc) self.game_dlc_layout.setObjectName("game_dlc_layout") - self.game_title = QtWidgets.QLabel(GameDlc) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + self.noborder = QtWidgets.QScrollArea(GameDlc) + self.noborder.setWidgetResizable(True) + self.noborder.setObjectName("noborder") + self.scrollAreaWidgetContents = QtWidgets.QWidget() + self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 630, 245)) + self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") + self.verticalLayout = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents) + self.verticalLayout.setObjectName("verticalLayout") + self.game_title = QtWidgets.QLabel(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.game_title.sizePolicy().hasHeightForWidth()) self.game_title.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setPointSize(16) + self.game_title.setFont(font) self.game_title.setText("error") - self.game_title.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) + self.game_title.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse | QtCore.Qt.TextSelectableByMouse) self.game_title.setObjectName("game_title") - self.game_dlc_layout.addWidget(self.game_title, 0, QtCore.Qt.AlignTop) - self.installed_dlc_group = QtWidgets.QGroupBox(GameDlc) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.installed_dlc_group.sizePolicy().hasHeightForWidth()) - self.installed_dlc_group.setSizePolicy(sizePolicy) - self.installed_dlc_group.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.installed_dlc_group.setObjectName("installed_dlc_group") - self.installed_dlc_group_layout = QtWidgets.QVBoxLayout(self.installed_dlc_group) - self.installed_dlc_group_layout.setObjectName("installed_dlc_group_layout") - self.installed_dlc_label = QtWidgets.QLabel(self.installed_dlc_group) - self.installed_dlc_label.setObjectName("installed_dlc_label") - self.installed_dlc_group_layout.addWidget(self.installed_dlc_label) - self.installed_dlc_scroll = QtWidgets.QScrollArea(self.installed_dlc_group) - self.installed_dlc_scroll.setFocusPolicy(QtCore.Qt.WheelFocus) - self.installed_dlc_scroll.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.installed_dlc_scroll.setFrameShadow(QtWidgets.QFrame.Sunken) - self.installed_dlc_scroll.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) - self.installed_dlc_scroll.setWidgetResizable(True) - self.installed_dlc_scroll.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.installed_dlc_scroll.setObjectName("installed_dlc_scroll") - self.installed_dlc_contents = QtWidgets.QWidget() - self.installed_dlc_contents.setGeometry(QtCore.QRect(0, 0, 255, 16)) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.installed_dlc_contents.sizePolicy().hasHeightForWidth()) - self.installed_dlc_contents.setSizePolicy(sizePolicy) - self.installed_dlc_contents.setObjectName("installed_dlc_contents") - self.installed_dlc_contents_layout = QtWidgets.QVBoxLayout(self.installed_dlc_contents) - self.installed_dlc_contents_layout.setSpacing(6) - self.installed_dlc_contents_layout.setObjectName("installed_dlc_contents_layout") - self.installed_dlc_scroll.setWidget(self.installed_dlc_contents) - self.installed_dlc_group_layout.addWidget(self.installed_dlc_scroll) - self.game_dlc_layout.addWidget(self.installed_dlc_group) - self.available_dlc_group = QtWidgets.QGroupBox(GameDlc) + self.verticalLayout.addWidget(self.game_title) + self.available_dlc_group = QtWidgets.QGroupBox(self.scrollAreaWidgetContents) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.available_dlc_group.sizePolicy().hasHeightForWidth()) self.available_dlc_group.setSizePolicy(sizePolicy) - self.available_dlc_group.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.available_dlc_group.setAlignment(QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop) self.available_dlc_group.setObjectName("available_dlc_group") self.available_dlc_group_layout = QtWidgets.QVBoxLayout(self.available_dlc_group) self.available_dlc_group_layout.setObjectName("available_dlc_group_layout") self.available_dlc_label = QtWidgets.QLabel(self.available_dlc_group) self.available_dlc_label.setObjectName("available_dlc_label") self.available_dlc_group_layout.addWidget(self.available_dlc_label) - self.available_dlc_scroll = QtWidgets.QScrollArea(self.available_dlc_group) - self.available_dlc_scroll.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.available_dlc_scroll.setFrameShadow(QtWidgets.QFrame.Sunken) - self.available_dlc_scroll.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) - self.available_dlc_scroll.setWidgetResizable(True) - self.available_dlc_scroll.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.available_dlc_scroll.setObjectName("available_dlc_scroll") - self.available_dlc_contents = QtWidgets.QWidget() - self.available_dlc_contents.setGeometry(QtCore.QRect(0, 0, 255, 16)) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum) + self.verticalLayout.addWidget(self.available_dlc_group) + self.installed_dlc_group = QtWidgets.QGroupBox(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.available_dlc_contents.sizePolicy().hasHeightForWidth()) - self.available_dlc_contents.setSizePolicy(sizePolicy) - self.available_dlc_contents.setObjectName("available_dlc_contents") - self.available_dlc_contents_layout = QtWidgets.QVBoxLayout(self.available_dlc_contents) - self.available_dlc_contents_layout.setSpacing(6) - self.available_dlc_contents_layout.setObjectName("available_dlc_contents_layout") - self.available_dlc_scroll.setWidget(self.available_dlc_contents) - self.available_dlc_group_layout.addWidget(self.available_dlc_scroll) - self.game_dlc_layout.addWidget(self.available_dlc_group) + sizePolicy.setHeightForWidth(self.installed_dlc_group.sizePolicy().hasHeightForWidth()) + self.installed_dlc_group.setSizePolicy(sizePolicy) + self.installed_dlc_group.setAlignment(QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop) + self.installed_dlc_group.setObjectName("installed_dlc_group") + self.installed_dlc_group_layout = QtWidgets.QVBoxLayout(self.installed_dlc_group) + self.installed_dlc_group_layout.setObjectName("installed_dlc_group_layout") + self.installed_dlc_label = QtWidgets.QLabel(self.installed_dlc_group) + self.installed_dlc_label.setObjectName("installed_dlc_label") + self.installed_dlc_group_layout.addWidget(self.installed_dlc_label) + self.verticalLayout.addWidget(self.installed_dlc_group) + self.noborder.setWidget(self.scrollAreaWidgetContents) + self.game_dlc_layout.addWidget(self.noborder) spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.game_dlc_layout.addItem(spacerItem) @@ -104,11 +77,10 @@ class Ui_GameDlc(object): def retranslateUi(self, GameDlc): _translate = QtCore.QCoreApplication.translate - GameDlc.setWindowTitle(_translate("GameDlc", "GameDlc")) - self.installed_dlc_group.setTitle(_translate("GameDlc", "Installed DLCs")) - self.installed_dlc_label.setText(_translate("GameDlc", "No Downloadable Content has been installed.")) self.available_dlc_group.setTitle(_translate("GameDlc", "Available DLCs")) self.available_dlc_label.setText(_translate("GameDlc", "No Downloadable Content is available")) + self.installed_dlc_group.setTitle(_translate("GameDlc", "Installed DLCs")) + self.installed_dlc_label.setText(_translate("GameDlc", "No Downloadable Content has been installed.")) if __name__ == "__main__": diff --git a/rare/ui/components/tabs/games/game_info/game_dlc.ui b/rare/ui/components/tabs/games/game_info/game_dlc.ui index aafa6d9f..a232b865 100644 --- a/rare/ui/components/tabs/games/game_info/game_dlc.ui +++ b/rare/ui/components/tabs/games/game_info/game_dlc.ui @@ -4,177 +4,118 @@ - 0 - 0 - 287 - 366 + 0 + 0 + 650 + 518 - GameDlc + GameDlc - - - - - - 0 - 0 - - - - error - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - Installed DLCs - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - No Downloadable Content has been installed. - - - - - - - Qt::WheelFocus - - - QFrame::StyledPanel - - - QFrame::Sunken - - - Qt::ScrollBarAlwaysOff - - - true - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - 0 - 0 - 255 - 16 - - - - - 0 - 0 - - - - - 6 - - - - - - - - - - - - - 0 - 0 - - - - Available DLCs - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - No Downloadable Content is available - - - - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - Qt::ScrollBarAlwaysOff - - - true - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - 0 - 0 - 255 - 16 - - - - - 0 - 0 - - - - - 6 - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - + + + + + true + + + + + 0 + 0 + 630 + 245 + + + + + + + + 0 + 0 + + + + + 16 + + + + error + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + Available DLCs + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + No Downloadable Content is available + + + + + + + + + + + 0 + 0 + + + + Installed DLCs + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + No Downloadable Content has been installed. + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + diff --git a/rare/ui/components/tabs/games/game_info/game_dlc_widget.py b/rare/ui/components/tabs/games/game_info/game_dlc_widget.py index 2349d69f..708d4f9c 100644 --- a/rare/ui/components/tabs/games/game_info/game_dlc_widget.py +++ b/rare/ui/components/tabs/games/game_info/game_dlc_widget.py @@ -26,13 +26,18 @@ class Ui_GameDlcWidget(object): self.dlc_layout = QtWidgets.QHBoxLayout(GameDlcWidget) self.dlc_layout.setObjectName("dlc_layout") self.image = QtWidgets.QLabel(GameDlcWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.image.sizePolicy().hasHeightForWidth()) + self.image.setSizePolicy(sizePolicy) self.image.setFrameShape(QtWidgets.QFrame.StyledPanel) self.image.setFrameShadow(QtWidgets.QFrame.Sunken) self.image.setText("") self.image.setObjectName("image") self.dlc_layout.addWidget(self.image) self.dlc_info_layout = QtWidgets.QFormLayout() - self.dlc_info_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.dlc_info_layout.setLabelAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter) self.dlc_info_layout.setContentsMargins(6, 6, 6, 6) self.dlc_info_layout.setSpacing(12) self.dlc_info_layout.setObjectName("dlc_info_layout") @@ -67,9 +72,26 @@ class Ui_GameDlcWidget(object): self.dlc_info_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.version_label) self.version = QtWidgets.QLabel(GameDlcWidget) self.version.setText("error") - self.version.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) + self.version.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse | QtCore.Qt.TextSelectableByMouse) self.version.setObjectName("version") self.dlc_info_layout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.version) + self.app_name_label = QtWidgets.QLabel(GameDlcWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.app_name_label.sizePolicy().hasHeightForWidth()) + self.app_name_label.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.app_name_label.setFont(font) + self.app_name_label.setObjectName("app_name_label") + self.dlc_info_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.app_name_label) + self.app_name = QtWidgets.QLabel(GameDlcWidget) + self.app_name.setText("error") + self.app_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse | QtCore.Qt.TextSelectableByMouse) + self.app_name.setObjectName("app_name") + self.dlc_info_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.app_name) self.status_label = QtWidgets.QLabel(GameDlcWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -110,23 +132,6 @@ class Ui_GameDlcWidget(object): self.install_button.setStyleSheet("") self.install_button.setObjectName("install_button") self.dlc_info_layout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.install_button) - self.app_name_label = QtWidgets.QLabel(GameDlcWidget) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.app_name_label.sizePolicy().hasHeightForWidth()) - self.app_name_label.setSizePolicy(sizePolicy) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.app_name_label.setFont(font) - self.app_name_label.setObjectName("app_name_label") - self.dlc_info_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.app_name_label) - self.app_name = QtWidgets.QLabel(GameDlcWidget) - self.app_name.setText("error") - self.app_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) - self.app_name.setObjectName("app_name") - self.dlc_info_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.app_name) self.dlc_layout.addLayout(self.dlc_info_layout) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.dlc_layout.addItem(spacerItem) @@ -138,10 +143,10 @@ class Ui_GameDlcWidget(object): _translate = QtCore.QCoreApplication.translate self.dlc_name_label.setText(_translate("GameDlcWidget", "DLC Name")) self.version_label.setText(_translate("GameDlcWidget", "Version")) + self.app_name_label.setText(_translate("GameDlcWidget", "Application")) self.status_label.setText(_translate("GameDlcWidget", "Status")) self.actions_label.setText(_translate("GameDlcWidget", "Actions")) self.install_button.setText(_translate("GameDlcWidget", "Install DLC")) - self.app_name_label.setText(_translate("GameDlcWidget", "Application")) if __name__ == "__main__": diff --git a/rare/ui/components/tabs/games/game_info/game_dlc_widget.ui b/rare/ui/components/tabs/games/game_info/game_dlc_widget.ui index 75518f7c..c2069b68 100644 --- a/rare/ui/components/tabs/games/game_info/game_dlc_widget.ui +++ b/rare/ui/components/tabs/games/game_info/game_dlc_widget.ui @@ -17,7 +17,7 @@ - GameDlcWidget + GameDlcWidget QFrame::StyledPanel @@ -27,17 +27,23 @@ - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - - + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + + @@ -110,26 +116,55 @@ - - - - error - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - + + + + error + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Application + + + + + + + error + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + 75 true @@ -193,35 +228,6 @@ - - - - - 0 - 0 - - - - - 75 - true - - - - Application - - - - - - - error - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - -