Applied patch from JCTull - show no pen and no fill as second entry in lists for symbology. Thanks. Closes #3557

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15377 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: timlinux

src/app/qgssinglesymboldialog.cpp

@@ -180,16 +180,17 @@ void QgsSingleSymbolDialog::refreshMarkers()
   //set outline / line style
   //
   cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "SolidLine" ) ), "", "SolidLine" );
+  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "NoPen" ) ), tr( "None" ), "NoPen" );
   cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashLine" ) ), "", "DashLine" );
   cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DotLine" ) ), "", "DotLine" );
   cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotLine" ) ), "" , "DashDotLine" );
   cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotDotLine" ) ), "", "DashDotDotLine" );
-  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "NoPen" ) ), tr( "None" ), "NoPen" );
 
   //
   //set pattern icons and state
   //
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "SolidPattern" ) ), "", "SolidPattern" );
+  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "None" ), "NoBrush" );
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "HorPattern" ) ), "", "HorPattern" );
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "VerPattern" ) ), "", "VerPattern" );
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "CrossPattern" ) ), "", "CrossPattern" );
@@ -203,7 +204,6 @@ void QgsSingleSymbolDialog::refreshMarkers()
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense5Pattern" ) ), "", "Dense5Pattern" );
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense6Pattern" ) ), "", "Dense6Pattern" );
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense7Pattern" ) ), "", "Dense7Pattern" );
-  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "None" ), "NoBrush" );
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "TexturePattern" ) ), tr( "Texture" ), "TexturePattern" );
 
   if ( mVectorLayer && mVectorLayer->geometryType() != QGis::Point )

src/gui/symbology-ng/qgsbrushstylecombobox.cpp

@@ -13,6 +13,7 @@ QgsBrushStyleComboBox::QgsBrushStyleComboBox( QWidget* parent )
 {
   QList < QPair<Qt::BrushStyle, QString> > styles;
   styles << qMakePair( Qt::SolidPattern, tr( "Solid" ) )
+  << qMakePair( Qt::NoBrush, tr( "No Brush" ) )
   << qMakePair( Qt::HorPattern, tr( "Horizontal" ) )
   << qMakePair( Qt::VerPattern, tr( "Vertical" ) )
   << qMakePair( Qt::CrossPattern, tr( "Cross" ) )
@@ -25,8 +26,7 @@ QgsBrushStyleComboBox::QgsBrushStyleComboBox( QWidget* parent )
   << qMakePair( Qt::Dense4Pattern, tr( "Dense 4" ) )
   << qMakePair( Qt::Dense5Pattern, tr( "Dense 5" ) )
   << qMakePair( Qt::Dense6Pattern, tr( "Dense 6" ) )
-  << qMakePair( Qt::Dense7Pattern, tr( "Dense 7" ) )
-  << qMakePair( Qt::NoBrush, tr( "No Brush" ) );
+  << qMakePair( Qt::Dense7Pattern, tr( "Dense 7" ) );
 
   setIconSize( QSize( 32, 16 ) );
 

src/gui/symbology-ng/qgspenstylecombobox.cpp

@@ -14,11 +14,11 @@ QgsPenStyleComboBox::QgsPenStyleComboBox( QWidget* parent )
 {
   QList < QPair<Qt::PenStyle, QString> > styles;
   styles << qMakePair( Qt::SolidLine, tr( "Solid Line" ) )
+  << qMakePair( Qt::NoPen, tr( "No Pen" ) )
   << qMakePair( Qt::DashLine, tr( "Dash Line" ) )
   << qMakePair( Qt::DotLine, tr( "Dot Line" ) )
   << qMakePair( Qt::DashDotLine, tr( "Dash Dot Line" ) )
-  << qMakePair( Qt::DashDotDotLine, tr( "Dash Dot Dot Line" ) )
-  << qMakePair( Qt::NoPen, tr( "No Pen" ) );
+  << qMakePair( Qt::DashDotDotLine, tr( "Dash Dot Dot Line" ) );
 
   setIconSize( QSize( 32, 12 ) );