Skip to content
Permalink
Browse files
Complete daily allocation of Qt5 connect transitions
  • Loading branch information
nyalldawson committed Apr 3, 2017
1 parent 86563c8 commit ae59e35dacb83f3fe321ab7523a05e5cdef1014d
Showing with 477 additions and 469 deletions.
  1. +10 −0 doc/api_break.dox
  2. +0 −2 python/gui/qgsdial.sip
  3. +0 −2 python/gui/qgsslider.sip
  4. +11 −11 src/gui/qgscolorbutton.cpp
  5. +2 −2 src/gui/qgscolordialog.cpp
  6. +1 −1 src/gui/qgscolorschemelist.cpp
  7. +3 −3 src/gui/qgscolorswatchgrid.cpp
  8. +8 −8 src/gui/qgscolorwidgets.cpp
  9. +5 −5 src/gui/qgscomposeritemcombobox.cpp
  10. +39 −39 src/gui/qgscompoundcolorwidget.cpp
  11. +8 −8 src/gui/qgsconfigureshortcutsdialog.cpp
  12. +4 −4 src/gui/qgscredentialdialog.cpp
  13. +2 −2 src/gui/qgsdial.cpp
  14. +2 −2 src/gui/qgsdial.h
  15. +2 −2 src/gui/qgsdialog.cpp
  16. +2 −2 src/gui/qgsdockwidget.cpp
  17. +2 −2 src/gui/qgsencodingfiledialog.cpp
  18. +3 −3 src/gui/qgsexpressionlineedit.cpp
  19. +3 −3 src/gui/qgsextentgroupbox.cpp
  20. +1 −1 src/gui/qgsexternalresourcewidget.cpp
  21. +1 −1 src/gui/qgsfieldcombobox.cpp
  22. +8 −8 src/gui/qgsfieldexpressionwidget.cpp
  23. +4 −4 src/gui/qgsfieldmodel.cpp
  24. +2 −2 src/gui/qgsfilewidget.cpp
  25. +2 −2 src/gui/qgsfilterlineedit.cpp
  26. +9 −9 src/gui/qgsgradientcolorrampdialog.cpp
  27. +4 −4 src/gui/qgshistogramwidget.cpp
  28. +16 −16 src/gui/qgsidentifymenu.cpp
  29. +3 −3 src/gui/qgslegendfilterbutton.cpp
  30. +10 −10 src/gui/qgslimitedrandomcolorrampdialog.cpp
  31. +5 −5 src/gui/qgsmanageconnectionsdialog.cpp
  32. +1 −1 src/gui/qgsmapcanvas.cpp
  33. +4 −4 src/gui/qgsmapcanvassnappingutils.cpp
  34. +5 −5 src/gui/qgsmapcanvastracer.cpp
  35. +3 −3 src/gui/qgsmaplayercombobox.cpp
  36. +12 −11 src/gui/qgsmaplayerstylemanagerwidget.cpp
  37. +1 −1 src/gui/qgsmapoverviewcanvas.cpp
  38. +2 −2 src/gui/qgsmaptool.cpp
  39. +2 −2 src/gui/qgsmaptooladvanceddigitizing.cpp
  40. +4 −4 src/gui/qgsmaptoolcapture.cpp
  41. +8 −8 src/gui/qgsmessagebar.cpp
  42. +3 −3 src/gui/qgsmessagelogviewer.cpp
  43. +4 −4 src/gui/qgsnewgeopackagelayerdialog.cpp
  44. +1 −1 src/gui/qgsnewnamedialog.cpp
  45. +2 −2 src/gui/qgsnewvectorlayerdialog.cpp
  46. +8 −8 src/gui/qgsoptionsdialogbase.cpp
  47. +1 −1 src/gui/qgsorderbydialog.cpp
  48. +2 −2 src/gui/qgsowssourceselect.cpp
  49. +1 −1 src/gui/qgspanelwidget.cpp
  50. +11 −11 src/gui/qgspresetcolorrampdialog.cpp
  51. +1 −1 src/gui/qgsprojectionselectionwidget.cpp
  52. +1 −1 src/gui/qgspropertyoverridebutton.cpp
  53. +2 −2 src/gui/qgsquerybuilder.cpp
  54. +6 −6 src/gui/qgsrasterformatsaveoptionswidget.cpp
  55. +6 −6 src/gui/qgsrasterlayersaveasdialog.cpp
  56. +10 −10 src/gui/qgsrasterpyramidsoptionswidget.cpp
  57. +22 −21 src/gui/qgsrelationeditorwidget.cpp
  58. +2 −2 src/gui/qgsscalecombobox.cpp
  59. +3 −3 src/gui/qgsscalerangewidget.cpp
  60. +2 −2 src/gui/qgsscalevisibilitydialog.cpp
  61. +2 −2 src/gui/qgsscalewidget.cpp
  62. +4 −4 src/gui/qgssearchquerybuilder.cpp
  63. +2 −2 src/gui/qgsshortcutsmanager.cpp
  64. +2 −2 src/gui/qgsslider.cpp
  65. +2 −2 src/gui/qgsslider.h
  66. +11 −11 src/gui/qgssourceselectdialog.cpp
  67. +15 −15 src/gui/qgssqlcomposerdialog.cpp
  68. +1 −1 src/gui/qgssublayersdialog.cpp
  69. +5 −5 src/gui/qgssubstitutionlistwidget.cpp
  70. +2 −2 src/gui/qgstablewidgetbase.cpp
  71. +29 −29 src/gui/qgstextformatwidget.cpp
  72. +3 −3 src/gui/qgsuserinputdockwidget.cpp
  73. +4 −4 src/gui/qgsvariableeditorwidget.cpp
  74. +5 −5 src/gui/raster/qgshillshaderendererwidget.cpp
  75. +7 −7 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  76. +6 −6 src/gui/raster/qgsrastertransparencywidget.cpp
  77. +22 −22 src/gui/raster/qgsrendererrasterpropertieswidget.cpp
  78. +2 −2 src/gui/raster/qgssinglebandgrayrendererwidget.cpp
  79. +12 −12 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  80. +8 −8 src/gui/symbology-ng/qgs25drendererwidget.cpp
  81. +12 −12 src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp
  82. +1 −1 src/gui/symbology-ng/qgscptcitycolorrampdialog.cpp
  83. +3 −3 src/gui/symbology-ng/qgsellipsesymbollayerwidget.cpp
  84. +2 −2 src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp
  85. +13 −13 src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp
