X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBFolderPage.py;h=9944677c7bc267d6f4a5796f4e765cd83b25200e;hb=d34c4c92b4d64258077e1caeb0723db404ae9951;hp=eaa5d02f11b4eb94ed57c7bf7d552bc2fb85861d;hpb=106d1edb5fc1984143fa299009ef823bd21ee6c5;p=bertos.git diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py index eaa5d02f..9944677c 100644 --- a/wizard/BFolderPage.py +++ b/wizard/BFolderPage.py @@ -66,9 +66,7 @@ class BFolderPage(BWizardPage): 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("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) + self.setProjectInfo("PROJECT_HW_PATH", os.path.join(self.projectInfo("PROJECT_PATH"), self.projectInfo("PROJECT_NAME"))) return True else: return False @@ -90,7 +88,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) #### @@ -129,20 +127,6 @@ class BFolderPage(BWizardPage): self.pageContent.directoryEdit.setText(QDir.toNativeSeparators(directory)) #### - - @property - def next_page(self): - """ - Contains the next page class. - """ - if self.from_preset: - return BBoardPage - else: - return BCpuPage - - @property - def from_preset(self): - return self.pageContent.predefinedButton.isChecked() def initializeAttributes(self): """