Skip to content
Permalink
Browse files

Fix capitalization for many combo box items

  • Loading branch information
nyalldawson committed May 20, 2020
1 parent 92ebf7b commit 9a0a1297c2e585cdbc3dbeeb64f5792024a451f9
Showing with 164 additions and 164 deletions.
  1. +2 −2 src/app/3d/qgs3dmapconfigwidget.cpp
  2. +2 −2 src/app/3d/qgsvectorlayer3drendererwidget.cpp
  3. +1 −1 src/app/labeling/qgslabelpropertydialog.cpp
  4. +2 −2 src/app/layout/qgslayoutmanagerdialog.cpp
  5. +5 −5 src/app/qgsalignrasterdialog.cpp
  6. +4 −4 src/app/qgsidentifyresultsdialog.cpp
  7. +5 −5 src/app/qgsmaptoolsimplify.cpp
  8. +2 −2 src/app/qgsmergeattributesdialog.cpp
  9. +4 −4 src/app/qgsnewspatialitelayerdialog.cpp
  10. +39 −39 src/app/qgsoptions.cpp
  11. +23 −23 src/app/qgsprojectproperties.cpp
  12. +1 −1 src/auth/identcert/qgsauthidentcertedit.cpp
  13. +1 −1 src/gui/auth/qgsauthconfigselect.cpp
  14. +2 −2 src/gui/auth/qgsauthsslconfigwidget.cpp
  15. +2 −2 src/gui/editorwidgets/qgsdatetimeeditconfig.cpp
  16. +2 −2 src/gui/editorwidgets/qgsexternalresourceconfigdlg.cpp
  17. +1 −1 src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp
  18. +5 −5 src/gui/effects/qgspainteffectwidget.cpp
  19. +9 −9 src/gui/layout/qgslayoutattributeselectiondialog.cpp
  20. +3 −3 src/gui/ogr/qgsvectorlayersaveasdialog.cpp
  21. +5 −5 src/gui/qgsnewgeopackagelayerdialog.cpp
  22. +4 −4 src/gui/qgsnewmemorylayerdialog.cpp
  23. +3 −3 src/gui/qgsnewvectorlayerdialog.cpp
  24. +2 −2 src/gui/qgsorderbydialog.cpp
  25. +4 −4 src/gui/qgsowssourceselect.cpp
  26. +6 −6 src/gui/qgstextformatwidget.cpp
  27. +2 −2 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  28. +2 −2 src/gui/raster/qgssinglebandgrayrendererwidget.cpp
  29. +1 −1 src/gui/symbology/qgspointdisplacementrendererwidget.cpp
  30. +3 −3 src/gui/vector/qgsattributesforminitcode.cpp
  31. +8 −8 src/gui/vector/qgsattributesformproperties.cpp
  32. +2 −2 src/gui/vector/qgsvectorlayerloadstyledialog.cpp
  33. +3 −3 src/gui/vector/qgsvectorlayersavestyledialog.cpp
  34. +4 −4 src/plugins/gps_importer/qgsgpsplugingui.cpp
