Skip to content

Commit ce92ff6

Browse files
nyalldawsonnyalldawson
authored
Merge pull request #4938 from SrNetoChan/dialog_titles_2
More work on titles capitalization
2 parents 7f1bb72 + 5281a36 commit ce92ff6

32 files changed

+81
-81
lines changed

‎src/app/composer/qgscomposerarrowwidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ QgsComposerArrowWidget::QgsComposerArrowWidget( QgsComposerArrow *arrow ): QgsCo
4242
QgsComposerItemWidget *itemPropertiesWidget = new QgsComposerItemWidget( this, mArrow );
4343
mainLayout->addWidget( itemPropertiesWidget );
4444

45-
mArrowHeadStrokeColorButton->setColorDialogTitle( tr( "Select arrow head stroke color" ) );
45+
mArrowHeadStrokeColorButton->setColorDialogTitle( tr( "Select Arrow Head Stroke Color" ) );
4646
mArrowHeadStrokeColorButton->setAllowOpacity( true );
4747
mArrowHeadStrokeColorButton->setContext( QStringLiteral( "composer" ) );
4848
mArrowHeadStrokeColorButton->setNoColorString( tr( "Transparent stroke" ) );
4949
mArrowHeadStrokeColorButton->setShowNoColor( true );
50-
mArrowHeadFillColorButton->setColorDialogTitle( tr( "Select arrow head fill color" ) );
50+
mArrowHeadFillColorButton->setColorDialogTitle( tr( "Select Arrow Head Fill Color" ) );
5151
mArrowHeadFillColorButton->setAllowOpacity( true );
5252
mArrowHeadFillColorButton->setContext( QStringLiteral( "composer" ) );
5353
mArrowHeadFillColorButton->setNoColorString( tr( "Transparent fill" ) );

‎src/app/composer/qgscomposerattributetablewidget.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@ QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAtt
7070
mComposerMapComboBox->setItemType( QgsComposerItem::ComposerMap );
7171
connect( mComposerMapComboBox, &QgsComposerItemComboBox::itemChanged, this, &QgsComposerAttributeTableWidget::composerMapChanged );
7272

73-
mHeaderFontColorButton->setColorDialogTitle( tr( "Select header font color" ) );
73+
mHeaderFontColorButton->setColorDialogTitle( tr( "Select Header Font Color" ) );
7474
mHeaderFontColorButton->setAllowOpacity( true );
7575
mHeaderFontColorButton->setContext( QStringLiteral( "composer" ) );
76-
mContentFontColorButton->setColorDialogTitle( tr( "Select content font color" ) );
76+
mContentFontColorButton->setColorDialogTitle( tr( "Select Content Font Color" ) );
7777
mContentFontColorButton->setAllowOpacity( true );
7878
mContentFontColorButton->setContext( QStringLiteral( "composer" ) );
79-
mGridColorButton->setColorDialogTitle( tr( "Select grid color" ) );
79+
mGridColorButton->setColorDialogTitle( tr( "Select Grid Color" ) );
8080
mGridColorButton->setAllowOpacity( true );
8181
mGridColorButton->setContext( QStringLiteral( "composer" ) );
8282
mGridColorButton->setDefaultColor( Qt::black );
83-
mBackgroundColorButton->setColorDialogTitle( tr( "Select background color" ) );
83+
mBackgroundColorButton->setColorDialogTitle( tr( "Select Background Color" ) );
8484
mBackgroundColorButton->setAllowOpacity( true );
8585
mBackgroundColorButton->setContext( QStringLiteral( "composer" ) );
8686
mBackgroundColorButton->setShowNoColor( true );

‎src/app/composer/qgscomposeritemwidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,10 +566,10 @@ void QgsComposerItemWidget::setValuesForGuiElements()
566566
return;
567567
}
568568

569-
mBackgroundColorButton->setColorDialogTitle( tr( "Select background color" ) );
569+
mBackgroundColorButton->setColorDialogTitle( tr( "Select Background Color" ) );
570570
mBackgroundColorButton->setAllowOpacity( true );
571571
mBackgroundColorButton->setContext( QStringLiteral( "composer" ) );
572-
mFrameColorButton->setColorDialogTitle( tr( "Select frame color" ) );
572+
mFrameColorButton->setColorDialogTitle( tr( "Select Frame Color" ) );
573573
mFrameColorButton->setAllowOpacity( true );
574574
mFrameColorButton->setContext( QStringLiteral( "composer" ) );
575575

