OpenToonz - An open-source full-featured 2D animation creation software
C
add better getters for icon properties
konerofd681f1e95da
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qssindex 0200cc8e8..cb822cd45 100644--- a/stuff/config/qss/Blue/Blue.qss+++ b/stuff/config/qss/Blue/Blue.qss@@ -12,6 +12,8 @@ QToolBar * {}:TOONZCOLORS {-bg-color: #43464d;+ -icon-base-opacity: 0.8;+ -icon-disabled-opacity: 0.3;-icon-base-color: #dfdfdf;-icon-active-color: white;-icon-selected-color: white;diff --git a/stuff/config/qss/Clay/Clay.qss b/stuff/config/qss/Clay/Clay.qssindex 1776dceca..c7edbcb90 100644--- a/stuff/config/qss/Clay/Clay.qss+++ b/stuff/config/qss/Clay/Clay.qss@@ -12,6 +12,8 @@ QToolBar * {}:TOONZCOLORS {-bg-color: #514d4c;+ -icon-base-opacity: 0.8;+ -icon-disabled-opacity: 0.3;-icon-base-color: #dfdfdf;-icon-active-color: white;-icon-selected-color: white;diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qssindex 989605c72..dcce9c5b7 100644--- a/stuff/config/qss/Dark/Dark.qss+++ b/stuff/config/qss/Dark/Dark.qss@@ -12,6 +12,8 @@ QToolBar * {}:TOONZCOLORS {-bg-color: #303030;+ -icon-base-opacity: 0.8;+ -icon-disabled-opacity: 0.3;-icon-base-color: #cecece;-icon-active-color: white;-icon-selected-color: white;diff --git a/stuff/config/qss/Default-Green/Default-Green.qss b/stuff/config/qss/Default-Green/Default-Green.qssindex b99557a46..0a55bb3f8 100644--- a/stuff/config/qss/Default-Green/Default-Green.qss+++ b/stuff/config/qss/Default-Green/Default-Green.qss@@ -12,6 +12,8 @@ QToolBar * {}:TOONZCOLORS {-bg-color: #484848;+ -icon-base-opacity: 0.8;+ -icon-disabled-opacity: 0.3;-icon-base-color: #dfdfdf;-icon-active-color: white;-icon-selected-color: white;diff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qssindex 54ea72111..781693eb1 100644--- a/stuff/config/qss/Default/Default.qss+++ b/stuff/config/qss/Default/Default.qss@@ -12,6 +12,8 @@ QToolBar * {}:TOONZCOLORS {-bg-color: #484848;+ -icon-base-opacity: 0.8;+ -icon-disabled-opacity: 0.3;-icon-base-color: #dfdfdf;-icon-active-color: white;-icon-selected-color: white;diff --git a/stuff/config/qss/Default/less/layouts/_mainwindow.less b/stuff/config/qss/Default/less/layouts/_mainwindow.lessindex 654ec2e06..6b9d8b806 100644--- a/stuff/config/qss/Default/less/layouts/_mainwindow.less+++ b/stuff/config/qss/Default/less/layouts/_mainwindow.less@@ -16,10 +16,18 @@ QToolBar * {:TOONZCOLORS {-bg-color: @bg-color;++ // Opacity+ -icon-base-opacity: @icon-base-opacity;+ -icon-disabled-opacity: @icon-disabled-opacity;++ // General-icon-base-color: @icon-base-color;-icon-active-color: @icon-active-color;-icon-selected-color: @icon-selected-color;-icon-on-color: @icon-on-color;++ // Individual on states-icon-close-color: @icon-close-color;-icon-preview-color: @icon-preview-color;-icon-vcheck-color: @icon-view-check-color;diff --git a/stuff/config/qss/Default/less/themes/default/default-theme.less b/stuff/config/qss/Default/less/themes/default/default-theme.lessindex df3f7d1e2..a83f1a0c4 100644--- a/stuff/config/qss/Default/less/themes/default/default-theme.less+++ b/stuff/config/qss/Default/less/themes/default/default-theme.less@@ -61,13 +61,15 @@@tooltip-padding: 2px;// Icon Theme Colors+@icon-base-opacity: 0.8;+@icon-disabled-opacity: 0.3;@icon-base-color: @text-color;@icon-active-color: white;@icon-selected-color: @icon-active-color;@icon-on-color: @icon-active-color;// Individual Icon Colors-@icon-preview-color: black;+@icon-preview-color: if(lightness(@preview-color) > 50%, black, white);@icon-view-check-color: @icon-on-color;@icon-lock-color: @icon-active-color;@icon-keyframe-color: @icon-active-color;diff --git a/stuff/config/qss/Default/less/themes/others/light-theme.less b/stuff/config/qss/Default/less/themes/others/light-theme.lessindex 71d1dba13..7bd2b8f45 100644--- a/stuff/config/qss/Default/less/themes/others/light-theme.less+++ b/stuff/config/qss/Default/less/themes/others/light-theme.less@@ -50,7 +50,7 @@// Icon Theme Colors@icon-base-color: @text-color;-@icon-active-color: rgb(0, 0, 0);+@icon-active-color: black;// -----------------------------------------------------------------------------// Tabsdiff --git a/stuff/config/qss/Default/less/themes/others/neutral-theme.less b/stuff/config/qss/Default/less/themes/others/neutral-theme.lessindex f32c5bdca..e308ee63e 100644--- a/stuff/config/qss/Default/less/themes/others/neutral-theme.less+++ b/stuff/config/qss/Default/less/themes/others/neutral-theme.less@@ -48,17 +48,8 @@@fx-settings-label-color: rgb(0, 0, 0);// Icon Theme Colors-@icon-active-color: rgb(0, 0, 0);-@icon-selected-color: @icon-active-color;-@icon-on-color: @icon-active-color;--// Individual Icon Colors-@icon-preview-color: black;-@icon-view-check-color: @icon-on-color;-@icon-lock-color: @icon-active-color;-@icon-keyframe-color: @icon-active-color;-@icon-keyframe-modified-color: @icon-active-color;-@icon-close-color: @icon-active-color;+@icon-base-color: @text-color;+@icon-active-color: black;// -----------------------------------------------------------------------------// Tabsdiff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qssindex 2c1624719..8fb2628b4 100644--- a/stuff/config/qss/Light/Light.qss+++ b/stuff/config/qss/Light/Light.qss@@ -12,16 +12,18 @@ QToolBar * {}:TOONZCOLORS {-bg-color: #DBDBDB;+ -icon-base-opacity: 0.8;+ -icon-disabled-opacity: 0.3;-icon-base-color: black;- -icon-active-color: #000000;- -icon-selected-color: #000000;- -icon-on-color: #000000;- -icon-close-color: #000000;+ -icon-active-color: black;+ -icon-selected-color: black;+ -icon-on-color: black;+ -icon-close-color: black;-icon-preview-color: black;- -icon-vcheck-color: #000000;- -icon-lock-color: #000000;- -icon-keyframe-color: #000000;- -icon-keyframe-modified-color: #000000;+ -icon-vcheck-color: black;+ -icon-lock-color: black;+ -icon-keyframe-color: black;+ -icon-keyframe-modified-color: black;}QWidget {background-color: #DBDBDB;diff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qssindex e24e534f1..39e63c43c 100644--- a/stuff/config/qss/Neutral/Neutral.qss+++ b/stuff/config/qss/Neutral/Neutral.qss@@ -12,16 +12,18 @@ QToolBar * {}:TOONZCOLORS {-bg-color: #808080;+ -icon-base-opacity: 0.8;+ -icon-disabled-opacity: 0.3;-icon-base-color: black;- -icon-active-color: #000000;- -icon-selected-color: #000000;- -icon-on-color: #000000;- -icon-close-color: #000000;+ -icon-active-color: black;+ -icon-selected-color: black;+ -icon-on-color: black;+ -icon-close-color: black;-icon-preview-color: black;- -icon-vcheck-color: #000000;- -icon-lock-color: #000000;- -icon-keyframe-color: #000000;- -icon-keyframe-modified-color: #000000;+ -icon-vcheck-color: black;+ -icon-lock-color: black;+ -icon-keyframe-color: black;+ -icon-keyframe-modified-color: black;}QWidget {background-color: #808080;diff --git a/stuff/config/qss/Synthwave/Synthwave.qss b/stuff/config/qss/Synthwave/Synthwave.qssindex 02ce52637..d81dd2f47 100644--- a/stuff/config/qss/Synthwave/Synthwave.qss+++ b/stuff/config/qss/Synthwave/Synthwave.qss@@ -12,6 +12,8 @@ QToolBar * {}:TOONZCOLORS {-bg-color: #2b313a;+ -icon-base-opacity: 0.8;+ -icon-disabled-opacity: 0.3;-icon-base-color: #cecece;-icon-active-color: white;-icon-selected-color: white;diff --git a/toonz/sources/include/toonzqt/gutil.h b/toonz/sources/include/toonzqt/gutil.hindex 2daefa238..54dd64a00 100644--- a/toonz/sources/include/toonzqt/gutil.h+++ b/toonz/sources/include/toonzqt/gutil.h@@ -249,7 +249,7 @@ public:// Icon Managementvoid preloadIconMetadata(const QString &path);- void updateThemeColor();+ void updateThemeProperties();QString getIconPath(const QString &iconName, QIcon::Mode mode = QIcon::Normal,QIcon::State state = QIcon::Off) const;QSize getIconSize(const QString &iconName) const;@@ -258,6 +258,16 @@ public:bool isColoredIcon(const QString &iconName) const;// Icon Color Management+ void setIconBaseOpacity(const double &val) { m_iconBaseOpacity = val; }+ double getIconBaseOpacity() const { return m_iconBaseOpacity; }+ void setIconDisabledOpacity(const double &val) {+ m_iconDisabledOpacity = val;+ }+ double getIconDisabledOpacity() const { return m_iconDisabledOpacity; }++ void setInterfaceColor(const QColor &color) { m_interfaceColor = color; }+ QColor getInterfaceColor() const { return m_interfaceColor; }+void setIconBaseColor(const QColor &color) { m_iconBaseColor = color; }QColor getIconBaseColor() const { return m_iconBaseColor; }@@ -299,7 +309,14 @@ public:// Stylesheet Parsingvoid parseCustomPropertiesFromStylesheet(const QString &styleSheet);void setCustomProperty(const QString &name, const QString &value);- QString getCustomProperty(const QString &name) const;+ QString getCustomProperty(const QString &name,+ const QString &defaultValue = QString()) const;++ double getCustomPropertyDouble(const QString &name,+ double defaultValue = 1.0) const;++ QColor getCustomPropertyColor(const QString &name,+ const QColor &defaultValue = QColor()) const;private:// Constructor & Restriction@@ -318,6 +335,11 @@ private:QHash<QString, QString> m_customProperties;// Theme Colors+ double m_iconBaseOpacity;+ double m_iconDisabledOpacity;++ QColor m_interfaceColor;+QColor m_iconBaseColor;QColor m_iconActiveColor;QColor m_iconOnColor;diff --git a/toonz/sources/toonzqt/gutil.cpp b/toonz/sources/toonzqt/gutil.cppindex ec780f046..8e3b34909 100644--- a/toonz/sources/toonzqt/gutil.cpp+++ b/toonz/sources/toonzqt/gutil.cpp@@ -760,25 +760,29 @@ void ThemeManager::initialize() { preloadIconMetadata(":/icons"); }//------------------------------------------------------------------------------void ThemeManager::updateThemeColor() {+void ThemeManager::updateThemeProperties() {+ // Icon opacities+ setIconBaseOpacity(getCustomPropertyDouble("icon-base-opacity", 0.8));+ setIconDisabledOpacity(getCustomPropertyDouble("icon-disabled-opacity", 0.2));+// Base icon colors- setIconBaseColor(QColor(getCustomProperty("icon-base-color")));- setIconActiveColor(QColor(getCustomProperty("icon-active-color")));- setIconOnColor(QColor(getCustomProperty("icon-on-color")));- setIconSelectedColor(QColor(getCustomProperty("icon-selected-color")));+ setIconBaseColor(getCustomPropertyColor("icon-base-color"));+ setIconActiveColor(getCustomPropertyColor("icon-active-color"));+ setIconOnColor(getCustomPropertyColor("icon-on-color"));+ setIconSelectedColor(getCustomPropertyColor("icon-selected-color"));// Individual icon colors- setIconCloseColor(QColor(getCustomProperty("icon-close-color")));- setIconPreviewColor(QColor(getCustomProperty("icon-preview-color")));- setIconLockColor(QColor(getCustomProperty("icon-lock-color")));+ setIconCloseColor(getCustomPropertyColor("icon-close-color"));+ setIconPreviewColor(getCustomPropertyColor("icon-preview-color"));+ setIconLockColor(getCustomPropertyColor("icon-lock-color"));// Keyframe icon colors- setIconKeyframeColor(QColor(getCustomProperty("icon-keyframe-color")));+ setIconKeyframeColor(getCustomPropertyColor("icon-keyframe-color"));setIconKeyframeModifiedColor(- QColor(getCustomProperty("icon-keyframe-modified-color")));+ getCustomPropertyColor("icon-keyframe-modified-color"));// Viewer check icon colors- setIconVCheckColor(QColor(getCustomProperty("icon-vcheck-color")));+ setIconVCheckColor(getCustomPropertyColor("icon-vcheck-color"));// Invalidate cache to force re-rendering of iconsclearQPixmapCache();@@ -922,7 +926,7 @@ void ThemeManager::parseCustomPropertiesFromStylesheet(}}- updateThemeColor();+ updateThemeProperties();}//-----------------------------------------------------------------------------@@ -934,12 +938,36 @@ void ThemeManager::setCustomProperty(const QString &name,//------------------------------------------------------------------------------QString ThemeManager::getCustomProperty(const QString &name) const {+QString ThemeManager::getCustomProperty(const QString &name,+ const QString &defaultValue) const {return m_customProperties.value(name, QString());}//-----------------------------------------------------------------------------+double ThemeManager::getCustomPropertyDouble(const QString &name,+ double defaultValue) const {+ QString value = getCustomProperty(name);+ bool ok = false;+ double result = value.toDouble(&ok);+ qDebug() << "result" << value << result;+ return ok ? result : defaultValue;+}++//-----------------------------------------------------------------------------++QColor ThemeManager::getCustomPropertyColor(const QString &name,+ const QColor &defaultValue) const {+ QString value = getCustomProperty(name);+ if (value.isEmpty()) return defaultValue;++ // Try to parse the color from the string+ QColor color(value);+ return color.isValid() ? color : defaultValue;+}++//-----------------------------------------------------------------------------+QSize ThemeManager::getIconSize(const QString &iconName) const {QString baseName = iconName;if (baseName.endsWith("_on") || baseName.endsWith("_over")) {@@ -1094,13 +1122,19 @@ void SvgIconEngine::paint(QPainter *painter, const QRect &rect,qreal SvgIconEngine::getOpacityForModeState(QIcon::Mode mode,QIcon::State state) {+ auto &tm = ThemeManager::getInstance();++ const double baseOpacity = tm.getIconBaseOpacity();+ const double disabledOpacity = tm.getIconDisabledOpacity();+ const double activeOpacity = 1.0;+qreal opacity;if (m_isColored) {- opacity = (mode == QIcon::Disabled) ? 0.4 : 1.0;+ opacity = (mode == QIcon::Disabled) ? disabledOpacity : activeOpacity;} else {- opacity = (mode == QIcon::Disabled) ? 0.4- : (mode == QIcon::Normal && state == QIcon::Off) ? 0.8- : 1.0;+ opacity = (mode == QIcon::Disabled) ? disabledOpacity+ : (mode == QIcon::Normal && state == QIcon::Off) ? baseOpacity+ : activeOpacity;}return opacity;