Skip to content

Commit 738107a

Browse files
nyalldawsonnyalldawson
committed
[composer] Change remaining color push buttons into QgsColorButtons
1 parent 61c3704 commit 738107a

10 files changed

+93
-77
lines changed

‎src/app/composer/qgscomposerlabelwidget.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,15 @@ void QgsComposerLabelWidget::on_mMarginDoubleSpinBox_valueChanged( double d )
113113
}
114114
}
115115

116-
void QgsComposerLabelWidget::on_mFontColorButton_clicked()
116+
void QgsComposerLabelWidget::on_mFontColorButton_colorChanged( const QColor &newLabelColor )
117117
{
118118
if ( !mComposerLabel )
119119
{
120120
return;
121121
}
122-
QColor newColor = QColorDialog::getColor( mComposerLabel->fontColor() );
123-
if ( !newColor.isValid() )
124-
{
125-
return;
126-
}
127-
mComposerLabel->beginCommand( tr( "Label font changed" ) );
128-
mComposerLabel->setFontColor( newColor );
122+
123+
mComposerLabel->beginCommand( tr( "Label color changed" ) );
124+
mComposerLabel->setFontColor( newLabelColor );
129125
mComposerLabel->endCommand();
130126
}
131127

@@ -241,6 +237,7 @@ void QgsComposerLabelWidget::setGuiElementValues()
241237
mLeftRadioButton->setChecked( mComposerLabel->hAlign() == Qt::AlignLeft );
242238
mCenterRadioButton->setChecked( mComposerLabel->hAlign() == Qt::AlignHCenter );
243239
mRightRadioButton->setChecked( mComposerLabel->hAlign() == Qt::AlignRight );
240+
mFontColorButton->setColor( mComposerLabel->fontColor() );
244241
blockAllSignals( false );
245242
}
246243

@@ -255,4 +252,5 @@ void QgsComposerLabelWidget::blockAllSignals( bool block )
255252
mLeftRadioButton->blockSignals( block );
256253
mCenterRadioButton->blockSignals( block );
257254
mRightRadioButton->blockSignals( block );
255+
mFontColorButton->blockSignals( block );
258256
}

‎src/app/composer/qgscomposerlabelwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class QgsComposerLabelWidget: public QWidget, private Ui::QgsComposerLabelWidget
3737
void on_mFontButton_clicked();
3838
void on_mInsertExpressionButton_clicked();
3939
void on_mMarginDoubleSpinBox_valueChanged( double d );
40-
void on_mFontColorButton_clicked();
40+
void on_mFontColorButton_colorChanged( const QColor& newLabelColor );
4141
void on_mCenterRadioButton_clicked();
4242
void on_mLeftRadioButton_clicked();
4343
void on_mRightRadioButton_clicked();

‎src/app/composer/qgscomposerlegendwidget.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ void QgsComposerLegendWidget::setGuiElements()
197197
{
198198
mMapComboBox->setCurrentIndex( mMapComboBox->findData( -1 ) );
199199
}
200+
mFontColorButton->setColor( mLegend->fontColor() );
200201
blockAllSignals( false );
201202
}
202203

@@ -472,23 +473,15 @@ void QgsComposerLegendWidget::on_mItemFontButton_clicked()
472473
}
473474
}
474475

475-
void QgsComposerLegendWidget::on_mFontColorPushButton_clicked()
476+
void QgsComposerLegendWidget::on_mFontColorButton_colorChanged( const QColor& newFontColor )
476477
{
477478
if ( !mLegend )
478479
{
479480
return;
480481
}
481482

482-
QColor oldColor = mLegend->fontColor();
483-
QColor newColor = QColorDialog::getColor( oldColor, 0 );
484-
485-
if ( !newColor.isValid() ) //user canceled the dialog
486-
{
487-
return;
488-
}
489-
490483
mLegend->beginCommand( tr( "Legend font color changed" ) );
491-
mLegend->setFontColor( newColor );
484+
mLegend->setFontColor( newFontColor );
492485
mLegend->update();
493486
mLegend->endCommand();
494487
}
@@ -947,6 +940,7 @@ void QgsComposerLegendWidget::blockAllSignals( bool b )
947940
mIconLabelSpaceSpinBox->blockSignals( b );
948941
mBoxSpaceSpinBox->blockSignals( b );
949942
mColumnSpaceSpinBox->blockSignals( b );
943+
mFontColorButton->blockSignals( b );
950944
}
951945

