X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBVersionPage.py;h=d11d1ff8b219d808e9839ce3347376f95e427d84;hb=eb43b8e3d3107c865cbb4c47b12e375ea29ea089;hp=04a956d0c88975012e73b09c20d34e71cf678b38;hpb=72789b9f8ed050ed97c3e66a9aa707740f6656f2;p=bertos.git diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py index 04a956d0..d11d1ff8 100644 --- a/wizard/BVersionPage.py +++ b/wizard/BVersionPage.py @@ -1,8 +1,32 @@ #!/usr/bin/env python # encoding: utf-8 # +# This file is part of BeRTOS. +# +# Bertos is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# As a special exception, you may use this file as part of a free software +# library without restriction. Specifically, if other files instantiate +# templates or use macros or inline functions from this file, or you compile +# this file and link it with other files to produce an executable, this +# file does not by itself cause the resulting executable to be covered by +# the GNU General Public License. This exception does not however +# invalidate any other reasons why the executable file might be covered by +# the GNU General Public License. +# # Copyright 2008 Develer S.r.l. (http://www.develer.com/) -# All rights reserved. # # $Id$ # @@ -93,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): @@ -127,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): @@ -160,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): """ @@ -186,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: @@ -212,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): """ @@ -222,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 +