Commit 74348da7 authored by Timothée Giet's avatar Timothée Giet
Browse files

use selected preset icon on preset chooser

use selected preset icon on preset chooser instead of preset editor

it seems more obvious for some users that clicking on the preset icon
should open the preset selector, so changing that...
parent 0b18655f
...@@ -114,7 +114,7 @@ KisPaintopBox::KisPaintopBox(KisViewManager *viewManager, QWidget *parent, const ...@@ -114,7 +114,7 @@ KisPaintopBox::KisPaintopBox(KisViewManager *viewManager, QWidget *parent, const
m_brushEditorPopupButton->setIconSize(QSize(iconsize, iconsize)); m_brushEditorPopupButton->setIconSize(QSize(iconsize, iconsize));
m_brushEditorPopupButton->setFlat(true); m_brushEditorPopupButton->setFlat(true);
m_presetSelectorPopupButton = new KisPopupButton(this); m_presetSelectorPopupButton = new KisIconWidget(this);
m_presetSelectorPopupButton->setIcon(KisIconUtils::loadIcon("paintop_settings_01")); m_presetSelectorPopupButton->setIcon(KisIconUtils::loadIcon("paintop_settings_01"));
m_presetSelectorPopupButton->setToolTip(i18n("Choose brush preset")); m_presetSelectorPopupButton->setToolTip(i18n("Choose brush preset"));
m_presetSelectorPopupButton->setFixedSize(buttonsize, buttonsize); m_presetSelectorPopupButton->setFixedSize(buttonsize, buttonsize);
...@@ -653,8 +653,8 @@ void KisPaintopBox::setCurrentPaintop(KisPaintOpPresetSP preset) ...@@ -653,8 +653,8 @@ void KisPaintopBox::setCurrentPaintop(KisPaintOpPresetSP preset)
m_presetConnections.addConnection(m_optionWidget, SIGNAL(sigDropLockedConfig(KisPropertiesConfigurationSP)), this, SLOT(slotDropLockedOption(KisPropertiesConfigurationSP))); m_presetConnections.addConnection(m_optionWidget, SIGNAL(sigDropLockedConfig(KisPropertiesConfigurationSP)), this, SLOT(slotDropLockedOption(KisPropertiesConfigurationSP)));
// load the current brush engine icon for the brush editor toolbar button // load the current preset icon to the preset selector toolbar button
m_brushEditorPopupButton->setThumbnail(preset->image()); m_presetSelectorPopupButton->setThumbnail(preset->image());
m_presetsEditor->editorWidget()->setCurrentPaintOpId(paintop.id()); m_presetsEditor->editorWidget()->setCurrentPaintOpId(paintop.id());
......
...@@ -180,7 +180,7 @@ private: ...@@ -180,7 +180,7 @@ private:
KisPresetSaveWidget* m_savePresetWidget {0}; KisPresetSaveWidget* m_savePresetWidget {0};
KisIconWidget* m_brushEditorPopupButton {0}; KisIconWidget* m_brushEditorPopupButton {0};
KisPopupButton* m_presetSelectorPopupButton {0}; KisIconWidget* m_presetSelectorPopupButton {0};
KisCompositeOpComboBox* m_cmbCompositeOp {0}; KisCompositeOpComboBox* m_cmbCompositeOp {0};
QToolButton* m_eraseModeButton {0}; QToolButton* m_eraseModeButton {0};
QToolButton* m_alphaLockButton {0}; QToolButton* m_alphaLockButton {0};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment