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 37097c4fb0ccd70d4de3cbd680998f42e80d7fa4..680577c53f245e86ea7cae1509a38f727428b392 100644
(file)
--- a/
wizard/BVersionPage.py
+++ b/
wizard/BVersionPage.py
@@
-48,7
+48,8
@@
class BVersionPage(BWizardPage):
to use. This page show some pieces of information about the version.
"""
to use. This page show some pieces of information about the version.
"""
- def __init__(self):
+ def __init__(self, edit=False):
+ self._edit = edit
BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui")
self.setTitle(self.tr("Select the BeRTOS directory"))
self.setSubTitle(self.tr("The project created will be based on the BeRTOS version found"))
BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui")
self.setTitle(self.tr("Select the BeRTOS directory"))
self.setSubTitle(self.tr("The project created will be based on the BeRTOS version found"))
@@
-64,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)
####
####
@@
-117,7
+126,8
@@
class BVersionPage(BWizardPage):
Slot called when the user remove a BeRTOS version.
"""
item = self.pageContent.versionList.takeItem(self.pageContent.versionList.currentRow())
Slot called when the user remove a BeRTOS version.
"""
item = self.pageContent.versionList.takeItem(self.pageContent.versionList.currentRow())
- self.deleteVersion(qvariant_converter.getString(item.data(Qt.UserRole)))
+ if item:
+ self.deleteVersion(qvariant_converter.getString(item.data(Qt.UserRole)))
self.emit(SIGNAL("completeChanged()"))
def rowChanged(self):
self.emit(SIGNAL("completeChanged()"))
def rowChanged(self):
@@
-151,8
+161,8
@@
class BVersionPage(BWizardPage):
"""
Removes the given directory from the QSettings.
"""
"""
Removes the given directory from the QSettings.
"""
- versions =
self.versions()
- versions.remove(
directory
)
+ versions =
[os.path.normpath(path) for path in self.versions()]
+ versions.remove(
os.path.normpath(directory)
)
self.setVersions(versions)
def resetVersionList(self):
self.setVersions(versions)
def resetVersionList(self):
@@
-186,7
+196,7
@@
class BVersionPage(BWizardPage):
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()])
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: