bug3557fix.diff

Patch to move no fill and no pen to second position rather than bottom. - John Tull, 2011-03-06 01:57 PM

Download (3.85 KB)

View differences:

src/app/qgssinglesymboldialog.cpp (working copy)
180 180
  //set outline / line style
181 181
  //
182 182
  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "SolidLine" ) ), "", "SolidLine" );
183
  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "NoPen" ) ), tr( "None" ), "NoPen" );
183 184
  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashLine" ) ), "", "DashLine" );
184 185
  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DotLine" ) ), "", "DotLine" );
185 186
  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotLine" ) ), "" , "DashDotLine" );
186 187
  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "DashDotDotLine" ) ), "", "DashDotDotLine" );
187
  cboOutlineStyle->addItem( QIcon( QgsSymbologyUtils::char2LinePixmap( "NoPen" ) ), tr( "None" ), "NoPen" );
188 188

  
189 189
  //
190 190
  //set pattern icons and state
191 191
  //
192 192
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "SolidPattern" ) ), "", "SolidPattern" );
193
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "None" ), "NoBrush" );
193 194
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "HorPattern" ) ), "", "HorPattern" );
194 195
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "VerPattern" ) ), "", "VerPattern" );
195 196
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "CrossPattern" ) ), "", "CrossPattern" );
......
203 204
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense5Pattern" ) ), "", "Dense5Pattern" );
204 205
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense6Pattern" ) ), "", "Dense6Pattern" );
205 206
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "Dense7Pattern" ) ), "", "Dense7Pattern" );
206
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "None" ), "NoBrush" );
207 207
  cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "TexturePattern" ) ), tr( "Texture" ), "TexturePattern" );
208 208

  
209 209
  if ( mVectorLayer && mVectorLayer->geometryType() != QGis::Point )
src/gui/symbology-ng/qgspenstylecombobox.cpp (working copy)
14 14
{
15 15
  QList < QPair<Qt::PenStyle, QString> > styles;
16 16
  styles << qMakePair( Qt::SolidLine, tr( "Solid Line" ) )
17
  << qMakePair( Qt::NoPen, tr( "No Pen" ) );
17 18
  << qMakePair( Qt::DashLine, tr( "Dash Line" ) )
18 19
  << qMakePair( Qt::DotLine, tr( "Dot Line" ) )
19 20
  << qMakePair( Qt::DashDotLine, tr( "Dash Dot Line" ) )
20 21
  << qMakePair( Qt::DashDotDotLine, tr( "Dash Dot Dot Line" ) )
21
  << qMakePair( Qt::NoPen, tr( "No Pen" ) );
22 22

  
23 23
  setIconSize( QSize( 32, 12 ) );
24 24

  
src/gui/symbology-ng/qgsbrushstylecombobox.cpp (working copy)
13 13
{
14 14
  QList < QPair<Qt::BrushStyle, QString> > styles;
15 15
  styles << qMakePair( Qt::SolidPattern, tr( "Solid" ) )
16
  << qMakePair( Qt::NoBrush, tr( "No Brush" ) );
16 17
  << qMakePair( Qt::HorPattern, tr( "Horizontal" ) )
17 18
  << qMakePair( Qt::VerPattern, tr( "Vertical" ) )
18 19
  << qMakePair( Qt::CrossPattern, tr( "Cross" ) )
......
26 27
  << qMakePair( Qt::Dense5Pattern, tr( "Dense 5" ) )
27 28
  << qMakePair( Qt::Dense6Pattern, tr( "Dense 6" ) )
28 29
  << qMakePair( Qt::Dense7Pattern, tr( "Dense 7" ) )
29
  << qMakePair( Qt::NoBrush, tr( "No Brush" ) );
30 30

  
31 31
  setIconSize( QSize( 32, 16 ) );
32 32