Skip to content

Commit dd2279c

Browse files
nyalldawsonnyalldawson
committedMay 28, 2018
More capitalization
·
ltr-3_40final-3_2_0
1 parent ec96956 commit dd2279c

17 files changed

+50
-50
lines changed
 

‎src/app/layout/qgslayoutlegendwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ QMenu *QgsLayoutLegendMenuProvider::createContextMenu()
11251125

11261126
if ( QgsLayerTree::isLayer( mView->currentNode() ) )
11271127
{
1128-
menu->addAction( QObject::tr( "Reset to defaults" ), mWidget, SLOT( resetLayerNodeToDefaults() ) );
1128+
menu->addAction( QObject::tr( "Reset to Defaults" ), mWidget, SLOT( resetLayerNodeToDefaults() ) );
11291129
menu->addSeparator();
11301130
}
11311131

‎src/app/qgsidentifyresultsdialog.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,19 +1065,19 @@ void QgsIdentifyResultsDialog::contextMenuEvent( QContextMenuEvent *event )
10651065
{
10661066
mActionPopup->addAction(
10671067
QgsApplication::getThemeIcon( QStringLiteral( "/mActionPropertyItem.svg" ) ),
1068-
vlayer->isEditable() ? tr( "Edit feature form" ) : tr( "View feature form" ),
1068+
vlayer->isEditable() ? tr( "Edit Feature Form…" ) : tr( "View Feature Form…" ),
10691069
this, SLOT( featureForm() ) );
10701070
}
10711071

10721072
if ( featItem->feature().isValid() )
10731073
{
1074-
mActionPopup->addAction( tr( "Zoom to feature" ), this, SLOT( zoomToFeature() ) );
1075-
mActionPopup->addAction( tr( "Copy feature" ), this, SLOT( copyFeature() ) );
1076-
mActionPopup->addAction( tr( "Toggle feature selection" ), this, SLOT( toggleFeatureSelection() ) );
1074+
mActionPopup->addAction( tr( "Zoom to Feature" ), this, SLOT( zoomToFeature() ) );
1075+
mActionPopup->addAction( tr( "Copy Feature" ), this, SLOT( copyFeature() ) );
1076+
mActionPopup->addAction( tr( "Toggle Feature Selection" ), this, SLOT( toggleFeatureSelection() ) );
10771077
}
10781078

1079-
mActionPopup->addAction( tr( "Copy attribute value" ), this, SLOT( copyAttributeValue() ) );
1080-
mActionPopup->addAction( tr( "Copy feature attributes" ), this, SLOT( copyFeatureAttributes() ) );
1079+
mActionPopup->addAction( tr( "Copy Attribute Value" ), this, SLOT( copyAttributeValue() ) );
1080+
mActionPopup->addAction( tr( "Copy Feature Attributes" ), this, SLOT( copyFeatureAttributes() ) );
10811081

10821082
if ( item->parent() == featItem && item->childCount() == 0 )
10831083
{
@@ -1098,18 +1098,18 @@ void QgsIdentifyResultsDialog::contextMenuEvent( QContextMenuEvent *event )
10981098
mActionPopup->addSeparator();
10991099
}
11001100

1101-
mActionPopup->addAction( tr( "Clear results" ), this, SLOT( clear() ) );
1102-
mActionPopup->addAction( tr( "Clear highlights" ), this, SLOT( clearHighlights() ) );
1103-
mActionPopup->addAction( tr( "Highlight all" ), this, SLOT( highlightAll() ) );
1104-
mActionPopup->addAction( tr( "Highlight layer" ), this, SLOT( highlightLayer() ) );
1101+
mActionPopup->addAction( tr( "Clear Results" ), this, SLOT( clear() ) );
1102+
mActionPopup->addAction( tr( "Clear Highlights" ), this, SLOT( clearHighlights() ) );
1103+
mActionPopup->addAction( tr( "Highlight All" ), this, SLOT( highlightAll() ) );
1104+
mActionPopup->addAction( tr( "Highlight Layer" ), this, SLOT( highlightLayer() ) );
11051105
if ( layer && QgsProject::instance()->layerIsEmbedded( layer->id() ).isEmpty() )
11061106
{
1107-
mActionPopup->addAction( tr( "Activate layer" ), this, SLOT( activateLayer() ) );
1108-
mActionPopup->addAction( tr( "Layer properties…" ), this, SLOT( layerProperties() ) );
1107+
mActionPopup->addAction( tr( "Activate Layer" ), this, SLOT( activateLayer() ) );
1108+
mActionPopup->addAction( tr( "Layer Properties…" ), this, SLOT( layerProperties() ) );
11091109
}
11101110
mActionPopup->addSeparator();
1111-
mActionPopup->addAction( tr( "Expand all" ), this, SLOT( expandAll() ) );
1112-
mActionPopup->addAction( tr( "Collapse all" ), this, SLOT( collapseAll() ) );
1111+
mActionPopup->addAction( tr( "Expand All" ), this, SLOT( expandAll() ) );
1112+
mActionPopup->addAction( tr( "Collapse All" ), this, SLOT( collapseAll() ) );
11131113
mActionPopup->addSeparator();
11141114

11151115
if ( featItem && vlayer )

‎src/app/qgssnappingwidget.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
101101
mModeButton = new QToolButton();
102102
mModeButton->setToolTip( tr( "Snapping Mode" ) );
103103
mModeButton->setPopupMode( QToolButton::InstantPopup );
104-
QMenu *modeMenu = new QMenu( tr( "Set snapping mode" ), this );
105-
mAllLayersAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingAllLayers.svg" ) ), tr( "All layers" ), modeMenu );
106-
mActiveLayerAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingActiveLayer.svg" ) ), tr( "Active layer" ), modeMenu );
107-
mAdvancedModeAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingAdvanced.svg" ) ), tr( "Advanced configuration" ), modeMenu );
104+
QMenu *modeMenu = new QMenu( tr( "Set Snapping Mode" ), this );
105+
mAllLayersAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingAllLayers.svg" ) ), tr( "All Layers" ), modeMenu );
106+
mActiveLayerAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingActiveLayer.svg" ) ), tr( "Active Layer" ), modeMenu );
107+
mAdvancedModeAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingAdvanced.svg" ) ), tr( "Advanced Configuration" ), modeMenu );
108108
modeMenu->addAction( mAllLayersAction );
109109
modeMenu->addAction( mActiveLayerAction );
110110
modeMenu->addAction( mAdvancedModeAction );
@@ -127,9 +127,9 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
127127
mTypeButton = new QToolButton();
128128
mTypeButton->setToolTip( tr( "Snapping Type" ) );
129129
mTypeButton->setPopupMode( QToolButton::InstantPopup );
130-
QMenu *typeMenu = new QMenu( tr( "Set snapping mode" ), this );
130+
QMenu *typeMenu = new QMenu( tr( "Set Snapping Mode" ), this );
131131
mVertexAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingVertex.svg" ) ), tr( "Vertex" ), typeMenu );
132-
mVertexAndSegmentAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingVertexAndSegment.svg" ) ), tr( "Vertex and segment" ), typeMenu );
132+
mVertexAndSegmentAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingVertexAndSegment.svg" ) ), tr( "Vertex and Segment" ), typeMenu );
133133
mSegmentAction = new QAction( QIcon( QgsApplication::getThemeIcon( "/mIconSnappingSegment.svg" ) ), tr( "Segment" ), typeMenu );
134134
typeMenu->addAction( mVertexAction );
135135
typeMenu->addAction( mVertexAndSegmentAction );

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
190190
{
191191
//for loading
192192
mLoadStyleMenu = new QMenu( this );
193-
mLoadStyleMenu->addAction( tr( "Load from file…" ) );
194-
mLoadStyleMenu->addAction( tr( "Database styles manager" ) );
193+
mLoadStyleMenu->addAction( tr( "Load from File…" ) );
194+
mLoadStyleMenu->addAction( tr( "Database Styles Manager…" ) );
195195
//mActionLoadStyle->setContextMenuPolicy( Qt::PreventContextMenu );
196196
mActionLoadStyle->setMenu( mLoadStyleMenu );
197197

@@ -206,7 +206,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
206206
if ( providerName == QLatin1String( "GPKG" ) )
207207
providerName = QStringLiteral( "GeoPackage" );
208208
}
209-
mSaveAsMenu->addAction( tr( "Save in database (%1)" ).arg( providerName ) );
209+
mSaveAsMenu->addAction( tr( "Save in Database (%1)" ).arg( providerName ) );
210210
}
211211

