projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to make usable the wizard for the pyqt<4.4.4 users
[bertos.git]
/
wizard
/
BCpuPage.py
diff --git
a/wizard/BCpuPage.py
b/wizard/BCpuPage.py
index 93919c9cf64d7effdd22f9dfb1a4324e83a927c7..e329dbc866d279557cee07037aa8d92fb0a0415d 100644
(file)
--- a/
wizard/BCpuPage.py
+++ b/
wizard/BCpuPage.py
@@
-12,6
+12,10
@@
from BWizardPage import *
import bertos_utils
from BWizardPage import *
import bertos_utils
+if PYQT_VERSION_STR > "4.4.3":
+ import qvariant_converter_new as qvariant_converter
+else:
+ import qvariant_converter_old as qvariant_converter
class BCpuPage(BWizardPage):
class BCpuPage(BWizardPage):
@@
-27,9
+31,7
@@
class BCpuPage(BWizardPage):
infos = bertos_utils.loadCpuInfos(self._projectInfoRetrieve("SOURCES_PATH"))
for cpu in infos:
item = QListWidgetItem(cpu["CPU_NAME"])
infos = bertos_utils.loadCpuInfos(self._projectInfoRetrieve("SOURCES_PATH"))
for cpu in infos:
item = QListWidgetItem(cpu["CPU_NAME"])
- # The CPU_DESC field in the cpu definition is a list of string, so we need to
- # store it as a QStringList in a QVariant
- item.setData(Qt.UserRole, QVariant(QStringList(cpu["CPU_DESC"])))
+ item.setData(Qt.UserRole, qvariant_converter.convertDict(cpu))
self.pageContent.cpuList.addItem(item)
def _connectSignals(self):
self.pageContent.cpuList.addItem(item)
def _connectSignals(self):
@@
-54,15
+56,14
@@
class BCpuPage(BWizardPage):
def isComplete(self):
if self.pageContent.cpuList.currentRow() != -1:
def isComplete(self):
if self.pageContent.cpuList.currentRow() != -1:
- self._projectInfoStore("CPU_
NAME", self.pageContent.cpuList.currentItem().text(
))
+ self._projectInfoStore("CPU_
INFOS", qvariant_converter.getStringDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole)
))
return True
else:
return False
def rowChanged(self):
return True
else:
return False
def rowChanged(self):
- description = self.pageContent.cpuList.currentItem().data(Qt.UserRole).toStringList()
- # We need to convert the list of QString in a list of unicode
- description = [unicode(line) for line in description]
+ description = qvariant_converter.getDict(self.pageContent.cpuList.currentItem().data(Qt.UserRole))["CPU_DESC"]
+ description = qvariant_converter.getStringList(description)
self.pageContent.descriptionLabel.setText("<br>".join(description))
self.pageContent.descriptionLabel.setVisible(True)
self.emit(SIGNAL("completeChanged()"))
self.pageContent.descriptionLabel.setText("<br>".join(description))
self.pageContent.descriptionLabel.setVisible(True)
self.emit(SIGNAL("completeChanged()"))