X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBVersionPage.py;h=0f9173eede1e08acda7f01a727ce4185d1eaa62c;hb=HEAD;hp=8842289d9aec4bb5cb4199f44946a9df02df266b;hpb=056aea92013907f6485a499b511cc0ef81c38a4d;p=bertos.git diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py index 8842289d..0f9173ee 100644 --- a/wizard/BVersionPage.py +++ b/wizard/BVersionPage.py @@ -28,7 +28,6 @@ # # Copyright 2008 Develer S.r.l. (http://www.develer.com/) # -# $Id$ # # Author: Lorenzo Berni # @@ -51,8 +50,8 @@ class BVersionPage(BWizardPage): def __init__(self, edit=False): self._edit = edit BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui") - self.setTitle(self.tr("Select the BeRTOS directory")) - self.setSubTitle(self.tr("The project created will be based on the BeRTOS version found")) + self.setTitle(self.tr("Select BeRTOS version")) + self.setSubTitle(self.tr("Your project will be created with the specified BeRTOS version")) ## Overloaded QWizardPage methods ## @@ -65,7 +64,7 @@ class BVersionPage(BWizardPage): # Remove the trailing slash if sources_path.endswith(os.sep): sources_path = sources_path[:-1] - self.setProjectInfo("SOURCES_PATH", sources_path) + self.setProjectInfo("BERTOS_PATH", sources_path) return True else: return False @@ -78,13 +77,13 @@ class BVersionPage(BWizardPage): """ Overload of the BWizardPage connectSignals method. """ - self.connect(self.pageContent.versionList, SIGNAL("itemSelectionChanged()"), self.rowChanged) + self.connect(self.pageContent.versionList, SIGNAL("currentItemChanged(QListWidgetItem *, QListWidgetItem*)"), 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 reloadData(self): + def reloadData(self, previous_id=None): """ Overload of the BWizardPage reloadData method. """ @@ -184,13 +183,11 @@ class BVersionPage(BWizardPage): Fills the version list with all the BeRTOS versions founded in the QSettings. """ versions = set([]) - if self._edit: - versions.add(self.projectInfo("SOURCES_PATH")) if os.name == "nt": import winreg_importer 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") + selected = self.projectInfo("BERTOS_PATH") for directory in versions: item = self.insertListElement(directory) if selected and selected == directory: