Skip to content

Commit 9bc7eca

Browse files
committedOct 20, 2014
Cleanup action text
Make sure all actions use standard capitalization and ... suffixes when required. Add missing menu key shortcuts to composer actions.
1 parent d2f89c5 commit 9bc7eca

15 files changed

+172
-170
lines changed
 

‎python/plugins/GdalTools/GdalTools.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,17 @@ def initGui( self ):
126126
self.projectionsMenu = QMenu( QCoreApplication.translate( "GdalTools", "Projections" ), self.iface.mainWindow() )
127127
self.projectionsMenu.setObjectName("projectionsMenu")
128128

129-
self.warp = QAction( QIcon(":/icons/warp.png"), QCoreApplication.translate( "GdalTools", "Warp (Reproject)" ), self.iface.mainWindow() )
129+
self.warp = QAction( QIcon(":/icons/warp.png"), QCoreApplication.translate( "GdalTools", "Warp (Reproject)..." ), self.iface.mainWindow() )
130130
self.warp.setObjectName("warp")
131131
self.warp.setStatusTip( QCoreApplication.translate( "GdalTools", "Warp an image into a new coordinate system") )
132132
QObject.connect( self.warp, SIGNAL( "triggered()" ), self.doWarp )
133133

134-
self.projection = QAction( QIcon( ":icons/projection-add.png" ), QCoreApplication.translate( "GdalTools", "Assign projection" ), self.iface.mainWindow() )
134+
self.projection = QAction( QIcon( ":icons/projection-add.png" ), QCoreApplication.translate( "GdalTools", "Assign Projection..." ), self.iface.mainWindow() )
135135
self.projection.setObjectName("projection")
136136
self.projection.setStatusTip( QCoreApplication.translate( "GdalTools", "Add projection info to the raster" ) )
137137
QObject.connect( self.projection, SIGNAL( "triggered()" ), self.doProjection )
138138

139-
self.extractProj = QAction( QIcon( ":icons/projection-export.png" ), QCoreApplication.translate( "GdalTools", "Extract projection" ), self.iface.mainWindow() )
139+
self.extractProj = QAction( QIcon( ":icons/projection-export.png" ), QCoreApplication.translate( "GdalTools", "Extract Projection..." ), self.iface.mainWindow() )
140140
self.extractProj.setObjectName("extractProj")
141141
self.extractProj.setStatusTip( QCoreApplication.translate( "GdalTools", "Extract projection information from raster(s)" ) )
142142
QObject.connect( self.extractProj, SIGNAL( "triggered()" ), self.doExtractProj )
@@ -148,30 +148,30 @@ def initGui( self ):
148148
self.conversionMenu.setObjectName("conversionMenu")
149149

150150
if self.GdalVersionNum >= 1300:
151-
self.rasterize = QAction( QIcon(":/icons/rasterize.png"), QCoreApplication.translate( "GdalTools", "Rasterize (Vector to raster)" ), self.iface.mainWindow() )
151+
self.rasterize = QAction( QIcon(":/icons/rasterize.png"), QCoreApplication.translate( "GdalTools", "Rasterize (Vector to Raster)..." ), self.iface.mainWindow() )
152152
self.rasterize.setObjectName("rasterize")
153153
self.rasterize.setStatusTip( QCoreApplication.translate( "GdalTools", "Burns vector geometries into a raster") )
154154
QObject.connect( self.rasterize, SIGNAL( "triggered()" ), self.doRasterize )
155155
self.conversionMenu.addAction( self.rasterize )
156156

157157
if self.GdalVersionNum >= 1600:
158-
self.polygonize = QAction( QIcon(":/icons/polygonize.png"), QCoreApplication.translate( "GdalTools", "Polygonize (Raster to vector)" ), self.iface.mainWindow() )
158+
self.polygonize = QAction( QIcon(":/icons/polygonize.png"), QCoreApplication.translate( "GdalTools", "Polygonize (Raster to Vector)..." ), self.iface.mainWindow() )
159159
self.polygonize.setObjectName("polygonize")
160160
self.polygonize.setStatusTip( QCoreApplication.translate( "GdalTools", "Produces a polygon feature layer from a raster") )
161161
QObject.connect( self.polygonize, SIGNAL( "triggered()" ), self.doPolygonize )
162162
self.conversionMenu.addAction( self.polygonize )
163163

