Skip to content

Commit ce4a251

Browse files
nyalldawsonnyalldawson
authoredJul 26, 2017
Merge pull request #4924 from SrNetoChan/dialog_titles
Making dialog titles use Book Style Capitalization [needs-docs]
2 parents a3af69a + 8d4dec5 commit ce4a251

File tree

106 files changed

+139
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+139
-139
lines changed
 

‎src/app/composer/qgsatlascompositionwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenameExpressionButton_clicked()
131131

132132
QgsExpressionContext context = mComposition->createExpressionContext();
133133
QgsExpressionBuilderDialog exprDlg( atlasMap->coverageLayer(), mAtlasFilenamePatternEdit->text(), this, QStringLiteral( "generic" ), context );
134-
exprDlg.setWindowTitle( tr( "Expression based filename" ) );
134+
exprDlg.setWindowTitle( tr( "Expression Based Filename" ) );
135135

136136
if ( exprDlg.exec() == QDialog::Accepted )
137137
{
@@ -304,7 +304,7 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterButton_clicked()
304304

305305
QgsExpressionContext context = mComposition->createExpressionContext();
306306
QgsExpressionBuilderDialog exprDlg( vl, mAtlasFeatureFilterEdit->text(), this, QStringLiteral( "generic" ), context );
307-
exprDlg.setWindowTitle( tr( "Expression based filter" ) );
307+
exprDlg.setWindowTitle( tr( "Expression Based Filter" ) );
308308

309309
if ( exprDlg.exec() == QDialog::Accepted )
310310
{

‎src/app/composer/qgscomposer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,7 +1695,7 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
16951695
}
16961696

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

17011701
for ( int featureI = 0; featureI < atlasMap->numFeatures(); ++featureI )
@@ -1862,7 +1862,7 @@ void QgsComposer::printComposition( QgsComposer::OutputMode mode )
18621862
return;
18631863
}
18641864
QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
1865-
progress.setWindowTitle( tr( "Exporting atlas" ) );
1865+
progress.setWindowTitle( tr( "Exporting Atlas" ) );
18661866

18671867
for ( int i = 0; i < atlasMap->numFeatures(); ++i )
18681868
{
@@ -2194,7 +2194,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
21942194
}
21952195

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

21992199
for ( int feature = 0; feature < atlasMap->numFeatures(); ++feature )
22002200
{
@@ -2383,7 +2383,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
23832383
if ( displaySVGWarning )
23842384
{
23852385
QgsMessageViewer *m = new QgsMessageViewer( this );
2386-
m->setWindowTitle( tr( "SVG warning" ) );
2386+
m->setWindowTitle( tr( "SVG Warning" ) );
23872387
m->setCheckBoxText( tr( "Don't show this message again" ) );
23882388
m->setCheckBoxState( Qt::Unchecked );
23892389
m->setCheckBoxVisible( true );
@@ -2541,7 +2541,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
25412541
}
25422542
}
25432543
QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
2544-
progress.setWindowTitle( tr( "Exporting atlas" ) );
2544+
progress.setWindowTitle( tr( "Exporting Atlas" ) );
25452545

25462546
do
25472547
{
@@ -3429,7 +3429,7 @@ void QgsComposer::showWmsPrintingWarning()
34293429
if ( displayWMSWarning )
34303430
{
34313431
QgsMessageViewer *m = new QgsMessageViewer( this );
3432-
m->setWindowTitle( tr( "Project contains WMS layers" ) );
3432+
m->setWindowTitle( tr( "Project Contains WMS Layers" ) );
34333433
m->setMessage( tr( "Some WMS servers (e.g. UMN mapserver) have a limit for the WIDTH and HEIGHT parameter. Printing layers from such servers may exceed this limit. If this is the case, the WMS layer will not be printed" ), QgsMessageOutput::MessageText );
34343434
m->setCheckBoxText( tr( "Don't show this message again" ) );
34353435
m->setCheckBoxState( Qt::Unchecked );
@@ -3444,7 +3444,7 @@ void QgsComposer::showAdvancedEffectsWarning()
34443444
if ( ! mComposition->printAsRaster() )
34453445
{
34463446
QgsMessageViewer *m = new QgsMessageViewer( this, QgsGuiUtils::ModalDialogFlags, false );
3447-
m->setWindowTitle( tr( "Project contains composition effects" ) );
3447+
m->setWindowTitle( tr( "Project Contains Composition Effects" ) );
34483448
m->setMessage( tr( "Advanced composition effects such as blend modes or vector layer transparency are enabled in this project, which cannot be printed as vectors. Printing as a raster is recommended." ), QgsMessageOutput::MessageText );
34493449
m->setCheckBoxText( tr( "Print as raster" ) );
34503450
m->setCheckBoxState( Qt::Checked );

0 commit comments

Comments
 (0)