From cff1529e7133f815aeea5e0b2ae5826eb4ee045b Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 14 May 2020 21:26:56 +0200 Subject: [PATCH] Restored the gear SVG decoration for some dialogs until they're redesigned --- nw/gui/dialogs/configeditor.py | 3 ++- nw/gui/dialogs/itemeditor.py | 10 +++------- nw/gui/dialogs/projecteditor.py | 8 +++----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/nw/gui/dialogs/configeditor.py b/nw/gui/dialogs/configeditor.py index e03d7bad..da3158c0 100644 --- a/nw/gui/dialogs/configeditor.py +++ b/nw/gui/dialogs/configeditor.py @@ -59,9 +59,10 @@ class GuiConfigEditor(QDialog): self.setWindowTitle("Preferences") self.guiDeco = self.theParent.theTheme.loadDecoration("settings", (64,64)) + self.outerBox.setSpacing(16) + self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop) self.outerBox.addLayout(self.innerBox) - self.outerBox.setSpacing(16) self.setLayout(self.outerBox) self.tabGeneral = GuiConfigEditGeneralTab(self.theParent) diff --git a/nw/gui/dialogs/itemeditor.py b/nw/gui/dialogs/itemeditor.py index 38af48d6..b96d226d 100644 --- a/nw/gui/dialogs/itemeditor.py +++ b/nw/gui/dialogs/itemeditor.py @@ -54,15 +54,11 @@ class GuiItemEditor(QDialog): self.innerBox = QVBoxLayout() self.setWindowTitle("Item Settings") - self.guiDeco = QLabel() - self.guiDeco.setPixmap( - self.theParent.theTheme.getPixmap( - nwLabels.CLASS_ICON[self.theItem.itemClass], (64,64) - ) - ) + self.guiDeco = self.theParent.theTheme.loadDecoration("settings", (64,64)) + self.outerBox.setSpacing(16) + self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop) self.outerBox.addLayout(self.innerBox) - self.outerBox.setSpacing(16) self.setLayout(self.outerBox) self.mainGroup = QGroupBox("Item Settings") diff --git a/nw/gui/dialogs/projecteditor.py b/nw/gui/dialogs/projecteditor.py index fd256c3a..6e8b63be 100644 --- a/nw/gui/dialogs/projecteditor.py +++ b/nw/gui/dialogs/projecteditor.py @@ -56,13 +56,11 @@ class GuiProjectEditor(QDialog): self.innerBox = QVBoxLayout() self.setWindowTitle("Project Settings") - self.guiDeco = QLabel() - self.guiDeco.setPixmap( - self.theParent.theTheme.getPixmap("cls_novel", (64,64)) - ) + self.guiDeco = self.theParent.theTheme.loadDecoration("settings", (64,64)) + self.outerBox.setSpacing(16) + self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop) self.outerBox.addLayout(self.innerBox) - self.outerBox.setSpacing(16) self.setLayout(self.outerBox) self.theProject.countStatus()