From dde2c9bf8f6e84c05b1ab66a6afa6d6921da41c9 Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Tue, 4 Dec 2018 21:01:20 -0600 Subject: [PATCH] Fix Issue #504 - Update qt/preferences_dialog.py to resize based on layout with fixed sizing constraints - Remove _setupUi from qt/se/preferences_dialog.py and just use the parent class's function - Remove unused imports from qt/se/preferences_dialog.py --- qt/preferences_dialog.py | 4 ++-- qt/se/preferences_dialog.py | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/qt/preferences_dialog.py b/qt/preferences_dialog.py index dc81e65f..97fe6bb0 100644 --- a/qt/preferences_dialog.py +++ b/qt/preferences_dialog.py @@ -7,7 +7,7 @@ from PyQt5.QtCore import Qt, QSize from PyQt5.QtWidgets import ( QDialog, QDialogButtonBox, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, - QSlider, QSizePolicy, QSpacerItem, QCheckBox, QLineEdit, QMessageBox, QSpinBox + QSlider, QSizePolicy, QSpacerItem, QCheckBox, QLineEdit, QMessageBox, QSpinBox, QLayout ) from hscommon.trans import trget @@ -114,7 +114,6 @@ class PreferencesDialogBase(QDialog): def _setupUi(self): self.setWindowTitle(tr("Options")) - self.resize(304, 263) self.setSizeGripEnabled(False) self.setModal(True) self.mainVLayout = QVBoxLayout(self) @@ -124,6 +123,7 @@ class PreferencesDialogBase(QDialog): self.buttonBox = QDialogButtonBox(self) self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok|QDialogButtonBox.RestoreDefaults) self.mainVLayout.addWidget(self.buttonBox) + self.layout().setSizeConstraint(QLayout.SetFixedSize) def _load(self, prefs, setchecked): # Edition-specific diff --git a/qt/se/preferences_dialog.py b/qt/se/preferences_dialog.py index 62db72d4..51c7dcaf 100644 --- a/qt/se/preferences_dialog.py +++ b/qt/se/preferences_dialog.py @@ -9,7 +9,6 @@ from PyQt5.QtWidgets import ( QVBoxLayout, QHBoxLayout, QLabel, QSizePolicy, QSpacerItem, QWidget, QLineEdit ) -from hscommon.plat import ISWINDOWS, ISLINUX from hscommon.trans import trget from hscommon.util import tryint @@ -64,16 +63,6 @@ class PreferencesDialog(PreferencesDialogBase): self.widgetsVLayout.addWidget(self.widget) self._setupBottomPart() - def _setupUi(self): - PreferencesDialogBase._setupUi(self) - - if ISLINUX: - # Under linux, whether it's a Qt layout bug or something else, the size threshold text edit - # doesn't have enough space, so we make the pref pane higher to compensate. - self.resize(self.width(), 530) - elif ISWINDOWS: - self.resize(self.width(), 440) - def _load(self, prefs, setchecked): setchecked(self.matchSimilarBox, prefs.match_similar) setchecked(self.wordWeightingBox, prefs.word_weighting)