X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBVersionPage.py;h=d11d1ff8b219d808e9839ce3347376f95e427d84;hb=d5f980505ade6c9b7063ba29dc8e4a96d05abd3c;hp=98c73885dfc43230e068599506cbd4139f8bb3da;hpb=df3bd7f742da8c015304fa21e01eb966ff76a089;p=bertos.git

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index 98c73885..d11d1ff8 100644
--- a/wizard/BVersionPage.py
+++ b/wizard/BVersionPage.py
@@ -117,7 +117,8 @@ class BVersionPage(BWizardPage):
         Slot called when the user remove a BeRTOS version.
         """
         item = self.pageContent.versionList.takeItem(self.pageContent.versionList.currentRow())
-        self.deleteVersion(qvariant_converter.getString(item.data(Qt.UserRole)))
+	if item:
+		self.deleteVersion(qvariant_converter.getString(item.data(Qt.UserRole)))
         self.emit(SIGNAL("completeChanged()"))
     
     def rowChanged(self):
@@ -151,8 +152,8 @@ class BVersionPage(BWizardPage):
         """
         Removes the given directory from the QSettings.
         """
-        versions = self.versions()
-        versions.remove(directory)
+        versions = [os.path.normpath(path) for path in self.versions()]
+        versions.remove(os.path.normpath(directory))
         self.setVersions(versions)
     
     def resetVersionList(self):
@@ -184,15 +185,17 @@ class BVersionPage(BWizardPage):
         versions = set([])
         if os.name == "nt":
             import winreg_importer
-            versions |= set(winreg_importer.getBertosDirs())
-        versions |= set(self.versions())
+            versions |= set([os.path.normpath(dir) for dir in winreg_importer.getBertosDirs()])
+        versions |= set([os.path.normpath(dir) for dir in self.versions()])
         selected = self.projectInfo("SOURCES_PATH")
         for directory in versions:
             item = self.insertListElement(directory)
             if selected and selected == directory:
                 self.setCurrentItem(item)
         if not selected:
-            self.setCurrentItem(self.latestVersionItem())
+            latest_version_item = self.latestVersionItem()
+            if latest_version_item:
+                self.setCurrentItem(latest_version_item)
     
     def disableRemoveButton(self):
         """
@@ -210,9 +213,11 @@ class BVersionPage(BWizardPage):
         """
         Returns the latest BeRTOS version founded.
         """
-        latest_version_item = QTableWidgetItem("")
+        latest_version_item = None
         for index in range(self.pageContent.versionList.count()):
             item = self.pageContent.versionList.item(index)
+            if not latest_version_item:
+                latest_version_item = item
             version = item.text().split(" (")[0]
             latest = latest_version_item.text().split(" (")[0]
             if version != "UNKNOWN" and version > latest:
@@ -236,7 +241,10 @@ class BVersionPage(BWizardPage):
         Return the path of the selected version.
         """
         current = self.currentItem()
-        return qvariant_converter.getString(current.data(Qt.UserRole))
+        if current:
+            return qvariant_converter.getString(current.data(Qt.UserRole))
+        else:
+            return None
     
     def isDefaultVersion(self, version):
         """
@@ -246,4 +254,5 @@ class BVersionPage(BWizardPage):
             import winreg_importer
             if version in winreg_importer.getBertosDirs():
                 return True
-        return False
\ No newline at end of file
+        return False
+