X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBFolderPage.py;h=06191f6be8af9be12fd4debfafee6018760181ad;hb=c781b7b6af3fedb6d0c8576c66432516d24ecc0b;hp=7caf4382cfeb31795eb14293028bde91a9c51938;hpb=cc03eb93224f06debc7f426acd9374076e8be834;p=bertos.git diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py index 7caf4382..06191f6b 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,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("ROUTE", self.next_page) return True else: return False - - def nextId(self): - """ - Overload of the QWizardPage nextId method. - """ - return self.wizard().pageIndex(self.next_page) - #### @@ -93,6 +87,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) #### @@ -138,7 +133,7 @@ class BFolderPage(BWizardPage): Contains the next page class. """ if self.pageContent.customButton.isChecked(): - return BVersionPage + return BCpuPage else: return BBoardPage