Use a separate dict for identify the module tags

[bertos.git] / wizard / BVersionPage.py

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index 1d078565794d51c3f93c55341ae52c3104477592..bdd14cba72ba508de60302c5a80f34c8026d13ad 100644 (file)
--- a/wizard/BVersionPage.py
+++ b/wizard/BVersionPage.py
@@ -9,18 +9,19 @@
 # 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()
@@ -48,11 +49,11 @@ class BVersionPage(BWizardPage):
         
     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)