From 088b96fd5582a6a57cc61c9979e7e1a8bec49320 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 26 May 2020 22:47:48 +0200 Subject: [PATCH] Fixed some alignemnt issue and the icon for NO_LAYOUT in the details panel under the tree view --- nw/gui/build.py | 2 +- nw/gui/elements/docdetails.py | 45 +++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/nw/gui/build.py b/nw/gui/build.py index 535ab1ae..d52056d8 100644 --- a/nw/gui/build.py +++ b/nw/gui/build.py @@ -205,7 +205,7 @@ class GuiBuildNovel(QDialog): self.novelFiles.setChecked( self.optState.getBool("GuiBuildNovel", "addNovel", True) ) - + self.noteFiles = QSwitch() self.noteFiles.setChecked( self.optState.getBool("GuiBuildNovel", "addNotes", False) diff --git a/nw/gui/elements/docdetails.py b/nw/gui/elements/docdetails.py index 6a12f0b3..e72f6486 100644 --- a/nw/gui/elements/docdetails.py +++ b/nw/gui/elements/docdetails.py @@ -32,7 +32,9 @@ from PyQt5.QtCore import Qt from PyQt5.QtGui import QFont from PyQt5.QtWidgets import QFrame, QGridLayout, QLabel -from nw.constants import nwLabels, nwItemClass, nwItemType, nwUnicode +from nw.constants import ( + nwLabels, nwItemClass, nwItemType, nwItemLayout, nwUnicode +) logger = logging.getLogger(__name__) @@ -143,27 +145,27 @@ class GuiDocDetails(QFrame): self.pCountData.setAlignment(Qt.AlignRight) # Assemble - self.mainBox.addWidget(self.labelName, 0, 0, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.labelFlag, 0, 1, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.labelData, 0, 2, 1, 3, Qt.AlignTop) + self.mainBox.addWidget(self.labelName, 0, 0, 1, 1) + self.mainBox.addWidget(self.labelFlag, 0, 1, 1, 1) + self.mainBox.addWidget(self.labelData, 0, 2, 1, 3) - self.mainBox.addWidget(self.statusName, 1, 0, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.statusFlag, 1, 1, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.statusData, 1, 2, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.cCountName, 1, 3, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.cCountData, 1, 4, 1, 1, Qt.AlignTop) + self.mainBox.addWidget(self.statusName, 1, 0, 1, 1) + self.mainBox.addWidget(self.statusFlag, 1, 1, 1, 1) + self.mainBox.addWidget(self.statusData, 1, 2, 1, 1) + self.mainBox.addWidget(self.cCountName, 1, 3, 1, 1) + self.mainBox.addWidget(self.cCountData, 1, 4, 1, 1) - self.mainBox.addWidget(self.className, 2, 0, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.classFlag, 2, 1, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.classData, 2, 2, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.wCountName, 2, 3, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.wCountData, 2, 4, 1, 1, Qt.AlignTop) + self.mainBox.addWidget(self.className, 2, 0, 1, 1) + self.mainBox.addWidget(self.classFlag, 2, 1, 1, 1) + self.mainBox.addWidget(self.classData, 2, 2, 1, 1) + self.mainBox.addWidget(self.wCountName, 2, 3, 1, 1) + self.mainBox.addWidget(self.wCountData, 2, 4, 1, 1) - self.mainBox.addWidget(self.layoutName, 3, 0, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.layoutFlag, 3, 1, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.layoutData, 3, 2, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.pCountName, 3, 3, 1, 1, Qt.AlignTop) - self.mainBox.addWidget(self.pCountData, 3, 4, 1, 1, Qt.AlignTop) + self.mainBox.addWidget(self.layoutName, 3, 0, 1, 1) + self.mainBox.addWidget(self.layoutFlag, 3, 1, 1, 1) + self.mainBox.addWidget(self.layoutData, 3, 2, 1, 1) + self.mainBox.addWidget(self.pCountName, 3, 3, 1, 1) + self.mainBox.addWidget(self.pCountData, 3, 4, 1, 1) self.mainBox.setColumnStretch(0,0) self.mainBox.setColumnStretch(1,0) @@ -221,7 +223,10 @@ class GuiDocDetails(QFrame): self.labelFlag.setText(exportFlag) self.statusFlag.setPixmap(flagIcon.pixmap(10, 10)) self.classFlag.setText(nwLabels.CLASS_FLAG[nwItem.itemClass]) - self.layoutFlag.setText(nwLabels.LAYOUT_FLAG[nwItem.itemLayout]) + if nwItem.itemLayout == nwItemLayout.NO_LAYOUT: + self.layoutFlag.setText("-") + else: + self.layoutFlag.setText(nwLabels.LAYOUT_FLAG[nwItem.itemLayout]) self.labelData.setText(theLabel) self.statusData.setText(nwItem.itemStatus)