1) geoprocessing tools better handle geos exceptions

2) fix osx bug regarding about dialog 3) update version information git-svn-id: http://svn.osgeo.org/qgis/trunk@10127 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 8, 2009 · 8f1cf6e · 8f1cf6e
1 parent d9dee32
commit 8f1cf6e
Show file tree

Hide file tree

Showing 4 changed files with 215 additions and 141 deletions.
diff --git a/python/plugins/fTools/__init__.py b/python/plugins/fTools/__init__.py
@@ -21,13 +21,13 @@ def description():
 	return "Tools for vector data analysis and management"
 
 def version():
-	return "0.5.5"
+	return "0.5.6"
 
 def qgisMinimumVersion():
 	return "1.0.0"
 
 def authorName():
-	return "Carson Farmer"
+	return "Carson J. Q. Farmer"
 
 def classFactory( iface ):
 	from fTools import fToolsPlugin

diff --git a/python/plugins/fTools/doAbout.py b/python/plugins/fTools/doAbout.py
@@ -32,7 +32,7 @@ def __init__(self, iface):
 		QObject.connect(self.btnWeb, SIGNAL("clicked()"), self.openWeb)
 		QObject.connect(self.btnHelp, SIGNAL("clicked()"), self.openHelp)
 		self.fToolsLogo.setPixmap(QPixmap(":/icons/default/ftools_logo.png"))
-		self.label_3.setText("fTools 0.5.2")
+		self.label_3.setText("fTools 0.5.6")
 		self.textEdit.setText(self.getText())
 
 	def getText(self):
@@ -71,6 +71,8 @@ def getText(self):
 		aknowledgeString.append("Paolo Cavallini\n")
 		aknowledgeString.append("Aaron Racicot\n")
 		aknowledgeString.append("Colin Robertson\n")
+		aknowledgeString.append("Agustin Lobo\n")		
+		aknowledgeString.append("Jurgen E. Fischer\n")
 		aknowledgeString.append("QGis developer and user communities\n")
 		aknowledgeString.append("Folks on #qgis at freenode.net\n")
 		aknowledgeString.append("All those who have reported bugs/fixes/suggestions/comments/etc.")

diff --git a/python/plugins/fTools/fTools.py b/python/plugins/fTools/fTools.py
@@ -170,7 +170,7 @@ def initGui( self ):
 		QCoreApplication.translate( "fTools", "Split vector layer" ), self.iface.mainWindow() )
 		self.dataManageMenu.addActions( [ self.project, self.define, self.joinAttr, self.spatJoin, self.splitVect ] )
 
-		self.about_ftools = QAction( QIcon( self.getThemeIcon( "ftools_logo.png" ) ), 
+		self.ftools_about = QAction( QIcon( self.getThemeIcon( "ftools_logo.png" ) ), 
 		QCoreApplication.translate( "fTools", "About fTools" ), self.iface.mainWindow() )
 
 		self.menu.addMenu( self.analysisMenu )
@@ -179,7 +179,7 @@ def initGui( self ):
 		self.menu.addMenu( self.conversionMenu )
 		self.menu.addMenu( self.dataManageMenu )
 		self.menu.addSeparator()
-		self.menu.addAction( self.about_ftools )
+		self.menu.addAction( self.ftools_about )
 
 		menuBar = self.iface.mainWindow().menuBar()
 		actions = menuBar.actions()
@@ -226,7 +226,7 @@ def initGui( self ):
 		QObject.connect( self.spatJoin, SIGNAL("triggered()"), self.dospatJoin )
 		QObject.connect( self.splitVect, SIGNAL("triggered()"), self.dosplitVect )
 
-		QObject.connect( self.about_ftools, SIGNAL("triggered()"), self.doabout )
+		QObject.connect( self.ftools_about, SIGNAL("triggered()"), self.doabout )
 
 	def unload( self ):
 		pass