feat(dialogs): rewrite class AddGameDialog from @Vector_null

portprotonqt/dialogs.py

@@ -6,7 +6,7 @@ from PySide6.QtWidgets import (
     QDialog, QLineEdit, QFormLayout, QPushButton,
     QHBoxLayout, QLabel, QVBoxLayout, QListWidget, QScrollArea, QWidget, QListWidgetItem
 )
-from PySide6.QtCore import Qt, QObject, Signal, QMimeDatabase
+from PySide6.QtCore import Qt, QObject, Signal, QMimeDatabase, QTimer
 from icoextract import IconExtractor, IconExtractorError
 from PIL import Image
 from portprotonqt.config_utils import get_portproton_location
@@ -388,10 +388,13 @@ class AddGameDialog(QDialog):
 
         self.setWindowTitle(_("Edit Game") if edit_mode else _("Add Game"))
         self.setModal(True)
+        self.setFixedWidth(600)
         self.setStyleSheet(self.theme.MAIN_WINDOW_STYLE + self.theme.MESSAGE_BOX_STYLE)
 
         layout = QFormLayout(self)
         layout.setLabelAlignment(Qt.AlignmentFlag.AlignLeft)
+        layout.setFormAlignment(Qt.AlignmentFlag.AlignLeft)
+        layout.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.ExpandingFieldsGrow)
 
         # Game name
         self.nameEdit = QLineEdit(self)
@@ -403,42 +406,55 @@ class AddGameDialog(QDialog):
         layout.addRow(name_label, self.nameEdit)
 
         # Exe path
+        exe_label = QLabel(_("Path to Executable:"))
+        exe_label.setStyleSheet(
+            self.theme.PARAMS_TITLE_STYLE + " QLabel { color: #ffffff; font-size: 14px; font-weight: bold; }")
+
         self.exeEdit = QLineEdit(self)
         self.exeEdit.setStyleSheet(self.theme.ADDGAME_INPUT_STYLE)
         if exe_path:
             self.exeEdit.setText(exe_path)
+
         exeBrowseButton = QPushButton(_("Browse..."), self)
         exeBrowseButton.setStyleSheet(self.theme.ACTION_BUTTON_STYLE)
         exeBrowseButton.clicked.connect(self.browseExe)
+        exeBrowseButton.setObjectName("exeBrowseButton")  # Для поиска кнопки
 
-        exeLayout = QHBoxLayout()
+        # Добавляем поле ввода для exe
-        exeLayout.addWidget(self.exeEdit)
+        layout.addRow(exe_label, self.exeEdit)
-        exeLayout.addWidget(exeBrowseButton)
+
-        exe_label = QLabel(_("Path to Executable:"))
+        # Добавляем кнопку обзора под полем ввода с выравниванием
-        exe_label.setStyleSheet(self.theme.PARAMS_TITLE_STYLE + " QLabel { color: #ffffff; font-size: 14px; font-weight: bold; }")
+        empty_label = QLabel("")
-        layout.addRow(exe_label, exeLayout)
+        empty_label.setFixedWidth(exe_label.sizeHint().width())
+        layout.addRow(empty_label, exeBrowseButton)
 
         # Cover path
+        cover_label = QLabel(_("Custom Cover:"))
+        cover_label.setStyleSheet(
+            self.theme.PARAMS_TITLE_STYLE + " QLabel { color: #ffffff; font-size: 14px; font-weight: bold; }")
+
         self.coverEdit = QLineEdit(self)
         self.coverEdit.setStyleSheet(self.theme.ADDGAME_INPUT_STYLE)
         if cover_path:
             self.coverEdit.setText(cover_path)
+
         coverBrowseButton = QPushButton(_("Browse..."), self)
         coverBrowseButton.setStyleSheet(self.theme.ACTION_BUTTON_STYLE)
         coverBrowseButton.clicked.connect(self.browseCover)
+        coverBrowseButton.setObjectName("coverBrowseButton")  # Для поиска кнопки
 
-        coverLayout = QHBoxLayout()
+        # Добавляем поле ввода для обложки
-        coverLayout.addWidget(self.coverEdit)
+        layout.addRow(cover_label, self.coverEdit)
-        coverLayout.addWidget(coverBrowseButton)
+
-        cover_label = QLabel(_("Custom Cover:"))
+        # Добавляем кнопку обзора под полем ввода с выравниванием
-        cover_label.setStyleSheet(self.theme.PARAMS_TITLE_STYLE + " QLabel { color: #ffffff; font-size: 14px; font-weight: bold; }")
+        layout.addRow(empty_label, coverBrowseButton)
-        layout.addRow(cover_label, coverLayout)
 
         # Preview
         self.coverPreview = QLabel(self)
         self.coverPreview.setStyleSheet(self.theme.CONTENT_STYLE + " QLabel { color: #ffffff; }")
         preview_label = QLabel(_("Cover Preview:"))
-        preview_label.setStyleSheet(self.theme.PARAMS_TITLE_STYLE + " QLabel { color: #ffffff; font-size: 14px; font-weight: bold; }")
+        preview_label.setStyleSheet(
+            self.theme.PARAMS_TITLE_STYLE + " QLabel { color: #ffffff; font-size: 14px; font-weight: bold; }")
         layout.addRow(preview_label, self.coverPreview)
 
         # Dialog buttons
@@ -452,12 +468,21 @@ class AddGameDialog(QDialog):
         self.button_layout.addWidget(self.cancel_button)
         layout.addRow(self.button_layout)
 
+        # Подключение сигналов
         self.select_button.clicked.connect(self.accept)
         self.cancel_button.clicked.connect(self.reject)
-
         self.coverEdit.textChanged.connect(self.updatePreview)
         self.exeEdit.textChanged.connect(self.updatePreview)
 
+        # Установка одинаковой ширины для кнопок и полей ввода
+        def update_button_widths():
+            exeBrowseButton.setFixedWidth(self.exeEdit.width())
+            coverBrowseButton.setFixedWidth(self.coverEdit.width())
+
+        # Вызываем после отображения окна, когда размеры установлены, чтобы реально дождаться, когда всё сформируется
+        QTimer.singleShot(0, update_button_widths)
+
+        # Обновляем превью, если в режиме редактирования
         if edit_mode:
             self.updatePreview()