@@ -940,6 +940,11 @@ QgsDiagramSettings {#qgis_api_break_3_0_QgsDiagramSettings}

- The SizeType enum was removed. Use QgsUnitTypes.RenderUnit instead.

QgsDial {#qgis_api_break_3_0_QgsDial}
-------

- The protected valueChanged slot was removed.


QgsDistanceArea {#qgis_api_break_3_0_QgsDistanceArea}
---------------
@@ -1819,6 +1824,11 @@ QgsSingleSymbolRendererWidget {#qgis_api_break_3_0_QgsSingleSymbolRendere
- sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.
- The Mode enum was removed.

QgsSlider {#qgis_api_break_3_0_QgsSlider}
---------

- The protected valueChanged slot was removed.


QgsSnapper {#qgis_api_break_3_0_QgsSnapper}
----------
@@ -15,8 +15,6 @@ class QgsDial: QDial
signals:
void valueChanged( const QVariant& );

protected slots:
void valueChanged( int );

protected:
virtual void paintEvent( QPaintEvent * event );
@@ -16,8 +16,6 @@ class QgsSlider : QSlider
signals:
void valueChanged( const QVariant& );

protected slots:
void valueChanged( int );

protected:
virtual void paintEvent( QPaintEvent * event );
@@ -63,7 +63,7 @@ QgsColorButton::QgsColorButton( QWidget *parent, const QString &cdt, QgsColorSch

//setup dropdown menu
mMenu = new QMenu( this );
connect( mMenu, SIGNAL( aboutToShow() ), this, SLOT( prepareMenu() ) );
connect( mMenu, &QMenu::aboutToShow, this, &QgsColorButton::prepareMenu );
setMenu( mMenu );
setPopupMode( QToolButton::MenuButtonPopup );
}
@@ -103,7 +103,7 @@ void QgsColorButton::showColorDialog()
colorWidget->setPreviousColor( currentColor );
}

connect( colorWidget, SIGNAL( currentColorChanged( QColor ) ), this, SLOT( setValidTemporaryColor( QColor ) ) );
connect( colorWidget, &QgsCompoundColorWidget::currentColorChanged, this, &QgsColorButton::setValidTemporaryColor );
panel->openPanel( colorWidget );
return;
}
@@ -433,7 +433,7 @@ void QgsColorButton::prepareMenu()
QAction *nullAction = new QAction( tr( "Clear color" ), this );
nullAction->setIcon( createMenuIcon( Qt::transparent, false ) );
mMenu->addAction( nullAction );
connect( nullAction, SIGNAL( triggered() ), this, SLOT( setToNull() ) );
connect( nullAction, &QAction::triggered, this, &QgsColorButton::setToNull );
}

//show default color option if set
@@ -442,15 +442,15 @@ void QgsColorButton::prepareMenu()
QAction *defaultColorAction = new QAction( tr( "Default color" ), this );
defaultColorAction->setIcon( createMenuIcon( mDefaultColor ) );
mMenu->addAction( defaultColorAction );
connect( defaultColorAction, SIGNAL( triggered() ), this, SLOT( setToDefaultColor() ) );
connect( defaultColorAction, &QAction::triggered, this, &QgsColorButton::setToDefaultColor );
}

if ( mShowNoColorOption && mAllowAlpha )
{
QAction *noColorAction = new QAction( mNoColorString, this );
noColorAction->setIcon( createMenuIcon( Qt::transparent, false ) );
mMenu->addAction( noColorAction );
connect( noColorAction, SIGNAL( triggered() ), this, SLOT( setToNoColor() ) );
connect( noColorAction, &QAction::triggered, this, &QgsColorButton::setToNoColor );
}

mMenu->addSeparator();
@@ -484,16 +484,16 @@ void QgsColorButton::prepareMenu()
QgsColorSwatchGridAction *colorAction = new QgsColorSwatchGridAction( *it, mMenu, mContext, this );
colorAction->setBaseColor( mColor );
mMenu->addAction( colorAction );
connect( colorAction, SIGNAL( colorChanged( const QColor & ) ), this, SLOT( setValidColor( const QColor & ) ) );
connect( colorAction, SIGNAL( colorChanged( const QColor & ) ), this, SLOT( addRecentColor( const QColor & ) ) );
connect( colorAction, &QgsColorSwatchGridAction::colorChanged, this, &QgsColorButton::setValidColor );
connect( colorAction, &QgsColorSwatchGridAction::colorChanged, this, &QgsColorButton::addRecentColor );
}
}