‎src/app/composer/qgscomposerlabelwidget.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel *label ): QgsCo
3737
QgsComposerItemWidget *itemPropertiesWidget = new QgsComposerItemWidget( this, label );
3838
mainLayout->addWidget( itemPropertiesWidget );
3939

40-
mFontColorButton->setColorDialogTitle( tr( "Select font color" ) );
40+
mFontColorButton->setColorDialogTitle( tr( "Select Font Color" ) );
4141
mFontColorButton->setContext( QStringLiteral( "composer" ) );
4242

4343
mMarginXDoubleSpinBox->setClearValue( 0.0 );

‎src/app/composer/qgscomposerlegendwidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend *legend )
7676
mMoveDownToolButton->setIcon( QIcon( QgsApplication::iconPath( "mActionArrowDown.svg" ) ) );
7777
mCountToolButton->setIcon( QIcon( QgsApplication::iconPath( "mActionSum.svg" ) ) );
7878

79-
mFontColorButton->setColorDialogTitle( tr( "Select font color" ) );
79+
mFontColorButton->setColorDialogTitle( tr( "Select Font Color" ) );
8080
mFontColorButton->setContext( QStringLiteral( "composer" ) );
8181

82-
mRasterStrokeColorButton->setColorDialogTitle( tr( "Select stroke color" ) );
82+
mRasterStrokeColorButton->setColorDialogTitle( tr( "Select Stroke Color" ) );
8383
mRasterStrokeColorButton->setAllowOpacity( true );
8484
mRasterStrokeColorButton->setContext( QStringLiteral( "composer " ) );
8585

