X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2FBCpuPage.py;h=e9052e6773736e5ba57d2575c2cb637223de7f03;hb=3df1334df82a572917f818c88387440a4d8eeee0;hp=72f28da44a47295ba815fec61bf133c22bef925d;hpb=eb31ed26eaba1a9a59d212ecd9f5ba9e967c610e;p=bertos.git

diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py
index 72f28da4..e9052e67 100644
--- a/wizard/BCpuPage.py
+++ b/wizard/BCpuPage.py
@@ -66,7 +66,7 @@ class BCpuPage(BWizardPage):
                         infos[key] = qvariant_converter.getStringList(value)
                     if type(CPU_DEF[key]) == str or type(CPU_DEF) == unicode:
                         infos[key] = qvariant_converter.getString(value)
-                elif key.startswith("MK_"):
+                elif key.startswith(MK_PARAM_ID):
                     infos[key] = qvariant_converter.getString(value)
                 else:
                     del infos[key]
@@ -93,8 +93,6 @@ class BCpuPage(BWizardPage):
         Overload of the BWizardPage setupUi method.
         """
         self.pageContent.cpuList.setSortingEnabled(True)
-        self.pageContent.descriptionLabel.setVisible(False)
-        self.pageContent.descriptionLabel.setText("")
         self.pageContent.frequencyLabel.setVisible(False)
         self.pageContent.frequencySpinBox.setVisible(False)
 
@@ -109,18 +107,20 @@ class BCpuPage(BWizardPage):
         """
         Overload of the BWizardPage reloadData method.
         """
-        QApplication.instance().setOverrideCursor(Qt.WaitCursor)
-        bertos_utils.loadSourceTree(self.project())
-        self.populateCpuList()
-        cpu_name = self.projectInfo("CPU_NAME")
-        selected_freq = self.projectInfo("SELECTED_FREQ")
-        self.setupUi()
-        if cpu_name:
-            self.selectItem(cpu_name)
-            if selected_freq:
-                self.setFrequency(selected_freq)
-                self.freq_modified = True
-        QApplication.instance().restoreOverrideCursor()
+        try:
+            QApplication.instance().setOverrideCursor(Qt.WaitCursor)
+            self.project().loadSourceTree()
+            self.populateCpuList()
+            cpu_name = self.projectInfo("CPU_NAME")
+            selected_freq = self.projectInfo("SELECTED_FREQ")
+            self.setupUi()
+            if cpu_name:
+                self.selectItem(cpu_name)
+                if selected_freq:
+                    self.setFrequency(selected_freq)
+                    self.freq_modified = True
+        finally:
+            QApplication.instance().restoreOverrideCursor()
         self.emit(SIGNAL("completeChanged()"))
 
     ####