952946
void QgsComposerLegendWidget::refreshMapComboBox()

‎src/app/composer/qgscomposerlegendwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
7171
void on_mGroupFontButton_clicked();
7272
void on_mLayerFontButton_clicked();
7373
void on_mItemFontButton_clicked();
74-
void on_mFontColorPushButton_clicked();
74+
void on_mFontColorButton_colorChanged( const QColor& newFontColor );
7575
void on_mBoxSpaceSpinBox_valueChanged( double d );
7676
void on_mColumnSpaceSpinBox_valueChanged( double d );
7777
void on_mCheckBoxAutoUpdate_stateChanged( int state );

‎src/app/composer/qgscomposerscalebarwidget.cpp

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,9 @@ void QgsComposerScaleBarWidget::setGuiElements()
171171
mUnitLabelLineEdit->setText( mComposerScaleBar->unitLabeling() );
172172
mLineJoinStyleCombo->setPenJoinStyle( mComposerScaleBar->lineJoinStyle() );
173173
mLineCapStyleCombo->setPenCapStyle( mComposerScaleBar->lineCapStyle() );
174+
mFontColorButton->setColor( mComposerScaleBar->fontColor() );
175+
mFillColorButton->setColor( mComposerScaleBar->brush().color() );
176+
mStrokeColorButton->setColor( mComposerScaleBar->pen().color() );
174177

175178
//map combo box
176179
if ( mComposerScaleBar->composerMap() )
@@ -301,21 +304,13 @@ void QgsComposerScaleBarWidget::on_mFontButton_clicked()
301304
mComposerScaleBar->update();
302305
}
303306

304-
void QgsComposerScaleBarWidget::on_mFontColorPushButton_clicked()
307+
void QgsComposerScaleBarWidget::on_mFontColorButton_colorChanged( const QColor& newColor )
305308
{
306309
if ( !mComposerScaleBar )
307310
{
308311
return;
309312
}
310313

311-
QColor oldColor = mComposerScaleBar->fontColor();
312-
QColor newColor = QColorDialog::getColor( oldColor, 0 );
313-
314-
if ( !newColor.isValid() ) //user canceled the dialog
315-
{
316-
return;
317-
}
318-
319314
mComposerScaleBar->beginCommand( tr( "Scalebar font color changed" ) );
320315
disconnectUpdateSignal();
321316
mComposerScaleBar->setFontColor( newColor );
@@ -324,21 +319,13 @@ void QgsComposerScaleBarWidget::on_mFontColorPushButton_clicked()
324319
mComposerScaleBar->endCommand();
325320
}
326321

327-
void QgsComposerScaleBarWidget::on_mColorPushButton_clicked()
322+
void QgsComposerScaleBarWidget::on_mFillColorButton_colorChanged( const QColor& newColor )
328323
{
329324
if ( !mComposerScaleBar )
330325
{
331326
return;
332327
}
333328

334-
QColor oldColor = mComposerScaleBar->brush().color();
335-
QColor newColor = QColorDialog::getColor( oldColor, 0 );
336-
337-
if ( !newColor.isValid() ) //user canceled the dialog
338-
{
339-
return;
340-
}
341-
342329
mComposerScaleBar->beginCommand( tr( "Scalebar color changed" ) );
343330
disconnectUpdateSignal();
344331
QBrush newBrush( newColor );
@@ -348,21 +335,13 @@ void QgsComposerScaleBarWidget::on_mColorPushButton_clicked()
348335
mComposerScaleBar->endCommand();
349336
}
350337

