OpenToonz - An open-source full-featured 2D animation creation software
C
#assistants: color assistant level from stylesheet
manongjohn0d750446a03f
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qssindex 3e755265d..2ee5fe408 100644--- a/stuff/config/qss/Blue/Blue.qss+++ b/stuff/config/qss/Blue/Blue.qss@@ -1794,6 +1794,7 @@ SchematicViewer {qproperty-FxColumnColor: #5e5645;qproperty-PaletteColumnColor: #42756e;qproperty-MeshColumnColor: #594d75;+ qproperty-MetaColumnColor: #8c8c8c;qproperty-ReferenceColumnColor: #4d5052;qproperty-TableColor: #62628c;qproperty-ActiveCameraColor: #4073a3;@@ -2343,6 +2344,9 @@ XsheetViewer {qproperty-MeshColumnColor: #594d75;qproperty-MeshColumnBorderColor: #423956;qproperty-SelectedMeshColumnColor: #656692;+ qproperty-MetaColumnColor: #8c8c8c;+ qproperty-MetaColumnBorderColor: #c8c8c8;+ qproperty-SelectedMetaColumnColor: #a6a6a6;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qssindex a995fed66..7f6c51bd4 100644--- a/stuff/config/qss/Dark/Dark.qss+++ b/stuff/config/qss/Dark/Dark.qss@@ -1794,6 +1794,7 @@ SchematicViewer {qproperty-FxColumnColor: #5e5645;qproperty-PaletteColumnColor: #42756e;qproperty-MeshColumnColor: #594d75;+ qproperty-MetaColumnColor: #8c8c8c;qproperty-ReferenceColumnColor: #3d3d3d;qproperty-TableColor: #62628c;qproperty-ActiveCameraColor: #4073a3;@@ -2343,6 +2344,9 @@ XsheetViewer {qproperty-MeshColumnColor: #594d75;qproperty-MeshColumnBorderColor: #423956;qproperty-SelectedMeshColumnColor: #656692;+ qproperty-MetaColumnColor: #8c8c8c;+ qproperty-MetaColumnBorderColor: #c8c8c8;+ qproperty-SelectedMetaColumnColor: #a6a6a6;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;diff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qssindex b1600d9b2..e33792748 100644--- a/stuff/config/qss/Default/Default.qss+++ b/stuff/config/qss/Default/Default.qss@@ -1794,6 +1794,7 @@ SchematicViewer {qproperty-FxColumnColor: #5e5645;qproperty-PaletteColumnColor: #42756e;qproperty-MeshColumnColor: #594d75;+ qproperty-MetaColumnColor: #8c8c8c;qproperty-ReferenceColumnColor: #555555;qproperty-TableColor: #62628c;qproperty-ActiveCameraColor: #4073a3;@@ -2343,6 +2344,9 @@ XsheetViewer {qproperty-MeshColumnColor: #594d75;qproperty-MeshColumnBorderColor: #423956;qproperty-SelectedMeshColumnColor: #656692;+ qproperty-MetaColumnColor: #8c8c8c;+ qproperty-MetaColumnBorderColor: #c8c8c8;+ qproperty-SelectedMetaColumnColor: #a6a6a6;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;diff --git a/stuff/config/qss/Default/less/Default.less b/stuff/config/qss/Default/less/Default.lessindex d2393cdb4..121ac3070 100644--- a/stuff/config/qss/Default/less/Default.less+++ b/stuff/config/qss/Default/less/Default.less@@ -454,6 +454,7 @@@xsheet-ReferenceColumn-color: lighten(@bg, 5);@xsheet-PaletteColumn-color: #42756e;@xsheet-MeshColumn-color: #594d75;+@xsheet-MetaColumn-color: #8c8c8c;@xsheet-SoundTextColumn-color: #a7a7a7;@xsheet-SoundColumn-color: #578a8a;@xsheet-SoundColumnHL-color: #34FE5E;diff --git a/stuff/config/qss/Default/less/layouts/schematic.less b/stuff/config/qss/Default/less/layouts/schematic.lessindex 80ed4a0cc..349e7c5fe 100644--- a/stuff/config/qss/Default/less/layouts/schematic.less+++ b/stuff/config/qss/Default/less/layouts/schematic.less@@ -13,6 +13,7 @@ SchematicViewer {qproperty-FxColumnColor: @xsheet-FxColumn-color;qproperty-PaletteColumnColor: @xsheet-PaletteColumn-color;qproperty-MeshColumnColor: @xsheet-MeshColumn-color;+ qproperty-MetaColumnColor: @xsheet-MetaColumn-color;qproperty-ReferenceColumnColor: @xsheet-ReferenceColumn-color;qproperty-TableColor: saturate(lighten(@schematic-TableColor, @nodeLightness), @nodeSaturation);diff --git a/stuff/config/qss/Default/less/layouts/xsheet.less b/stuff/config/qss/Default/less/layouts/xsheet.lessindex b7f44a854..886356050 100644--- a/stuff/config/qss/Default/less/layouts/xsheet.less+++ b/stuff/config/qss/Default/less/layouts/xsheet.less@@ -134,6 +134,10 @@ XsheetViewer {qproperty-MeshColumnBorderColor: desaturate(darken(@xsheet-MeshColumn-color, @columnBorderDarkness), @columnBorderDesaturation);qproperty-SelectedMeshColumnColor: mix(shade(@xsheet-MeshColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);+ qproperty-MetaColumnColor: @xsheet-MetaColumn-color;+ qproperty-MetaColumnBorderColor: desaturate(darken(@xsheet-MetaColumn-color, @columnBorderDarkness), @columnBorderDesaturation);+ qproperty-SelectedMetaColumnColor: mix(shade(@xsheet-MetaColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);+qproperty-SoundTextColumnColor: @xsheet-SoundTextColumn-color;qproperty-SoundTextColumnBorderColor: desaturate(darken(@xsheet-SoundTextColumn-color, @columnBorderDarkness), @columnBorderDesaturation);qproperty-SelectedSoundTextColumnColor: mix(shade(@xsheet-SoundTextColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);@@ -143,7 +147,7 @@ XsheetViewer {qproperty-SelectedSoundColumnColor: mix(shade(@xsheet-SoundColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);qproperty-SoundColumnHlColor: @xsheet-SoundColumnHL-color;qproperty-SoundColumnTrackColor: @xsheet-SoundColumnTrack-color;-+qproperty-ActiveCameraColor: @xsheet-ActiveCamera-color;qproperty-SelectedActiveCameraColor: mix(shade(@xsheet-ActiveCamera-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);qproperty-OtherCameraColor: @xsheet-OtherCamera-color;diff --git a/stuff/config/qss/Default/less/themes/Light.less b/stuff/config/qss/Default/less/themes/Light.lessindex e49542aad..72b8aedf2 100644--- a/stuff/config/qss/Default/less/themes/Light.less+++ b/stuff/config/qss/Default/less/themes/Light.less@@ -206,6 +206,7 @@@xsheet-ReferenceColumn-color: #c2c2c2;@xsheet-PaletteColumn-color: #a9d4ca;@xsheet-MeshColumn-color: #b8a2cf;+@xsheet-MetaColumn-color: #a8a8a8;@xsheet-SoundColumn-color: #aad6d6;@xsheet-SoundTextColumn-color: #c2c2c2;@xsheet-ActiveCamera-color: #b7dbfc;diff --git a/stuff/config/qss/Default/less/themes/Neutral.less b/stuff/config/qss/Default/less/themes/Neutral.lessindex a9723ad86..9226fed80 100644--- a/stuff/config/qss/Default/less/themes/Neutral.less+++ b/stuff/config/qss/Default/less/themes/Neutral.less@@ -230,6 +230,7 @@@xsheet-ReferenceColumn-color: #959595;@xsheet-PaletteColumn-color: #599586;@xsheet-MeshColumn-color: #8b73a7;+@xsheet-MetaColumnColor: #8c8c8c;@xsheet-SoundColumn-color: #749e9e;@xsheet-SoundColumnHL-color: #f5ffe6;@xsheet-SoundColumnTrack-color: rgba(0,0,0,0.8);diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qssindex ac23e2020..8a0e464f2 100644--- a/stuff/config/qss/Light/Light.qss+++ b/stuff/config/qss/Light/Light.qss@@ -1794,6 +1794,7 @@ SchematicViewer {qproperty-FxColumnColor: #ceb694;qproperty-PaletteColumnColor: #a9d4ca;qproperty-MeshColumnColor: #b8a2cf;+ qproperty-MetaColumnColor: #a8a8a8;qproperty-ReferenceColumnColor: #c2c2c2;qproperty-TableColor: #cbcbe4;qproperty-ActiveCameraColor: #b7dbfc;@@ -2343,6 +2344,9 @@ XsheetViewer {qproperty-MeshColumnColor: #b8a2cf;qproperty-MeshColumnBorderColor: #9278ac;qproperty-SelectedMeshColumnColor: #a49dc2;+ qproperty-MetaColumnColor: #a8a8a8;+ qproperty-MetaColumnBorderColor: #686868;+ qproperty-SelectedMetaColumnColor: #c2c2c2;qproperty-SoundTextColumnColor: #c2c2c2;qproperty-SoundTextColumnBorderColor: #9c9c9c;qproperty-SelectedSoundTextColumnColor: #abb3b9;diff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qssindex 250127dcc..f66f83d9d 100644--- a/stuff/config/qss/Neutral/Neutral.qss+++ b/stuff/config/qss/Neutral/Neutral.qss@@ -1794,6 +1794,7 @@ SchematicViewer {qproperty-FxColumnColor: #928562;qproperty-PaletteColumnColor: #599586;qproperty-MeshColumnColor: #8b73a7;+ qproperty-MetaColumnColor: #8c8c8c;qproperty-ReferenceColumnColor: #959595;qproperty-TableColor: #a4a4bf;qproperty-ActiveCameraColor: #6491be;@@ -2343,6 +2344,9 @@ XsheetViewer {qproperty-MeshColumnColor: #8b73a7;qproperty-MeshColumnBorderColor: #654f7e;qproperty-SelectedMeshColumnColor: #a18fc3;+ qproperty-MetaColumnColor: #8c8c8c;+ qproperty-MetaColumnBorderColor: #c8c8c8;+ qproperty-SelectedMetaColumnColor: #a6a6a6;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #818181;qproperty-SelectedSoundTextColumnColor: #bbbfc3;diff --git a/toonz/sources/include/toonzqt/schematicviewer.h b/toonz/sources/include/toonzqt/schematicviewer.hindex 811f45d19..6a37b764f 100644--- a/toonz/sources/include/toonzqt/schematicviewer.h+++ b/toonz/sources/include/toonzqt/schematicviewer.h@@ -273,6 +273,11 @@ class DVAPI SchematicViewer final : public QWidget {Q_PROPERTY(QColor MeshColumnColor READ getMeshColumnColor WRITE setMeshColumnColor)+ // Meta column+ QColor m_metaColumnColor;+ Q_PROPERTY(+ QColor MetaColumnColor READ getMetaColumnColor WRITE setMetaColumnColor)+// Reference columnQColor m_referenceColumnColor;Q_PROPERTY(QColor ReferenceColumnColor MEMBER m_referenceColumnColor)@@ -455,6 +460,10 @@ public:void setMeshColumnColor(const QColor &color) { m_meshColumnColor = color; }QColor getMeshColumnColor() const { return m_meshColumnColor; }+ // Meta column+ void setMetaColumnColor(const QColor &color) { m_metaColumnColor = color; }+ QColor getMetaColumnColor() const { return m_metaColumnColor; }+// Reference columnQColor getReferenceColumnColor() const { return m_referenceColumnColor; }diff --git a/toonz/sources/toonz/xsheetviewer.cpp b/toonz/sources/toonz/xsheetviewer.cppindex ac8ea6f8e..adbe05eed 100644--- a/toonz/sources/toonz/xsheetviewer.cpp+++ b/toonz/sources/toonz/xsheetviewer.cpp@@ -119,6 +119,11 @@ void XsheetViewer::getCellTypeAndColors(int <ype, QColor &cellColor,(isSelected) ? getSelectedMeshColumnColor() : getMeshColumnColor();sideColor = getMeshColumnBorderColor();break;+ case META_XSHLEVEL:+ cellColor =+ (isSelected) ? getSelectedMetaColumnColor() : getMetaColumnColor();+ sideColor = getMetaColumnBorderColor();+ break;case UNKNOWN_XSHLEVEL:case NO_XSHLEVEL:default:diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.hindex 0c3c43202..6e6393d18 100644--- a/toonz/sources/toonz/xsheetviewer.h+++ b/toonz/sources/toonz/xsheetviewer.h@@ -111,6 +111,10 @@ const QColor MeshColumnColor(200, 130, 255);const QColor MeshColumnBorderColor(105, 70, 135);const QColor SelectedMeshColumnColor(216, 180, 245);+const QColor MetaColumnColor(200, 130, 255);+const QColor MetaColumnBorderColor(105, 70, 135);+const QColor SelectedMetaColumnColor(216, 180, 245);+// Empty columnconst QColor EmptyColumnColor(124, 124, 124);// Occupied column@@ -388,6 +392,16 @@ class XsheetViewer final : public QFrame, public SaveLoadQSettings {Q_PROPERTY(QColor SelectedSoundColumnColor MEMBER m_selectedSoundColumnColor)Q_PROPERTY(QColor SoundColumnHlColor MEMBER m_soundColumnHlColor)Q_PROPERTY(QColor SoundColumnTrackColor MEMBER m_soundColumnTrackColor)+ // Meta column+ QColor m_metaColumnColor;+ QColor m_metaColumnBorderColor;+ QColor m_selectedMetaColumnColor;+ Q_PROPERTY(+ QColor MetaColumnColor READ getMetaColumnColor WRITE setMetaColumnColor)+ Q_PROPERTY(QColor MetaColumnBorderColor READ getMetaColumnBorderColor WRITE+ setMetaColumnBorderColor)+ Q_PROPERTY(QColor SelectedMetaColumnColor READ getSelectedMetaColumnColor+ WRITE setSelectedMetaColumnColor)// for making the column head lighter (255,255,255,50);QColor m_columnHeadPastelizer;@@ -1008,6 +1022,19 @@ public:m_selectedColumnHead = color;}QColor getSelectedColumnHead() const { return m_selectedColumnHead; }+ // Meta column+ void setMetaColumnColor(const QColor &color) { m_metaColumnColor = color; }+ void setMetaColumnBorderColor(const QColor &color) {+ m_metaColumnBorderColor = color;+ }+ void setSelectedMetaColumnColor(const QColor &color) {+ m_selectedMetaColumnColor = color;+ }+ QColor getMetaColumnColor() const { return m_metaColumnColor; }+ QColor getMetaColumnBorderColor() const { return m_metaColumnBorderColor; }+ QColor getSelectedMetaColumnColor() const {+ return m_selectedMetaColumnColor;+ }void getCellTypeAndColors(int <ype, QColor &cellColor, QColor &sideColor,const TXshCell &cell, bool isSelected = false);diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cppindex 53cec0342..bc23b0c44 100644--- a/toonz/sources/toonzqt/schematicviewer.cpp+++ b/toonz/sources/toonzqt/schematicviewer.cpp@@ -919,6 +919,9 @@ void SchematicViewer::getNodeColor(int ltype, QColor &nodeColor) {case MESH_XSHLEVEL:nodeColor = getMeshColumnColor();break;+ case META_XSHLEVEL:+ nodeColor = getMetaColumnColor();+ break;case PLT_XSHLEVEL:nodeColor = getPaletteColumnColor();break;