X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=041a8069a8c86cb62034ae8d33d9daa4da984d1f;hb=57dfb183e24175bc782647d4e6aebe31063f3881;hp=d5339c40477b5328e74caae7f959f6e65771a068;hpb=fdf9de0d15d7189f399b68ddb44edf03123e1ca1;p=bertos.git

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index d5339c40..041a8069 100644
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -169,7 +169,9 @@ class BToolchainPage(BWizardPage):
         try:
             QApplication.instance().setOverrideCursor(Qt.WaitCursor)
             for i in range(self.pageContent.toolchainList.count()):
-                self.validateToolchain(i)
+                data = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(i).data(Qt.UserRole))
+                self.validateToolchain(data["path"])
+            self._populateToolchainList()
         finally:
             QApplication.instance().restoreOverrideCursor()
 
@@ -182,19 +184,37 @@ class BToolchainPage(BWizardPage):
         self.pageContent.toolchainList.clear()
         self._valid_items = []
         toolchains = self._toolchain_manager.predefined_toolchains + self._toolchain_manager.toolchains
-        sel_toolchain = self.projectInfo("TOOLCHAIN")
+        toolchain_dict = {
+            'valid': [],
+            'non-valid': [],
+            'unknown': [],
+            'unverified': [],
+        }
         for key, value in toolchains:
             if os.path.exists(key):
-                item = QListWidgetItem(key)
                 item_data = {"path":key}
                 if value:
                     item_data.update(value)
-                item.setData(Qt.UserRole, qvariant_converter.convertStringDict(item_data))
-                self.pageContent.toolchainList.addItem(item)
-                if sel_toolchain and sel_toolchain["path"] == key:
-                    self.pageContent.toolchainList.setCurrentItem(item)
                 if value is not None:
-                    self.validateToolchain(self.pageContent.toolchainList.row(item))
+                    k, data = self.validateToolchain(key)
+                    item_data.update(data)
+                    toolchain_dict[k].append(item_data)
+                else:
+                    toolchain_dict["unverified"].append(item_data)
+        self._processItems(toolchain_dict["valid"], self._validItem)
+        self._processItems(toolchain_dict["non-valid"], self._invalidItem)
+        self._processItems(toolchain_dict["unknown"], self._unknownItem)
+        self._processItems(toolchain_dict["unverified"])
+
+    def _processItems(self, item_list, procedure=lambda x: None):
+        sel_toolchain = self.projectInfo("TOOLCHAIN")
+        for item_data in item_list:
+            item = QListWidgetItem(item_data["path"])
+            item.setData(Qt.UserRole, qvariant_converter.convertStringDict(item_data))
+            self.pageContent.toolchainList.addItem(item)
+            procedure(item)
+            if sel_toolchain and sel_toolchain["path"] == item_data["path"]:
+                self.pageContent.toolchainList.setCurrentItem(item)
 
     def currentToolchain(self):
         selected_toolchain = qvariant_converter.getStringDict(self.pageContent.toolchainList.currentItem().data(Qt.UserRole))
@@ -221,62 +241,41 @@ class BToolchainPage(BWizardPage):
         self._populateToolchainList()
         self.showMessage(self.tr("Toolchain search result."), self.tr("%1 toolchains found").arg(len(toolchain_list)))
 
-    def _validItem(self, index, infos):
+    def _validItem(self, item):
         """
         Sets the item at index as a valid item and associates the given info to it.
         """
-        item = self.pageContent.toolchainList.item(index)
-        new_data = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(index).data(Qt.UserRole))
-        new_data.update(infos)
-        item.setData(Qt.UserRole, qvariant_converter.convertStringDict(new_data))
+        data = qvariant_converter.getStringDict(item.data(Qt.UserRole))
         item.setIcon(QIcon(":/images/ok.png"))
         self._valid_items.append(item)
-        if "version" in infos and "target" in infos:
-            item.setText("GCC " + infos["version"] + " - " + infos["target"].strip())
-
-    def _differentTargetItem(self, index, infos):
-        item = self.pageContent.toolchainList.item(index)
-        new_data = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(index).data(Qt.UserRole))
-        new_data.update(infos)
-        item.setData(Qt.UserRole, qvariant_converter.convertStringDict(new_data))
+        if "version" in data and "target" in data:
+            item.setText("GCC " + data["version"] + " - " + data["target"].strip())
+
+    def _invalidItem(self, item):
+        data = qvariant_converter.getStringDict(item.data(Qt.UserRole))
         item.setIcon(QIcon(":/images/warning.png"))
-        if "version" in infos and "target" in infos:
-            item.setText("GCC " + infos["version"] + " - " + infos["target"].strip())
+        if "version" in data and "target" in data:
+            item.setText("GCC " + data["version"] + " - " + data["target"].strip())
 
-    def _invalidItem(self, index):
+    def _unknownItem(self, item):
         """
         Sets the item at index as an invalid item.
         """
-        item = self.pageContent.toolchainList.item(index)
         item.setIcon(QIcon(":/images/error.png"))
 
-    def validateToolchain(self, i):
+    def validateToolchain(self, filename):
         """
         Toolchain validation procedure.
         """
-        filename = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(i).data(Qt.UserRole))["path"]
         info = self._toolchain_manager.validateToolchain(filename)
-
-        valid = []
-        different_target = []
-        invalid = []
-
-        # Add the item in the list with the appropriate associate data.
-        needed = self.projectInfo("CPU_INFOS")
         if info:
+            needed = self.projectInfo("CPU_INFOS")
             if "target" in info and info["target"].find(needed["TOOLCHAIN"]) != -1:
-                valid.append(info)
+                return 'valid', info
             else:
-                different_target.append(info)
+                return 'non-valid', info
         else:
-            invalid.append(info)
-
-        for i, info in enumerate(valid):
-            self._validItem(i, info)
-        for i, info in enumerate(different_target):
-            self._differentTargetItem(i + len(valid), info)
-        for i, info in enumerate(invalid):
-            self._invalidItem(i + len(valid) + len(different_target))
+            return 'unknown', {'path': filename}
     
     def isDefaultToolchain(self, toolchain):
         """