Extract the validateToolchain function from the BToolchainPage in order to use it...

[bertos.git] / wizard / BEditingDialog.py

diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py
index 6c714a5027654b5f577f3d9f8f2bd8774322194f..495f358ce5746b0ee3e50cad43bcb511444497c7 100644 (file)
--- a/wizard/BEditingDialog.py
+++ b/wizard/BEditingDialog.py
@@ -39,7 +39,8 @@ import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from bertos_utils import loadBertosProject
+from bertos_utils import loadBertosProject, bertosVersion, getToolchainName
+from toolchain_validation import validateToolchain
 import BModulePage
 
 class BEditingDialog(QDialog):
@@ -79,15 +80,20 @@ class BEditingDialog(QDialog):
         self.toolchain_menu = QMenu(self.tr("select toolchain"))
         action_group = QActionGroup(self.toolchain_menu)
         for toolchain in sorted(self.toolchains()):
-            action = self.toolchain_menu.addAction(toolchain)
+            info = validateToolchain(toolchain)
+            if info[0]:
+                name = getToolchainName(info[1])
+            else:
+                name = toolchain
+            action = self.toolchain_menu.addAction(name)
             action_group.addAction(action)
             action.setCheckable(True)
-            action.setChecked(True if unicode(action.text()) == self.currentToolchain()["path"] else False)
+            action.setChecked(True if toolchain == self.currentToolchain()["path"] else False)
 
     def setupVersionMenu(self):
         self.version_menu = QMenu(self.tr("select BeRTOS version"))
         action_group = QActionGroup(self.version_menu)
-        for version in sorted(self.versions()):
+        for version in sorted([bertosVersion(v) for v in self.versions()]):
             action = self.version_menu.addAction(version)
             action_group.addAction(action)
             action.setCheckable(True)