Skip to content

Commit

Permalink
Flip all symbology color buttons to QgsColorButtonV2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Aug 12, 2014
1 parent dd1fe45 commit 766f078
Show file tree
Hide file tree
Showing 13 changed files with 165 additions and 116 deletions.
15 changes: 12 additions & 3 deletions src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
View file
Expand Up @@ -22,6 +22,18 @@
QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ): QgsSymbolLayerV2Widget( parent, vl )
{
setupUi( this );

btnChangeColorFill->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );
btnChangeColorFill->setContext( "symbology" );
btnChangeColorFill->setShowNoColor( true );
btnChangeColorFill->setNoColorString( tr( "Transparent fill" ) );
btnChangeColorBorder->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColorBorder->setColorDialogTitle( tr( "Select border color" ) );
btnChangeColorBorder->setContext( "symbology" );
btnChangeColorBorder->setShowNoColor( true );
btnChangeColorBorder->setNoColorString( tr( "Transparent border" ) );

QStringList names;
names << "circle" << "rectangle" << "cross" << "triangle";
QSize iconSize = mShapeListWidget->iconSize();
Expand Down Expand Up @@ -59,11 +71,8 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
mRotationSpinBox->setValue( mLayer->angle() );
mOutlineStyleComboBox->setPenStyle( mLayer->outlineStyle() );
mOutlineWidthSpinBox->setValue( mLayer->outlineWidth() );

btnChangeColorBorder->setColor( mLayer->outlineColor() );
btnChangeColorBorder->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColorFill->setColor( mLayer->fillColor() );
btnChangeColorFill->setColorDialogOptions( QColorDialog::ShowAlphaChannel );

QList<QListWidgetItem *> symbolItemList = mShapeListWidget->findItems( mLayer->symbolName(), Qt::MatchExactly );
if ( symbolItemList.size() > 0 )
Expand Down
65 changes: 55 additions & 10 deletions src/gui/symbology-ng/qgssymbollayerv2widget.cpp
View file
Expand Up @@ -76,6 +76,10 @@ QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget( const QgsVec
mOffsetUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
mDashPatternUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );

btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor->setColorDialogTitle( tr( "Select line color" ) );
btnChangeColor->setContext( "symbology" );

if ( vl && vl->geometryType() != QGis::Polygon )
{
//draw inside polygon checkbox only makes sense for polygon layers
Expand Down Expand Up @@ -121,7 +125,6 @@ void QgsSimpleLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
spinWidth->blockSignals( false );
btnChangeColor->blockSignals( true );
btnChangeColor->setColor( mLayer->color() );
btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor->blockSignals( false );
spinOffset->blockSignals( true );
spinOffset->setValue( mLayer->offset() );
Expand Down Expand Up @@ -318,6 +321,17 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( const Qg
mOffsetUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
mOutlineWidthUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );

btnChangeColorFill->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );
btnChangeColorFill->setContext( "symbology" );
btnChangeColorFill->setShowNoColor( true );
btnChangeColorFill->setNoColorString( tr( "Transparent fill" ) );
btnChangeColorBorder->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColorBorder->setColorDialogTitle( tr( "Select border color" ) );
btnChangeColorBorder->setContext( "symbology" );
btnChangeColorBorder->setShowNoColor( true );
btnChangeColorBorder->setNoColorString( tr( "Transparent border" ) );

QSize size = lstNames->iconSize();
QStringList names;
names << "circle" << "rectangle" << "diamond" << "pentagon" << "cross" << "cross2" << "triangle"
Expand Down Expand Up @@ -361,11 +375,9 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer
}
btnChangeColorBorder->blockSignals( true );
btnChangeColorBorder->setColor( mLayer->borderColor() );
btnChangeColorBorder->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColorBorder->blockSignals( false );
btnChangeColorFill->blockSignals( true );
btnChangeColorFill->setColor( mLayer->color() );
btnChangeColorFill->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColorFill->blockSignals( false );
spinSize->blockSignals( true );
spinSize->setValue( mLayer->size() );
Expand Down Expand Up @@ -579,9 +591,13 @@ QgsSimpleFillSymbolLayerV2Widget::QgsSimpleFillSymbolLayerV2Widget( const QgsVec
mBorderWidthUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
mOffsetUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );

btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor->setColorDialogTitle( tr( "Select fill color" ) );
btnChangeColor->setContext( "symbology" );
btnChangeColor->setShowNoColor( true );
btnChangeColor->setNoColorString( tr( "Transparent fill" ) );
btnChangeBorderColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeBorderColor->setColorDialogTitle( tr( "Select border color" ) );
btnChangeBorderColor->setContext( "symbology" );
btnChangeBorderColor->setShowNoColor( true );
btnChangeBorderColor->setNoColorString( tr( "Transparent border" ) );
Expand All @@ -607,14 +623,12 @@ void QgsSimpleFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
// set values
btnChangeColor->blockSignals( true );
btnChangeColor->setColor( mLayer->color() );
btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor->blockSignals( false );
cboFillStyle->blockSignals( true );
cboFillStyle->setBrushStyle( mLayer->brushStyle() );
cboFillStyle->blockSignals( false );
btnChangeBorderColor->blockSignals( true );
btnChangeBorderColor->setColor( mLayer->borderColor() );
btnChangeBorderColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeBorderColor->blockSignals( false );
cboBorderStyle->blockSignals( true );
cboBorderStyle->setPenStyle( mLayer->borderStyle() );
Expand Down Expand Up @@ -751,6 +765,17 @@ QgsGradientFillSymbolLayerV2Widget::QgsGradientFillSymbolLayerV2Widget( const Qg
cboGradientColorRamp->setShowGradientOnly( true );
cboGradientColorRamp->populate( QgsStyleV2::defaultStyle() );

btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor->setColorDialogTitle( tr( "Select gradient color" ) );
btnChangeColor->setContext( "symbology" );
btnChangeColor->setShowNoColor( true );
btnChangeColor->setNoColorString( tr( "Transparent" ) );
btnChangeColor2->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor2->setColorDialogTitle( tr( "Select gradient color" ) );
btnChangeColor2->setContext( "symbology" );
btnChangeColor2->setShowNoColor( true );
btnChangeColor2->setNoColorString( tr( "Transparent" ) );

connect( btnChangeColor, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( setColor( const QColor& ) ) );
connect( btnChangeColor2, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( setColor2( const QColor& ) ) );
connect( cboGradientColorRamp, SIGNAL( currentIndexChanged( int ) ) , this, SLOT( applyColorRamp() ) );
Expand Down Expand Up @@ -779,11 +804,9 @@ void QgsGradientFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer
// set values
btnChangeColor->blockSignals( true );
btnChangeColor->setColor( mLayer->color() );
btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor->blockSignals( false );
btnChangeColor2->blockSignals( true );
btnChangeColor2->setColor( mLayer->color2() );
btnChangeColor2->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor2->blockSignals( false );

if ( mLayer->gradientColorType() == QgsGradientFillSymbolLayerV2::SimpleTwoColor )
Expand Down Expand Up @@ -1102,6 +1125,17 @@ QgsShapeburstFillSymbolLayerV2Widget::QgsShapeburstFillSymbolLayerV2Widget( cons
mDistanceUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
mOffsetUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );

btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor->setColorDialogTitle( tr( "Select gradient color" ) );
btnChangeColor->setContext( "symbology" );
btnChangeColor->setShowNoColor( true );
btnChangeColor->setNoColorString( tr( "Transparent" ) );
btnChangeColor2->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor2->setColorDialogTitle( tr( "Select gradient color" ) );
btnChangeColor2->setContext( "symbology" );
btnChangeColor2->setShowNoColor( true );
btnChangeColor2->setNoColorString( tr( "Transparent" ) );

cboGradientColorRamp->setShowGradientOnly( true );
cboGradientColorRamp->populate( QgsStyleV2::defaultStyle() );

Expand All @@ -1127,11 +1161,9 @@ void QgsShapeburstFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* lay
// set values
btnChangeColor->blockSignals( true );
btnChangeColor->setColor( mLayer->color() );
btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor->blockSignals( false );
btnChangeColor2->blockSignals( true );
btnChangeColor2->setColor( mLayer->color2() );
btnChangeColor2->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnChangeColor2->blockSignals( false );

if ( mLayer->colorType() == QgsShapeburstFillSymbolLayerV2::SimpleTwoColor )
Expand Down Expand Up @@ -1557,6 +1589,11 @@ QgsSvgMarkerSymbolLayerV2Widget::QgsSvgMarkerSymbolLayerV2Widget( const QgsVecto
mOffsetUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
viewGroups->setHeaderHidden( true );

mChangeColorButton->setColorDialogTitle( tr( "Select fill color" ) );
mChangeColorButton->setContext( "symbology" );
mChangeBorderColorButton->setColorDialogTitle( tr( "Select border color" ) );
mChangeColorButton->setContext( "symbology" );

populateList();

connect( viewImages->selectionModel(), SIGNAL( currentChanged( const QModelIndex&, const QModelIndex& ) ), this, SLOT( setName( const QModelIndex& ) ) );
Expand Down Expand Up @@ -2045,6 +2082,11 @@ QgsSVGFillSymbolLayerWidget::QgsSVGFillSymbolLayerWidget( const QgsVectorLayer*
mSvgTreeView->setHeaderHidden( true );
insertIcons();

mChangeColorButton->setColorDialogTitle( tr( "Select fill color" ) );
mChangeColorButton->setContext( "symbology" );
mChangeBorderColorButton->setColorDialogTitle( tr( "Select border color" ) );
mChangeBorderColorButton->setContext( "symbology" );

connect( mSvgListView->selectionModel(), SIGNAL( currentChanged( const QModelIndex&, const QModelIndex& ) ), this, SLOT( setFile( const QModelIndex& ) ) );
connect( mSvgTreeView->selectionModel(), SIGNAL( currentChanged( const QModelIndex&, const QModelIndex& ) ), this, SLOT( populateIcons( const QModelIndex& ) ) );
}
Expand Down Expand Up @@ -2639,6 +2681,10 @@ QgsFontMarkerSymbolLayerV2Widget::QgsFontMarkerSymbolLayerV2Widget( const QgsVec
widgetChar = new CharacterWidget;
scrollArea->setWidget( widgetChar );

btnColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnColor->setColorDialogTitle( tr( "Select symbol color" ) );
btnColor->setContext( "symbology" );

connect( cboFont, SIGNAL( currentFontChanged( const QFont & ) ), this, SLOT( setFontFamily( const QFont& ) ) );
connect( spinSize, SIGNAL( valueChanged( double ) ), this, SLOT( setSize( double ) ) );
connect( btnColor, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( setColor( const QColor& ) ) );
Expand Down Expand Up @@ -2666,7 +2712,6 @@ void QgsFontMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
spinSize->blockSignals( false );
btnColor->blockSignals( true );
btnColor->setColor( mLayer->color() );
btnColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnColor->blockSignals( false );
spinAngle->blockSignals( true );
spinAngle->setValue( mLayer->angle() );
Expand Down
2 changes: 2 additions & 0 deletions src/gui/symbology-ng/qgssymbolslistwidget.cpp
View file
Expand Up @@ -86,6 +86,8 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
// Live color updates are not undoable to child symbol layers
btnColor->setAcceptLiveUpdates( false );
btnColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
btnColor->setColorDialogTitle( tr( "Select color" ) );
btnColor->setContext( "symbology" );
}

void QgsSymbolsListWidget::populateGroups( QString parent, QString prepend )
Expand Down
10 changes: 5 additions & 5 deletions src/ui/symbollayer/widget_ellipse.ui
View file
Expand Up @@ -66,7 +66,7 @@
</widget>
</item>
<item>
<widget class="QgsColorButton" name="btnChangeColorFill">
<widget class="QgsColorButtonV2" name="btnChangeColorFill">
<property name="minimumSize">
<size>
<width>100</width>
Expand Down Expand Up @@ -98,7 +98,7 @@
</widget>
</item>
<item>
<widget class="QgsColorButton" name="btnChangeColorBorder">
<widget class="QgsColorButtonV2" name="btnChangeColorBorder">
<property name="minimumSize">
<size>
<width>100</width>
Expand Down Expand Up @@ -399,9 +399,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
<header>qgscolorbutton.h</header>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
Expand Down
12 changes: 6 additions & 6 deletions src/ui/symbollayer/widget_fontmarker.ui
View file
Expand Up @@ -34,16 +34,16 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="btnColor">
<widget class="QgsColorButtonV2" name="btnColor">
<property name="minimumSize">
<size>
<width>100</width>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<width>120</width>
<height>16777215</height>
</size>
</property>
Expand Down Expand Up @@ -238,9 +238,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
<header>qgscolorbutton.h</header>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
Expand Down
35 changes: 16 additions & 19 deletions src/ui/symbollayer/widget_gradientfill.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>474</width>
<width>494</width>
<height>358</height>
</rect>
</property>
Expand All @@ -23,16 +23,7 @@
<property name="horizontalSpacing">
<number>28</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>1</number>
</property>
<item row="0" column="0">
Expand All @@ -48,16 +39,16 @@
<number>12</number>
</property>
<item>
<widget class="QgsColorButton" name="btnChangeColor">
<widget class="QgsColorButtonV2" name="btnChangeColor">
<property name="minimumSize">
<size>
<width>100</width>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<width>120</width>
<height>16777215</height>
</size>
</property>
Expand All @@ -67,13 +58,19 @@
</widget>
</item>
<item>
<widget class="QgsColorButton" name="btnChangeColor2">
<widget class="QgsColorButtonV2" name="btnChangeColor2">
<property name="minimumSize">
<size>
<width>100</width>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -429,9 +426,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
<header>qgscolorbutton.h</header>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
Expand Down

0 comments on commit 766f078

Please sign in to comment.