Merge branch 'master' into dev_0.6

2020-05-14 22:01:38 +02:00
parent 82c24d75ef a8bd8e63d5
commit 69b101ce55
10 changed files with 42 additions and 24 deletions
@@ -57,15 +57,11 @@ class GuiItemEditor(QDialog):
            self._doClose()

        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")