Fix error message.

[bertos.git] / wizard / BFolderPage.py

diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py
index 06191f6be8af9be12fd4debfafee6018760181ad..50cb2cd6b38db3de9c6d38a6bc2e4ccbc483342b 100644 (file)
--- a/wizard/BFolderPage.py
+++ b/wizard/BFolderPage.py
@@ -65,7 +65,10 @@ class BFolderPage(BWizardPage):
         if self.pageContent.projectPath.text() != "None":
             self.setProjectInfo("PROJECT_PATH", unicode(self.pageContent.projectPath.text()))
             self.setProjectInfo("PROJECT_NAME", os.path.basename(unicode(self.pageContent.projectPath.text())))
+            self.setProjectInfo("PROJECT_SRC_PATH", os.path.join(self.projectInfo("PROJECT_PATH"), self.projectInfo("PROJECT_NAME")))
+            self.setProjectInfo("PROJECT_HW_PATH", os.path.join(self.projectInfo("PROJECT_PATH"), self.projectInfo("PROJECT_NAME")))
             self.setProjectInfo("ROUTE", self.next_page)
+            self.setProjectInfo("PROJECT_FROM_PRESET", self.from_preset)
             return True
         else:
             return False
@@ -132,10 +135,14 @@ class BFolderPage(BWizardPage):
         """
         Contains the next page class.
         """
-        if self.pageContent.customButton.isChecked():
-            return BCpuPage
-        else:
+        if self.from_preset:
             return BBoardPage
+        else:
+            return BCpuPage
+
+    @property
+    def from_preset(self):
+        return self.pageContent.predefinedButton.isChecked()
     
     def initializeAttributes(self):
         """