X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBVersionPage.py;h=fde94dbb84dae030ef9a20034a02788de946cd19;hb=6756c1317f0e53161565214755a71fd573aeb635;hp=e7da3bc54724eb69d9d57cb82b3f632a1cbc3e64;hpb=901cb75d67d0d624d982bde46ecd5b6c6b7a3852;p=bertos.git

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index e7da3bc5..fde94dbb 100644
--- a/wizard/BVersionPage.py
+++ b/wizard/BVersionPage.py
@@ -4,7 +4,7 @@
 # Copyright 2008 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
-# $Id:$
+# $Id$
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
@@ -26,7 +26,8 @@ class BVersionPage(BWizardPage):
     
     def __init__(self):
         BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui")
-        self.setTitle(self.tr("Select the BeRTOS version needed"))
+        self.setTitle(self.tr("Select the BeRTOS directory"))
+        self.setSubTitle(self.tr("The project created will be based on the BeRTOS version found"))
 
     ## Overloaded QWizardPage methods ##
     
@@ -36,7 +37,7 @@ class BVersionPage(BWizardPage):
         """
         if self.pageContent.versionList.currentRow() != -1:
             sources_path = qvariant_converter.getString(self.pageContent.versionList.currentItem().data(Qt.UserRole))
-            ## Remove the trailing slash
+            # Remove the trailing slash
             if sources_path.endswith(os.sep):
                 sources_path = sources_path[:-1]
             self.setProjectInfo("SOURCES_PATH", sources_path)
@@ -48,13 +49,6 @@ class BVersionPage(BWizardPage):
     
     ## Overloaded BWizardPage methods ##
 
-    def setupUi(self):
-        """
-        Overload of the BWizardPage setupUi method.
-        """
-        self.fillVersionList()
-        self.pageContent.versionList.setCurrentRow(-1)
-
     def connectSignals(self):
         """
         Overload of the BWizardPage connectSignals method.
@@ -65,6 +59,20 @@ class BVersionPage(BWizardPage):
         # Fake signal connection for the update button
         self.connect(self.pageContent.updateButton, SIGNAL("clicked()"), self.updateClicked)
     
+    def reloadData(self):
+        """
+        Overload of the BWizardPage reloadData method.
+        """
+        self.resetVersionList()
+        self.pageContent.versionList.setCurrentRow(-1)
+        self.fillVersionList()
+    
+    def setupUi(self):
+        """
+        Overload of the BWizardPage setupUi method.
+        """
+        self.pageContent.updateButton.setVisible(False)
+    
     ####
     
     ## Slots ##
@@ -118,24 +126,46 @@ class BVersionPage(BWizardPage):
         versions = self.versions()
         versions.remove(directory)
         self.setVersions(versions)
-        
+    
+    def resetVersionList(self):
+        """
+        Remove all the version entries from the list.
+        """
+        self.pageContent.versionList.clear()
+    
     def insertListElement(self, directory):
         """
-        Inserts the given directory in the version list.
+        Inserts the given directory in the version list and returns the
+        inserted item.
         """
         if bertos_utils.isBertosDir(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)
+            return item
         elif len(directory) > 0:
             item = QListWidgetItem(QIcon(":/images/warning.png"), "UNKNOWN" + " (\"" + os.path.normpath(directory) + "\")")
             item.setData(Qt.UserRole, qvariant_converter.convertString(directory))
             self.pageContent.versionList.addItem(item)
+            return item
     
     def fillVersionList(self):
         """
         Fills the version list with all the BeRTOS versions founded in the QSettings.
         """
-        versions = self.versions()
+        versions = set([])
+        if os.name == "nt":
+            import winreg_importer
+            versions |= set(winreg_importer.getBertosDirs())
+        versions |= set(self.versions())
+        selected = self.projectInfo("SOURCES_PATH")
         for directory in versions:
-            self.insertListElement(directory)
\ No newline at end of file
+            item = self.insertListElement(directory)
+            if selected and selected == directory:
+                self.setCurrentItem(item)
+    
+    def setCurrentItem(self, item):
+        """
+        Select the given item in the version list.
+        """
+        self.pageContent.versionList.setCurrentItem(item)
\ No newline at end of file