projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a stub of the code that will fill all the fields of the board selection Wizard...
[bertos.git]
/
wizard
/
BVersionPage.py
diff --git
a/wizard/BVersionPage.py
b/wizard/BVersionPage.py
index 8ce6940399f94ed0cb77cd782c0d3495f1daeaad..452e8a947309637d75906199b3ae0674894157e8 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"))
@@
-68,6
+69,14
@@
class BVersionPage(BWizardPage):
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):
@@
-182,10
+192,12
@@
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
if os.name == "nt":
import winreg_importer
- versions |= set(
winreg_importer.getBertosDirs()
)
- versions |= set(
self.versions()
)
+ 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("SOURCES_PATH")
for directory in versions:
item = self.insertListElement(directory)
selected = self.projectInfo("SOURCES_PATH")
for directory in versions:
item = self.insertListElement(directory)
@@
-215,6
+227,8
@@
class BVersionPage(BWizardPage):
latest_version_item = None
for index in range(self.pageContent.versionList.count()):
item = self.pageContent.versionList.item(index)
latest_version_item = None
for index in range(self.pageContent.versionList.count()):
item = self.pageContent.versionList.item(index)
+ if not latest_version_item:
+ latest_version_item = item
version = item.text().split(" (")[0]
latest = latest_version_item.text().split(" (")[0]
if version != "UNKNOWN" and version > latest:
version = item.text().split(" (")[0]
latest = latest_version_item.text().split(" (")[0]
if version != "UNKNOWN" and version > latest:
@@
-238,7
+252,10
@@
class BVersionPage(BWizardPage):
Return the path of the selected version.
"""
current = self.currentItem()
Return the path of the selected version.
"""
current = self.currentItem()
- return qvariant_converter.getString(current.data(Qt.UserRole))
+ if current:
+ return qvariant_converter.getString(current.data(Qt.UserRole))
+ else:
+ return None
def isDefaultVersion(self, version):
"""
def isDefaultVersion(self, version):
"""
@@
-248,4
+265,5
@@
class BVersionPage(BWizardPage):
import winreg_importer
if version in winreg_importer.getBertosDirs():
return True
import winreg_importer
if version in winreg_importer.getBertosDirs():
return True
- return False
\ No newline at end of file
+ return False
+