mMenu->addSeparator();

QAction *copyColorAction = new QAction( tr( "Copy color" ), this );
mMenu->addAction( copyColorAction );
connect( copyColorAction, SIGNAL( triggered() ), this, SLOT( copyColor() ) );
connect( copyColorAction, &QAction::triggered, this, &QgsColorButton::copyColor );

QAction *pasteColorAction = new QAction( tr( "Paste color" ), this );
//enable or disable paste action based on current clipboard contents. We always show the paste
@@ -508,19 +508,19 @@ void QgsColorButton::prepareMenu()
pasteColorAction->setEnabled( false );
}
mMenu->addAction( pasteColorAction );
connect( pasteColorAction, SIGNAL( triggered() ), this, SLOT( pasteColor() ) );
connect( pasteColorAction, &QAction::triggered, this, &QgsColorButton::pasteColor );

#ifndef Q_OS_MAC
//disabled for OSX, as it is impossible to grab the mouse under OSX
//see note for QWidget::grabMouse() re OSX Cocoa
//http://qt-project.org/doc/qt-4.8/qwidget.html#grabMouse
QAction *pickColorAction = new QAction( tr( "Pick color" ), this );
mMenu->addAction( pickColorAction );
connect( pickColorAction, SIGNAL( triggered() ), this, SLOT( activatePicker() ) );
connect( pickColorAction, &QAction::triggered, this, &QgsColorButton::activatePicker );
#endif
QAction *chooseColorAction = new QAction( tr( "Choose color..." ), this );
mMenu->addAction( chooseColorAction );
connect( chooseColorAction, SIGNAL( triggered() ), this, SLOT( showColorDialog() ) );
connect( chooseColorAction, &QAction::triggered, this, &QgsColorButton::showColorDialog );
}

