Skip to content

Commit 0752176

Browse files
jef-njef-n
committedJan 29, 2012
cleanup separate file type names from extensions in translations
·
ltr-3_40Before-merge-new_vector_api
1 parent eae552f commit 0752176

17 files changed

+52
-33
lines changed
 

‎src/app/gps/qgsgpsinformationwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@ void QgsGPSInformationWidget::on_mBtnLogFile_clicked()
11651165
QSettings settings;
11661166
QString settingPath( "/gps/lastLogFileDir" );
11671167
QString lastUsedDir = settings.value( settingPath, "." ).toString();
1168-
QString saveFilePath = QFileDialog::getSaveFileName( this, tr( "Save GPS log file as" ), lastUsedDir, tr( "NMEA files (*.nmea)" ) );
1168+
QString saveFilePath = QFileDialog::getSaveFileName( this, tr( "Save GPS log file as" ), lastUsedDir, tr( "NMEA files" ) + " (*.nmea)" );
11691169
if ( saveFilePath.isNull() ) //canceled
11701170
{
11711171
return;

‎src/app/qgisapp.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2700,7 +2700,10 @@ void QgisApp::fileOpen()
27002700
// Retrieve last used project dir from persistent settings
27012701
QSettings settings;
27022702
QString lastUsedDir = settings.value( "/UI/lastProjectDir", "." ).toString();
2703-
QString fullPath = QFileDialog::getOpenFileName( this, tr( "Choose a QGIS project file to open" ), lastUsedDir, tr( "QGis files (*.qgs *.QGS)" ) );
2703+
QString fullPath = QFileDialog::getOpenFileName( this,
2704+
tr( "Choose a QGIS project file to open" ),
2705+
lastUsedDir,
2706+
tr( "QGis files" ) + " (*.qgs *.QGS)" );
27042707
if ( fullPath.isNull() )
27052708
{
27062709
return;
@@ -2843,7 +2846,7 @@ bool QgisApp::fileSave()
28432846
this,
28442847
tr( "Choose a QGIS project file" ),
28452848
lastUsedDir + "/" + QgsProject::instance()->title(),
2846-
tr( "QGis files (*.qgs *.QGS)" ) );
2849+
tr( "QGis files" ) + " (*.qgs *.QGS)" );
28472850
if ( path.isEmpty() )
28482851
return true;
28492852

@@ -2892,7 +2895,10 @@ void QgisApp::fileSaveAs()
28922895
QSettings settings;
28932896
QString lastUsedDir = settings.value( "/UI/lastProjectDir", "." ).toString();
28942897

2895-
QString path = QFileDialog::getSaveFileName( this, tr( "Choose a file name to save the QGIS project file as" ), lastUsedDir + "/" + QgsProject::instance()->title(), tr( "QGis files (*.qgs *.QGS)" ) );
2898+
QString path = QFileDialog::getSaveFileName( this,
2899+
tr( "Choose a file name to save the QGIS project file as" ),
2900+
lastUsedDir + "/" + QgsProject::instance()->title(),
2901+
tr( "QGis files" ) + " (*.qgs *.QGS)" );
28962902
if ( path.isEmpty() )
28972903
return;
28982904

‎src/app/qgsconfigureshortcutsdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void QgsConfigureShortcutsDialog::populateActions()
9898

