From 881d4e23089768eb233d7c0981a6e27939fe7da6 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" Date: Sun, 16 Jun 2019 22:06:25 +0200 Subject: [PATCH 1/2] Fixed the text boxes in project settings to only be enabled when something can be edited --- nw/gui/projecteditor.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nw/gui/projecteditor.py b/nw/gui/projecteditor.py index 8f5bf681..ab15c148 100644 --- a/nw/gui/projecteditor.py +++ b/nw/gui/projecteditor.py @@ -161,6 +161,7 @@ class GuiProjectEditStatus(QWidget): self._addItem(iName, iCol, iName, nUse) self.editName = QLineEdit() + self.editName.setEnabled(False) self.newButton = QPushButton("New") self.delButton = QPushButton("Delete") self.saveButton = QPushButton("Save") @@ -251,6 +252,7 @@ class GuiProjectEditStatus(QWidget): ) selItem.setText("%s [%d]" % (self.colData[selIdx][0], self.colCounts[selIdx])) selItem.setIcon(self.colButton.icon()) + self.editName.setEnabled(False) self.colChanged = True return @@ -277,6 +279,7 @@ class GuiProjectEditStatus(QWidget): newIcon.fill(self.selColour) self.editName.setText(selVal[0]) self.colButton.setIcon(QIcon(newIcon)) + self.editName.setEnabled(True) self.editName.selectAll() self.editName.setFocus() return @@ -326,6 +329,9 @@ class GuiProjectEditReplace(QWidget): self.addButton = QPushButton(QIcon.fromTheme("list-add"),"") self.delButton = QPushButton(QIcon.fromTheme("list-remove"),"") + self.editKey.setEnabled(False) + self.editValue.setEnabled(False) + self.saveButton.clicked.connect(self._saveEntry) self.addButton.clicked.connect(self._addEntry) self.delButton.clicked.connect(self._delEntry) @@ -364,6 +370,8 @@ class GuiProjectEditReplace(QWidget): editVal = selItem.text(1) self.editKey.setText(editKey) self.editValue.setText(editVal) + self.editKey.setEnabled(True) + self.editValue.setEnabled(True) self.editKey.selectAll() self.editKey.setFocus() return True @@ -383,6 +391,9 @@ class GuiProjectEditReplace(QWidget): selItem.setText(1,newVal) self.editKey.clear() self.editValue.clear() + self.editKey.setEnabled(False) + self.editValue.setEnabled(False) + self.listBox.clearSelection() self.arChanged = True return From 3f32da7ece983213234bf80f7c53159a119ab9ba Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" Date: Sun, 16 Jun 2019 22:18:47 +0200 Subject: [PATCH 2/2] Fixed a bug in docdetails pane where labels were stacked instead of replaced --- nw/gui/docdetails.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nw/gui/docdetails.py b/nw/gui/docdetails.py index bfe2f26d..43c51ccd 100644 --- a/nw/gui/docdetails.py +++ b/nw/gui/docdetails.py @@ -47,12 +47,19 @@ class GuiDocDetails(QFrame): self.fntTwo = QFont() self.fntTwo.setPointSize(10) + self.colTwo = [ + QLabel(""), + QLabel(""), + QLabel(""), + QLabel("") + ] colOne = ["Name","Status","Class","Layout"] for nRow in range(4): lblOne = QLabel(colOne[nRow]) lblOne.setFont(self.fntOne) self.mainBox.addWidget(lblOne,nRow,0) + self.mainBox.addWidget(self.colTwo[nRow],nRow,1) self.mainBox.setColumnStretch(0,0) self.mainBox.setColumnStretch(1,1) @@ -76,9 +83,7 @@ class GuiDocDetails(QFrame): ] for nRow in range(4): - lblTwo = QLabel(colTwo[nRow]) - lblTwo.setFont(self.fntTwo) - self.mainBox.addWidget(lblTwo,nRow,1) + self.colTwo[nRow].setText(colTwo[nRow]) return