164-
self.translate = QAction( QIcon(":/icons/translate.png"), QCoreApplication.translate( "GdalTools", "Translate (Convert format)" ), self.iface.mainWindow() )
164+
self.translate = QAction( QIcon(":/icons/translate.png"), QCoreApplication.translate( "GdalTools", "Translate (Convert Format)..." ), self.iface.mainWindow() )
165165
self.translate.setObjectName("translate")
166166
self.translate.setStatusTip( QCoreApplication.translate( "GdalTools", "Converts raster data between different formats") )
167167
QObject.connect( self.translate, SIGNAL( "triggered()" ), self.doTranslate )
168168

169-
self.paletted = QAction( QIcon( ":icons/24-to-8-bits.png" ), QCoreApplication.translate( "GdalTools", "RGB to PCT" ), self.iface.mainWindow() )
169+
self.paletted = QAction( QIcon( ":icons/24-to-8-bits.png" ), QCoreApplication.translate( "GdalTools", "RGB to PCT..." ), self.iface.mainWindow() )
170170
self.paletted.setObjectName("paletted")
171171
self.paletted.setStatusTip( QCoreApplication.translate( "GdalTools", "Convert a 24bit RGB image to 8bit paletted" ) )
172172
QObject.connect( self.paletted, SIGNAL( "triggered()" ), self.doPaletted )
173173

174-
self.rgb = QAction( QIcon( ":icons/8-to-24-bits.png" ), QCoreApplication.translate( "GdalTools", "PCT to RGB" ), self.iface.mainWindow() )
174+
self.rgb = QAction( QIcon( ":icons/8-to-24-bits.png" ), QCoreApplication.translate( "GdalTools", "PCT to RGB..." ), self.iface.mainWindow() )
175175
self.rgb.setObjectName("rgb")
176176
self.rgb.setStatusTip( QCoreApplication.translate( "GdalTools", "Convert an 8bit paletted image to 24bit RGB" ) )
177177
QObject.connect( self.rgb, SIGNAL( "triggered()" ), self.doRGB )
@@ -183,13 +183,13 @@ def initGui( self ):
183183
self.extractionMenu.setObjectName("extractionMenu")
184184

185185
if self.GdalVersionNum >= 1600:
186-
self.contour = QAction( QIcon(":/icons/contour.png"), QCoreApplication.translate( "GdalTools", "Contour" ), self.iface.mainWindow() )
186+
self.contour = QAction( QIcon(":/icons/contour.png"), QCoreApplication.translate( "GdalTools", "Contour..." ), self.iface.mainWindow() )
187187
self.contour.setObjectName("contour")
188188
self.contour.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds vector contour lines from a DEM") )
189189
QObject.connect( self.contour, SIGNAL( "triggered()" ), self.doContour )
190190
self.extractionMenu.addAction( self.contour )
191191

192-
self.clipper = QAction( QIcon( ":icons/raster-clip.png" ), QCoreApplication.translate( "GdalTools", "Clipper" ), self.iface.mainWindow() )
192+
self.clipper = QAction( QIcon( ":icons/raster-clip.png" ), QCoreApplication.translate( "GdalTools", "Clipper..." ), self.iface.mainWindow() )
193193
self.clipper.setObjectName("clipper")
194194
#self.clipper.setStatusTip( QCoreApplication.translate( "GdalTools", "Converts raster data between different formats") )
195195
QObject.connect( self.clipper, SIGNAL( "triggered()" ), self.doClipper )
@@ -201,42 +201,42 @@ def initGui( self ):
201201
self.analysisMenu.setObjectName("analysisMenu")
202202

203203
if self.GdalVersionNum >= 1600:
204-
self.sieve = QAction( QIcon(":/icons/sieve.png"), QCoreApplication.translate( "GdalTools", "Sieve" ), self.iface.mainWindow() )
204+
self.sieve = QAction( QIcon(":/icons/sieve.png"), QCoreApplication.translate( "GdalTools", "Sieve..." ), self.iface.mainWindow() )
205205
self.sieve.setObjectName("sieve")
206206
self.sieve.setStatusTip( QCoreApplication.translate( "GdalTools", "Removes small raster polygons") )
207207
QObject.connect( self.sieve, SIGNAL( "triggered()" ), self.doSieve )
208208
self.analysisMenu.addAction( self.sieve )
209209