9999
void QgsConfigureShortcutsDialog::saveShortcuts()
100100
{
101-
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save shortcuts" ), ".", tr( "XML file (*.xml);; All files (*)" ) );
101+
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save shortcuts" ), ".", tr( "XML file" ) + " (*.xml);;" + tr( "All files" ) + " (*)" );
102102

103103
if ( fileName.isEmpty() )
104104
return;
@@ -150,7 +150,7 @@ void QgsConfigureShortcutsDialog::saveShortcuts()
150150

151151
void QgsConfigureShortcutsDialog::loadShortcuts()
152152
{
153-
QString fileName = QFileDialog::getOpenFileName( this, tr( "Load shortcuts" ), ".", tr( "XML file (*.xml);; All files (*)" ) );
153+
QString fileName = QFileDialog::getOpenFileName( this, tr( "Load shortcuts" ), ".", tr( "XML file" ) + " (*.xml);;" + tr( "All files" ) + " (*)" );
154154

155155
if ( fileName.isEmpty() )
156156
{

‎src/app/qgsembedlayerdialog.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ void QgsEmbedLayerDialog::on_mBrowseFileToolButton_clicked()
6262
mProjectFileLineEdit->blockSignals( true );
6363

6464
QSettings s;
65-
QString projectFile = QFileDialog::getOpenFileName( 0, tr( "Select project file" ), s.value( "/qgis/last_embedded_project_path" ).toString() , tr( "QGIS project files (*.qgs *.QGS)" ) );
65+
QString projectFile = QFileDialog::getOpenFileName( this,
66+
tr( "Select project file" ),
67+
s.value( "/qgis/last_embedded_project_path" ).toString() ,
68+
tr( "QGis files" ) + " (*.qgs *.QGS)" );
6669
if ( !projectFile.isEmpty() )
6770
{
6871
mProjectFileLineEdit->setText( projectFile );

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,7 @@ void QgsRasterLayerProperties::on_pbnExportTransparentPixelValues_clicked()
18271827
{
18281828
QSettings myQSettings;
18291829
QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
1830-
QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), myLastDir, tr( "Textfile (*.txt)" ) );
1830+
QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), myLastDir, tr( "Textfile" ) + " (*.txt)" );
18311831
if ( !myFileName.isEmpty() )
18321832
{
18331833
if ( !myFileName.endsWith( ".txt", Qt::CaseInsensitive ) )
@@ -2035,7 +2035,7 @@ void QgsRasterLayerProperties::on_pbnImportTransparentPixelValues_clicked()
20352035
QString myBadLines;
20362036
QSettings myQSettings;
20372037
QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
2038-
QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), myLastDir, tr( "Textfile (*.txt)" ) );
2038+
QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), myLastDir, tr( "Textfile" ) + " (*.txt)" );
20392039
QFile myInputFile( myFileName );
20402040
if ( myInputFile.open( QFile::ReadOnly ) )
20412041
{
@@ -2510,7 +2510,7 @@ void QgsRasterLayerProperties::on_pbtnExportColorMapToFile_clicked()
25102510
{
25112511
QSettings myQSettings;
25122512
QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
2513-
QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), myLastDir, tr( "Textfile (*.txt)" ) );
2513+
QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), myLastDir, tr( "Textfile" ) + " (*.txt)" );
25142514
if ( !myFileName.isEmpty() )
25152515
{
25162516
if ( !myFileName.endsWith( ".txt", Qt::CaseInsensitive ) )
@@ -2592,7 +2592,7 @@ void QgsRasterLayerProperties::on_pbtnLoadColorMapFromFile_clicked()
25922592
QString myBadLines;
25932593
QSettings myQSettings;
25942594
QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
2595-
QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), myLastDir, tr( "Textfile (*.txt)" ) );
2595+
QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), myLastDir, tr( "Textfile" ) + " (*.txt)" );
25962596
QFile myInputFile( myFileName );
25972597
if ( myInputFile.open( QFile::ReadOnly ) )
25982598
{
@@ -2955,9 +2955,9 @@ void QgsRasterLayerProperties::on_pbnLoadStyle_clicked()
29552955

29562956
QString fileName = QFileDialog::getOpenFileName(
29572957
this,
2958-
tr( "Load layer properties from style file (.qml)" ),
2958+
tr( "Load layer properties from style file" ),
29592959
lastUsedDir,
2960-
tr( "QGIS Layer Style File (*.qml)" ) );
2960+
tr( "QGIS Layer Style File" ) + " (*.qml)" );
29612961
if ( fileName.isEmpty() )
29622962
return;
29632963

