Commit e0ae2cdb authored by Scott Petrovic's avatar Scott Petrovic

update mirror icons so they are themed

parent deed559a
......@@ -45,8 +45,6 @@ select_shape.png
shade.png
shear_horizontal.png
shear_vertical.png
symmetry-horyzontal.png
symmetry-vertical.png
tablet.png
tool_screenshot.png
transparency-disabled.png
......@@ -84,6 +82,8 @@ dark_properties.png
dark_selection-mode_ants.png
dark_selection-mode_invisible.png
dark_selection-mode_mask.png
dark_symmetry-horizontal.png
dark_symmetry-vertical.png
light_select.png
light_pattern.png
......@@ -100,6 +100,9 @@ light_properties.png
light_selection-mode_ants.png
light_selection-mode_invisible.png
light_selection-mode_mask.png
light_symmetry-vertical.png
light_symmetry-horizontal.png
tool_transform/dark_transform_icons_cage.png
tool_transform/dark_transform_icons_liquify_erase.png
......
......@@ -93,8 +93,8 @@ KisMirrorAxis::KisMirrorAxis(KisCanvasResourceProvider* provider, QPointer<KisVi
connect(d->resourceProvider, SIGNAL(mirrorModeChanged()), SLOT(mirrorModeChanged()));
d->mirrorHorizontal = d->resourceProvider->mirrorHorizontal();
d->mirrorVertical = d->resourceProvider->mirrorVertical();
d->horizontalIcon = koIcon("symmetry-horyzontal").pixmap(d->handleSize, QIcon::Normal, QIcon::On);
d->verticalIcon = koIcon("symmetry-vertical").pixmap(d->handleSize, QIcon::Normal, QIcon::On);
d->horizontalIcon = koIcon("dark_symmetry-horizontal").pixmap(d->handleSize, QIcon::Normal, QIcon::On);
d->verticalIcon = koIcon("dark_symmetry-vertical").pixmap(d->handleSize, QIcon::Normal, QIcon::On);
d->horizontalHandleIcon = koIcon("transform-move").pixmap(d->handleSize, QIcon::Normal, QIcon::On);
d->verticalHandleIcon = koIcon("transform-move").pixmap(d->handleSize, QIcon::Normal, QIcon::On);
setVisible(d->mirrorHorizontal || d->mirrorVertical);
......
......@@ -62,6 +62,7 @@
#include "kis_canvas_resource_provider.h"
#include "kis_resource_server_provider.h"
#include "kis_favorite_resource_manager.h"
#include "thememanager.h"
#include "kis_config.h"
#include "widgets/kis_popup_button.h"
......@@ -152,8 +153,9 @@ KisPaintopBox::KisPaintopBox(KisViewManager *view, QWidget *parent, const char *
hMirrorButton = new QToolButton(this);
hMirrorButton->setFixedSize(32, 32);
hMirrorButton->setCheckable(true);
KAction* hMirrorAction = new KAction(i18n("Set horizontal mirror mode"), hMirrorButton);
hMirrorAction->setIcon(koIcon("symmetry-horyzontal"));
hMirrorAction = new KAction(i18n("Set horizontal mirror mode"), hMirrorButton);
hMirrorAction->setIcon(themedIcon("symmetry-horizontal"));
hMirrorAction->setCheckable(true);
hMirrorButton->setDefaultAction(hMirrorAction);
m_view->actionCollection()->addAction("hmirror_action", hMirrorAction);
......@@ -161,8 +163,9 @@ KisPaintopBox::KisPaintopBox(KisViewManager *view, QWidget *parent, const char *
vMirrorButton = new QToolButton(this);
vMirrorButton->setFixedSize(32, 32);
vMirrorButton->setCheckable(true);
KAction* vMirrorAction = new KAction(i18n("Set vertical mirror mode"), vMirrorButton);
vMirrorAction->setIcon(koIcon("symmetry-vertical"));
vMirrorAction = new KAction(i18n("Set vertical mirror mode"), vMirrorButton);
vMirrorAction->setIcon(themedIcon("symmetry-vertical"));
vMirrorAction->setCheckable(true);
vMirrorButton->setDefaultAction(vMirrorAction);
m_view->actionCollection()->addAction("vmirror_action", vMirrorAction);
......@@ -347,6 +350,9 @@ KisPaintopBox::KisPaintopBox(KisViewManager *view, QWidget *parent, const char *
connect(m_favoriteResourceManager, SIGNAL(sigSetFGColor(KoColor)), m_resourceProvider, SLOT(slotSetFGColor(KoColor)));
connect(m_favoriteResourceManager, SIGNAL(sigSetBGColor(KoColor)), m_resourceProvider, SLOT(slotSetBGColor(KoColor)));
connect(m_favoriteResourceManager, SIGNAL(sigEnableChangeColor(bool)), m_resourceProvider, SLOT(slotResetEnableFGChange(bool)));
connect(view->mainWindow(), SIGNAL(themeChanged()), this, SLOT(slotUpdateSelectionIcon()));
}
KisPaintopBox::~KisPaintopBox()
......@@ -981,7 +987,7 @@ void KisPaintopBox::slotToggleAlphaLockMode(bool checked)
void KisPaintopBox::toggleHighlightedButton(QToolButton* m_tool)
{
palette_highlight.setColor(QPalette::Button, palette.color(QPalette::Highlight));
palette_highlight.setColor(QPalette::Button, palette.color(QPalette::Base));
if (m_tool->isChecked())
m_tool->setPalette(this->palette_highlight);
......@@ -1072,3 +1078,9 @@ void KisPaintopBox::slotEraserBrushSizeToggled(bool value)
KisConfig cfg;
cfg.setUseEraserBrushSize(m_eraserBrushSizeEnabled);
}
void KisPaintopBox::slotUpdateSelectionIcon()
{
hMirrorAction->setIcon(themedIcon("symmetry-horizontal"));
vMirrorAction->setIcon(themedIcon("symmetry-vertical"));
}
......@@ -26,17 +26,20 @@
#include <QWidget>
#include <QList>
#include <KoID.h>
#include <KoInputDevice.h>
#include <kis_types.h>
#include <kis_paintop_settings.h>
#include <kaction.h>
#include "kis_locked_properties_proxy.h"
#include "kis_locked_properties_server.h"
#include "kis_locked_properties.h"
#include "kis_config.h"
class QToolButton;
class QPushButton;
class QString;
......@@ -154,8 +157,8 @@ private slots:
void slotSaveLockedOptionToPreset(KisPropertiesConfiguration* p);
void slotDropLockedOption(KisPropertiesConfiguration* p);
void slotDirtyPresetToggled(bool);
void slotEraserBrushSizeToggled(bool);
void slotEraserBrushSizeToggled(bool);
void slotUpdateSelectionIcon();
private:
KisCanvasResourceProvider* m_resourceProvider;
......@@ -190,6 +193,9 @@ private:
int normalBrushSize; // when toggling between eraser mode
int eraserBrushSize;
KAction* hMirrorAction;
KAction* vMirrorAction;
struct TabletToolID {
TabletToolID(const KoInputDevice& dev) {
uniqueID = dev.uniqueTabletId();
......
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