X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBFolderPage.py;h=50cb2cd6b38db3de9c6d38a6bc2e4ccbc483342b;hb=7bd424107eb3b53fb9f055f2d7409ea4f0991130;hp=7caf4382cfeb31795eb14293028bde91a9c51938;hpb=cc03eb93224f06debc7f426acd9374076e8be834;p=bertos.git

diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py
index 7caf4382..50cb2cd6 100644
--- a/wizard/BFolderPage.py
+++ b/wizard/BFolderPage.py
@@ -39,7 +39,7 @@ from PyQt4.QtGui import *
 from BWizardPage import *
 import bertos_utils
 
-from BVersionPage import BVersionPage
+from BCpuPage import BCpuPage
 from BBoardPage import BBoardPage
 
 from const import *
@@ -65,16 +65,13 @@ 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
-
-    def nextId(self):
-        """
-        Overload of the QWizardPage nextId method.
-        """
-        return self.wizard().pageIndex(self.next_page)
-        
     
     ####
 
@@ -93,6 +90,7 @@ class BFolderPage(BWizardPage):
         self.connect(self.pageContent.nameEdit, SIGNAL("textChanged(const QString)"), self.nameChanged)
         self.connect(self.pageContent.directoryEdit, SIGNAL("textChanged(const QString)"), self.directoryChanged)
         self.connect(self.pageContent.directoryButton, SIGNAL("clicked()"), self.selectDirectory)
+        self.connect(self.pageContent.customButton, SIGNAL("toggled(bool)"), self.isComplete)
     
     ####
 
@@ -137,10 +135,14 @@ class BFolderPage(BWizardPage):
         """
         Contains the next page class.
         """
-        if self.pageContent.customButton.isChecked():
-            return BVersionPage
-        else:
+        if self.from_preset:
             return BBoardPage
+        else:
+            return BCpuPage
+
+    @property
+    def from_preset(self):
+        return self.pageContent.predefinedButton.isChecked()
     
     def initializeAttributes(self):
         """