@@ -53,8 +53,8 @@ Qgs3DMapConfigWidget::Qgs3DMapConfigWidget( Qgs3DMapSettings *map, QgsMapCanvas
cboTerrainLayer->setAllowEmptyLayer( true );
cboTerrainLayer->setFilters( QgsMapLayerProxyModel::RasterLayer );

cboTerrainType->addItem( tr( "Flat terrain" ), QgsTerrainGenerator::Flat );
cboTerrainType->addItem( tr( "DEM (Raster layer)" ), QgsTerrainGenerator::Dem );
cboTerrainType->addItem( tr( "Flat Terrain" ), QgsTerrainGenerator::Flat );
cboTerrainType->addItem( tr( "DEM (Raster Layer)" ), QgsTerrainGenerator::Dem );
cboTerrainType->addItem( tr( "Online" ), QgsTerrainGenerator::Online );
cboTerrainType->addItem( tr( "Mesh" ), QgsTerrainGenerator::Mesh );

@@ -76,8 +76,8 @@ QgsVectorLayer3DRendererWidget::QgsVectorLayer3DRendererWidget( QgsMapLayer *lay
layout->setContentsMargins( 0, 0, 0, 0 );

cboRendererType = new QComboBox( this );
cboRendererType->addItem( QgsApplication::getThemeIcon( QStringLiteral( "rendererNullSymbol.svg" ) ), tr( "No symbols" ) );
cboRendererType->addItem( QgsApplication::getThemeIcon( QStringLiteral( "rendererSingleSymbol.svg" ) ), tr( "Single symbol" ) );
cboRendererType->addItem( QgsApplication::getThemeIcon( QStringLiteral( "rendererNullSymbol.svg" ) ), tr( "No Symbols" ) );
cboRendererType->addItem( QgsApplication::getThemeIcon( QStringLiteral( "rendererSingleSymbol.svg" ) ), tr( "Single Symbol" ) );
cboRendererType->addItem( QgsApplication::getThemeIcon( QStringLiteral( "rendererRuleBasedSymbol.svg" ) ), tr( "Rule-based" ) );

widgetBaseProperties = new QgsVectorLayer3DPropertiesWidget( this );
@@ -586,7 +586,7 @@ void QgsLabelPropertyDialog::populateFontStyleComboBox()

void QgsLabelPropertyDialog::fillMultiLineAlignComboBox()
{
mMultiLineAlignComboBox->addItem( tr( "Layer default" ), "" );
mMultiLineAlignComboBox->addItem( tr( "Layer Default" ), "" );
mMultiLineAlignComboBox->addItem( tr( "Left" ), "Left" );
mMultiLineAlignComboBox->addItem( tr( "Center" ), "Center" );
mMultiLineAlignComboBox->addItem( tr( "Right" ), "Right" );
@@ -93,8 +93,8 @@ QgsLayoutManagerDialog::QgsLayoutManagerDialog( QWidget *parent, Qt::WindowFlags
connect( mWindowAction, &QAction::triggered, this, &QgsLayoutManagerDialog::activate );
#endif

mTemplate->addItem( tr( "Empty layout" ) );
mTemplate->addItem( tr( "Empty report" ) );
mTemplate->addItem( tr( "Empty Layout" ) );
mTemplate->addItem( tr( "Empty Report" ) );
mTemplate->addItem( tr( "Specific" ) );

mUserTemplatesDir = QgsApplication::qgisSettingsDirPath() + "/composer_templates";
@@ -397,11 +397,11 @@ QgsAlignRasterLayerConfigDialog::QgsAlignRasterLayerConfigDialog()
cboLayers->setFilters( QgsMapLayerProxyModel::RasterLayer );

cboResample = new QComboBox( this );
cboResample->addItem( tr( "Nearest neighbour" ), QgsAlignRaster::RA_NearestNeighbour );
cboResample->addItem( tr( "Bilinear (2x2 kernel)" ), QgsAlignRaster::RA_Bilinear );
cboResample->addItem( tr( "Cubic (4x4 kernel)" ), QgsAlignRaster::RA_Cubic );
cboResample->addItem( tr( "Cubic B-Spline (4x4 kernel)" ), QgsAlignRaster::RA_CubicSpline );
cboResample->addItem( tr( "Lanczos (6x6 kernel)" ), QgsAlignRaster::RA_Lanczos );
cboResample->addItem( tr( "Nearest Neighbour" ), QgsAlignRaster::RA_NearestNeighbour );
cboResample->addItem( tr( "Bilinear (2x2 Kernel)" ), QgsAlignRaster::RA_Bilinear );
cboResample->addItem( tr( "Cubic (4x4 Kernel)" ), QgsAlignRaster::RA_Cubic );
cboResample->addItem( tr( "Cubic B-Spline (4x4 Kernel)" ), QgsAlignRaster::RA_CubicSpline );
cboResample->addItem( tr( "Lanczos (6x6 Kernel)" ), QgsAlignRaster::RA_Lanczos );
cboResample->addItem( tr( "Average" ), QgsAlignRaster::RA_Average );
cboResample->addItem( tr( "Mode" ), QgsAlignRaster::RA_Mode );
cboResample->addItem( tr( "Maximum" ), QgsAlignRaster::RA_Max );
@@ -382,10 +382,10 @@ QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidge
// retrieve mode before on_cmbIdentifyMode_currentIndexChanged resets it on addItem
QgsMapToolIdentify::IdentifyMode identifyMode = mySettings.enumValue( QStringLiteral( "Map/identifyMode" ), QgsMapToolIdentify::ActiveLayer );

cmbIdentifyMode->addItem( tr( "Current layer" ), QgsMapToolIdentify::ActiveLayer );
cmbIdentifyMode->addItem( tr( "Top down, stop at first" ), QgsMapToolIdentify::TopDownStopAtFirst );
cmbIdentifyMode->addItem( tr( "Top down" ), QgsMapToolIdentify::TopDownAll );
cmbIdentifyMode->addItem( tr( "Layer selection" ), QgsMapToolIdentify::LayerSelection );
cmbIdentifyMode->addItem( tr( "Current Layer" ), QgsMapToolIdentify::ActiveLayer );
cmbIdentifyMode->addItem( tr( "Top Down, Stop at First" ), QgsMapToolIdentify::TopDownStopAtFirst );
cmbIdentifyMode->addItem( tr( "Top Down" ), QgsMapToolIdentify::TopDownAll );
cmbIdentifyMode->addItem( tr( "Layer Selection" ), QgsMapToolIdentify::LayerSelection );
cmbIdentifyMode->setCurrentIndex( cmbIdentifyMode->findData( identifyMode ) );

// view modes
@@ -36,14 +36,14 @@ QgsSimplifyUserInputWidget::QgsSimplifyUserInputWidget( QWidget *parent )
{
setupUi( this );

mMethodComboBox->addItem( tr( "Simplify by distance" ), QgsMapToolSimplify::SimplifyDistance );
mMethodComboBox->addItem( tr( "Simplify by snapping to grid" ), QgsMapToolSimplify::SimplifySnapToGrid );
mMethodComboBox->addItem( tr( "Simplify by area (Visvalingam)" ), QgsMapToolSimplify::SimplifyVisvalingam );
mMethodComboBox->addItem( tr( "Simplify by Distance" ), QgsMapToolSimplify::SimplifyDistance );
mMethodComboBox->addItem( tr( "Simplify by Snapping to Grid" ), QgsMapToolSimplify::SimplifySnapToGrid );
mMethodComboBox->addItem( tr( "Simplify by Area (Visvalingam)" ), QgsMapToolSimplify::SimplifyVisvalingam );
mMethodComboBox->addItem( tr( "Smooth" ), QgsMapToolSimplify::Smooth );

mToleranceUnitsComboBox->addItem( tr( "Layer units" ), QgsTolerance::LayerUnits );
mToleranceUnitsComboBox->addItem( tr( "Layer Units" ), QgsTolerance::LayerUnits );
mToleranceUnitsComboBox->addItem( tr( "Pixels" ), QgsTolerance::Pixels );
mToleranceUnitsComboBox->addItem( tr( "Map units" ), QgsTolerance::ProjectUnits );
mToleranceUnitsComboBox->addItem( tr( "Map Units" ), QgsTolerance::ProjectUnits );

mToleranceSpinBox->setShowClearButton( false );

@@ -241,8 +241,8 @@ QComboBox *QgsMergeAttributesDialog::createMergeComboBox( QVariant::Type columnT
break;
}

newComboBox->addItem( tr( "Skip attribute" ), QStringLiteral( "skip" ) );
newComboBox->addItem( tr( "Manual value" ), QStringLiteral( "manual" ) );
newComboBox->addItem( tr( "Skip Attribute" ), QStringLiteral( "skip" ) );
newComboBox->addItem( tr( "Manual Value" ), QStringLiteral( "manual" ) );

connect( newComboBox, &QComboBox::currentTextChanged,
this, &QgsMergeAttributesDialog::comboValueChanged );
@@ -50,7 +50,7 @@ QgsNewSpatialiteLayerDialog::QgsNewSpatialiteLayerDialog( QWidget *parent, Qt::W
setupUi( this );
QgsGui::enableAutoGeometryRestore( this );

mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconTableLayer.svg" ) ), tr( "No geometry" ), QString() );
mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconTableLayer.svg" ) ), tr( "No Geometry" ), QString() );
mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconPointLayer.svg" ) ), tr( "Point" ), QStringLiteral( "POINT" ) );
mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconLineLayer.svg" ) ), tr( "Line" ), QStringLiteral( "LINESTRING" ) );
mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconPolygonLayer.svg" ) ), tr( "Polygon" ), QStringLiteral( "POLYGON" ) );
@@ -67,9 +67,9 @@ QgsNewSpatialiteLayerDialog::QgsNewSpatialiteLayerDialog( QWidget *parent, Qt::W

mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionNewAttribute.svg" ) ) );
mRemoveAttributeButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionDeleteAttribute.svg" ) ) );
mTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconFieldText.svg" ) ), tr( "Text data" ), "text" );
mTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconFieldInteger.svg" ) ), tr( "Whole number" ), "integer" );
mTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconFieldFloat.svg" ) ), tr( "Decimal number" ), "real" );
mTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconFieldText.svg" ) ), tr( "Text Data" ), "text" );
mTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconFieldInteger.svg" ) ), tr( "Whole Number" ), "integer" );
mTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconFieldFloat.svg" ) ), tr( "Decimal Number" ), "real" );

mDatabaseComboBox->setProvider( QStringLiteral( "spatialite" ) );

0 comments on commit 9a0a129

Please sign in to comment.
You can’t perform that action at this time.