‎src/app/composer/qgscomposermapgridwidget.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ QgsComposerMapGridWidget::QgsComposerMapGridWidget( QgsComposerMapGrid *mapGrid,
5959
mAnnotationFormatComboBox->addItem( tr( "Degree, minute, second aligned" ), QgsComposerMapGrid::DegreeMinuteSecondPadded );
6060
mAnnotationFormatComboBox->addItem( tr( "Custom" ), QgsComposerMapGrid::CustomFormat );
6161

62-
mAnnotationFontColorButton->setColorDialogTitle( tr( "Select font color" ) );
62+
mAnnotationFontColorButton->setColorDialogTitle( tr( "Select Font Color" ) );
6363
mAnnotationFontColorButton->setAllowOpacity( true );
6464
mAnnotationFontColorButton->setContext( QStringLiteral( "composer" ) );
6565

@@ -78,19 +78,19 @@ QgsComposerMapGridWidget::QgsComposerMapGridWidget( QgsComposerMapGrid *mapGrid,
7878
insertAnnotationDirectionEntries( mAnnotationDirectionComboBoxTop );
7979
insertAnnotationDirectionEntries( mAnnotationDirectionComboBoxBottom );
8080

81-
mGridFramePenColorButton->setColorDialogTitle( tr( "Select grid frame color" ) );
81+
mGridFramePenColorButton->setColorDialogTitle( tr( "Select Grid Frame Color" ) );
8282
mGridFramePenColorButton->setAllowOpacity( true );
8383
mGridFramePenColorButton->setContext( QStringLiteral( "composer" ) );
8484
mGridFramePenColorButton->setNoColorString( tr( "Transparent frame" ) );
8585
mGridFramePenColorButton->setShowNoColor( true );
8686

87-
mGridFrameFill1ColorButton->setColorDialogTitle( tr( "Select grid frame fill color" ) );
87+
mGridFrameFill1ColorButton->setColorDialogTitle( tr( "Select Grid Frame Fill Color" ) );
8888
mGridFrameFill1ColorButton->setAllowOpacity( true );
8989
mGridFrameFill1ColorButton->setContext( QStringLiteral( "composer" ) );
9090
mGridFrameFill1ColorButton->setNoColorString( tr( "Transparent fill" ) );
9191
mGridFrameFill1ColorButton->setShowNoColor( true );
9292

93-
mGridFrameFill2ColorButton->setColorDialogTitle( tr( "Select grid frame fill color" ) );
93+
mGridFrameFill2ColorButton->setColorDialogTitle( tr( "Select Grid Frame Fill Color" ) );
9494
mGridFrameFill2ColorButton->setAllowOpacity( true );
9595
mGridFrameFill2ColorButton->setContext( QStringLiteral( "composer" ) );
9696
mGridFrameFill2ColorButton->setNoColorString( tr( "Transparent fill" ) );

‎src/app/composer/qgscomposerpicturewidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture *picture
4040
setPanelTitle( tr( "Picture properties" ) );
4141

4242
mFillColorButton->setAllowOpacity( true );
43-
mFillColorButton->setColorDialogTitle( tr( "Select fill color" ) );
43+
mFillColorButton->setColorDialogTitle( tr( "Select Fill Color" ) );
4444
mFillColorButton->setContext( QStringLiteral( "composer" ) );
4545
mStrokeColorButton->setAllowOpacity( true );
46-
mStrokeColorButton->setColorDialogTitle( tr( "Select stroke color" ) );
46+
mStrokeColorButton->setColorDialogTitle( tr( "Select Stroke Color" ) );
4747
mStrokeColorButton->setContext( QStringLiteral( "composer" ) );
4848

4949
mNorthTypeComboBox->blockSignals( true );

‎src/app/composer/qgscomposerscalebarwidget.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,23 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar *scale
6262
mUnitsComboBox->insertItem( 2, tr( "Feet" ), QgsUnitTypes::DistanceFeet );
6363
mUnitsComboBox->insertItem( 3, tr( "Nautical Miles" ), QgsUnitTypes::DistanceNauticalMiles );
6464

65-
mFillColorButton->setColorDialogTitle( tr( "Select fill color" ) );
65+
mFillColorButton->setColorDialogTitle( tr( "Select Fill Color" ) );
6666
mFillColorButton->setAllowOpacity( true );
6767
mFillColorButton->setContext( QStringLiteral( "composer" ) );
68-
mFillColorButton->setNoColorString( tr( "Transparent fill" ) );
68+
mFillColorButton->setNoColorString( tr( "Transparent Fill" ) );
6969
mFillColorButton->setShowNoColor( true );
7070

71-
mFillColor2Button->setColorDialogTitle( tr( "Select alternate fill color" ) );
71+
mFillColor2Button->setColorDialogTitle( tr( "Select Alternate Fill Color" ) );
7272
mFillColor2Button->setAllowOpacity( true );
7373
mFillColor2Button->setContext( QStringLiteral( "composer" ) );
7474
mFillColor2Button->setNoColorString( tr( "Transparent fill" ) );
7575
mFillColor2Button->setShowNoColor( true );
7676

77-
mFontColorButton->setColorDialogTitle( tr( "Select font color" ) );
77+
mFontColorButton->setColorDialogTitle( tr( "Select Font Color" ) );
7878
mFontColorButton->setAllowOpacity( true );
7979
mFontColorButton->setContext( QStringLiteral( "composer" ) );
8080

81-
mStrokeColorButton->setColorDialogTitle( tr( "Select line color" ) );
81+
mStrokeColorButton->setColorDialogTitle( tr( "Select Line Color" ) );
8282
mStrokeColorButton->setAllowOpacity( true );
8383
mStrokeColorButton->setContext( QStringLiteral( "composer" ) );
8484
mStrokeColorButton->setNoColorString( tr( "Transparent line" ) );

‎src/app/composer/qgscomposertablebackgroundcolorsdialog.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ void QgsComposerTableBackgroundColorsDialog::setGuiElementValues()
120120
button->setEnabled( mComposerTable->cellStyle( styleGroup )->enabled );
121121
button->setColor( mComposerTable->cellStyle( styleGroup )->cellBackgroundColor );
122122
button->setAllowOpacity( true );
123-
button->setColorDialogTitle( tr( "Select background color" ) );
123+
button->setColorDialogTitle( tr( "Select Background Color" ) );
124124
}
125125

126126
mDefaultColorButton->setColor( mComposerTable->backgroundColor() );
127127
mDefaultColorButton->setAllowOpacity( true );
128-
mDefaultColorButton->setColorDialogTitle( tr( "Select background color" ) );
128+
mDefaultColorButton->setColorDialogTitle( tr( "Select Background Color" ) );
129129
mDefaultColorButton->setShowNoColor( true );
130130
mDefaultColorButton->setNoColorString( tr( "No background" ) );
131131
}

‎src/app/qgsdecorationcopyrightdialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ QgsDecorationCopyrightDialog::QgsDecorationCopyrightDialog( QgsDecorationCopyrig
5353
pbnColorChooser->setAllowOpacity( true );
5454
pbnColorChooser->setColor( mDeco.mColor );
5555
pbnColorChooser->setContext( QStringLiteral( "gui" ) );
56-
pbnColorChooser->setColorDialogTitle( tr( "Select text color" ) );
56+
pbnColorChooser->setColorDialogTitle( tr( "Select Text color" ) );
5757

5858
QTextCursor cursor = txtCopyrightText->textCursor();
5959
txtCopyrightText->selectAll();

0 commit comments

Comments
 (0)