Add shell script for generate the wizard resource

[bertos.git] / wizard / BVersionPage.py

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index bad8e97d47e62e732c9f524934e8e77361c67c1e..48bc75bbd5dc619eebfc981b2049b146f6109184 100644 (file)
--- a/wizard/BVersionPage.py
+++ b/wizard/BVersionPage.py
@@ -11,7 +11,7 @@
 
 from PyQt4.QtGui import *
 from BWizardPage import *
-from libbertos import *
+import bertos_utils
 
 class BVersionPage(BWizardPage):
     
@@ -24,7 +24,7 @@ class BVersionPage(BWizardPage):
     def _connectSignals(self):
         self.connect(self.pageContent.versionList, SIGNAL("itemClicked(QListWidgetItem *)"), self.itemClicked)
         self.connect(self.pageContent.addButton, SIGNAL("clicked()"), self.addVersion)
-        self.connect(self.pageContent.addButton, SIGNAL("clicked()"), self.removeVersion)
+        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)
     
@@ -33,15 +33,15 @@ class BVersionPage(BWizardPage):
     
     def addVersion(self):
         directory = QFileDialog.getExistingDirectory(self, self.tr("Choose a directory"), QString(), QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks)
-        if isBertosDir(directory):
-            version = bertosVersion(directory)
-            self.pageContent.versionList.addItem(QListWidgetItem(QIcon(":/images/ok.png"), version))
-        else:
+        if bertos_utils.isBertosDir(directory):
+            version = bertos_utils.bertosVersion(directory)
+            self.pageContent.versionList.addItem(QListWidgetItem(QIcon(":/images/ok.png"), version + " (\"" + directory + "\")"))
+        elif not directory.isEmpty():
             version = "UNCHECKED"
-            self.pageContent.versionList.addItem(QListWidgetItem(QIcon(":/images/warning.png"), version))
+            self.pageContent.versionList.addItem(QListWidgetItem(QIcon(":/images/warning.png"), version + " (\"" + directory + "\")"))
     
     def removeVersion(self):
-        pass
+        self.pageContent.versionList.takeItem(self.pageContent.versionList.currentRow())
     
     def updateClicked(self):
         print "fake update checking"