Merge branch 'dev' into tree_context

2020-06-04 17:58:39 +02:00
parent 72e5778e4f 91fdb71674
commit fa769650a7
13 changed files with 408 additions and 70 deletions
@@ -50,20 +50,20 @@ class GuiProjectTree(QTreeWidget):
    C_EXPORT = 2
    C_FLAGS  = 3

-    def __init__(self, theParent, theProject):
+    def __init__(self, theParent):
        QTreeWidget.__init__(self, theParent)

        logger.debug("Initialising GuiProjectTree ...")
        self.mainConf   = nw.CONFIG
        self.theParent  = theParent
        self.theTheme   = theParent.theTheme
-        self.theProject = theProject
-        self.ctxMenu    = GuiProjectTreeMenu(self)
+        self.theProject = theParent.theProject

        # Tree Settings
        self.theMap   = None
        self.orphRoot = None

+        self.ctxMenu = GuiProjectTreeMenu(self)
        self.clearTree()

        # Build GUI