projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor all module. Clean up. Fix comments. Some patch to work with preemtive kernel...
[bertos.git]
/
wizard
/
BVersionPage.py
diff --git
a/wizard/BVersionPage.py
b/wizard/BVersionPage.py
index 8842289d9aec4bb5cb4199f44946a9df02df266b..680577c53f245e86ea7cae1509a38f727428b392 100644
(file)
--- a/
wizard/BVersionPage.py
+++ b/
wizard/BVersionPage.py
@@
-65,10
+65,18
@@
class BVersionPage(BWizardPage):
# Remove the trailing slash
if sources_path.endswith(os.sep):
sources_path = sources_path[:-1]
# Remove the trailing slash
if sources_path.endswith(os.sep):
sources_path = sources_path[:-1]
- self.setProjectInfo("
SOURCE
S_PATH", sources_path)
+ self.setProjectInfo("
BERTO
S_PATH", sources_path)
return True
else:
return False
return True
else:
return False
+
+ def nextId(self):
+ """
+ Overload of the QWizard nextId method.
+ """
+ # Pick up the class stored into the project in the 'folder' step
+ page_class = self.projectInfo("ROUTE")
+ return self.wizard().pageIndex(page_class)
####
####
@@
-184,13
+192,11
@@
class BVersionPage(BWizardPage):
Fills the version list with all the BeRTOS versions founded in the QSettings.
"""
versions = set([])
Fills the version list with all the BeRTOS versions founded in the QSettings.
"""
versions = set([])
- if self._edit:
- versions.add(self.projectInfo("SOURCES_PATH"))
if os.name == "nt":
import winreg_importer
versions |= set([os.path.normpath(dir) for dir in winreg_importer.getBertosDirs()])
versions |= set([os.path.normpath(dir) for dir in self.versions()])
if os.name == "nt":
import winreg_importer
versions |= set([os.path.normpath(dir) for dir in winreg_importer.getBertosDirs()])
versions |= set([os.path.normpath(dir) for dir in self.versions()])
- selected = self.projectInfo("
SOURCE
S_PATH")
+ selected = self.projectInfo("
BERTO
S_PATH")
for directory in versions:
item = self.insertListElement(directory)
if selected and selected == directory:
for directory in versions:
item = self.insertListElement(directory)
if selected and selected == directory: