Skip to content

Commit 8f1cf6e

Browse files
author
cfarmer
committed
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
1 parent d9dee32 commit 8f1cf6e

File tree

4 files changed

+215
-141
lines changed

4 files changed

+215
-141
lines changed

python/plugins/fTools/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ def description():
2121
return "Tools for vector data analysis and management"
2222

2323
def version():
24-
return "0.5.5"
24+
return "0.5.6"
2525

2626
def qgisMinimumVersion():
2727
return "1.0.0"
2828

2929
def authorName():
30-
return "Carson Farmer"
30+
return "Carson J. Q. Farmer"
3131

3232
def classFactory( iface ):
3333
from fTools import fToolsPlugin

python/plugins/fTools/doAbout.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def __init__(self, iface):
3232
QObject.connect(self.btnWeb, SIGNAL("clicked()"), self.openWeb)
3333
QObject.connect(self.btnHelp, SIGNAL("clicked()"), self.openHelp)
3434
self.fToolsLogo.setPixmap(QPixmap(":/icons/default/ftools_logo.png"))
35-
self.label_3.setText("fTools 0.5.2")
35+
self.label_3.setText("fTools 0.5.6")
3636
self.textEdit.setText(self.getText())
3737

3838
def getText(self):
@@ -71,6 +71,8 @@ def getText(self):
7171
aknowledgeString.append("Paolo Cavallini\n")
7272
aknowledgeString.append("Aaron Racicot\n")
7373
aknowledgeString.append("Colin Robertson\n")
74+
aknowledgeString.append("Agustin Lobo\n")
75+
aknowledgeString.append("Jurgen E. Fischer\n")
7476
aknowledgeString.append("QGis developer and user communities\n")
7577
aknowledgeString.append("Folks on #qgis at freenode.net\n")
7678
aknowledgeString.append("All those who have reported bugs/fixes/suggestions/comments/etc.")

python/plugins/fTools/fTools.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def initGui( self ):
170170
QCoreApplication.translate( "fTools", "Split vector layer" ), self.iface.mainWindow() )
171171
self.dataManageMenu.addActions( [ self.project, self.define, self.joinAttr, self.spatJoin, self.splitVect ] )
172172

173-
self.about_ftools = QAction( QIcon( self.getThemeIcon( "ftools_logo.png" ) ),
173+
self.ftools_about = QAction( QIcon( self.getThemeIcon( "ftools_logo.png" ) ),
174174
QCoreApplication.translate( "fTools", "About fTools" ), self.iface.mainWindow() )
175175

176176
self.menu.addMenu( self.analysisMenu )
@@ -179,7 +179,7 @@ def initGui( self ):
179179
self.menu.addMenu( self.conversionMenu )
180180
self.menu.addMenu( self.dataManageMenu )
181181
self.menu.addSeparator()
182-
self.menu.addAction( self.about_ftools )
182+
self.menu.addAction( self.ftools_about )
183183

184184
menuBar = self.iface.mainWindow().menuBar()
185185
actions = menuBar.actions()
@@ -226,7 +226,7 @@ def initGui( self ):
226226
QObject.connect( self.spatJoin, SIGNAL("triggered()"), self.dospatJoin )
227227
QObject.connect( self.splitVect, SIGNAL("triggered()"), self.dosplitVect )
228228

229-
QObject.connect( self.about_ftools, SIGNAL("triggered()"), self.doabout )
229+
QObject.connect( self.ftools_about, SIGNAL("triggered()"), self.doabout )
230230

231231
def unload( self ):
232232
pass

0 commit comments

Comments
 (0)