212212
connect( mSaveAsMenu, &QMenu::triggered,

‎src/gui/editorwidgets/qgsmultiedittoolbutton.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ void QgsMultiEditToolButton::aboutToShowMenu()
4343
{
4444
case Default:
4545
{
46-
QAction *noAction = mMenu->addAction( tr( "No changes to commit" ) );
46+
QAction *noAction = mMenu->addAction( tr( "No Changes to Commit" ) );
4747
noAction->setEnabled( false );
4848
break;
4949
}
5050
case MixedValues:
5151
{
52-
QString title = !mField.name().isEmpty() ? tr( "Set %1 for all selected features" ).arg( mField.name() )
52+
QString title = !mField.name().isEmpty() ? tr( "Set %1 for All Selected Features" ).arg( mField.name() )
5353
: tr( "Set field for all selected features" );
5454
QAction *setFieldAction = mMenu->addAction( title );
5555
connect( setFieldAction, &QAction::triggered, this, &QgsMultiEditToolButton::setFieldTriggered );
5656
break;
5757
}
5858
case Changed:
5959
{
60-
QAction *resetFieldAction = mMenu->addAction( tr( "Reset to original values" ) );
60+
QAction *resetFieldAction = mMenu->addAction( tr( "Reset to Original Values" ) );
6161
connect( resetFieldAction, &QAction::triggered, this, &QgsMultiEditToolButton::resetFieldTriggered );
6262
break;
6363
}

‎src/gui/editorwidgets/qgssearchwidgettoolbutton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ void QgsSearchWidgetToolButton::aboutToShowMenu()
144144
}
145145
}
146146

147-
QAction *clearAction = mMenu->addAction( tr( "Exclude field" ) );
147+
QAction *clearAction = mMenu->addAction( tr( "Exclude Field" ) );
148148
connect( clearAction, &QAction::triggered, this, &QgsSearchWidgetToolButton::setInactive );
149149
clearAction->setCheckable( true );
150150
clearAction->setChecked( !fieldActive );

‎src/gui/qgscheckablecombobox.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ QgsCheckableComboBox::QgsCheckableComboBox( QWidget *parent )
8585
setLineEdit( lineEdit );
8686

8787
mContextMenu = new QMenu( this );
88-
mSelectAllAction = mContextMenu->addAction( tr( "Select all" ) );
89-
mDeselectAllAction = mContextMenu->addAction( tr( "Deselect all" ) );
88+
mSelectAllAction = mContextMenu->addAction( tr( "Select All" ) );
89+
mDeselectAllAction = mContextMenu->addAction( tr( "Deselect All" ) );
9090
connect( mSelectAllAction, &QAction::triggered, this, &QgsCheckableComboBox::selectAllOptions );
9191
connect( mDeselectAllAction, &QAction::triggered, this, &QgsCheckableComboBox::deselectAllOptions );
9292

‎src/gui/qgsexpressionbuilderwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,8 +967,8 @@ void QgsExpressionBuilderWidget::showContextMenu( QPoint pt )
967967
if ( item->getItemType() == QgsExpressionItem::Field && mLayer )
968968
{
969969
QMenu *menu = new QMenu( this );
970-
menu->addAction( tr( "Load top 10 unique values" ), this, SLOT( loadSampleValues() ) );
971-
menu->addAction( tr( "Load all unique values" ), this, SLOT( loadAllValues() ) );
970+
menu->addAction( tr( "Load First 10 Unique Values" ), this, SLOT( loadSampleValues() ) );
971+
menu->addAction( tr( "Load All Unique Values" ), this, SLOT( loadAllValues() ) );
972972
menu->popup( expressionTree->mapToGlobal( pt ) );
973973
}
974974
}

‎src/gui/qgsfontbutton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ void QgsFontButton::prepareMenu()
540540
sizeWidget->setFocusPolicy( Qt::StrongFocus );
541541
mMenu->addAction( sizeAction );
542542