210210
if self.GdalVersionNum >= 1500:
211-
self.nearBlack = QAction( QIcon(":/icons/nearblack.png"), QCoreApplication.translate( "GdalTools", "Near black" ), self.iface.mainWindow() )
211+
self.nearBlack = QAction( QIcon(":/icons/nearblack.png"), QCoreApplication.translate( "GdalTools", "Near Black..." ), self.iface.mainWindow() )
212212
self.nearBlack.setObjectName("nearBlack")
213213
self.nearBlack.setStatusTip( QCoreApplication.translate( "GdalTools", "Convert nearly black/white borders to exact value") )
214214
QObject.connect( self.nearBlack, SIGNAL( "triggered()" ), self.doNearBlack )
215215
self.analysisMenu.addAction( self.nearBlack )
216216

217217
if self.GdalVersionNum >= 1700:
218-
self.fillNodata = QAction( QIcon(":/icons/fillnodata.png"), QCoreApplication.translate( "GdalTools", "Fill nodata" ), self.iface.mainWindow() )
218+
self.fillNodata = QAction( QIcon(":/icons/fillnodata.png"), QCoreApplication.translate( "GdalTools", "Fill nodata..." ), self.iface.mainWindow() )
219219
self.fillNodata.setObjectName("fillNodata")
220220
self.fillNodata.setStatusTip( QCoreApplication.translate( "GdalTools", "Fill raster regions by interpolation from edges") )
221221
QObject.connect( self.fillNodata, SIGNAL( "triggered()" ), self.doFillNodata )
222222
self.analysisMenu.addAction( self.fillNodata )
223223

224224
if self.GdalVersionNum >= 1600:
225-
self.proximity = QAction( QIcon(":/icons/proximity.png"), QCoreApplication.translate( "GdalTools", "Proximity (Raster distance)" ), self.iface.mainWindow() )
225+
self.proximity = QAction( QIcon(":/icons/proximity.png"), QCoreApplication.translate( "GdalTools", "Proximity (Raster Distance)..." ), self.iface.mainWindow() )
226226
self.proximity.setObjectName("proximity")
227227
self.proximity.setStatusTip( QCoreApplication.translate( "GdalTools", "Produces a raster proximity map") )
228228
QObject.connect( self.proximity, SIGNAL( "triggered()" ), self.doProximity )
229229
self.analysisMenu.addAction( self.proximity )
230230

231231
if self.GdalVersionNum >= 1500:
232-
self.grid = QAction( QIcon(":/icons/grid.png"), QCoreApplication.translate( "GdalTools", "Grid (Interpolation)" ), self.iface.mainWindow() )
232+
self.grid = QAction( QIcon(":/icons/grid.png"), QCoreApplication.translate( "GdalTools", "Grid (Interpolation)..." ), self.iface.mainWindow() )
233233
self.grid.setObjectName("grid")
234234
self.grid.setStatusTip( QCoreApplication.translate( "GdalTools", "Create raster from the scattered data") )
235235
QObject.connect( self.grid, SIGNAL( "triggered()" ), self.doGrid )
236236
self.analysisMenu.addAction( self.grid )
237237

238238
if self.GdalVersionNum >= 1700:
239-
self.dem = QAction( QIcon( ":icons/dem.png" ), QCoreApplication.translate( "GdalTools", "DEM (Terrain models)" ), self.iface.mainWindow() )
239+
self.dem = QAction( QIcon( ":icons/dem.png" ), QCoreApplication.translate( "GdalTools", "DEM (Terrain Models)..." ), self.iface.mainWindow() )
240240
self.dem.setObjectName("dem")
241241
self.dem.setStatusTip( QCoreApplication.translate( "GdalTools", "Tool to analyze and visualize DEMs" ) )
242242
QObject.connect( self.dem, SIGNAL( "triggered()" ), self.doDEM )
@@ -249,28 +249,28 @@ def initGui( self ):
249249
self.miscellaneousMenu.setObjectName("miscellaneousMenu")
250250

