X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBFolderPage.py;h=6af6a651808475a05485295b4703f3da49d03dd5;hb=74081ebc421ca63e090ae8027a634a0c1b8f6864;hp=06191f6be8af9be12fd4debfafee6018760181ad;hpb=ec8c7a72981bd819fba072cf53404bae3d9cee46;p=bertos.git diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py index 06191f6b..6af6a651 100644 --- a/wizard/BFolderPage.py +++ b/wizard/BFolderPage.py @@ -28,7 +28,6 @@ # # Copyright 2008 Develer S.r.l. (http://www.develer.com/) # -# $Id$ # # Author: Lorenzo Berni # @@ -65,7 +64,8 @@ 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) + 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"))) return True else: return False @@ -87,7 +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) + # self.connect(self.pageContent.customButton, SIGNAL("toggled(bool)"), self.isComplete) #### @@ -126,16 +126,6 @@ class BFolderPage(BWizardPage): self.pageContent.directoryEdit.setText(QDir.toNativeSeparators(directory)) #### - - @property - def next_page(self): - """ - Contains the next page class. - """ - if self.pageContent.customButton.isChecked(): - return BCpuPage - else: - return BBoardPage def initializeAttributes(self): """