From d5775a7838508ccb32a4bd5051a9847c54747ab0 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Thu, 7 May 2020 00:59:05 +0200
Subject: [PATCH] Improved lookup of enums

---
 nw/project/item.py | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/nw/project/item.py b/nw/project/item.py
index 3bd358af..f404eda7 100644
--- a/nw/project/item.py
+++ b/nw/project/item.py
@@ -146,40 +146,31 @@ class NWItem():
     def setType(self, theType):
         if isinstance(theType, nwItemType):
             self.itemType = theType
-            return
+        elif theType in nwItemType.__members__:
+            self.itemType = nwItemType[theType]
         else:
-            for itemType in nwItemType:
-                if theType == itemType.name:
-                    self.itemType = itemType
-                    return
-        logger.error("Unrecognised item type '%s'" % theType)
-        self.itemType = nwItemType.NO_TYPE
+            logger.error("Unrecognised item type '%s'" % theType)
+            self.itemType = nwItemType.NO_TYPE
         return
 
     def setClass(self, theClass):
         if isinstance(theClass, nwItemClass):
             self.itemClass = theClass
-            return
+        elif theClass in nwItemClass.__members__:
+            self.itemClass = nwItemClass[theClass]
         else:
-            for itemClass in nwItemClass:
-                if theClass == itemClass.name:
-                    self.itemClass = itemClass
-                    return
-        logger.error("Unrecognised item class '%s'" % theClass)
-        self.itemClass = nwItemClass.NO_CLASS
+            logger.error("Unrecognised item class '%s'" % theClass)
+            self.itemClass = nwItemClass.NO_CLASS
         return
 
     def setLayout(self, theLayout):
         if isinstance(theLayout, nwItemLayout):
             self.itemLayout = theLayout
-            return
+        elif theLayout in nwItemLayout.__members__:
+            self.itemLayout = nwItemLayout[theLayout]
         else:
-            for itemLayout in nwItemLayout:
-                if theLayout == itemLayout.name:
-                    self.itemLayout = itemLayout
-                    return
-        logger.error("Unrecognised item layout '%s'" % theLayout)
-        self.itemLayout = nwItemLayout.NO_LAYOUT
+            logger.error("Unrecognised item layout '%s'" % theLayout)
+            self.itemLayout = nwItemLayout.NO_LAYOUT
         return
 
     def setStatus(self, theStatus):