From 8c83f8aa23c1cffabab8d66cabd0954769edaf9a Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:21:19 +0200 Subject: [PATCH] InstallDialog: Add install_dir_edit widget without using an extra layout --- rare/components/dialogs/install_dialog.py | 7 +++++-- rare/ui/components/dialogs/install_dialog.py | 7 ++----- rare/ui/components/dialogs/install_dialog.ui | 7 ++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/rare/components/dialogs/install_dialog.py b/rare/components/dialogs/install_dialog.py index 4b1e405d..e379ab7c 100644 --- a/rare/components/dialogs/install_dialog.py +++ b/rare/components/dialogs/install_dialog.py @@ -6,7 +6,7 @@ from typing import Tuple, List, Union, Optional from PyQt5.QtCore import Qt, QThreadPool, QSettings, QCoreApplication from PyQt5.QtCore import pyqtSignal, pyqtSlot from PyQt5.QtGui import QCloseEvent, QKeyEvent, QShowEvent -from PyQt5.QtWidgets import QDialog, QFileDialog, QCheckBox, QLayout, QWidget, QVBoxLayout +from PyQt5.QtWidgets import QDialog, QFileDialog, QCheckBox, QLayout, QWidget, QVBoxLayout, QFormLayout from legendary.utils.selective_dl import get_sdl_appname from rare.models.game import RareGame @@ -85,7 +85,10 @@ class InstallDialog(QDialog): save_func=self.save_install_edit, parent=self, ) - self.ui.install_dir_layout.addWidget(self.install_dir_edit) + self.ui.install_dialog_layout.setWidget( + self.ui.install_dialog_layout.indexOf(self.ui.install_dir_label), + QFormLayout.FieldRole, self.install_dir_edit + ) if self.options.update: self.ui.install_dir_label.setEnabled(False) diff --git a/rare/ui/components/dialogs/install_dialog.py b/rare/ui/components/dialogs/install_dialog.py index b74ca181..de10c4ad 100644 --- a/rare/ui/components/dialogs/install_dialog.py +++ b/rare/ui/components/dialogs/install_dialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'rare/ui/components/dialogs/install_dialog.ui' # -# Created by: PyQt5 UI code generator 5.15.9 +# 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. @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_InstallDialog(object): def setupUi(self, InstallDialog): InstallDialog.setObjectName("InstallDialog") - InstallDialog.resize(324, 232) + InstallDialog.resize(272, 238) InstallDialog.setWindowTitle("InstallDialog") self.install_dialog_layout = QtWidgets.QFormLayout(InstallDialog) self.install_dialog_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) @@ -25,9 +25,6 @@ class Ui_InstallDialog(object): self.install_dir_label = QtWidgets.QLabel(InstallDialog) self.install_dir_label.setObjectName("install_dir_label") self.install_dialog_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.install_dir_label) - self.install_dir_layout = QtWidgets.QHBoxLayout() - self.install_dir_layout.setObjectName("install_dir_layout") - self.install_dialog_layout.setLayout(1, QtWidgets.QFormLayout.FieldRole, self.install_dir_layout) self.platform_label = QtWidgets.QLabel(InstallDialog) self.platform_label.setObjectName("platform_label") self.install_dialog_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.platform_label) diff --git a/rare/ui/components/dialogs/install_dialog.ui b/rare/ui/components/dialogs/install_dialog.ui index 684809e0..6db58a64 100644 --- a/rare/ui/components/dialogs/install_dialog.ui +++ b/rare/ui/components/dialogs/install_dialog.ui @@ -6,8 +6,8 @@ 0 0 - 324 - 232 + 272 + 238 @@ -31,9 +31,6 @@ - - -