From 2061afefb02f51599b2b9f1da7939996e25a7fe3 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Fri, 30 Apr 2021 10:10:36 +0300 Subject: [PATCH] Use widget alignment instead of label alignment --- .../tabs/games/game_info/game_info_ui.py | 19 ++++------ .../tabs/games/game_info/game_settings_ui.py | 21 ++++------ rare/components/tabs/settings/about_ui.py | 2 +- rare/components/tabs/settings/legendary_ui.py | 2 +- rare/components/tabs/settings/linux_ui.py | 6 +-- .../tabs/games/game_info/game_info.ui | 38 +++++++------------ .../tabs/games/game_info/game_settings.ui | 35 ++++------------- .../ui/components/tabs/settings/about.ui | 2 +- .../ui/components/tabs/settings/legendary.ui | 2 +- .../ui/components/tabs/settings/linux.ui | 10 +---- 10 files changed, 43 insertions(+), 94 deletions(-) diff --git a/rare/components/tabs/games/game_info/game_info_ui.py b/rare/components/tabs/games/game_info/game_info_ui.py index c2919c44..4ea6e898 100644 --- a/rare/components/tabs/games/game_info/game_info_ui.py +++ b/rare/components/tabs/games/game_info/game_info_ui.py @@ -14,6 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_GameInfo(object): def setupUi(self, GameInfo): GameInfo.setObjectName("GameInfo") + GameInfo.resize(424, 308) self.layout_game_info = QtWidgets.QGridLayout(GameInfo) self.layout_game_info.setObjectName("layout_game_info") self.layout_game_info_form = QtWidgets.QGridLayout() @@ -46,9 +47,8 @@ class Ui_GameInfo(object): font.setBold(True) font.setWeight(75) self.lbl_dev.setFont(font) - self.lbl_dev.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.lbl_dev.setObjectName("lbl_dev") - self.layout_game_info_form.addWidget(self.lbl_dev, 0, 0, 1, 1) + self.layout_game_info_form.addWidget(self.lbl_dev, 0, 0, 1, 1, QtCore.Qt.AlignRight) self.dev = QtWidgets.QLabel(GameInfo) self.dev.setText("error") self.dev.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) @@ -69,9 +69,8 @@ class Ui_GameInfo(object): font.setBold(True) font.setWeight(75) self.lbl_version.setFont(font) - self.lbl_version.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.lbl_version.setObjectName("lbl_version") - self.layout_game_info_form.addWidget(self.lbl_version, 2, 0, 1, 1) + self.layout_game_info_form.addWidget(self.lbl_version, 2, 0, 1, 1, QtCore.Qt.AlignRight) self.lbl_install_path = QtWidgets.QLabel(GameInfo) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -82,9 +81,8 @@ class Ui_GameInfo(object): font.setBold(True) font.setWeight(75) self.lbl_install_path.setFont(font) - self.lbl_install_path.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.lbl_install_path.setObjectName("lbl_install_path") - self.layout_game_info_form.addWidget(self.lbl_install_path, 4, 0, 1, 1) + self.layout_game_info_form.addWidget(self.lbl_install_path, 4, 0, 1, 1, QtCore.Qt.AlignRight) spacerItem = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.layout_game_info_form.addItem(spacerItem, 6, 1, 1, 1) self.lbl_game_actions = QtWidgets.QLabel(GameInfo) @@ -97,9 +95,8 @@ class Ui_GameInfo(object): font.setBold(True) font.setWeight(75) self.lbl_game_actions.setFont(font) - self.lbl_game_actions.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.lbl_game_actions.setObjectName("lbl_game_actions") - self.layout_game_info_form.addWidget(self.lbl_game_actions, 5, 0, 1, 1) + self.layout_game_info_form.addWidget(self.lbl_game_actions, 5, 0, 1, 1, QtCore.Qt.AlignRight) self.lbl_app_name = QtWidgets.QLabel(GameInfo) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -110,9 +107,8 @@ class Ui_GameInfo(object): font.setBold(True) font.setWeight(75) self.lbl_app_name.setFont(font) - self.lbl_app_name.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.lbl_app_name.setObjectName("lbl_app_name") - self.layout_game_info_form.addWidget(self.lbl_app_name, 1, 0, 1, 1) + self.layout_game_info_form.addWidget(self.lbl_app_name, 1, 0, 1, 1, QtCore.Qt.AlignRight) self.lbl_install_size = QtWidgets.QLabel(GameInfo) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -123,9 +119,8 @@ class Ui_GameInfo(object): font.setBold(True) font.setWeight(75) self.lbl_install_size.setFont(font) - self.lbl_install_size.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.lbl_install_size.setObjectName("lbl_install_size") - self.layout_game_info_form.addWidget(self.lbl_install_size, 3, 0, 1, 1) + self.layout_game_info_form.addWidget(self.lbl_install_size, 3, 0, 1, 1, QtCore.Qt.AlignRight) spacerItem1 = QtWidgets.QSpacerItem(20, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.layout_game_info_form.addItem(spacerItem1, 6, 0, 1, 1) self.wg_game_actions = QtWidgets.QWidget(GameInfo) diff --git a/rare/components/tabs/games/game_info/game_settings_ui.py b/rare/components/tabs/games/game_info/game_settings_ui.py index bb3276ee..318eca31 100644 --- a/rare/components/tabs/games/game_info/game_settings_ui.py +++ b/rare/components/tabs/games/game_info/game_settings_ui.py @@ -27,9 +27,8 @@ class Ui_GameSettings(object): self.launch_settings_layout = QtWidgets.QGridLayout(self.launch_settings_groupbox) self.launch_settings_layout.setObjectName("launch_settings_layout") self.launch_params_label = QtWidgets.QLabel(self.launch_settings_groupbox) - self.launch_params_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.launch_params_label.setObjectName("launch_params_label") - self.launch_settings_layout.addWidget(self.launch_params_label, 3, 0, 1, 1) + self.launch_settings_layout.addWidget(self.launch_params_label, 3, 0, 1, 1, QtCore.Qt.AlignRight) self.skip_update = QtWidgets.QComboBox(self.launch_settings_groupbox) self.skip_update.setObjectName("skip_update") self.skip_update.addItem("") @@ -37,17 +36,14 @@ class Ui_GameSettings(object): self.skip_update.addItem("") self.launch_settings_layout.addWidget(self.skip_update, 0, 1, 1, 1, QtCore.Qt.AlignLeft) self.skip_update_label = QtWidgets.QLabel(self.launch_settings_groupbox) - self.skip_update_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.skip_update_label.setObjectName("skip_update_label") - self.launch_settings_layout.addWidget(self.skip_update_label, 0, 0, 1, 1) + self.launch_settings_layout.addWidget(self.skip_update_label, 0, 0, 1, 1, QtCore.Qt.AlignRight) self.offline_label = QtWidgets.QLabel(self.launch_settings_groupbox) - self.offline_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.offline_label.setObjectName("offline_label") - self.launch_settings_layout.addWidget(self.offline_label, 1, 0, 1, 1) + self.launch_settings_layout.addWidget(self.offline_label, 1, 0, 1, 1, QtCore.Qt.AlignRight) self.wrapper_label = QtWidgets.QLabel(self.launch_settings_groupbox) - self.wrapper_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.wrapper_label.setObjectName("wrapper_label") - self.launch_settings_layout.addWidget(self.wrapper_label, 4, 0, 1, 1) + self.launch_settings_layout.addWidget(self.wrapper_label, 4, 0, 1, 1, QtCore.Qt.AlignRight) self.offline = QtWidgets.QComboBox(self.launch_settings_groupbox) self.offline.setObjectName("offline") self.offline.addItem("") @@ -59,9 +55,8 @@ class Ui_GameSettings(object): self.cloud_sync.setObjectName("cloud_sync") self.launch_settings_layout.addWidget(self.cloud_sync, 2, 1, 1, 1, QtCore.Qt.AlignLeft) self.cloud_sync_label = QtWidgets.QLabel(self.launch_settings_groupbox) - self.cloud_sync_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.cloud_sync_label.setObjectName("cloud_sync_label") - self.launch_settings_layout.addWidget(self.cloud_sync_label, 2, 0, 1, 1) + self.launch_settings_layout.addWidget(self.cloud_sync_label, 2, 0, 1, 1, QtCore.Qt.AlignRight) self.wrapper_widget = QtWidgets.QWidget(self.launch_settings_groupbox) self.wrapper_widget.setObjectName("wrapper_widget") self.wrapper_layout = QtWidgets.QHBoxLayout(self.wrapper_widget) @@ -92,13 +87,11 @@ class Ui_GameSettings(object): self.proton_layout = QtWidgets.QGridLayout(self.proton_groupbox) self.proton_layout.setObjectName("proton_layout") self.proton_prefix_label = QtWidgets.QLabel(self.proton_groupbox) - self.proton_prefix_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.proton_prefix_label.setObjectName("proton_prefix_label") - self.proton_layout.addWidget(self.proton_prefix_label, 1, 0, 1, 1) + self.proton_layout.addWidget(self.proton_prefix_label, 1, 0, 1, 1, QtCore.Qt.AlignRight) self.proton_wrapper_label = QtWidgets.QLabel(self.proton_groupbox) - self.proton_wrapper_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.proton_wrapper_label.setObjectName("proton_wrapper_label") - self.proton_layout.addWidget(self.proton_wrapper_label, 0, 0, 1, 1) + self.proton_layout.addWidget(self.proton_wrapper_label, 0, 0, 1, 1, QtCore.Qt.AlignRight) self.proton_wrapper = QtWidgets.QComboBox(self.proton_groupbox) self.proton_wrapper.setObjectName("proton_wrapper") self.proton_wrapper.addItem("") diff --git a/rare/components/tabs/settings/about_ui.py b/rare/components/tabs/settings/about_ui.py index ddfcb7c7..8bb8538d 100644 --- a/rare/components/tabs/settings/about_ui.py +++ b/rare/components/tabs/settings/about_ui.py @@ -28,7 +28,7 @@ class Ui_About(object): self.gridLayout.addWidget(self.lbl_license, 7, 0, 1, 1, QtCore.Qt.AlignRight) self.lbl_lgd_dev = QtWidgets.QLabel(About) self.lbl_lgd_dev.setObjectName("lbl_lgd_dev") - self.gridLayout.addWidget(self.lbl_lgd_dev, 6, 0, 1, 1) + self.gridLayout.addWidget(self.lbl_lgd_dev, 6, 0, 1, 1, QtCore.Qt.AlignRight) self.dev = QtWidgets.QLabel(About) self.dev.setText("Dummerle") self.dev.setOpenExternalLinks(True) diff --git a/rare/components/tabs/settings/legendary_ui.py b/rare/components/tabs/settings/legendary_ui.py index dcf8f247..ad71a6b9 100644 --- a/rare/components/tabs/settings/legendary_ui.py +++ b/rare/components/tabs/settings/legendary_ui.py @@ -33,7 +33,7 @@ class Ui_LegendarySettings(object): sizePolicy.setHeightForWidth(self.lbl_max_workers.sizePolicy().hasHeightForWidth()) self.lbl_max_workers.setSizePolicy(sizePolicy) self.lbl_max_workers.setObjectName("lbl_max_workers") - self.layout_downloads.addWidget(self.lbl_max_workers, 0, 0, 1, 1) + self.layout_downloads.addWidget(self.lbl_max_workers, 0, 0, 1, 1, QtCore.Qt.AlignRight) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.layout_downloads.addItem(spacerItem, 0, 3, 1, 1) self.max_worker_select = QtWidgets.QSpinBox(self.gb_downloads) diff --git a/rare/components/tabs/settings/linux_ui.py b/rare/components/tabs/settings/linux_ui.py index 02eee180..cad5fdd6 100644 --- a/rare/components/tabs/settings/linux_ui.py +++ b/rare/components/tabs/settings/linux_ui.py @@ -24,13 +24,11 @@ class Ui_LinuxSettings(object): self.wine_layout = QtWidgets.QGridLayout(self.wine_groupbox) self.wine_layout.setObjectName("wine_layout") self.exec_label = QtWidgets.QLabel(self.wine_groupbox) - self.exec_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.exec_label.setObjectName("exec_label") - self.wine_layout.addWidget(self.exec_label, 2, 0, 1, 1) + self.wine_layout.addWidget(self.exec_label, 2, 0, 1, 1, QtCore.Qt.AlignRight) self.prefix_label = QtWidgets.QLabel(self.wine_groupbox) - self.prefix_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.prefix_label.setObjectName("prefix_label") - self.wine_layout.addWidget(self.prefix_label, 0, 0, 1, 1) + self.wine_layout.addWidget(self.prefix_label, 0, 0, 1, 1, QtCore.Qt.AlignRight) self.prefix_alignment_label = QtWidgets.QLabel(self.wine_groupbox) self.prefix_alignment_label.setEnabled(False) self.prefix_alignment_label.setText("") diff --git a/resources/ui/components/tabs/games/game_info/game_info.ui b/resources/ui/components/tabs/games/game_info/game_info.ui index 82029a12..bafc4b3c 100644 --- a/resources/ui/components/tabs/games/game_info/game_info.ui +++ b/resources/ui/components/tabs/games/game_info/game_info.ui @@ -2,6 +2,14 @@ GameInfo + + + 0 + 0 + 424 + 308 + + Game Info @@ -56,7 +64,7 @@ - + @@ -73,9 +81,6 @@ Developer: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - @@ -98,7 +103,7 @@ - + @@ -115,12 +120,9 @@ Version: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + @@ -137,9 +139,6 @@ Installation Path: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - @@ -155,7 +154,7 @@ - + @@ -172,12 +171,9 @@ Game Actions: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + @@ -194,12 +190,9 @@ Application Name: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + @@ -216,9 +209,6 @@ Installation Size: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - diff --git a/resources/ui/components/tabs/games/game_info/game_settings.ui b/resources/ui/components/tabs/games/game_info/game_settings.ui index 54aa71d4..fddd8321 100644 --- a/resources/ui/components/tabs/games/game_info/game_settings.ui +++ b/resources/ui/components/tabs/games/game_info/game_settings.ui @@ -30,14 +30,11 @@ Launch Settings - + Launch parameters: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - @@ -59,34 +56,25 @@ - + Skip update check: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + Offline mode: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + Wrapper: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - @@ -115,14 +103,11 @@ - + Sync with cloud: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - @@ -198,24 +183,18 @@ Proton - + Prefix: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + Wrapper: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - diff --git a/resources/ui/components/tabs/settings/about.ui b/resources/ui/components/tabs/settings/about.ui index 7a3c9929..e7386a85 100644 --- a/resources/ui/components/tabs/settings/about.ui +++ b/resources/ui/components/tabs/settings/about.ui @@ -35,7 +35,7 @@ - + Legendary Developer: diff --git a/resources/ui/components/tabs/settings/legendary.ui b/resources/ui/components/tabs/settings/legendary.ui index 368c24f1..efa42912 100644 --- a/resources/ui/components/tabs/settings/legendary.ui +++ b/resources/ui/components/tabs/settings/legendary.ui @@ -28,7 +28,7 @@ Download Settings - + diff --git a/resources/ui/components/tabs/settings/linux.ui b/resources/ui/components/tabs/settings/linux.ui index b7170c0e..e4bf0abb 100644 --- a/resources/ui/components/tabs/settings/linux.ui +++ b/resources/ui/components/tabs/settings/linux.ui @@ -33,24 +33,18 @@ Wine Settings - + Executable: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + Prefix: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter -