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

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index 129a5bf1..bd78fe01 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,34 +38,38 @@ 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)
 
     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
     
@@ -83,4 +91,4 @@ class BVersionPage(BWizardPage):
     
     def rowChanged(self):
         self.emit(SIGNAL("completeChanged()"))
-    
\ No newline at end of file
+