From fa686c5166cab84145119a49842b2980d978626a Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Mon, 7 Feb 2022 22:10:18 +0200 Subject: [PATCH] LegendarySettings: Add EosWidget directly in the left layout --- rare/components/tabs/settings/legendary.py | 4 +- rare/ui/components/tabs/settings/legendary.py | 4 - rare/ui/components/tabs/settings/legendary.ui | 7 - rare/ui/components/tabs/settings/rare.py | 3 - rare/ui/components/tabs/settings/rare.ui | 559 +++++++++--------- 5 files changed, 280 insertions(+), 297 deletions(-) diff --git a/rare/components/tabs/settings/legendary.py b/rare/components/tabs/settings/legendary.py index ba631b04..8c5cc4de 100644 --- a/rare/components/tabs/settings/legendary.py +++ b/rare/components/tabs/settings/legendary.py @@ -2,7 +2,7 @@ import re from logging import getLogger from typing import Tuple -from PyQt5.QtCore import QRunnable, QObject, pyqtSignal, QThreadPool +from PyQt5.QtCore import Qt, QRunnable, QObject, pyqtSignal, QThreadPool from PyQt5.QtWidgets import QSizePolicy, QWidget, QFileDialog, QMessageBox import rare.shared as shared @@ -86,7 +86,7 @@ class LegendarySettings(QWidget, Ui_LegendarySettings): self.ubi_helper = UbiActivationHelper(self.ubisoft_gb) self.eos_widget = EosWidget() - self.eos_layout.addWidget(self.eos_widget) + self.left_layout.insertWidget(3, self.eos_widget, alignment=Qt.AlignTop) self.refresh_game_meta_btn.clicked.connect(self.refresh_game_meta) diff --git a/rare/ui/components/tabs/settings/legendary.py b/rare/ui/components/tabs/settings/legendary.py index f2805129..35a5c3f9 100644 --- a/rare/ui/components/tabs/settings/legendary.py +++ b/rare/ui/components/tabs/settings/legendary.py @@ -135,10 +135,6 @@ class Ui_LegendarySettings(object): self.verticalLayout = QtWidgets.QVBoxLayout(self.ubisoft_gb) self.verticalLayout.setObjectName("verticalLayout") self.left_layout.addWidget(self.ubisoft_gb, 0, QtCore.Qt.AlignTop) - self.eos_layout = QtWidgets.QHBoxLayout() - self.eos_layout.setSizeConstraint(QtWidgets.QLayout.SetFixedSize) - self.eos_layout.setObjectName("eos_layout") - self.left_layout.addLayout(self.eos_layout) spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.left_layout.addItem(spacerItem1) self.gridLayout.addLayout(self.left_layout, 0, 0, 1, 1) diff --git a/rare/ui/components/tabs/settings/legendary.ui b/rare/ui/components/tabs/settings/legendary.ui index c521ed47..eeb4395b 100644 --- a/rare/ui/components/tabs/settings/legendary.ui +++ b/rare/ui/components/tabs/settings/legendary.ui @@ -244,13 +244,6 @@ - - - - QLayout::SetFixedSize - - - diff --git a/rare/ui/components/tabs/settings/rare.py b/rare/ui/components/tabs/settings/rare.py index 530658bd..89daf103 100644 --- a/rare/ui/components/tabs/settings/rare.py +++ b/rare/ui/components/tabs/settings/rare.py @@ -127,9 +127,6 @@ class Ui_RareSettings(object): self.log_dir_size_label.setObjectName("log_dir_size_label") self.log_dir_layout.addWidget(self.log_dir_size_label) self.right_layout.addWidget(self.log_dir_group) - self.rpc_layout = QtWidgets.QVBoxLayout() - self.rpc_layout.setObjectName("rpc_layout") - self.right_layout.addLayout(self.rpc_layout) self.groupBox = QtWidgets.QGroupBox(RareSettings) self.groupBox.setObjectName("groupBox") self.shortcuts_layout = QtWidgets.QVBoxLayout(self.groupBox) diff --git a/rare/ui/components/tabs/settings/rare.ui b/rare/ui/components/tabs/settings/rare.ui index f64a7f89..704a5497 100644 --- a/rare/ui/components/tabs/settings/rare.ui +++ b/rare/ui/components/tabs/settings/rare.ui @@ -1,285 +1,282 @@ - RareSettings - - - - 0 - 0 - 674 - 532 - + RareSettings + + + + 0 + 0 + 674 + 532 + + + + RareSettings + + + + + + + + + 0 + 0 + + + + Interface + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - RareSettings - - - - - - - - - 0 - 0 - - - - Interface - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - Language - - - - - - - - 0 - 0 - - - - - - - - Color Scheme - - - - - - - - 0 - 0 - - - - - None - - - - - - - - Style Sheet - - - - - - - - 0 - 0 - - - - - None - - - - - - - - - true - - - - Restart Rare to apply. - - - true - - - - - - - - - - Behavior - - - - - - Restore window size on application startup - - - - - - - Show notification on download completion - - - - - - - Show console for game debug - - - - - - - Exit to System tray - - - - - - - Update games on application startup - - - - - - - Confirm game launch - - - - - - - Automatically sync with cloud - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Logs - - - - - - Open Log directory - - - - - - - Clean Log directory - - - - - - - - 0 - 0 - - - - - - - true - - - - - - - - - - - - - Shortcuts - - - - - - Create Desktop link - - - - - - - Create start menu link - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - + + + + Language + + + + + + + + 0 + 0 + + + + + + + + Color Scheme + + + + + + + + 0 + 0 + + + + + None + + + + + + + + Style Sheet + + + + + + + + 0 + 0 + + + + + None + + + + + + + + + true + + + + Restart Rare to apply. + + + true + + + + + + + + + + Behavior + + + + + + Restore window size on application startup + + + + + + + Show notification on download completion + + + + + + + Show console for game debug + + + + + + + Exit to System tray + + + + + + + Update games on application startup + + + + + + + Confirm game launch + + + + + + + Automatically sync with cloud + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Logs + + + + + + Open Log directory + + + + + + + Clean Log directory + + + + + + + + 0 + 0 + + + + + + + true + + + + + + + + + + Shortcuts + + + + + + Create Desktop link + + + + + + + Create start menu link + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + +