Commit 2a254dc4 authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Show the icon of the currently selected preset instead of the icon of the engine.

This makes it a bit easier to tell what the current preset is.

Of course, the real question is whether it isn't more consistent to do this to the
preset drop down instead of the settings, but on the other hand it should make the
settings easier to discover.
parent 2c43afe1
......@@ -70,6 +70,7 @@
#include "kis_config.h"
#include "widgets/kis_popup_button.h"
#include "widgets/kis_iconwidget.h"
#include "widgets/kis_tool_options_popup.h"
#include "widgets/kis_paintop_presets_popup.h"
#include "widgets/kis_tool_options_popup.h"
......@@ -130,7 +131,7 @@ KisPaintopBox::KisPaintopBox(KisViewManager *view, QWidget *parent, const char *
m_toolOptionsPopupButton->setFixedSize(iconsize, iconsize);
}
m_brushEditorPopupButton = new KisPopupButton(this);
m_brushEditorPopupButton = new KisIconWidget(this);
m_brushEditorPopupButton->setIcon(KisIconUtils::loadIcon("paintop_settings_02"));
m_brushEditorPopupButton->setToolTip(i18n("Edit brush settings"));
m_brushEditorPopupButton->setFixedSize(iconsize, iconsize);
......@@ -614,10 +615,8 @@ void KisPaintopBox::setCurrentPaintop(KisPaintOpPresetSP preset)
// load the current brush engine icon for the brush editor toolbar button
KisPaintOpFactory* paintOp = KisPaintOpRegistry::instance()->get(paintop.id());
QString pixFilename = KoResourcePaths::findResource("kis_images", paintOp->pixmap());
m_brushEditorPopupButton->setIcon(QIcon(pixFilename));
m_brushEditorPopupButton->slotSetItem(preset.data());
m_presetsPopup->setCurrentPaintOpId(paintop.id());
......
......@@ -52,6 +52,7 @@ class KoCanvasController;
class KisViewManager;
class KisCanvasResourceProvider;
class KisPopupButton;
class KisIconWidget;
class KisToolOptionsPopup;
class KisPaintOpPresetsPopup;
class KisPaintOpPresetsChooserPopup;
......@@ -187,7 +188,7 @@ private:
KisPopupButton* m_toolOptionsPopupButton;
KisPresetSaveWidget* m_savePresetWidget;
KisPopupButton* m_brushEditorPopupButton;
KisIconWidget* m_brushEditorPopupButton;
KisPopupButton* m_presetSelectorPopupButton;
KisCompositeOpComboBox* m_cmbCompositeOp;
QToolButton* m_eraseModeButton;
......
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