From bf2f284cab60c3d49bb930720a19c404ecccabfd Mon Sep 17 00:00:00 2001 From: brushtyler Date: Fri, 18 Mar 2011 15:22:22 +0000 Subject: [PATCH] fix #3637 git-svn-id: http://svn.osgeo.org/qgis/trunk@15532 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/plugins/GdalTools/GdalTools.py | 20 +++++++++---------- .../plugins/GdalTools/tools/widgetBuildVRT.ui | 6 +++--- python/plugins/GdalTools/tools/widgetDEM.ui | 2 +- python/plugins/GdalTools/tools/widgetGrid.ui | 2 +- .../plugins/GdalTools/tools/widgetOverview.ui | 2 +- .../GdalTools/tools/widgetPolygonize.ui | 2 +- .../GdalTools/tools/widgetProximity.ui | 2 +- .../GdalTools/tools/widgetRasterize.ui | 2 +- .../GdalTools/tools/widgetTranslate.ui | 2 +- python/plugins/GdalTools/tools/widgetWarp.ui | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/python/plugins/GdalTools/GdalTools.py b/python/plugins/GdalTools/GdalTools.py index 573be5009a3..2352cb4886a 100644 --- a/python/plugins/GdalTools/GdalTools.py +++ b/python/plugins/GdalTools/GdalTools.py @@ -97,7 +97,7 @@ class GdalTools: if rasterMenu == None: # no Raster menu, create and insert it before the Help menu self.menu = QMenu() - self.menu.setTitle( QCoreApplication.translate( "GdalTools", "&Raster" ) ) + self.menu.setTitle( rasterText ) lastAction = actions[ len( actions ) - 1 ] menu_bar.insertMenu( lastAction, self.menu ) else: @@ -105,7 +105,7 @@ class GdalTools: self.menu.addSeparator() if self.GdalVersion >= "1.6": - self.buildVRT = QAction( QIcon(":/icons/vrt.png"), QCoreApplication.translate( "GdalTools", "Build Virtual Raster (catalog)" ), self.iface.mainWindow() ) + self.buildVRT = QAction( QIcon(":/icons/vrt.png"), QCoreApplication.translate( "GdalTools", "Build Virtual Raster (Catalog)" ), self.iface.mainWindow() ) self.buildVRT.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds a VRT from a list of datasets") ) QObject.connect( self.buildVRT, SIGNAL( "triggered()" ), self.doBuildVRT ) self.menu.addAction(self.buildVRT) @@ -117,13 +117,13 @@ class GdalTools: self.menu.addAction(self.contour) if self.GdalVersion >= "1.3": - self.rasterize = QAction( QIcon(":/icons/rasterize.png"), QCoreApplication.translate( "GdalTools", "Rasterize" ), self.iface.mainWindow() ) + self.rasterize = QAction( QIcon(":/icons/rasterize.png"), QCoreApplication.translate( "GdalTools", "Rasterize (Vector to raster)" ), self.iface.mainWindow() ) self.rasterize.setStatusTip( QCoreApplication.translate( "GdalTools", "Burns vector geometries into a raster") ) QObject.connect( self.rasterize, SIGNAL( "triggered()" ), self.doRasterize ) self.menu.addAction(self.rasterize) if self.GdalVersion >= "1.6": - self.polygonize = QAction( QIcon(":/icons/polygonize.png"), QCoreApplication.translate( "GdalTools", "Polygonize" ), self.iface.mainWindow() ) + self.polygonize = QAction( QIcon(":/icons/polygonize.png"), QCoreApplication.translate( "GdalTools", "Polygonize (Raster to vector)" ), self.iface.mainWindow() ) self.polygonize.setStatusTip( QCoreApplication.translate( "GdalTools", "Produces a polygon feature layer from a raster") ) QObject.connect( self.polygonize, SIGNAL( "triggered()" ), self.doPolygonize ) self.menu.addAction(self.polygonize) @@ -140,7 +140,7 @@ class GdalTools: self.menu.addAction(self.sieve) if self.GdalVersion >= "1.6": - self.proximity = QAction( QIcon(":/icons/proximity.png"), QCoreApplication.translate( "GdalTools", "Proximity" ), self.iface.mainWindow() ) + self.proximity = QAction( QIcon(":/icons/proximity.png"), QCoreApplication.translate( "GdalTools", "Proximity (Raster distance)" ), self.iface.mainWindow() ) self.proximity.setStatusTip( QCoreApplication.translate( "GdalTools", "Produces a raster proximity map") ) QObject.connect( self.proximity, SIGNAL( "triggered()" ), self.doProximity ) self.menu.addAction(self.proximity) @@ -151,18 +151,18 @@ class GdalTools: QObject.connect( self.nearBlack, SIGNAL( "triggered()" ), self.doNearBlack ) self.menu.addAction(self.nearBlack) - self.warp = QAction( QIcon(":/icons/warp.png"), QCoreApplication.translate( "GdalTools", "Warp" ), self.iface.mainWindow() ) + self.warp = QAction( QIcon(":/icons/warp.png"), QCoreApplication.translate( "GdalTools", "Warp (Reproject)" ), self.iface.mainWindow() ) self.warp.setStatusTip( QCoreApplication.translate( "GdalTools", "Warp an image into a new coordinate system") ) QObject.connect( self.warp, SIGNAL( "triggered()" ), self.doWarp ) self.menu.addAction(self.warp) if self.GdalVersion >= "1.5": - self.grid = QAction( QIcon(":/icons/grid.png"), QCoreApplication.translate( "GdalTools", "Grid" ), self.iface.mainWindow() ) + self.grid = QAction( QIcon(":/icons/grid.png"), QCoreApplication.translate( "GdalTools", "Grid (Interpolation)" ), self.iface.mainWindow() ) self.grid.setStatusTip( QCoreApplication.translate( "GdalTools", "Create raster from the scattered data") ) QObject.connect( self.grid, SIGNAL( "triggered()" ), self.doGrid ) self.menu.addAction(self.grid) - self.translate = QAction( QIcon(":/icons/translate.png"), QCoreApplication.translate( "GdalTools", "Translate" ), self.iface.mainWindow() ) + self.translate = QAction( QIcon(":/icons/translate.png"), QCoreApplication.translate( "GdalTools", "Translate (Convert format)" ), self.iface.mainWindow() ) self.translate.setStatusTip( QCoreApplication.translate( "GdalTools", "Converts raster data between different formats") ) QObject.connect( self.translate, SIGNAL( "triggered()" ), self.doTranslate ) self.menu.addAction(self.translate) @@ -177,7 +177,7 @@ class GdalTools: QObject.connect( self.projection, SIGNAL( "triggered()" ), self.doProjection ) self.menu.addAction( self.projection ) - self.overview = QAction( QIcon( ":icons/raster-overview.png" ), QCoreApplication.translate( "GdalTools", "Build overviews" ), self.iface.mainWindow() ) + self.overview = QAction( QIcon( ":icons/raster-overview.png" ), QCoreApplication.translate( "GdalTools", "Build overviews (Pyramids)" ), self.iface.mainWindow() ) self.overview.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds or rebuilds overview images" ) ) QObject.connect( self.overview, SIGNAL( "triggered()" ), self.doOverview ) self.menu.addAction( self.overview ) @@ -203,7 +203,7 @@ class GdalTools: self.menu.addAction(self.tileindex) if self.GdalVersion >= "1.7": - self.dem = QAction( QIcon( ":icons/dem.png" ), QCoreApplication.translate( "GdalTools", "DEM" ), self.iface.mainWindow() ) + self.dem = QAction( QIcon( ":icons/dem.png" ), QCoreApplication.translate( "GdalTools", "DEM (Terrain models)" ), self.iface.mainWindow() ) self.dem.setStatusTip( QCoreApplication.translate( "GdalTools", "Tool to analyze and visualize DEMs" ) ) QObject.connect( self.dem, SIGNAL( "triggered()" ), self.doDEM ) self.menu.addAction(self.dem) diff --git a/python/plugins/GdalTools/tools/widgetBuildVRT.ui b/python/plugins/GdalTools/tools/widgetBuildVRT.ui index 23d8b6b1be3..d74041c8660 100644 --- a/python/plugins/GdalTools/tools/widgetBuildVRT.ui +++ b/python/plugins/GdalTools/tools/widgetBuildVRT.ui @@ -6,8 +6,8 @@ 0 0 - 344 - 234 + 348 + 240 @@ -17,7 +17,7 @@ - Build Virtual Raster + Build Virtual Raster (Catalog) diff --git a/python/plugins/GdalTools/tools/widgetDEM.ui b/python/plugins/GdalTools/tools/widgetDEM.ui index 0153cc26879..9e7a6ce4da7 100644 --- a/python/plugins/GdalTools/tools/widgetDEM.ui +++ b/python/plugins/GdalTools/tools/widgetDEM.ui @@ -17,7 +17,7 @@ - DEM + DEM (Terrain models) diff --git a/python/plugins/GdalTools/tools/widgetGrid.ui b/python/plugins/GdalTools/tools/widgetGrid.ui index eed9f0f1279..873427955e9 100644 --- a/python/plugins/GdalTools/tools/widgetGrid.ui +++ b/python/plugins/GdalTools/tools/widgetGrid.ui @@ -17,7 +17,7 @@ - Grid + Grid (Interpolation) diff --git a/python/plugins/GdalTools/tools/widgetOverview.ui b/python/plugins/GdalTools/tools/widgetOverview.ui index 30b8af9bcf2..6454dc7b2ae 100644 --- a/python/plugins/GdalTools/tools/widgetOverview.ui +++ b/python/plugins/GdalTools/tools/widgetOverview.ui @@ -17,7 +17,7 @@ - Add overview + Build overviews (Pyramids) diff --git a/python/plugins/GdalTools/tools/widgetPolygonize.ui b/python/plugins/GdalTools/tools/widgetPolygonize.ui index 5bad8b2777a..c99d0f75d92 100644 --- a/python/plugins/GdalTools/tools/widgetPolygonize.ui +++ b/python/plugins/GdalTools/tools/widgetPolygonize.ui @@ -17,7 +17,7 @@ - Polygonize + Polygonize (Raster to vector) diff --git a/python/plugins/GdalTools/tools/widgetProximity.ui b/python/plugins/GdalTools/tools/widgetProximity.ui index e8266be9011..4bd8d43cb42 100644 --- a/python/plugins/GdalTools/tools/widgetProximity.ui +++ b/python/plugins/GdalTools/tools/widgetProximity.ui @@ -17,7 +17,7 @@ - Proximity + Proximity (Raster distance) diff --git a/python/plugins/GdalTools/tools/widgetRasterize.ui b/python/plugins/GdalTools/tools/widgetRasterize.ui index 3a54d2af996..f58f36af3ec 100644 --- a/python/plugins/GdalTools/tools/widgetRasterize.ui +++ b/python/plugins/GdalTools/tools/widgetRasterize.ui @@ -17,7 +17,7 @@ - Rasterize + Rasterize (Vector to raster) diff --git a/python/plugins/GdalTools/tools/widgetTranslate.ui b/python/plugins/GdalTools/tools/widgetTranslate.ui index a7511708bc7..a2377fa4103 100644 --- a/python/plugins/GdalTools/tools/widgetTranslate.ui +++ b/python/plugins/GdalTools/tools/widgetTranslate.ui @@ -17,7 +17,7 @@ - Translate + Translate (Convert format) diff --git a/python/plugins/GdalTools/tools/widgetWarp.ui b/python/plugins/GdalTools/tools/widgetWarp.ui index f9c388ad9fe..28b0dea15f9 100644 --- a/python/plugins/GdalTools/tools/widgetWarp.ui +++ b/python/plugins/GdalTools/tools/widgetWarp.ui @@ -17,7 +17,7 @@ - Warp + Warp (Reproject)