351-
void QgsComposerScaleBarWidget::on_mStrokeColorPushButton_clicked()
338+
void QgsComposerScaleBarWidget::on_mStrokeColorButton_colorChanged( const QColor& newColor )
352339
{
353340
if ( !mComposerScaleBar )
354341
{
355342
return;
356343
}
357344

358-
QColor oldColor = mComposerScaleBar->pen().color();
359-
QColor newColor = QColorDialog::getColor( oldColor, 0 );
360-
361-
if ( !newColor.isValid() ) //user canceled the dialog
362-
{
363-
return;
364-
}
365-
366345
mComposerScaleBar->beginCommand( tr( "Scalebar stroke color changed" ) );
367346
disconnectUpdateSignal();
368347
QPen newPen = mComposerScaleBar->pen();
@@ -462,8 +441,8 @@ void QgsComposerScaleBarWidget::toggleStyleSpecificControls( const QString& styl
462441
mGroupBoxSegments->setCollapsed( true );
463442
mLabelBarSpaceSpinBox->setEnabled( false );
464443
mLineWidthSpinBox->setEnabled( false );
465-
mColorPushButton->setEnabled( false );
466-
mStrokeColorPushButton->setEnabled( false );
444+
mFillColorButton->setEnabled( false );
445+
mStrokeColorButton->setEnabled( false );
467446
mLineJoinStyleCombo->setEnabled( false );
468447
mLineCapStyleCombo->setEnabled( false );
469448
}
@@ -474,8 +453,8 @@ void QgsComposerScaleBarWidget::toggleStyleSpecificControls( const QString& styl
474453
mGroupBoxSegments->setEnabled( true );
475454
mLabelBarSpaceSpinBox->setEnabled( true );
476455
mLineWidthSpinBox->setEnabled( true );
477-
mColorPushButton->setEnabled( true );
478-
mStrokeColorPushButton->setEnabled( true );
456+
mFillColorButton->setEnabled( true );
457+
mStrokeColorButton->setEnabled( true );
479458
if ( style == "Single Box" || style == "Double Box" )
480459
{
481460
mLineJoinStyleCombo->setEnabled( true );
@@ -600,6 +579,9 @@ void QgsComposerScaleBarWidget::blockMemberSignals( bool block )
600579
mUnitsComboBox->blockSignals( block );
601580
mLineJoinStyleCombo->blockSignals( block );
602581
mLineCapStyleCombo->blockSignals( block );
582+
mFontColorButton->blockSignals( block );
583+
mFillColorButton->blockSignals( block );
584+
mStrokeColorButton->blockSignals( block );
603585
}
604586

605587
void QgsComposerScaleBarWidget::connectUpdateSignal()

‎src/app/composer/qgscomposerscalebarwidget.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class QgsComposerScaleBarWidget: public QWidget, private Ui::QgsComposerScaleBar
4141
void on_mNumberOfSegmentsSpinBox_valueChanged( int i );
4242
void on_mUnitLabelLineEdit_textChanged( const QString& text );
4343
void on_mMapUnitsPerBarUnitSpinBox_valueChanged( double d );
44-
void on_mColorPushButton_clicked();
45-
void on_mStrokeColorPushButton_clicked();
4644
void on_mFontButton_clicked();
47-
void on_mFontColorPushButton_clicked();
45+
void on_mFontColorButton_colorChanged( const QColor& newColor );
46+
void on_mFillColorButton_colorChanged( const QColor& newColor );
47+
void on_mStrokeColorButton_colorChanged( const QColor& newColor );
4848
void on_mStyleComboBox_currentIndexChanged( const QString& text );
4949
void on_mLabelBarSpaceSpinBox_valueChanged( double d );
5050
void on_mBoxSizeSpinBox_valueChanged( double d );

‎src/ui/qgscomposerlabelwidgetbase.ui

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="margin">
26+
<property name="leftMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="topMargin">
30+
<number>0</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="bottomMargin">
2736
<number>0</number>
2837
</property>
2938
<item>
@@ -52,8 +61,8 @@
5261
<rect>
5362
<x>0</x>
5463
<y>0</y>
55-
<width>298</width>
56-
<height>681</height>
64+
<width>302</width>
65+
<height>682</height>
5766
</rect>
5867
</property>
5968
<layout class="QVBoxLayout" name="mainLayout">
@@ -107,7 +116,7 @@
107116
</widget>
108117
</item>
109118
<item>
110-
<widget class="QPushButton" name="mFontColorButton">
119+
<widget class="QgsColorButton" name="mFontColorButton">
111120
<property name="text">
112121
<string>Font color...</string>
113122
</property>
@@ -310,6 +319,11 @@
310319
</widget>
311320
<layoutdefault spacing="6" margin="11"/>
312321
<customwidgets>
322+
<customwidget>
323+
<class>QgsColorButton</class>
324+
<extends>QPushButton</extends>
325+
<header>qgscolorbutton.h</header>
326+
</customwidget>
313327
<customwidget>
314328
<class>QgsCollapsibleGroupBoxBasic</class>
315329
<extends>QGroupBox</extends>
@@ -320,7 +334,7 @@
320334
<resources/>
321335
<connections/>
322336
<buttongroups>
323-
<buttongroup name="buttonGroup"/>
324337
<buttongroup name="buttonGroup_2"/>
338+
<buttongroup name="buttonGroup"/>
325339
</buttongroups>
326340
</ui>

‎src/ui/qgscomposerlegendwidgetbase.ui

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<rect>
6565
<x>0</x>
6666
<y>0</y>
67-
<width>377</width>
68-
<height>1251</height>
67+
<width>375</width>
68+
<height>1320</height>
6969
</rect>
7070
</property>
7171
<layout class="QVBoxLayout" name="mainLayout">
@@ -408,7 +408,7 @@
408408
<property name="collapsed" stdset="0">
409409
<bool>true</bool>
410410
</property>
411-
<layout class="QVBoxLayout" name="verticalLayout_4">
411+
<layout class="QVBoxLayout" name="verticalLayout_3">
412412
<item>
413413
<widget class="QPushButton" name="mTitleFontButton">
414414
<property name="sizePolicy">
@@ -444,7 +444,7 @@
444444
</widget>
445445
</item>
446446
<item>
447-
<widget class="QPushButton" name="mFontColorPushButton">
447+
<widget class="QgsColorButton" name="mFontColorButton">
448448
<property name="text">
449449
<string>Font color...</string>
450450
</property>
@@ -817,6 +817,11 @@
817817
</widget>
818818
<layoutdefault spacing="6" margin="11"/>
819819
<customwidgets>
820+
<customwidget>
821+
<class>QgsColorButton</class>
822+
<extends>QPushButton</extends>
823+
<header>qgscolorbutton.h</header>
824+
</customwidget>
820825
<customwidget>
821826
<class>QgsCollapsibleGroupBoxBasic</class>
822827
<extends>QGroupBox</extends>

‎src/ui/qgscomposerpicturewidgetbase.ui

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>315</width>
9+
<width>332</width>
1010
<height>572</height>
1111
</rect>
1212
</property>
@@ -23,7 +23,16 @@
2323
<property name="spacing">
2424
<number>0</number>
2525
</property>
26-
<property name="margin">
26+
<property name="leftMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="topMargin">
30+
<number>0</number>
31+
</property>
32+
<property name="rightMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="bottomMargin">
2736
<number>0</number>
2837
</property>
2938
<item>
@@ -52,7 +61,7 @@
5261
<rect>
5362
<x>0</x>
5463
<y>0</y>
55-
<width>297</width>
64+
<width>314</width>
5665
<height>589</height>
5766
</rect>
5867
</property>
@@ -167,7 +176,7 @@
167176
<item>
168177
<widget class="QToolButton" name="mPictureExpressionButton">
169178
<property name="sizePolicy">
170-
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
179+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
171180
<horstretch>0</horstretch>
172181
<verstretch>0</verstretch>
173182
</sizepolicy>
@@ -389,7 +398,7 @@
389398
<customwidget>
390399
<class>QgsCollapsibleGroupBoxBasic</class>
391400
<extends>QGroupBox</extends>
392-
<header>qgscollapsiblegroupbox.h</header>
401+
<header location="global">qgscollapsiblegroupbox.h</header>
393402
<container>1</container>
394403
</customwidget>
395404
</customwidgets>

0 commit comments

Comments
 (0)