Skip to content

Commit 788da55

Browse files
author
wonder
committed
Fixed symbol selector UI, use just one symbol color button instead of former three buttons
git-svn-id: http://svn.osgeo.org/qgis/trunk@12817 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8c38d2d commit 788da55

File tree

2 files changed

+157
-194
lines changed

2 files changed

+157
-194
lines changed

src/gui/symbology-ng/qgssymbolv2selectordialog.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ QgsSymbolV2SelectorDialog::QgsSymbolV2SelectorDialog( QgsSymbolV2* symbol, QgsSt
5757
// there's a correspondence between symbol type number and page numbering => exploit it!
5858
stackedWidget->setCurrentIndex( symbol->type() );
5959

60-
connect( btnColorMarker, SIGNAL( clicked() ), this, SLOT( setSymbolColor() ) );
61-
connect( btnColorLine, SIGNAL( clicked() ), this, SLOT( setSymbolColor() ) );
62-
connect( btnColorFill, SIGNAL( clicked() ), this, SLOT( setSymbolColor() ) );
60+
connect( btnColor, SIGNAL( clicked() ), this, SLOT( setSymbolColor() ) );
6361
connect( spinAngle, SIGNAL( valueChanged( double ) ), this, SLOT( setMarkerAngle( double ) ) );
6462
connect( spinSize, SIGNAL( valueChanged( double ) ), this, SLOT( setMarkerSize( double ) ) );
6563
connect( spinWidth, SIGNAL( valueChanged( double ) ), this, SLOT( setLineWidth( double ) ) );
@@ -130,10 +128,7 @@ void QgsSymbolV2SelectorDialog::updateSymbolPreview()
130128

131129
void QgsSymbolV2SelectorDialog::updateSymbolColor()
132130
{
133-
QColor c = mSymbol->color();
134-
btnColorMarker->setColor( c );
135-
btnColorLine->setColor( c );
136-
btnColorFill->setColor( c );
131+
btnColor->setColor( mSymbol->color() );
137132
}
138133

139134
void QgsSymbolV2SelectorDialog::updateSymbolInfo()

0 commit comments

Comments
 (0)