# Author: Lorenzo Berni <duplo@develer.com>
#
+import os
+
from PyQt4.QtGui import *
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
+import qvariant_converter
+
+from const import *
class BVersionPage(BWizardPage):
def __init__(self):
- BWizardPage.__init__(self, "bertos_versions.ui")
+ BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui")
self._connectSignals()
self._fillVersionList()
self._setupUi()
def _insertListElement(self, directory):
if bertos_utils.isBertosDir(directory):
- item = QListWidgetItem(QIcon(":/images/ok.png"), bertos_utils.bertosVersion(directory) + " (\"" + directory + "\")")
+ item = QListWidgetItem(QIcon(":/images/ok.png"), bertos_utils.bertosVersion(directory) + " (\"" + os.path.normpath(directory) + "\")")
item.setData(Qt.UserRole, qvariant_converter.convertString(directory))
self.pageContent.versionList.addItem(item)
elif len(directory) > 0:
- item = QListWidgetItem(QIcon(":/images/warning.png"), "UNKNOWN" + " (\"" + directory + "\")")
+ item = QListWidgetItem(QIcon(":/images/warning.png"), "UNKNOWN" + " (\"" + os.path.normpath(directory) + "\")")
item.setData(Qt.UserRole, qvariant_converter.convertString(directory))
self.pageContent.versionList.addItem(item)
def isComplete(self):
if self.pageContent.versionList.currentRow() != -1:
- self._projectInfoStore("SOURCES_PATH", qvariant_converter.getString(self.pageContent.versionList.currentItem().data(Qt.UserRole)))
- return True
+ # Remove trailing slash
+ sources_path = qvariant_converter.getString(self.pageContent.versionList.currentItem().data(Qt.UserRole))
+ if sources_path.endswith(os.sep):
+ sources_path = sources_path[:-1]
+ self._projectInfoStore("SOURCES_PATH", sources_path)
+ return True
else:
return False
def rowChanged(self):
self.emit(SIGNAL("completeChanged()"))
-
\ No newline at end of file
+