void QgsColorButton::changeEvent( QEvent *e )
@@ -55,8 +55,8 @@ QgsColorDialog::QgsColorDialog( QWidget *parent, Qt::WindowFlags fl, const QColo

mColorWidget->setAllowAlpha( true );

connect( mColorWidget, SIGNAL( currentColorChanged( QColor ) ), this, SIGNAL( currentColorChanged( QColor ) ) );
connect( this, SIGNAL( rejected() ), this, SLOT( discardColor() ) );
connect( mColorWidget, &QgsCompoundColorWidget::currentColorChanged, this, &QgsColorDialog::currentColorChanged );
connect( this, &QDialog::rejected, this, &QgsColorDialog::discardColor );
}

QColor QgsColorDialog::color() const
@@ -763,7 +763,7 @@ bool QgsColorSwatchDelegate::editorEvent( QEvent *event, QAbstractItemModel *mod
colorWidget->setPanelTitle( tr( "Select color" ) );
colorWidget->setAllowAlpha( true );
colorWidget->setProperty( "index", index );
connect( colorWidget, SIGNAL( currentColorChanged( QColor ) ), this, SLOT( colorChanged() ) );
connect( colorWidget, &QgsCompoundColorWidget::currentColorChanged, this, &QgsColorSwatchDelegate::colorChanged );
panel->openPanel( colorWidget );
return true;
}
@@ -362,10 +362,10 @@ QgsColorSwatchGridAction::QgsColorSwatchGridAction( QgsColorScheme *scheme, QMen
mColorSwatchGrid = new QgsColorSwatchGrid( scheme, context, parent );

setDefaultWidget( mColorSwatchGrid );
connect( mColorSwatchGrid, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mColorSwatchGrid, &QgsColorSwatchGrid::colorChanged, this, &QgsColorSwatchGridAction::setColor );

connect( this, SIGNAL( hovered() ), this, SLOT( onHover() ) );
connect( mColorSwatchGrid, SIGNAL( hovered() ), this, SLOT( onHover() ) );
connect( this, &QAction::hovered, this, &QgsColorSwatchGridAction::onHover );
connect( mColorSwatchGrid, &QgsColorSwatchGrid::hovered, this, &QgsColorSwatchGridAction::onHover );

//hide the action if no colors to be shown
setVisible( !mColorSwatchGrid->colors()->isEmpty() );
@@ -1297,9 +1297,9 @@ QgsColorSliderWidget::QgsColorSliderWidget( QWidget *parent, const ColorComponen
hLayout->addWidget( mSpinBox );
setLayout( hLayout );

connect( mRampWidget, SIGNAL( valueChanged( int ) ), this, SLOT( rampChanged( int ) ) );
connect( mRampWidget, SIGNAL( colorChanged( const QColor ) ), this, SLOT( rampColorChanged( const QColor ) ) );
connect( mSpinBox, SIGNAL( valueChanged( int ) ), this, SLOT( spinChanged( int ) ) );
connect( mRampWidget, &QgsColorRampWidget::valueChanged, this, &QgsColorSliderWidget::rampChanged );
connect( mRampWidget, &QgsColorWidget::colorChanged, this, &QgsColorSliderWidget::rampColorChanged );
connect( mSpinBox, static_cast < void ( QSpinBox::* )( int ) > ( &QSpinBox::valueChanged ), this, &QgsColorSliderWidget::spinChanged );
}

void QgsColorSliderWidget::setComponent( const QgsColorWidget::ColorComponent component )
@@ -1419,8 +1419,8 @@ QgsColorTextWidget::QgsColorTextWidget( QWidget *parent )
mLineEdit->setStyleSheet( QStringLiteral( "QLineEdit { padding-right: %1px; } " )
.arg( mMenuButton->sizeHint().width() + frameWidth + 1 ) );

connect( mLineEdit, SIGNAL( editingFinished() ), this, SLOT( textChanged() ) );
connect( mMenuButton, SIGNAL( clicked() ), this, SLOT( showMenu() ) );
connect( mLineEdit, &QLineEdit::editingFinished, this, &QgsColorTextWidget::textChanged );
connect( mMenuButton, &QAbstractButton::clicked, this, &QgsColorTextWidget::showMenu );

//restore format setting
QgsSettings settings;
@@ -1691,10 +1691,10 @@ QgsColorWidgetAction::QgsColorWidgetAction( QgsColorWidget *colorWidget, QMenu *
, mDismissOnColorSelection( true )
{
setDefaultWidget( mColorWidget );
connect( mColorWidget, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mColorWidget, &QgsColorWidget::colorChanged, this, &QgsColorWidgetAction::setColor );

connect( this, SIGNAL( hovered() ), this, SLOT( onHover() ) );
connect( mColorWidget, SIGNAL( hovered() ), this, SLOT( onHover() ) );
connect( this, &QAction::hovered, this, &QgsColorWidgetAction::onHover );
connect( mColorWidget, &QgsColorWidget::hovered, this, &QgsColorWidgetAction::onHover );
}

void QgsColorWidgetAction::onHover()
@@ -23,17 +23,17 @@ QgsComposerItemComboBox::QgsComposerItemComboBox( QWidget *parent, QgsCompositio
setComposition( composition );

setModelColumn( QgsComposerModel::ItemId );
connect( this, SIGNAL( currentIndexChanged( int ) ), this, SLOT( indexChanged( int ) ) );
connect( mProxyModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SLOT( rowsChanged() ) );
connect( mProxyModel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( rowsChanged() ) );
connect( this, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsComposerItemComboBox::indexChanged );
connect( mProxyModel, &QAbstractItemModel::rowsInserted, this, &QgsComposerItemComboBox::rowsChanged );
connect( mProxyModel, &QAbstractItemModel::rowsRemoved, this, &QgsComposerItemComboBox::rowsChanged );
}

void QgsComposerItemComboBox::setComposition( QgsComposition *composition )
{
delete mProxyModel;
mProxyModel = new QgsComposerProxyModel( composition, this );
connect( mProxyModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SLOT( rowsChanged() ) );
connect( mProxyModel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( rowsChanged() ) );
connect( mProxyModel, &QAbstractItemModel::rowsInserted, this, &QgsComposerItemComboBox::rowsChanged );
connect( mProxyModel, &QAbstractItemModel::rowsRemoved, this, &QgsComposerItemComboBox::rowsChanged );
setModel( mProxyModel );
setModelColumn( QgsComposerModel::ItemId );
mProxyModel->sort( 0, Qt::AscendingOrder );
@@ -73,18 +73,18 @@ QgsCompoundColorWidget::QgsCompoundColorWidget( QWidget *parent, const QColor &c
updateActionsForCurrentScheme();

//listen out for selection changes in list, so we can enable/disable the copy colors option
connect( mSchemeList->selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), this, SLOT( listSelectionChanged( QItemSelection, QItemSelection ) ) );
connect( mSchemeList->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsCompoundColorWidget::listSelectionChanged );
//copy action defaults to disabled
mActionCopyColors->setEnabled( false );

connect( mActionCopyColors, SIGNAL( triggered() ), mSchemeList, SLOT( copyColors() ) );
connect( mActionPasteColors, SIGNAL( triggered() ), mSchemeList, SLOT( pasteColors() ) );
connect( mActionExportColors, SIGNAL( triggered() ), mSchemeList, SLOT( showExportColorsDialog() ) );
connect( mActionImportColors, SIGNAL( triggered() ), mSchemeList, SLOT( showImportColorsDialog() ) );
connect( mActionImportPalette, SIGNAL( triggered() ), this, SLOT( importPalette() ) );
connect( mActionRemovePalette, SIGNAL( triggered() ), this, SLOT( removePalette() ) );
connect( mActionNewPalette, SIGNAL( triggered() ), this, SLOT( newPalette() ) );
connect( mRemoveColorsFromSchemeButton, SIGNAL( clicked() ), mSchemeList, SLOT( removeSelection() ) );
connect( mActionCopyColors, &QAction::triggered, mSchemeList, &QgsColorSchemeList::copyColors );
connect( mActionPasteColors, &QAction::triggered, mSchemeList, &QgsColorSchemeList::pasteColors );
connect( mActionExportColors, &QAction::triggered, mSchemeList, &QgsColorSchemeList::showExportColorsDialog );
connect( mActionImportColors, &QAction::triggered, mSchemeList, &QgsColorSchemeList::showImportColorsDialog );
connect( mActionImportPalette, &QAction::triggered, this, &QgsCompoundColorWidget::importPalette );
connect( mActionRemovePalette, &QAction::triggered, this, &QgsCompoundColorWidget::removePalette );
connect( mActionNewPalette, &QAction::triggered, this, &QgsCompoundColorWidget::newPalette );
connect( mRemoveColorsFromSchemeButton, &QAbstractButton::clicked, mSchemeList, &QgsColorSchemeList::removeSelection );

QMenu *schemeMenu = new QMenu( mSchemeToolButton );
schemeMenu->addAction( mActionCopyColors );
@@ -99,8 +99,8 @@ QgsCompoundColorWidget::QgsCompoundColorWidget( QWidget *parent, const QColor &c
schemeMenu->addAction( mActionShowInButtons );
mSchemeToolButton->setMenu( schemeMenu );

connect( mSchemeComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( schemeIndexChanged( int ) ) );
connect( mSchemeList, SIGNAL( colorSelected( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSchemeComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsCompoundColorWidget::schemeIndexChanged );
connect( mSchemeList, &QgsColorSchemeList::colorSelected, this, &QgsCompoundColorWidget::setColor );

mOldColorLabel->hide();

@@ -209,34 +209,34 @@ QgsCompoundColorWidget::QgsCompoundColorWidget( QWidget *parent, const QColor &c
#endif

//setup connections
connect( mColorBox, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mColorWheel, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mColorText, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mVerticalRamp, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mRedSlider, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mGreenSlider, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mBlueSlider, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mHueSlider, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mValueSlider, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSaturationSlider, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mAlphaSlider, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mColorPreview, SIGNAL( colorChanged( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton1, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton2, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton3, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton4, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton5, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton6, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton7, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton8, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton9, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton10, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton11, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton12, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton13, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton14, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton15, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mSwatchButton16, SIGNAL( colorClicked( QColor ) ), this, SLOT( setColor( QColor ) ) );
connect( mColorBox, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mColorWheel, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mColorText, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mVerticalRamp, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mRedSlider, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mGreenSlider, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mBlueSlider, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mHueSlider, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mValueSlider, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mSaturationSlider, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mAlphaSlider, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mColorPreview, &QgsColorWidget::colorChanged, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton1, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton2, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton3, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton4, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton5, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton6, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton7, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton8, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton9, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton10, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton11, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton12, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton13, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton14, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton15, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
connect( mSwatchButton16, &QgsColorButton::colorClicked, this, &QgsCompoundColorWidget::setColor );
}

QgsCompoundColorWidget::~QgsCompoundColorWidget()
Loading

0 comments on commit ae59e35

Please sign in to comment.