X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBVersionPage.py;h=fc989a739b5a978bfe472dff402a42cc526c1355;hb=ba2ba183c492049aface3e3d4e1d5f945b43f3d6;hp=ce72ff461607c633688a54b8189a1788dfcca17f;hpb=255e98716335ab8e40da330bad016a8983046dec;p=bertos.git

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index ce72ff46..fc989a73 100644
--- a/wizard/BVersionPage.py
+++ b/wizard/BVersionPage.py
@@ -9,6 +9,8 @@
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 
+import os
+
 from PyQt4.QtGui import *
 from BWizardPage import *
 import bertos_utils
@@ -17,72 +19,142 @@ import qvariant_converter
 from const import *
 
 class BVersionPage(BWizardPage):
+    """
+    Page of the wizard that permits to choose which BeRTOS version the user wants
+    to use. This page show some pieces of information about the version.
+    """
     
     def __init__(self):
         BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui")
-        self._connectSignals()
-        self._fillVersionList()
-        self._setupUi()
         self.setTitle(self.tr("Select the BeRTOS version needed"))
+
+    ## Overloaded QWizardPage methods ##
     
-    def _connectSignals(self):
+    def isComplete(self):
+        """
+        Overload of the QWizardPage isComplete method.
+        """
+        if self.pageContent.versionList.currentRow() != -1:
+            sources_path = qvariant_converter.getString(self.pageContent.versionList.currentItem().data(Qt.UserRole))
+            # Remove the trailing slash
+            if sources_path.endswith(os.sep):
+                sources_path = sources_path[:-1]
+            self.setProjectInfo("SOURCES_PATH", sources_path)
+            return True
+        else:
+            return False
+    
+    ####
+    
+    ## Overloaded BWizardPage methods ##
+
+    def connectSignals(self):
+        """
+        Overload of the BWizardPage connectSignals method.
+        """
         self.connect(self.pageContent.versionList, SIGNAL("itemSelectionChanged()"), self.rowChanged)
         self.connect(self.pageContent.addButton, SIGNAL("clicked()"), self.addVersion)
         self.connect(self.pageContent.removeButton, SIGNAL("clicked()"), self.removeVersion)
         # Fake signal connection for the update button
         self.connect(self.pageContent.updateButton, SIGNAL("clicked()"), self.updateClicked)
     
-    def _setupUi(self):
+    def reloadData(self):
+        """
+        Overload of the BWizardPage reloadData method.
+        """
+        self.resetVersionList()
         self.pageContent.versionList.setCurrentRow(-1)
+        self.fillVersionList()
+    
+    ####
+    
+    ## Slots ##
+    
+    def addVersion(self):
+        """
+        Slot called when the user add a BeRTOS version.
+        """
+        directory = QFileDialog.getExistingDirectory(self, self.tr("Choose a directory"), "", QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks)
+        if not directory.isEmpty():
+            self.storeVersion(unicode(directory))
+            self.pageContent.versionList.clear()
+            self.fillVersionList()
+            self.emit(SIGNAL("completeChanged()"))
+    
+    def removeVersion(self):
+        """
+        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)))
+        self.emit(SIGNAL("completeChanged()"))
+    
+    def rowChanged(self):
+        """
+        Slot called when the user select an entry from the version list.
+        """
+        self.emit(SIGNAL("completeChanged()"))
+
+    def updateClicked(self):
+        """
+        Slot called when the user clicks on the 'update' button. It checks for
+        update (TO BE IMPLEMENTED).
+        """
+        pass    
+
+    ####
     
-    def _storeVersion(self, directory):
+    def storeVersion(self, directory):
+        """
+        Stores the directory selected by the user in the QSettings.
+        """
         versions = self.versions()
         versions = set(versions + [directory])
         self.setVersions(list(versions))
     
-    def _deleteVersion(self, directory):
+    def deleteVersion(self, directory):
+        """
+        Removes the given directory from the QSettings.
+        """
         versions = self.versions()
         versions.remove(directory)
         self.setVersions(versions)
-        
-    def _insertListElement(self, directory):
+    
+    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 and returns the
+        inserted item.
+        """
         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)
+            return 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)
+            return item
     
-    def _fillVersionList(self):
+    def fillVersionList(self):
+        """
+        Fills the version list with all the BeRTOS versions founded in the QSettings.
+        """
         versions = self.versions()
+        selected = self.projectInfo("SOURCES_PATH")
         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
-        else:
-            return False
+            item = self.insertListElement(directory)
+            if not selected is None and selected == directory:
+                self.setCurrentItem(item)
     
-    def addVersion(self):
-        directory = QFileDialog.getExistingDirectory(self, self.tr("Choose a directory"), "", QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks)
-        if not directory.isEmpty():
-            self._storeVersion(unicode(directory))
-            self.pageContent.versionList.clear()
-            self._fillVersionList()
-            self.emit(SIGNAL("completeChanged()"))
-    
-    def removeVersion(self):
-        item = self.pageContent.versionList.takeItem(self.pageContent.versionList.currentRow())
-        self._deleteVersion(qvariant_converter.getString(item.data(Qt.UserRole)))
-        self.emit(SIGNAL("completeChanged()"))
-    
-    def updateClicked(self):
-        print "fake update checking"
-    
-    def rowChanged(self):
-        self.emit(SIGNAL("completeChanged()"))
-    
\ No newline at end of file
+    def setCurrentItem(self, item):
+        """
+        Select the given item in the version list.
+        """
+        self.pageContent.versionList.setCurrentItem(item)
\ No newline at end of file