Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Avoid some ugly qgis-dev-bin window titles
  • Loading branch information
nyalldawson committed May 7, 2015
1 parent 1ff6b27 commit d424841
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/app/composer/qgscomposer.cpp
Expand Up @@ -1588,6 +1588,7 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
}

QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
progress.setWindowTitle( tr( "Exporting atlas" ) );
QApplication::setOverrideCursor( Qt::BusyCursor );

for ( int featureI = 0; featureI < atlasMap->numFeatures(); ++featureI )
Expand Down Expand Up @@ -1749,6 +1750,7 @@ void QgsComposer::printComposition( QgsComposer::OutputMode mode )
return;
}
QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
progress.setWindowTitle( tr( "Exporting atlas" ) );

for ( int i = 0; i < atlasMap->numFeatures(); ++i )
{
Expand Down Expand Up @@ -2016,6 +2018,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
}

QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
progress.setWindowTitle( tr( "Exporting atlas" ) );

for ( int feature = 0; feature < atlasMap->numFeatures(); ++feature )
{
Expand Down Expand Up @@ -2290,6 +2293,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
}
}
QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
progress.setWindowTitle( tr( "Exporting atlas" ) );

do
{
Expand Down
1 change: 1 addition & 0 deletions src/app/qgisapp.cpp
Expand Up @@ -5090,6 +5090,7 @@ void QgisApp::saveAsRasterFile()
QProgressDialog pd( 0, tr( "Abort..." ), 0, 0 );
// Show the dialo immediately because cloning pipe can take some time (WCS)
pd.setLabelText( tr( "Reading raster" ) );
pd.setWindowTitle( tr( "Saving raster" ) );
pd.show();
pd.setWindowModality( Qt::WindowModal );

Expand Down
1 change: 1 addition & 0 deletions src/core/qgsvectorlayer.cpp
Expand Up @@ -773,6 +773,7 @@ bool QgsVectorLayer::countSymbolFeatures( bool showProgress )

long nFeatures = pendingFeatureCount();
QProgressDialog progressDialog( tr( "Updating feature count for layer %1" ).arg( name() ), tr( "Abort" ), 0, nFeatures );
progressDialog.setWindowTitle( tr( "QGIS" ) );
progressDialog.setWindowModality( Qt::WindowModal );
int featuresCounted = 0;

Expand Down
3 changes: 2 additions & 1 deletion src/plugins/heatmap/heatmap.cpp
Expand Up @@ -225,7 +225,8 @@ void Heatmap::run()
int totalFeatures = inputLayer->featureCount();
int counter = 0;

QProgressDialog p( tr( "Creating heatmap" ), tr( "Abort" ), 0, totalFeatures, mQGisIface->mainWindow() );
QProgressDialog p( tr( "Rendering heatmap..." ), tr( "Abort" ), 0, totalFeatures, mQGisIface->mainWindow() );
progressDialog.setWindowTitle( tr( "QGIS" ) );
p.setWindowModality( Qt::ApplicationModal );
p.show();

Expand Down

0 comments on commit d424841

Please sign in to comment.