X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBFolderPage.py;h=3b3bce8956ba0cc523191dbfcce1dd14ad9711d4;hb=c91dd2220f6f26607ddb6988db95005eafe068e0;hp=06191f6be8af9be12fd4debfafee6018760181ad;hpb=ec8c7a72981bd819fba072cf53404bae3d9cee46;p=bertos.git diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py index 06191f6b..3b3bce89 100644 --- a/wizard/BFolderPage.py +++ b/wizard/BFolderPage.py @@ -65,7 +65,9 @@ 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("ROUTE", self.next_page) + self.setProjectInfo("PROJECT_FROM_PRESET", self.from_preset) return True else: return False @@ -132,10 +134,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): """