From kde-commits Sun Dec 31 19:41:45 2017 From: Scott Petrovic Date: Sun, 31 Dec 2017 19:41:45 +0000 To: kde-commits Subject: [krita/petrovic/theme-update] libs/ui: Fix icons updating when changing themes for the pop up palett Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=151474931925355 Git commit dd0602139ecaedfe72ad4afa2eb0dd62a2cee05d by Scott Petrovic. Committed on 31/12/2017 at 18:14. Pushed by scottpetrovic into branch 'petrovic/theme-update'. Fix icons updating when changing themes for the pop up palette M +12 -1 libs/ui/brushhud/kis_brush_hud.cpp M +2 -0 libs/ui/brushhud/kis_brush_hud.h M +1 -0 libs/ui/canvas/kis_canvas2.cpp M +16 -5 libs/ui/kis_popup_palette.cpp M +3 -0 libs/ui/kis_popup_palette.h https://commits.kde.org/krita/dd0602139ecaedfe72ad4afa2eb0dd62a2cee05d diff --git a/libs/ui/brushhud/kis_brush_hud.cpp b/libs/ui/brushhud/kis_brus= h_hud.cpp index f72cd60541a..60fa77a7ec8 100644 --- a/libs/ui/brushhud/kis_brush_hud.cpp +++ b/libs/ui/brushhud/kis_brush_hud.cpp @@ -82,7 +82,9 @@ KisBrushHud::KisBrushHud(KisCanvasResourceProvider *provi= der, QWidget *parent) = m_d->btnConfigure =3D new QToolButton(this); m_d->btnConfigure->setAutoRaise(true); - m_d->btnConfigure->setIcon(KisIconUtils::loadIcon("applications-system= ")); + + + connect(m_d->btnConfigure, SIGNAL(clicked()), SLOT(slotConfigBrushHud(= ))); = labelLayout->addWidget(m_d->lblPresetIcon); @@ -109,6 +111,8 @@ KisBrushHud::KisBrushHud(KisCanvasResourceProvider *pro= vider, QWidget *parent) m_d->wdgPropertiesArea->setWidget(m_d->wdgProperties); layout->addWidget(m_d->wdgPropertiesArea); = + updateIcons(); + setLayout(layout); setCursor(Qt::ArrowCursor); = @@ -116,6 +120,8 @@ KisBrushHud::KisBrushHud(KisCanvasResourceProvider *pro= vider, QWidget *parent) setAttribute(Qt::WA_NoMousePropagation, true); } = + + KisBrushHud::~KisBrushHud() { } @@ -126,6 +132,11 @@ QSize KisBrushHud::sizeHint() const return QSize(size.width(), parentWidget()->height()); } = +void KisBrushHud::updateIcons() +{ + m_d->btnConfigure->setIcon(KisIconUtils::loadIcon("applications-system= ")); +} + void KisBrushHud::slotReloadProperties() { m_d->presetConnections.clear(); diff --git a/libs/ui/brushhud/kis_brush_hud.h b/libs/ui/brushhud/kis_brush_= hud.h index 091f1dcb3a9..fbecf743c84 100644 --- a/libs/ui/brushhud/kis_brush_hud.h +++ b/libs/ui/brushhud/kis_brush_hud.h @@ -34,6 +34,8 @@ public: void updateProperties(); QSize sizeHint() const override; = + void updateIcons(); + protected: void paintEvent(QPaintEvent *event) override; bool event(QEvent *event) override; diff --git a/libs/ui/canvas/kis_canvas2.cpp b/libs/ui/canvas/kis_canvas2.cpp index f246047649f..a25cf9a5774 100644 --- a/libs/ui/canvas/kis_canvas2.cpp +++ b/libs/ui/canvas/kis_canvas2.cpp @@ -922,6 +922,7 @@ void KisCanvas2::setFavoriteResourceManager(KisFavorite= ResourceManager* favorite m_d->view->resourceProvider(),= m_d->canvasWidget->widget()); connect(m_d->popupPalette, SIGNAL(zoomLevelChanged(int)), this, SLOT(s= lotZoomChanged(int))); connect(m_d->popupPalette, SIGNAL(sigUpdateCanvas()), this, SLOT(updat= eCanvas())); + connect(m_d->view->mainWindow(), SIGNAL(themeChanged()), m_d->popupPal= ette, SLOT(slotUpdateIcons())); = m_d->popupPalette->showPopupPalette(false); } diff --git a/libs/ui/kis_popup_palette.cpp b/libs/ui/kis_popup_palette.cpp index a920ed6f8e5..0e2ab03fb91 100644 --- a/libs/ui/kis_popup_palette.cpp +++ b/libs/ui/kis_popup_palette.cpp @@ -180,7 +180,7 @@ KisPopupPalette::KisPopupPalette(KisViewManager* viewMa= nager, KisCoordinatesConv const int auxButtonSize =3D 35; = m_settingsButton =3D new KisRoundHudButton(this); - m_settingsButton->setIcon(KisIconUtils::loadIcon("configure")); + m_settingsButton->setGeometry(m_popupPaletteSize - 2.2 * auxButtonSize= , m_popupPaletteSize - auxButtonSize, auxButtonSize, auxButtonSize); = @@ -189,7 +189,7 @@ KisPopupPalette::KisPopupPalette(KisViewManager* viewMa= nager, KisCoordinatesConv KisConfig cfg; m_brushHudButton =3D new KisRoundHudButton(this); m_brushHudButton->setCheckable(true); - m_brushHudButton->setOnOffIcons(KisIconUtils::loadIcon("arrow-left"), = KisIconUtils::loadIcon("arrow-right")); + m_brushHudButton->setGeometry(m_popupPaletteSize - 1.0 * auxButtonSize= , m_popupPaletteSize - auxButtonSize, auxButtonSize, auxButtonSize); connect(m_brushHudButton, SIGNAL(toggled(bool)), SLOT(showHudWidget(bo= ol))); @@ -210,7 +210,7 @@ KisPopupPalette::KisPopupPalette(KisViewManager* viewMa= nager, KisCoordinatesConv mirrorMode =3D new KisHighlightedToolButton(this); mirrorMode->setCheckable(true); mirrorMode->setFixedSize(35, 35); - mirrorMode->setIcon(KisIconUtils::loadIcon("symmetry-horizontal")); + mirrorMode->setToolTip(i18n("Mirror Canvas")); connect(mirrorMode, SIGNAL(clicked(bool)), this, SLOT(slotmirroModeCli= cked())); = @@ -218,14 +218,14 @@ KisPopupPalette::KisPopupPalette(KisViewManager* view= Manager, KisCoordinatesConv canvasOnlyButton =3D new KisHighlightedToolButton(this); canvasOnlyButton->setCheckable(true); canvasOnlyButton->setFixedSize(35, 35); - canvasOnlyButton->setIcon(KisIconUtils::loadIcon("document-new")); + canvasOnlyButton->setToolTip(i18n("Canvas Only")); connect(canvasOnlyButton, SIGNAL(clicked(bool)), this, SLOT(slotCanvas= onlyModeClicked())); = zoomToOneHundredPercentButton =3D new QPushButton(this); zoomToOneHundredPercentButton->setText(i18n("100%")); zoomToOneHundredPercentButton->setFixedHeight(35); - zoomToOneHundredPercentButton->setIcon(KisIconUtils::loadIcon("zoom-or= iginal")); + zoomToOneHundredPercentButton->setToolTip(i18n("Zoom to 100%")); connect(zoomToOneHundredPercentButton, SIGNAL(clicked(bool)), this, SL= OT(slotZoomToOneHundredPercentClicked())); = @@ -242,6 +242,7 @@ KisPopupPalette::KisPopupPalette(KisViewManager* viewMa= nager, KisCoordinatesConv = connect(zoomCanvasSlider, SIGNAL(valueChanged(int)), this, SLOT(slotZo= omSliderChanged(int))); = + slotUpdateIcons(); = hLayout->addWidget(mirrorMode); hLayout->addWidget(canvasOnlyButton); @@ -344,6 +345,16 @@ void KisPopupPalette::adjustLayout(const QPoint &p) } } = +void KisPopupPalette::slotUpdateIcons() +{ + zoomToOneHundredPercentButton->setIcon(KisIconUtils::loadIcon("zoom-or= iginal")); + canvasOnlyButton->setIcon(KisIconUtils::loadIcon("document-new")); + mirrorMode->setIcon(KisIconUtils::loadIcon("symmetry-horizontal")); + m_settingsButton->setIcon(KisIconUtils::loadIcon("configure")); + m_brushHud->updateIcons(); + m_brushHudButton->setOnOffIcons(KisIconUtils::loadIcon("arrow-left"), = KisIconUtils::loadIcon("arrow-right")); +} + void KisPopupPalette::showHudWidget(bool visible) { KIS_ASSERT_RECOVER_RETURN(m_brushHud); diff --git a/libs/ui/kis_popup_palette.h b/libs/ui/kis_popup_palette.h index 241cd6d2466..1f054818f90 100644 --- a/libs/ui/kis_popup_palette.h +++ b/libs/ui/kis_popup_palette.h @@ -157,6 +157,9 @@ Q_SIGNALS: void sigEnableChangeFGColor(bool); void sigTriggerTimer(); = +public Q_SLOTS: + void slotUpdateIcons(); + private Q_SLOTS: void slotExternalFgColorChanged(const KoColor &color); void slotEmitColorChanged();