Skip to content

/ QGIS

Permalink
Browse files
Capitalization
  • Loading branch information
@nyalldawson
nyalldawson committed Oct 4, 2018
1 parent 9d2c3af commit cc4e2ab842dd1fbaabc1a3abe7aacc5aabb77744
2 src/app/layout/qgslayoutattributetablewidget.cpp
View file
@@ -115,7 +115,7 @@ QgsLayoutAttributeTableWidget::QgsLayoutAttributeTableWidget( QgsLayoutFrame *fr
mBackgroundColorButton->setAllowOpacity( true );
mBackgroundColorButton->setContext( QStringLiteral( "composer" ) );
mBackgroundColorButton->setShowNoColor( true );
mBackgroundColorButton->setNoColorString( tr( "No background" ) );
mBackgroundColorButton->setNoColorString( tr( "No Background" ) );

updateGuiElements();

6 src/app/layout/qgslayoutmapgridwidget.cpp
View file
@@ -123,19 +123,19 @@ QgsLayoutMapGridWidget::QgsLayoutMapGridWidget( QgsLayoutItemMapGrid *mapGrid, Q
mGridFramePenColorButton->setColorDialogTitle( tr( "Select Grid Frame Color" ) );
mGridFramePenColorButton->setAllowOpacity( true );
mGridFramePenColorButton->setContext( QStringLiteral( "composer" ) );
mGridFramePenColorButton->setNoColorString( tr( "Transparent frame" ) );
mGridFramePenColorButton->setNoColorString( tr( "Transparent Frame" ) );
mGridFramePenColorButton->setShowNoColor( true );

mGridFrameFill1ColorButton->setColorDialogTitle( tr( "Select Grid Frame Fill Color" ) );
mGridFrameFill1ColorButton->setAllowOpacity( true );
mGridFrameFill1ColorButton->setContext( QStringLiteral( "composer" ) );
mGridFrameFill1ColorButton->setNoColorString( tr( "Transparent fill" ) );
mGridFrameFill1ColorButton->setNoColorString( tr( "Transparent Fill" ) );
mGridFrameFill1ColorButton->setShowNoColor( true );

mGridFrameFill2ColorButton->setColorDialogTitle( tr( "Select Grid Frame Fill Color" ) );
mGridFrameFill2ColorButton->setAllowOpacity( true );
mGridFrameFill2ColorButton->setContext( QStringLiteral( "composer" ) );
mGridFrameFill2ColorButton->setNoColorString( tr( "Transparent fill" ) );
mGridFrameFill2ColorButton->setNoColorString( tr( "Transparent Fill" ) );
mGridFrameFill2ColorButton->setShowNoColor( true );

mGridLineStyleButton->setSymbolType( QgsSymbol::Line );
4 src/app/layout/qgslayoutpolylinewidget.cpp
View file
@@ -66,12 +66,12 @@ QgsLayoutPolylineWidget::QgsLayoutPolylineWidget( QgsLayoutItemPolyline *polylin
mArrowHeadStrokeColorButton->setColorDialogTitle( tr( "Select Arrow Head Stroke Color" ) );
mArrowHeadStrokeColorButton->setAllowOpacity( true );
mArrowHeadStrokeColorButton->setContext( QStringLiteral( "composer" ) );
mArrowHeadStrokeColorButton->setNoColorString( tr( "Transparent stroke" ) );
mArrowHeadStrokeColorButton->setNoColorString( tr( "Transparent Stroke" ) );
mArrowHeadStrokeColorButton->setShowNoColor( true );
mArrowHeadFillColorButton->setColorDialogTitle( tr( "Select Arrow Head Fill Color" ) );
mArrowHeadFillColorButton->setAllowOpacity( true );
mArrowHeadFillColorButton->setContext( QStringLiteral( "composer" ) );
mArrowHeadFillColorButton->setNoColorString( tr( "Transparent fill" ) );
mArrowHeadFillColorButton->setNoColorString( tr( "Transparent Fill" ) );
mArrowHeadFillColorButton->setShowNoColor( true );

//add widget for general composer item properties
4 src/app/layout/qgslayoutscalebarwidget.cpp
View file
@@ -97,7 +97,7 @@ QgsLayoutScaleBarWidget::QgsLayoutScaleBarWidget( QgsLayoutItemScaleBar *scaleBa
mFillColor2Button->setColorDialogTitle( tr( "Select Alternate Fill Color" ) );
mFillColor2Button->setAllowOpacity( true );
mFillColor2Button->setContext( QStringLiteral( "composer" ) );
mFillColor2Button->setNoColorString( tr( "Transparent fill" ) );
mFillColor2Button->setNoColorString( tr( "Transparent Fill" ) );
mFillColor2Button->setShowNoColor( true );

mFontButton->setDialogTitle( tr( "Scalebar Font" ) );
@@ -106,7 +106,7 @@ QgsLayoutScaleBarWidget::QgsLayoutScaleBarWidget( QgsLayoutItemScaleBar *scaleBa
mStrokeColorButton->setColorDialogTitle( tr( "Select Line Color" ) );
mStrokeColorButton->setAllowOpacity( true );
mStrokeColorButton->setContext( QStringLiteral( "composer" ) );
mStrokeColorButton->setNoColorString( tr( "Transparent line" ) );
mStrokeColorButton->setNoColorString( tr( "Transparent Line" ) );
mStrokeColorButton->setShowNoColor( true );

if ( mScalebar )
2 src/app/layout/qgslayouttablebackgroundcolorsdialog.cpp
View file
@@ -118,5 +118,5 @@ void QgsLayoutTableBackgroundColorsDialog::setGuiElementValues()
mDefaultColorButton->setAllowOpacity( true );
mDefaultColorButton->setColorDialogTitle( tr( "Select Background Color" ) );
mDefaultColorButton->setShowNoColor( true );
mDefaultColorButton->setNoColorString( tr( "No background" ) );
mDefaultColorButton->setNoColorString( tr( "No Background" ) );
}
4 src/app/layout/qgsreportorganizerwidget.cpp
View file
@@ -56,11 +56,11 @@ QgsReportOrganizerWidget::QgsReportOrganizerWidget( QWidget *parent, QgsLayoutDe
mViewSections->setEditTriggers( QAbstractItemView::AllEditTriggers );

QMenu *addMenu = new QMenu( mButtonAddSection );
QAction *layoutSection = new QAction( tr( "Static layout section" ), addMenu );
QAction *layoutSection = new QAction( tr( "Static Layout Section" ), addMenu );
layoutSection->setToolTip( tr( "A static layout report section which consists of a single layout inserted into the report" ) );
addMenu->addAction( layoutSection );
connect( layoutSection, &QAction::triggered, this, &QgsReportOrganizerWidget::addLayoutSection );
QAction *fieldGroupSection = new QAction( tr( "Field group section" ), addMenu );
QAction *fieldGroupSection = new QAction( tr( "Field Group Section" ), addMenu );
fieldGroupSection->setToolTip( tr( "A report section which is repeated for every matching feature within a layer" ) );
addMenu->addAction( fieldGroupSection );
connect( fieldGroupSection, &QAction::triggered, this, &QgsReportOrganizerWidget::addFieldGroupSection );
14 src/app/pluginmanager/qgspluginmanager.cpp
View file
@@ -181,10 +181,10 @@ void QgsPluginManager::setPythonUtils( QgsPythonUtils *pythonUtils )
buttonDeleteRep->setEnabled( false );

// Add context menu to the plugins list view
QAction *actionSortByName = new QAction( tr( "sort by name" ), vwPlugins );
QAction *actionSortByDownloads = new QAction( tr( "sort by downloads" ), vwPlugins );
QAction *actionSortByVote = new QAction( tr( "sort by vote" ), vwPlugins );
QAction *actionSortByStatus = new QAction( tr( "sort by status" ), vwPlugins );
QAction *actionSortByName = new QAction( tr( "Sort by Name" ), vwPlugins );
QAction *actionSortByDownloads = new QAction( tr( "Sort by Downloads" ), vwPlugins );
QAction *actionSortByVote = new QAction( tr( "Sort by Vote" ), vwPlugins );
QAction *actionSortByStatus = new QAction( tr( "Sort by Status" ), vwPlugins );
actionSortByName->setCheckable( true );
actionSortByDownloads->setCheckable( true );
actionSortByVote->setCheckable( true );
@@ -1071,12 +1071,12 @@ void QgsPluginManager::addToRepositoryList( const QMap<QString, QString> &reposi
// If it's the second item on the tree, change the button text to plural form and add the filter context menu
if ( buttonRefreshRepos->isEnabled() && treeRepositories->actions().count() < 1 )
{
buttonRefreshRepos->setText( tr( "Reload all repositories" ) );
QAction *actionEnableThisRepositoryOnly = new QAction( tr( "Only show plugins from selected repository" ), treeRepositories );
buttonRefreshRepos->setText( tr( "Reload all Repositories" ) );
QAction *actionEnableThisRepositoryOnly = new QAction( tr( "Only Show Plugins from Selected Repository" ), treeRepositories );
treeRepositories->addAction( actionEnableThisRepositoryOnly );
connect( actionEnableThisRepositoryOnly, &QAction::triggered, this, &QgsPluginManager::setRepositoryFilter );
treeRepositories->setContextMenuPolicy( Qt::ActionsContextMenu );
QAction *actionClearFilter = new QAction( tr( "Clear filter" ), treeRepositories );
QAction *actionClearFilter = new QAction( tr( "Clear Filter" ), treeRepositories );
actionClearFilter->setEnabled( repository.value( QStringLiteral( "inspection_filter" ) ) == QLatin1String( "true" ) );
treeRepositories->addAction( actionClearFilter );
connect( actionClearFilter, &QAction::triggered, this, &QgsPluginManager::clearRepositoryFilter );
4 src/app/qgsdiagramproperties.cpp
View file
@@ -102,12 +102,12 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer *layer, QWidget *pare
mBackgroundColorButton->setAllowOpacity( true );
mBackgroundColorButton->setContext( QStringLiteral( "symbology" ) );
mBackgroundColorButton->setShowNoColor( true );
mBackgroundColorButton->setNoColorString( tr( "Transparent background" ) );
mBackgroundColorButton->setNoColorString( tr( "Transparent Background" ) );
mDiagramPenColorButton->setColorDialogTitle( tr( "Select Pen Color" ) );
mDiagramPenColorButton->setAllowOpacity( true );
mDiagramPenColorButton->setContext( QStringLiteral( "symbology" ) );
mDiagramPenColorButton->setShowNoColor( true );
mDiagramPenColorButton->setNoColorString( tr( "Transparent stroke" ) );
mDiagramPenColorButton->setNoColorString( tr( "Transparent Stroke" ) );

mMaxValueSpinBox->setShowClearButton( false );

2 src/app/qgsfeatureaction.cpp
View file
@@ -74,7 +74,7 @@ QgsAttributeDialog *QgsFeatureAction::newDialog( bool cloneFeature )
{
dialog->setContextMenuPolicy( Qt::ActionsContextMenu );

QAction *a = new QAction( tr( "Run actions" ), dialog );
QAction *a = new QAction( tr( "Run Actions" ), dialog );
a->setEnabled( false );
dialog->addAction( a );

12 src/gui/qgsattributeform.cpp
View file
@@ -1433,19 +1433,19 @@ void QgsAttributeForm::init()
selectButton->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
connect( selectButton, &QToolButton::clicked, this, &QgsAttributeForm::searchSetSelection );
QMenu *selectMenu = new QMenu( selectButton );
QAction *selectAction = new QAction( tr( "Select features" ), selectMenu );
QAction *selectAction = new QAction( tr( "Select Features" ), selectMenu );
selectAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mIconFormSelect.svg" ) ) );
connect( selectAction, &QAction::triggered, this, &QgsAttributeForm::searchSetSelection );
selectMenu->addAction( selectAction );
QAction *addSelectAction = new QAction( tr( "Add to current selection" ), selectMenu );
QAction *addSelectAction = new QAction( tr( "Add to Current Selection" ), selectMenu );
addSelectAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mIconSelectAdd.svg" ) ) );
connect( addSelectAction, &QAction::triggered, this, &QgsAttributeForm::searchAddToSelection );
selectMenu->addAction( addSelectAction );
QAction *deselectAction = new QAction( tr( "Remove from current selection" ), selectMenu );
QAction *deselectAction = new QAction( tr( "Remove from Current Selection" ), selectMenu );
deselectAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mIconSelectRemove.svg" ) ) );
connect( deselectAction, &QAction::triggered, this, &QgsAttributeForm::searchRemoveFromSelection );
selectMenu->addAction( deselectAction );
QAction *filterSelectAction = new QAction( tr( "Filter current selection" ), selectMenu );
QAction *filterSelectAction = new QAction( tr( "Filter Current Selection" ), selectMenu );
filterSelectAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mIconSelectIntersect.svg" ) ) );
connect( filterSelectAction, &QAction::triggered, this, &QgsAttributeForm::searchIntersectSelection );
selectMenu->addAction( filterSelectAction );
@@ -1460,10 +1460,10 @@ void QgsAttributeForm::init()
filterButton->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
connect( filterButton, &QToolButton::clicked, this, &QgsAttributeForm::filterTriggered );
QMenu *filterMenu = new QMenu( filterButton );
QAction *filterAndAction = new QAction( tr( "Filter within (\"AND\")" ), filterMenu );
QAction *filterAndAction = new QAction( tr( "Filter Within (\"AND\")" ), filterMenu );
connect( filterAndAction, &QAction::triggered, this, &QgsAttributeForm::filterAndTriggered );
filterMenu->addAction( filterAndAction );
QAction *filterOrAction = new QAction( tr( "Extend filter (\"OR\")" ), filterMenu );
QAction *filterOrAction = new QAction( tr( "Extend Filter (\"OR\")" ), filterMenu );
connect( filterOrAction, &QAction::triggered, this, &QgsAttributeForm::filterOrTriggered );
filterMenu->addAction( filterOrAction );
filterButton->setMenu( filterMenu );
4 src/gui/symbology/qgsellipsesymbollayerwidget.cpp
View file
@@ -50,12 +50,12 @@ QgsEllipseSymbolLayerWidget::QgsEllipseSymbolLayerWidget( QgsVectorLayer *vl, QW
btnChangeColorFill->setColorDialogTitle( tr( "Select Fill Color" ) );
btnChangeColorFill->setContext( QStringLiteral( "symbology" ) );
btnChangeColorFill->setShowNoColor( true );
btnChangeColorFill->setNoColorString( tr( "Transparent fill" ) );
btnChangeColorFill->setNoColorString( tr( "Transparent Fill" ) );
btnChangeColorStroke->setAllowOpacity( true );
btnChangeColorStroke->setColorDialogTitle( tr( "Select Stroke Color" ) );
btnChangeColorStroke->setContext( QStringLiteral( "symbology" ) );
btnChangeColorStroke->setShowNoColor( true );
btnChangeColorStroke->setNoColorString( tr( "Transparent stroke" ) );
btnChangeColorStroke->setNoColorString( tr( "Transparent Stroke" ) );

spinOffsetX->setClearValue( 0.0 );
spinOffsetY->setClearValue( 0.0 );
2 src/gui/symbology/qgspointdisplacementrendererwidget.cpp
View file
@@ -118,7 +118,7 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
mCircleColorButton->setContext( QStringLiteral( "symbology" ) );
mCircleColorButton->setAllowOpacity( true );
mCircleColorButton->setShowNoColor( true );
mCircleColorButton->setNoColorString( tr( "No stroke" ) );
mCircleColorButton->setNoColorString( tr( "Transparent Stroke" ) );
mLabelColorButton->setContext( QStringLiteral( "symbology" ) );
mLabelColorButton->setColorDialogTitle( tr( "Select Color" ) );
mLabelColorButton->setAllowOpacity( true );
6 src/gui/symbology/qgssymbollayerwidget.cpp
View file
@@ -443,7 +443,7 @@ QgsSimpleMarkerSymbolLayerWidget::QgsSimpleMarkerSymbolLayerWidget( QgsVectorLay
btnChangeColorFill->setColorDialogTitle( tr( "Select Fill Color" ) );
btnChangeColorFill->setContext( QStringLiteral( "symbology" ) );
btnChangeColorFill->setShowNoColor( true );
btnChangeColorFill->setNoColorString( tr( "Transparent fill" ) );
btnChangeColorFill->setNoColorString( tr( "Transparent Fill" ) );
btnChangeColorStroke->setAllowOpacity( true );
btnChangeColorStroke->setColorDialogTitle( tr( "Select Stroke Color" ) );
btnChangeColorStroke->setContext( QStringLiteral( "symbology" ) );
@@ -725,12 +725,12 @@ QgsSimpleFillSymbolLayerWidget::QgsSimpleFillSymbolLayerWidget( QgsVectorLayer *
btnChangeColor->setColorDialogTitle( tr( "Select Fill Color" ) );
btnChangeColor->setContext( QStringLiteral( "symbology" ) );
btnChangeColor->setShowNoColor( true );
btnChangeColor->setNoColorString( tr( "Transparent fill" ) );
btnChangeColor->setNoColorString( tr( "Transparent Fill" ) );
btnChangeStrokeColor->setAllowOpacity( true );
btnChangeStrokeColor->setColorDialogTitle( tr( "Select Stroke Color" ) );
btnChangeStrokeColor->setContext( QStringLiteral( "symbology" ) );
btnChangeStrokeColor->setShowNoColor( true );
btnChangeStrokeColor->setNoColorString( tr( "Transparent stroke" ) );
btnChangeStrokeColor->setNoColorString( tr( "Transparent Stroke" ) );

spinOffsetX->setClearValue( 0.0 );
spinOffsetY->setClearValue( 0.0 );
4 src/ui/qgspluginmanagerbase.ui
View file
@@ -676,7 +676,7 @@
</size>
</property>
<property name="text">
<string>Install plugin</string>
<string>Install Plugin</string>
</property>
</widget>
</item>
@@ -1054,7 +1054,7 @@ p, li { white-space: pre-wrap; }
(useful when you uploaded a plugin there)</string>
</property>
<property name="text">
<string>Reload repository</string>
<string>Reload Repository</string>
</property>
</widget>
</item>

0 comments on commit cc4e2ab

Please sign in to comment.