From a5fd8398c49c27cd8342f621ed8e0c804f892b91 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 30 May 2020 19:54:25 -0300 Subject: [PATCH 1/2] Allow to resize clayout.py horizontal space between the text editor and the card preview. # Conflicts: # qt/aqt/clayout.py --- qt/aqt/clayout.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qt/aqt/clayout.py b/qt/aqt/clayout.py index 29f3c6496..7af761507 100644 --- a/qt/aqt/clayout.py +++ b/qt/aqt/clayout.py @@ -100,6 +100,7 @@ class CardLayout(QDialog): def setupTopArea(self): self.topArea = QWidget() + self.topArea.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) self.topAreaForm = aqt.forms.clayout_top.Ui_Form() self.topAreaForm.setupUi(self.topArea) self.topAreaForm.templateOptions.setText(_("Options") + " " + downArrow()) @@ -173,14 +174,14 @@ class CardLayout(QDialog): ########################################################################## def setupMainArea(self): - w = self.mainArea = QWidget() - l = QHBoxLayout() - l.setContentsMargins(0, 0, 0, 0) - l.setSpacing(3) + split = self.mainArea = QSplitter() + split.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + split.setOrientation(Qt.Horizontal) left = QWidget() tform = self.tform = aqt.forms.template.Ui_Form() tform.setupUi(left) - l.addWidget(left, 5) + split.addWidget(left) + split.setCollapsible(0, False) right = QWidget() self.pform = aqt.forms.preview.Ui_Form() @@ -192,9 +193,8 @@ class CardLayout(QDialog): self.setup_edit_area() self.setup_preview() - - l.addWidget(right, 5) - w.setLayout(l) + split.addWidget(right) + split.setCollapsible(1, False) def setup_edit_area(self): tform = self.tform From 6bd80fef67fd839be1ea36245c07e90252a41666 Mon Sep 17 00:00:00 2001 From: evandrocoan Date: Sat, 30 May 2020 20:31:34 -0300 Subject: [PATCH 2/2] Add saveSplitter and restoreSplitter to clayout.py # Conflicts: # qt/aqt/clayout.py --- qt/aqt/clayout.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qt/aqt/clayout.py b/qt/aqt/clayout.py index 7af761507..a2442b7aa 100644 --- a/qt/aqt/clayout.py +++ b/qt/aqt/clayout.py @@ -25,7 +25,9 @@ from aqt.utils import ( getOnlyText, openHelp, restoreGeom, + restoreSplitter, saveGeom, + saveSplitter, shortcut, showInfo, showWarning, @@ -72,6 +74,7 @@ class CardLayout(QDialog): gui_hooks.card_layout_will_show(self) self.redraw_everything() restoreGeom(self, "CardLayout") + restoreSplitter(self.mainArea, "CardLayoutMainArea") self.setWindowModality(Qt.ApplicationModal) self.show() # take the focus away from the first input area when starting up, @@ -765,6 +768,7 @@ Enter deck to place new %s cards in, or leave blank:""" self.cancelPreviewTimer() av_player.stop_and_clear_queue() saveGeom(self, "CardLayout") + saveSplitter(self.mainArea, "CardLayoutMainArea") self.preview_web = None self.model = None self.rendered_card = None