@@ -2985,7 +2985,11 @@ void QgsRasterLayerProperties::on_pbnSaveStyleAs_clicked()
29852985
QSettings settings;
29862986
QString lastUsedDir = settings.value( "style/lastStyleDir", "." ).toString();
29872987

2988-
QString outputFileName = QFileDialog::getSaveFileName( this, tr( "Save layer properties as style file (.qml)" ), lastUsedDir );
2988+
QString outputFileName = QFileDialog::getSaveFileName(
2989+
this,
2990+
tr( "Save layer properties as style file" ),
2991+
lastUsedDir,
2992+
tr( "QGIS Layer Style File" ) + " (*.qml)" );
29892993
if ( outputFileName.isEmpty() )
29902994
return;
29912995

‎src/app/qgssinglesymboldialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ void QgsSingleSymbolDialog::selectTextureImage()
292292
QString fileName = QFileDialog::getOpenFileName( this,
293293
tr( "Open File" ),
294294
mTexturePath,
295-
tr( "Images (*.png *.xpm *.jpg)" ) ); //should we allow other types of images?
295+
tr( "Images" ) + " (*.png *.xpm *.jpg)" ); //should we allow other types of images?
296296

297297
if ( !fileName.isNull() )
298298
{ //only process the string if the user clicked OK

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ void QgsVectorLayerProperties::on_pbnSelectEditForm_clicked()
10481048
{
10491049
QSettings myQSettings;
10501050
QString lastUsedDir = myQSettings.value( "style/lastUIDir", "." ).toString();
1051-
QString uifilename = QFileDialog::getOpenFileName( this, tr( "Select edit form" ), lastUsedDir, tr( "UI file (*.ui)" ) );
1051+
QString uifilename = QFileDialog::getOpenFileName( this, tr( "Select edit form" ), lastUsedDir, tr( "UI file" ) + " (*.ui)" );
10521052

10531053
if ( uifilename.isNull() )
10541054
return;

‎src/gui/qgssearchquerybuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ void QgsSearchQueryBuilder::loadQuery()
403403
QSettings s;
404404
QString lastQueryFileDir = s.value( "/UI/lastQueryFileDir", "" ).toString();
405405

406-
QString queryFileName = QFileDialog::getOpenFileName( 0, tr( "Load query from file" ), lastQueryFileDir, tr( "Query files" ) + "(*.qqf);;" + tr( "All files" ) + "(*)" );
406+
QString queryFileName = QFileDialog::getOpenFileName( 0, tr( "Load query from file" ), lastQueryFileDir, tr( "Query files" ) + " (*.qqf);;" + tr( "All files" ) + " (*)" );
407407
if ( queryFileName.isNull() )
408408
{
409409
return;

‎src/gui/symbology-ng/qgssymbollayerv2widget.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,10 @@ void QgsSvgMarkerSymbolLayerV2Widget::setOffset()
676676
void QgsSvgMarkerSymbolLayerV2Widget::on_mFileToolButton_clicked()
677677
{
678678
QSettings s;
679-
QString file = QFileDialog::getOpenFileName( 0, tr( "Select SVG file" ), s.value( "/UI/lastSVGMarkerDir" ).toString(), "SVG files (*.svg)" );
679+
QString file = QFileDialog::getOpenFileName( 0,
680+
tr( "Select SVG file" ),
681+
s.value( "/UI/lastSVGMarkerDir" ).toString(),
682+
tr( "SVG files" ) + " (*.svg)" );
680683
QFileInfo fi( file );
681684
if ( file.isEmpty() || !fi.exists() )
682685
{

‎src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,9 @@ void QgsDelimitedTextPluginGui::getOpenFileName()
450450
this,
451451
tr( "Choose a delimited text file to open" ),
452452
settings.value( "/Plugin-DelimitedText/text_path", "./" ).toString(),
453-
"Text files (*.txt *.csv);;Well Known Text files (*.wkt);;All files (* *.*)" );
453+
tr( "Text files" ) + " (*.txt *.csv);;"
454+
+ tr( "Well Known Text files" ) + " (*.wkt);;"
455+
+ tr( "All files" ) + " (* *.*)" );
454456
// set path
455457
txtFilePath->setText( s );
456458
}

‎src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void dxf2shpConverterGui::getInputFileName()
156156
QString s = QFileDialog::getOpenFileName( this,
157157
tr( "Choose a DXF file to open" ),
158158
settings.value( "/Plugin-DXF/text_path", "./" ).toString(),
159-
tr( "DXF files (*.dxf)" ) );
159+
tr( "DXF files" ) + " (*.dxf)" );
160160

161161
if ( !s.isEmpty() )
162162
{
@@ -171,7 +171,7 @@ void dxf2shpConverterGui::getOutputDir()
171171
QString s = QFileDialog::getSaveFileName( this,
172172
tr( "Choose a file name to save to" ),
173173
settings.value( "/UI/lastShapefileDir", "./" ).toString(),
174-
tr( "Shapefile (*.shp)" ) );
174+
tr( "Shapefile" ) + " (*.shp)" );
175175

176176
if ( !s.isEmpty() )
177177
{

‎src/plugins/georeferencer/qgsgeorefplugingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void QgsGeorefPluginGui::loadGCPsDialog()
562562
{
563563
QString selectedFile = mRasterFileName.isEmpty() ? "" : mRasterFileName + ".points";
564564
mGCPpointsFileName = QFileDialog::getOpenFileName( this, tr( "Load GCP points" ),
565-
selectedFile, "GCP file (*.points)" );
565+
selectedFile, tr( "GCP file" ) + " (*.points)" );
566566
if ( mGCPpointsFileName.isEmpty() )
567567
return;
568568

@@ -580,7 +580,7 @@ void QgsGeorefPluginGui::saveGCPsDialog()
580580
QString selectedFile = mRasterFileName.isEmpty() ? "" : mRasterFileName + ".points";
581581
mGCPpointsFileName = QFileDialog::getSaveFileName( this, tr( "Save GCP points" ),
582582
selectedFile,
583-
"GCP file (*.points)" );
583+
tr( "GCP file" ) + " (*.points)" );
584584

585585
if ( mGCPpointsFileName.isEmpty() )
586586
return;

‎src/plugins/globe/globe_plugin_dialog.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,9 @@ QgsVectorLayer* QgsGlobePluginDialog::modelLayer()
372372
void QgsGlobePluginDialog::on_modelBrowse_clicked()
373373
{
374374
//see http://www.openscenegraph.org/projects/osg/wiki/Support/UserGuides/Plugins
375-
const char* filter = "Model files (*.3dc *.asc *.3ds *.ac *.bsp *.dae *.dw *.dxf *.fbx *.gem *.geo *.iv *.wrl *.ive *.logo *.lwo *.lw *.geo *.lws *.md2 *.obj *.ogr *.flt *.osg *.shp *.stl *.sta *.wrl *.x) \
376-
;;All files (*.*)";
375+
const char* filter =
376+
tr( "Model files" ) + " (*.3dc *.asc *.3ds *.ac *.bsp *.dae *.dw *.dxf *.fbx *.gem *.geo *.iv *.wrl *.ive *.logo *.lwo *.lw *.geo *.lws *.md2 *.obj *.ogr *.flt *.osg *.shp *.stl *.sta *.wrl *.x);;"
377+
+ tr( "All files" ) + " (*.*)";
377378
QString path = QFileDialog::getOpenFileName( this,
378379
tr( "Open 3D model file" ),
379380
QDir::homePath(),

‎src/plugins/gps_importer/qgsgpsplugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ void QgsGPSPlugin::createGPX()
163163
QFileDialog::getSaveFileName( mQGisInterface->mainWindow(),
164164
tr( "Save new GPX file as..." ),
165165
dir,
166-
tr( "GPS eXchange file (*.gpx)" ) );
166+
tr( "GPS eXchange file" ) + " (*.gpx)" );
167167
if ( !fileName.isEmpty() )
168168
{
169169
if ( !fileName.toLower().endsWith( ".gpx" ) )

‎src/plugins/gps_importer/qgsgpsplugingui.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ void QgsGPSPluginGui::on_pbnDLOutput_clicked()
163163
QFileDialog::getSaveFileName( this,
164164
tr( "Choose a file name to save under" ),
165165
dir,
166-
tr( "GPS eXchange format (*.gpx)" ) );
166+
tr( "GPS eXchange format" ) + " (*.gpx)" );
167167
if ( !myFileNameQString.isEmpty() )
168168
{
169169
if ( !myFileNameQString.toLower().endsWith( ".gpx" ) )
@@ -256,7 +256,7 @@ void QgsGPSPluginGui::on_pbnGPXSelectFile_clicked()
256256
this,
257257
tr( "Select GPX file" ),
258258
dir,
259-
tr( "GPS eXchange format (*.gpx)" ) );
259+
tr( "GPS eXchange format" ) + " (*.gpx)" );
260260
if ( !myFileNameQString.isEmpty() )
261261
{
262262
leGPXFile->setText( myFileNameQString );
@@ -313,7 +313,7 @@ void QgsGPSPluginGui::on_pbnIMPOutput_clicked()
313313
QFileDialog::getSaveFileName( this,
314314
tr( "Choose a file name to save under" ),
315315
dir,
316-
tr( "GPS eXchange format (*.gpx)" ) );
316+
tr( "GPS eXchange format" ) + " (*.gpx)" );
317317
if ( !myFileNameQString.isEmpty() )
318318
{
319319
if ( !myFileNameQString.toLower().endsWith( ".gpx" ) )
@@ -420,7 +420,7 @@ void QgsGPSPluginGui::on_pbnCONVOutput_clicked()
420420
QFileDialog::getSaveFileName( this,
421421
tr( "Choose a file name to save under" ),
422422
dir,
423-
tr( "GPS eXchange format (*.gpx)" ) );
423+
tr( "GPS eXchange format" ) + " (*.gpx)" );
424424
if ( !myFileNameQString.isEmpty() )
425425
{
426426
if ( !myFileNameQString.toLower().endsWith( ".gpx" ) )

‎src/plugins/offline_editing/offline_editing_plugin_gui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ void QgsOfflineEditingPluginGui::on_butBrowse_clicked()
9999
QString fileName = QFileDialog::getSaveFileName( this,
100100
tr( "Select target database for offline data" ),
101101
QDir( mOfflineDataPath ).absoluteFilePath( mOfflineDbFile ),
102-
tr( "SpatiaLite DB(*.sqlite);;All files(*.*)" )
103-
);
102+
tr( "SpatiaLite DB" ) + " (*.sqlite);;"
103+
tr( "All files" ) + " (*.*)" );
104104

105105
if ( !fileName.isEmpty() )
106106
{

‎src/plugins/spit/qgsspit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ void QgsSpit::addFile()
165165
QgsEncodingFileDialog dlg( this,
166166
tr( "Add Shapefiles" ),
167167
settings.value( "/Plugin-Spit/last_directory" ).toString(),
168-
tr( "Shapefiles (*.shp);;All files (*)" ),
168+
tr( "Shapefiles" ) + " (*.shp);;" + tr( "All files" ) + " (*)",
169169
settings.value( "/Plugin-Spit/last_encoding" ).toString() );
170170
dlg.setFileMode( QFileDialog::ExistingFiles );
171171

0 commit comments

Comments
 (0)
Please sign in to comment.