[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/petrovic/theme-update] plugins/dockers/advancedcolorselector: Update icon when theme changed 
From:       Scott Petrovic <null () kde ! org>
Date:       2018-01-01 17:10:00
Message-ID: E1eW3b6-0001T3-7f () code ! kde ! org
[Download RAW message or body]

Git commit 7ef2ef54fc8be1e2f522af08223b6e4bc3433ea6 by Scott Petrovic.
Committed on 01/01/2018 at 17:09.
Pushed by scottpetrovic into branch 'petrovic/theme-update'.

Update icon when theme changed for advanced color selector configure button

M  +7    -0    plugins/dockers/advancedcolorselector/kis_color_selector.cpp
M  +4    -0    plugins/dockers/advancedcolorselector/kis_color_selector.h
M  +5    -0    plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp
M  +3    -0    plugins/dockers/advancedcolorselector/kis_color_selector_container.h
M  +4    -0    plugins/dockers/advancedcolorselector/kis_color_selector_ng_docker_widget.cpp

https://commits.kde.org/krita/7ef2ef54fc8be1e2f522af08223b6e4bc3433ea6

diff --git a/plugins/dockers/advancedcolorselector/kis_color_selector.cpp \
b/plugins/dockers/advancedcolorselector/kis_color_selector.cpp index 1f3e9389692..451d7afca1c 100644
--- a/plugins/dockers/advancedcolorselector/kis_color_selector.cpp
+++ b/plugins/dockers/advancedcolorselector/kis_color_selector.cpp
@@ -151,6 +151,12 @@ void KisColorSelector::updateSettings()
     setConfiguration(KisColorSelectorConfiguration::fromString(cfg.readEntry("colorSelectorConfiguration", \
KisColorSelectorConfiguration().toString())));  }
 
+void KisColorSelector::updateIcons() {
+    if (m_button) {
+        m_button->setIcon(KisIconUtils::loadIcon("configure"));
+    }
+}
+
 void KisColorSelector::reset()
 {
     KisColorSelectorBase::reset();
@@ -338,6 +344,7 @@ void KisColorSelector::init()
     if(displaySettingsButton()) {
         m_button = new QPushButton(this);
         m_button->setIcon(KisIconUtils::loadIcon("configure"));
+        m_button->setFlat(true);
         connect(m_button, SIGNAL(clicked()), SIGNAL(settingsButtonClicked()));
     }
 
diff --git a/plugins/dockers/advancedcolorselector/kis_color_selector.h \
b/plugins/dockers/advancedcolorselector/kis_color_selector.h index f349bf1b9a9..b28c2844fe4 100644
--- a/plugins/dockers/advancedcolorselector/kis_color_selector.h
+++ b/plugins/dockers/advancedcolorselector/kis_color_selector.h
@@ -42,10 +42,14 @@ public:
     KisColorSelectorConfiguration configuration() const;
     void setColor(const KoColor &color) override;
 
+    /// update icons when a theme update happens
+    void updateIcons();
+
 public Q_SLOTS:
     void reset() override;
     void updateSettings() override;
 
+
 Q_SIGNALS:
     void settingsButtonClicked();
 
diff --git a/plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp \
b/plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp index 8d8a57e00e5..7389619f64e \
                100644
--- a/plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp
+++ b/plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp
@@ -87,6 +87,11 @@ void KisColorSelectorContainer::unsetCanvas()
     m_canvas = 0;
 }
 
+void KisColorSelectorContainer::slotUpdateIcons()
+{
+    m_colorSelector->updateIcons();
+}
+
 void KisColorSelectorContainer::setCanvas(KisCanvas2* canvas)
 {
     if (m_canvas) {
diff --git a/plugins/dockers/advancedcolorselector/kis_color_selector_container.h \
b/plugins/dockers/advancedcolorselector/kis_color_selector_container.h index 27c32fa151b..6398d4245af \
                100644
--- a/plugins/dockers/advancedcolorselector/kis_color_selector_container.h
+++ b/plugins/dockers/advancedcolorselector/kis_color_selector_container.h
@@ -38,6 +38,9 @@ public:
 
     enum ShadeSelectorType{MyPaintSelector, MinimalSelector, NoSelector};
 
+public Q_SLOTS:
+    void slotUpdateIcons();
+
 Q_SIGNALS:
     void openSettings();
     void settingsChanged();
diff --git a/plugins/dockers/advancedcolorselector/kis_color_selector_ng_docker_widget.cpp \
b/plugins/dockers/advancedcolorselector/kis_color_selector_ng_docker_widget.cpp index \
                fecb32d29c4..2d2fd45bbbd 100644
--- a/plugins/dockers/advancedcolorselector/kis_color_selector_ng_docker_widget.cpp
+++ b/plugins/dockers/advancedcolorselector/kis_color_selector_ng_docker_widget.cpp
@@ -107,6 +107,8 @@ void KisColorSelectorNgDockerWidget::unsetCanvas()
     m_commonColorsWidget->unsetCanvas();
     m_colorHistoryWidget->unsetCanvas();
     m_colorSelectorContainer->unsetCanvas();
+
+    disconnect(m_canvas->viewManager()->mainWindow(), SIGNAL(themeChanged()), m_colorSelectorContainer, \
SLOT(slotUpdateIcons()));  }
 
 void KisColorSelectorNgDockerWidget::setCanvas(KisCanvas2 *canvas)
@@ -132,6 +134,8 @@ void KisColorSelectorNgDockerWidget::setCanvas(KisCanvas2 *canvas)
 
         actionCollection->addAction("show_color_history", m_colorHistoryAction);
         actionCollection->addAction("show_common_colors", m_commonColorsAction);
+
+        connect(m_canvas->viewManager()->mainWindow(), SIGNAL(themeChanged()), m_colorSelectorContainer, \
SLOT(slotUpdateIcons()));  }
 
     reactOnLayerChange();


[prev in list] [next in list] [prev in thread] [next in thread]