X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2FBVersionPage.py;h=bdd14cba72ba508de60302c5a80f34c8026d13ad;hb=212d4ed20629ca6378cbb997b60eaf0f2a75b6a3;hp=129a5bf1dd8e71764405d20453a96df348c3d083;hpb=191efa49c6a346b6170231ece92d451ffea15248;p=bertos.git

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index 129a5bf1..bdd14cba 100644
--- a/wizard/BVersionPage.py
+++ b/wizard/BVersionPage.py
@@ -9,15 +9,19 @@
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 
+import os
+
 from PyQt4.QtGui import *
 from BWizardPage import *
 import bertos_utils
 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()
@@ -34,27 +38,27 @@ class BVersionPage(BWizardPage):
         self.pageContent.versionList.setCurrentRow(-1)
     
     def _storeVersion(self, directory):
-        versions = qvariant_converter.getStringList(self._settingsRetrieve("versions"))
+        versions = self.versions()
         versions = set(versions + [directory])
-        self._settingsStore("versions", list(versions))
+        self.setVersions(list(versions))
     
     def _deleteVersion(self, directory):
-        versions = qvariant_converter.getStringList(self._settingsRetrieve("versions"))
+        versions = self.versions()
         versions.remove(directory)
-        self._settingsStore("versions", versions)
+        self.setVersions(versions)
         
     def _insertListElement(self, directory):
         if bertos_utils.isBertosDir(directory):
-            item = QListWidgetItem(QIcon(":/images/ok.png"), bertos_utils.bertosVersion(directory) + " (\"" + directory + "\")")
-            item.setData(Qt.UserRole, QVariant(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.setData(Qt.UserRole, QVariant(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 _fillVersionList(self):
-        versions = qvariant_converter.getStringList(self._settingsRetrieve("versions"))
+        versions = self.versions()
         for directory in versions:
             self._insertListElement(directory)