251251
if self.GdalVersionNum >= 1600:
252-
self.buildVRT = QAction( QIcon(":/icons/vrt.png"), QCoreApplication.translate( "GdalTools", "Build Virtual Raster (Catalog)" ), self.iface.mainWindow() )
252+
self.buildVRT = QAction( QIcon(":/icons/vrt.png"), QCoreApplication.translate( "GdalTools", "Build Virtual Raster (Catalog)..." ), self.iface.mainWindow() )
253253
self.buildVRT.setObjectName("buildVRT")
254254
self.buildVRT.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds a VRT from a list of datasets") )
255255
QObject.connect( self.buildVRT, SIGNAL( "triggered()" ), self.doBuildVRT )
256256
self.miscellaneousMenu.addAction( self.buildVRT )
257257

258-
self.merge = QAction( QIcon(":/icons/merge.png"), QCoreApplication.translate( "GdalTools", "Merge" ), self.iface.mainWindow() )
258+
self.merge = QAction( QIcon(":/icons/merge.png"), QCoreApplication.translate( "GdalTools", "Merge..." ), self.iface.mainWindow() )
259259
self.merge.setObjectName("merge")
260260
self.merge.setStatusTip( QCoreApplication.translate( "GdalTools", "Build a quick mosaic from a set of images") )
261261
QObject.connect( self.merge, SIGNAL( "triggered()" ), self.doMerge )
262262

263-
self.info = QAction( QIcon( ":/icons/raster-info.png" ), QCoreApplication.translate( "GdalTools", "Information" ), self.iface.mainWindow() )
263+
self.info = QAction( QIcon( ":/icons/raster-info.png" ), QCoreApplication.translate( "GdalTools", "Information..." ), self.iface.mainWindow() )
264264
self.info.setObjectName("info")
265265
self.info.setStatusTip( QCoreApplication.translate( "GdalTools", "Lists information about raster dataset" ) )
266266
QObject.connect( self.info, SIGNAL("triggered()"), self.doInfo )
267267

268-
self.overview = QAction( QIcon( ":icons/raster-overview.png" ), QCoreApplication.translate( "GdalTools", "Build overviews (Pyramids)" ), self.iface.mainWindow() )
268+
self.overview = QAction( QIcon( ":icons/raster-overview.png" ), QCoreApplication.translate( "GdalTools", "Build Overviews (Pyramids)..." ), self.iface.mainWindow() )
269269
self.overview.setObjectName("overview")
270270
self.overview.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds or rebuilds overview images" ) )
271271
QObject.connect( self.overview, SIGNAL( "triggered()" ), self.doOverview )
272272

273-
self.tileindex = QAction( QIcon( ":icons/tiles.png" ), QCoreApplication.translate( "GdalTools", "Tile index" ), self.iface.mainWindow() )
273+
self.tileindex = QAction( QIcon( ":icons/tiles.png" ), QCoreApplication.translate( "GdalTools", "Tile Index..." ), self.iface.mainWindow() )
274274
self.tileindex.setObjectName("tileindex")
275275
self.tileindex.setStatusTip( QCoreApplication.translate( "GdalTools", "Build a shapefile as a raster tileindex" ) )
276276
QObject.connect( self.tileindex, SIGNAL( "triggered()" ), self.doTileIndex )
@@ -286,7 +286,7 @@ def initGui( self ):
286286

287287
self.menu.addMenu( self.miscellaneousMenu )
288288

289-
self.settings = QAction( QCoreApplication.translate( "GdalTools", "GdalTools settings" ), self.iface.mainWindow() )
289+
self.settings = QAction( QCoreApplication.translate( "GdalTools", "GdalTools Settings..." ), self.iface.mainWindow() )
290290
self.settings.setObjectName("settings")
291291
self.settings.setStatusTip( QCoreApplication.translate( "GdalTools", "Various settings for Gdal Tools" ) )
292292
QObject.connect( self.settings, SIGNAL( "triggered()" ), self.doSettings )

0 commit comments

Comments
 (0)
Please sign in to comment.