Fix string capitalization, HIG violations

nyalldawson · nyalldawson · commit cf41fda4c76b · 2018-04-20T18:52:43.000+10:00
(cherry-picked from c70c784)
diff --git a/src/gui/raster/qgspalettedrendererwidget.cpp b/src/gui/raster/qgspalettedrendererwidget.cpp
@@ -41,16 +41,16 @@ QgsPalettedRendererWidget::QgsPalettedRendererWidget( QgsRasterLayer *layer, con
   mCancelButton->hide();
 
   mContextMenu = new QMenu( tr( "Options" ), this );
-  mContextMenu->addAction( tr( "Change color" ), this, SLOT( changeColor() ) );
-  mContextMenu->addAction( tr( "Change opacity" ), this, SLOT( changeOpacity() ) );
-  mContextMenu->addAction( tr( "Change label" ), this, SLOT( changeLabel() ) );
+  mContextMenu->addAction( tr( "Change Color…" ), this, SLOT( changeColor() ) );
+  mContextMenu->addAction( tr( "Change Opacity…" ), this, SLOT( changeOpacity() ) );
+  mContextMenu->addAction( tr( "Change Label…" ), this, SLOT( changeLabel() ) );
 
   mAdvancedMenu = new QMenu( tr( "Advanced options" ), this );
-  QAction *mLoadFromLayerAction = mAdvancedMenu->addAction( tr( "Load classes from layer" ) );
+  QAction *mLoadFromLayerAction = mAdvancedMenu->addAction( tr( "Load Classes from Layer" ) );
   connect( mLoadFromLayerAction, &QAction::triggered, this, &QgsPalettedRendererWidget::loadFromLayer );
-  QAction *loadFromFile = mAdvancedMenu->addAction( tr( "Load color map from file…" ) );
+  QAction *loadFromFile = mAdvancedMenu->addAction( tr( "Load Color Map from File…" ) );
   connect( loadFromFile, &QAction::triggered, this, &QgsPalettedRendererWidget::loadColorTable );
-  QAction *exportToFile = mAdvancedMenu->addAction( tr( "Export color map to file…" ) );
+  QAction *exportToFile = mAdvancedMenu->addAction( tr( "Export Color Map to File…" ) );
   connect( exportToFile, &QAction::triggered, this, &QgsPalettedRendererWidget::saveColorTable );
 
 
diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
@@ -62,8 +62,8 @@ QgsSingleBandPseudoColorRendererWidget::QgsSingleBandPseudoColorRendererWidget(
   connect( mClassificationModeComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsSingleBandPseudoColorRendererWidget::mClassificationModeComboBox_currentIndexChanged );
 
   contextMenu = new QMenu( tr( "Options" ), this );
-  contextMenu->addAction( tr( "Change color" ), this, SLOT( changeColor() ) );
-  contextMenu->addAction( tr( "Change opacity" ), this, SLOT( changeOpacity() ) );
+  contextMenu->addAction( tr( "Change Color…" ), this, SLOT( changeColor() ) );
+  contextMenu->addAction( tr( "Change Opacity…" ), this, SLOT( changeOpacity() ) );
 
   mColormapTreeWidget->setColumnWidth( ColorColumn, 50 );
   mColormapTreeWidget->setContextMenuPolicy( Qt::CustomContextMenu );
@@ -106,7 +106,7 @@ QgsSingleBandPseudoColorRendererWidget::QgsSingleBandPseudoColorRendererWidget(
   mColorInterpolationComboBox->setCurrentIndex( mColorInterpolationComboBox->findData( QgsColorRampShader::Interpolated ) );
 
   mClassificationModeComboBox->addItem( tr( "Continuous" ), QgsColorRampShader::Continuous );
-  mClassificationModeComboBox->addItem( tr( "Equal interval" ), QgsColorRampShader::EqualInterval );
+  mClassificationModeComboBox->addItem( tr( "Equal Interval" ), QgsColorRampShader::EqualInterval );
   mClassificationModeComboBox->addItem( tr( "Quantile" ), QgsColorRampShader::Quantile );
   mClassificationModeComboBox->setCurrentIndex( mClassificationModeComboBox->findData( QgsColorRampShader::Continuous ) );
 
diff --git a/src/gui/symbology/qgsrendererwidget.cpp b/src/gui/symbology/qgsrendererwidget.cpp
@@ -41,18 +41,18 @@ QgsRendererWidget::QgsRendererWidget( QgsVectorLayer *layer, QgsStyle *style )
   mPasteAction->setShortcut( QKeySequence( QKeySequence::Paste ) );
 
   contextMenu->addSeparator();
-  contextMenu->addAction( tr( "Change color" ), this, SLOT( changeSymbolColor() ) );
-  contextMenu->addAction( tr( "Change opacity" ), this, SLOT( changeSymbolOpacity() ) );
-  contextMenu->addAction( tr( "Change output unit" ), this, SLOT( changeSymbolUnit() ) );
+  contextMenu->addAction( tr( "Change Color…" ), this, SLOT( changeSymbolColor() ) );
+  contextMenu->addAction( tr( "Change Opacity…" ), this, SLOT( changeSymbolOpacity() ) );
+  contextMenu->addAction( tr( "Change Output Unit…" ), this, SLOT( changeSymbolUnit() ) );
 
   if ( mLayer && mLayer->geometryType() == QgsWkbTypes::LineGeometry )
   {
-    contextMenu->addAction( tr( "Change width" ), this, SLOT( changeSymbolWidth() ) );
+    contextMenu->addAction( tr( "Change Width…" ), this, SLOT( changeSymbolWidth() ) );
   }
   else if ( mLayer && mLayer->geometryType() == QgsWkbTypes::PointGeometry )
   {
-    contextMenu->addAction( tr( "Change size" ), this, SLOT( changeSymbolSize() ) );
-    contextMenu->addAction( tr( "Change angle" ), this, SLOT( changeSymbolAngle() ) );
+    contextMenu->addAction( tr( "Change Size…" ), this, SLOT( changeSymbolSize() ) );
+    contextMenu->addAction( tr( "Change Angle…" ), this, SLOT( changeSymbolAngle() ) );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,18 +41,18 @@ QgsRendererWidget::QgsRendererWidget( QgsVectorLayer layer, QgsStyle style )`
`41`	`41`	`mPasteAction->setShortcut( QKeySequence( QKeySequence::Paste ) );`
`42`	`42`
`43`	`43`	`contextMenu->addSeparator();`
`44`		`- contextMenu->addAction( tr( "Change color" ), this, SLOT( changeSymbolColor() ) );`
`45`		`- contextMenu->addAction( tr( "Change opacity" ), this, SLOT( changeSymbolOpacity() ) );`
`46`		`- contextMenu->addAction( tr( "Change output unit" ), this, SLOT( changeSymbolUnit() ) );`
	`44`	`+ contextMenu->addAction( tr( "Change Color…" ), this, SLOT( changeSymbolColor() ) );`
	`45`	`+ contextMenu->addAction( tr( "Change Opacity…" ), this, SLOT( changeSymbolOpacity() ) );`
	`46`	`+ contextMenu->addAction( tr( "Change Output Unit…" ), this, SLOT( changeSymbolUnit() ) );`
`47`	`47`
`48`	`48`	`if ( mLayer && mLayer->geometryType() == QgsWkbTypes::LineGeometry )`
`49`	`49`	`{`
`50`		`- contextMenu->addAction( tr( "Change width" ), this, SLOT( changeSymbolWidth() ) );`
	`50`	`+ contextMenu->addAction( tr( "Change Width…" ), this, SLOT( changeSymbolWidth() ) );`
`51`	`51`	`}`
`52`	`52`	`else if ( mLayer && mLayer->geometryType() == QgsWkbTypes::PointGeometry )`
`53`	`53`	`{`
`54`		`- contextMenu->addAction( tr( "Change size" ), this, SLOT( changeSymbolSize() ) );`
`55`		`- contextMenu->addAction( tr( "Change angle" ), this, SLOT( changeSymbolAngle() ) );`
	`54`	`+ contextMenu->addAction( tr( "Change Size…" ), this, SLOT( changeSymbolSize() ) );`
	`55`	`+ contextMenu->addAction( tr( "Change Angle…" ), this, SLOT( changeSymbolAngle() ) );`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`