543-
QMenu *recentFontMenu = new QMenu( tr( "Recent fonts" ), mMenu );
543+
QMenu *recentFontMenu = new QMenu( tr( "Recent Fonts" ), mMenu );
544544
Q_FOREACH ( const QString &family, QgsFontUtils::recentFontFamilies() )
545545
{
546546
QAction *fontAction = new QAction( family, recentFontMenu );

‎src/gui/qgspropertyoverridebutton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ void QgsPropertyOverrideButton::aboutToShowMenu()
368368
bool fieldActive = false;
369369
if ( !mDataTypesString.isEmpty() )
370370
{
371-
QAction *fieldTitleAct = mDefineMenu->addAction( tr( "Attribute field" ) );
371+
QAction *fieldTitleAct = mDefineMenu->addAction( tr( "Attribute Field" ) );
372372
fieldTitleAct->setFont( titlefont );
373373
fieldTitleAct->setEnabled( false );
374374

‎src/gui/qgsrelationeditorwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,10 +688,10 @@ void QgsRelationEditorWidget::showContextMenu( QgsActionMenu *menu, const QgsFea
688688
{
689689
QAction *qAction = nullptr;
690690

691-
qAction = menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionDeleteSelected.svg" ) ), tr( "Delete feature" ) );
691+
qAction = menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionDeleteSelected.svg" ) ), tr( "Delete Feature" ) );
692692
connect( qAction, &QAction::triggered, this, [this, fid]() { deleteFeature( fid ); } );
693693

694-
qAction = menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionUnlink.svg" ) ), tr( "Unlink feature" ) );
694+
qAction = menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionUnlink.svg" ) ), tr( "Unlink Feature" ) );
695695
connect( qAction, &QAction::triggered, this, [this, fid]() { unlinkFeature( fid ); } );
696696
}
697697
}

‎src/gui/raster/qgspalettedrendererwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ QgsPalettedRendererWidget::QgsPalettedRendererWidget( QgsRasterLayer *layer, con
4545
mContextMenu->addAction( tr( "Change Opacity…" ), this, SLOT( changeOpacity() ) );
4646
mContextMenu->addAction( tr( "Change Label…" ), this, SLOT( changeLabel() ) );
4747

48-
mAdvancedMenu = new QMenu( tr( "Advanced options" ), this );
48+
mAdvancedMenu = new QMenu( tr( "Advanced Options" ), this );
4949
QAction *mLoadFromLayerAction = mAdvancedMenu->addAction( tr( "Load Classes from Layer" ) );
5050
connect( mLoadFromLayerAction, &QAction::triggered, this, &QgsPalettedRendererWidget::loadFromLayer );
5151
QAction *loadFromFile = mAdvancedMenu->addAction( tr( "Load Color Map from File…" ) );

‎src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,12 +463,12 @@ QgsCategorizedSymbolRendererWidget::QgsCategorizedSymbolRendererWidget( QgsVecto
463463
// menus for data-defined rotation/size
464464
QMenu *advMenu = new QMenu;
465465

466-
advMenu->addAction( tr( "Match to saved symbols" ), this, SLOT( matchToSymbolsFromLibrary() ) );
467-
advMenu->addAction( tr( "Match to symbols from file…" ), this, SLOT( matchToSymbolsFromXml() ) );
468-
advMenu->addAction( tr( "Symbol levels…" ), this, SLOT( showSymbolLevels() ) );
466+
advMenu->addAction( tr( "Match to Saved Symbols" ), this, SLOT( matchToSymbolsFromLibrary() ) );
467+
advMenu->addAction( tr( "Match to Symbols from File…" ), this, SLOT( matchToSymbolsFromXml() ) );
468+
advMenu->addAction( tr( "Symbol Levels…" ), this, SLOT( showSymbolLevels() ) );
469469
if ( mCategorizedSymbol->type() == QgsSymbol::Marker )
470470
{
471-
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined size legend…" ) );
471+
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined Size Legend…" ) );
472472
// only from Qt 5.6 there is convenience addAction() with new style connection
473473
connect( actionDdsLegend, &QAction::triggered, this, &QgsCategorizedSymbolRendererWidget::dataDefinedSizeLegend );
474474
}

‎src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,10 @@ QgsGraduatedSymbolRendererWidget::QgsGraduatedSymbolRendererWidget( QgsVectorLay
524524
// menus for data-defined rotation/size
525525
QMenu *advMenu = new QMenu( this );
526526

527-
advMenu->addAction( tr( "Symbol levels…" ), this, SLOT( showSymbolLevels() ) );
527+
advMenu->addAction( tr( "Symbol Levels…" ), this, SLOT( showSymbolLevels() ) );
528528
if ( mGraduatedSymbol->type() == QgsSymbol::Marker )
529529
{
530-
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined size legend…" ) );
530+
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined Size Legend…" ) );
531531
// only from Qt 5.6 there is convenience addAction() with new style connection
532532
connect( actionDdsLegend, &QAction::triggered, this, &QgsGraduatedSymbolRendererWidget::dataDefinedSizeLegend );
533533
}

‎src/gui/symbology/qgsrulebasedrendererwidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ QgsRuleBasedRendererWidget::QgsRuleBasedRendererWidget( QgsVectorLayer *layer, Q
8484
viewRules->addAction( mCopyAction );
8585
viewRules->addAction( mPasteAction );
8686

87-
mRefineMenu = new QMenu( tr( "Refine current rule" ), btnRefineRule );
88-
mRefineMenu->addAction( tr( "Add scales to rule" ), this, SLOT( refineRuleScales() ) );
89-
mRefineMenu->addAction( tr( "Add categories to rule" ), this, SLOT( refineRuleCategories() ) );
90-
mRefineMenu->addAction( tr( "Add ranges to rule" ), this, SLOT( refineRuleRanges() ) );
87+
mRefineMenu = new QMenu( tr( "Refine Current Rule" ), btnRefineRule );
88+
mRefineMenu->addAction( tr( "Add Scales to Rule" ), this, SLOT( refineRuleScales() ) );
89+
mRefineMenu->addAction( tr( "Add Categories to Rule" ), this, SLOT( refineRuleCategories() ) );
90+
mRefineMenu->addAction( tr( "Add Ranges to Rule" ), this, SLOT( refineRuleRanges() ) );
9191
btnRefineRule->setMenu( mRefineMenu );
9292
contextMenu->addMenu( mRefineMenu );
9393

‎src/gui/symbology/qgssinglesymbolrendererwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ QgsSingleSymbolRendererWidget::QgsSingleSymbolRendererWidget( QgsVectorLayer *la
6565
// advanced actions - data defined rendering
6666
QMenu *advMenu = mSelector->advancedMenu();
6767

68-
QAction *actionLevels = advMenu->addAction( tr( "Symbol levels…" ) );
68+
QAction *actionLevels = advMenu->addAction( tr( "Symbol Levels…" ) );
6969
connect( actionLevels, &QAction::triggered, this, &QgsSingleSymbolRendererWidget::showSymbolLevels );
7070
if ( mSingleSymbol->type() == QgsSymbol::Marker )
7171
{
72-
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined size legend…" ) );
72+
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined Size Legend…" ) );
7373
// only from Qt 5.6 there is convenience addAction() with new style connection
7474
connect( actionDdsLegend, &QAction::triggered, this, &QgsSingleSymbolRendererWidget::dataDefinedSizeLegend );
7575
}

‎src/gui/symbology/qgsstylemanagerdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ QgsStyleManagerDialog::QgsStyleManagerDialog( QgsStyle *style, QWidget *parent )
124124
connect( groupModel, &QStandardItemModel::itemChanged,
125125
this, &QgsStyleManagerDialog::groupRenamed );
126126

127-
QMenu *groupMenu = new QMenu( tr( "Group actions" ), this );
127+
QMenu *groupMenu = new QMenu( tr( "Group Actions" ), this );
128128
connect( actnTagSymbols, &QAction::triggered, this, &QgsStyleManagerDialog::tagSymbolsAction );
129129
groupMenu->addAction( actnTagSymbols );
130130
connect( actnFinishTagging, &QAction::triggered, this, &QgsStyleManagerDialog::tagSymbolsAction );

0 commit comments

Comments
 (0)
Please sign in to comment.