projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump up revision number.
[bertos.git]
/
wizard
/
BVersionPage.py
diff --git
a/wizard/BVersionPage.py
b/wizard/BVersionPage.py
index ded8395e7d2bced1569f85c288007116684f9ad3..d11d1ff8b219d808e9839ce3347376f95e427d84 100644
(file)
--- a/
wizard/BVersionPage.py
+++ b/
wizard/BVersionPage.py
@@
-117,7
+117,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
+152,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):
@@
-184,8
+185,8
@@
class BVersionPage(BWizardPage):
versions = set([])
if os.name == "nt":
import winreg_importer
versions = set([])
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)
@@
-240,7
+241,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):
"""
@@
-250,4
+254,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
+