OpenToonz - An open-source full-featured 2D animation creation software
C
refactor icon code
konero7bed166ae3b8
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qssindex 73e6677f8..7ccf8fa49 100644--- a/stuff/config/qss/Blue/Blue.qss+++ b/stuff/config/qss/Blue/Blue.qss@@ -367,6 +367,7 @@ TPanelTitleBar {qproperty-ActiveBorderPixmap: url('../Default/imgs/white/none');qproperty-FloatBorderPixmap: url('none');qproperty-FloatActiveBorderPixmap: url('../Default/imgs/white/none');+ qproperty-OverColor: #C34040;}TPanelTitleBarButton {qproperty-PressedColor: #5385a6;@@ -2345,8 +2346,8 @@ XsheetViewer {qproperty-MeshColumnBorderColor: #423956;qproperty-SelectedMeshColumnColor: #656692;qproperty-MetaColumnColor: #8c8c8c;- qproperty-MetaColumnBorderColor: #c8c8c8;- qproperty-SelectedMetaColumnColor: #a6a6a6;+ qproperty-MetaColumnBorderColor: #737373;+ qproperty-SelectedMetaColumnColor: #94a0a8;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;@@ -2389,25 +2390,19 @@ XsheetViewer {qproperty-TimelinePreviewButtonBgOnColor: #414345;qproperty-TimelinePreviewButtonOnImage: url('../Default/imgs/white/preview_small.svg');qproperty-TimelinePreviewButtonBgOffColor: #414345;- qproperty-TimelinePreviewButtonOffImage: url('none');+ qproperty-TimelinePreviewButtonOffImage: url('../Default/imgs/white/transparent.svg');qproperty-TimelineUnifiedButtonTranspImage: url('../Default/imgs/white/preview_trans_small.svg');qproperty-TimelineCamstandButtonBgOnColor: #414345;qproperty-TimelineCamstandButtonOnImage: url('../Default/imgs/white/table_small.svg');qproperty-TimelineCamstandButtonTranspImage: url('../Default/imgs/white/trans_small.svg');qproperty-TimelineCamstandButtonBgOffColor: #414345;- qproperty-TimelineCamstandButtonOffImage: url('none');+ qproperty-TimelineCamstandButtonOffImage: url('../Default/imgs/white/transparent.svg');qproperty-TimelineLockButtonBgOnColor: #414345;qproperty-TimelineLockButtonOnImage: url('../Default/imgs/white/lock_on_small.svg');qproperty-TimelineLockButtonBgOffColor: #414345;- qproperty-TimelineLockButtonOffImage: url('none');+ qproperty-TimelineLockButtonOffImage: url('../Default/imgs/white/transparent.svg');qproperty-TimelineConfigButtonBgColor: #414345;qproperty-TimelineConfigButtonImage: url('../Default/imgs/white/timeline_config.svg');- qproperty-LayerHeaderPreviewImage: url('../Default/imgs/white/layer_header_prev_eye.svg');- qproperty-LayerHeaderPreviewOverImage: url('../Default/imgs/white/layer_header_prev_eye_over.svg');- qproperty-LayerHeaderCamstandImage: url('../Default/imgs/white/layer_header_table_view.svg');- qproperty-LayerHeaderCamstandOverImage: url('../Default/imgs/white/layer_header_table_view_over.svg');- qproperty-LayerHeaderLockImage: url('../Default/imgs/white/layer_lock_on.svg');- qproperty-LayerHeaderLockOverImage: url('../Default/imgs/white/layer_lock_on_over.svg');}/* -----------------------------------------------------------------------------Function Editordiff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qssindex 10652ea7f..891ba3d77 100644--- a/stuff/config/qss/Dark/Dark.qss+++ b/stuff/config/qss/Dark/Dark.qss@@ -367,6 +367,7 @@ TPanelTitleBar {qproperty-ActiveBorderPixmap: url('../Default/imgs/white/none');qproperty-FloatBorderPixmap: url('none');qproperty-FloatActiveBorderPixmap: url('../Default/imgs/white/none');+ qproperty-OverColor: #C34040;}TPanelTitleBarButton {qproperty-PressedColor: #5385a6;@@ -2345,8 +2346,8 @@ XsheetViewer {qproperty-MeshColumnBorderColor: #423956;qproperty-SelectedMeshColumnColor: #656692;qproperty-MetaColumnColor: #8c8c8c;- qproperty-MetaColumnBorderColor: #c8c8c8;- qproperty-SelectedMetaColumnColor: #a6a6a6;+ qproperty-MetaColumnBorderColor: #737373;+ qproperty-SelectedMetaColumnColor: #94a0a8;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;@@ -2389,25 +2390,19 @@ XsheetViewer {qproperty-TimelinePreviewButtonBgOnColor: #303030;qproperty-TimelinePreviewButtonOnImage: url('../Default/imgs/white/preview_small.svg');qproperty-TimelinePreviewButtonBgOffColor: #303030;- qproperty-TimelinePreviewButtonOffImage: url('none');+ qproperty-TimelinePreviewButtonOffImage: url('../Default/imgs/white/transparent.svg');qproperty-TimelineUnifiedButtonTranspImage: url('../Default/imgs/white/preview_trans_small.svg');qproperty-TimelineCamstandButtonBgOnColor: #303030;qproperty-TimelineCamstandButtonOnImage: url('../Default/imgs/white/table_small.svg');qproperty-TimelineCamstandButtonTranspImage: url('../Default/imgs/white/trans_small.svg');qproperty-TimelineCamstandButtonBgOffColor: #303030;- qproperty-TimelineCamstandButtonOffImage: url('none');+ qproperty-TimelineCamstandButtonOffImage: url('../Default/imgs/white/transparent.svg');qproperty-TimelineLockButtonBgOnColor: #303030;qproperty-TimelineLockButtonOnImage: url('../Default/imgs/white/lock_on_small.svg');qproperty-TimelineLockButtonBgOffColor: #303030;- qproperty-TimelineLockButtonOffImage: url('none');+ qproperty-TimelineLockButtonOffImage: url('../Default/imgs/white/transparent.svg');qproperty-TimelineConfigButtonBgColor: #303030;qproperty-TimelineConfigButtonImage: url('../Default/imgs/white/timeline_config.svg');- qproperty-LayerHeaderPreviewImage: url('../Default/imgs/white/layer_header_prev_eye.svg');- qproperty-LayerHeaderPreviewOverImage: url('../Default/imgs/white/layer_header_prev_eye_over.svg');- qproperty-LayerHeaderCamstandImage: url('../Default/imgs/white/layer_header_table_view.svg');- qproperty-LayerHeaderCamstandOverImage: url('../Default/imgs/white/layer_header_table_view_over.svg');- qproperty-LayerHeaderLockImage: url('../Default/imgs/white/layer_lock_on.svg');- qproperty-LayerHeaderLockOverImage: url('../Default/imgs/white/layer_lock_on_over.svg');}/* -----------------------------------------------------------------------------Function Editordiff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qssindex f502d4d45..65b69ab7d 100644--- a/stuff/config/qss/Default/Default.qss+++ b/stuff/config/qss/Default/Default.qss@@ -367,6 +367,7 @@ TPanelTitleBar {qproperty-ActiveBorderPixmap: url('imgs/white/none');qproperty-FloatBorderPixmap: url('none');qproperty-FloatActiveBorderPixmap: url('imgs/white/none');+ qproperty-OverColor: #C34040;}TPanelTitleBarButton {qproperty-PressedColor: #5385a6;@@ -2345,8 +2346,8 @@ XsheetViewer {qproperty-MeshColumnBorderColor: #423956;qproperty-SelectedMeshColumnColor: #656692;qproperty-MetaColumnColor: #8c8c8c;- qproperty-MetaColumnBorderColor: #c8c8c8;- qproperty-SelectedMetaColumnColor: #a6a6a6;+ qproperty-MetaColumnBorderColor: #737373;+ qproperty-SelectedMetaColumnColor: #94a0a8;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;@@ -2389,25 +2390,19 @@ XsheetViewer {qproperty-TimelinePreviewButtonBgOnColor: #484848;qproperty-TimelinePreviewButtonOnImage: url('imgs/white/preview_small.svg');qproperty-TimelinePreviewButtonBgOffColor: #484848;- qproperty-TimelinePreviewButtonOffImage: url('none');+ qproperty-TimelinePreviewButtonOffImage: url('imgs/white/transparent.svg');qproperty-TimelineUnifiedButtonTranspImage: url('imgs/white/preview_trans_small.svg');qproperty-TimelineCamstandButtonBgOnColor: #484848;qproperty-TimelineCamstandButtonOnImage: url('imgs/white/table_small.svg');qproperty-TimelineCamstandButtonTranspImage: url('imgs/white/trans_small.svg');qproperty-TimelineCamstandButtonBgOffColor: #484848;- qproperty-TimelineCamstandButtonOffImage: url('none');+ qproperty-TimelineCamstandButtonOffImage: url('imgs/white/transparent.svg');qproperty-TimelineLockButtonBgOnColor: #484848;qproperty-TimelineLockButtonOnImage: url('imgs/white/lock_on_small.svg');qproperty-TimelineLockButtonBgOffColor: #484848;- qproperty-TimelineLockButtonOffImage: url('none');+ qproperty-TimelineLockButtonOffImage: url('imgs/white/transparent.svg');qproperty-TimelineConfigButtonBgColor: #484848;qproperty-TimelineConfigButtonImage: url('imgs/white/timeline_config.svg');- qproperty-LayerHeaderPreviewImage: url('imgs/white/layer_header_prev_eye.svg');- qproperty-LayerHeaderPreviewOverImage: url('imgs/white/layer_header_prev_eye_over.svg');- qproperty-LayerHeaderCamstandImage: url('imgs/white/layer_header_table_view.svg');- qproperty-LayerHeaderCamstandOverImage: url('imgs/white/layer_header_table_view_over.svg');- qproperty-LayerHeaderLockImage: url('imgs/white/layer_lock_on.svg');- qproperty-LayerHeaderLockOverImage: url('imgs/white/layer_lock_on_over.svg');}/* -----------------------------------------------------------------------------Function Editordiff --git a/stuff/config/qss/Default/imgs/black/layer_header_prev_eye.svg b/stuff/config/qss/Default/imgs/black/layer_header_prev_eye.svgdeleted file mode 100644index c608dd0e1..000000000--- a/stuff/config/qss/Default/imgs/black/layer_header_prev_eye.svg+++ /dev/null@@ -1,7 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <g transform="matrix(1.125,0,0,1.125,-6.75,-8.5)">- <path d="M8,15.991C8,15.991 10.248,12 14.001,12C17.752,12 20,15.991 20,15.991C20,15.991 17.761,20 14.001,20C10.239,20 8,15.991 8,15.991ZM14,13C15.656,13 17,14.344 17,16C17,17.656 15.656,19 14,19C12.344,19 11,17.656 11,16C11,14.344 12.344,13 14,13ZM14,14.5C14.828,14.5 15.5,15.172 15.5,16C15.5,16.828 14.828,17.5 14,17.5C13.172,17.5 12.5,16.828 12.5,16C12.5,15.172 13.172,14.5 14,14.5Z" style="fill-opacity:0.8;"/>- </g>-</svg>diff --git a/stuff/config/qss/Default/imgs/black/layer_header_prev_eye_over.svg b/stuff/config/qss/Default/imgs/black/layer_header_prev_eye_over.svgdeleted file mode 100644index 1fc0fec29..000000000--- a/stuff/config/qss/Default/imgs/black/layer_header_prev_eye_over.svg+++ /dev/null@@ -1,8 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <path d="M18,2C18,0.896 17.104,0 16,0L2,0C0.896,0 0,0.896 0,2L0,16C0,17.104 0.896,18 2,18L16,18C17.104,18 18,17.104 18,16L18,2Z" style="fill-opacity:0.2;"/>- <g transform="matrix(1.125,0,0,1.125,-6.75,-8.5)">- <path d="M8,15.991C8,15.991 10.248,12 14.001,12C17.752,12 20,15.991 20,15.991C20,15.991 17.761,20 14.001,20C10.239,20 8,15.991 8,15.991ZM14,13C15.656,13 17,14.344 17,16C17,17.656 15.656,19 14,19C12.344,19 11,17.656 11,16C11,14.344 12.344,13 14,13ZM14,14.5C14.828,14.5 15.5,15.172 15.5,16C15.5,16.828 14.828,17.5 14,17.5C13.172,17.5 12.5,16.828 12.5,16C12.5,15.172 13.172,14.5 14,14.5Z"/>- </g>-</svg>diff --git a/stuff/config/qss/Default/imgs/black/layer_header_table_view.svg b/stuff/config/qss/Default/imgs/black/layer_header_table_view.svgdeleted file mode 100644index 39873e897..000000000--- a/stuff/config/qss/Default/imgs/black/layer_header_table_view.svg+++ /dev/null@@ -1,9 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="18" height="18" style="fill-opacity:0;"/>- <g id="ellipse9" transform="matrix(0.928571,0,0,0.928571,0.642857,0.642857)">- <path d="M9,2C12.863,2 16,5.137 16,9C16,12.863 12.863,16 9,16C5.137,16 2,12.863 2,9C2,5.137 5.137,2 9,2Z" style="fill:none;stroke:black;stroke-opacity:0.8;stroke-width:1.29px;"/>- </g>- <rect x="5" y="6" width="8" height="6" style="fill-opacity:0.8;"/>-</svg>diff --git a/stuff/config/qss/Default/imgs/black/layer_header_table_view_over.svg b/stuff/config/qss/Default/imgs/black/layer_header_table_view_over.svgdeleted file mode 100644index 3511282e7..000000000--- a/stuff/config/qss/Default/imgs/black/layer_header_table_view_over.svg+++ /dev/null@@ -1,9 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <path d="M18,2C18,0.896 17.104,0 16,0L2,0C0.896,0 0,0.896 0,2L0,16C0,17.104 0.896,18 2,18L16,18C17.104,18 18,17.104 18,16L18,2Z" style="fill-opacity:0.2;"/>- <g id="ellipse9" transform="matrix(0.928571,0,0,0.928571,0.642857,0.642857)">- <path d="M9,2C12.863,2 16,5.137 16,9C16,12.863 12.863,16 9,16C5.137,16 2,12.863 2,9C2,5.137 5.137,2 9,2Z" style="fill:none;stroke:black;stroke-width:1.29px;"/>- </g>- <rect x="5" y="6" width="8" height="6"/>-</svg>diff --git a/stuff/config/qss/Default/imgs/black/layer_lock_on.svg b/stuff/config/qss/Default/imgs/black/layer_lock_on.svgdeleted file mode 100644index dd9430721..000000000--- a/stuff/config/qss/Default/imgs/black/layer_lock_on.svg+++ /dev/null@@ -1,13 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <g transform="matrix(0.818182,0,0,0.818182,1.77636e-15,1.77636e-15)">- <rect x="0" y="0" width="22" height="22" style="fill-opacity:0;"/>- </g>- <g>- <g id="path4509" transform="matrix(0.0555556,0,0,0.0555556,-0.5,0)">- <path d="M162,54C127.2,54 99,82.2 99,117L99,144L117,144L117,117C117,92.2 137.2,72 162,72C186.8,72 207,92.1 207,117L207,144L225,144L225,117C225,82.2 196.8,54 162,54Z" style="fill-opacity:0.8;fill-rule:nonzero;"/>- </g>- <path id="rect4488" d="M5,8C4.735,8 4.48,8.105 4.293,8.293C4.105,8.48 4,8.735 4,9L4,14C4,14.265 4.105,14.52 4.293,14.707C4.48,14.895 4.735,15 5,15L12,15C12.265,15 12.52,14.895 12.707,14.707C12.895,14.52 13,14.265 13,14L13,9C13,8.735 12.895,8.48 12.707,8.293C12.52,8.105 12.265,8 12,8L5,8ZM7.75,11.799C7.302,11.54 7,11.055 7,10.5C7,9.672 7.672,9 8.5,9C9.328,9 10,9.672 10,10.5C10,11.055 9.698,11.54 9.25,11.799L9.25,13.25C9.25,13.664 8.914,14 8.5,14C8.086,14 7.75,13.664 7.75,13.25L7.75,11.799Z" style="fill-opacity:0.8;fill-rule:nonzero;"/>- </g>-</svg>diff --git a/stuff/config/qss/Default/imgs/black/transparent.svg b/stuff/config/qss/Default/imgs/black/transparent.svgnew file mode 100644index 000000000..d3f1714f9--- /dev/null+++ b/stuff/config/qss/Default/imgs/black/transparent.svg@@ -0,0 +1,4 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+</svg>diff --git a/stuff/config/qss/Default/imgs/white/layer_header_prev_eye.svg b/stuff/config/qss/Default/imgs/white/layer_header_prev_eye.svgdeleted file mode 100644index 8eb5be62c..000000000--- a/stuff/config/qss/Default/imgs/white/layer_header_prev_eye.svg+++ /dev/null@@ -1,7 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <g transform="matrix(1.125,0,0,1.125,-6.75,-8.5)">- <path d="M8,15.991C8,15.991 10.248,12 14.001,12C17.752,12 20,15.991 20,15.991C20,15.991 17.761,20 14.001,20C10.239,20 8,15.991 8,15.991ZM14,13C15.656,13 17,14.344 17,16C17,17.656 15.656,19 14,19C12.344,19 11,17.656 11,16C11,14.344 12.344,13 14,13ZM14,14.5C14.828,14.5 15.5,15.172 15.5,16C15.5,16.828 14.828,17.5 14,17.5C13.172,17.5 12.5,16.828 12.5,16C12.5,15.172 13.172,14.5 14,14.5Z" style="fill:white;fill-opacity:0.8;"/>- </g>-</svg>diff --git a/stuff/config/qss/Default/imgs/white/layer_header_prev_eye_over.svg b/stuff/config/qss/Default/imgs/white/layer_header_prev_eye_over.svgdeleted file mode 100644index e80043604..000000000--- a/stuff/config/qss/Default/imgs/white/layer_header_prev_eye_over.svg+++ /dev/null@@ -1,8 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <path d="M18,2C18,0.896 17.104,0 16,0L2,0C0.896,0 0,0.896 0,2L0,16C0,17.104 0.896,18 2,18L16,18C17.104,18 18,17.104 18,16L18,2Z" style="fill:white;fill-opacity:0.2;"/>- <g transform="matrix(1.125,0,0,1.125,-6.75,-8.5)">- <path d="M8,15.991C8,15.991 10.248,12 14.001,12C17.752,12 20,15.991 20,15.991C20,15.991 17.761,20 14.001,20C10.239,20 8,15.991 8,15.991ZM14,13C15.656,13 17,14.344 17,16C17,17.656 15.656,19 14,19C12.344,19 11,17.656 11,16C11,14.344 12.344,13 14,13ZM14,14.5C14.828,14.5 15.5,15.172 15.5,16C15.5,16.828 14.828,17.5 14,17.5C13.172,17.5 12.5,16.828 12.5,16C12.5,15.172 13.172,14.5 14,14.5Z" style="fill:white;"/>- </g>-</svg>diff --git a/stuff/config/qss/Default/imgs/white/layer_header_table_view.svg b/stuff/config/qss/Default/imgs/white/layer_header_table_view.svgdeleted file mode 100644index a2a280ab8..000000000--- a/stuff/config/qss/Default/imgs/white/layer_header_table_view.svg+++ /dev/null@@ -1,9 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="18" height="18" style="fill-opacity:0;"/>- <g id="ellipse9" transform="matrix(0.928571,0,0,0.928571,0.642857,0.642857)">- <path d="M9,2C12.863,2 16,5.137 16,9C16,12.863 12.863,16 9,16C5.137,16 2,12.863 2,9C2,5.137 5.137,2 9,2Z" style="fill:none;stroke:white;stroke-opacity:0.8;stroke-width:1.29px;"/>- </g>- <rect x="5" y="6" width="8" height="6" style="fill:white;fill-opacity:0.8;"/>-</svg>diff --git a/stuff/config/qss/Default/imgs/white/layer_header_table_view_over.svg b/stuff/config/qss/Default/imgs/white/layer_header_table_view_over.svgdeleted file mode 100644index 3dfe1c692..000000000--- a/stuff/config/qss/Default/imgs/white/layer_header_table_view_over.svg+++ /dev/null@@ -1,9 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <path d="M18,2C18,0.896 17.104,0 16,0L2,0C0.896,0 0,0.896 0,2L0,16C0,17.104 0.896,18 2,18L16,18C17.104,18 18,17.104 18,16L18,2Z" style="fill:white;fill-opacity:0.2;"/>- <g id="ellipse9" transform="matrix(0.928571,0,0,0.928571,0.642857,0.642857)">- <path d="M9,2C12.863,2 16,5.137 16,9C16,12.863 12.863,16 9,16C5.137,16 2,12.863 2,9C2,5.137 5.137,2 9,2Z" style="fill:none;stroke:white;stroke-width:1.29px;"/>- </g>- <rect x="5" y="6" width="8" height="6" style="fill:white;"/>-</svg>diff --git a/stuff/config/qss/Default/imgs/white/layer_lock_on.svg b/stuff/config/qss/Default/imgs/white/layer_lock_on.svgdeleted file mode 100644index 00d037246..000000000--- a/stuff/config/qss/Default/imgs/white/layer_lock_on.svg+++ /dev/null@@ -1,13 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <g transform="matrix(0.818182,0,0,0.818182,1.77636e-15,1.77636e-15)">- <rect x="0" y="0" width="22" height="22" style="fill-opacity:0;"/>- </g>- <g>- <g id="path4509" transform="matrix(0.0555556,0,0,0.0555556,-0.5,0)">- <path d="M162,54C127.2,54 99,82.2 99,117L99,144L117,144L117,117C117,92.2 137.2,72 162,72C186.8,72 207,92.1 207,117L207,144L225,144L225,117C225,82.2 196.8,54 162,54Z" style="fill:white;fill-opacity:0.8;fill-rule:nonzero;"/>- </g>- <path id="rect4488" d="M5,8C4.735,8 4.48,8.105 4.293,8.293C4.105,8.48 4,8.735 4,9L4,14C4,14.265 4.105,14.52 4.293,14.707C4.48,14.895 4.735,15 5,15L12,15C12.265,15 12.52,14.895 12.707,14.707C12.895,14.52 13,14.265 13,14L13,9C13,8.735 12.895,8.48 12.707,8.293C12.52,8.105 12.265,8 12,8L5,8ZM7.75,11.799C7.302,11.54 7,11.055 7,10.5C7,9.672 7.672,9 8.5,9C9.328,9 10,9.672 10,10.5C10,11.055 9.698,11.54 9.25,11.799L9.25,13.25C9.25,13.664 8.914,14 8.5,14C8.086,14 7.75,13.664 7.75,13.25L7.75,11.799Z" style="fill:white;fill-opacity:0.8;fill-rule:nonzero;"/>- </g>-</svg>diff --git a/stuff/config/qss/Default/imgs/white/layer_lock_on_over.svg b/stuff/config/qss/Default/imgs/white/layer_lock_on_over.svgdeleted file mode 100644index f5e9a7ce4..000000000--- a/stuff/config/qss/Default/imgs/white/layer_lock_on_over.svg+++ /dev/null@@ -1,14 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <g transform="matrix(0.818182,0,0,0.818182,1.77636e-15,1.77636e-15)">- <rect x="0" y="0" width="22" height="22" style="fill-opacity:0;"/>- </g>- <path d="M18,2C18,0.896 17.104,0 16,0L2,0C0.896,0 0,0.896 0,2L0,16C0,17.104 0.896,18 2,18L16,18C17.104,18 18,17.104 18,16L18,2Z" style="fill:white;fill-opacity:0.2;"/>- <g>- <g id="path4509" transform="matrix(0.0555556,0,0,0.0555556,-0.5,0)">- <path d="M162,54C127.2,54 99,82.2 99,117L99,144L117,144L117,117C117,92.2 137.2,72 162,72C186.8,72 207,92.1 207,117L207,144L225,144L225,117C225,82.2 196.8,54 162,54Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <path id="rect4488" d="M5,8C4.735,8 4.48,8.105 4.293,8.293C4.105,8.48 4,8.735 4,9L4,14C4,14.265 4.105,14.52 4.293,14.707C4.48,14.895 4.735,15 5,15L12,15C12.265,15 12.52,14.895 12.707,14.707C12.895,14.52 13,14.265 13,14L13,9C13,8.735 12.895,8.48 12.707,8.293C12.52,8.105 12.265,8 12,8L5,8ZM7.75,11.799C7.302,11.54 7,11.055 7,10.5C7,9.672 7.672,9 8.5,9C9.328,9 10,9.672 10,10.5C10,11.055 9.698,11.54 9.25,11.799L9.25,13.25C9.25,13.664 8.914,14 8.5,14C8.086,14 7.75,13.664 7.75,13.25L7.75,11.799Z" style="fill:white;fill-rule:nonzero;"/>- </g>-</svg>diff --git a/stuff/config/qss/Default/imgs/white/transparent.svg b/stuff/config/qss/Default/imgs/white/transparent.svgnew file mode 100644index 000000000..d3f1714f9--- /dev/null+++ b/stuff/config/qss/Default/imgs/white/transparent.svg@@ -0,0 +1,4 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+</svg>diff --git a/stuff/config/qss/Default/less/Default.less b/stuff/config/qss/Default/less/Default.lessindex 121ac3070..055b11cd5 100644--- a/stuff/config/qss/Default/less/Default.less+++ b/stuff/config/qss/Default/less/Default.less@@ -34,6 +34,8 @@@label-title: rgb(159, 218, 255);@label-error: rgb(255, 0, 0);+@lock-color: #C34040;+// -----------------------------------------------------------------------------// Tabs// -----------------------------------------------------------------------------@@ -198,7 +200,7 @@@toolbutton-border-color-disabled: @toolbutton-bg-color-disabled;// Lock-@toolbutton-lock-bg-color-checked: #C34040;+@toolbutton-lock-bg-color-checked: @lock-color;@toolbutton-lock-border-color-checked: @toolbutton-lock-bg-color-checked;@toolbutton-lock-bg-color-checked-hover: lighten(@toolbutton-lock-bg-color-checked, 15);@toolbutton-lock-border-color-checked-hover: @toolbutton-lock-bg-color-checked-hover;@@ -325,8 +327,9 @@// Title pane icon colors@title-button-rollover-color: @button-bg-color-hover;@title-button-pressed-color: @hl-bg-color;-@title-button-freeze-color: @toolbutton-lock-bg-color-checked;+@title-button-freeze-color: @lock-color;@title-button-preview-color: #1baf7e;+@title-close-over-color: @lock-color;// -----------------------------------------------------------------------------// File Browser / Treesdiff --git a/stuff/config/qss/Default/less/layouts/mainwindow.less b/stuff/config/qss/Default/less/layouts/mainwindow.lessindex 86fc349fd..e16a9f0ef 100644--- a/stuff/config/qss/Default/less/layouts/mainwindow.less+++ b/stuff/config/qss/Default/less/layouts/mainwindow.less@@ -195,6 +195,9 @@ TPanelTitleBar {qproperty-ActiveBorderPixmap: url('@{img-url}/@{title-active-border-pixmap}');qproperty-FloatBorderPixmap: url('none');qproperty-FloatActiveBorderPixmap: url('@{img-url}/@{title-active-border-pixmap}');++ // Buttons+ qproperty-OverColor: @title-close-over-color;}TPanelTitleBarButton {diff --git a/stuff/config/qss/Default/less/layouts/xsheet.less b/stuff/config/qss/Default/less/layouts/xsheet.lessindex 5d7cbcaec..20101393e 100644--- a/stuff/config/qss/Default/less/layouts/xsheet.less+++ b/stuff/config/qss/Default/less/layouts/xsheet.less@@ -193,7 +193,7 @@ XsheetViewer {qproperty-TimelinePreviewButtonBgOnColor: @bg;qproperty-TimelinePreviewButtonOnImage: url('@{img-url}/preview_small.svg');qproperty-TimelinePreviewButtonBgOffColor: @bg;- qproperty-TimelinePreviewButtonOffImage: url('none');+ qproperty-TimelinePreviewButtonOffImage: url('@{img-url}/transparent.svg');qproperty-TimelineUnifiedButtonTranspImage: url('@{img-url}/preview_trans_small.svg');@@ -201,23 +201,15 @@ XsheetViewer {qproperty-TimelineCamstandButtonOnImage: url('@{img-url}/table_small.svg');qproperty-TimelineCamstandButtonTranspImage: url('@{img-url}/trans_small.svg');qproperty-TimelineCamstandButtonBgOffColor: @bg;- qproperty-TimelineCamstandButtonOffImage: url('none');+ qproperty-TimelineCamstandButtonOffImage: url('@{img-url}/transparent.svg');qproperty-TimelineLockButtonBgOnColor: @bg;qproperty-TimelineLockButtonOnImage: url('@{img-url}/lock_on_small.svg');qproperty-TimelineLockButtonBgOffColor: @bg;- qproperty-TimelineLockButtonOffImage: url('none');+ qproperty-TimelineLockButtonOffImage: url('@{img-url}/transparent.svg');qproperty-TimelineConfigButtonBgColor: @bg;qproperty-TimelineConfigButtonImage: url('@{img-url}/timeline_config.svg');-- // Header Control- qproperty-LayerHeaderPreviewImage: url('@{img-url}/layer_header_prev_eye.svg');- qproperty-LayerHeaderPreviewOverImage: url('@{img-url}/layer_header_prev_eye_over.svg');- qproperty-LayerHeaderCamstandImage: url('@{img-url}/layer_header_table_view.svg');- qproperty-LayerHeaderCamstandOverImage: url('@{img-url}/layer_header_table_view_over.svg');- qproperty-LayerHeaderLockImage: url('@{img-url}/layer_lock_on.svg');- qproperty-LayerHeaderLockOverImage: url('@{img-url}/layer_lock_on_over.svg');}/* -----------------------------------------------------------------------------diff --git a/stuff/config/qss/Default/less/themes/Light.less b/stuff/config/qss/Default/less/themes/Light.lessindex 72b8aedf2..c9e993ff2 100644--- a/stuff/config/qss/Default/less/themes/Light.less+++ b/stuff/config/qss/Default/less/themes/Light.less@@ -20,6 +20,8 @@@hl-text-color: #000;@hl-bg-color-secondary: darken(@bg, 15);+@lock-color: #e0625c;+// -----------------------------------------------------------------------------// Tabs// -----------------------------------------------------------------------------@@ -52,7 +54,7 @@// Title pane icon colors@title-button-pressed-color: darken(@hl-bg-color, 8);@title-button-rollover-color: darken(@title-bg-color, 20);-@title-button-freeze-color: #e0625c;+@title-button-freeze-color: @lock-color;@title-button-preview-color: #2cb856;// -----------------------------------------------------------------------------@@ -75,7 +77,7 @@@toolbutton-border-color-checked: darken(@toolbutton-bg-color-checked, 10);@toolbutton-bg-color-hover: darken(@bg, 15);-@toolbutton-lock-bg-color-checked: @title-button-freeze-color;+@toolbutton-lock-bg-color-checked: @lock-color;@toolbutton-lock-border-color-checked: darken(@toolbutton-lock-bg-color-checked, 20);// -----------------------------------------------------------------------------diff --git a/stuff/config/qss/Default/less/themes/Neutral.less b/stuff/config/qss/Default/less/themes/Neutral.lessindex 9226fed80..5e45f23cb 100644--- a/stuff/config/qss/Default/less/themes/Neutral.less+++ b/stuff/config/qss/Default/less/themes/Neutral.less@@ -21,6 +21,8 @@@dock-bg-color: darken(@bg, 30);@label-title: rgb(0, 0, 0);+@lock-color: #bd5454;+// -----------------------------------------------------------------------------// Tabs// -----------------------------------------------------------------------------@@ -115,8 +117,7 @@@toolbutton-border-color-checked-hover: @toolbutton-border-color-checked;// Lock-@toolbutton-lock-bg-color-checked: #bd5454;-@toolbutton-lock-border-color-checked: darken(@toolbutton-lock-bg-color-checked, 20);+@toolbutton-lock-border-color-checked: darken(@lock-color, 20);@toolbutton-lock-border-color-checked-hover: @toolbutton-lock-border-color-checked;// -----------------------------------------------------------------------------diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qssindex ebe296f24..e35a57396 100644--- a/stuff/config/qss/Light/Light.qss+++ b/stuff/config/qss/Light/Light.qss@@ -367,6 +367,7 @@ TPanelTitleBar {qproperty-ActiveBorderPixmap: url('../Default/imgs/black/none');qproperty-FloatBorderPixmap: url('none');qproperty-FloatActiveBorderPixmap: url('../Default/imgs/black/none');+ qproperty-OverColor: #e0625c;}TPanelTitleBarButton {qproperty-PressedColor: #82add2;@@ -2345,8 +2346,8 @@ XsheetViewer {qproperty-MeshColumnBorderColor: #9278ac;qproperty-SelectedMeshColumnColor: #a49dc2;qproperty-MetaColumnColor: #a8a8a8;- qproperty-MetaColumnBorderColor: #686868;- qproperty-SelectedMetaColumnColor: #c2c2c2;+ qproperty-MetaColumnBorderColor: #828282;+ qproperty-SelectedMetaColumnColor: #99a1a7;qproperty-SoundTextColumnColor: #c2c2c2;qproperty-SoundTextColumnBorderColor: #9c9c9c;qproperty-SelectedSoundTextColumnColor: #abb3b9;@@ -2389,25 +2390,19 @@ XsheetViewer {qproperty-TimelinePreviewButtonBgOnColor: #DBDBDB;qproperty-TimelinePreviewButtonOnImage: url('../Default/imgs/black/preview_small.svg');qproperty-TimelinePreviewButtonBgOffColor: #DBDBDB;- qproperty-TimelinePreviewButtonOffImage: url('none');+ qproperty-TimelinePreviewButtonOffImage: url('../Default/imgs/black/transparent.svg');qproperty-TimelineUnifiedButtonTranspImage: url('../Default/imgs/black/preview_trans_small.svg');qproperty-TimelineCamstandButtonBgOnColor: #DBDBDB;qproperty-TimelineCamstandButtonOnImage: url('../Default/imgs/black/table_small.svg');qproperty-TimelineCamstandButtonTranspImage: url('../Default/imgs/black/trans_small.svg');qproperty-TimelineCamstandButtonBgOffColor: #DBDBDB;- qproperty-TimelineCamstandButtonOffImage: url('none');+ qproperty-TimelineCamstandButtonOffImage: url('../Default/imgs/black/transparent.svg');qproperty-TimelineLockButtonBgOnColor: #DBDBDB;qproperty-TimelineLockButtonOnImage: url('../Default/imgs/black/lock_on_small.svg');qproperty-TimelineLockButtonBgOffColor: #DBDBDB;- qproperty-TimelineLockButtonOffImage: url('none');+ qproperty-TimelineLockButtonOffImage: url('../Default/imgs/black/transparent.svg');qproperty-TimelineConfigButtonBgColor: #DBDBDB;qproperty-TimelineConfigButtonImage: url('../Default/imgs/black/timeline_config.svg');- qproperty-LayerHeaderPreviewImage: url('../Default/imgs/black/layer_header_prev_eye.svg');- qproperty-LayerHeaderPreviewOverImage: url('../Default/imgs/black/layer_header_prev_eye_over.svg');- qproperty-LayerHeaderCamstandImage: url('../Default/imgs/black/layer_header_table_view.svg');- qproperty-LayerHeaderCamstandOverImage: url('../Default/imgs/black/layer_header_table_view_over.svg');- qproperty-LayerHeaderLockImage: url('../Default/imgs/black/layer_lock_on.svg');- qproperty-LayerHeaderLockOverImage: url('../Default/imgs/black/layer_lock_on_over.svg');}/* -----------------------------------------------------------------------------Function Editordiff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qssindex 7ac5da9a3..f194e5cd8 100644--- a/stuff/config/qss/Neutral/Neutral.qss+++ b/stuff/config/qss/Neutral/Neutral.qss@@ -367,6 +367,7 @@ TPanelTitleBar {qproperty-ActiveBorderPixmap: url('../Default/imgs/black/none');qproperty-FloatBorderPixmap: url('none');qproperty-FloatActiveBorderPixmap: url('../Default/imgs/black/none');+ qproperty-OverColor: #bd5454;}TPanelTitleBarButton {qproperty-PressedColor: #8FA0B2;@@ -2345,8 +2346,8 @@ XsheetViewer {qproperty-MeshColumnBorderColor: #654f7e;qproperty-SelectedMeshColumnColor: #a18fc3;qproperty-MetaColumnColor: #8c8c8c;- qproperty-MetaColumnBorderColor: #c8c8c8;- qproperty-SelectedMetaColumnColor: #a6a6a6;+ qproperty-MetaColumnBorderColor: #666666;+ qproperty-SelectedMetaColumnColor: #a2a6aa;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #818181;qproperty-SelectedSoundTextColumnColor: #bbbfc3;@@ -2389,25 +2390,19 @@ XsheetViewer {qproperty-TimelinePreviewButtonBgOnColor: #808080;qproperty-TimelinePreviewButtonOnImage: url('../Default/imgs/black/preview_small.svg');qproperty-TimelinePreviewButtonBgOffColor: #808080;- qproperty-TimelinePreviewButtonOffImage: url('none');+ qproperty-TimelinePreviewButtonOffImage: url('../Default/imgs/black/transparent.svg');qproperty-TimelineUnifiedButtonTranspImage: url('../Default/imgs/black/preview_trans_small.svg');qproperty-TimelineCamstandButtonBgOnColor: #808080;qproperty-TimelineCamstandButtonOnImage: url('../Default/imgs/black/table_small.svg');qproperty-TimelineCamstandButtonTranspImage: url('../Default/imgs/black/trans_small.svg');qproperty-TimelineCamstandButtonBgOffColor: #808080;- qproperty-TimelineCamstandButtonOffImage: url('none');+ qproperty-TimelineCamstandButtonOffImage: url('../Default/imgs/black/transparent.svg');qproperty-TimelineLockButtonBgOnColor: #808080;qproperty-TimelineLockButtonOnImage: url('../Default/imgs/black/lock_on_small.svg');qproperty-TimelineLockButtonBgOffColor: #808080;- qproperty-TimelineLockButtonOffImage: url('none');+ qproperty-TimelineLockButtonOffImage: url('../Default/imgs/black/transparent.svg');qproperty-TimelineConfigButtonBgColor: #808080;qproperty-TimelineConfigButtonImage: url('../Default/imgs/black/timeline_config.svg');- qproperty-LayerHeaderPreviewImage: url('../Default/imgs/black/layer_header_prev_eye.svg');- qproperty-LayerHeaderPreviewOverImage: url('../Default/imgs/black/layer_header_prev_eye_over.svg');- qproperty-LayerHeaderCamstandImage: url('../Default/imgs/black/layer_header_table_view.svg');- qproperty-LayerHeaderCamstandOverImage: url('../Default/imgs/black/layer_header_table_view_over.svg');- qproperty-LayerHeaderLockImage: url('../Default/imgs/black/layer_lock_on.svg');- qproperty-LayerHeaderLockOverImage: url('../Default/imgs/black/layer_lock_on_over.svg');}/* -----------------------------------------------------------------------------Function Editordiff --git a/toonz/sources/include/toonzqt/gutil.h b/toonz/sources/include/toonzqt/gutil.hindex 234f98634..00c0817e0 100644--- a/toonz/sources/include/toonzqt/gutil.h+++ b/toonz/sources/include/toonzqt/gutil.h@@ -39,6 +39,11 @@ const QColor grey225(225, 225, 225);const QColor grey190(190, 190, 190);const QColor grey150(150, 150, 150);+struct SvgRenderParams {+ QSize size;+ QRectF rect;+};+} // namespaceclass QPainter;@@ -95,11 +100,24 @@ QPixmap DVAPI scalePixmapKeepingAspectRatio(QPixmap p, QSize size,//-----------------------------------------------------------------------------+SvgRenderParams calculateSvgRenderParams(const QSize &desiredSize,+ QSize &imageSize,+ Qt::AspectRatioMode aspectRatioMode);++//-----------------------------------------------------------------------------+QPixmap DVAPI-svgToPixmap(const QString &svgFilePath, const QSize &size = QSize(),+svgToPixmap(const QString &svgFilePath, QSize size = QSize(),Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio,QColor bgColor = Qt::transparent);+//-----------------------------------------------------------------------------++QImage DVAPI+svgToImage(const QString &svgFilePath, QSize size = QSize(),+ Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio,+ QColor bgColor = Qt::transparent);+//-----------------------------------------------------------------------------// returns device-pixel ratio. It is 1 for normal monitors and 2 (or higher// ratio) for high DPI monitors. Setting "Display > Set custom text size(DPI)"@@ -108,18 +126,47 @@ int DVAPI getDevicePixelRatio(const QWidget *widget = nullptr);//------------------------------------------------------------------------------QPixmap DVAPI compositePixmap(QPixmap pixmap, const qreal &opacity = 0.8,- const QSize &size = QSize(),- const int leftAdj = 0, const int topAdj = 0,- QColor bgColor = Qt::transparent);-QPixmap DVAPI recolorPixmap(- QPixmap pixmap, QColor color = Preferences::instance()->getIconTheme()- ? Qt::black- : Qt::white);-QIcon DVAPI createQIcon(const char *iconSVGName, bool useFullOpacity = false,- bool isForMenuItem = false);-void DVAPI addSpecifiedSizedImageToIcon(QIcon &icon, const char *iconSVGName,- QSize newSize);+QImage DVAPI adjustImageOpacity(const QImage &input, qreal opacity = 1.0);++//-----------------------------------------------------------------------------++QImage DVAPI compositeImage(const QImage &input, QSize newSize = QSize(),+ bool scaleInput = false,+ QColor bgColor = Qt::transparent);++//-----------------------------------------------------------------------------++QPixmap DVAPI convertImageToPixmap(const QImage &image);++//-----------------------------------------------------------------------------++QImage DVAPI+generateIconImage(const QString &iconSVGName, qreal opacity = qreal(1.0),+ QSize newSize = QSize(),+ Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio);++//-----------------------------------------------------------------------------++QPixmap DVAPI+generateIconPixmap(const QString &iconSVGName, qreal opacity = qreal(1.0),+ QSize newSize = QSize(),+ Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio);++//-----------------------------------------------------------------------------++void DVAPI addImagesToIcon(QIcon &icon, const QImage &baseImg,+ const QImage &overImg = QImage(),+ const QImage &onImg = QImage(),+ bool useFullOpacity = false);++//-----------------------------------------------------------------------------++void DVAPI addPixmapToAllModesAndStates(QIcon &icon, const QPixmap &pixmap);++//-----------------------------------------------------------------------------++QIcon DVAPI createQIcon(const QString &iconSVGName, bool useFullOpacity = false,+ bool isForMenuItem = false, QSize newSize = QSize());QIcon DVAPI createQIconPNG(const char *iconPNGName);QIcon DVAPI createQIconOnOffPNG(const char *iconPNGName, bool withOver = true);QIcon DVAPI createTemporaryIconFromName(const char *commandName);@@ -219,4 +266,39 @@ protected:QString DVAPI operator+(const QString &a, const TFilePath &fp);+//-----------------------------------------------------------------------------+// Theme Manager+// For managing icon themes++class DVAPI ThemeManager { // singleton+public:+ static ThemeManager &getInstance();++ void buildIconPathsMap(const QString &path);+ bool hasIcon(const QString &iconName) const;+ QString getIconPath(const QString &iconName) const;++ qreal getOnOpacity() const;+ qreal getOffOpacity() const;+ qreal getDisabledOpacity() const;++ QImage recolorBlackPixels(const QImage &image, QColor color = QColor());+ QPixmap recolorBlackPixels(const QPixmap &input, QColor color = QColor());++ // Debug+ void printiconPathsMap();++ ThemeManager(ThemeManager const &) = delete;+ void operator=(ThemeManager const &) = delete;+ ~ThemeManager();++private:+ ThemeManager();++ class ThemeManagerImpl; // forward declaration+ std::unique_ptr<ThemeManagerImpl> impl; // opaque pointer+};++QString DVAPI getIconPath(const QString &path);+#endif // GUTIL_Hdiff --git a/toonz/sources/toonz/castselection.cpp b/toonz/sources/toonz/castselection.cppindex 70830508d..e3079d700 100644--- a/toonz/sources/toonz/castselection.cpp+++ b/toonz/sources/toonz/castselection.cpp@@ -38,7 +38,7 @@ void CastSelection::getSelectedLevels(std::vector<TXshLevel *> &levels) {CastItems const &castItems = m_browser->getCastItems();for (int i = 0; i < castItems.getItemCount(); i++) {if (!isSelected(i)) continue;- TXshLevel *level = castItems.getItem(i)->getSimpleLevel();+ TXshLevel *level = castItems.getItem(i)->getSimpleLevel();if (!level) level = castItems.getItem(i)->getPaletteLevel();if (!level) level = castItems.getItem(i)->getSoundLevel();if (level) levels.push_back(level);@@ -93,7 +93,7 @@ QPixmap LevelCastItem::getPixmap(bool isSelected) const {bool onDemand = false;if (Preferences::instance()->getColumnIconLoadingPolicy() ==Preferences::LoadOnDemand)- onDemand = !isSelected;+ onDemand = !isSelected;QPixmap icon = IconGenerator::instance()->getIcon(sl, sl->getFirstFid(),false, onDemand);return scalePixmapKeepingAspectRatio(icon, m_itemPixmapSize, Qt::transparent);@@ -138,9 +138,8 @@ int SoundCastItem::getFrameCount() const {//-----------------------------------------------------------------------------QPixmap SoundCastItem::getPixmap(bool isSelected) const {- static QPixmap loudspeaker(- svgToPixmap(getIconThemePath("mimetypes/60/audio_icon.svg"),- m_itemPixmapSize, Qt::KeepAspectRatio));+ static QPixmap loudspeaker(generateIconPixmap(+ "audio_icon", qreal(1.0), m_itemPixmapSize, Qt::KeepAspectRatio));return loudspeaker;}diff --git a/toonz/sources/toonz/dvitemview.cpp b/toonz/sources/toonz/dvitemview.cppindex 6141bc7d6..8b2ca4270 100644--- a/toonz/sources/toonz/dvitemview.cpp+++ b/toonz/sources/toonz/dvitemview.cpp@@ -1028,8 +1028,7 @@ void DvItemViewerPanel::paintThumbnailItem(QPainter &p, int index) {if (!thumbnail.isNull()) p.drawPixmap(iconRect.topLeft(), thumbnail);//}else {- static QPixmap missingPixmap =- QPixmap(getIconThemePath("mimetypes/60/missing_icon.svg"));+ static QPixmap missingPixmap = generateIconPixmap("missing_icon");QRect pixmapRect(rect.left() + (rect.width() - missingPixmap.width()) / 2,rect.top(), missingPixmap.width(), missingPixmap.height());p.drawPixmap(pixmapRect.topLeft(), missingPixmap);@@ -1251,7 +1250,7 @@ void DvItemViewerPanel::mousePressEvent(QMouseEvent *event) {}if (m_globalSelectionEnabled) m_selection->makeCurrent();m_currentIndex = index;- //if (m_viewer ) m_viewer->notifyClick(index);+ // if (m_viewer ) m_viewer->notifyClick(index);m_startDragPosition = event->pos();update();}@@ -1302,7 +1301,7 @@ void DvItemViewerPanel::mouseMoveEvent(QMouseEvent *event) {//-----------------------------------------------------------------------------void DvItemViewerPanel::mouseReleaseEvent(QMouseEvent *) {- if (m_viewer ) m_viewer->notifyClick(m_currentIndex);+ if (m_viewer) m_viewer->notifyClick(m_currentIndex);}//-----------------------------------------------------------------------------diff --git a/toonz/sources/toonz/exportscenepopup.cpp b/toonz/sources/toonz/exportscenepopup.cppindex 4dc3f0c77..ed6b98f43 100644--- a/toonz/sources/toonz/exportscenepopup.cpp+++ b/toonz/sources/toonz/exportscenepopup.cpp@@ -122,10 +122,8 @@ ExportSceneDvDirModelFileFolderNode::createExposeSceneNode(// ExportSceneDvDirModelProjectNodeQPixmap ExportSceneDvDirModelProjectNode::getPixmap(bool isOpen) const {- static QPixmap openProjectPixmap(recolorPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_project_on.svg"))));- static QPixmap closeProjectPixmap(recolorPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_project.svg"))));+ static QPixmap openProjectPixmap(generateIconPixmap("folder_project_on"));+ static QPixmap closeProjectPixmap(generateIconPixmap("folder_project"));return isOpen ? openProjectPixmap : closeProjectPixmap;}@@ -193,8 +191,8 @@ void ExportSceneDvDirModelRootNode::refreshChildren() {ExportSceneDvDirModelSpecialFileFolderNode *projectRootNode =new ExportSceneDvDirModelSpecialFileFolderNode(this, L"Project root (" + rootDir + L")", projectRoot);- projectRootNode->setPixmap(QPixmap(recolorPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_project_root.svg")))));+ projectRootNode->setPixmap(+ QPixmap(generateIconPixmap("folder_project_root")));m_projectRootNodes.push_back(projectRootNode);addChild(projectRootNode);}diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cppindex 62491cc98..1565d696c 100644--- a/toonz/sources/toonz/filebrowser.cpp+++ b/toonz/sources/toonz/filebrowser.cpp@@ -897,22 +897,19 @@ QVariant FileBrowser::getItemData(int index, DataType dataType,QSize iconSize = m_itemViewer->getPanel()->getIconSize();// parent folder iconsif (item.m_path == m_folder.getParentDir()) {- static QPixmap folderUpPixmap(- svgToPixmap(getIconThemePath("actions/60/folder_browser_up.svg"),- iconSize, Qt::KeepAspectRatio));+ static QPixmap folderUpPixmap(generateIconPixmap(+ "folder_browser_up", qreal(1.0), iconSize, Qt::KeepAspectRatio));return folderUpPixmap;}// folder iconselse if (item.m_isFolder) {if (item.m_isLink) {- static QPixmap folderLinkPixmap(- svgToPixmap(getIconThemePath("actions/60/folder_browser_link.svg"),- iconSize, Qt::KeepAspectRatio));+ static QPixmap folderLinkPixmap(generateIconPixmap(+ "folder_browser_link", qreal(1.0), iconSize, Qt::KeepAspectRatio));return folderLinkPixmap;} else {- static QPixmap folderPixmap(- svgToPixmap(getIconThemePath("actions/60/folder_browser.svg"),- iconSize, Qt::KeepAspectRatio));+ static QPixmap folderPixmap(generateIconPixmap(+ "folder_browser", qreal(1.0), iconSize, Qt::KeepAspectRatio));return folderPixmap;}}diff --git a/toonz/sources/toonz/filebrowsermodel.cpp b/toonz/sources/toonz/filebrowsermodel.cppindex 3371b58d9..35e1ded17 100644--- a/toonz/sources/toonz/filebrowsermodel.cpp+++ b/toonz/sources/toonz/filebrowsermodel.cpp@@ -353,10 +353,8 @@ DvDirModelNode *DvDirModelFileFolderNode::getNodeByPath(const TFilePath &path) {//-----------------------------------------------------------------------------QPixmap DvDirModelFileFolderNode::getPixmap(bool isOpen) const {- static QPixmap openFolderPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_on.svg")));- static QPixmap closeFolderPixmap(- svgToPixmap(getIconThemePath("actions/18/folder.svg")));+ static QPixmap openFolderPixmap = generateIconPixmap("folder_on");+ static QPixmap closeFolderPixmap = generateIconPixmap("folder");return isOpen ? openFolderPixmap : closeFolderPixmap;}@@ -506,10 +504,8 @@ DvDirModelNode *DvDirVersionControlNode::makeChild(std::wstring name) {//-----------------------------------------------------------------------------QPixmap DvDirVersionControlNode::getPixmap(bool isOpen) const {- static QPixmap openFolderPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_on.svg")));- static QPixmap closeFolderPixmap(- svgToPixmap(getIconThemePath("actions/18/folder.svg")));+ static QPixmap openFolderPixmap(generateIconPixmap("folder_on"));+ static QPixmap closeFolderPixmap(generateIconPixmap("folder"));static QPixmap openMissingPixmap(svgToPixmap(":Resources/vcfolder_mis_open.svg"));static QPixmap closeMissingPixmap(@@ -782,10 +778,8 @@ void DvDirModelProjectNode::makeCurrent() {//-----------------------------------------------------------------------------QPixmap DvDirModelProjectNode::getPixmap(bool isOpen) const {- static QPixmap openProjectPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_project_on.svg")));- static QPixmap closeProjectPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_project.svg")));+ static QPixmap openProjectPixmap = generateIconPixmap("folder_project_on");+ static QPixmap closeProjectPixmap = generateIconPixmap("folder_project");return isOpen ? openProjectPixmap : closeProjectPixmap;}@@ -866,10 +860,8 @@ void DvDirModelDayNode::visualizeContent(FileBrowser *browser) {//-----------------------------------------------------------------------------QPixmap DvDirModelDayNode::getPixmap(bool isOpen) const {- static QPixmap openFolderPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_on.svg")));- static QPixmap closeFolderPixmap(- svgToPixmap(getIconThemePath("actions/18/folder.svg")));+ static QPixmap openFolderPixmap = generateIconPixmap("folder_on");+ static QPixmap closeFolderPixmap = generateIconPixmap("folder");return isOpen ? openFolderPixmap : closeFolderPixmap;}@@ -1072,22 +1064,19 @@ void DvDirModelRootNode::refreshChildren() {DvDirModelSpecialFileFolderNode *child;child = new DvDirModelSpecialFileFolderNode(this, L"My Documents",getMyDocumentsPath());- child->setPixmap(recolorPixmap(- svgToPixmap(getIconThemePath("actions/16/my_documents.svg"))));+ child->setPixmap(generateIconPixmap("my_documents"));m_specialNodes.push_back(child);addChild(child);child =new DvDirModelSpecialFileFolderNode(this, L"Desktop", getDesktopPath());- child->setPixmap(- recolorPixmap(svgToPixmap(getIconThemePath("actions/16/desktop.svg"))));+ child->setPixmap(generateIconPixmap("desktop"));m_specialNodes.push_back(child);addChild(child);child = new DvDirModelSpecialFileFolderNode(this, L"Library", ToonzFolder::getLibraryFolder());- child->setPixmap(- recolorPixmap(svgToPixmap(getIconThemePath("actions/16/library.svg"))));+ child->setPixmap(generateIconPixmap("library"));m_specialNodes.push_back(child);addChild(child);@@ -1104,8 +1093,8 @@ void DvDirModelRootNode::refreshChildren() {DvDirModelSpecialFileFolderNode *projectRootNode =new DvDirModelSpecialFileFolderNode(this, L"Project root (" + roothDir + L")", projectRoot);- projectRootNode->setPixmap(QPixmap(recolorPixmap(svgToPixmap(- getIconThemePath("actions/18/folder_project_root.svg")))));+ projectRootNode->setPixmap(+ QPixmap(generateIconPixmap("folder_project_root")));m_projectRootNodes.push_back(projectRootNode);addChild(projectRootNode);}diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cppindex ae5e34185..4b946dc5a 100644--- a/toonz/sources/toonz/flipbook.cpp+++ b/toonz/sources/toonz/flipbook.cpp@@ -265,8 +265,8 @@ void FlipBook::addFreezeButtonToTitleBar() {TPanel *panel = qobject_cast<TPanel *>(parentWidget());if (panel) {TPanelTitleBar *titleBar = panel->getTitleBar();- m_freezeButton = new TPanelTitleBarButton(- titleBar, getIconThemePath("actions/20/pane_freeze.svg"));+ m_freezeButton =+ new TPanelTitleBarButton(titleBar, getIconPath("pane_freeze"));m_freezeButton->setToolTip("Freeze");titleBar->add(QPoint(-64, 0), m_freezeButton);connect(m_freezeButton, SIGNAL(toggled(bool)), this, SLOT(freeze(bool)));diff --git a/toonz/sources/toonz/icons/dark/actions/16/lock.svg b/toonz/sources/toonz/icons/dark/actions/16/lock.svgnew file mode 100644index 000000000..aedeaa5c7--- /dev/null+++ b/toonz/sources/toonz/icons/dark/actions/16/lock.svg@@ -0,0 +1,15 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <g transform="matrix(1,0,0,1,-2,-2)">+ <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>+ </g>+ <g transform="matrix(1,0,0,1,-1,-1)">+ <g id="rect4488" transform="matrix(1,0,0,1,-1,0)">+ <path d="M5,8C4.735,8 4.48,8.105 4.293,8.293C4.105,8.48 4,8.735 4,9L4,14C4,14.265 4.105,14.52 4.293,14.707C4.48,14.895 4.735,15 5,15L12,15C12.265,15 12.52,14.895 12.707,14.707C12.895,14.52 13,14.265 13,14L13,9C13,8.735 12.895,8.48 12.707,8.293C12.52,8.105 12.265,8 12,8L5,8ZM7.75,11.799C7.302,11.54 7,11.055 7,10.5C7,9.672 7.672,9 8.5,9C9.328,9 10,9.672 10,10.5C10,11.055 9.698,11.54 9.25,11.799L9.25,13.25C9.25,13.664 8.914,14 8.5,14C8.086,14 7.75,13.664 7.75,13.25L7.75,11.799Z" style="fill-rule:nonzero;"/>+ </g>+ <g id="path4491" transform="matrix(1,0,0,1,-1,0)">+ <path d="M13.5,2C11.6,2 10,3.6 10,5.5L10,8L11,8L11,5.5C11,4.1 12.1,3 13.5,3C14.9,3 16,4.1 16,5.5L16,6.5C16,6.776 16.224,7 16.5,7C16.776,7 17,6.776 17,6.5L17,5.5C17,3.6 15.4,2 13.5,2Z" style="fill-rule:nonzero;"/>+ </g>+ </g>+</svg>diff --git a/stuff/config/qss/Default/imgs/black/layer_lock_on_over.svg b/toonz/sources/toonz/icons/dark/actions/16/lock_on.svgsimilarity index 63%rename from stuff/config/qss/Default/imgs/black/layer_lock_on_over.svgrename to toonz/sources/toonz/icons/dark/actions/16/lock_on.svgindex d7ce8d596..b4d14e9c8 100644--- a/stuff/config/qss/Default/imgs/black/layer_lock_on_over.svg+++ b/toonz/sources/toonz/icons/dark/actions/16/lock_on.svg@@ -1,11 +1,10 @@<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="18px" height="18px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <g transform="matrix(0.818182,0,0,0.818182,1.77636e-15,1.77636e-15)">- <rect x="0" y="0" width="22" height="22" style="fill-opacity:0;"/>+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <g transform="matrix(1,0,0,1,-2,-2)">+ <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/></g>- <path d="M18,2C18,0.896 17.104,0 16,0L2,0C0.896,0 0,0.896 0,2L0,16C0,17.104 0.896,18 2,18L16,18C17.104,18 18,17.104 18,16L18,2Z" style="fill-opacity:0.2;"/>- <g>+ <g transform="matrix(1,0,0,1,-1,-1)"><g id="path4509" transform="matrix(0.0555556,0,0,0.0555556,-0.5,0)"><path d="M162,54C127.2,54 99,82.2 99,117L99,144L117,144L117,117C117,92.2 137.2,72 162,72C186.8,72 207,92.1 207,117L207,144L225,144L225,117C225,82.2 196.8,54 162,54Z" style="fill-rule:nonzero;"/></g>diff --git a/toonz/sources/toonz/icons/dark/actions/16/new_note_level.svg b/toonz/sources/toonz/icons/dark/actions/16/new_note_level.svgindex 892069e34..7b6bdbcb2 100644--- a/toonz/sources/toonz/icons/dark/actions/16/new_note_level.svg+++ b/toonz/sources/toonz/icons/dark/actions/16/new_note_level.svg@@ -2,10 +2,10 @@<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g id="new_note_level">- <rect id="bg" x="0.001" y="-0.04" width="16" height="16" style="fill:#878787;fill-opacity:0;"/>+ <rect id="bg" x="0.001" y="-0.04" width="16" height="16" style="fill:rgb(135,135,135);fill-opacity:0;"/><rect x="4.501" y="4.235" width="5" height="1.45"/><rect x="4.501" y="7.235" width="7" height="1.45"/><rect x="4.501" y="10.235" width="6" height="1.45"/>- <path d="M15,5l0.019,10l-14.019,0l0,-14l10.001,0l3.999,4Zm-1,9l0,-9l-3,0l0,-3l-9,0l0,12l12,0Z"/>+ <path d="M14.694,4.694C14.89,4.89 15,5.156 15.001,5.432C15.004,6.91 15.013,11.788 15.017,13.951C15.018,14.229 14.907,14.496 14.711,14.693C14.515,14.889 14.248,15 13.97,15C11.369,15 4.646,15 2.047,15C1.769,15 1.503,14.89 1.307,14.693C1.11,14.497 1,14.231 1,13.953C1,11.356 1,4.644 1,2.047C1,1.769 1.11,1.503 1.307,1.307C1.503,1.11 1.769,1 2.047,1C4.209,1 9.087,1 10.567,1C10.845,1 11.111,1.11 11.308,1.307C12.053,2.052 13.95,3.95 14.694,4.694ZM14,14L14,5L11,5L11,2L2,2L2,14L14,14Z"/></g></svg>diff --git a/toonz/sources/toonz/icons/dark/actions/16/table.svg b/toonz/sources/toonz/icons/dark/actions/16/table.svgnew file mode 100644index 000000000..caa347b45--- /dev/null+++ b/toonz/sources/toonz/icons/dark/actions/16/table.svg@@ -0,0 +1,15 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <g transform="matrix(1,0,0,1,-1,-1)">+ <rect x="0" y="0" width="18" height="18" style="fill-opacity:0;"/>+ </g>+ <g transform="matrix(0.928571,0,0,0.928571,-0.357142,-0.357143)">+ <g id="ellipse9">+ <path d="M9,2C12.863,2 16,5.137 16,9C16,12.863 12.863,16 9,16C5.137,16 2,12.863 2,9C2,5.137 5.137,2 9,2Z" style="fill:none;stroke:#000;stroke-width:1.29px;"/>+ </g>+ </g>+ <g transform="matrix(1,0,0,1,-1,-1)">+ <rect x="5" y="6" width="8" height="6"/>+ </g>+</svg>diff --git a/toonz/sources/toonz/icons/dark/actions/18/.svg b/toonz/sources/toonz/icons/dark/actions/18/.svgdeleted file mode 100644index f7ad3c7ef..000000000--- a/toonz/sources/toonz/icons/dark/actions/18/.svg+++ /dev/null@@ -1,8 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>- <g transform="matrix(1,0,0,1,-1.5,1)">- <path d="M3.5,8.989C3.5,8.989 6.31,4 11,4C15.69,4 18.5,8.989 18.5,8.989C18.5,8.989 15.701,14 11,14C6.299,14 3.5,8.989 3.5,8.989ZM11,5C13.208,5 15,6.792 15,9C15,11.208 13.208,13 11,13C8.792,13 7,11.208 7,9C7,6.792 8.792,5 11,5ZM11,7C12.104,7 13,7.896 13,9C13,10.104 12.104,11 11,11C9.896,11 9,10.104 9,9C9,7.896 9.896,7 11,7Z" style="fill:black;"/>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/index.theme b/toonz/sources/toonz/icons/dark/index.themedeleted file mode 100644index d38bc9ad1..000000000--- a/toonz/sources/toonz/icons/dark/index.theme+++ /dev/null@@ -1,62 +0,0 @@-[Icon Theme]-Name=dark-Comment=a dark icon set for use in light themes-Inherits=light--Directories=actions/11,actions/15,actions/16,actions/18,actions/20,actions/30,actions/35,actions/48,actions/60,actions/74,console/20,tools/18,tools/20,devices/20--[actions/11]-Size=11-Type=Scalable--[actions/15]-Size=15-Type=Scalable--[actions/16]-Size=16-Type=Scalable--[actions/18]-Size=18-Type=Scalable--[actions/20]-Size=20-Type=Scalable--[actions/30]-Size=30-Type=Scalable--[actions/35]-Size=35-Type=Scalable--[actions/48]-Size=48-Type=Scalable--[actions/60]-Size=60-Type=Scalable--[actions/74]-Size=74-Type=Scalable--[console/20]-Size=20-Type=Scalable--[tools/18]-Size=18-Type=Scalabe--[tools/20]-Size=20-Type=Scalabe--[devices/20]-Size=20-Type=Scalablediff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/audio_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/audio_icon.svgdeleted file mode 100644index 1af6f27df..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/audio_icon.svg+++ /dev/null@@ -1,25 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(184,184,184);fill-opacity:0;"/>- <g id="page">- <g id="base" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(64,181,185);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(173,225,226);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <g id="outline" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(24,91,93);"/>- </g>- <g transform="matrix(1,0,0,1,2,2)">- <path d="M21,42.259L21,24.5L38,19L38,39.5C38,41.984 35.984,44 33.5,44C31.016,44 29,41.984 29,39.5C29,37.016 31.016,35 33.5,35C34.425,35 35.285,35.279 36,35.759L36,23.927L23,28.214L23,45.5L22.972,45.5C22.991,45.664 23,45.831 23,46C23,48.484 20.984,50.5 18.5,50.5C16.016,50.5 14,48.484 14,46C14,43.516 16.016,41.5 18.5,41.5C19.425,41.5 20.285,41.779 21,42.259Z" style="fill-opacity:0.3;"/>- </g>- <g transform="matrix(1,0,0,1,2,1)">- <path d="M21,42.259L21,24.5L38,19L38,39.5C38,41.984 35.984,44 33.5,44C31.016,44 29,41.984 29,39.5C29,37.016 31.016,35 33.5,35C34.425,35 35.285,35.279 36,35.759L36,23.927L23,28.214L23,45.5L22.972,45.5C22.991,45.664 23,45.831 23,46C23,48.484 20.984,50.5 18.5,50.5C16.016,50.5 14,48.484 14,46C14,43.516 16.016,41.5 18.5,41.5C19.425,41.5 20.285,41.779 21,42.259Z" style="fill:white;"/>- </g>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/broken_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/broken_icon.svgdeleted file mode 100644index 97397c717..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/broken_icon.svg+++ /dev/null@@ -1,21 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill-opacity:0;"/>- <g transform="matrix(1,0,0,1,-1,1)">- <g id="page">- <g id="outline">- <g transform="matrix(1,0,0,1,1,0)">- <path d="M8,34L14.5,40.5L22,33L29.5,40.5L37,33L44.5,40.5L51,34L51,56L8,56L8,34ZM51,23L44.5,29.5L37,22L29.5,29.5L22,22L14.5,29.5L8,23L8,2L40,2L51,13L51,23Z" style="fill:rgb(228,228,228);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,1,0)">- <path d="M40,2L51,13L40,13L40,2Z" style="fill:white;fill-rule:nonzero;"/>- </g>- </g>- </g>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <path d="M15,41L14,41L14,42L15,42L15,41ZM45,41L44,41L44,42L45,42L45,41ZM30,41L29,41L29,42L30,42L30,41ZM44,40L43,40L43,41L44,41L44,40ZM46,40L45,40L45,41L46,41L46,40ZM29,40L28,40L28,41L29,41L29,40ZM31,40L30,40L30,41L31,41L31,40ZM14,40L13,40L13,41L14,41L14,40ZM16,40L15,40L15,41L16,41L16,40ZM17,39L16,39L16,40L17,40L17,39ZM13,39L12,39L12,40L13,40L13,39ZM43,39L42,39L42,40L43,40L43,39ZM47,39L46,39L46,40L47,40L47,39ZM28,39L27,39L27,40L28,40L28,39ZM32,39L31,39L31,40L32,40L32,39ZM27,38L26,38L26,39L27,39L27,38ZM33,38L32,38L32,39L33,39L33,38ZM12,38L11,38L11,39L12,39L12,38ZM18,38L17,38L17,39L18,39L18,38ZM42,38L41,38L41,39L42,39L42,38ZM48,38L47,38L47,39L48,39L48,38ZM41,37L40,37L40,38L41,38L41,37ZM49,37L48,37L48,38L49,38L49,37ZM26,37L25,37L25,38L26,38L26,37ZM34,37L33,37L33,38L34,38L34,37ZM11,37L10,37L10,38L11,38L11,37ZM19,37L18,37L18,38L19,38L19,37ZM20,36L19,36L19,37L20,37L20,36ZM10,36L9,36L9,37L10,37L10,36ZM35,36L34,36L34,37L35,37L35,36ZM25,36L24,36L24,37L25,37L25,36ZM40,36L39,36L39,37L40,37L40,36ZM50,36L49,36L49,37L50,37L50,36ZM39,35L38,35L38,36L39,36L39,35ZM24,35L23,35L23,36L24,36L24,35ZM36,35L35,35L35,36L36,36L36,35ZM8,57L51,57L51,36L50,36L50,35L51,35L51,34L52,34L52,58L7,58L7,34L8,34L8,35L9,35L9,36L8,36L8,57ZM21,35L20,35L20,36L21,36L21,35ZM36,35L36,34L38,34L38,35L36,35ZM23,34L23,35L21,35L21,34L23,34ZM15,30L14,30L14,31L15,31L15,30ZM30,30L29,30L29,31L30,31L30,30ZM45,30L44,30L44,31L45,31L45,30ZM16,29L15,29L15,30L16,30L16,29ZM29,29L28,29L28,30L29,30L29,29ZM14,29L13,29L13,30L14,30L14,29ZM31,29L30,29L30,30L31,30L31,29ZM46,29L45,29L45,30L46,30L46,29ZM44,29L43,29L43,30L44,30L44,29ZM43,28L42,28L42,29L43,29L43,28ZM13,28L12,28L12,29L13,29L13,28ZM17,28L16,28L16,29L17,29L17,28ZM32,28L31,28L31,29L32,29L32,28ZM28,28L27,28L27,29L28,29L28,28ZM47,28L46,28L46,29L47,29L47,28ZM42,27L41,27L41,28L42,28L42,27ZM48,27L47,27L47,28L48,28L48,27ZM18,27L17,27L17,28L18,28L18,27ZM12,27L11,27L11,28L12,28L12,27ZM27,27L26,27L26,28L27,28L27,27ZM33,27L32,27L32,28L33,28L33,27ZM41,26L40,26L40,27L41,27L41,26ZM49,26L48,26L48,27L49,27L49,26ZM26,26L25,26L25,27L26,27L26,26ZM34,26L33,26L33,27L34,27L34,26ZM11,26L10,26L10,27L11,27L11,26ZM19,26L18,26L18,27L19,27L19,26ZM20,25L19,25L19,26L20,26L20,25ZM10,25L9,25L9,26L10,26L10,25ZM35,25L34,25L34,26L35,26L35,25ZM25,25L24,25L24,26L25,26L25,25ZM50,25L49,25L49,26L50,26L50,25ZM40,25L39,25L39,26L40,26L40,25ZM51,24L50,24L50,25L51,25L51,24ZM39,24L38,24L38,25L39,25L39,24ZM9,24L8,24L8,25L9,25L9,24ZM36,24L35,24L35,25L36,25L36,24ZM24,24L23,24L23,25L24,25L24,24ZM21,24L20,24L20,25L21,25L21,24ZM51,14L40,3L8,3L8,24L7,24L7,2L41,2L41,3L42,3L42,4L43,4L43,5L44,5L44,6L45,6L45,7L46,7L46,8L47,8L47,9L48,9L48,10L49,10L49,11L50,11L50,12L51,12L51,13L52,13L52,24L51,24L51,14ZM23,23L23,24L21,24L21,23L23,23ZM36,24L36,23L38,23L38,24L36,24Z" style="fill:rgb(39,39,39);"/>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/cleanup_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/cleanup_icon.svgdeleted file mode 100644index d8a4b16bf..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/cleanup_icon.svg+++ /dev/null@@ -1,67 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(59,59,59);fill-opacity:0;"/>- <g id="page">- <g id="base" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(72,121,52);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(150,206,127);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <g id="outline" transform="matrix(1,0,0,1,-1,1)">- <g transform="matrix(1,0,0,0.947836,8.71586,16.3208)">- <g transform="matrix(13,0,0,13.1217,9.77559,38.544)">- <path d="M0.575,-0.029C0.522,-0.002 0.456,0.012 0.378,0.012C0.276,0.012 0.195,-0.02 0.134,-0.084C0.073,-0.149 0.042,-0.233 0.042,-0.337C0.042,-0.449 0.076,-0.539 0.145,-0.608C0.214,-0.677 0.301,-0.712 0.406,-0.712C0.474,-0.712 0.53,-0.702 0.575,-0.683L0.575,-0.568C0.528,-0.596 0.475,-0.61 0.418,-0.61C0.343,-0.61 0.281,-0.586 0.234,-0.537C0.187,-0.489 0.164,-0.424 0.164,-0.343C0.164,-0.266 0.186,-0.204 0.229,-0.158C0.273,-0.113 0.331,-0.09 0.403,-0.09C0.469,-0.09 0.526,-0.105 0.575,-0.137L0.575,-0.029Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(13,0,0,13.561,18.0832,38.6978)">- <path d="M0.474,0L0.086,0L0.086,-0.7L0.203,-0.7L0.203,-0.098L0.474,-0.098L0.474,0Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(12.1579,0,0,13.561,24.9773,38.6978)">- <path d="M0.68,0L0.553,0L0.219,-0.515C0.21,-0.528 0.203,-0.541 0.198,-0.555L0.195,-0.555C0.197,-0.54 0.199,-0.508 0.199,-0.459L0.199,0L0.086,0L0.086,-0.7L0.222,-0.7L0.545,-0.198C0.559,-0.177 0.567,-0.163 0.571,-0.155L0.573,-0.155C0.57,-0.173 0.568,-0.205 0.568,-0.249L0.568,-0.7L0.68,-0.7L0.68,0Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- </g>- <g>- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(33,63,21);"/>- </g>- <g transform="matrix(1,0,0,0.947836,8.71586,15.3208)">- <g transform="matrix(13,0,0,13.1217,9.77559,38.544)">- <path d="M0.575,-0.029C0.522,-0.002 0.456,0.012 0.378,0.012C0.276,0.012 0.195,-0.02 0.134,-0.084C0.073,-0.149 0.042,-0.233 0.042,-0.337C0.042,-0.449 0.076,-0.539 0.145,-0.608C0.214,-0.677 0.301,-0.712 0.406,-0.712C0.474,-0.712 0.53,-0.702 0.575,-0.683L0.575,-0.568C0.528,-0.596 0.475,-0.61 0.418,-0.61C0.343,-0.61 0.281,-0.586 0.234,-0.537C0.187,-0.489 0.164,-0.424 0.164,-0.343C0.164,-0.266 0.186,-0.204 0.229,-0.158C0.273,-0.113 0.331,-0.09 0.403,-0.09C0.469,-0.09 0.526,-0.105 0.575,-0.137L0.575,-0.029Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(13,0,0,13.561,18.0832,38.6978)">- <path d="M0.474,0L0.086,0L0.086,-0.7L0.203,-0.7L0.203,-0.098L0.474,-0.098L0.474,0Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(12.1579,0,0,13.561,24.9773,38.6978)">- <path d="M0.68,0L0.553,0L0.219,-0.515C0.21,-0.528 0.203,-0.541 0.198,-0.555L0.195,-0.555C0.197,-0.54 0.199,-0.508 0.199,-0.459L0.199,0L0.086,0L0.086,-0.7L0.222,-0.7L0.545,-0.198C0.559,-0.177 0.567,-0.163 0.571,-0.155L0.573,-0.155C0.57,-0.173 0.568,-0.205 0.568,-0.249L0.568,-0.7L0.68,-0.7L0.68,0Z" style="fill:white;fill-rule:nonzero;"/>- </g>- </g>- </g>- <g transform="matrix(1.22828,0,0,1.20913,-6.96115,-20.1923)">- <g transform="matrix(0.564739,0,0,0.564739,13.9574,18.7774)">- <g>- <path d="M33.862,42.304C35.557,39.628 35.78,37.025 33.29,34.535C30.799,32.045 27.505,32.22 25.605,34.083C22.136,36.502 18.621,38.391 14.343,39.046C13.863,39.526 14.445,40.916 14.445,40.916C17.154,40.74 21.227,39.813 23.46,38.361C20.341,41.498 18.501,42.948 16.149,44.035C16.149,44.035 16.205,44.113 16.233,44.152C16.615,44.678 17.386,45.7 17.386,45.7C18.587,45.349 20.682,44.465 21.695,43.551C21.066,44.717 19.641,46.155 18.637,46.947C18.637,46.947 22.43,50.792 24.446,52.18C24.525,52.236 24.662,52.362 24.715,52.283C26.411,49.781 28.298,47.896 28.283,47.939C28.227,48.103 26.838,50.53 26.885,53.526C26.885,53.526 28.33,53.93 28.779,53.481C29.792,49.942 31.647,45.353 33.862,42.304ZM35.299,30.017L40.961,24.355C41.652,23.664 42.774,23.664 43.465,24.355C44.156,25.046 44.156,26.168 43.465,26.859L37.803,32.521C38.488,33.957 37.905,36.224 37.228,37.661C37.23,36.022 36.55,34.413 34.978,32.842C33.5,31.363 31.787,30.659 30.153,30.593C31.593,29.914 33.862,29.331 35.299,30.017Z" style="fill-opacity:0.3;"/>- </g>- </g>- <g transform="matrix(0.564739,0,0,0.564739,13.9574,18.7774)">- <g>- <path d="M42.611,44.082L40.966,47.017C40.902,47.133 40.868,47.262 40.868,47.395C40.868,47.528 40.902,47.657 40.967,47.772L42.61,50.707L39.675,49.064C39.56,48.999 39.431,48.965 39.298,48.965C39.165,48.965 39.036,48.999 38.92,49.063L35.985,50.708L37.629,47.772C37.694,47.657 37.727,47.526 37.728,47.395C37.728,47.262 37.693,47.132 37.629,47.018L35.985,44.082L38.921,45.726C39.035,45.79 39.165,45.825 39.298,45.825C39.429,45.823 39.56,45.791 39.675,45.726L42.611,44.082ZM24.408,24.574L22.763,27.509C22.699,27.626 22.665,27.755 22.665,27.887C22.665,28.02 22.699,28.149 22.764,28.264L24.407,31.199L21.472,29.556C21.357,29.491 21.228,29.458 21.095,29.458C20.962,29.458 20.833,29.491 20.717,29.555L17.782,31.2L19.426,28.264C19.491,28.149 19.524,28.019 19.525,27.887C19.525,27.755 19.49,27.625 19.426,27.511L17.782,24.574L20.718,26.218C20.832,26.282 20.962,26.317 21.095,26.317C21.227,26.316 21.357,26.284 21.472,26.218L24.408,24.574Z" style="fill-opacity:0.3;"/>- </g>- </g>- </g>- <g transform="matrix(1.22828,0,0,1.20913,-6.96115,-21.1923)">- <g transform="matrix(0.564739,0,0,0.564739,13.9574,18.7774)">- <g>- <path d="M33.862,42.304C35.557,39.628 35.78,37.025 33.29,34.535C30.799,32.045 27.505,32.22 25.605,34.083C22.136,36.502 18.621,38.391 14.343,39.046C13.863,39.526 14.445,40.916 14.445,40.916C17.154,40.74 21.227,39.813 23.46,38.361C20.341,41.498 18.501,42.948 16.149,44.035C16.149,44.035 16.205,44.113 16.233,44.152C16.615,44.678 17.386,45.7 17.386,45.7C18.587,45.349 20.682,44.465 21.695,43.551C21.066,44.717 19.641,46.155 18.637,46.947C18.637,46.947 22.43,50.792 24.446,52.18C24.525,52.236 24.662,52.362 24.715,52.283C26.411,49.781 28.298,47.896 28.283,47.939C28.227,48.103 26.838,50.53 26.885,53.526C26.885,53.526 28.33,53.93 28.779,53.481C29.792,49.942 31.647,45.353 33.862,42.304ZM35.299,30.017L40.961,24.355C41.652,23.664 42.774,23.664 43.465,24.355C44.156,25.046 44.156,26.168 43.465,26.859L37.803,32.521C38.488,33.957 37.905,36.224 37.228,37.661C37.23,36.022 36.55,34.413 34.978,32.842C33.5,31.363 31.787,30.659 30.153,30.593C31.593,29.914 33.862,29.331 35.299,30.017Z" style="fill:white;"/>- </g>- </g>- <g transform="matrix(0.564739,0,0,0.564739,13.9574,18.7774)">- <g>- <path d="M42.611,44.082L40.966,47.017C40.902,47.133 40.868,47.262 40.868,47.395C40.868,47.528 40.902,47.657 40.967,47.772L42.61,50.707L39.675,49.064C39.56,48.999 39.431,48.965 39.298,48.965C39.165,48.965 39.036,48.999 38.92,49.063L35.985,50.708L37.629,47.772C37.694,47.657 37.727,47.526 37.728,47.395C37.728,47.262 37.693,47.132 37.629,47.018L35.985,44.082L38.921,45.726C39.035,45.79 39.165,45.825 39.298,45.825C39.429,45.823 39.56,45.791 39.675,45.726L42.611,44.082ZM24.408,24.574L22.763,27.509C22.699,27.626 22.665,27.755 22.665,27.887C22.665,28.02 22.699,28.149 22.764,28.264L24.407,31.199L21.472,29.556C21.357,29.491 21.228,29.458 21.095,29.458C20.962,29.458 20.833,29.491 20.717,29.555L17.782,31.2L19.426,28.264C19.491,28.149 19.524,28.019 19.525,27.887C19.525,27.755 19.49,27.625 19.426,27.511L17.782,24.574L20.718,26.218C20.832,26.282 20.962,26.317 21.095,26.317C21.227,26.316 21.357,26.284 21.472,26.218L24.408,24.574Z" style="fill:white;"/>- </g>- </g>- </g>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/curve_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/curve_icon.svgdeleted file mode 100644index 8c82f98af..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/curve_icon.svg+++ /dev/null@@ -1,59 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(184,184,184);fill-opacity:0;"/>- <g id="page">- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(72,121,52);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(150,206,127);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(33,63,21);"/>- </g>- <g transform="matrix(1,0,0,1,0,-12)">- <path d="M46,52L13,52L13,31L46,31L46,52ZM15,45L15,50L20,50L20,45L15,45ZM21,45L21,50L26,50L26,45L21,45ZM27,45L27,50L32,50L32,45L27,45ZM33,45L33,50L38,50L38,45L33,45ZM39,45L39,50L44,50L44,45L39,45ZM15,39L15,44L20,44L20,39L15,39ZM21,39L21,44L26,44L26,39L21,39ZM27,39L27,44L32,44L32,39L27,39ZM33,39L33,44L38,44L38,39L33,39ZM39,39L39,44L44,44L44,39L39,39ZM15,33L15,38L20,38L20,33L15,33ZM21,33L21,38L26,38L26,33L21,33ZM27,33L27,38L32,38L32,33L27,33ZM33,33L33,38L38,38L38,33L33,33ZM39,33L39,38L44,38L44,33L39,33Z" style="fill-opacity:0.5;"/>- </g>- <g>- <path d="M44,38.056C39.45,37.996 36.227,37.2 34.419,36.056C32.783,35.021 28.941,30.642 26.204,27.851C21.956,23.52 15.328,24.083 15.328,24.083C15.216,24.092 15.106,24.088 15,24.074L15,21.102C15.028,21.098 15.056,21.095 15.085,21.093C15.085,21.093 23.283,20.343 28.346,25.751C32.257,29.928 34.225,32.272 36.098,33.57C37.533,34.564 40.735,35.035 44,35.204L44,38.056Z" style="fill:rgb(255,127,33);"/>- </g>- <g transform="matrix(1,0,0,1.0221,-1.32985,2.89295)">- <g transform="matrix(11.2123,0,0,10.8163,13.886,49.8752)">- <path d="M0.575,-0.029C0.522,-0.002 0.456,0.012 0.378,0.012C0.276,0.012 0.195,-0.02 0.134,-0.084C0.073,-0.149 0.042,-0.233 0.042,-0.337C0.042,-0.449 0.076,-0.539 0.145,-0.608C0.214,-0.677 0.301,-0.712 0.406,-0.712C0.474,-0.712 0.53,-0.702 0.575,-0.683L0.575,-0.568C0.528,-0.596 0.475,-0.61 0.418,-0.61C0.343,-0.61 0.281,-0.586 0.234,-0.537C0.187,-0.489 0.164,-0.424 0.164,-0.343C0.164,-0.266 0.186,-0.204 0.229,-0.158C0.273,-0.113 0.331,-0.09 0.403,-0.09C0.469,-0.09 0.526,-0.105 0.575,-0.137L0.575,-0.029Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,10.9382,20.9705,49.8338)">- <path d="M0.625,-0.283C0.625,-0.087 0.532,0.012 0.346,0.012C0.167,0.012 0.078,-0.083 0.078,-0.272L0.078,-0.7L0.194,-0.7L0.194,-0.296C0.194,-0.159 0.248,-0.09 0.354,-0.09C0.457,-0.09 0.509,-0.156 0.509,-0.289L0.509,-0.7L0.625,-0.7L0.625,-0.283Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11.1783,28.4614,50.002)">- <path d="M0.627,0L0.492,0L0.38,-0.188C0.37,-0.205 0.36,-0.219 0.35,-0.232C0.341,-0.244 0.331,-0.254 0.321,-0.262C0.311,-0.27 0.3,-0.275 0.289,-0.279C0.277,-0.282 0.264,-0.284 0.249,-0.284L0.202,-0.284L0.202,0L0.086,0L0.086,-0.7L0.317,-0.7C0.35,-0.7 0.38,-0.696 0.408,-0.688C0.435,-0.681 0.459,-0.669 0.48,-0.653C0.5,-0.637 0.517,-0.618 0.528,-0.594C0.54,-0.57 0.545,-0.543 0.545,-0.511C0.545,-0.486 0.542,-0.464 0.534,-0.443C0.527,-0.422 0.517,-0.404 0.503,-0.388C0.49,-0.372 0.473,-0.358 0.454,-0.347C0.435,-0.335 0.414,-0.326 0.39,-0.32L0.39,-0.318C0.403,-0.311 0.414,-0.303 0.423,-0.295C0.433,-0.286 0.442,-0.277 0.45,-0.268C0.459,-0.259 0.467,-0.249 0.475,-0.237C0.484,-0.226 0.493,-0.212 0.503,-0.197L0.627,0ZM0.202,-0.606L0.202,-0.378L0.299,-0.378C0.317,-0.378 0.333,-0.381 0.348,-0.387C0.364,-0.392 0.377,-0.4 0.388,-0.411C0.399,-0.421 0.407,-0.434 0.414,-0.449C0.42,-0.464 0.423,-0.48 0.423,-0.499C0.423,-0.533 0.412,-0.559 0.391,-0.578C0.37,-0.597 0.34,-0.606 0.3,-0.606L0.202,-0.606Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11.1783,35.3421,50.002)">- <path d="M0.635,-0.7L0.384,0L0.254,0L0.007,-0.7L0.134,-0.7L0.307,-0.169C0.312,-0.152 0.316,-0.132 0.319,-0.11L0.321,-0.11C0.324,-0.128 0.328,-0.148 0.335,-0.17L0.512,-0.7L0.635,-0.7Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11.1783,42.3671,50.002)">- <path d="M0.479,0L0.086,0L0.086,-0.7L0.464,-0.7L0.464,-0.602L0.203,-0.602L0.203,-0.403L0.443,-0.403L0.443,-0.305L0.203,-0.305L0.203,-0.098L0.479,-0.098L0.479,0Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- </g>- <g transform="matrix(1,0,0,1.0221,-1.32985,1.89295)">- <g transform="matrix(11.2123,0,0,10.8163,13.886,49.8752)">- <path d="M0.575,-0.029C0.522,-0.002 0.456,0.012 0.378,0.012C0.276,0.012 0.195,-0.02 0.134,-0.084C0.073,-0.149 0.042,-0.233 0.042,-0.337C0.042,-0.449 0.076,-0.539 0.145,-0.608C0.214,-0.677 0.301,-0.712 0.406,-0.712C0.474,-0.712 0.53,-0.702 0.575,-0.683L0.575,-0.568C0.528,-0.596 0.475,-0.61 0.418,-0.61C0.343,-0.61 0.281,-0.586 0.234,-0.537C0.187,-0.489 0.164,-0.424 0.164,-0.343C0.164,-0.266 0.186,-0.204 0.229,-0.158C0.273,-0.113 0.331,-0.09 0.403,-0.09C0.469,-0.09 0.526,-0.105 0.575,-0.137L0.575,-0.029Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,10.9382,20.9705,49.8338)">- <path d="M0.625,-0.283C0.625,-0.087 0.532,0.012 0.346,0.012C0.167,0.012 0.078,-0.083 0.078,-0.272L0.078,-0.7L0.194,-0.7L0.194,-0.296C0.194,-0.159 0.248,-0.09 0.354,-0.09C0.457,-0.09 0.509,-0.156 0.509,-0.289L0.509,-0.7L0.625,-0.7L0.625,-0.283Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11.1783,28.4614,50.002)">- <path d="M0.627,0L0.492,0L0.38,-0.188C0.37,-0.205 0.36,-0.219 0.35,-0.232C0.341,-0.244 0.331,-0.254 0.321,-0.262C0.311,-0.27 0.3,-0.275 0.289,-0.279C0.277,-0.282 0.264,-0.284 0.249,-0.284L0.202,-0.284L0.202,0L0.086,0L0.086,-0.7L0.317,-0.7C0.35,-0.7 0.38,-0.696 0.408,-0.688C0.435,-0.681 0.459,-0.669 0.48,-0.653C0.5,-0.637 0.517,-0.618 0.528,-0.594C0.54,-0.57 0.545,-0.543 0.545,-0.511C0.545,-0.486 0.542,-0.464 0.534,-0.443C0.527,-0.422 0.517,-0.404 0.503,-0.388C0.49,-0.372 0.473,-0.358 0.454,-0.347C0.435,-0.335 0.414,-0.326 0.39,-0.32L0.39,-0.318C0.403,-0.311 0.414,-0.303 0.423,-0.295C0.433,-0.286 0.442,-0.277 0.45,-0.268C0.459,-0.259 0.467,-0.249 0.475,-0.237C0.484,-0.226 0.493,-0.212 0.503,-0.197L0.627,0ZM0.202,-0.606L0.202,-0.378L0.299,-0.378C0.317,-0.378 0.333,-0.381 0.348,-0.387C0.364,-0.392 0.377,-0.4 0.388,-0.411C0.399,-0.421 0.407,-0.434 0.414,-0.449C0.42,-0.464 0.423,-0.48 0.423,-0.499C0.423,-0.533 0.412,-0.559 0.391,-0.578C0.37,-0.597 0.34,-0.606 0.3,-0.606L0.202,-0.606Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11.1783,35.3421,50.002)">- <path d="M0.635,-0.7L0.384,0L0.254,0L0.007,-0.7L0.134,-0.7L0.307,-0.169C0.312,-0.152 0.316,-0.132 0.319,-0.11L0.321,-0.11C0.324,-0.128 0.328,-0.148 0.335,-0.17L0.512,-0.7L0.635,-0.7Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11.1783,42.3671,50.002)">- <path d="M0.479,0L0.086,0L0.086,-0.7L0.464,-0.7L0.464,-0.602L0.203,-0.602L0.203,-0.403L0.443,-0.403L0.443,-0.305L0.203,-0.305L0.203,-0.098L0.479,-0.098L0.479,0Z" style="fill:white;fill-rule:nonzero;"/>- </g>- </g>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/json_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/json_icon.svgdeleted file mode 100644index e9d83f3d3..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/json_icon.svg+++ /dev/null@@ -1,110 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<svg- xmlns:dc="http://purl.org/dc/elements/1.1/"- xmlns:cc="http://creativecommons.org/ns#"- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"- xmlns:svg="http://www.w3.org/2000/svg"- xmlns="http://www.w3.org/2000/svg"- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"- width="60px"- height="60px"- version="1.1"- xml:space="preserve"- style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"- id="svg44"- sodipodi:docname="json_icon.svg"- inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata- id="metadata50"><rdf:RDF><cc:Work- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs- id="defs48">------------- </defs><sodipodi:namedview- pagecolor="#ffffff"- bordercolor="#666666"- borderopacity="1"- objecttolerance="10"- gridtolerance="10"- guidetolerance="10"- inkscape:pageopacity="0"- inkscape:pageshadow="2"- inkscape:window-width="1273"- inkscape:window-height="826"- id="namedview46"- showgrid="false"- showguides="false"- inkscape:zoom="3.9333333"- inkscape:cx="0.69877966"- inkscape:cy="48.877998"- inkscape:window-x="458"- inkscape:window-y="28"- inkscape:window-maximized="0"- inkscape:current-layer="svg44" />- <rect- x="0"- y="0"- width="60"- height="60"- style="fill:rgb(184,184,184);fill-opacity:0;"- id="rect2" />- <path- d="M 52,58 H 7 V 2 h 34 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 z"- style="fill:#a2e5db;fill-rule:nonzero;fill-opacity:1;stroke:none"- id="path4"- inkscape:connector-curvature="0" /><path- d="M 40,14 V 2 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 z"- style="fill:#cfecef;fill-rule:nonzero;fill-opacity:1"- id="path7"- inkscape:connector-curvature="0" /><g- id="g13"- transform="translate(-1,1)">- <path- inkscape:connector-curvature="0"- id="path11"- style="fill-opacity:0.25"- d="M 41,13 H 52 V 24 Z" />- </g><path- d="M 52,58 H 7 V 2 h 34 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 v 1 h 1 z M 40,3 H 8 V 57 H 51 V 14 Z"- style="fill:#3a839a;fill-opacity:1"- id="path15"- inkscape:connector-curvature="0" />-<g- aria-label="JSON"- style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"- id="text884"><path- d="m 15.929203,42.828612 h 1.920573 v 6.041667 q 0,1.184896 -0.208334,1.822916 -0.279947,0.833334 -1.015625,1.341146 -0.735677,0.501302 -1.940104,0.501302 -1.41276,0 -2.174479,-0.78776 -0.761718,-0.794271 -0.768229,-2.324219 l 1.816406,-0.208333 q 0.03255,0.820312 0.240886,1.158854 0.3125,0.514323 0.950521,0.514323 0.644531,0 0.911458,-0.364583 0.266927,-0.371094 0.266927,-1.529948 z"- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial Bold'"- id="path890" /><path- d="m 19.418786,49.267414 1.875,-0.182291 q 0.169271,0.94401 0.683594,1.386718 0.520833,0.442709 1.39974,0.442709 0.930989,0 1.399739,-0.390625 0.475261,-0.397136 0.475261,-0.92448 0,-0.338541 -0.201823,-0.572916 -0.195313,-0.240886 -0.690105,-0.416667 -0.338541,-0.117187 -1.542968,-0.416667 -1.549479,-0.384114 -2.174479,-0.94401 -0.878907,-0.78776 -0.878907,-1.920573 0,-0.729166 0.410157,-1.360677 0.416666,-0.638021 1.191406,-0.970052 0.78125,-0.332031 1.88151,-0.332031 1.796875,0 2.701823,0.78776 0.911458,0.787761 0.957031,2.102865 l -1.927083,0.08463 q -0.123698,-0.735677 -0.533854,-1.054687 -0.403646,-0.325521 -1.217448,-0.325521 -0.839844,0 -1.315104,0.345052 -0.30599,0.221354 -0.30599,0.592448 0,0.338542 0.286459,0.579427 0.364583,0.305989 1.770833,0.638021 1.40625,0.332031 2.076823,0.690104 0.677083,0.351562 1.054687,0.970052 0.384115,0.611979 0.384115,1.516927 0,0.820312 -0.455729,1.536458 -0.455729,0.716146 -1.289063,1.067709 -0.833333,0.345052 -2.076823,0.345052 -1.809895,0 -2.779948,-0.833334 -0.970052,-0.839843 -1.158854,-2.441406 z"- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial Bold'"- id="path892" /><path- d="m 28.422693,47.659341 q 0,-1.458333 0.436198,-2.447916 0.32552,-0.729167 0.885416,-1.308594 0.566406,-0.579427 1.236979,-0.859375 0.891927,-0.377604 2.057292,-0.377604 2.109375,0 3.372396,1.308594 1.269531,1.308593 1.269531,3.639322 0,2.311198 -1.256511,3.619792 -1.25651,1.302083 -3.359374,1.302083 -2.128907,0 -3.385417,-1.295573 -1.25651,-1.302083 -1.25651,-3.580729 z m 1.985677,-0.0651 q 0,1.621094 0.748698,2.460938 0.748697,0.833333 1.901041,0.833333 1.152344,0 1.888021,-0.826823 0.742187,-0.833333 0.742187,-2.49349 0,-1.640625 -0.722656,-2.447916 -0.716146,-0.807292 -1.907552,-0.807292 -1.191406,0 -1.920573,0.820313 -0.729166,0.813802 -0.729166,2.460937 z"- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial Bold'"- id="path894" /><path- d="m 39.197431,52.372883 v -9.544271 h 1.875 l 3.90625,6.373698 v -6.373698 h 1.790364 v 9.544271 h -1.933593 l -3.847657,-6.223958 v 6.223958 z"- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial Bold'"- id="path896" /></g><g- aria-label="{;}"- style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"- id="text888"><path- d="m 25.14849,36.250741 h -1.5625 q -1.864583,0 -3.03125,-1.041666 -1.15625,-1.03125 -1.15625,-2.989584 v -1.552083 q 0,-1.760417 -0.864583,-2.75 -0.864584,-1 -2.645834,-1 h -0.53125 v -1.625 h 0.53125 q 1.78125,0 2.645834,-0.989584 0.864583,-1 0.864583,-2.760416 v -1.552084 q 0,-1.958333 1.15625,-2.989583 1.166667,-1.041667 3.03125,-1.041667 h 1.5625 v 1.4375 h -1.1875 q -1.416666,0 -2.0625,0.65625 -0.635416,0.65625 -0.635416,2.114584 v 1.822916 q 0,1.447917 -0.802084,2.4375 -0.802083,0.979167 -2.229167,1.552084 v 0.25 q 1.427084,0.572916 2.229167,1.5625 0.802084,0.979167 0.802084,2.427083 v 1.822917 q 0,1.458333 0.635416,2.114583 0.645834,0.65625 2.0625,0.65625 h 1.1875 z"- style="font-size:21.33333397px"- id="path899" /><path- d="m 30.902022,23.500741 h -2.489584 v -2.96875 h 2.489584 z m 0.760416,5.697917 -2.9375,6.822917 h -1.520833 l 1.8125,-6.822917 z"- style="font-size:21.33333397px"- id="path901" /><path- d="m 43.205342,26.917408 h -0.53125 q -1.78125,0 -2.645833,1 -0.864584,0.989583 -0.864584,2.75 v 1.552083 q 0,1.958334 -1.166666,2.989584 -1.156251,1.041666 -3.020834,1.041666 h -1.5625 v -1.4375 h 1.1875 q 1.416667,0 2.052083,-0.65625 0.645834,-0.65625 0.645834,-2.114583 v -1.822917 q 0,-1.447916 0.802083,-2.427083 0.802084,-0.989584 2.229167,-1.5625 v -0.25 q -1.427083,-0.572917 -2.229167,-1.552084 -0.802083,-0.989583 -0.802083,-2.4375 v -1.822916 q 0,-1.458334 -0.645834,-2.114584 -0.635416,-0.65625 -2.052083,-0.65625 h -1.1875 v -1.4375 h 1.5625 q 1.864583,0 3.020834,1.041667 1.166666,1.03125 1.166666,2.989583 v 1.552084 q 0,1.760416 0.864584,2.760416 0.864583,0.989584 2.645833,0.989584 h 0.53125 z"- style="font-size:21.33333397px"- id="path903" /></g></svg>\ No newline at end of filediff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/missing_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/missing_icon.svgdeleted file mode 100644index 925f31820..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/missing_icon.svg+++ /dev/null@@ -1,28 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(59,59,59);fill-opacity:0;"/>- <g id="page">- <g id="outline" transform="matrix(1,0,0,1,-1,1)">- <g transform="matrix(1,0,0,1,1,0)">- <path d="M40,2L8,2L8,56L51,56L51,13L40,2Z" style="fill:rgb(228,228,228);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,1,0)">- <path d="M40,2L51,13L40,13L40,2Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill-opacity:0.6;"/>- </g>- <g transform="matrix(0.943825,0,0,0.871141,2.60099,0.57182)">- <path d="M26.38,23.595C26.82,22.794 27.627,22.302 28.5,22.302C29.373,22.302 30.18,22.794 30.62,23.595C33.912,29.584 40.217,41.056 43.529,47.082C43.971,47.888 43.975,48.883 43.537,49.692C43.099,50.501 42.287,51 41.408,51L15.592,51C14.713,51 13.901,50.501 13.463,49.692C13.025,48.883 13.029,47.888 13.471,47.082C16.783,41.056 23.088,29.584 26.38,23.595Z" style="fill-opacity:0.7;"/>- </g>- <g transform="matrix(16,0,0,16,24.96,42.068)">- <path d="M0.367,-0.185L0.242,-0.185L0.242,-0.217C0.242,-0.258 0.248,-0.291 0.262,-0.317C0.275,-0.343 0.302,-0.372 0.342,-0.405C0.382,-0.437 0.406,-0.459 0.414,-0.469C0.426,-0.485 0.432,-0.502 0.432,-0.521C0.432,-0.548 0.421,-0.571 0.4,-0.59C0.378,-0.609 0.35,-0.619 0.313,-0.619C0.279,-0.619 0.25,-0.609 0.226,-0.589C0.203,-0.569 0.187,-0.539 0.178,-0.498L0.052,-0.514C0.055,-0.572 0.08,-0.621 0.126,-0.662C0.172,-0.703 0.233,-0.723 0.308,-0.723C0.386,-0.723 0.449,-0.703 0.496,-0.661C0.542,-0.62 0.565,-0.572 0.565,-0.518C0.565,-0.487 0.557,-0.459 0.54,-0.432C0.523,-0.405 0.486,-0.368 0.43,-0.321C0.401,-0.297 0.383,-0.278 0.376,-0.263C0.369,-0.249 0.366,-0.222 0.367,-0.185ZM0.242,0L0.242,-0.137L0.379,-0.137L0.379,0L0.242,0Z" style="fill-opacity:0.25;fill-rule:nonzero;"/>- </g>- <g transform="matrix(16,0,0,16,24.96,41.068)">- <path d="M0.367,-0.185L0.242,-0.185L0.242,-0.217C0.242,-0.258 0.248,-0.291 0.262,-0.317C0.275,-0.343 0.302,-0.372 0.342,-0.405C0.382,-0.437 0.406,-0.459 0.414,-0.469C0.426,-0.485 0.432,-0.502 0.432,-0.521C0.432,-0.548 0.421,-0.571 0.4,-0.59C0.378,-0.609 0.35,-0.619 0.313,-0.619C0.279,-0.619 0.25,-0.609 0.226,-0.589C0.203,-0.569 0.187,-0.539 0.178,-0.498L0.052,-0.514C0.055,-0.572 0.08,-0.621 0.126,-0.662C0.172,-0.703 0.233,-0.723 0.308,-0.723C0.386,-0.723 0.449,-0.703 0.496,-0.661C0.542,-0.62 0.565,-0.572 0.565,-0.518C0.565,-0.487 0.557,-0.459 0.54,-0.432C0.523,-0.405 0.486,-0.368 0.43,-0.321C0.401,-0.297 0.383,-0.278 0.376,-0.263C0.369,-0.249 0.366,-0.222 0.367,-0.185ZM0.242,0L0.242,-0.137L0.379,-0.137L0.379,0L0.242,0Z" style="fill:white;fill-rule:nonzero;"/>- </g>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/motionpath_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/motionpath_icon.svgdeleted file mode 100644index 609c26431..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/motionpath_icon.svg+++ /dev/null@@ -1,59 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(184,184,184);fill-opacity:0;"/>- <g id="page">- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(72,121,52);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(150,206,127);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(33,63,21);"/>- </g>- </g>- <g transform="matrix(0.884821,-0.237087,0.237087,0.884821,-4.15421,4.8312)">- <path d="M33.708,47.264L39.212,49.042L38.541,51.204L30.342,48.595C29.82,48.296 29.522,47.849 29.522,47.402C29.522,47.327 29.522,47.178 29.596,47.104L32.205,38.532L34.367,39.202L32.463,45.406C34.159,44.627 35.663,43.84 36.976,43.004L37.05,43.004L38.169,44.868C36.873,45.656 35.365,46.487 33.708,47.264ZM38.69,41.886C38.69,41.811 38.765,41.811 38.69,41.886C40.703,40.395 42.045,38.83 42.641,37.264L42.716,37.264L44.728,38.084L44.728,38.159C43.908,40.097 42.343,41.886 40.032,43.675L39.958,43.675L38.69,41.886ZM41.333,29.152C42.743,29.681 44.509,30.952 45.101,33.985L45.101,34.134C45.175,34.357 45.25,34.879 45.25,35.475L45.25,35.55L43.088,35.55L43.088,35.475C43.088,35.028 43.014,34.73 43.014,34.655C43.014,34.581 42.939,34.506 42.939,34.357C42.717,33.544 42.349,31.996 40.523,31.171L40.479,31.152L41.225,29.139L41.299,29.139L41.333,29.152ZM14.017,30.928L15.583,29.438C16.03,29.885 16.701,30.332 17.446,30.63C18.042,30.854 18.639,31.003 18.713,31.003L18.788,31.003C19.086,31.003 19.608,31.077 20.502,31.077L20.95,31.077L20.95,33.239L20.428,33.239C19.459,33.239 18.788,33.239 18.564,33.165L18.49,33.165C18.117,33.165 17.521,33.015 16.552,32.643C15.583,32.27 14.688,31.674 14.017,30.928ZM23.186,31.003C25.273,30.779 27.435,30.556 29.745,30.034L30.193,32.196L30.193,32.27C27.807,32.717 25.497,33.015 23.409,33.165L23.186,31.003ZM31.833,29.661C32.429,29.512 33.025,29.363 33.696,29.214C35.261,28.841 36.752,28.618 38.019,28.618L38.765,28.618C38.765,28.618 38.839,28.618 38.765,28.692L38.616,30.854L38.019,30.854C36.901,30.854 35.634,31.077 34.218,31.376C33.547,31.525 32.876,31.674 32.28,31.823L32.205,31.823L31.833,29.661ZM12.75,27.723C12.75,26.754 13.048,25.636 13.644,24.518C14.166,23.474 14.837,22.505 15.657,21.536L17.297,22.952C16.626,23.772 16.03,24.667 15.583,25.561C15.135,26.381 14.986,27.127 14.986,27.723L14.986,28.17L12.825,28.468C12.75,28.17 12.75,27.947 12.75,27.723ZM23.931,17.809C23.931,17.809 23.782,17.884 23.484,18.033C23.111,18.256 22.664,18.48 22.291,18.704C21.397,19.225 20.055,20.12 18.713,21.387L17.222,19.822C19.906,17.287 22.589,16.02 23.037,15.796L23.931,17.809Z" style="fill-opacity:0.25;fill-rule:nonzero;"/>- </g>- <g transform="matrix(0.884821,-0.237087,0.237087,0.884821,-4.15421,3.8312)">- <path d="M33.708,47.264L39.212,49.042L38.541,51.204L30.342,48.595C29.82,48.296 29.522,47.849 29.522,47.402C29.522,47.327 29.522,47.178 29.596,47.104L32.205,38.532L34.367,39.202L32.463,45.406C34.159,44.627 35.663,43.84 36.976,43.004L37.05,43.004L38.169,44.868C36.873,45.656 35.365,46.487 33.708,47.264ZM38.69,41.886C38.69,41.811 38.765,41.811 38.69,41.886C40.703,40.395 42.045,38.83 42.641,37.264L42.716,37.264L44.728,38.084L44.728,38.159C43.908,40.097 42.343,41.886 40.032,43.675L39.958,43.675L38.69,41.886ZM41.333,29.152C42.743,29.681 44.509,30.952 45.101,33.985L45.101,34.134C45.175,34.357 45.25,34.879 45.25,35.475L45.25,35.55L43.088,35.55L43.088,35.475C43.088,35.028 43.014,34.73 43.014,34.655C43.014,34.581 42.939,34.506 42.939,34.357C42.717,33.544 42.349,31.996 40.523,31.171L40.479,31.152L41.225,29.139L41.299,29.139L41.333,29.152ZM14.017,30.928L15.583,29.438C16.03,29.885 16.701,30.332 17.446,30.63C18.042,30.854 18.639,31.003 18.713,31.003L18.788,31.003C19.086,31.003 19.608,31.077 20.502,31.077L20.95,31.077L20.95,33.239L20.428,33.239C19.459,33.239 18.788,33.239 18.564,33.165L18.49,33.165C18.117,33.165 17.521,33.015 16.552,32.643C15.583,32.27 14.688,31.674 14.017,30.928ZM23.186,31.003C25.273,30.779 27.435,30.556 29.745,30.034L30.193,32.196L30.193,32.27C27.807,32.717 25.497,33.015 23.409,33.165L23.186,31.003ZM31.833,29.661C32.429,29.512 33.025,29.363 33.696,29.214C35.261,28.841 36.752,28.618 38.019,28.618L38.765,28.618C38.765,28.618 38.839,28.618 38.765,28.692L38.616,30.854L38.019,30.854C36.901,30.854 35.634,31.077 34.218,31.376C33.547,31.525 32.876,31.674 32.28,31.823L32.205,31.823L31.833,29.661ZM12.75,27.723C12.75,26.754 13.048,25.636 13.644,24.518C14.166,23.474 14.837,22.505 15.657,21.536L17.297,22.952C16.626,23.772 16.03,24.667 15.583,25.561C15.135,26.381 14.986,27.127 14.986,27.723L14.986,28.17L12.825,28.468C12.75,28.17 12.75,27.947 12.75,27.723ZM23.931,17.809C23.931,17.809 23.782,17.884 23.484,18.033C23.111,18.256 22.664,18.48 22.291,18.704C21.397,19.225 20.055,20.12 18.713,21.387L17.222,19.822C19.906,17.287 22.589,16.02 23.037,15.796L23.931,17.809Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1.03867,-2.03566,1.38139)">- <g transform="matrix(10.639,0,0,11,13.1202,50.6595)">- <path d="M0.838,0L0.723,0L0.723,-0.453C0.723,-0.49 0.725,-0.536 0.73,-0.589L0.728,-0.589C0.721,-0.559 0.715,-0.537 0.709,-0.523L0.5,0L0.42,0L0.21,-0.52C0.205,-0.535 0.198,-0.558 0.192,-0.589L0.19,-0.589C0.193,-0.561 0.194,-0.516 0.194,-0.452L0.194,0L0.086,0L0.086,-0.7L0.25,-0.7L0.434,-0.234C0.448,-0.198 0.457,-0.171 0.461,-0.154L0.464,-0.154C0.476,-0.191 0.486,-0.218 0.493,-0.236L0.681,-0.7L0.838,-0.7L0.838,0Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11,22.9637,50.6595)">- <path d="M0.202,-0.254L0.202,0L0.086,0L0.086,-0.7L0.299,-0.7C0.379,-0.7 0.442,-0.681 0.486,-0.644C0.53,-0.607 0.552,-0.554 0.552,-0.486C0.552,-0.418 0.529,-0.362 0.483,-0.319C0.437,-0.276 0.374,-0.254 0.295,-0.254L0.202,-0.254ZM0.202,-0.604L0.202,-0.349L0.277,-0.349C0.327,-0.349 0.365,-0.36 0.391,-0.383C0.417,-0.406 0.43,-0.439 0.43,-0.481C0.43,-0.563 0.382,-0.604 0.287,-0.604L0.202,-0.604Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11,28.8507,50.6705)">- <path d="M0.662,0L0.534,0L0.471,-0.178L0.196,-0.178L0.135,0L0.008,0L0.271,-0.7L0.401,-0.7L0.662,0ZM0.44,-0.273L0.343,-0.552C0.34,-0.561 0.337,-0.576 0.334,-0.596L0.332,-0.596C0.329,-0.578 0.326,-0.563 0.322,-0.552L0.226,-0.273L0.44,-0.273Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11,35.4929,50.6595)">- <path d="M0.536,-0.602L0.334,-0.602L0.334,0L0.218,0L0.218,-0.602L0.018,-0.602L0.018,-0.7L0.536,-0.7L0.536,-0.602Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11,41.9912,50.6595)">- <path d="M0.649,0L0.532,0L0.532,-0.304L0.203,-0.304L0.203,0L0.086,0L0.086,-0.7L0.203,-0.7L0.203,-0.406L0.532,-0.406L0.532,-0.7L0.649,-0.7L0.649,0Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- </g>- <g transform="matrix(1,0,0,1.03867,-2.03566,0.381386)">- <g transform="matrix(10.639,0,0,11,13.1202,50.6595)">- <path d="M0.838,0L0.723,0L0.723,-0.453C0.723,-0.49 0.725,-0.536 0.73,-0.589L0.728,-0.589C0.721,-0.559 0.715,-0.537 0.709,-0.523L0.5,0L0.42,0L0.21,-0.52C0.205,-0.535 0.198,-0.558 0.192,-0.589L0.19,-0.589C0.193,-0.561 0.194,-0.516 0.194,-0.452L0.194,0L0.086,0L0.086,-0.7L0.25,-0.7L0.434,-0.234C0.448,-0.198 0.457,-0.171 0.461,-0.154L0.464,-0.154C0.476,-0.191 0.486,-0.218 0.493,-0.236L0.681,-0.7L0.838,-0.7L0.838,0Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11,22.9637,50.6595)">- <path d="M0.202,-0.254L0.202,0L0.086,0L0.086,-0.7L0.299,-0.7C0.379,-0.7 0.442,-0.681 0.486,-0.644C0.53,-0.607 0.552,-0.554 0.552,-0.486C0.552,-0.418 0.529,-0.362 0.483,-0.319C0.437,-0.276 0.374,-0.254 0.295,-0.254L0.202,-0.254ZM0.202,-0.604L0.202,-0.349L0.277,-0.349C0.327,-0.349 0.365,-0.36 0.391,-0.383C0.417,-0.406 0.43,-0.439 0.43,-0.481C0.43,-0.563 0.382,-0.604 0.287,-0.604L0.202,-0.604Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11,28.8507,50.6705)">- <path d="M0.662,0L0.534,0L0.471,-0.178L0.196,-0.178L0.135,0L0.008,0L0.271,-0.7L0.401,-0.7L0.662,0ZM0.44,-0.273L0.343,-0.552C0.34,-0.561 0.337,-0.576 0.334,-0.596L0.332,-0.596C0.329,-0.578 0.326,-0.563 0.322,-0.552L0.226,-0.273L0.44,-0.273Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11,35.4929,50.6595)">- <path d="M0.536,-0.602L0.334,-0.602L0.334,0L0.218,0L0.218,-0.602L0.018,-0.602L0.018,-0.7L0.536,-0.7L0.536,-0.602Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(11,0,0,11,41.9912,50.6595)">- <path d="M0.649,0L0.532,0L0.532,-0.304L0.203,-0.304L0.203,0L0.086,0L0.086,-0.7L0.203,-0.7L0.203,-0.406L0.532,-0.406L0.532,-0.7L0.649,-0.7L0.649,0Z" style="fill:white;fill-rule:nonzero;"/>- </g>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/psd_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/psd_icon.svgdeleted file mode 100644index 9aa95244d..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/psd_icon.svg+++ /dev/null@@ -1,62 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(42,42,42);fill-opacity:0;"/>- <g id="page">- <g id="base" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(33,44,102);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(42,122,176);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <g id="outline" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(14,22,67);"/>- </g>- </g>- <g transform="matrix(1,0,0,1,2.03191,-0.79639)">- <g transform="matrix(1,0,0,1,6.39312,4.66075)">- <g transform="matrix(13,0,0,13,9.28273,50.1869)">- <path d="M0.202,-0.254L0.202,0L0.086,0L0.086,-0.7L0.299,-0.7C0.379,-0.7 0.442,-0.681 0.486,-0.644C0.53,-0.607 0.552,-0.554 0.552,-0.486C0.552,-0.418 0.529,-0.362 0.483,-0.319C0.437,-0.276 0.374,-0.254 0.295,-0.254L0.202,-0.254ZM0.202,-0.604L0.202,-0.349L0.277,-0.349C0.327,-0.349 0.365,-0.36 0.391,-0.383C0.417,-0.406 0.43,-0.439 0.43,-0.481C0.43,-0.563 0.382,-0.604 0.287,-0.604L0.202,-0.604Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(13,0,0,13,16.8809,50.1869)">- <path d="M0.054,-0.028L0.054,-0.147C0.065,-0.138 0.078,-0.129 0.093,-0.121C0.107,-0.113 0.123,-0.107 0.14,-0.101C0.156,-0.096 0.173,-0.092 0.189,-0.089C0.206,-0.086 0.221,-0.084 0.235,-0.084C0.284,-0.084 0.321,-0.093 0.344,-0.109C0.368,-0.125 0.38,-0.149 0.38,-0.18C0.38,-0.196 0.376,-0.211 0.368,-0.223C0.36,-0.235 0.349,-0.246 0.335,-0.256C0.321,-0.266 0.304,-0.276 0.284,-0.285C0.265,-0.295 0.244,-0.304 0.222,-0.314C0.198,-0.327 0.176,-0.34 0.156,-0.353C0.135,-0.366 0.117,-0.38 0.102,-0.396C0.087,-0.412 0.075,-0.43 0.067,-0.45C0.058,-0.47 0.054,-0.493 0.054,-0.52C0.054,-0.552 0.061,-0.581 0.076,-0.605C0.091,-0.629 0.11,-0.649 0.135,-0.665C0.159,-0.681 0.186,-0.693 0.217,-0.7C0.248,-0.708 0.28,-0.712 0.312,-0.712C0.385,-0.712 0.439,-0.704 0.472,-0.687L0.472,-0.572C0.432,-0.601 0.381,-0.615 0.319,-0.615C0.302,-0.615 0.284,-0.614 0.267,-0.61C0.25,-0.607 0.235,-0.602 0.221,-0.594C0.208,-0.587 0.197,-0.577 0.188,-0.565C0.18,-0.554 0.176,-0.54 0.176,-0.523C0.176,-0.507 0.179,-0.494 0.186,-0.482C0.192,-0.471 0.202,-0.461 0.214,-0.451C0.227,-0.442 0.242,-0.433 0.26,-0.424C0.278,-0.415 0.299,-0.405 0.323,-0.395C0.347,-0.382 0.37,-0.368 0.392,-0.354C0.413,-0.34 0.433,-0.325 0.449,-0.308C0.465,-0.291 0.478,-0.272 0.488,-0.252C0.498,-0.231 0.502,-0.208 0.502,-0.181C0.502,-0.146 0.495,-0.116 0.481,-0.091C0.467,-0.067 0.447,-0.047 0.423,-0.032C0.399,-0.016 0.371,-0.005 0.339,0.001C0.308,0.008 0.274,0.012 0.239,0.012C0.228,0.012 0.213,0.011 0.196,0.009C0.179,0.007 0.161,0.005 0.144,0.001C0.126,-0.002 0.109,-0.006 0.093,-0.011C0.077,-0.016 0.064,-0.022 0.054,-0.028Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(13,0,0,13,23.9585,50.1869)">- <path d="M0.086,0L0.086,-0.7L0.289,-0.7C0.547,-0.7 0.676,-0.586 0.676,-0.359C0.676,-0.251 0.64,-0.164 0.568,-0.098C0.497,-0.033 0.401,0 0.28,0L0.086,0ZM0.202,-0.602L0.202,-0.098L0.295,-0.098C0.377,-0.098 0.44,-0.121 0.486,-0.166C0.531,-0.21 0.554,-0.274 0.554,-0.356C0.554,-0.52 0.469,-0.602 0.299,-0.602L0.202,-0.602Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- </g>- <g transform="matrix(1,0,0,1,6.39312,3.66075)">- <g transform="matrix(13,0,0,13,9.28273,50.1869)">- <path d="M0.202,-0.254L0.202,0L0.086,0L0.086,-0.7L0.299,-0.7C0.379,-0.7 0.442,-0.681 0.486,-0.644C0.53,-0.607 0.552,-0.554 0.552,-0.486C0.552,-0.418 0.529,-0.362 0.483,-0.319C0.437,-0.276 0.374,-0.254 0.295,-0.254L0.202,-0.254ZM0.202,-0.604L0.202,-0.349L0.277,-0.349C0.327,-0.349 0.365,-0.36 0.391,-0.383C0.417,-0.406 0.43,-0.439 0.43,-0.481C0.43,-0.563 0.382,-0.604 0.287,-0.604L0.202,-0.604Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(13,0,0,13,16.8809,50.1869)">- <path d="M0.054,-0.028L0.054,-0.147C0.065,-0.138 0.078,-0.129 0.093,-0.121C0.107,-0.113 0.123,-0.107 0.14,-0.101C0.156,-0.096 0.173,-0.092 0.189,-0.089C0.206,-0.086 0.221,-0.084 0.235,-0.084C0.284,-0.084 0.321,-0.093 0.344,-0.109C0.368,-0.125 0.38,-0.149 0.38,-0.18C0.38,-0.196 0.376,-0.211 0.368,-0.223C0.36,-0.235 0.349,-0.246 0.335,-0.256C0.321,-0.266 0.304,-0.276 0.284,-0.285C0.265,-0.295 0.244,-0.304 0.222,-0.314C0.198,-0.327 0.176,-0.34 0.156,-0.353C0.135,-0.366 0.117,-0.38 0.102,-0.396C0.087,-0.412 0.075,-0.43 0.067,-0.45C0.058,-0.47 0.054,-0.493 0.054,-0.52C0.054,-0.552 0.061,-0.581 0.076,-0.605C0.091,-0.629 0.11,-0.649 0.135,-0.665C0.159,-0.681 0.186,-0.693 0.217,-0.7C0.248,-0.708 0.28,-0.712 0.312,-0.712C0.385,-0.712 0.439,-0.704 0.472,-0.687L0.472,-0.572C0.432,-0.601 0.381,-0.615 0.319,-0.615C0.302,-0.615 0.284,-0.614 0.267,-0.61C0.25,-0.607 0.235,-0.602 0.221,-0.594C0.208,-0.587 0.197,-0.577 0.188,-0.565C0.18,-0.554 0.176,-0.54 0.176,-0.523C0.176,-0.507 0.179,-0.494 0.186,-0.482C0.192,-0.471 0.202,-0.461 0.214,-0.451C0.227,-0.442 0.242,-0.433 0.26,-0.424C0.278,-0.415 0.299,-0.405 0.323,-0.395C0.347,-0.382 0.37,-0.368 0.392,-0.354C0.413,-0.34 0.433,-0.325 0.449,-0.308C0.465,-0.291 0.478,-0.272 0.488,-0.252C0.498,-0.231 0.502,-0.208 0.502,-0.181C0.502,-0.146 0.495,-0.116 0.481,-0.091C0.467,-0.067 0.447,-0.047 0.423,-0.032C0.399,-0.016 0.371,-0.005 0.339,0.001C0.308,0.008 0.274,0.012 0.239,0.012C0.228,0.012 0.213,0.011 0.196,0.009C0.179,0.007 0.161,0.005 0.144,0.001C0.126,-0.002 0.109,-0.006 0.093,-0.011C0.077,-0.016 0.064,-0.022 0.054,-0.028Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(13,0,0,13,23.9585,50.1869)">- <path d="M0.086,0L0.086,-0.7L0.289,-0.7C0.547,-0.7 0.676,-0.586 0.676,-0.359C0.676,-0.251 0.64,-0.164 0.568,-0.098C0.497,-0.033 0.401,0 0.28,0L0.086,0ZM0.202,-0.602L0.202,-0.098L0.295,-0.098C0.377,-0.098 0.44,-0.121 0.486,-0.166C0.531,-0.21 0.554,-0.274 0.554,-0.356C0.554,-0.52 0.469,-0.602 0.299,-0.602L0.202,-0.602Z" style="fill:white;fill-rule:nonzero;"/>- </g>- </g>- </g>- <g>- <g transform="matrix(1.19231,0,0,0.846154,-12.2307,7.15384)">- <rect x="22" y="14" width="26" height="26" style="fill-opacity:0.25;"/>- </g>- <g transform="matrix(1.19231,0,0,0.846154,-12.2307,6.15384)">- <rect x="22" y="14" width="26" height="26" style="fill:rgb(42,122,176);"/>- </g>- <g>- <g transform="matrix(0.857143,0,0,0.857143,4.28571,5.57143)">- <circle cx="40.5" cy="21.5" r="3.5" style="fill:white;"/>- </g>- <g transform="matrix(1.54545,0,0,1.2,-9.27273,-5)">- <path d="M22.5,25L28,35L17,35L22.5,25Z" style="fill:rgb(149,189,216);"/>- </g>- <g transform="matrix(1.3,0,0,1.33333,-12.6,-11)">- <path d="M37,30L42,36L32,36L37,30Z" style="fill:white;"/>- </g>- </g>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/script_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/script_icon.svgdeleted file mode 100644index 651a4c8b2..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/script_icon.svg+++ /dev/null@@ -1,38 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(184,184,184);fill-opacity:0;"/>- <g id="page">- <g id="base" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(239,216,29);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(242,238,190);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(131,122,19);"/>- </g>- <g transform="matrix(0.842601,0,0,1.26869,-0.600865,-4.37553)">- <g transform="matrix(20,0,0,20,18.1277,30.2886)">- <path d="M0.511,-0.142C0.521,-0.137 0.527,-0.129 0.528,-0.12C0.53,-0.11 0.525,-0.095 0.516,-0.076C0.511,-0.066 0.506,-0.058 0.502,-0.052C0.497,-0.047 0.493,-0.043 0.489,-0.041C0.485,-0.038 0.48,-0.037 0.476,-0.038C0.471,-0.038 0.467,-0.04 0.462,-0.042L0.081,-0.239C0.073,-0.243 0.068,-0.248 0.064,-0.254C0.06,-0.26 0.059,-0.271 0.059,-0.285C0.059,-0.299 0.06,-0.309 0.064,-0.315C0.068,-0.322 0.073,-0.327 0.081,-0.331L0.462,-0.527C0.467,-0.529 0.471,-0.531 0.476,-0.531C0.48,-0.532 0.485,-0.531 0.489,-0.529C0.493,-0.527 0.497,-0.523 0.502,-0.517C0.506,-0.511 0.511,-0.503 0.516,-0.494C0.525,-0.474 0.53,-0.459 0.528,-0.45C0.527,-0.44 0.521,-0.432 0.511,-0.427L0.225,-0.285L0.511,-0.142Z" style="fill-rule:nonzero;"/>- </g>- <g transform="matrix(20,0,0,20,30.1199,30.2886)">- <path d="M0.193,0.13C0.19,0.136 0.186,0.14 0.179,0.143C0.172,0.145 0.164,0.146 0.156,0.146C0.146,0.146 0.137,0.145 0.126,0.142C0.116,0.14 0.108,0.136 0.1,0.131C0.092,0.126 0.087,0.12 0.083,0.113C0.079,0.106 0.08,0.098 0.083,0.089L0.407,-0.637C0.409,-0.643 0.414,-0.647 0.421,-0.65C0.428,-0.652 0.436,-0.654 0.445,-0.654C0.454,-0.654 0.464,-0.652 0.474,-0.65C0.484,-0.647 0.493,-0.643 0.5,-0.638C0.508,-0.633 0.513,-0.627 0.517,-0.62C0.52,-0.613 0.52,-0.605 0.516,-0.596L0.193,0.13Z" style="fill-rule:nonzero;"/>- </g>- <g transform="matrix(20,0,0,20,42.1121,30.2886)">- <path d="M0.089,-0.427C0.078,-0.432 0.073,-0.44 0.071,-0.45C0.07,-0.459 0.074,-0.474 0.084,-0.494C0.089,-0.503 0.094,-0.511 0.098,-0.517C0.102,-0.523 0.107,-0.527 0.111,-0.529C0.115,-0.531 0.119,-0.532 0.124,-0.531C0.128,-0.531 0.133,-0.529 0.138,-0.527L0.519,-0.331C0.526,-0.327 0.532,-0.322 0.536,-0.315C0.539,-0.309 0.541,-0.299 0.541,-0.285C0.541,-0.271 0.539,-0.26 0.536,-0.254C0.532,-0.248 0.526,-0.243 0.519,-0.239L0.138,-0.042C0.133,-0.04 0.128,-0.038 0.124,-0.038C0.119,-0.037 0.115,-0.038 0.111,-0.041C0.107,-0.043 0.102,-0.047 0.098,-0.052C0.094,-0.058 0.089,-0.066 0.084,-0.076C0.074,-0.095 0.07,-0.11 0.071,-0.12C0.073,-0.129 0.078,-0.137 0.089,-0.142L0.375,-0.285L0.089,-0.427Z" style="fill-rule:nonzero;"/>- </g>- </g>- <g transform="matrix(0.991441,0,0,0.964309,-2.6367,5.83796)">- <g transform="matrix(15.4155,0,0,14.2441,23.5773,48.7337)">- <path d="M0.331,-0.716L0.475,-0.716L0.475,-0.263C0.475,-0.203 0.47,-0.158 0.459,-0.126C0.445,-0.084 0.42,-0.051 0.383,-0.026C0.347,0 0.298,0.012 0.238,0.012C0.167,0.012 0.113,-0.008 0.075,-0.047C0.037,-0.087 0.017,-0.145 0.017,-0.221L0.153,-0.237C0.155,-0.196 0.161,-0.167 0.171,-0.15C0.187,-0.124 0.211,-0.111 0.243,-0.111C0.275,-0.111 0.298,-0.121 0.311,-0.139C0.324,-0.157 0.331,-0.195 0.331,-0.253L0.331,-0.716Z" style="fill-rule:nonzero;"/>- </g>- <g transform="matrix(13.8636,0,0,14,32.4175,48.7299)">- <path d="M0.036,-0.233L0.177,-0.247C0.185,-0.199 0.202,-0.165 0.228,-0.143C0.254,-0.12 0.289,-0.109 0.333,-0.109C0.38,-0.109 0.415,-0.119 0.438,-0.139C0.462,-0.159 0.474,-0.182 0.474,-0.208C0.474,-0.225 0.469,-0.239 0.459,-0.251C0.449,-0.263 0.431,-0.273 0.407,-0.282C0.39,-0.288 0.351,-0.299 0.291,-0.313C0.214,-0.333 0.159,-0.356 0.128,-0.384C0.084,-0.424 0.062,-0.472 0.062,-0.528C0.062,-0.565 0.072,-0.599 0.093,-0.631C0.114,-0.662 0.143,-0.687 0.182,-0.703C0.221,-0.72 0.268,-0.728 0.323,-0.728C0.413,-0.728 0.481,-0.708 0.526,-0.669C0.572,-0.63 0.595,-0.577 0.598,-0.511L0.453,-0.505C0.447,-0.542 0.434,-0.568 0.413,-0.584C0.393,-0.6 0.362,-0.608 0.322,-0.608C0.28,-0.608 0.247,-0.6 0.223,-0.583C0.208,-0.571 0.2,-0.557 0.2,-0.538C0.2,-0.521 0.207,-0.507 0.222,-0.495C0.24,-0.479 0.284,-0.463 0.354,-0.447C0.425,-0.43 0.477,-0.413 0.51,-0.395C0.544,-0.378 0.571,-0.353 0.59,-0.323C0.609,-0.292 0.618,-0.254 0.618,-0.208C0.618,-0.167 0.607,-0.129 0.584,-0.093C0.561,-0.057 0.529,-0.031 0.487,-0.013C0.446,0.004 0.394,0.013 0.332,0.013C0.241,0.013 0.172,-0.008 0.123,-0.05C0.075,-0.092 0.046,-0.153 0.036,-0.233Z" style="fill-rule:nonzero;"/>- </g>- </g>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/svg_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/svg_icon.svgdeleted file mode 100644index 776c80e9e..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/svg_icon.svg+++ /dev/null@@ -1,71 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(59,59,59);fill-opacity:0;"/>- <g id="page">- <g id="base" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(229,78,62);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(244,125,113);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <g id="outline" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(124,44,35);"/>- <g transform="matrix(1,0,0,1.06301,2.06643,0.562347)">- <g transform="matrix(13.3711,0,0,13,15.2154,49.1769)">- <path d="M0.054,-0.028L0.054,-0.147C0.065,-0.138 0.078,-0.129 0.093,-0.121C0.107,-0.113 0.123,-0.107 0.14,-0.101C0.156,-0.096 0.173,-0.092 0.189,-0.089C0.206,-0.086 0.221,-0.084 0.235,-0.084C0.284,-0.084 0.321,-0.093 0.344,-0.109C0.368,-0.125 0.38,-0.149 0.38,-0.18C0.38,-0.196 0.376,-0.211 0.368,-0.223C0.36,-0.235 0.349,-0.246 0.335,-0.256C0.321,-0.266 0.304,-0.276 0.284,-0.285C0.265,-0.295 0.244,-0.304 0.222,-0.314C0.198,-0.327 0.176,-0.34 0.156,-0.353C0.135,-0.366 0.117,-0.38 0.102,-0.396C0.087,-0.412 0.075,-0.43 0.067,-0.45C0.058,-0.47 0.054,-0.493 0.054,-0.52C0.054,-0.552 0.061,-0.581 0.076,-0.605C0.091,-0.629 0.11,-0.649 0.135,-0.665C0.159,-0.681 0.186,-0.693 0.217,-0.7C0.248,-0.708 0.28,-0.712 0.312,-0.712C0.385,-0.712 0.439,-0.704 0.472,-0.687L0.472,-0.572C0.432,-0.601 0.381,-0.615 0.319,-0.615C0.302,-0.615 0.284,-0.614 0.267,-0.61C0.25,-0.607 0.235,-0.602 0.221,-0.594C0.208,-0.587 0.197,-0.577 0.188,-0.565C0.18,-0.554 0.176,-0.54 0.176,-0.523C0.176,-0.507 0.179,-0.494 0.186,-0.482C0.192,-0.471 0.202,-0.461 0.214,-0.451C0.227,-0.442 0.242,-0.433 0.26,-0.424C0.278,-0.415 0.299,-0.405 0.323,-0.395C0.347,-0.382 0.37,-0.368 0.392,-0.354C0.413,-0.34 0.433,-0.325 0.449,-0.308C0.465,-0.291 0.478,-0.272 0.488,-0.252C0.498,-0.231 0.502,-0.208 0.502,-0.181C0.502,-0.146 0.495,-0.116 0.481,-0.091C0.467,-0.067 0.447,-0.047 0.423,-0.032C0.399,-0.016 0.371,-0.005 0.339,0.001C0.308,0.008 0.274,0.012 0.239,0.012C0.228,0.012 0.213,0.011 0.196,0.009C0.179,0.007 0.161,0.005 0.144,0.001C0.126,-0.002 0.109,-0.006 0.093,-0.011C0.077,-0.016 0.064,-0.022 0.054,-0.028Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(14.3217,0,0,13.4351,22.8357,49.3293)">- <path d="M0.635,-0.7L0.384,0L0.254,0L0.007,-0.7L0.134,-0.7L0.307,-0.169C0.312,-0.152 0.316,-0.132 0.319,-0.11L0.321,-0.11C0.324,-0.128 0.328,-0.148 0.335,-0.17L0.512,-0.7L0.635,-0.7Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(13.5293,0,0,13,32.372,49.1769)">- <path d="M0.633,-0.048C0.56,-0.008 0.479,0.012 0.389,0.012C0.286,0.012 0.202,-0.021 0.138,-0.085C0.074,-0.149 0.042,-0.235 0.042,-0.341C0.042,-0.449 0.077,-0.538 0.147,-0.608C0.217,-0.677 0.306,-0.712 0.414,-0.712C0.492,-0.712 0.557,-0.701 0.61,-0.678L0.61,-0.558C0.557,-0.594 0.493,-0.612 0.418,-0.612C0.344,-0.612 0.283,-0.587 0.235,-0.538C0.187,-0.489 0.164,-0.425 0.164,-0.347C0.164,-0.267 0.184,-0.204 0.225,-0.157C0.266,-0.111 0.322,-0.088 0.392,-0.088C0.44,-0.088 0.482,-0.098 0.517,-0.116L0.517,-0.283L0.37,-0.283L0.37,-0.38L0.633,-0.38L0.633,-0.048Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- </g>- <g transform="matrix(1,0,0,1.06301,2.06643,-0.437653)">- <g transform="matrix(13.3711,0,0,13,15.2154,49.1769)">- <path d="M0.054,-0.028L0.054,-0.147C0.065,-0.138 0.078,-0.129 0.093,-0.121C0.107,-0.113 0.123,-0.107 0.14,-0.101C0.156,-0.096 0.173,-0.092 0.189,-0.089C0.206,-0.086 0.221,-0.084 0.235,-0.084C0.284,-0.084 0.321,-0.093 0.344,-0.109C0.368,-0.125 0.38,-0.149 0.38,-0.18C0.38,-0.196 0.376,-0.211 0.368,-0.223C0.36,-0.235 0.349,-0.246 0.335,-0.256C0.321,-0.266 0.304,-0.276 0.284,-0.285C0.265,-0.295 0.244,-0.304 0.222,-0.314C0.198,-0.327 0.176,-0.34 0.156,-0.353C0.135,-0.366 0.117,-0.38 0.102,-0.396C0.087,-0.412 0.075,-0.43 0.067,-0.45C0.058,-0.47 0.054,-0.493 0.054,-0.52C0.054,-0.552 0.061,-0.581 0.076,-0.605C0.091,-0.629 0.11,-0.649 0.135,-0.665C0.159,-0.681 0.186,-0.693 0.217,-0.7C0.248,-0.708 0.28,-0.712 0.312,-0.712C0.385,-0.712 0.439,-0.704 0.472,-0.687L0.472,-0.572C0.432,-0.601 0.381,-0.615 0.319,-0.615C0.302,-0.615 0.284,-0.614 0.267,-0.61C0.25,-0.607 0.235,-0.602 0.221,-0.594C0.208,-0.587 0.197,-0.577 0.188,-0.565C0.18,-0.554 0.176,-0.54 0.176,-0.523C0.176,-0.507 0.179,-0.494 0.186,-0.482C0.192,-0.471 0.202,-0.461 0.214,-0.451C0.227,-0.442 0.242,-0.433 0.26,-0.424C0.278,-0.415 0.299,-0.405 0.323,-0.395C0.347,-0.382 0.37,-0.368 0.392,-0.354C0.413,-0.34 0.433,-0.325 0.449,-0.308C0.465,-0.291 0.478,-0.272 0.488,-0.252C0.498,-0.231 0.502,-0.208 0.502,-0.181C0.502,-0.146 0.495,-0.116 0.481,-0.091C0.467,-0.067 0.447,-0.047 0.423,-0.032C0.399,-0.016 0.371,-0.005 0.339,0.001C0.308,0.008 0.274,0.012 0.239,0.012C0.228,0.012 0.213,0.011 0.196,0.009C0.179,0.007 0.161,0.005 0.144,0.001C0.126,-0.002 0.109,-0.006 0.093,-0.011C0.077,-0.016 0.064,-0.022 0.054,-0.028Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(14.3217,0,0,13.4351,22.8357,49.3293)">- <path d="M0.635,-0.7L0.384,0L0.254,0L0.007,-0.7L0.134,-0.7L0.307,-0.169C0.312,-0.152 0.316,-0.132 0.319,-0.11L0.321,-0.11C0.324,-0.128 0.328,-0.148 0.335,-0.17L0.512,-0.7L0.635,-0.7Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(13.5293,0,0,13,32.372,49.1769)">- <path d="M0.633,-0.048C0.56,-0.008 0.479,0.012 0.389,0.012C0.286,0.012 0.202,-0.021 0.138,-0.085C0.074,-0.149 0.042,-0.235 0.042,-0.341C0.042,-0.449 0.077,-0.538 0.147,-0.608C0.217,-0.677 0.306,-0.712 0.414,-0.712C0.492,-0.712 0.557,-0.701 0.61,-0.678L0.61,-0.558C0.557,-0.594 0.493,-0.612 0.418,-0.612C0.344,-0.612 0.283,-0.587 0.235,-0.538C0.187,-0.489 0.164,-0.425 0.164,-0.347C0.164,-0.267 0.184,-0.204 0.225,-0.157C0.266,-0.111 0.322,-0.088 0.392,-0.088C0.44,-0.088 0.482,-0.098 0.517,-0.116L0.517,-0.283L0.37,-0.283L0.37,-0.38L0.633,-0.38L0.633,-0.048Z" style="fill:white;fill-rule:nonzero;"/>- </g>- </g>- </g>- </g>- <g transform="matrix(1,0,0,1,0,3)">- <g transform="matrix(2,0,0,-2,14,43)">- <rect x="2" y="12" width="12" height="1" style="fill-opacity:0.3;"/>- </g>- <g transform="matrix(1.83333,0,0,-1.83333,14.8333,40.6667)">- <rect x="5" y="8" width="6" height="6" style="fill-opacity:0.3;"/>- </g>- <g transform="matrix(2,0,0,-2,13,43)">- <path d="M16,12.5C16,13.323 15.323,14 14.5,14C13.677,14 13,13.323 13,12.5C13,11.677 13.677,11 14.5,11C15.323,11 16,11.677 16,12.5Z" style="fill-opacity:0.3;"/>- </g>- <path d="M16.034,35.016C16.001,35.566 15.546,35.995 14.995,35.995C14.981,36 14.967,36 14.953,36C14.698,36 14.454,35.896 14.278,35.713C14.102,35.529 14.008,35.281 14.02,35.026C14.533,26.649 21.496,20 30,20C38.488,20 45.442,26.624 45.968,34.981C45.982,35.245 45.887,35.503 45.705,35.695C45.523,35.887 45.27,35.996 45.006,35.996L45.005,36C44.451,36 43.994,35.569 43.961,35.016C43.46,27.747 37.396,22 30,22C22.604,22 16.54,27.747 16.034,35.016Z" style="fill-opacity:0.3;"/>- <g transform="matrix(2,0,0,-2,14,43)">- <path d="M3,12.5C3,13.323 2.323,14 1.5,14C0.677,14 0,13.323 0,12.5C0,11.677 0.677,11 1.5,11C2.323,11 3,11.677 3,12.5Z" style="fill-opacity:0.3;"/>- </g>- </g>- <g transform="matrix(1,0,0,1,0,2)">- <g transform="matrix(2,0,0,-2,14,43)">- <rect x="2" y="12" width="12" height="1" style="fill:white;"/>- </g>- <g transform="matrix(1.83333,0,0,-1.83333,14.8333,40.6667)">- <rect x="5" y="8" width="6" height="6" style="fill:white;"/>- </g>- <g transform="matrix(2,0,0,-2,13,43)">- <path d="M16,12.5C16,13.323 15.323,14 14.5,14C13.677,14 13,13.323 13,12.5C13,11.677 13.677,11 14.5,11C15.323,11 16,11.677 16,12.5Z" style="fill:white;"/>- </g>- <path d="M16.034,35.016C16.001,35.566 15.546,35.995 14.995,35.995C14.981,36 14.967,36 14.953,36C14.698,36 14.454,35.896 14.278,35.713C14.102,35.529 14.008,35.281 14.02,35.026C14.533,26.649 21.496,20 30,20C38.488,20 45.442,26.624 45.968,34.981C45.982,35.245 45.887,35.503 45.705,35.695C45.523,35.887 45.27,35.996 45.006,35.996L45.005,36C44.451,36 43.994,35.569 43.961,35.016C43.46,27.747 37.396,22 30,22C22.604,22 16.54,27.747 16.034,35.016Z" style="fill:white;"/>- <g transform="matrix(2,0,0,-2,14,43)">- <path d="M3,12.5C3,13.323 2.323,14 1.5,14C0.677,14 0,13.323 0,12.5C0,11.677 0.677,11 1.5,11C2.323,11 3,11.677 3,12.5Z" style="fill:white;"/>- </g>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/tasklist_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/tasklist_icon.svgdeleted file mode 100644index 22cadebe2..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/tasklist_icon.svg+++ /dev/null@@ -1,73 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(184,184,184);fill-opacity:0;"/>- <g id="page">- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(72,121,52);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(150,206,127);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,0.999721,0,5.85109)">- <g id="outline">- <g>- <g transform="matrix(10,0,0,10,10.8083,48.1623)">- <path d="M0.536,-0.602L0.334,-0.602L0.334,0L0.218,0L0.218,-0.602L0.018,-0.602L0.018,-0.7L0.536,-0.7L0.536,-0.602Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,16.1357,48.1623)">- <path d="M0.68,0L0.553,0L0.219,-0.515C0.21,-0.528 0.203,-0.541 0.198,-0.555L0.195,-0.555C0.197,-0.54 0.199,-0.508 0.199,-0.459L0.199,0L0.086,0L0.086,-0.7L0.222,-0.7L0.545,-0.198C0.559,-0.177 0.567,-0.163 0.571,-0.155L0.573,-0.155C0.57,-0.173 0.568,-0.205 0.568,-0.249L0.568,-0.7L0.68,-0.7L0.68,0Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,24.3242,48.1623)">- <path d="M0.564,-0.649L0.18,-0.098L0.559,-0.098L0.559,0L0.018,0L0.018,-0.053L0.403,-0.602L0.047,-0.602L0.047,-0.7L0.564,-0.7L0.564,-0.649Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,30.3945,48.1623)">- <path d="M0.086,0L0.086,-0.7L0.309,-0.7C0.376,-0.7 0.43,-0.685 0.469,-0.656C0.509,-0.626 0.529,-0.588 0.529,-0.54C0.529,-0.5 0.518,-0.466 0.495,-0.437C0.473,-0.407 0.442,-0.386 0.402,-0.374L0.402,-0.372C0.45,-0.367 0.489,-0.349 0.517,-0.319C0.546,-0.288 0.561,-0.249 0.561,-0.201C0.561,-0.141 0.537,-0.093 0.49,-0.056C0.443,-0.019 0.383,0 0.311,0L0.086,0ZM0.202,-0.607L0.202,-0.408L0.277,-0.408C0.318,-0.408 0.349,-0.417 0.372,-0.436C0.395,-0.455 0.407,-0.482 0.407,-0.517C0.407,-0.577 0.367,-0.607 0.287,-0.607L0.202,-0.607ZM0.202,-0.314L0.202,-0.093L0.301,-0.093C0.345,-0.093 0.378,-0.103 0.402,-0.123C0.425,-0.143 0.437,-0.17 0.437,-0.206C0.437,-0.278 0.387,-0.314 0.286,-0.314L0.202,-0.314Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,36.6504,48.1623)">- <path d="M0.662,0L0.534,0L0.471,-0.178L0.196,-0.178L0.135,0L0.008,0L0.271,-0.7L0.401,-0.7L0.662,0ZM0.44,-0.273L0.343,-0.552C0.34,-0.561 0.337,-0.576 0.334,-0.596L0.332,-0.596C0.329,-0.578 0.326,-0.563 0.322,-0.552L0.226,-0.273L0.44,-0.273Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,42.8242,48.1623)">- <path d="M0.536,-0.602L0.334,-0.602L0.334,0L0.218,0L0.218,-0.602L0.018,-0.602L0.018,-0.7L0.536,-0.7L0.536,-0.602Z" style="fill-opacity:0.3;fill-rule:nonzero;"/>- </g>- </g>- </g>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(33,63,21);"/>- </g>- <g transform="matrix(1,0,0,0.999721,0,4.85109)">- <g id="outline1" serif:id="outline">- <g>- <g transform="matrix(10,0,0,10,10.8083,48.1623)">- <path d="M0.536,-0.602L0.334,-0.602L0.334,0L0.218,0L0.218,-0.602L0.018,-0.602L0.018,-0.7L0.536,-0.7L0.536,-0.602Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,16.1357,48.1623)">- <path d="M0.68,0L0.553,0L0.219,-0.515C0.21,-0.528 0.203,-0.541 0.198,-0.555L0.195,-0.555C0.197,-0.54 0.199,-0.508 0.199,-0.459L0.199,0L0.086,0L0.086,-0.7L0.222,-0.7L0.545,-0.198C0.559,-0.177 0.567,-0.163 0.571,-0.155L0.573,-0.155C0.57,-0.173 0.568,-0.205 0.568,-0.249L0.568,-0.7L0.68,-0.7L0.68,0Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,24.3242,48.1623)">- <path d="M0.564,-0.649L0.18,-0.098L0.559,-0.098L0.559,0L0.018,0L0.018,-0.053L0.403,-0.602L0.047,-0.602L0.047,-0.7L0.564,-0.7L0.564,-0.649Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,30.3945,48.1623)">- <path d="M0.086,0L0.086,-0.7L0.309,-0.7C0.376,-0.7 0.43,-0.685 0.469,-0.656C0.509,-0.626 0.529,-0.588 0.529,-0.54C0.529,-0.5 0.518,-0.466 0.495,-0.437C0.473,-0.407 0.442,-0.386 0.402,-0.374L0.402,-0.372C0.45,-0.367 0.489,-0.349 0.517,-0.319C0.546,-0.288 0.561,-0.249 0.561,-0.201C0.561,-0.141 0.537,-0.093 0.49,-0.056C0.443,-0.019 0.383,0 0.311,0L0.086,0ZM0.202,-0.607L0.202,-0.408L0.277,-0.408C0.318,-0.408 0.349,-0.417 0.372,-0.436C0.395,-0.455 0.407,-0.482 0.407,-0.517C0.407,-0.577 0.367,-0.607 0.287,-0.607L0.202,-0.607ZM0.202,-0.314L0.202,-0.093L0.301,-0.093C0.345,-0.093 0.378,-0.103 0.402,-0.123C0.425,-0.143 0.437,-0.17 0.437,-0.206C0.437,-0.278 0.387,-0.314 0.286,-0.314L0.202,-0.314Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,36.6504,48.1623)">- <path d="M0.662,0L0.534,0L0.471,-0.178L0.196,-0.178L0.135,0L0.008,0L0.271,-0.7L0.401,-0.7L0.662,0ZM0.44,-0.273L0.343,-0.552C0.34,-0.561 0.337,-0.576 0.334,-0.596L0.332,-0.596C0.329,-0.578 0.326,-0.563 0.322,-0.552L0.226,-0.273L0.44,-0.273Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <g transform="matrix(10,0,0,10,42.8242,48.1623)">- <path d="M0.536,-0.602L0.334,-0.602L0.334,0L0.218,0L0.218,-0.602L0.018,-0.602L0.018,-0.7L0.536,-0.7L0.536,-0.602Z" style="fill:white;fill-rule:nonzero;"/>- </g>- </g>- </g>- </g>- <g transform="matrix(1,0,0,1,0,-7)">- <path d="M27,40C27,38.895 26.105,38 25,38L19,38C17.895,38 17,38.895 17,40L17,46C17,47.105 17.895,48 19,48L25,48C26.105,48 27,47.105 27,46L27,40ZM25,40L19,40L19,46L25,46L25,40ZM41,43.5C41,43.224 40.776,43 40.5,43L31.5,43C31.224,43 31,43.224 31,43.5L31,44.5C31,44.776 31.224,45 31.5,45L40.5,45C40.776,45 41,44.776 41,44.5L41,43.5ZM27,27C27,25.895 26.105,25 25,25L19,25C17.895,25 17,25.895 17,27L17,33C17,34.105 17.895,35 19,35L25,35C26.105,35 27,34.105 27,33L27,27ZM25,27L19,27L19,33L25,33L25,27ZM34.978,30.585L39.295,26.291C39.686,25.902 40.32,25.903 40.709,26.295C41.098,26.686 41.097,27.32 40.705,27.709L35.678,32.709C35.49,32.896 35.235,33.001 34.97,33C34.704,32.999 34.45,32.893 34.263,32.704L31.29,29.704C30.901,29.312 30.904,28.678 31.296,28.29C31.688,27.901 32.322,27.904 32.71,28.296L34.978,30.585Z" style="fill-opacity:0.3;"/>- </g>- <g transform="matrix(1,0,0,1,0,-8)">- <path d="M27,40C27,38.895 26.105,38 25,38L19,38C17.895,38 17,38.895 17,40L17,46C17,47.105 17.895,48 19,48L25,48C26.105,48 27,47.105 27,46L27,40ZM25,40L19,40L19,46L25,46L25,40ZM41,43.5C41,43.224 40.776,43 40.5,43L31.5,43C31.224,43 31,43.224 31,43.5L31,44.5C31,44.776 31.224,45 31.5,45L40.5,45C40.776,45 41,44.776 41,44.5L41,43.5ZM27,27C27,25.895 26.105,25 25,25L19,25C17.895,25 17,25.895 17,27L17,33C17,34.105 17.895,35 19,35L25,35C26.105,35 27,34.105 27,33L27,27ZM25,27L19,27L19,33L25,33L25,27ZM34.978,30.585L39.295,26.291C39.686,25.902 40.32,25.903 40.709,26.295C41.098,26.686 41.097,27.32 40.705,27.709L35.678,32.709C35.49,32.896 35.235,33.001 34.97,33C34.704,32.999 34.45,32.893 34.263,32.704L31.29,29.704C30.901,29.312 30.904,28.678 31.296,28.29C31.688,27.901 32.322,27.904 32.71,28.296L34.978,30.585Z" style="fill:white;"/>- </g>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/unknown_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/unknown_icon.svgdeleted file mode 100644index 69c008fd4..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/unknown_icon.svg+++ /dev/null@@ -1,22 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(59,59,59);fill-opacity:0;"/>- <g id="page">- <g id="outline" transform="matrix(1,0,0,1,-1,1)">- <g transform="matrix(1,0,0,1,1,0)">- <path d="M40,2L8,2L8,56L51,56L51,13L40,2Z" style="fill:rgb(228,228,228);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,1,0)">- <path d="M40,2L51,13L40,13L40,2Z" style="fill:white;fill-rule:nonzero;"/>- </g>- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill-opacity:0.6;"/>- </g>- <g transform="matrix(1.04999,0,0,1.02216,-1.43775,-5.06379)">- <path d="M31.988,44.006L27.995,44.006L27.995,48L31.988,48L31.988,44.006ZM31.862,41.957L28.265,41.957L28.265,41.036C28.265,39.857 28.438,38.907 28.841,38.159C29.215,37.411 29.992,36.576 31.143,35.627C32.294,34.706 32.984,34.073 33.215,33.785C33.56,33.325 33.733,32.836 33.733,32.289C33.733,31.512 33.416,30.85 32.812,30.304C32.179,29.757 31.373,29.469 30.308,29.469C29.33,29.469 28.496,29.757 27.805,30.332C27.143,30.908 26.683,31.771 26.424,32.951L22.798,32.491C22.885,30.822 23.604,29.412 24.928,28.232C26.251,27.052 28.006,26.477 30.165,26.477C32.409,26.477 34.222,27.052 35.574,28.261C36.898,29.44 37.56,30.822 37.56,32.375C37.56,33.267 37.329,34.073 36.84,34.85C36.351,35.627 35.286,36.692 33.675,38.044C32.841,38.735 32.323,39.281 32.121,39.713C31.92,40.116 31.833,40.893 31.862,41.957Z" style="fill-opacity:0.7;"/>- </g>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/60/xdts_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/60/xdts_icon.svgdeleted file mode 100644index 769ed5949..000000000--- a/toonz/sources/toonz/icons/dark/mimetypes/60/xdts_icon.svg+++ /dev/null@@ -1,107 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-<svg width="60px" height="60px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-miterlimit:1.5;">- <rect x="0" y="0" width="60" height="60" style="fill:rgb(59,59,59);fill-opacity:0;"/>- <g id="page">- <g id="base" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57Z" style="fill:rgb(229,216,152);fill-rule:nonzero;"/>- </g>- <g transform="matrix(1,0,0,1,-1,0)">- <path d="M41,14L41,2L42,2L42,3L43,3L43,4L44,4L44,5L45,5L45,6L46,6L46,7L47,7L47,8L48,8L48,9L49,9L49,10L50,10L50,11L51,11L51,12L52,12L52,13L53,13L53,14L41,14Z" style="fill:rgb(246,241,216);fill-rule:nonzero;"/>- </g>- <g id="outline" transform="matrix(1,0,0,1,-1,1)">- <path d="M53,57L8,57L8,1L42,1L42,2L43,2L43,3L44,3L44,4L45,4L45,5L46,5L46,6L47,6L47,7L48,7L48,8L49,8L49,9L50,9L50,10L51,10L51,11L52,11L52,12L53,12L53,57ZM41,2L9,2L9,56L52,56L52,13L41,2Z" style="fill:rgb(116,106,55);"/>- </g>- <g transform="matrix(0.943825,0,0,0.871141,1.60099,7.57182)">- <g transform="matrix(1.05952,0,0,1.14792,-2.7558,-5.24808)">- <g id="g4">- <g opacity="0.7">- <g transform="matrix(13.2987,0,0,12.8536,15.8896,50)">- <path d="M0.61,0L0.471,0L0.327,-0.257C0.323,-0.265 0.318,-0.276 0.313,-0.29L0.311,-0.29C0.308,-0.283 0.303,-0.272 0.296,-0.257L0.148,0L0.008,0L0.238,-0.352L0.027,-0.7L0.169,-0.7L0.295,-0.464C0.304,-0.448 0.311,-0.433 0.317,-0.417L0.319,-0.417C0.328,-0.438 0.336,-0.454 0.343,-0.466L0.475,-0.7L0.605,-0.7L0.39,-0.353L0.61,0Z" style="fill-rule:nonzero;"/>- </g>- <g transform="matrix(11.8774,0,0,12.8536,23.9735,50)">- <path d="M0.086,0L0.086,-0.7L0.289,-0.7C0.547,-0.7 0.676,-0.586 0.676,-0.359C0.676,-0.251 0.64,-0.164 0.568,-0.098C0.497,-0.033 0.401,0 0.28,0L0.086,0ZM0.202,-0.602L0.202,-0.098L0.295,-0.098C0.377,-0.098 0.44,-0.121 0.486,-0.166C0.531,-0.21 0.554,-0.274 0.554,-0.356C0.554,-0.52 0.469,-0.602 0.299,-0.602L0.202,-0.602Z" style="fill-rule:nonzero;"/>- </g>- <g transform="matrix(11.5815,0,0,12.8536,32.2964,50)">- <path d="M0.536,-0.602L0.334,-0.602L0.334,0L0.218,0L0.218,-0.602L0.018,-0.602L0.018,-0.7L0.536,-0.7L0.536,-0.602Z" style="fill-rule:nonzero;"/>- </g>- <g transform="matrix(13,0,0,12.4372,38.385,49.8543)">- <path d="M0.054,-0.028L0.054,-0.147C0.065,-0.138 0.078,-0.129 0.093,-0.121C0.107,-0.113 0.123,-0.107 0.14,-0.101C0.156,-0.096 0.173,-0.092 0.189,-0.089C0.206,-0.086 0.221,-0.084 0.235,-0.084C0.284,-0.084 0.321,-0.093 0.344,-0.109C0.368,-0.125 0.38,-0.149 0.38,-0.18C0.38,-0.196 0.376,-0.211 0.368,-0.223C0.36,-0.235 0.349,-0.246 0.335,-0.256C0.321,-0.266 0.304,-0.276 0.284,-0.285C0.265,-0.295 0.244,-0.304 0.222,-0.314C0.198,-0.327 0.176,-0.34 0.156,-0.353C0.135,-0.366 0.117,-0.38 0.102,-0.396C0.087,-0.412 0.075,-0.43 0.067,-0.45C0.058,-0.47 0.054,-0.493 0.054,-0.52C0.054,-0.552 0.061,-0.581 0.076,-0.605C0.091,-0.629 0.11,-0.649 0.135,-0.665C0.159,-0.681 0.186,-0.693 0.217,-0.7C0.248,-0.708 0.28,-0.712 0.312,-0.712C0.385,-0.712 0.439,-0.704 0.472,-0.687L0.472,-0.572C0.432,-0.601 0.381,-0.615 0.319,-0.615C0.302,-0.615 0.284,-0.614 0.267,-0.61C0.25,-0.607 0.235,-0.602 0.221,-0.594C0.208,-0.587 0.197,-0.577 0.188,-0.565C0.18,-0.554 0.176,-0.54 0.176,-0.523C0.176,-0.507 0.179,-0.494 0.186,-0.482C0.192,-0.471 0.202,-0.461 0.214,-0.451C0.227,-0.442 0.242,-0.433 0.26,-0.424C0.278,-0.415 0.299,-0.405 0.323,-0.395C0.347,-0.382 0.37,-0.368 0.392,-0.354C0.413,-0.34 0.433,-0.325 0.449,-0.308C0.465,-0.291 0.478,-0.272 0.488,-0.252C0.498,-0.231 0.502,-0.208 0.502,-0.181C0.502,-0.146 0.495,-0.116 0.481,-0.091C0.467,-0.067 0.447,-0.047 0.423,-0.032C0.399,-0.016 0.371,-0.005 0.339,0.001C0.308,0.008 0.274,0.012 0.239,0.012C0.228,0.012 0.213,0.011 0.196,0.009C0.179,0.007 0.161,0.005 0.144,0.001C0.126,-0.002 0.109,-0.006 0.093,-0.011C0.077,-0.016 0.064,-0.022 0.054,-0.028Z" style="fill-rule:nonzero;"/>- </g>- </g>- </g>- </g>- <g transform="matrix(1,0,0,1,0,1.14792)">- <g opacity="0.7">- <g id="rect4533" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <rect x="10.5" y="8.5" width="40" height="25" style="fill:none;stroke:black;stroke-width:1px;"/>- </g>- <g>- <g id="path4535" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M10.5,12.5L50.5,12.5" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-4" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M10.5,15.484L50.5,15.484" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-3" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M10.5,18.49L45.5,18.49" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-4-3" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M10.5,21.497L45.5,21.497" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-4-9" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M10.5,24.503L45.5,24.503" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-3-1" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M10.5,27.51L45.5,27.51" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-4-3-1" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M10.5,30.516L45.5,30.516" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-9" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M31.25,33.5L31.25,12.5" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-9-1" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M17.25,33.5L17.25,12.5" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-9-9" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M38.25,33.5L38.25,12.5" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-9-1-4" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M24.25,33.5L24.25,12.5" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="path4535-9-9-5" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path d="M45.25,33.5L45.25,12.5" style="fill:none;fill-rule:nonzero;stroke:black;stroke-width:0.5px;stroke-miterlimit:4;"/>- </g>- <g id="text4670" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path id="path4775" d="M14.755,15L14.48,15L14.29,14.46L13.452,14.46L13.262,15L13,15L13.706,13.061L14.049,13.061L14.755,15ZM14.211,14.238L13.871,13.286L13.53,14.238L14.211,14.238Z" style="fill-rule:nonzero;"/>- </g>- <g id="text4670-1" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path id="path4772" d="M21.489,14.404C21.489,14.5 21.471,14.585 21.434,14.659C21.398,14.733 21.349,14.793 21.287,14.841C21.214,14.898 21.134,14.939 21.046,14.964C20.959,14.988 20.849,15 20.714,15L20.027,15L20.027,13.061L20.601,13.061C20.742,13.061 20.848,13.066 20.918,13.077C20.989,13.087 21.056,13.109 21.12,13.142C21.191,13.179 21.243,13.227 21.275,13.286C21.307,13.345 21.323,13.414 21.323,13.496C21.323,13.588 21.3,13.667 21.253,13.732C21.206,13.796 21.144,13.848 21.066,13.887L21.066,13.897C21.197,13.924 21.3,13.982 21.376,14.07C21.451,14.158 21.489,14.269 21.489,14.404ZM21.055,13.53C21.055,13.483 21.047,13.444 21.032,13.411C21.016,13.379 20.991,13.353 20.956,13.333C20.915,13.31 20.866,13.296 20.808,13.29C20.75,13.284 20.678,13.281 20.592,13.281L20.284,13.281L20.284,13.841L20.618,13.841C20.698,13.841 20.763,13.837 20.81,13.829C20.858,13.821 20.902,13.803 20.943,13.777C20.984,13.751 21.013,13.718 21.029,13.677C21.047,13.635 21.055,13.586 21.055,13.53ZM21.221,14.414C21.221,14.336 21.209,14.274 21.185,14.228C21.162,14.182 21.119,14.143 21.058,14.111C21.016,14.089 20.965,14.075 20.905,14.069C20.846,14.062 20.774,14.059 20.689,14.059L20.284,14.059L20.284,14.78L20.626,14.78C20.738,14.78 20.831,14.774 20.903,14.763C20.975,14.751 21.034,14.729 21.08,14.698C21.129,14.664 21.164,14.625 21.187,14.582C21.209,14.539 21.221,14.483 21.221,14.414Z" style="fill-rule:nonzero;"/>- </g>- <g id="text4670-0" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path id="path4769" d="M28.524,14.859C28.476,14.88 28.433,14.9 28.394,14.918C28.356,14.936 28.305,14.955 28.243,14.975C28.19,14.992 28.132,15.006 28.07,15.017C28.008,15.029 27.94,15.035 27.865,15.035C27.724,15.035 27.596,15.016 27.481,14.977C27.366,14.937 27.267,14.875 27.182,14.79C27.098,14.708 27.033,14.603 26.986,14.477C26.939,14.349 26.916,14.201 26.916,14.033C26.916,13.873 26.938,13.73 26.984,13.604C27.029,13.478 27.094,13.372 27.179,13.285C27.261,13.201 27.361,13.137 27.477,13.092C27.594,13.048 27.724,13.026 27.866,13.026C27.971,13.026 28.074,13.039 28.178,13.064C28.282,13.089 28.397,13.133 28.524,13.197L28.524,13.503L28.504,13.503C28.398,13.413 28.292,13.348 28.187,13.307C28.082,13.266 27.969,13.246 27.849,13.246C27.751,13.246 27.663,13.262 27.584,13.294C27.506,13.326 27.436,13.375 27.374,13.441C27.314,13.507 27.267,13.589 27.234,13.689C27.201,13.788 27.184,13.902 27.184,14.033C27.184,14.169 27.202,14.286 27.239,14.384C27.276,14.482 27.324,14.562 27.382,14.624C27.443,14.688 27.514,14.736 27.594,14.767C27.676,14.797 27.762,14.812 27.852,14.812C27.976,14.812 28.093,14.791 28.201,14.749C28.31,14.706 28.411,14.642 28.506,14.557L28.524,14.557L28.524,14.859Z" style="fill-rule:nonzero;"/>- </g>- <g id="text4670-1-0" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path id="path4766" d="M35.665,14.033C35.665,14.209 35.626,14.368 35.549,14.512C35.472,14.655 35.37,14.766 35.243,14.845C35.154,14.9 35.055,14.939 34.946,14.964C34.837,14.988 34.694,15 34.516,15L34.027,15L34.027,13.061L34.511,13.061C34.7,13.061 34.85,13.075 34.961,13.103C35.073,13.13 35.168,13.167 35.245,13.215C35.377,13.297 35.48,13.407 35.554,13.544C35.628,13.681 35.665,13.844 35.665,14.033ZM35.395,14.029C35.395,13.877 35.369,13.749 35.316,13.645C35.263,13.54 35.184,13.458 35.079,13.398C35.002,13.355 34.921,13.325 34.835,13.309C34.749,13.291 34.646,13.283 34.527,13.283L34.284,13.283L34.284,14.779L34.527,14.779C34.651,14.779 34.759,14.77 34.851,14.751C34.944,14.733 35.029,14.699 35.106,14.65C35.202,14.588 35.274,14.507 35.322,14.406C35.371,14.306 35.395,14.18 35.395,14.029Z" style="fill-rule:nonzero;"/>- </g>- <g id="text4670-1-0-2" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path id="path4763" d="M42.304,15L41.027,15L41.027,13.061L42.304,13.061L42.304,13.29L41.284,13.29L41.284,13.822L42.304,13.822L42.304,14.051L41.284,14.051L41.284,14.771L42.304,14.771L42.304,15Z" style="fill-rule:nonzero;"/>- </g>- <g id="text4670-10" transform="matrix(1.05952,0,0,1.14792,-2.7558,-0.656403)">- <path id="path4750" d="M28.234,11.65L27.959,11.65L27.769,11.11L26.93,11.11L26.74,11.65L26.479,11.65L27.184,9.711L27.528,9.711L28.234,11.65ZM27.689,10.888L27.35,9.936L27.008,10.888L27.689,10.888Z" style="fill-rule:nonzero;"/>- <path id="path4752" d="M29.584,11.559C29.502,11.598 29.425,11.628 29.351,11.65C29.278,11.672 29.2,11.682 29.118,11.682C29.013,11.682 28.916,11.667 28.829,11.637C28.741,11.606 28.666,11.559 28.604,11.496C28.54,11.434 28.491,11.355 28.456,11.259C28.422,11.164 28.404,11.052 28.404,10.925C28.404,10.687 28.469,10.5 28.6,10.365C28.731,10.229 28.903,10.162 29.118,10.162C29.201,10.162 29.283,10.173 29.363,10.197C29.443,10.22 29.517,10.249 29.584,10.283L29.584,10.555L29.571,10.555C29.496,10.497 29.419,10.452 29.339,10.421C29.26,10.39 29.183,10.374 29.107,10.374C28.969,10.374 28.859,10.421 28.778,10.515C28.698,10.607 28.658,10.744 28.658,10.925C28.658,11.1 28.697,11.235 28.775,11.33C28.854,11.423 28.965,11.47 29.107,11.47C29.157,11.47 29.207,11.464 29.258,11.451C29.31,11.438 29.356,11.421 29.396,11.4C29.432,11.382 29.466,11.363 29.497,11.343C29.528,11.322 29.553,11.304 29.571,11.289L29.584,11.289L29.584,11.559Z" style="fill-rule:nonzero;"/>- <path id="path4754" d="M30.654,11.637C30.608,11.649 30.558,11.659 30.503,11.667C30.449,11.675 30.401,11.679 30.359,11.679C30.21,11.679 30.097,11.639 30.02,11.559C29.943,11.479 29.904,11.351 29.904,11.175L29.904,10.401L29.739,10.401L29.739,10.195L29.904,10.195L29.904,9.778L30.149,9.778L30.149,10.195L30.654,10.195L30.654,10.401L30.149,10.401L30.149,11.064C30.149,11.14 30.151,11.2 30.154,11.244C30.158,11.286 30.17,11.326 30.191,11.363C30.21,11.398 30.236,11.424 30.269,11.44C30.303,11.456 30.354,11.464 30.423,11.464C30.462,11.464 30.504,11.458 30.548,11.447C30.591,11.435 30.622,11.425 30.641,11.417L30.654,11.417L30.654,11.637Z" style="fill-rule:nonzero;"/>- <path id="path4756" d="M31.214,9.952L30.938,9.952L30.938,9.698L31.214,9.698L31.214,9.952ZM31.199,11.65L30.954,11.65L30.954,10.195L31.199,10.195L31.199,11.65Z" style="fill-rule:nonzero;"/>- <path id="path4758" d="M32.925,10.923C32.925,11.16 32.864,11.347 32.743,11.485C32.621,11.622 32.459,11.69 32.255,11.69C32.049,11.69 31.885,11.622 31.764,11.485C31.643,11.347 31.583,11.16 31.583,10.923C31.583,10.686 31.643,10.499 31.764,10.362C31.885,10.224 32.049,10.155 32.255,10.155C32.459,10.155 32.621,10.224 32.743,10.362C32.864,10.499 32.925,10.686 32.925,10.923ZM32.673,10.923C32.673,10.735 32.636,10.595 32.562,10.504C32.488,10.412 32.386,10.366 32.255,10.366C32.122,10.366 32.018,10.412 31.945,10.504C31.872,10.595 31.835,10.735 31.835,10.923C31.835,11.106 31.872,11.244 31.946,11.339C32.02,11.432 32.123,11.479 32.255,11.479C32.385,11.479 32.487,11.433 32.561,11.34C32.635,11.246 32.673,11.107 32.673,10.923Z" style="fill-rule:nonzero;"/>- <path id="path4760" d="M34.521,11.65L34.277,11.65L34.277,10.822C34.277,10.755 34.273,10.692 34.265,10.634C34.257,10.575 34.243,10.529 34.222,10.496C34.2,10.46 34.169,10.433 34.128,10.416C34.087,10.397 34.035,10.388 33.969,10.388C33.903,10.388 33.833,10.405 33.76,10.438C33.687,10.471 33.617,10.513 33.55,10.564L33.55,11.65L33.305,11.65L33.305,10.195L33.55,10.195L33.55,10.357C33.627,10.294 33.706,10.244 33.787,10.209C33.869,10.173 33.952,10.155 34.038,10.155C34.196,10.155 34.315,10.202 34.398,10.297C34.48,10.392 34.521,10.528 34.521,10.706L34.521,11.65Z" style="fill-rule:nonzero;"/>- </g>- </g>- </g>- </g>- </g>- </g>- <g transform="matrix(1,0,0,1,-1,1)">- <path d="M41,13L52,13L52,24L41,13Z" style="fill-opacity:0.25;"/>- </g>-</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/audio_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/audio_icon.svgnew file mode 100644index 000000000..85ef8b3bb--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/audio_icon.svg@@ -0,0 +1,10 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(64,181,185);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <g transform="matrix(0.873016,0,0,0.873016,7.30159,5.4127)">+ <path d="M21,42.259L21,24.5L38,19L38,39.5C38,41.984 35.984,44 33.5,44C31.016,44 29,41.984 29,39.5C29,37.016 31.016,35 33.5,35C34.425,35 35.285,35.279 36,35.759L36,23.927L23,28.214L23,45.5L22.972,45.5C22.991,45.664 23,45.831 23,46C23,48.484 20.984,50.5 18.5,50.5C16.016,50.5 14,48.484 14,46C14,43.516 16.016,41.5 18.5,41.5C19.425,41.5 20.285,41.779 21,42.259Z" style="fill:white;fill-opacity:0.9;"/>+ </g>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(16,45,46);"/>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/broken_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/broken_icon.svgnew file mode 100644index 000000000..86591a263--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/broken_icon.svg@@ -0,0 +1,7 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M9,25.757L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,24.302C54.865,24.398 54.737,24.506 54.617,24.627L37.918,41.325C37.918,41.325 25.531,28.938 25.531,28.938L18.856,35.613C18.856,35.613 11.564,28.321 9,25.757ZM55,32.729L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,34.243L18.856,44.098L25.531,37.423C25.531,37.423 37.918,49.81 37.918,49.81L55,32.729Z" style="fill:rgb(228,228,228);"/>+ <path d="M9,25.757L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,24.302C54.865,24.398 54.737,24.506 54.617,24.627L37.918,41.325C37.918,41.325 25.531,28.938 25.531,28.938L18.856,35.613C18.856,35.613 11.564,28.321 9,25.757ZM37.918,38.497L53,23.415L53,16.243C53,15.977 52.895,15.723 52.707,15.535L43.465,6.293C43.277,6.105 43.023,6 42.757,6L12,6C11.735,6 11.481,6.105 11.294,6.292L11.292,6.294C11.105,6.481 11,6.735 11,7L11,24.929L18.856,32.785L24.117,27.524C24.898,26.743 26.164,26.743 26.945,27.524L37.918,38.497ZM55,32.729L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,34.243L18.856,44.098L25.531,37.423C25.531,37.423 37.918,49.81 37.918,49.81L55,32.729ZM25.531,40.252L20.27,45.513C19.489,46.294 18.223,46.294 17.442,45.513L11,39.071L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,37.557L39.333,51.224C38.552,52.006 37.285,52.006 36.504,51.224L25.531,40.252Z" style="fill:rgb(57,57,57);"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(57,57,57);"/>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/cleanup_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/cleanup_icon.svgnew file mode 100644index 000000000..e6aa48d7b--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/cleanup_icon.svg@@ -0,0 +1,11 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(72,121,52);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(18,30,13);"/>+ <g transform="matrix(11,0,0,11,42.3232,51.0713)">+ </g>+ <text x="21.677px" y="51.071px" style="font-family:'SegoeUI-Semibold', 'Segoe UI', sans-serif;font-weight:600;font-size:11px;fill:white;">CLN</text>+ <path d="M35.325,30.399C33.789,32.481 32.502,35.615 31.799,38.031C31.488,38.338 30.486,38.062 30.486,38.062C30.453,36.016 31.416,34.359 31.455,34.247C31.466,34.218 30.157,35.505 28.98,37.213C28.944,37.267 28.849,37.181 28.794,37.143C27.395,36.195 24.764,33.57 24.764,33.57C25.461,33.029 26.449,32.047 26.885,31.251C26.183,31.875 24.73,32.478 23.897,32.718C23.897,32.718 23.362,32.02 23.097,31.661L23.038,31.581C24.67,30.839 25.946,29.849 28.11,27.707C26.561,28.698 23.736,29.331 21.856,29.451C21.856,29.451 21.453,28.502 21.786,28.174C24.753,27.727 27.191,26.437 29.598,24.785C30.916,23.513 33.201,23.394 34.928,25.094C36.656,26.794 36.501,28.572 35.325,30.399ZM36.322,22.009L40.25,18.143C40.729,17.671 41.507,17.671 41.986,18.143C42.466,18.615 42.466,19.381 41.986,19.853L38.059,23.719C38.534,24.699 38.13,26.247 37.66,27.229C37.661,26.109 37.19,25.011 36.099,23.938C35.074,22.928 33.886,22.447 32.752,22.402C33.751,21.939 35.325,21.541 36.322,22.009ZM41.394,31.613L40.253,33.617C40.209,33.697 40.185,33.785 40.185,33.875C40.185,33.966 40.209,34.054 40.254,34.133L41.393,36.137L39.357,35.015C39.278,34.971 39.188,34.947 39.096,34.947C39.004,34.947 38.914,34.971 38.834,35.014L36.798,36.138L37.938,34.133C37.983,34.054 38.006,33.965 38.007,33.875C38.007,33.785 37.983,33.696 37.938,33.618L36.798,31.613L38.834,32.736C38.914,32.779 39.004,32.803 39.096,32.803C39.187,32.802 39.278,32.78 39.357,32.736L41.394,31.613ZM28.767,18.292L27.626,20.296C27.582,20.376 27.558,20.464 27.558,20.555C27.558,20.645 27.582,20.733 27.627,20.812L28.767,22.816L26.731,21.694C26.651,21.65 26.562,21.627 26.469,21.627C26.377,21.627 26.288,21.65 26.207,21.694L24.171,22.817L25.312,20.812C25.357,20.733 25.38,20.645 25.38,20.555C25.38,20.464 25.356,20.376 25.312,20.298L24.171,18.292L26.208,19.415C26.287,19.459 26.377,19.482 26.469,19.482C26.561,19.482 26.651,19.46 26.731,19.415L28.767,18.292Z" style="fill:white;"/>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/curve_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/curve_icon.svgnew file mode 100644index 000000000..0da5e115e--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/curve_icon.svg@@ -0,0 +1,16 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(72,121,52);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(18,30,13);"/>+ <g transform="matrix(11,0,0,11,49.0828,51.0713)">+ </g>+ <text x="14.917px" y="51.071px" style="font-family:'SegoeUI-Semibold', 'Segoe UI', sans-serif;font-weight:600;font-size:11px;fill:white;">CURVE</text>+ <g transform="matrix(1,0,0,1,2.5,-11.8241)">+ <path d="M46,52L13,52L13,31L46,31L46,52ZM15,45L15,50L20,50L20,45L15,45ZM21,45L21,50L26,50L26,45L21,45ZM27,45L27,50L32,50L32,45L27,45ZM33,45L33,50L38,50L38,45L33,45ZM39,45L39,50L44,50L44,45L39,45ZM15,39L15,44L20,44L20,39L15,39ZM21,39L21,44L26,44L26,39L21,39ZM27,39L27,44L32,44L32,39L27,39ZM33,39L33,44L38,44L38,39L33,39ZM39,39L39,44L44,44L44,39L39,39ZM15,33L15,38L20,38L20,33L15,33ZM21,33L21,38L26,38L26,33L21,33ZM27,33L27,38L32,38L32,33L27,33ZM33,33L33,38L38,38L38,33L33,33ZM39,33L39,38L44,38L44,33L39,33Z" style="fill-opacity:0.5;"/>+ </g>+ <g transform="matrix(1,0,0,1,2.5,0.175916)">+ <path d="M44,38.056C39.45,37.996 36.227,37.2 34.419,36.056C32.783,35.021 28.941,30.642 26.204,27.851C21.956,23.52 15.328,24.083 15.328,24.083C15.216,24.092 15.106,24.088 15,24.074L15,21.102C15.028,21.098 15.056,21.095 15.085,21.093C15.085,21.093 23.283,20.343 28.346,25.751C32.257,29.928 34.225,32.272 36.098,33.57C37.533,34.564 40.735,35.035 44,35.204L44,38.056Z" style="fill:rgb(255,127,33);"/>+ </g>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/json_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/json_icon.svgnew file mode 100644index 000000000..9b05c29f9--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/json_icon.svg@@ -0,0 +1,13 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(162,229,219);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(41,57,55);"/>+ <g transform="matrix(11,0,0,11,45.5513,51.0713)">+ </g>+ <text x="18.449px" y="51.071px" style="font-family:'SegoeUI-Semibold', 'Segoe UI', sans-serif;font-weight:600;font-size:11px;fill:rgb(41,57,55);">JSON</text>+ <g id="path899" transform="matrix(1,0,0,1,53.7189,3)">+ <path d="M-25.852,36.292L-27.414,36.292C-28.657,36.292 -29.667,35.944 -30.445,35.25C-31.216,34.563 -31.602,33.566 -31.602,32.26L-31.602,30.708C-31.602,29.535 -31.89,28.618 -32.466,27.958C-33.042,27.292 -33.924,26.958 -35.112,26.958L-35.643,26.958L-35.643,25.333L-35.112,25.333C-33.924,25.333 -33.042,25.003 -32.466,24.344C-31.89,23.677 -31.602,22.757 -31.602,21.583L-31.602,20.031C-31.602,18.726 -31.216,17.729 -30.445,17.042C-29.667,16.347 -28.657,16 -27.414,16L-25.852,16L-25.852,17.438L-27.039,17.438C-27.983,17.438 -28.671,17.656 -29.102,18.094C-29.525,18.531 -29.737,19.236 -29.737,20.208L-29.737,22.031C-29.737,22.997 -30.004,23.809 -30.539,24.469C-31.074,25.122 -31.817,25.639 -32.768,26.021L-32.768,26.271C-31.817,26.653 -31.074,27.174 -30.539,27.833C-30.004,28.486 -29.737,29.295 -29.737,30.26L-29.737,32.083C-29.737,33.056 -29.525,33.76 -29.102,34.198C-28.671,34.635 -27.983,34.854 -27.039,34.854L-25.852,34.854L-25.852,36.292ZM-20.098,23.542L-22.588,23.542L-22.588,20.573L-20.098,20.573L-20.098,23.542ZM-19.338,29.24L-22.275,36.063L-23.796,36.063L-21.983,29.24L-19.338,29.24ZM-7.795,26.958L-8.326,26.958C-9.513,26.958 -10.395,27.292 -10.972,27.958C-11.548,28.618 -11.836,29.535 -11.836,30.708L-11.836,32.26C-11.836,33.566 -12.225,34.563 -13.003,35.25C-13.774,35.944 -14.781,36.292 -16.024,36.292L-17.586,36.292L-17.586,34.854L-16.399,34.854C-15.454,34.854 -14.77,34.635 -14.347,34.198C-13.916,33.76 -13.701,33.056 -13.701,32.083L-13.701,30.26C-13.701,29.295 -13.434,28.486 -12.899,27.833C-12.364,27.174 -11.621,26.653 -10.67,26.271L-10.67,26.021C-11.621,25.639 -12.364,25.122 -12.899,24.469C-13.434,23.809 -13.701,22.997 -13.701,22.031L-13.701,20.208C-13.701,19.236 -13.916,18.531 -14.347,18.094C-14.77,17.656 -15.454,17.438 -16.399,17.438L-17.586,17.438L-17.586,16L-16.024,16C-14.781,16 -13.774,16.347 -13.003,17.042C-12.225,17.729 -11.836,18.726 -11.836,20.031L-11.836,21.583C-11.836,22.757 -11.548,23.677 -10.972,24.344C-10.395,25.003 -9.513,25.333 -8.326,25.333L-7.795,25.333L-7.795,26.958Z" style="fill:rgb(41,57,55);"/>+ </g>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/missing_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/missing_icon.svgnew file mode 100644index 000000000..a0d39a271--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/missing_icon.svg@@ -0,0 +1,13 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(228,228,228);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <g transform="matrix(0.943825,0,0,0.871141,5.10099,0.0718112)">+ <path d="M26.38,23.595C26.82,22.794 27.627,22.302 28.5,22.302C29.373,22.302 30.18,22.794 30.62,23.595C33.912,29.584 40.217,41.056 43.529,47.082C43.971,47.888 43.975,48.883 43.537,49.692C43.099,50.501 42.287,51 41.408,51L15.592,51C14.713,51 13.901,50.501 13.463,49.692C13.025,48.883 13.029,47.888 13.471,47.082C16.783,41.056 23.088,29.584 26.38,23.595Z" style="fill-opacity:0.7;"/>+ </g>+ <g transform="matrix(16,0,0,16,27.46,40.568)">+ <path d="M0.367,-0.185L0.242,-0.185L0.242,-0.217C0.242,-0.258 0.248,-0.291 0.262,-0.317C0.275,-0.343 0.302,-0.372 0.342,-0.405C0.382,-0.437 0.406,-0.459 0.414,-0.469C0.426,-0.485 0.432,-0.502 0.432,-0.521C0.432,-0.548 0.421,-0.571 0.4,-0.59C0.378,-0.609 0.35,-0.619 0.313,-0.619C0.279,-0.619 0.25,-0.609 0.226,-0.589C0.203,-0.569 0.187,-0.539 0.178,-0.498L0.052,-0.514C0.055,-0.572 0.08,-0.621 0.126,-0.662C0.172,-0.703 0.233,-0.723 0.308,-0.723C0.386,-0.723 0.449,-0.703 0.496,-0.661C0.542,-0.62 0.565,-0.572 0.565,-0.518C0.565,-0.487 0.557,-0.459 0.54,-0.432C0.523,-0.405 0.486,-0.368 0.43,-0.321C0.401,-0.297 0.383,-0.278 0.376,-0.263C0.369,-0.249 0.366,-0.222 0.367,-0.185ZM0.242,0L0.242,-0.137L0.379,-0.137L0.379,0L0.242,0Z" style="fill:white;fill-rule:nonzero;"/>+ </g>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(57,57,57);"/>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/motionpath_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/motionpath_icon.svgnew file mode 100644index 000000000..870566ac5--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/motionpath_icon.svg@@ -0,0 +1,13 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(72,121,52);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(18,30,13);"/>+ <g transform="matrix(11,0,0,11,50.302,51.0713)">+ </g>+ <text x="13.698px" y="51.071px" style="font-family:'SegoeUI-Semibold', 'Segoe UI', sans-serif;font-weight:600;font-size:11px;fill:white;">MP<tspan x="29.537px 36.144px 42.213px " y="51.071px 51.071px 51.071px ">ATH</tspan></text>+ <g transform="matrix(0.884821,-0.237087,0.237087,0.884821,-1.15421,3.8312)">+ <path d="M33.708,47.264L39.212,49.042L38.541,51.204L30.342,48.595C29.82,48.296 29.522,47.849 29.522,47.402C29.522,47.327 29.522,47.178 29.596,47.104L32.205,38.532L34.367,39.202L32.463,45.406C34.159,44.627 35.663,43.84 36.976,43.004L37.05,43.004L38.169,44.868C36.873,45.656 35.365,46.487 33.708,47.264ZM38.69,41.886C38.69,41.811 38.765,41.811 38.69,41.886C40.703,40.395 42.045,38.83 42.641,37.264L42.716,37.264L44.728,38.084L44.728,38.159C43.908,40.097 42.343,41.886 40.032,43.675L39.958,43.675L38.69,41.886ZM41.333,29.152C42.743,29.681 44.509,30.952 45.101,33.985L45.101,34.134C45.175,34.357 45.25,34.879 45.25,35.475L45.25,35.55L43.088,35.55L43.088,35.475C43.088,35.028 43.014,34.73 43.014,34.655C43.014,34.581 42.939,34.506 42.939,34.357C42.717,33.544 42.349,31.996 40.523,31.171L40.479,31.152L41.225,29.139L41.299,29.139L41.333,29.152ZM14.017,30.928L15.583,29.438C16.03,29.885 16.701,30.332 17.446,30.63C18.042,30.854 18.639,31.003 18.713,31.003L18.788,31.003C19.086,31.003 19.608,31.077 20.502,31.077L20.95,31.077L20.95,33.239L20.428,33.239C19.459,33.239 18.788,33.239 18.564,33.165L18.49,33.165C18.117,33.165 17.521,33.015 16.552,32.643C15.583,32.27 14.688,31.674 14.017,30.928ZM23.186,31.003C25.273,30.779 27.435,30.556 29.745,30.034L30.193,32.196L30.193,32.27C27.807,32.717 25.497,33.015 23.409,33.165L23.186,31.003ZM31.833,29.661C32.429,29.512 33.025,29.363 33.696,29.214C35.261,28.841 36.752,28.618 38.019,28.618L38.765,28.618C38.765,28.618 38.839,28.618 38.765,28.692L38.616,30.854L38.019,30.854C36.901,30.854 35.634,31.077 34.218,31.376C33.547,31.525 32.876,31.674 32.28,31.823L32.205,31.823L31.833,29.661ZM12.75,27.723C12.75,26.754 13.048,25.636 13.644,24.518C14.166,23.474 14.837,22.505 15.657,21.536L17.297,22.952C16.626,23.772 16.03,24.667 15.583,25.561C15.135,26.381 14.986,27.127 14.986,27.723L14.986,28.17L12.825,28.468C12.75,28.17 12.75,27.947 12.75,27.723ZM23.931,17.809C23.931,17.809 23.782,17.884 23.484,18.033C23.111,18.256 22.664,18.48 22.291,18.704C21.397,19.225 20.055,20.12 18.713,21.387L17.222,19.822C19.906,17.287 22.589,16.02 23.037,15.796L23.931,17.809Z" style="fill:rgb(255,127,33);fill-rule:nonzero;"/>+ </g>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/psd_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/psd_icon.svgnew file mode 100644index 000000000..4eab0fa75--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/psd_icon.svg@@ -0,0 +1,22 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(33,44,102);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill:rgb(42,122,176);"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(42,122,176);"/>+ <g transform="matrix(11,0,0,11,42.1541,51.0713)">+ </g>+ <text x="21.846px" y="51.071px" style="font-family:'SegoeUI-Semibold', 'Segoe UI', sans-serif;font-weight:600;font-size:11px;fill:white;">PSD</text>+ <g transform="matrix(1.15385,0,0,0.807692,-8.38473,7.69231)">+ <rect x="22" y="14" width="26" height="26" style="fill:rgb(42,122,176);"/>+ </g>+ <g transform="matrix(0.857143,0,0,0.857143,7.28553,5.57143)">+ <circle cx="40.5" cy="21.5" r="3.5" style="fill:white;"/>+ </g>+ <g transform="matrix(1.54545,0,0,1.2,-6.27291,-5)">+ <path d="M22.5,25L28,35L17,35L22.5,25Z" style="fill:rgb(149,189,216);"/>+ </g>+ <g transform="matrix(1.3,0,0,1.33333,-10.6002,-11)">+ <path d="M37,30L42,36L32,36L37,30Z" style="fill:white;"/>+ </g>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/script_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/script_icon.svgnew file mode 100644index 000000000..d4f1e4866--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/script_icon.svg@@ -0,0 +1,11 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(239,216,29);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(60,54,7);"/>+ <g transform="matrix(11,0,0,11,37.175,51.0713)">+ </g>+ <text x="26.825px" y="51.071px" style="font-family:'SegoeUI-Semibold', 'Segoe UI', sans-serif;font-weight:600;font-size:11px;fill:rgb(60,54,7);">JS</text>+ <path d="M25.451,31.448C25.62,31.575 25.721,31.778 25.738,32.006C25.771,32.26 25.687,32.641 25.535,33.123C25.451,33.377 25.367,33.58 25.299,33.732C25.215,33.859 25.148,33.96 25.08,34.011C25.013,34.087 24.929,34.112 24.861,34.087C24.777,34.087 24.71,34.036 24.625,33.986L18.205,28.987C18.07,28.885 17.986,28.759 17.918,28.606C17.851,28.454 17.834,28.175 17.834,27.82C17.834,27.465 17.851,27.211 17.918,27.059C17.986,26.881 18.07,26.754 18.205,26.653L24.625,21.679C24.71,21.629 24.777,21.578 24.861,21.578C24.929,21.552 25.013,21.578 25.08,21.629C25.148,21.679 25.215,21.781 25.299,21.933C25.367,22.085 25.451,22.288 25.535,22.517C25.687,23.024 25.771,23.405 25.738,23.633C25.721,23.887 25.62,24.09 25.451,24.217L20.631,27.82L25.451,31.448ZM30.197,38.35C30.146,38.502 30.079,38.604 29.961,38.68C29.843,38.731 29.708,38.756 29.573,38.756C29.405,38.756 29.253,38.731 29.068,38.654C28.899,38.604 28.764,38.502 28.63,38.375C28.495,38.248 28.411,38.096 28.343,37.919C28.276,37.741 28.293,37.538 28.343,37.31L33.803,18.888C33.837,18.736 33.921,18.634 34.039,18.558C34.157,18.508 34.292,18.457 34.444,18.457C34.595,18.457 34.764,18.508 34.932,18.558C35.101,18.634 35.252,18.736 35.37,18.863C35.505,18.99 35.589,19.142 35.657,19.32C35.707,19.497 35.707,19.7 35.64,19.929L30.197,38.35ZM38.549,24.217C38.363,24.09 38.279,23.887 38.246,23.633C38.229,23.405 38.296,23.024 38.465,22.517C38.549,22.288 38.633,22.085 38.701,21.933C38.768,21.781 38.852,21.679 38.92,21.629C38.987,21.578 39.054,21.552 39.139,21.578C39.206,21.578 39.29,21.629 39.375,21.679L45.795,26.653C45.913,26.754 46.014,26.881 46.082,27.059C46.132,27.211 46.166,27.465 46.166,27.82C46.166,28.175 46.132,28.454 46.082,28.606C46.014,28.759 45.913,28.885 45.795,28.987L39.375,33.986C39.29,34.036 39.206,34.087 39.139,34.087C39.054,34.112 38.987,34.087 38.92,34.011C38.852,33.96 38.768,33.859 38.701,33.732C38.633,33.58 38.549,33.377 38.465,33.123C38.296,32.641 38.229,32.26 38.246,32.006C38.279,31.778 38.363,31.575 38.549,31.448L43.369,27.82L38.549,24.217Z" style="fill-opacity:0.7;"/>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/svg_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/svg_icon.svgnew file mode 100644index 000000000..fc0d8f7e9--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/svg_icon.svg@@ -0,0 +1,13 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(229,78,62);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(57,20,16);"/>+ <g transform="matrix(11,0,0,11,42.2454,51.0713)">+ </g>+ <text x="21.755px" y="51.071px" style="font-family:'SegoeUI-Semibold', 'Segoe UI', sans-serif;font-weight:600;font-size:11px;fill:white;">SV<tspan x="34.575px " y="51.071px ">G</tspan></text>+ <g transform="matrix(1,0,0,1,0,1)">+ <path d="M19.622,30.018C20.565,27.089 22.519,24.612 25.073,23L17,23C16.448,23 16,22.552 16,22C16,21.448 16.448,21 17,21L28.126,21C28.571,19.276 30.138,18 32,18C33.862,18 35.429,19.276 35.874,21L47,21C47.552,21 48,21.448 48,22C48,22.552 47.552,23 47,23L38.927,23C41.481,24.612 43.435,27.089 44.378,30.018C46.408,30.208 48,31.92 48,34C48,36.208 46.208,38 44,38C41.792,38 40,36.208 40,34C40,32.37 40.977,30.967 42.377,30.344C41.272,27.212 38.788,24.728 35.656,23.623C35.033,25.023 33.63,26 32,26C30.37,26 28.967,25.023 28.344,23.623C25.212,24.728 22.728,27.212 21.623,30.344C23.023,30.967 24,32.37 24,34C24,36.208 22.208,38 20,38C17.792,38 16,36.208 16,34C16,31.92 17.592,30.208 19.622,30.018ZM20,32C18.896,32 18,32.896 18,34C18,35.104 18.896,36 20,36C21.104,36 22,35.104 22,34C22,32.896 21.104,32 20,32ZM44,32C42.896,32 42,32.896 42,34C42,35.104 42.896,36 44,36C45.104,36 46,35.104 46,34C46,32.896 45.104,32 44,32ZM32,20C30.896,20 30,20.896 30,22C30,23.104 30.896,24 32,24C33.104,24 34,23.104 34,22C34,20.896 33.104,20 32,20Z" style="fill:white;fill-opacity:0.9;"/>+ </g>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/tasklist_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/tasklist_icon.svgnew file mode 100644index 000000000..a6a421d9f--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/tasklist_icon.svg@@ -0,0 +1,26 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243C55,22.224 55,48.122 55,57C55,58.657 53.657,60 52,60C43.671,60 20.329,60 12,60C10.343,60 9,58.657 9,57C9,47.28 9,16.72 9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4C19.308,4 37.794,4 42.757,4Z" style="fill:rgb(72,121,52);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(18,30,13);"/>+ <g transform="matrix(10,0,0,10,50.3105,50.7012)">+ </g>+ <text x="13.689px" y="50.701px" style="font-family:'SegoeUI-Semibold', 'Segoe UI', sans-serif;font-weight:600;font-size:10px;fill:white;">TNZBA<tspan x="44.793px " y="50.701px ">T</tspan></text>+ <g transform="matrix(1,0,0,1,3.5,-6.5)">+ <g id="page">+ <g>+ <g transform="matrix(1,0,0,1,-1,-4)">+ <path d="M41,43.5C41,43.224 40.776,43 40.5,43L31.5,43C31.224,43 31,43.224 31,43.5L31,44.5C31,44.776 31.224,45 31.5,45L40.5,45C40.776,45 41,44.776 41,44.5L41,43.5Z" style="fill:white;"/>+ </g>+ <path d="M25,26.6C25,25.716 24.284,25 23.4,25L18.6,25C17.716,25 17,25.716 17,26.6L17,31.4C17,32.284 17.716,33 18.6,33L23.4,33C24.284,33 25,32.284 25,31.4L25,26.6ZM23.4,26.6L18.6,26.6L18.6,31.4L23.4,31.4L23.4,26.6Z" style="fill:white;"/>+ <g transform="matrix(1,0,0,1,0,11)">+ <path d="M25,26.6C25,25.716 24.284,25 23.4,25L18.6,25C17.716,25 17,25.716 17,26.6L17,31.4C17,32.284 17.716,33 18.6,33L23.4,33C24.284,33 25,32.284 25,31.4L25,26.6ZM23.4,26.6L18.6,26.6L18.6,31.4L23.4,31.4L23.4,26.6Z" style="fill:white;"/>+ </g>+ <g transform="matrix(1,0,0,1,-1,0)">+ <path d="M34.978,30.585L39.295,26.291C39.686,25.902 40.32,25.903 40.709,26.295C41.098,26.686 41.097,27.32 40.705,27.709L35.678,32.709C35.49,32.896 35.235,33.001 34.97,33C34.704,32.999 34.45,32.893 34.263,32.704L31.29,29.704C30.901,29.312 30.904,28.678 31.296,28.29C31.688,27.901 32.322,27.904 32.71,28.296L34.978,30.585Z" style="fill:white;"/>+ </g>+ </g>+ </g>+ </g>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/unknown_icon.svg b/toonz/sources/toonz/icons/dark/mimetypes/unknown_icon.svgnew file mode 100644index 000000000..0de22a0d2--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/unknown_icon.svg@@ -0,0 +1,7 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4Z" style="fill:rgb(228,228,228);"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:rgb(57,57,57);"/>+</svg>diff --git a/toonz/sources/toonz/icons/dark/mimetypes/xdts_icong.svg b/toonz/sources/toonz/icons/dark/mimetypes/xdts_icong.svgnew file mode 100644index 000000000..5416416b9--- /dev/null+++ b/toonz/sources/toonz/icons/dark/mimetypes/xdts_icong.svg@@ -0,0 +1,12 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-miterlimit:1.5;">+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879C46.939,6.939 52.061,12.061 54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4Z" style="fill:#e5d898;"/>+ <path d="M42.757,4C43.553,4 44.316,4.316 44.879,4.879L54.121,14.121C54.684,14.684 55,15.447 55,16.243L55,57C55,58.657 53.657,60 52,60L12,60C10.343,60 9,58.657 9,57L9,7C9,6.204 9.316,5.441 9.879,4.879C10.441,4.316 11.204,4 12,4L42.757,4ZM42.757,6L12,6C11.735,6 11.48,6.105 11.293,6.293C11.105,6.48 11,6.735 11,7L11,57C11,57.552 11.448,58 12,58L52,58C52.552,58 53,57.552 53,57L53,16.243C53,15.977 52.895,15.723 52.707,15.536L43.464,6.293C43.277,6.105 43.023,6 42.757,6Z" style="fill-opacity:0.75;"/>+ <g>+ <rect x="15" y="18.875" width="34" height="21.25" style="fill:none;stroke:#000;stroke-width:0.85px;"/>+ </g>+ <path d="M20.525,22.488L15,22.488L15,22.063L49,22.063L49,22.488L44.75,22.488L44.75,24.599L49,24.599L49,25.024L44.75,25.024L44.75,40.125L44.325,40.125L44.325,37.801L38.8,37.801L38.8,40.125L38.375,40.125L38.375,37.801L32.85,37.801L32.85,40.125L32.425,40.125L32.425,37.801L26.9,37.801L26.9,40.125L26.475,40.125L26.475,37.801L20.95,37.801L20.95,40.125L20.525,40.125L20.525,37.801L15,37.801L15,37.376L20.525,37.376L20.525,35.246L15,35.246L15,34.821L20.525,34.821L20.525,32.69L15,32.69L15,32.265L20.525,32.265L20.525,30.135L15,30.135L15,29.71L20.525,29.71L20.525,27.579L15,27.579L15,27.154L20.525,27.154L20.525,25.024L15,25.024L15,24.599L20.525,24.599L20.525,22.488ZM38.375,34.821L38.375,32.69L32.85,32.69L32.85,34.821L38.375,34.821ZM32.85,37.376L38.375,37.376L38.375,35.246L32.85,35.246L32.85,37.376ZM26.9,37.376L32.425,37.376L32.425,35.246L26.9,35.246L26.9,37.376ZM44.325,32.265L44.325,30.135L38.8,30.135L38.8,32.265L44.325,32.265ZM44.325,37.376L44.325,35.246L38.8,35.246L38.8,37.376L44.325,37.376ZM44.325,22.488L38.8,22.488L38.8,24.599L44.325,24.599L44.325,22.488ZM42.033,24.4L40.948,24.4L40.948,22.752L42.033,22.752L42.033,22.947L41.166,22.947L41.166,23.399L42.033,23.399L42.033,23.593L41.166,23.593L41.166,24.205L42.033,24.205L42.033,24.4ZM44.325,34.821L44.325,32.69L38.8,32.69L38.8,34.821L44.325,34.821ZM20.95,30.135L20.95,32.265L26.475,32.265L26.475,30.135L20.95,30.135ZM38.375,25.024L32.85,25.024L32.85,27.154L38.375,27.154L38.375,25.024ZM20.95,25.024L20.95,27.154L26.475,27.154L26.475,25.024L20.95,25.024ZM32.425,25.024L26.9,25.024L26.9,27.154L32.425,27.154L32.425,25.024ZM20.95,32.69L20.95,34.821L26.475,34.821L26.475,32.69L20.95,32.69ZM20.95,27.579L20.95,29.71L26.475,29.71L26.475,27.579L20.95,27.579ZM38.375,32.265L38.375,30.135L32.85,30.135L32.85,32.265L38.375,32.265ZM38.375,29.71L38.375,27.579L32.85,27.579L32.85,29.71L38.375,29.71ZM26.9,34.821L32.425,34.821L32.425,32.69L26.9,32.69L26.9,34.821ZM44.325,29.71L44.325,27.579L38.8,27.579L38.8,29.71L44.325,29.71ZM26.475,22.488L20.95,22.488L20.95,24.599L26.475,24.599L26.475,22.488ZM24.341,23.893C24.341,23.975 24.325,24.047 24.294,24.11C24.263,24.173 24.222,24.224 24.169,24.265C24.107,24.313 24.039,24.348 23.964,24.369C23.89,24.39 23.797,24.4 23.682,24.4L23.098,24.4L23.098,22.752L23.586,22.752C23.706,22.752 23.796,22.756 23.855,22.765C23.916,22.774 23.973,22.793 24.027,22.821C24.087,22.852 24.132,22.893 24.159,22.943C24.186,22.993 24.2,23.052 24.2,23.122C24.2,23.2 24.18,23.267 24.14,23.322C24.1,23.377 24.047,23.421 23.981,23.454L23.981,23.462C24.092,23.485 24.18,23.535 24.245,23.61C24.308,23.684 24.341,23.779 24.341,23.893ZM24.113,23.902C24.113,23.836 24.103,23.783 24.082,23.744C24.063,23.705 24.026,23.672 23.974,23.644C23.939,23.626 23.895,23.614 23.844,23.609C23.794,23.603 23.733,23.6 23.661,23.6L23.316,23.6L23.316,24.213L23.607,24.213C23.702,24.213 23.781,24.208 23.843,24.199C23.904,24.188 23.954,24.17 23.993,24.143C24.035,24.114 24.064,24.081 24.084,24.045C24.103,24.008 24.113,23.961 24.113,23.902ZM23.972,23.151C23.972,23.111 23.965,23.077 23.952,23.049C23.939,23.022 23.917,23 23.888,22.983C23.853,22.964 23.811,22.952 23.762,22.947C23.712,22.941 23.651,22.939 23.578,22.939L23.316,22.939L23.316,23.415L23.6,23.415C23.668,23.415 23.724,23.411 23.763,23.405C23.804,23.398 23.842,23.383 23.877,23.36C23.911,23.338 23.936,23.31 23.95,23.275C23.965,23.24 23.972,23.198 23.972,23.151ZM26.9,27.579L26.9,29.71L32.425,29.71L32.425,27.579L26.9,27.579ZM32.425,22.488L26.9,22.488L26.9,24.599L32.425,24.599L32.425,22.488ZM30.32,24.28C30.28,24.298 30.243,24.315 30.21,24.33C30.178,24.346 30.134,24.362 30.082,24.379C30.036,24.393 29.987,24.405 29.934,24.414C29.882,24.425 29.824,24.43 29.76,24.43C29.64,24.43 29.532,24.414 29.434,24.38C29.336,24.346 29.252,24.294 29.18,24.222C29.108,24.152 29.053,24.063 29.013,23.955C28.973,23.847 28.954,23.721 28.954,23.578C28.954,23.442 28.972,23.321 29.011,23.213C29.05,23.106 29.105,23.016 29.177,22.942C29.247,22.871 29.332,22.816 29.43,22.778C29.53,22.741 29.64,22.722 29.761,22.722C29.85,22.722 29.938,22.733 30.026,22.754C30.115,22.776 30.212,22.813 30.32,22.867L30.32,23.128L30.303,23.128C30.213,23.051 30.123,22.996 30.034,22.961C29.945,22.926 29.849,22.909 29.747,22.909C29.663,22.909 29.589,22.923 29.521,22.95C29.455,22.977 29.396,23.019 29.343,23.075C29.292,23.131 29.252,23.201 29.224,23.286C29.196,23.37 29.181,23.467 29.181,23.578C29.181,23.694 29.197,23.793 29.228,23.876C29.26,23.96 29.3,24.028 29.35,24.08C29.402,24.135 29.462,24.176 29.53,24.202C29.6,24.227 29.673,24.24 29.749,24.24C29.855,24.24 29.954,24.222 30.046,24.187C30.138,24.15 30.224,24.096 30.305,24.023L30.32,24.023L30.32,24.28ZM38.375,22.488L32.85,22.488L32.85,24.599L38.375,24.599L38.375,22.488ZM36.39,23.578C36.39,23.728 36.357,23.863 36.292,23.985C36.226,24.107 36.139,24.201 36.032,24.268C35.956,24.315 35.872,24.348 35.779,24.369C35.686,24.39 35.565,24.4 35.414,24.4L34.998,24.4L34.998,22.752L35.409,22.752C35.57,22.752 35.697,22.764 35.792,22.788C35.887,22.811 35.968,22.842 36.033,22.883C36.145,22.952 36.233,23.046 36.296,23.162C36.359,23.279 36.39,23.417 36.39,23.578ZM36.161,23.575C36.161,23.445 36.139,23.337 36.094,23.248C36.049,23.159 35.981,23.089 35.892,23.038C35.827,23.002 35.758,22.976 35.685,22.963C35.612,22.947 35.524,22.941 35.423,22.941L35.216,22.941L35.216,24.212L35.423,24.212C35.528,24.212 35.62,24.205 35.698,24.188C35.777,24.173 35.85,24.144 35.915,24.103C35.997,24.05 36.058,23.981 36.099,23.895C36.14,23.81 36.161,23.703 36.161,23.575ZM20.95,37.376L26.475,37.376L26.475,35.246L20.95,35.246L20.95,37.376ZM44.325,27.154L44.325,25.024L38.8,25.024L38.8,27.154L44.325,27.154ZM26.9,30.135L26.9,32.265L32.425,32.265L32.425,30.135L26.9,30.135ZM18.617,24.4L18.383,24.4L18.221,23.941L17.509,23.941L17.348,24.4L17.125,24.4L17.725,22.752L18.017,22.752L18.617,24.4ZM18.154,23.752L17.865,22.943L17.575,23.752L18.154,23.752ZM30.074,21.553L29.84,21.553L29.679,21.094L28.965,21.094L28.804,21.553L28.582,21.553L29.181,19.904L29.474,19.904L30.074,21.553ZM29.611,20.905L29.322,20.096L29.032,20.905L29.611,20.905ZM31.221,21.475C31.152,21.508 31.086,21.534 31.023,21.553C30.961,21.571 30.895,21.58 30.825,21.58C30.736,21.58 30.654,21.567 30.58,21.541C30.505,21.515 30.441,21.475 30.388,21.422C30.334,21.369 30.292,21.302 30.263,21.22C30.234,21.139 30.218,21.044 30.218,20.936C30.218,20.734 30.274,20.575 30.385,20.46C30.496,20.345 30.643,20.288 30.825,20.288C30.896,20.288 30.966,20.297 31.034,20.317C31.102,20.337 31.164,20.362 31.221,20.391L31.221,20.622L31.21,20.622C31.147,20.572 31.081,20.534 31.013,20.508C30.946,20.482 30.881,20.468 30.816,20.468C30.699,20.468 30.605,20.508 30.536,20.588C30.468,20.666 30.434,20.782 30.434,20.936C30.434,21.085 30.467,21.2 30.534,21.281C30.601,21.36 30.695,21.4 30.816,21.4C30.858,21.4 30.901,21.394 30.944,21.383C30.988,21.372 31.028,21.358 31.062,21.34C31.092,21.325 31.121,21.309 31.147,21.292C31.174,21.274 31.195,21.258 31.21,21.246L31.221,21.246L31.221,21.475ZM32.131,21.541C32.092,21.552 32.049,21.56 32.003,21.567C31.957,21.574 31.916,21.577 31.88,21.577C31.753,21.577 31.657,21.543 31.592,21.475C31.527,21.407 31.493,21.298 31.493,21.149L31.493,20.491L31.353,20.491L31.353,20.316L31.493,20.316L31.493,19.961L31.702,19.961L31.702,20.316L32.131,20.316L32.131,20.491L31.702,20.491L31.702,21.054C31.702,21.119 31.703,21.17 31.706,21.207C31.709,21.243 31.719,21.277 31.737,21.309C31.753,21.338 31.776,21.36 31.804,21.374C31.833,21.388 31.876,21.394 31.935,21.394C31.968,21.394 32.003,21.389 32.041,21.38C32.077,21.37 32.104,21.361 32.12,21.354L32.131,21.354L32.131,21.541ZM32.607,20.109L32.372,20.109L32.372,19.893L32.607,19.893L32.607,20.109ZM32.594,21.553L32.386,21.553L32.386,20.316L32.594,20.316L32.594,21.553ZM34.061,20.935C34.061,21.136 34.009,21.295 33.907,21.412C33.803,21.529 33.665,21.587 33.492,21.587C33.317,21.587 33.177,21.529 33.074,21.412C32.972,21.295 32.921,21.136 32.921,20.935C32.921,20.733 32.972,20.574 33.074,20.458C33.177,20.34 33.317,20.282 33.492,20.282C33.665,20.282 33.803,20.34 33.907,20.458C34.009,20.574 34.061,20.733 34.061,20.935ZM33.847,20.935C33.847,20.775 33.816,20.656 33.753,20.578C33.69,20.5 33.603,20.461 33.492,20.461C33.379,20.461 33.29,20.5 33.228,20.578C33.166,20.656 33.135,20.775 33.135,20.935C33.135,21.09 33.166,21.207 33.229,21.288C33.292,21.367 33.38,21.407 33.492,21.407C33.602,21.407 33.689,21.368 33.752,21.289C33.815,21.209 33.847,21.091 33.847,20.935ZM35.418,21.553L35.21,21.553L35.21,20.849C35.21,20.792 35.207,20.738 35.2,20.689C35.193,20.639 35.182,20.6 35.164,20.572C35.145,20.541 35.119,20.518 35.084,20.504C35.049,20.487 35.005,20.48 34.949,20.48C34.893,20.48 34.833,20.494 34.771,20.522C34.709,20.55 34.649,20.586 34.592,20.629L34.592,21.553L34.384,21.553L34.384,20.316L34.592,20.316L34.592,20.453C34.658,20.4 34.725,20.357 34.794,20.328C34.864,20.297 34.934,20.282 35.007,20.282C35.142,20.282 35.243,20.322 35.313,20.402C35.383,20.483 35.418,20.599 35.418,20.75L35.418,21.553Z"/>+ <path d="M43,5L54,16L43,16L43,5Z" style="fill:#393626;"/>+ <path d="M25.552,51.071L24.022,51.071L22.443,48.246C22.396,48.16 22.344,48.038 22.287,47.881L22.265,47.881C22.233,47.959 22.179,48.081 22.104,48.246L20.477,51.071L18.935,51.071L21.46,47.198L19.139,43.369L20.702,43.369L22.094,45.968C22.183,46.14 22.264,46.312 22.335,46.484L22.351,46.484C22.455,46.259 22.545,46.079 22.62,45.947L24.065,43.369L25.504,43.369L23.13,47.188L25.552,51.071ZM26.605,51.071L26.605,43.369L28.829,43.369C31.668,43.369 33.088,44.62 33.088,47.123C33.088,48.312 32.694,49.267 31.907,49.989C31.119,50.71 30.062,51.071 28.738,51.071L26.605,51.071ZM27.878,44.454L27.878,49.991L28.899,49.991C29.797,49.991 30.497,49.744 30.996,49.25C31.496,48.756 31.745,48.058 31.745,47.155C31.745,45.354 30.813,44.454 28.947,44.454L27.878,44.454ZM38.99,44.454L36.777,44.454L36.777,51.071L35.499,51.071L35.499,44.454L33.291,44.454L33.291,43.369L38.99,43.369L38.99,44.454ZM39.764,50.765L39.764,49.449C39.882,49.556 40.023,49.653 40.186,49.739C40.349,49.825 40.522,49.897 40.704,49.956C40.887,50.016 41.069,50.061 41.252,50.093C41.435,50.126 41.603,50.142 41.757,50.142C42.294,50.142 42.694,50.052 42.957,49.873C43.22,49.694 43.352,49.435 43.352,49.094C43.352,48.912 43.308,48.753 43.22,48.619C43.133,48.485 43.01,48.362 42.853,48.251C42.695,48.14 42.51,48.034 42.297,47.932C42.084,47.83 41.855,47.723 41.612,47.612C41.35,47.472 41.107,47.331 40.881,47.188C40.656,47.044 40.46,46.886 40.293,46.712C40.127,46.539 39.996,46.343 39.901,46.124C39.806,45.906 39.759,45.65 39.759,45.356C39.759,44.995 39.84,44.68 40.003,44.414C40.166,44.147 40.381,43.927 40.648,43.753C40.915,43.579 41.218,43.45 41.558,43.366C41.898,43.282 42.246,43.24 42.6,43.24C43.406,43.24 43.993,43.331 44.362,43.514L44.362,44.776C43.925,44.461 43.363,44.303 42.675,44.303C42.486,44.303 42.297,44.321 42.109,44.357C41.921,44.393 41.752,44.452 41.604,44.534C41.455,44.617 41.334,44.722 41.241,44.851C41.148,44.98 41.102,45.136 41.102,45.319C41.102,45.49 41.137,45.639 41.209,45.764C41.281,45.89 41.385,46.004 41.523,46.108C41.661,46.212 41.829,46.313 42.028,46.412C42.227,46.51 42.457,46.617 42.718,46.731C42.987,46.871 43.24,47.018 43.478,47.172C43.716,47.326 43.926,47.496 44.107,47.682C44.288,47.868 44.431,48.075 44.536,48.302C44.642,48.53 44.695,48.788 44.695,49.078C44.695,49.469 44.616,49.798 44.459,50.067C44.301,50.335 44.089,50.554 43.822,50.722C43.555,50.89 43.248,51.012 42.901,51.087C42.554,51.162 42.187,51.2 41.8,51.2C41.671,51.2 41.512,51.19 41.324,51.17C41.137,51.151 40.944,51.122 40.747,51.084C40.55,51.047 40.364,51.001 40.189,50.947C40.013,50.894 39.872,50.833 39.764,50.765Z" style="fill:#393939;"/>+</svg>diff --git a/toonz/sources/toonz/icons/dark/misc/opentoonz_logo.svg b/toonz/sources/toonz/icons/dark/misc/opentoonz_logo.svgnew file mode 100644index 000000000..6f4c6f032--- /dev/null+++ b/toonz/sources/toonz/icons/dark/misc/opentoonz_logo.svg@@ -0,0 +1,41 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 315 77" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <g transform="matrix(1,0,0,1,-147.2,-124.4)">+ <g>+ <g transform="matrix(1,0,0,1,147.2,124.4)">+ <rect x="0" y="0" width="315" height="77" style="fill-opacity:0;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M185.8,163C191.2,163 195.8,161.1 199.5,157.4C203.2,153.7 205.1,149.1 205.1,143.7C205.1,138.3 203.2,133.7 199.5,130C195.8,126.3 191.1,124.4 185.6,124.4C182.2,124.4 179,125.3 176,127C173.1,128.7 170.7,131.1 169,134.1C167.3,137.1 166.4,140.4 166.4,143.9C166.4,149.2 168.3,153.7 172,157.4C175.8,161.1 180.4,163 185.8,163ZM174,136.8C175.2,134.7 176.9,133 179,131.8C181.1,130.6 183.4,129.9 185.7,129.9C188.1,129.9 190.4,130.5 192.5,131.8C194.6,133 196.3,134.7 197.5,136.7C198.7,138.7 199.3,141.1 199.3,143.6C199.3,146.2 198.7,148.5 197.5,150.6C196.3,152.7 194.7,154.3 192.6,155.5C190.5,156.7 188.2,157.3 185.7,157.3C181.9,157.3 178.8,156 176.2,153.4C173.5,150.8 172.3,147.6 172.3,143.8C172.2,141.3 172.8,138.9 174,136.8Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M257.4,162.8C259.4,162.8 261.2,162.5 262.9,161.9C264.5,161.3 266,160.4 267.3,159.2C268.6,158 269.7,156.5 270.7,154.6L271.2,153.6L271,153.5L265,153.5C264.4,154.3 263.9,155 263.4,155.4C262.6,156.1 261.7,156.6 260.6,157C259.5,157.4 258.3,157.6 257.2,157.6C254.8,157.6 252.8,156.8 251.2,155.1C249.8,153.6 249,151.9 248.7,149.7L271.7,149.7L271.7,148.6C271.7,144.9 270.6,141.7 268.6,139.2C265.8,135.6 262,133.8 257.3,133.8C252.7,133.8 249,135.6 246.3,139.1C244.2,141.8 243.1,145 243.1,148.5C243.1,152.2 244.4,155.6 246.9,158.5C249.3,161.2 252.9,162.8 257.4,162.8ZM251.5,141.1C253.1,139.7 255,139 257.2,139C258.6,139 259.9,139.3 261.1,139.9C262.3,140.5 263.3,141.2 264,142.1C264.5,142.7 264.9,143.5 265.3,144.5L249.3,144.5C249.9,143.1 250.7,141.9 251.5,141.1Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M281.8,151.6C281.8,148.3 281.9,146.1 282.2,144.9C282.6,143.2 283.5,141.8 285,140.6C286.4,139.4 287.9,138.9 289.6,138.9C291.1,138.9 292.3,139.3 293.1,139.9C294,140.6 294.6,141.6 294.9,143.1C295.1,143.7 295.2,145.2 295.2,148.7L295.2,162L300.7,162L300.7,147.7C300.7,144 300.3,141.4 299.6,139.6C298.8,137.8 297.6,136.3 295.9,135.2C294.2,134.1 292.3,133.6 290.2,133.6C288.1,133.6 286.2,134.1 284.4,135C283.4,135.5 282.5,136.2 281.7,137L281.7,134.2L276.2,134.2L276.2,162L281.7,162L281.8,151.6Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M310.4,162.1L316.2,162.1L316.2,130.9L328.1,130.9L328.1,125.3L298.5,125.3L298.5,130.9L310.4,130.9L310.4,162.1Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M328.1,158.4C330.8,161.3 334.3,162.8 338.5,162.8C342.7,162.8 346.2,161.3 348.9,158.4C351.6,155.5 352.9,152.1 352.9,148.3C352.9,144.5 351.6,141.1 349.1,138.3C346.3,135.2 342.7,133.7 338.5,133.7C334.2,133.7 330.6,135.3 327.8,138.4C325.3,141.2 324,144.6 324,148.4C324,152.1 325.4,155.5 328.1,158.4ZM332.2,141.8C334,140 336,139.1 338.5,139.1C340.9,139.1 343,140 344.8,141.8C346.6,143.6 347.4,145.8 347.4,148.4C347.4,150 347,151.6 346.2,153C345.4,154.4 344.3,155.5 343,156.3C341.6,157.1 340.1,157.5 338.5,157.5C336.9,157.5 335.4,157.1 334,156.3C332.7,155.5 331.6,154.4 330.8,153C330,151.6 329.6,150 329.6,148.4C329.6,145.7 330.5,143.6 332.2,141.8Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M370.9,162.8C375.1,162.8 378.6,161.3 381.3,158.4C384,155.5 385.3,152.1 385.3,148.3C385.3,144.5 384,141.1 381.5,138.3C378.7,135.2 375.1,133.7 370.9,133.7C366.6,133.7 363,135.3 360.3,138.4C357.8,141.2 356.5,144.6 356.5,148.4C356.5,152.2 357.9,155.7 360.5,158.5C363.2,161.3 366.7,162.8 370.9,162.8ZM364.6,141.8C366.4,140 368.4,139.1 370.9,139.1C373.3,139.1 375.4,140 377.2,141.8C379,143.6 379.8,145.8 379.8,148.4C379.8,150 379.4,151.6 378.6,153C377.8,154.4 376.7,155.5 375.4,156.3C374,157.1 372.5,157.5 370.9,157.5C369.3,157.5 367.8,157.1 366.4,156.3C365.1,155.5 364,154.4 363.2,153C362.4,151.6 362,150 362,148.4C362,145.7 362.9,143.6 364.6,141.8Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M394.7,151.6C394.7,148.3 394.8,146.1 395.1,144.9C395.5,143.2 396.4,141.8 397.9,140.6C399.3,139.4 400.8,138.9 402.5,138.9C404,138.9 405.2,139.3 406,139.9C406.9,140.6 407.5,141.6 407.8,143.1C408,143.7 408.1,145.2 408.1,148.7L408.1,162L413.6,162L413.6,147.7C413.6,144 413.2,141.4 412.5,139.6C411.7,137.8 410.5,136.3 408.8,135.2C407.1,134.1 405.2,133.6 403.1,133.6C401,133.6 399.1,134.1 397.3,135C396.3,135.5 395.4,136.2 394.6,137L394.6,134.2L389.1,134.2L389.1,162L394.6,162L394.7,151.6Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M439.9,162.1L439.9,157L426.8,157L441.3,134.3L419.3,134.3L419.3,139.4L431.5,139.4L417,162.1L439.9,162.1Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M212.9,185.7L215.5,175.7L215.5,159.4C216.4,160.2 217.5,160.9 218.5,161.4C220.4,162.3 222.4,162.8 224.6,162.8C228.5,162.8 231.9,161.4 234.7,158.5C237.5,155.7 238.9,152.2 238.9,148.1C238.9,144.1 237.5,140.7 234.7,137.9C231.9,135.1 228.5,133.6 224.6,133.6C222.3,133.6 220.3,134.1 218.4,135.1C217.4,135.6 216.4,136.3 215.5,137.2L215.5,134.3L210,134.3L210,175.7L212.9,185.7ZM217.9,141.7C219.6,139.9 221.7,139.1 224.3,139.1C225.9,139.1 227.4,139.5 228.8,140.3C230.2,141.1 231.3,142.2 232.1,143.7C232.9,145.2 233.3,146.7 233.3,148.3C233.3,149.9 232.9,151.5 232.1,152.9C231.3,154.4 230.2,155.5 228.8,156.3C227.4,157.1 226,157.5 224.4,157.5C222.8,157.5 221.3,157.1 219.8,156.3C218.4,155.5 217.3,154.4 216.5,153C215.7,151.6 215.3,150 215.3,148.3C215.3,145.6 216.1,143.5 217.9,141.7ZM214.6,175.7L213.5,180L212.2,180L211,175.7L214.6,175.7Z" style="fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(0.8599,0,0,0.8599,42.6463,22.8222)">+ <path d="M461.6,189.7L452.2,180.3C452.6,179.6 456.2,172.7 452.6,164.9C450.6,167.3 447.5,169.5 443.5,171.5L440.6,168.6L422.9,168.6C422.6,167.5 421.1,166.6 419.4,166.6L409,166.6C407.2,166.6 405.8,167.5 405.5,168.6L308.5,168.6C308.2,167.1 306.3,166 304.1,165.9L303.9,165.9C301.6,166 299.8,167.1 299.5,168.6L221.8,168.6L221.8,170.8L300.6,170.8L300.6,173.3L307.5,173.3L307.5,170.8L406.8,170.8L406.8,172.6L421.9,172.6L421.9,170.8L439.9,170.8L441.6,172.5C414.2,185.1 354.7,189.7 353.2,189.9L150.7,189.9L170.5,170.7L187.3,170.7L187.3,172.6L202.4,172.6L202.4,170.6L203.6,170.6L203.6,169C203.6,167.7 202,166.6 200,166.6L189.7,166.6C188,166.6 186.6,167.4 186.2,168.5L169.4,168.5L147.2,189.9L147.2,201.4L461.5,201.4L461.6,189.7ZM306.5,170.1L306.5,172.5L301.3,172.5L301.3,170.1C301.3,169.5 301.8,169 302.5,168.7C302.6,168.7 302.7,168.6 302.9,168.6C303.2,168.5 303.6,168.5 303.9,168.4C304.3,168.4 304.6,168.5 304.9,168.6C305,168.6 305.1,168.7 305.3,168.7C306,169 306.5,169.5 306.5,170.1ZM421,170.5L421,171.9L407.4,171.9L407.4,169.7C407.4,169.2 408.1,168.8 408.9,168.7L419.6,168.7C420.4,168.8 421.1,169.2 421.1,169.7L421.1,170.5L421,170.5ZM188.1,170.7L188.1,169.7C188.1,169.2 188.8,168.8 189.6,168.7L200.3,168.7C201.1,168.8 201.8,169.2 201.8,169.7L201.8,171.9L188.2,171.9L188.2,170.7L188.1,170.7ZM396,186.9C417.1,183.4 432.9,179.1 443.1,174.3C443.8,174 444.5,173.6 445.2,173.3C447.8,171.9 450,170.5 451.7,169.1C452.6,173.5 451.3,177.3 450.6,178.7C450.6,178.8 450.5,178.9 450.5,179C449.8,179.2 449.1,179.4 448.4,179.7C435.5,183.5 411.9,186.1 391.2,187.7C392.8,187.4 394.4,187.1 396,186.9ZM450.1,181.4L458.6,190L390,190C411.8,188.3 437,185.5 450.1,181.4ZM459.3,199.2L149.5,199.2L149.5,196.8L459.3,196.8L459.3,199.2ZM459.3,194.6L149.5,194.6L149.5,192.2L459.3,192.2L459.3,194.6Z" style="fill-rule:nonzero;"/>+ </g>+ </g>+ </g>+</svg>diff --git a/toonz/sources/toonz/icons/dark/misc/startup.png b/toonz/sources/toonz/icons/dark/misc/startup.pngdeleted file mode 100644index 9a541267f..000000000Binary files a/toonz/sources/toonz/icons/dark/misc/startup.png and /dev/null differdiff --git a/toonz/sources/toonz/icons/light/index.theme b/toonz/sources/toonz/icons/light/index.themedeleted file mode 100644index 03245f72e..000000000--- a/toonz/sources/toonz/icons/light/index.theme+++ /dev/null@@ -1,66 +0,0 @@-[Icon Theme]-Name=light-Comment=a light icon set for use in dark themes-Inherits=dark--Directories=actions/11,actions/15,actions/16,actions/18,actions/20,actions/30,actions/35,actions/48,actions/60,actions/74,console/20,tools/18,tools/20,devices/20--[actions/11]-Size=11-Type=Scalable--[actions/15]-Size=15-Type=Scalable--[actions/16]-Size=16-Type=Scalable--[actions/18]-Size=18-Type=Scalable--[actions/20]-Size=20-Type=Scalable--[actions/30]-Size=30-Type=Scalable--[actions/35]-Size=35-Type=Scalable--[actions/48]-Size=48-Type=Scalable--[actions/60]-Size=60-Type=Scalable--[actions/74]-Size=74-Type=Scalable--[console/20]-Size=20-Type=Scalable--[tools/18]-Size=18-Type=Scalabe--[tools/20]-Size=20-Type=Scalabe--[devices/20]-Size=20-Type=Scalable--[mimetypes/60]-Size=60-Type=Scalablediff --git a/toonz/sources/toonz/icons/light/misc/startup.png b/toonz/sources/toonz/icons/light/misc/startup.pngdeleted file mode 100644index 8a5e60228..000000000Binary files a/toonz/sources/toonz/icons/light/misc/startup.png and /dev/null differdiff --git a/toonz/sources/toonz/layerfooterpanel.cpp b/toonz/sources/toonz/layerfooterpanel.cppindex 660444ffb..e424e196b 100644--- a/toonz/sources/toonz/layerfooterpanel.cpp+++ b/toonz/sources/toonz/layerfooterpanel.cpp@@ -84,17 +84,13 @@ void LayerFooterPanel::paintEvent(QPaintEvent *event) {QRect sliderObjRect = o->rect(PredefinedRect::ZOOM_SLIDER);m_frameZoomSlider->setGeometry(sliderObjRect);- static QPixmap zoomIn =- recolorPixmap(svgToPixmap(getIconThemePath("actions/15/zoom_in.svg")));- static QPixmap zoomInRollover = recolorPixmap(- svgToPixmap(getIconThemePath("actions/15/zoom_in_rollover.svg")));- const QRect zoomInImgRect = o->rect(PredefinedRect::ZOOM_IN);-- static QPixmap zoomOut =- recolorPixmap(svgToPixmap(getIconThemePath("actions/15/zoom_out.svg")));- static QPixmap zoomOutRollover = recolorPixmap(- svgToPixmap(getIconThemePath("actions/15/zoom_out_rollover.svg")));- const QRect zoomOutImgRect = o->rect(PredefinedRect::ZOOM_OUT);+ static QPixmap zoomIn = generateIconPixmap("zoom_in");+ static QPixmap zoomInRollover = generateIconPixmap("zoom_in_rollover");+ const QRect zoomInImgRect = o->rect(PredefinedRect::ZOOM_IN);++ static QPixmap zoomOut = generateIconPixmap("zoom_out");+ static QPixmap zoomOutRollover = generateIconPixmap("zoom_out_rollover");+ const QRect zoomOutImgRect = o->rect(PredefinedRect::ZOOM_OUT);p.setRenderHint(QPainter::SmoothPixmapTransform, true);if (m_zoomInHighlighted)diff --git a/toonz/sources/toonz/layerheaderpanel.cpp b/toonz/sources/toonz/layerheaderpanel.cppindex b188fb6ad..84564d2b5 100644--- a/toonz/sources/toonz/layerheaderpanel.cpp+++ b/toonz/sources/toonz/layerheaderpanel.cpp@@ -2,6 +2,7 @@#include <QPainter>#include <QToolTip>+#include <QToolButton>#include "xsheetviewer.h"#include "xshcolumnviewer.h"@@ -12,200 +13,80 @@#include "toonz/tobjecthandle.h"#include "toonz/preferences.h"+#include "../include/toonzqt/gutil.h"using XsheetGUI::ColumnArea;LayerHeaderPanel::LayerHeaderPanel(XsheetViewer *viewer, QWidget *parent,Qt::WindowFlags flags): QWidget(parent, flags), m_viewer(viewer) {- const Orientation *o = Orientations::leftToRight();- QRect rect = o->rect(PredefinedRect::LAYER_HEADER_PANEL);-+ QHBoxLayout *layout = new QHBoxLayout(this);setObjectName("layerHeaderPanel");- setFixedSize(rect.size());- setMouseTracking(true);-}--LayerHeaderPanel::~LayerHeaderPanel() {}--namespace {--QColor mix(const QColor &a, const QColor &b, double w) {- return QColor(a.red() * w + b.red() * (1 - w),- a.green() * w + b.green() * (1 - w),- a.blue() * w + b.blue() * (1 - w));-}--QColor withAlpha(const QColor &color, double alpha) {- QColor result(color);- result.setAlpha(alpha * 255);- return result;-}--QRect shorter(const QRect original) { return original.adjusted(0, 2, 0, -2); }--QLine leftSide(const QRect &r) { return QLine(r.topLeft(), r.bottomLeft()); }--QLine rightSide(const QRect &r) { return QLine(r.topRight(), r.bottomRight()); }-} // namespace--void LayerHeaderPanel::paintEvent(QPaintEvent *event) {- QPainter p(this);- p.setRenderHint(QPainter::SmoothPixmapTransform, true);-- const Orientation *o = Orientations::leftToRight();-- QImage preview = (m_buttonHighlighted == PreviewButton- ? m_viewer->getLayerHeaderPreviewOverImage()- : m_viewer->getLayerHeaderPreviewImage());- QImage camstand = (m_buttonHighlighted == CamstandButton- ? m_viewer->getLayerHeaderCamstandOverImage()- : m_viewer->getLayerHeaderCamstandImage());- QImage lock = (m_buttonHighlighted == LockButton- ? m_viewer->getLayerHeaderLockOverImage()- : m_viewer->getLayerHeaderLockImage());-- drawIcon(p, PredefinedRect::PANEL_EYE, boost::none, preview);- if (!Preferences::instance()->isUnifyColumnVisibilityTogglesEnabled())- drawIcon(p, PredefinedRect::PANEL_PREVIEW_LAYER, boost::none, camstand);- drawIcon(p, PredefinedRect::PANEL_LOCK, boost::none, lock);-}--void LayerHeaderPanel::drawIcon(QPainter &p, PredefinedRect rect,- optional<QColor> fill,- const QImage &image) const {- QRect iconRect =- Orientations::leftToRight()->rect(rect).adjusted(-2, 0, -2, 0);-- if (fill) p.fillRect(iconRect, *fill);- p.drawImage(iconRect, image);-}--void LayerHeaderPanel::drawLines(QPainter &p, const QRect &numberRect,- const QRect &nameRect) const {- p.setPen(withAlpha(m_viewer->getTextColor(), 0.5));-- QLine line = {leftSide(shorter(numberRect)).translated(-2, 0)};- p.drawLine(line);-- if (Preferences::instance()->isShowColumnNumbersEnabled()) {- line = rightSide(shorter(numberRect)).translated(-2, 0);- p.drawLine(line);+ layout->setContentsMargins(0, 0, 0, 0);+ layout->setSpacing(0);++ m_previewButton = new QToolButton(this);+ m_camstandButton = new QToolButton(this);+ m_lockButton = new QToolButton(this);++ // Define style and icon size for all buttons+ QString buttonStyleSheet =+ "QToolButton { padding: 0px; margin: 0px; }";+ QSize iconSize(16, 16);+ QSize buttonSize(20, 20);++ QList<QToolButton *> buttonList = {m_previewButton, m_camstandButton,+ m_lockButton};++ for (auto &button : buttonList) {+ button->setStyleSheet(buttonStyleSheet);+ button->setIconSize(iconSize);+ button->setFixedSize(buttonSize);}-- line = rightSide(shorter(nameRect));- p.drawLine(line);++ m_previewButton->setIcon(createQIcon("preview"));+ m_camstandButton->setIcon(createQIcon("table"));+ m_lockButton->setIcon(createQIcon("lock_on"));++ connect(m_previewButton, &QToolButton::clicked, this,+ &LayerHeaderPanel::onPreviewClicked);+ connect(m_camstandButton, &QToolButton::clicked, this,+ &LayerHeaderPanel::onCamstandClicked);+ connect(m_lockButton, &QToolButton::clicked, this,+ &LayerHeaderPanel::onLockClicked);++ // Add widgets to the layout+ layout->addWidget(m_previewButton);+ layout->addWidget(m_camstandButton);+ layout->addWidget(m_lockButton);+ layout->addStretch();++ setLayout(layout);}-void LayerHeaderPanel::showOrHide(const Orientation *o) {- QRect rect = o->rect(PredefinedRect::LAYER_HEADER_PANEL);- if (rect.isEmpty())- hide();- else- show();-}--//------------------------------------------------------------------------------void LayerHeaderPanel::enterEvent(QEvent *) {- m_buttonHighlighted = NoButton;-- update();-}--void LayerHeaderPanel::leaveEvent(QEvent *) {- m_buttonHighlighted = NoButton;-- update();-}--void LayerHeaderPanel::mousePressEvent(QMouseEvent *event) {- const Orientation *o = Orientations::leftToRight();-- m_doOnRelease = 0;-- if (event->button() == Qt::LeftButton) {- // get mouse position- QPoint pos = event->pos();-- // preview button- if (o->rect(PredefinedRect::EYE_AREA).contains(pos)) {- m_doOnRelease = ToggleAllPreviewVisible;- }- // camstand button- else if (o->rect(PredefinedRect::PREVIEW_LAYER_AREA).contains(pos)) {- m_doOnRelease = ToggleAllTransparency;- }- // lock button- else if (o->rect(PredefinedRect::LOCK_AREA).contains(pos)) {- m_doOnRelease = ToggleAllLock;- }- }-- update();-}--void LayerHeaderPanel::mouseMoveEvent(QMouseEvent *event) {- const Orientation *o = Orientations::leftToRight();-- QPoint pos = event->pos();- m_buttonHighlighted = NoButton;-- // preview button- if (o->rect(PredefinedRect::EYE_AREA).contains(pos)) {- m_tooltip = tr("Preview Visibility Toggle All");- m_buttonHighlighted = PreviewButton;- }- // camstand button- else if (o->rect(PredefinedRect::PREVIEW_LAYER_AREA).contains(pos)) {- m_tooltip = tr("Camera Stand Visibility Toggle All");- m_buttonHighlighted = CamstandButton;- }- // lock button- else if (o->rect(PredefinedRect::LOCK).contains(pos)) {- m_tooltip = tr("Lock Toggle All");- m_buttonHighlighted = LockButton;- } else {- m_tooltip = tr("");- }-- m_pos = pos;-- update();-}--//-------------------------------------------------------------------------------bool LayerHeaderPanel::event(QEvent *event) {- if (event->type() == QEvent::ToolTip) {- if (!m_tooltip.isEmpty())- QToolTip::showText(mapToGlobal(m_pos), m_tooltip);- else- QToolTip::hideText();- }- return QWidget::event(event);-}+LayerHeaderPanel::~LayerHeaderPanel() {}//------------------------------------------------------------------------------void LayerHeaderPanel::mouseReleaseEvent(QMouseEvent *event) {+void LayerHeaderPanel::toggleColumnVisibility(int visibilityFlag) {TApp *app = TApp::instance();TXsheet *xsh = m_viewer->getXsheet();int col, totcols = xsh->getColumnCount();bool sound_changed = false;- if (m_doOnRelease != 0 && totcols > 0) {+ if (totcols > 0) {int startCol =Preferences::instance()->isXsheetCameraColumnVisible() ? -1 : 0;for (col = startCol; col < totcols; col++) {if (startCol < 0 || !xsh->isColumnEmpty(col)) {TXshColumn *column = xsh->getColumn(col);- if (m_doOnRelease == ToggleAllPreviewVisible) {+ if (visibilityFlag == ToggleAllPreviewVisible) {column->setPreviewVisible(!column->isPreviewVisible());- } else if (m_doOnRelease == ToggleAllTransparency) {+ } else if (visibilityFlag == ToggleAllTransparency) {column->setCamstandVisible(!column->isCamstandVisible());if (column->getSoundColumn()) sound_changed = true;- } else if (m_doOnRelease == ToggleAllLock) {+ } else if (visibilityFlag == ToggleAllLock) {column->lock(!column->isLocked());}}@@ -220,5 +101,28 @@ void LayerHeaderPanel::mouseReleaseEvent(QMouseEvent *event) {}m_viewer->updateColumnArea();update();- m_doOnRelease = 0;+}++//-----------------------------------------------------------------------------++void LayerHeaderPanel::onPreviewClicked() {+ toggleColumnVisibility(ToggleAllPreviewVisible);+}++void LayerHeaderPanel::onCamstandClicked() {+ toggleColumnVisibility(ToggleAllTransparency);+}++void LayerHeaderPanel::onLockClicked() {+ toggleColumnVisibility(ToggleAllLock);+}++//-----------------------------------------------------------------------------++void LayerHeaderPanel::showOrHide(const Orientation *o) {+ QRect rect = o->rect(PredefinedRect::LAYER_HEADER_PANEL);+ if (rect.isEmpty())+ hide();+ else+ show();}diff --git a/toonz/sources/toonz/layerheaderpanel.h b/toonz/sources/toonz/layerheaderpanel.hindex 110fa5c9a..926b6a8cb 100644--- a/toonz/sources/toonz/layerheaderpanel.h+++ b/toonz/sources/toonz/layerheaderpanel.h@@ -4,6 +4,7 @@#define LAYER_HEADER_PANEL_INCLUDED#include <QWidget>+#include <QToolButton>#include <boost/optional.hpp>#include "orientation.h"@@ -18,38 +19,27 @@ class LayerHeaderPanel final : public QWidget {enum { ToggleAllTransparency = 1, ToggleAllPreviewVisible, ToggleAllLock };- enum { NoButton, PreviewButton, CamstandButton, LockButton };+public:+ void toggleColumnVisibility(int visibilityFlag);- int m_doOnRelease;- QString m_tooltip;- QPoint m_pos;- int m_buttonHighlighted;+ QToolButton *m_previewButton;+ QToolButton *m_camstandButton;+ QToolButton *m_lockButton;private:XsheetViewer *m_viewer;public:- LayerHeaderPanel(XsheetViewer *viewer, QWidget *parent = 0,- Qt::WindowFlags flags = 0);+ LayerHeaderPanel(XsheetViewer *viewer, QWidget *parent = nullptr,+ Qt::WindowFlags flags = Qt::WindowFlags());~LayerHeaderPanel();void showOrHide(const Orientation *o);-protected:- void paintEvent(QPaintEvent *event) override;-- void mousePressEvent(QMouseEvent *event) override;- void mouseMoveEvent(QMouseEvent *event) override;- void mouseReleaseEvent(QMouseEvent *event) override;- void enterEvent(QEvent *) override;- void leaveEvent(QEvent *) override;- bool event(QEvent *event) override;--private:- void drawIcon(QPainter &p, PredefinedRect rect, optional<QColor> fill,- const QImage &image) const;- void drawLines(QPainter &p, const QRect &numberRect,- const QRect &nameRect) const;+public slots:+ void onPreviewClicked();+ void onCamstandClicked();+ void onLockClicked();};-#endif+#endif\ No newline at end of filediff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cppindex b7dc6fec8..68671ba4e 100644--- a/toonz/sources/toonz/main.cpp+++ b/toonz/sources/toonz/main.cpp@@ -256,6 +256,9 @@ int main(int argc, char *argv[]) {}#endif+ // Build icon map+ ThemeManager::getInstance().buildIconPathsMap(":/icons");+// Install signal handlers to catch crashesCrashHandler::install();@@ -410,6 +413,7 @@ int main(int argc, char *argv[]) {#endif#ifdef _WIN32+ // BUG_WORKAROUND: #20230627// This attribute is set to make menubar icon to be always (16 x devPixRatio).// Without this attribute the menu bar icon size becomes the same as tool bar// when Windows scale is in 125%. Currently hiding the menu bar icon is done@@ -435,11 +439,6 @@ int main(int argc, char *argv[]) {}#endif- // Set icon theme search paths- QStringList themeSearchPathsList = {":/icons"};- QIcon::setThemeSearchPaths(themeSearchPathsList);- // qDebug() << "All icon theme search paths:" << QIcon::themeSearchPaths();-// Set show icons in menus flag (use iconVisibleInMenu to disable selectively)QApplication::instance()->setAttribute(Qt::AA_DontShowIconsInMenus, false);@@ -621,11 +620,6 @@ int main(int argc, char *argv[]) {Qt::white);a.processEvents();- // Set default start icon theme- QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark"- : "light");- // qDebug() << "Icon theme name:" << QIcon::themeName();-// stileQApplication::setStyle("windows");diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cppindex 505a8b2b9..821c8df22 100644--- a/toonz/sources/toonz/mainwindow.cpp+++ b/toonz/sources/toonz/mainwindow.cpp@@ -1408,6 +1408,7 @@ QAction *MainWindow::createAction(const char *id, const char *name,action->setIconVisibleInMenu(visible);#endif+ // BUG_WORKAROUND: #20230627// In Qt5.15.2 - Windows, QMenu stylesheet has alignment issue when one item// has icon and another has not one. (See// https://bugreports.qt.io/browse/QTBUG-90242 for details.) To avoid the@@ -1611,11 +1612,15 @@ QAction *MainWindow::createMiscAction(const char *id, const char *name,//-----------------------------------------------------------------------------QAction *MainWindow::createToolOptionsAction(const char *id, const char *name,- const QString &defaultShortcut) {+ const QString &defaultShortcut,+ const char *iconSVGName) {QAction *action = new DVAction(tr(name), this);+ if (iconSVGName && *iconSVGName)+ action->setIcon(createQIcon(iconSVGName, false, true));addAction(action);CommandManager::instance()->define(id, ToolModifierCommandType,- defaultShortcut.toStdString(), action);+ defaultShortcut.toStdString(), action,+ iconSVGName);return action;}@@ -1950,7 +1955,7 @@ void MainWindow::defineActions() {createMenuXsheetAction(MI_MergeColumns, QT_TR_NOOP("&Merge Levels"), "","merge_levels");createMenuXsheetAction(MI_InsertFx, QT_TR_NOOP("&New FX..."), "Ctrl+F",- "fx_new");+ "fx_logo");createMenuXsheetAction(MI_NewOutputFx, QT_TR_NOOP("&New Output"), "Alt+O","output");createMenuXsheetAction(MI_InsertSceneFrame, QT_TR_NOOP("Insert Frame"), "",@@ -2170,8 +2175,7 @@ void MainWindow::defineActions() {createMenuWindowsAction(MI_OpenFileBrowser, QT_TR_NOOP("&File Browser"), "","filebrowser");createMenuWindowsAction(MI_OpenPreproductionBoard,- QT_TR_NOOP("&Preproduction Board"), "",- "scenebrowser");+ QT_TR_NOOP("&Preproduction Board"), "", "");createMenuWindowsAction(MI_OpenFileViewer, QT_TR_NOOP("&Flipbook"), "","flipbook");createMenuWindowsAction(MI_OpenFunctionEditor, QT_TR_NOOP("&Function Editor"),@@ -2476,7 +2480,8 @@ void MainWindow::defineActions() {createToolAction(T_Plastic, "plastic", QT_TR_NOOP("Plastic Tool"), "X");createToolAction(T_Ruler, "ruler", QT_TR_NOOP("Ruler Tool"), "");createToolAction(T_Finger, "finger", QT_TR_NOOP("Finger Tool"), "");- createToolAction(T_EditAssistants, "assistant", QT_TR_NOOP("Edit Assistants"), "");+ createToolAction(T_EditAssistants, "assistant", QT_TR_NOOP("Edit Assistants"),+ "");/*-- Animate tool + mode switching shortcuts --*/createAction(MI_EditNextMode, QT_TR_NOOP("Animate Tool - Next Mode"), "",@@ -2756,15 +2761,13 @@ void MainWindow::defineActions() {createToolOptionsAction("A_ToolOption_GeometricEdge",QT_TR_NOOP("Geometric Edge"), "");createToolOptionsAction("A_ToolOption_Mode", QT_TR_NOOP("Mode"), "");- menuAct = createToolOptionsAction("A_ToolOption_Mode:Areas",- QT_TR_NOOP("Mode - Areas"), "");- menuAct->setIcon(createQIcon("mode_areas"));- menuAct = createToolOptionsAction("A_ToolOption_Mode:Lines",- QT_TR_NOOP("Mode - Lines"), "");- menuAct->setIcon(createQIcon("mode_lines"));+ menuAct = createToolOptionsAction(+ "A_ToolOption_Mode:Areas", QT_TR_NOOP("Mode - Areas"), "", "mode_areas");+ menuAct = createToolOptionsAction(+ "A_ToolOption_Mode:Lines", QT_TR_NOOP("Mode - Lines"), "", "mode_lines");menuAct = createToolOptionsAction("A_ToolOption_Mode:Lines & Areas",- QT_TR_NOOP("Mode - Lines && Areas"), "");- menuAct->setIcon(createQIcon("mode_areas_lines"));+ QT_TR_NOOP("Mode - Lines && Areas"), "",+ "mode_areas_lines");createToolOptionsAction("A_ToolOption_Mode:Endpoint to Endpoint",QT_TR_NOOP("Mode - Endpoint to Endpoint"), "");createToolOptionsAction("A_ToolOption_Mode:Endpoint to Line",@@ -2773,29 +2776,24 @@ void MainWindow::defineActions() {QT_TR_NOOP("Mode - Line to Line"), "");createToolOptionsAction("A_ToolOption_Type", QT_TR_NOOP("Type"), "");- menuAct = createToolOptionsAction("A_ToolOption_Type:Normal",- QT_TR_NOOP("Type - Normal"), "");- menuAct->setIcon(createQIcon("type_normal"));-+ menuAct =+ createToolOptionsAction("A_ToolOption_Type:Normal",+ QT_TR_NOOP("Type - Normal"), "", "type_normal");menuAct = createToolOptionsAction("A_ToolOption_Type:Rectangular",- QT_TR_NOOP("Type - Rectangular"), "F5");- menuAct->setIcon(createQIcon("type_rectangular"));-- menuAct = createToolOptionsAction("A_ToolOption_Type:Freehand",- QT_TR_NOOP("Type - Freehand"), "");- menuAct->setIcon(createQIcon("type_lasso"));-+ QT_TR_NOOP("Type - Rectangular"), "F5",+ "type_rectangular");+ menuAct =+ createToolOptionsAction("A_ToolOption_Type:Freehand",+ QT_TR_NOOP("Type - Freehand"), "", "type_lasso");menuAct = createToolOptionsAction("A_ToolOption_Type:Polyline",- QT_TR_NOOP("Type - Polyline"), "");- menuAct->setIcon(createQIcon("type_polyline"));-+ QT_TR_NOOP("Type - Polyline"), "",+ "type_polyline");menuAct = createToolOptionsAction("A_ToolOption_Type:Freepick",- QT_TR_NOOP("Type - Pick+Freehand"), "");- menuAct->setIcon(createQIcon("type_pickerlasso"));-+ QT_TR_NOOP("Type - Pick+Freehand"), "",+ "type_pickerlasso");menuAct = createToolOptionsAction("A_ToolOption_Type:Segment",- QT_TR_NOOP("Type - Segment"), "");- menuAct->setIcon(createQIcon("type_erase_segment"));+ QT_TR_NOOP("Type - Segment"), "",+ "type_erase_segment");createToolOptionsAction("A_ToolOption_TypeFont", QT_TR_NOOP("TypeTool Font"),"");@@ -2854,7 +2852,7 @@ void MainWindow::defineActions() {menuAct =createToolOptionsAction("A_ToolOption_AutopaintLines",QT_TR_NOOP("Fill Tool - Autopaint Lines"), "");- menuAct->setIcon(createQIcon("fill_auto"));+ menuAct->setIcon(createQIcon("toggle_autofill"));createToolOptionsAction("A_ToolOption_FlipHorizontal",QT_TR_NOOP("Flip Selection/Object Horizontally"), "");@@ -2911,9 +2909,9 @@ void MainWindow::defineActions() {createVisualizationButtonAction(VB_ActualPixelSize, QT_TR_NOOP("Actual Pixel Size"), "actual_pixel_size");createVisualizationButtonAction(- VB_FlipX, QT_TR_NOOP("Flip Viewer Horizontally"), "fliphoriz_off");+ VB_FlipX, QT_TR_NOOP("Flip Viewer Horizontally"), "fliphoriz");createVisualizationButtonAction(- VB_FlipY, QT_TR_NOOP("Flip Viewer Vertically"), "flipvert_off");+ VB_FlipY, QT_TR_NOOP("Flip Viewer Vertically"), "flipvert");// Misc@@ -2926,7 +2924,6 @@ void MainWindow::defineActions() {menuAct =createMiscAction(MI_RefreshTree, QT_TR_NOOP("Refresh Folder Tree"), "");menuAct->setIconText(tr("Refresh"));- menuAct->setIcon(createQIcon("refresh", false, true));createMiscAction("A_FxSchematicToggle",QT_TR_NOOP("Toggle FX/Stage schematic"), "");diff --git a/toonz/sources/toonz/mainwindow.h b/toonz/sources/toonz/mainwindow.hindex f85d5c6b2..b7ecd87a1 100644--- a/toonz/sources/toonz/mainwindow.h+++ b/toonz/sources/toonz/mainwindow.h@@ -190,7 +190,7 @@ private:QAction *createMiscAction(const char *id, const char *name,const char *defaultShortcut);QAction *createToolOptionsAction(const char *id, const char *name,- const QString &defaultShortcut);+ const QString &defaultShortcut, const char *iconSVGName = "");QAction *createStopMotionAction(const char *id, const char *name,const QString &defaultShortcut,const char *iconSVGName = "");diff --git a/toonz/sources/toonz/pane.cpp b/toonz/sources/toonz/pane.cppindex 43e8f5b7d..2b8cc93f9 100644--- a/toonz/sources/toonz/pane.cpp+++ b/toonz/sources/toonz/pane.cpp@@ -246,6 +246,7 @@ TPanelTitleBarButton::TPanelTitleBarButton(QWidget *parent,, m_buttonSet(0), m_id(0) {setFixedSize(m_standardPixmap.size());+ QMap<QString, QPixmap> m_pixmaps;}//-----------------------------------------------------------------------------@@ -281,26 +282,52 @@ void TPanelTitleBarButton::setPressed(bool pressed) {//------------------------------------------------------------------------------void TPanelTitleBarButton::paintEvent(QPaintEvent *event) {- // Set unique pressed colors if filename contains the following words:- QColor bgColor = getPressedColor();- if (m_standardPixmapName.contains("freeze", Qt::CaseInsensitive))+void TPanelTitleBarButton::computePixmaps(const QString &standardPixmapName) {+ // Get background color used by some icons and states+ QColor bgColor;+ if (m_standardPixmapName.contains("freeze", Qt::CaseInsensitive)) {bgColor = getFreezeColor();- if (m_standardPixmapName.contains("preview", Qt::CaseInsensitive))+ } else if (m_standardPixmapName.contains("preview", Qt::CaseInsensitive)) {bgColor = getPreviewColor();+ } else {+ bgColor = getPressedColor();+ }- QPixmap panePixmap = recolorPixmap(svgToPixmap(m_standardPixmapName));- QPixmap panePixmapOff = compositePixmap(panePixmap, 0.8);- QPixmap panePixmapOver =- compositePixmap(panePixmap, 1, QSize(), 0, 0, getOverColor());- QPixmap panePixmapOn = compositePixmap(panePixmap, 1, QSize(), 0, 0, bgColor);+ ThemeManager &themeManager = ThemeManager::getInstance();+ const qreal offOpacity = themeManager.getOffOpacity();+ // Compute icon+ QImage baseImg = svgToImage(standardPixmapName);+ baseImg = themeManager.recolorBlackPixels(baseImg);+ QImage onImg = compositeImage(baseImg, QSize(), false, bgColor);+ QImage offImg = adjustImageOpacity(baseImg, offOpacity);+ QImage overImg = compositeImage(baseImg, QSize(), false, getOverColor());++ // Add to cache+ m_pixmaps[standardPixmapName + "_on"] = convertImageToPixmap(onImg);+ m_pixmaps[standardPixmapName + "_off"] = convertImageToPixmap(offImg);+ m_pixmaps[standardPixmapName + "_over"] = convertImageToPixmap(overImg);+}++//-----------------------------------------------------------------------------++void TPanelTitleBarButton::paintEvent(QPaintEvent *event) {+ // Note: For some reason unless m_standardPixmapName is a valid path to+ // something in Qt resources (.qrc) this event will fail to be called. So+ // passing a string like a base name will not work, for now we must use+ // absolute paths when making TPanelTitleBarButtons.++ // Compute pixmaps if cache is empty+ if (!m_pixmaps.contains(m_standardPixmapName + "_off")) {+ computePixmaps(m_standardPixmapName);+ }++ // Use cahced pixmapsQPainter painter(this);painter.drawPixmap(0, 0,- m_pressed ? panePixmapOn- : m_rollover ? panePixmapOver- : panePixmapOff);- painter.end();+ m_pressed ? m_pixmaps[m_standardPixmapName + "_on"]+ : m_rollover ? m_pixmaps[m_standardPixmapName + "_over"]+ : m_pixmaps[m_standardPixmapName + "_off"]);}//-----------------------------------------------------------------------------@@ -501,6 +528,36 @@ QSize TPanelTitleBar::minimumSizeHint() const { return QSize(20, 18); }//-----------------------------------------------------------------------------+// Cache close button image+QPixmap TPanelTitleBar::getPixmap(const QString &iconSVGName, bool rollover) {+ if (!m_pixmaps.contains(iconSVGName)) {+ // Icon theme vars+ ThemeManager &themeManager = ThemeManager::getInstance();+ const qreal offOpacity = themeManager.getOffOpacity();+ const qreal onOpacity = themeManager.getOnOpacity();++ // Use overColor from stylesheet for bgColor of rollover+ QColor overColor = getOverColor();++ // Generate base icon image+ QImage baseImg = generateIconImage("pane_close");+ baseImg = compositeImage(baseImg, QSize(20, 18));++ // Off icon image+ QImage offImg = adjustImageOpacity(baseImg, offOpacity);++ // Over icon image+ QImage overImg = compositeImage(baseImg, QSize(), false, overColor);++ m_pixmaps[iconSVGName] = convertImageToPixmap(offImg);+ m_pixmaps[iconSVGName + "_over"] = convertImageToPixmap(overImg);+ }++ return m_pixmaps[rollover ? iconSVGName + "_over" : iconSVGName];+}++//-----------------------------------------------------------------------------+void TPanelTitleBar::paintEvent(QPaintEvent *) {QPainter painter(this);QRect rect = this->rect();@@ -533,13 +590,9 @@ void TPanelTitleBar::paintEvent(QPaintEvent *) {}if (dw->isFloating()) {- QIcon paneCloseIcon = createQIcon("pane_close");- const static QPixmap closeButtonPixmap(- paneCloseIcon.pixmap(20, 18, QIcon::Normal, QIcon::Off));- const static QPixmap closeButtonPixmapOver(- paneCloseIcon.pixmap(20, 18, QIcon::Active));-- QPoint closeButtonPos(rect.right() - 20, rect.top());+ QPoint closeButtonPos(rect.right() - 19, rect.top());+ QPixmap closeButtonPixmap = getPixmap("pane_close", false);+ QPixmap closeButtonPixmapOver = getPixmap("pane_close", true);if (m_closeButtonHighlighted)painter.drawPixmap(closeButtonPos, closeButtonPixmapOver);@@ -552,6 +605,19 @@ void TPanelTitleBar::paintEvent(QPaintEvent *) {//-----------------------------------------------------------------------------+void TPanelTitleBar::leaveEvent(QEvent *) {+ TPanel *dw = qobject_cast<TPanel *>(parentWidget());+ Q_ASSERT(dw != 0);++ // Mouse left the widget, reset the highlighted flag+ if (dw->isFloating()) {+ m_closeButtonHighlighted = false;+ update();+ }+}++//-----------------------------------------------------------------------------+void TPanelTitleBar::mousePressEvent(QMouseEvent *event) {TDockWidget *dw = static_cast<TDockWidget *>(parentWidget());diff --git a/toonz/sources/toonz/pane.h b/toonz/sources/toonz/pane.hindex 2e91f13ab..e690ef805 100644--- a/toonz/sources/toonz/pane.h+++ b/toonz/sources/toonz/pane.h@@ -14,13 +14,22 @@ class Room;//! icon buttons placed on the panel titlebar (cfr. viewerpane.h)class TPanelTitleBarButton : public QWidget {Q_OBJECT++ // PixmapsQString m_standardPixmapName;QPixmap m_standardPixmap;+ QMap<QString, QPixmap> m_pixmaps;++ // ColorsQColor m_overColor;QColor m_pressedColor;QColor m_freezeColor;QColor m_previewColor;+ // Methods+ void computePixmaps(const QString &standardPixmapName);++ // StylesheetQ_PROPERTY(QColor OverColor READ getOverColor WRITE setOverColor);Q_PROPERTY(QColor PressedColor READ getPressedColor WRITE setPressedColor);Q_PROPERTY(QColor FreezeColor READ getFreezeColor WRITE setFreezeColor);@@ -41,6 +50,7 @@ public:void setButtonSet(TPanelTitleBarButtonSet *buttonSet, int id);int getId() const { return m_id; }+ // Stylesheetvoid setOverColor(const QColor &color) { m_overColor = color; }QColor getOverColor() const { return m_overColor; }void setPressedColor(const QColor &color) { m_pressedColor = color; }@@ -136,7 +146,9 @@ class TPanelTitleBar final : public QFrame {std::vector<std::pair<QPoint, QWidget *>> m_buttons;QPixmap m_borderPm, m_activeBorderPm, m_floatBorderPm, m_floatActiveBorderPm;- QColor m_titleColor, m_activeTitleColor;+ QColor m_titleColor, m_activeTitleColor, m_overColor;++ QMap<QString, QPixmap> m_pixmaps; // cachepublic:TPanelTitleBar(QWidget *parent = 0,@@ -164,6 +176,8 @@ public:void setTitleColor(const QColor &color) { m_titleColor = color; }QColor getActiveTitleColor() const { return m_activeTitleColor; }void setActiveTitleColor(const QColor &color) { m_activeTitleColor = color; }+ QColor getOverColor() const { return m_overColor; }+ void setOverColor(const QColor &color) { m_overColor = color; }protected:void resizeEvent(QResizeEvent *e) override;@@ -172,10 +186,13 @@ protected:void contextMenuEvent(QContextMenuEvent *) override {}void paintEvent(QPaintEvent *event) override;+ void leaveEvent(QEvent *);void mouseMoveEvent(QMouseEvent *event) override;void mousePressEvent(QMouseEvent *event) override;void mouseDoubleClickEvent(QMouseEvent *) override;+ QPixmap getPixmap(const QString &iconSVGName, bool rollover);+Q_PROPERTY(QPixmap BorderPixmap READ getBorderPixmap WRITE setBorderPixmap);Q_PROPERTY(QPixmap ActiveBorderPixmap READ getActiveBorderPixmap WRITEsetActiveBorderPixmap);@@ -186,6 +203,7 @@ protected:Q_PROPERTY(QColor TitleColor READ getTitleColor WRITE setTitleColor);Q_PROPERTY(QColor ActiveTitleColor READ getActiveTitleColor WRITEsetActiveTitleColor);+ Q_PROPERTY(QColor OverColor READ getOverColor WRITE setOverColor);signals:diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cppindex 9e8ef5611..3add117ee 100644--- a/toonz/sources/toonz/preferencespopup.cpp+++ b/toonz/sources/toonz/preferencespopup.cpp@@ -504,12 +504,7 @@ void PreferencesPopup::onStyleSheetTypeChanged() {//------------------------------------------------------------------------------void PreferencesPopup::onIconThemeChanged() {- // Switch between dark or light icons- QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark"- : "light");- // qDebug() << "Icon theme name (preference switch):" << QIcon::themeName();-}+void PreferencesPopup::onIconThemeChanged() {}//-----------------------------------------------------------------------------diff --git a/toonz/sources/toonz/projectpopup.cpp b/toonz/sources/toonz/projectpopup.cppindex fd3eecb42..a2b3e0f7a 100644--- a/toonz/sources/toonz/projectpopup.cpp+++ b/toonz/sources/toonz/projectpopup.cpp@@ -50,10 +50,8 @@ enum { Rule_Standard = 0, Rule_Custom };//-----------------------------------------------------------------------------QPixmap ProjectDvDirModelProjectNode::getPixmap(bool isOpen) const {- static QPixmap openProjectPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_project_on.svg")));- static QPixmap closeProjectPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_project.svg")));+ static QPixmap openProjectPixmap(generateIconPixmap("folder_project_on"));+ static QPixmap closeProjectPixmap(generateIconPixmap("folder_project.svg"));return isOpen ? openProjectPixmap : closeProjectPixmap;}@@ -106,8 +104,7 @@ void ProjectDvDirModelRootNode::refreshChildren() {ProjectDvDirModelSpecialFileFolderNode *projectRootNode =new ProjectDvDirModelSpecialFileFolderNode(this, L"Project root (" + rootDir + L")", projectRoot);- projectRootNode->setPixmap(- svgToPixmap(getIconThemePath("actions/18/folder_project_root.svg")));+ projectRootNode->setPixmap(generateIconPixmap("folder_project_root"));addChild(projectRootNode);}diff --git a/toonz/sources/toonz/startuppopup.cpp b/toonz/sources/toonz/startuppopup.cppindex 410dfc39c..3d93b22c7 100644--- a/toonz/sources/toonz/startuppopup.cpp+++ b/toonz/sources/toonz/startuppopup.cpp@@ -169,8 +169,7 @@ StartupPopup::StartupPopup()m_removePresetBtn->setStyleSheet("QPushButton { padding-left: 4px; padding-right: 4px;}");QLabel *label = new QLabel();- label->setPixmap(- QPixmap(QString(":icons/") + QIcon::themeName() + "/misc/startup.png"));+ label->setPixmap(QPixmap(generateIconPixmap("opentoonz_logo")));m_projectBox->setObjectName("SolidLineFrame");m_scenesTab->setObjectName("SolidLineFrame");m_recentBox->setObjectName("SolidLineFrame");@@ -195,7 +194,7 @@ StartupPopup::StartupPopup()guiLay->setVerticalSpacing(10);guiLay->setHorizontalSpacing(10);- guiLay->addWidget(label, 0, 0, 1, 2, Qt::AlignLeft);+ guiLay->addWidget(label, 0, 0, 1, 2, Qt::AlignCenter);//--- ProjectprojectLay->setSpacing(8);@@ -297,19 +296,19 @@ StartupPopup::StartupPopup()//---- signal-slot connectionsbool ret = true;ret = ret && connect(sceneHandle, SIGNAL(sceneChanged()), this,- SLOT(onSceneChanged()));+ SLOT(onSceneChanged()));ret = ret && connect(sceneHandle, SIGNAL(sceneSwitched()), this,- SLOT(onSceneChanged()));+ SLOT(onSceneChanged()));ret = ret && connect(newProjectButton, SIGNAL(clicked()), this,- SLOT(onNewProjectButtonPressed()));+ SLOT(onNewProjectButtonPressed()));ret = ret && connect(openProjectButton, SIGNAL(clicked()), this,- SLOT(onOpenProjectButtonPressed()));+ SLOT(onOpenProjectButtonPressed()));ret = ret && connect(exploreProjectButton, SIGNAL(clicked()), this,- SLOT(onExploreProjectButtonPressed()));+ SLOT(onExploreProjectButtonPressed()));ret = ret && connect(loadOtherSceneButton, SIGNAL(clicked()), this,- SLOT(onLoadSceneButtonPressed()));+ SLOT(onLoadSceneButtonPressed()));ret = ret && connect(m_projectsCB, SIGNAL(currentIndexChanged(int)),- SLOT(onProjectChanged(int)));+ SLOT(onProjectChanged(int)));ret = ret &&connect(createButton, SIGNAL(clicked()), this, SLOT(onCreateButton()));ret = ret && connect(m_showAtStartCB, SIGNAL(stateChanged(int)), this,@@ -974,7 +973,7 @@ void StartupPopup::onOpenProjectButtonPressed() {void StartupPopup::onExploreProjectButtonPressed() {TProjectManager *pm = TProjectManager::instance();- TFilePath cfp = pm->getCurrentProject()->getProjectFolder();+ TFilePath cfp = pm->getCurrentProject()->getProjectFolder();QDesktopServices::openUrl(QUrl("file:///" + cfp.getQString()));}@@ -1038,11 +1037,11 @@ void StartupPopup::onRecentSceneClicked(int index) {IoCmd::loadScene(TFilePath(path.toStdWString()), false, true);QString origProjectName = RecentFiles::instance()->getFileProject(index);QString projectName = QString::fromStdString(TApp::instance()- ->getCurrentScene()- ->getScene()- ->getProject()- ->getName()- .getName());+ ->getCurrentScene()+ ->getScene()+ ->getProject()+ ->getName()+ .getName());if (origProjectName == "-" || origProjectName != projectName) {QString fileName =RecentFiles::instance()->getFilePath(index, RecentFiles::Scene);@@ -1222,8 +1221,7 @@ QPixmap StartupScenesList::createScenePreview(const QString &name,painter.setPen(pen);painter.drawRect((m_iconSize.width() - scaledPixmap.width()) / 2,(m_iconSize.height() - scaledPixmap.height()) / 2,- scaledPixmap.width() - 1,- scaledPixmap.height() - 1);+ scaledPixmap.width() - 1, scaledPixmap.height() - 1);return pixmap;}}@@ -1232,15 +1230,13 @@ QPixmap StartupScenesList::createScenePreview(const QString &name,return pixmap;}-void StartupScenesList::clearScenes() {- clear();-}+void StartupScenesList::clearScenes() { clear(); }void StartupScenesList::addScene(const QString &name, const QString &path) {QPixmap pixmap;if (path == ":")- pixmap =- svgToPixmap(getIconThemePath("actions/16/new_scene.svg"), m_iconSize, Qt::KeepAspectRatio);+ pixmap = generateIconPixmap("new_scene", qreal(1.0), m_iconSize,+ Qt::KeepAspectRatio);elsepixmap = createScenePreview(name, TFilePath(path));QIcon icon(pixmap);diff --git a/toonz/sources/toonz/tasksviewer.cpp b/toonz/sources/toonz/tasksviewer.cppindex 5bf78f4f7..2c188a531 100644--- a/toonz/sources/toonz/tasksviewer.cpp+++ b/toonz/sources/toonz/tasksviewer.cpp@@ -1121,49 +1121,32 @@ QVariant TaskTreeModel::data(const QModelIndex &index, int role) const {bool sourceFileIsCLN = (t->m_taskFilePath.getType() == "cln");switch (t->m_status) {case Suspended:- return QIcon(- t->m_isComposerTask- ? getIconThemePath("actions/35/task_render_suspended.svg")- : (sourceFileIsCLN- ? getIconThemePath("actions/35/task_cln_suspended.svg")- : getIconThemePath(- "actions/35/task_cleanup_suspended.svg")));+ return createQIcon(t->m_isComposerTask+ ? "task_render_suspended"+ : (sourceFileIsCLN ? "task_cln_suspended"+ : "task_cleanup_suspended"));case Waiting:- return QIcon(- t->m_isComposerTask- ? getIconThemePath(- "actions/35/task_render_completed_with_errors.svg")- : (sourceFileIsCLN- ? getIconThemePath(- "actions/35/task_cln_completed_with_errors.svg")- : getIconThemePath(- "actions/35/"- "task_cleanup_completed_with_errors.svg")));+ return createQIcon(t->m_isComposerTask+ ? "task_render_completed_with_errors"+ : (sourceFileIsCLN+ ? "task_cln_completed_with_errors"+ : "task_cleanup_completed_with_errors"));case Running:- return QIcon(- t->m_isComposerTask- ? getIconThemePath("actions/35/task_render_computing.svg")- : (sourceFileIsCLN- ? getIconThemePath("actions/35/task_cln_computing.svg")- : getIconThemePath(- "actions/35/task_cleanup_computing.svg")));+ return createQIcon(t->m_isComposerTask+ ? "task_render_computing"+ : (sourceFileIsCLN ? "task_cln_computing"+ : "task_cleanup_computing"));case Completed:- return QIcon(- t->m_isComposerTask- ? getIconThemePath("actions/35/task_render_completed.svg")- : (sourceFileIsCLN- ? getIconThemePath("actions/35/task_cln_completed.svg")- : getIconThemePath(- "actions/35/task_cleanup_completed.svg")));+ return createQIcon(t->m_isComposerTask+ ? "task_render_completed"+ : (sourceFileIsCLN ? "task_cln_completed"+ : "task_cleanup_completed"));case Aborted:case TaskUnknown:- return QIcon(- t->m_isComposerTask- ? getIconThemePath("actions/35/task_render_failed.svg")- : (sourceFileIsCLN- ? getIconThemePath("actions/35/task_cln_failed.svg")- : getIconThemePath(- "actions/35/task_cleanup_failed.svg")));+ return createQIcon(t->m_isComposerTask+ ? "task_render_failed"+ : (sourceFileIsCLN ? "task_cln_failed"+ : "task_cleanup_failed"));default:assert(false);}diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrcindex 5070c0010..f7179e675 100644--- a/toonz/sources/toonz/toonz.qrc+++ b/toonz/sources/toonz/toonz.qrc@@ -1,9 +1,5 @@<RCC><qresource prefix="/">- <!-- Themes =============================================== -->- <file>icons/dark/index.theme</file>- <file>icons/light/index.theme</file>-<!-- Tools --><file>icons/dark/tools/20/animate.svg</file><file>icons/dark/tools/20/brush.svg</file>@@ -59,8 +55,8 @@<file>icons/dark/actions/16/export.svg</file><file>icons/dark/actions/16/import.svg</file><file>icons/dark/actions/16/load.svg</file>- <file>icons/dark/actions/18/lock.svg</file>- <file>icons/dark/actions/18/lock_on.svg</file>+ <file>icons/dark/actions/16/lock.svg</file>+ <file>icons/dark/actions/16/lock_on.svg</file><file>icons/dark/actions/16/file_copy.svg</file><file>icons/dark/actions/16/content_copy.svg</file><file>icons/dark/actions/16/cut.svg</file>@@ -161,19 +157,19 @@<file>icons/dark/actions/35/task_render_failed.svg</file><!-- Mimetypes -->- <file>icons/dark/mimetypes/60/tasklist_icon.svg</file>- <file>icons/dark/mimetypes/60/xdts_icon.svg</file>- <file>icons/dark/mimetypes/60/missing_icon.svg</file>- <file>icons/dark/mimetypes/60/motionpath_icon.svg</file>- <file>icons/dark/mimetypes/60/curve_icon.svg</file>- <file>icons/dark/mimetypes/60/unknown_icon.svg</file>- <file>icons/dark/mimetypes/60/cleanup_icon.svg</file>- <file>icons/dark/mimetypes/60/psd_icon.svg</file>- <file>icons/dark/mimetypes/60/svg_icon.svg</file>- <file>icons/dark/mimetypes/60/audio_icon.svg</file>- <file>icons/dark/mimetypes/60/script_icon.svg</file>- <file>icons/dark/mimetypes/60/broken_icon.svg</file>- <file>icons/dark/mimetypes/60/json_icon.svg</file>+ <file>icons/dark/mimetypes/tasklist_icon.svg</file>+ <file>icons/dark/mimetypes/xdts_icon.svg</file>+ <file>icons/dark/mimetypes/missing_icon.svg</file>+ <file>icons/dark/mimetypes/motionpath_icon.svg</file>+ <file>icons/dark/mimetypes/curve_icon.svg</file>+ <file>icons/dark/mimetypes/unknown_icon.svg</file>+ <file>icons/dark/mimetypes/cleanup_icon.svg</file>+ <file>icons/dark/mimetypes/psd_icon.svg</file>+ <file>icons/dark/mimetypes/svg_icon.svg</file>+ <file>icons/dark/mimetypes/audio_icon.svg</file>+ <file>icons/dark/mimetypes/script_icon.svg</file>+ <file>icons/dark/mimetypes/broken_icon.svg</file>+ <file>icons/dark/mimetypes/json_icon.svg</file><!-- Render --><file>icons/dark/actions/16/render.svg</file>@@ -559,7 +555,7 @@<file>icons/dark/actions/48/colorchiporder_leftup.svg</file><file>icons/dark/actions/48/colorchiporder_lowleft.svg</file><file>icons/dark/actions/48/colorchiporder_upleft.svg</file>- <file>icons/dark/misc/startup.png</file>+ <file>icons/dark/misc/opentoonz_logo.svg</file><file>icons/dark/actions/20/touch.svg</file><file>icons/dark/actions/16/quit.svg</file><file>icons/dark/actions/16/clear_cache.svg</file>@@ -579,6 +575,7 @@<file>icons/dark/actions/16/project_settings.svg</file><file>icons/dark/actions/16/save_default_settings.svg</file><file>icons/dark/actions/16/zero_thick_lines.svg</file>+ <file>icons/dark/actions/16/table.svg</file><!-- Keyframe --><file>icons/dark/actions/20/key_off.svg</file>@@ -588,8 +585,6 @@<!-- ===================================================== --><!-- Light =============================================== -->-- <file>icons/light/misc/startup.png</file><!-- ===================================================== --><!-- Legacy resources ==================================== -->diff --git a/toonz/sources/toonz/tpanels.cpp b/toonz/sources/toonz/tpanels.cppindex bf8e40675..26f86ccac 100644--- a/toonz/sources/toonz/tpanels.cpp+++ b/toonz/sources/toonz/tpanels.cpp@@ -542,8 +542,8 @@ void PaletteViewerPanel::reset() {//-----------------------------------------------------------------------------void PaletteViewerPanel::initializeTitleBar() {- m_freezeButton = new TPanelTitleBarButton(- getTitleBar(), getIconThemePath("actions/20/pane_freeze.svg"));+ m_freezeButton =+ new TPanelTitleBarButton(getTitleBar(), getIconPath("pane_freeze"));m_freezeButton->setToolTip(tr("Freeze"));getTitleBar()->add(QPoint(-54, 0), m_freezeButton);m_freezeButton->setPressed(m_isFrozen);@@ -1122,10 +1122,10 @@ void FlipbookPanel::initializeTitleBar(TPanelTitleBar *titleBar) {bool ret = true;int x = -91;int iconWidth = 20;+// safe area buttonTPanelTitleBarButtonForSafeArea *safeAreaButton =- new TPanelTitleBarButtonForSafeArea(- titleBar, getIconThemePath("actions/20/pane_safe.svg"));+ new TPanelTitleBarButtonForSafeArea(titleBar, getIconPath("pane_safe"));safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)"));titleBar->add(QPoint(x, 0), safeAreaButton);ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)),@@ -1141,7 +1141,7 @@ void FlipbookPanel::initializeTitleBar(TPanelTitleBar *titleBar) {x += 28 + iconWidth;// minimize buttonm_button = new TPanelTitleBarButton(- titleBar, getIconThemePath("actions/20/pane_minimize.svg"));+ titleBar, getIconPath("pane_minimize"));m_button->setToolTip(tr("Minimize"));m_button->setPressed(false);diff --git a/toonz/sources/toonz/viewerpane.cpp b/toonz/sources/toonz/viewerpane.cppindex 7f6734050..e0d4e6ade 100644--- a/toonz/sources/toonz/viewerpane.cpp+++ b/toonz/sources/toonz/viewerpane.cpp@@ -332,7 +332,7 @@ void BaseViewerPanel::showEvent(QShowEvent *event) {ret = ret && connect(frameHandle, SIGNAL(frameTypeChanged()), this,SLOT(onFrameTypeChanged()));- // onXshLevelSwitched(TXshLevel*)�F changeWindowTitle() + updateFrameRange()+ // onXshLevelSwitched(TXshLevel*)�F changeWindowTitle() + updateFrameRange()ret = ret && connect(levelHandle, SIGNAL(xshLevelSwitched(TXshLevel *)), this,SLOT(onXshLevelSwitched(TXshLevel *)));@@ -383,8 +383,7 @@ void BaseViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {// buttons for show / hide toggle for the field guide and the safe areaTPanelTitleBarButtonForSafeArea *safeAreaButton =- new TPanelTitleBarButtonForSafeArea(- titleBar, getIconThemePath("actions/20/pane_safe.svg"));+ new TPanelTitleBarButtonForSafeArea(titleBar, getIconPath("pane_safe"));safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)"));titleBar->add(QPoint(x, 0), safeAreaButton);ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)),@@ -397,8 +396,7 @@ void BaseViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {safeAreaButton->setPressed(CommandManager::instance()->getAction(MI_SafeArea)->isChecked());- button = new TPanelTitleBarButton(- titleBar, getIconThemePath("actions/20/pane_grid.svg"));+ button = new TPanelTitleBarButton(titleBar, getIconPath("pane_grid"));button->setToolTip(tr("Field Guide"));x += 1 + iconWidth;titleBar->add(QPoint(x, 0), button);@@ -412,23 +410,20 @@ void BaseViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {CommandManager::instance()->getAction(MI_FieldGuide)->isChecked());// view mode toggles- button = new TPanelTitleBarButton(- titleBar, getIconThemePath("actions/20/pane_table.svg"));+ button = new TPanelTitleBarButton(titleBar, getIconPath("pane_table"));button->setToolTip(tr("Camera Stand View"));x += 10 + iconWidth;titleBar->add(QPoint(x, 0), button);button->setButtonSet(viewModeButtonSet, SceneViewer::NORMAL_REFERENCE);button->setPressed(true);- button = new TPanelTitleBarButton(titleBar,- getIconThemePath("actions/20/pane_3d.svg"));+ button = new TPanelTitleBarButton(titleBar, getIconPath("pane_3d"));button->setToolTip(tr("3D View"));x += 1 + iconWidth;titleBar->add(QPoint(x, 0), button);button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA3D_REFERENCE);- button = new TPanelTitleBarButton(- titleBar, getIconThemePath("actions/20/pane_cam.svg"));+ button = new TPanelTitleBarButton(titleBar, getIconPath("pane_cam"));button->setToolTip(tr("Camera View"));x += 1 + iconWidth;titleBar->add(QPoint(x, 0), button);@@ -437,8 +432,7 @@ void BaseViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {SLOT(setReferenceMode(int)));// freeze button- button = new TPanelTitleBarButton(- titleBar, getIconThemePath("actions/20/pane_freeze.svg"));+ button = new TPanelTitleBarButton(titleBar, getIconPath("pane_freeze"));x += 10 + iconWidth;button->setToolTip(tr("Freeze"));@@ -447,8 +441,8 @@ void BaseViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {SLOT(freeze(bool)));// preview toggles- m_previewButton = new TPanelTitleBarButtonForPreview(- titleBar, getIconThemePath("actions/20/pane_preview.svg"));+ m_previewButton =+ new TPanelTitleBarButtonForPreview(titleBar, getIconPath("pane_preview"));x += 10 + iconWidth;titleBar->add(QPoint(x, 0), m_previewButton);m_previewButton->setToolTip(tr("Preview"));@@ -457,8 +451,8 @@ void BaseViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {// SLOT(enableFullPreview(bool)));m_subcameraPreviewButton = new TPanelTitleBarButtonForPreview(- titleBar, getIconThemePath("actions/20/pane_subpreview.svg"));- x += 1 + 24; // width of pane_preview.svg = 24px+ titleBar, getIconPath("pane_subpreview"));+ x += 1 + 24;titleBar->add(QPoint(x, 0), m_subcameraPreviewButton);m_subcameraPreviewButton->setToolTip(tr("Sub-camera Preview"));@@ -602,7 +596,7 @@ void BaseViewerPanel::onPlayingStatusChanged(bool playing) {//------------------------------------------------------------------------------void BaseViewerPanel::changeWindowTitle() { // �v�m�F+void BaseViewerPanel::changeWindowTitle() { // �v�m�FTApp *app = TApp::instance();ToonzScene *scene = app->getCurrentScene()->getScene();if (!scene) return;diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cppindex c3b0416cc..73ec62d1c 100644--- a/toonz/sources/toonz/xshcolumnviewer.cpp+++ b/toonz/sources/toonz/xshcolumnviewer.cpp@@ -156,21 +156,20 @@ bool containsVectorLevel(int col) {}QIcon createLockIcon(XsheetViewer *viewer) {- QImage icon_on, icon_off;QColor bgColor_on, bgColor_off;- viewer->getButton(LOCK_ON_XSHBUTTON, bgColor_on, icon_on);- viewer->getButton(LOCK_OFF_XSHBUTTON, bgColor_off, icon_off);- QPainter p_on(&icon_on);- p_on.setCompositionMode(QPainter::CompositionMode_DestinationOver);- p_on.fillRect(0, 0, icon_on.width(), icon_on.height(), bgColor_on);- p_on.end();- QPainter p_off(&icon_off);- p_off.setCompositionMode(QPainter::CompositionMode_DestinationOver);- p_off.fillRect(0, 0, icon_off.width(), icon_off.height(), bgColor_off);- p_off.end();++ QString svgFilePath_on = viewer->getXsheetLockButtonOnImage();+ QString svgFilePath_off = viewer->getXsheetLockButtonOffImage();++ QPixmap pm_on = svgToPixmap(svgFilePath_on, QSize(16, 16),+ Qt::KeepAspectRatio, bgColor_on);+ QPixmap pm_off = svgToPixmap(svgFilePath_off, QSize(16, 16),+ Qt::KeepAspectRatio, bgColor_off);+QIcon lockIcon;- lockIcon.addPixmap(QPixmap::fromImage(icon_off));- lockIcon.addPixmap(QPixmap::fromImage(icon_on), QIcon::Normal, QIcon::On);+ lockIcon.addPixmap(pm_off);+ lockIcon.addPixmap(pm_on, QIcon::Normal, QIcon::On);+return lockIcon;}@@ -804,13 +803,11 @@ void ColumnArea::DrawHeader::prepare() const {//-----------------------------------------------------------------------------const QPixmap &ColumnArea::Pixmaps::sound() {- static QPixmap sound =- svgToPixmap(getIconThemePath("actions/30/sound_header.svg"));+ static QPixmap sound = generateIconPixmap("sound_header");return sound;}const QPixmap &ColumnArea::Pixmaps::soundPlaying() {- static QPixmap soundPlaying =- svgToPixmap(getIconThemePath("actions/30/sound_header_on.svg"));+ static QPixmap soundPlaying = generateIconPixmap("sound_header_on");return soundPlaying;}@@ -931,16 +928,17 @@ void ColumnArea::DrawHeader::drawEye() const {if (col < 0 && o->isVerticalTimeline())return; // no preview eye in the camera columnQColor bgColor;- QImage icon;+ QString svgFilePath;int buttonType = !column->isPreviewVisible() ? PREVIEW_OFF_XSHBUTTON: PREVIEW_ON_XSHBUTTON;- m_viewer->getButton(buttonType, bgColor, icon, !o->isVerticalTimeline());+ m_viewer->getButton(buttonType, bgColor, svgFilePath,+ !o->isVerticalTimeline());QRect prevViewRect = o->rect(PredefinedRect::EYE_AREA).translated(orig);QRect eyeRect = o->rect(PredefinedRect::EYE).translated(orig);// preview visible toggleif (o->isVerticalTimeline())- p.setPen(m_viewer->getColumnIconLineColor()); // Preview border color+ p.setPen(m_viewer->getColumnIconLineColor()); // Preview border colorelsep.setPen(m_viewer->getTimelineIconLineColor()); // Preview border color@@ -958,7 +956,10 @@ void ColumnArea::DrawHeader::drawEye() const {buttonType == PREVIEW_OFF_XSHBUTTON)return;- p.drawImage(eyeRect, icon);+ QPixmap icon =+ svgToPixmap(svgFilePath, eyeRect.size(), Qt::KeepAspectRatio, bgColor);++ p.drawPixmap(eyeRect, icon);}void ColumnArea::DrawHeader::drawPreviewToggle(int opacity) const {@@ -967,11 +968,12 @@ void ColumnArea::DrawHeader::drawPreviewToggle(int opacity) const {return; // no camstand toggle in the camera column// camstand visible toggleQColor bgColor;- QImage icon;+ QString svgFilePath;int buttonType = !column->isCamstandVisible() ? CAMSTAND_OFF_XSHBUTTON: opacity < 255 ? CAMSTAND_TRANSP_XSHBUTTON: CAMSTAND_ON_XSHBUTTON;- m_viewer->getButton(buttonType, bgColor, icon, !o->isVerticalTimeline());+ m_viewer->getButton(buttonType, bgColor, svgFilePath,+ !o->isVerticalTimeline());QRect tableViewRect =o->rect(PredefinedRect::PREVIEW_LAYER_AREA).translated(orig);@@ -979,7 +981,7 @@ void ColumnArea::DrawHeader::drawPreviewToggle(int opacity) const {o->rect(PredefinedRect::PREVIEW_LAYER).translated(orig);if (o->isVerticalTimeline())- p.setPen(m_viewer->getColumnIconLineColor()); // Camstand border color+ p.setPen(m_viewer->getColumnIconLineColor()); // Camstand border colorelsep.setPen(m_viewer->getTimelineIconLineColor()); // Camstand border color@@ -998,7 +1000,11 @@ void ColumnArea::DrawHeader::drawPreviewToggle(int opacity) const {m_viewer->getXsheetLayout() == QString("Classic") &&buttonType == CAMSTAND_OFF_XSHBUTTON)return;- p.drawImage(tableViewImgRect, icon);++ QPixmap icon = svgToPixmap(svgFilePath, tableViewImgRect.size(),+ Qt::KeepAspectRatio, bgColor);++ p.drawPixmap(tableViewImgRect, icon);}// shows united visibility toggle, which has the same state as the camstand@@ -1009,11 +1015,12 @@ void ColumnArea::DrawHeader::drawUnifiedViewToggle(int opacity) const {return; // no camstand toggle in the camera column// camstand visible toggleQColor bgColor;- QImage icon;+ QString svgFilePath;int buttonType = !column->isCamstandVisible() ? PREVIEW_OFF_XSHBUTTON: opacity < 255 ? UNIFIED_TRANSP_XSHBUTTON: PREVIEW_ON_XSHBUTTON;- m_viewer->getButton(buttonType, bgColor, icon, !o->isVerticalTimeline());+ m_viewer->getButton(buttonType, bgColor, svgFilePath,+ !o->isVerticalTimeline());QRect unifiedViewRect =o->rect(PredefinedRect::UNIFIEDVIEW_LAYER_AREA).translated(orig);@@ -1021,7 +1028,7 @@ void ColumnArea::DrawHeader::drawUnifiedViewToggle(int opacity) const {o->rect(PredefinedRect::UNIFIEDVIEW_LAYER).translated(orig);if (o->isVerticalTimeline())- p.setPen(m_viewer->getColumnIconLineColor()); // border color+ p.setPen(m_viewer->getColumnIconLineColor()); // border colorelsep.setPen(m_viewer->getTimelineIconLineColor()); // border color@@ -1035,15 +1042,19 @@ void ColumnArea::DrawHeader::drawUnifiedViewToggle(int opacity) const {if (o->flag(PredefinedFlag::PREVIEW_LAYER_AREA_BORDER))p.drawRect(unifiedViewRect);- p.drawImage(unifiedViewImgRect, icon);+ QPixmap icon = svgToPixmap(svgFilePath, unifiedViewImgRect.size(),+ Qt::KeepAspectRatio, bgColor);++ p.drawPixmap(unifiedViewImgRect, icon);}void ColumnArea::DrawHeader::drawLock() const {if (isEmpty || !o->flag(PredefinedFlag::LOCK_AREA_VISIBLE)) return;QColor bgColor;- QImage icon;+ QString svgFilePath;int buttonType = !column->isLocked() ? LOCK_OFF_XSHBUTTON : LOCK_ON_XSHBUTTON;- m_viewer->getButton(buttonType, bgColor, icon, !o->isVerticalTimeline());+ m_viewer->getButton(buttonType, bgColor, svgFilePath,+ !o->isVerticalTimeline());QRect lockModeRect = o->rect((col < 0) ? PredefinedRect::CAMERA_LOCK_AREA: PredefinedRect::LOCK_AREA)@@ -1059,7 +1070,7 @@ void ColumnArea::DrawHeader::drawLock() const {// lock buttonif (o->isVerticalTimeline())- p.setPen(m_viewer->getColumnIconLineColor()); // Lock border color+ p.setPen(m_viewer->getColumnIconLineColor()); // Lock border colorelsep.setPen(m_viewer->getTimelineIconLineColor()); // Lock border color@@ -1071,7 +1082,11 @@ void ColumnArea::DrawHeader::drawLock() const {m_viewer->getXsheetLayout() == QString("Classic") &&buttonType == LOCK_OFF_XSHBUTTON)return;- p.drawImage(lockModeImgRect, icon);++ QPixmap icon = svgToPixmap(svgFilePath, lockModeImgRect.size(),+ Qt::KeepAspectRatio, bgColor);++ p.drawPixmap(lockModeImgRect, icon);}void ColumnArea::DrawHeader::drawConfig() const {@@ -1079,9 +1094,12 @@ void ColumnArea::DrawHeader::drawConfig() const {(col < 0 && !o->flag(PredefinedFlag::CAMERA_CONFIG_AREA_VISIBLE)))return;QColor bgColor;- QImage icon;+ QString svgIconPath;+int buttonType = CONFIG_XSHBUTTON;- m_viewer->getButton(buttonType, bgColor, icon, !o->isVerticalTimeline());++ m_viewer->getButton(buttonType, bgColor, svgIconPath,+ !o->isVerticalTimeline());QRect configRect = o->rect((col < 0) ? PredefinedRect::CAMERA_CONFIG_AREA: PredefinedRect::CONFIG_AREA)@@ -1105,7 +1123,10 @@ void ColumnArea::DrawHeader::drawConfig() const {if (zColumn || column->getPaletteColumn() || column->getSoundTextColumn())return;- p.drawImage(configImgRect, icon);+ QPixmap icon = svgToPixmap(svgIconPath, configImgRect.size(),+ Qt::KeepAspectRatio, bgColor);++ p.drawPixmap(configImgRect, icon);}void ColumnArea::DrawHeader::drawColumnNumber() const {@@ -1766,8 +1787,7 @@ void ColumnArea::drawSoundTextColumnHead(QPainter &p, int col) { // AREAdrawHeader.drawConfig();drawHeader.drawColumnName();drawHeader.drawColumnNumber();- static QPixmap iconPixmap(- recolorPixmap(svgToPixmap(getIconThemePath("actions/74/notelevel.svg"))));+ static QPixmap iconPixmap(generateIconPixmap("notelevel"));drawHeader.drawThumbnail(iconPixmap);drawHeader.drawPegbarName();drawHeader.drawParentHandleName();diff --git a/toonz/sources/toonz/xsheetviewer.cpp b/toonz/sources/toonz/xsheetviewer.cppindex 56afdc007..19170656f 100644--- a/toonz/sources/toonz/xsheetviewer.cpp+++ b/toonz/sources/toonz/xsheetviewer.cpp@@ -158,66 +158,66 @@ void XsheetViewer::getColumnColor(QColor &color, QColor &sideColor, int index,//-----------------------------------------------------------------------------void XsheetViewer::getButton(const int &btype, QColor &bgColor,- QImage &iconImage, bool isTimeline) {+ QString &svgIconPath, bool isTimeline) {switch (btype) {case PREVIEW_ON_XSHBUTTON:bgColor = (isTimeline) ? getTimelinePreviewButtonBgOnColor(): getXsheetPreviewButtonBgOnColor();- iconImage = (isTimeline) ? getTimelinePreviewButtonOnImage()+ svgIconPath = (isTimeline) ? getTimelinePreviewButtonOnImage(): getXsheetPreviewButtonOnImage();break;case PREVIEW_OFF_XSHBUTTON:bgColor = (isTimeline) ? getTimelinePreviewButtonBgOffColor(): getXsheetPreviewButtonBgOffColor();- iconImage = (isTimeline) ? getTimelinePreviewButtonOffImage()+ svgIconPath = (isTimeline) ? getTimelinePreviewButtonOffImage(): getXsheetPreviewButtonOffImage();break;case CAMSTAND_ON_XSHBUTTON:bgColor = (isTimeline) ? getTimelineCamstandButtonBgOnColor(): getXsheetCamstandButtonBgOnColor();- iconImage = (isTimeline) ? getTimelineCamstandButtonOnImage()+ svgIconPath = (isTimeline) ? getTimelineCamstandButtonOnImage(): getXsheetCamstandButtonOnImage();break;case CAMSTAND_TRANSP_XSHBUTTON:bgColor = (isTimeline) ? getTimelineCamstandButtonBgOnColor(): getXsheetCamstandButtonBgOnColor();- iconImage = (isTimeline) ? getTimelineCamstandButtonTranspImage()+ svgIconPath = (isTimeline) ? getTimelineCamstandButtonTranspImage(): getXsheetCamstandButtonTranspImage();break;case CAMSTAND_OFF_XSHBUTTON:bgColor = (isTimeline) ? getTimelineCamstandButtonBgOffColor(): getXsheetCamstandButtonBgOffColor();- iconImage = (isTimeline) ? getTimelineCamstandButtonOffImage()+ svgIconPath = (isTimeline) ? getTimelineCamstandButtonOffImage(): getXsheetCamstandButtonOffImage();break;case LOCK_ON_XSHBUTTON:bgColor = (isTimeline) ? getTimelineLockButtonBgOnColor(): getXsheetLockButtonBgOnColor();- iconImage = (isTimeline) ? getTimelineLockButtonOnImage()+ svgIconPath = (isTimeline) ? getTimelineLockButtonOnImage(): getXsheetLockButtonOnImage();break;case LOCK_OFF_XSHBUTTON:bgColor = (isTimeline) ? getTimelineLockButtonBgOffColor(): getXsheetLockButtonBgOffColor();- iconImage = (isTimeline) ? getTimelineLockButtonOffImage()+ svgIconPath = (isTimeline) ? getTimelineLockButtonOffImage(): getXsheetLockButtonOffImage();break;case CONFIG_XSHBUTTON:bgColor = (isTimeline) ? getTimelineConfigButtonBgColor(): getXsheetConfigButtonBgColor();- iconImage = (isTimeline) ? getTimelineConfigButtonImage()+ svgIconPath = (isTimeline) ? getTimelineConfigButtonImage(): getXsheetConfigButtonImage();break;case UNIFIED_TRANSP_XSHBUTTON:bgColor = (isTimeline) ? getTimelinePreviewButtonBgOnColor(): getXsheetPreviewButtonBgOnColor();- iconImage = (isTimeline) ? getTimelineUnifiedButtonTranspImage()+ svgIconPath = (isTimeline) ? getTimelineUnifiedButtonTranspImage(): getXsheetUnifiedButtonTranspImage();break;default:bgColor = grey210;static QImage iconignored;- iconImage = iconignored;+ svgIconPath = "";}}diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.hindex 515148d4a..e3686efcf 100644--- a/toonz/sources/toonz/xsheetviewer.h+++ b/toonz/sources/toonz/xsheetviewer.h@@ -447,153 +447,153 @@ class XsheetViewer final : public QFrame, public SaveLoadQSettings {// Xsheet Preview ButtonQColor m_xsheetPreviewButtonBgOnColor;- QImage m_xsheetPreviewButtonOnImage;+ QString m_xsheetPreviewButtonOnImage;QColor m_xsheetPreviewButtonBgOffColor;- QImage m_xsheetPreviewButtonOffImage;- QImage m_xsheetUnifiedButtonTranspImage;+ QString m_xsheetPreviewButtonOffImage;+ QString m_xsheetUnifiedButtonTranspImage;Q_PROPERTY(QColor XsheetPreviewButtonBgOnColor READ getXsheetPreviewButtonBgOnColorWRITE setXsheetPreviewButtonBgOnColor)Q_PROPERTY(- QImage XsheetPreviewButtonOnImage READ getXsheetPreviewButtonOnImage WRITE+ QString XsheetPreviewButtonOnImage READ getXsheetPreviewButtonOnImage WRITEsetXsheetPreviewButtonOnImage)Q_PROPERTY(QColor XsheetPreviewButtonBgOffColor READ getXsheetPreviewButtonBgOffColorWRITE setXsheetPreviewButtonBgOffColor)Q_PROPERTY(- QImage XsheetPreviewButtonOffImage READ getXsheetPreviewButtonOffImage+ QString XsheetPreviewButtonOffImage READ getXsheetPreviewButtonOffImageWRITE setXsheetPreviewButtonOffImage)- Q_PROPERTY(QImage XsheetUnifiedButtonTranspImage READ+ Q_PROPERTY(QString XsheetUnifiedButtonTranspImage READgetXsheetUnifiedButtonTranspImage WRITEsetXsheetUnifiedButtonTranspImage)// Xsheet Camstand ButtonQColor m_xsheetCamstandButtonBgOnColor;- QImage m_xsheetCamstandButtonOnImage;- QImage m_xsheetCamstandButtonTranspImage;+ QString m_xsheetCamstandButtonOnImage;+ QString m_xsheetCamstandButtonTranspImage;QColor m_xsheetCamstandButtonBgOffColor;- QImage m_xsheetCamstandButtonOffImage;+ QString m_xsheetCamstandButtonOffImage;Q_PROPERTY(QColor XsheetCamstandButtonBgOnColor READ getXsheetCamstandButtonBgOnColorWRITE setXsheetCamstandButtonBgOnColor)Q_PROPERTY(- QImage XsheetCamstandButtonOnImage READ getXsheetCamstandButtonOnImage+ QString XsheetCamstandButtonOnImage READ getXsheetCamstandButtonOnImageWRITE setXsheetCamstandButtonOnImage)- Q_PROPERTY(QImage XsheetCamstandButtonTranspImage READ+ Q_PROPERTY(QString XsheetCamstandButtonTranspImage READgetXsheetCamstandButtonTranspImage WRITEsetXsheetCamstandButtonTranspImage)Q_PROPERTY(QColor XsheetCamstandButtonBgOffColor READgetXsheetCamstandButtonBgOffColor WRITEsetXsheetCamstandButtonBgOffColor)Q_PROPERTY(- QImage XsheetCamstandButtonOffImage READ getXsheetCamstandButtonOffImage+ QString XsheetCamstandButtonOffImage READ getXsheetCamstandButtonOffImageWRITE setXsheetCamstandButtonOffImage)// Xsheet Lock ButtonQColor m_xsheetLockButtonBgOnColor;- QImage m_xsheetLockButtonOnImage;+ QString m_xsheetLockButtonOnImage;QColor m_xsheetLockButtonBgOffColor;- QImage m_xsheetLockButtonOffImage;+ QString m_xsheetLockButtonOffImage;Q_PROPERTY(QColor XsheetLockButtonBgOnColor READ getXsheetLockButtonBgOnColorWRITE setXsheetLockButtonBgOnColor)- Q_PROPERTY(QImage XsheetLockButtonOnImage READ getXsheetLockButtonOnImage+ Q_PROPERTY(QString XsheetLockButtonOnImage READ getXsheetLockButtonOnImageWRITE setXsheetLockButtonOnImage)Q_PROPERTY(QColor XsheetLockButtonBgOffColor READ getXsheetLockButtonBgOffColor WRITEsetXsheetLockButtonBgOffColor)- Q_PROPERTY(QImage XsheetLockButtonOffImage READ getXsheetLockButtonOffImage+ Q_PROPERTY(QString XsheetLockButtonOffImage READ getXsheetLockButtonOffImageWRITE setXsheetLockButtonOffImage)// Xsheet Config ButtonQColor m_xsheetConfigButtonBgColor;- QImage m_xsheetConfigButtonImage;+ QString m_xsheetConfigButtonImage;Q_PROPERTY(QColor XsheetConfigButtonBgColor READ getXsheetConfigButtonBgColorWRITE setXsheetConfigButtonBgColor)- Q_PROPERTY(QImage XsheetConfigButtonImage READ getXsheetConfigButtonImage+ Q_PROPERTY(QString XsheetConfigButtonImage READ getXsheetConfigButtonImageWRITE setXsheetConfigButtonImage)// Timeline Preview ButtonQColor m_timelinePreviewButtonBgOnColor;- QImage m_timelinePreviewButtonOnImage;+ QString m_timelinePreviewButtonOnImage;QColor m_timelinePreviewButtonBgOffColor;- QImage m_timelinePreviewButtonOffImage;- QImage m_timelineUnifiedButtonTranspImage;+ QString m_timelinePreviewButtonOffImage;+ QString m_timelineUnifiedButtonTranspImage;Q_PROPERTY(QColor TimelinePreviewButtonBgOnColor READgetTimelinePreviewButtonBgOnColor WRITEsetTimelinePreviewButtonBgOnColor)Q_PROPERTY(- QImage TimelinePreviewButtonOnImage READ getTimelinePreviewButtonOnImage+ QString TimelinePreviewButtonOnImage READ getTimelinePreviewButtonOnImageWRITE setTimelinePreviewButtonOnImage)Q_PROPERTY(QColor TimelinePreviewButtonBgOffColor READgetTimelinePreviewButtonBgOffColor WRITEsetTimelinePreviewButtonBgOffColor)Q_PROPERTY(- QImage TimelinePreviewButtonOffImage READ getTimelinePreviewButtonOffImage+ QString TimelinePreviewButtonOffImage READ getTimelinePreviewButtonOffImageWRITE setTimelinePreviewButtonOffImage)- Q_PROPERTY(QImage TimelineUnifiedButtonTranspImage READ+ Q_PROPERTY(QString TimelineUnifiedButtonTranspImage READgetTimelineUnifiedButtonTranspImage WRITEsetTimelineUnifiedButtonTranspImage)// Timeline Camstand ButtonQColor m_timelineCamstandButtonBgOnColor;- QImage m_timelineCamstandButtonOnImage;- QImage m_timelineCamstandButtonTranspImage;+ QString m_timelineCamstandButtonOnImage;+ QString m_timelineCamstandButtonTranspImage;QColor m_timelineCamstandButtonBgOffColor;- QImage m_timelineCamstandButtonOffImage;+ QString m_timelineCamstandButtonOffImage;Q_PROPERTY(QColor TimelineCamstandButtonBgOnColor READgetTimelineCamstandButtonBgOnColor WRITEsetTimelineCamstandButtonBgOnColor)Q_PROPERTY(- QImage TimelineCamstandButtonOnImage READ getTimelineCamstandButtonOnImage+ QString TimelineCamstandButtonOnImage READ getTimelineCamstandButtonOnImageWRITE setTimelineCamstandButtonOnImage)- Q_PROPERTY(QImage TimelineCamstandButtonTranspImage READ+ Q_PROPERTY(QString TimelineCamstandButtonTranspImage READgetTimelineCamstandButtonTranspImage WRITEsetTimelineCamstandButtonTranspImage)Q_PROPERTY(QColor TimelineCamstandButtonBgOffColor READgetTimelineCamstandButtonBgOffColor WRITEsetTimelineCamstandButtonBgOffColor)- Q_PROPERTY(QImage TimelineCamstandButtonOffImage READ+ Q_PROPERTY(QString TimelineCamstandButtonOffImage READgetTimelineCamstandButtonOffImage WRITEsetTimelineCamstandButtonOffImage)// Timeline Lock ButtonQColor m_timelineLockButtonBgOnColor;- QImage m_timelineLockButtonOnImage;+ QString m_timelineLockButtonOnImage;QColor m_timelineLockButtonBgOffColor;- QImage m_timelineLockButtonOffImage;+ QString m_timelineLockButtonOffImage;Q_PROPERTY(QColor TimelineLockButtonBgOnColor READ getTimelineLockButtonBgOnColorWRITE setTimelineLockButtonBgOnColor)- Q_PROPERTY(QImage TimelineLockButtonOnImage READ getTimelineLockButtonOnImage+ Q_PROPERTY(QString TimelineLockButtonOnImage READ getTimelineLockButtonOnImageWRITE setTimelineLockButtonOnImage)Q_PROPERTY(QColor TimelineLockButtonBgOffColor READ getTimelineLockButtonBgOffColorWRITE setTimelineLockButtonBgOffColor)Q_PROPERTY(- QImage TimelineLockButtonOffImage READ getTimelineLockButtonOffImage WRITE+ QString TimelineLockButtonOffImage READ getTimelineLockButtonOffImage WRITEsetTimelineLockButtonOffImage)// Timeline Config ButtonQColor m_timelineConfigButtonBgColor;- QImage m_timelineConfigButtonImage;+ QString m_timelineConfigButtonImage;Q_PROPERTY(QColor TimelineConfigButtonBgColor READ getTimelineConfigButtonBgColorWRITE setTimelineConfigButtonBgColor)- Q_PROPERTY(QImage TimelineConfigButtonImage READ getTimelineConfigButtonImage+ Q_PROPERTY(QString TimelineConfigButtonImage READ getTimelineConfigButtonImageWRITE setTimelineConfigButtonImage)// Layer Header icons- QImage m_layerHeaderPreviewImage;- QImage m_layerHeaderPreviewOverImage;- QImage m_layerHeaderCamstandImage;- QImage m_layerHeaderCamstandOverImage;- QImage m_layerHeaderLockImage;- QImage m_layerHeaderLockOverImage;- Q_PROPERTY(QImage LayerHeaderPreviewImage READ getLayerHeaderPreviewImage+ QString m_layerHeaderPreviewImage;+ QString m_layerHeaderPreviewOverImage;+ QString m_layerHeaderCamstandImage;+ QString m_layerHeaderCamstandOverImage;+ QString m_layerHeaderLockImage;+ QString m_layerHeaderLockOverImage;+ Q_PROPERTY(QString LayerHeaderPreviewImage READ getLayerHeaderPreviewImageWRITE setLayerHeaderPreviewImage)Q_PROPERTY(- QImage LayerHeaderPreviewOverImage READ getLayerHeaderPreviewOverImage+ QString LayerHeaderPreviewOverImage READ getLayerHeaderPreviewOverImageWRITE setLayerHeaderPreviewOverImage)- Q_PROPERTY(QImage LayerHeaderCamstandImage READ getLayerHeaderCamstandImage+ Q_PROPERTY(QString LayerHeaderCamstandImage READ getLayerHeaderCamstandImageWRITE setLayerHeaderCamstandImage)Q_PROPERTY(- QImage LayerHeaderCamstandOverImage READ getLayerHeaderCamstandOverImage+ QString LayerHeaderCamstandOverImage READ getLayerHeaderCamstandOverImageWRITE setLayerHeaderCamstandOverImage)- Q_PROPERTY(QImage LayerHeaderLockImage READ getLayerHeaderLockImage WRITE+ Q_PROPERTY(QString LayerHeaderLockImage READ getLayerHeaderLockImage WRITEsetLayerHeaderLockImage)- Q_PROPERTY(QImage LayerHeaderLockOverImage READ getLayerHeaderLockOverImage+ Q_PROPERTY(QString LayerHeaderLockOverImage READ getLayerHeaderLockOverImageWRITE setLayerHeaderLockOverImage)XsheetScrollArea *m_cellScrollArea;@@ -1098,239 +1098,239 @@ public:void setXsheetPreviewButtonBgOnColor(const QColor &color) {m_xsheetPreviewButtonBgOnColor = color;}- void setXsheetPreviewButtonOnImage(const QImage &image) {- m_xsheetPreviewButtonOnImage = image;+ void setXsheetPreviewButtonOnImage(const QString &svgFilePath) {+ m_xsheetPreviewButtonOnImage = svgFilePath;}void setXsheetPreviewButtonBgOffColor(const QColor &color) {m_xsheetPreviewButtonBgOffColor = color;}- void setXsheetPreviewButtonOffImage(const QImage &image) {- m_xsheetPreviewButtonOffImage = image;+ void setXsheetPreviewButtonOffImage(const QString &svgFilePath) {+ m_xsheetPreviewButtonOffImage = svgFilePath;}- void setXsheetUnifiedButtonTranspImage(const QImage &image) {- m_xsheetUnifiedButtonTranspImage = image;+ void setXsheetUnifiedButtonTranspImage(const QString &svgFilePath) {+ m_xsheetUnifiedButtonTranspImage = svgFilePath;}QColor getXsheetPreviewButtonBgOnColor() const {return m_xsheetPreviewButtonBgOnColor;}- QImage getXsheetPreviewButtonOnImage() const {+ QString getXsheetPreviewButtonOnImage() const {return m_xsheetPreviewButtonOnImage;}QColor getXsheetPreviewButtonBgOffColor() const {return m_xsheetPreviewButtonBgOffColor;}- QImage getXsheetPreviewButtonOffImage() const {+ QString getXsheetPreviewButtonOffImage() const {return m_xsheetPreviewButtonOffImage;}- QImage getXsheetUnifiedButtonTranspImage() const {+ QString getXsheetUnifiedButtonTranspImage() const {return m_xsheetUnifiedButtonTranspImage;}// Xsheet Camstand Buttonvoid setXsheetCamstandButtonBgOnColor(const QColor &color) {m_xsheetCamstandButtonBgOnColor = color;}- void setXsheetCamstandButtonOnImage(const QImage &image) {- m_xsheetCamstandButtonOnImage = image;+ void setXsheetCamstandButtonOnImage(const QString &svgFilePath) {+ m_xsheetCamstandButtonOnImage = svgFilePath;}- void setXsheetCamstandButtonTranspImage(const QImage &image) {- m_xsheetCamstandButtonTranspImage = image;+ void setXsheetCamstandButtonTranspImage(const QString &svgFilePath) {+ m_xsheetCamstandButtonTranspImage = svgFilePath;}void setXsheetCamstandButtonBgOffColor(const QColor &color) {m_xsheetCamstandButtonBgOffColor = color;}- void setXsheetCamstandButtonOffImage(const QImage &image) {- m_xsheetCamstandButtonOffImage = image;+ void setXsheetCamstandButtonOffImage(const QString &svgFilePath) {+ m_xsheetCamstandButtonOffImage = svgFilePath;}QColor getXsheetCamstandButtonBgOnColor() const {return m_xsheetCamstandButtonBgOnColor;}- QImage getXsheetCamstandButtonOnImage() const {+ QString getXsheetCamstandButtonOnImage() const {return m_xsheetCamstandButtonOnImage;}- QImage getXsheetCamstandButtonTranspImage() const {+ QString getXsheetCamstandButtonTranspImage() const {return m_xsheetCamstandButtonTranspImage;}QColor getXsheetCamstandButtonBgOffColor() const {return m_xsheetCamstandButtonBgOffColor;}- QImage getXsheetCamstandButtonOffImage() const {+ QString getXsheetCamstandButtonOffImage() const {return m_xsheetCamstandButtonOffImage;}// XsheetLock Buttonvoid setXsheetLockButtonBgOnColor(const QColor &color) {m_xsheetLockButtonBgOnColor = color;}- void setXsheetLockButtonOnImage(const QImage &image) {- m_xsheetLockButtonOnImage = image;+ void setXsheetLockButtonOnImage(const QString &svgFilePath) {+ m_xsheetLockButtonOnImage = svgFilePath;}void setXsheetLockButtonBgOffColor(const QColor &color) {m_xsheetLockButtonBgOffColor = color;}- void setXsheetLockButtonOffImage(const QImage &image) {- m_xsheetLockButtonOffImage = image;+ void setXsheetLockButtonOffImage(const QString &svgFilePath) {+ m_xsheetLockButtonOffImage = svgFilePath;}QColor getXsheetLockButtonBgOnColor() const {return m_xsheetLockButtonBgOnColor;}- QImage getXsheetLockButtonOnImage() const {+ QString getXsheetLockButtonOnImage() const {return m_xsheetLockButtonOnImage;}QColor getXsheetLockButtonBgOffColor() const {return m_xsheetLockButtonBgOffColor;}- QImage getXsheetLockButtonOffImage() const {+ QString getXsheetLockButtonOffImage() const {return m_xsheetLockButtonOffImage;}// Xsheet Config Buttonvoid setXsheetConfigButtonBgColor(const QColor &color) {m_xsheetConfigButtonBgColor = color;}- void setXsheetConfigButtonImage(const QImage &image) {- m_xsheetConfigButtonImage = image;+ void setXsheetConfigButtonImage(const QString &svgFilePath) {+ m_xsheetConfigButtonImage = svgFilePath;}QColor getXsheetConfigButtonBgColor() const {return m_xsheetConfigButtonBgColor;}- QImage getXsheetConfigButtonImage() const {+ QString getXsheetConfigButtonImage() const {return m_xsheetConfigButtonImage;}// Timeline Preview Buttonvoid setTimelinePreviewButtonBgOnColor(const QColor &color) {m_timelinePreviewButtonBgOnColor = color;}- void setTimelinePreviewButtonOnImage(const QImage &image) {- m_timelinePreviewButtonOnImage = image;+ void setTimelinePreviewButtonOnImage(const QString &svgFilePath) {+ m_timelinePreviewButtonOnImage = svgFilePath;}void setTimelinePreviewButtonBgOffColor(const QColor &color) {m_timelinePreviewButtonBgOffColor = color;}- void setTimelinePreviewButtonOffImage(const QImage &image) {- m_timelinePreviewButtonOffImage = image;+ void setTimelinePreviewButtonOffImage(const QString &svgFilePath) {+ m_timelinePreviewButtonOffImage = svgFilePath;}- void setTimelineUnifiedButtonTranspImage(const QImage &image) {- m_timelineUnifiedButtonTranspImage = image;+ void setTimelineUnifiedButtonTranspImage(const QString &svgFilePath) {+ m_timelineUnifiedButtonTranspImage = svgFilePath;}QColor getTimelinePreviewButtonBgOnColor() const {return m_timelinePreviewButtonBgOnColor;}- QImage getTimelinePreviewButtonOnImage() const {+ QString getTimelinePreviewButtonOnImage() const {return m_timelinePreviewButtonOnImage;}QColor getTimelinePreviewButtonBgOffColor() const {return m_timelinePreviewButtonBgOffColor;}- QImage getTimelinePreviewButtonOffImage() const {+ QString getTimelinePreviewButtonOffImage() const {return m_timelinePreviewButtonOffImage;}- QImage getTimelineUnifiedButtonTranspImage() const {+ QString getTimelineUnifiedButtonTranspImage() const {return m_timelineUnifiedButtonTranspImage;}// Timeline Camstand Buttonvoid setTimelineCamstandButtonBgOnColor(const QColor &color) {m_timelineCamstandButtonBgOnColor = color;}- void setTimelineCamstandButtonOnImage(const QImage &image) {- m_timelineCamstandButtonOnImage = image;+ void setTimelineCamstandButtonOnImage(const QString &svgFilePath) {+ m_timelineCamstandButtonOnImage = svgFilePath;}- void setTimelineCamstandButtonTranspImage(const QImage &image) {- m_timelineCamstandButtonTranspImage = image;+ void setTimelineCamstandButtonTranspImage(const QString &svgFilePath) {+ m_timelineCamstandButtonTranspImage = svgFilePath;}void setTimelineCamstandButtonBgOffColor(const QColor &color) {m_timelineCamstandButtonBgOffColor = color;}- void setTimelineCamstandButtonOffImage(const QImage &image) {- m_timelineCamstandButtonOffImage = image;+ void setTimelineCamstandButtonOffImage(const QString &svgFilePath) {+ m_timelineCamstandButtonOffImage = svgFilePath;}QColor getTimelineCamstandButtonBgOnColor() const {return m_timelineCamstandButtonBgOnColor;}- QImage getTimelineCamstandButtonOnImage() const {+ QString getTimelineCamstandButtonOnImage() const {return m_timelineCamstandButtonOnImage;}- QImage getTimelineCamstandButtonTranspImage() const {+ QString getTimelineCamstandButtonTranspImage() const {return m_timelineCamstandButtonTranspImage;}QColor getTimelineCamstandButtonBgOffColor() const {return m_timelineCamstandButtonBgOffColor;}- QImage getTimelineCamstandButtonOffImage() const {+ QString getTimelineCamstandButtonOffImage() const {return m_timelineCamstandButtonOffImage;}// Timeline Lock Buttonvoid setTimelineLockButtonBgOnColor(const QColor &color) {m_timelineLockButtonBgOnColor = color;}- void setTimelineLockButtonOnImage(const QImage &image) {- m_timelineLockButtonOnImage = image;+ void setTimelineLockButtonOnImage(const QString &svgFilePath) {+ m_timelineLockButtonOnImage = svgFilePath;}void setTimelineLockButtonBgOffColor(const QColor &color) {m_timelineLockButtonBgOffColor = color;}- void setTimelineLockButtonOffImage(const QImage &image) {- m_timelineLockButtonOffImage = image;+ void setTimelineLockButtonOffImage(const QString &svgFilePath) {+ m_timelineLockButtonOffImage = svgFilePath;}QColor getTimelineLockButtonBgOnColor() const {return m_timelineLockButtonBgOnColor;}- QImage getTimelineLockButtonOnImage() const {+ QString getTimelineLockButtonOnImage() const {return m_timelineLockButtonOnImage;}QColor getTimelineLockButtonBgOffColor() const {return m_timelineLockButtonBgOffColor;}- QImage getTimelineLockButtonOffImage() const {+ QString getTimelineLockButtonOffImage() const {return m_timelineLockButtonOffImage;}// Timeline Config Buttonvoid setTimelineConfigButtonBgColor(const QColor &color) {m_timelineConfigButtonBgColor = color;}- void setTimelineConfigButtonImage(const QImage &image) {- m_timelineConfigButtonImage = image;+ void setTimelineConfigButtonImage(const QString &svgFilePath) {+ m_timelineConfigButtonImage = svgFilePath;}QColor getTimelineConfigButtonBgColor() const {return m_timelineConfigButtonBgColor;}- QImage getTimelineConfigButtonImage() const {+ QString getTimelineConfigButtonImage() const {return m_timelineConfigButtonImage;}// Layer Header icons- void setLayerHeaderPreviewImage(const QImage &image) {- m_layerHeaderPreviewImage = image;+ void setLayerHeaderPreviewImage(const QString &svgFilePath) {+ m_layerHeaderPreviewImage = svgFilePath;}- void setLayerHeaderPreviewOverImage(const QImage &image) {- m_layerHeaderPreviewOverImage = image;+ void setLayerHeaderPreviewOverImage(const QString &svgFilePath) {+ m_layerHeaderPreviewOverImage = svgFilePath;}- void setLayerHeaderCamstandImage(const QImage &image) {- m_layerHeaderCamstandImage = image;+ void setLayerHeaderCamstandImage(const QString &svgFilePath) {+ m_layerHeaderCamstandImage = svgFilePath;}- void setLayerHeaderCamstandOverImage(const QImage &image) {- m_layerHeaderCamstandOverImage = image;+ void setLayerHeaderCamstandOverImage(const QString &svgFilePath) {+ m_layerHeaderCamstandOverImage = svgFilePath;}- void setLayerHeaderLockImage(const QImage &image) {- m_layerHeaderLockImage = image;+ void setLayerHeaderLockImage(const QString &svgFilePath) {+ m_layerHeaderLockImage = svgFilePath;}- void setLayerHeaderLockOverImage(const QImage &image) {- m_layerHeaderLockOverImage = image;+ void setLayerHeaderLockOverImage(const QString &svgFilePath) {+ m_layerHeaderLockOverImage = svgFilePath;}- QImage getLayerHeaderPreviewImage() const {+ QString getLayerHeaderPreviewImage() const {return m_layerHeaderPreviewImage;}- QImage getLayerHeaderPreviewOverImage() const {+ QString getLayerHeaderPreviewOverImage() const {return m_layerHeaderPreviewOverImage;}- QImage getLayerHeaderCamstandImage() const {+ QString getLayerHeaderCamstandImage() const {return m_layerHeaderCamstandImage;}- QImage getLayerHeaderCamstandOverImage() const {+ QString getLayerHeaderCamstandOverImage() const {return m_layerHeaderCamstandOverImage;}- QImage getLayerHeaderLockImage() const { return m_layerHeaderLockImage; }- QImage getLayerHeaderLockOverImage() const {+ QString getLayerHeaderLockImage() const { return m_layerHeaderLockImage; }+ QString getLayerHeaderLockOverImage() const {return m_layerHeaderLockOverImage;}- void getButton(const int &btype, QColor &bgColor, QImage &iconImage,+ void getButton(const int &btype, QColor &bgColor, QString &svgIconPath,bool isTimeline = false);// convert the last one digit of the frame number to alphabetdiff --git a/toonz/sources/toonzqt/functionsheet.cpp b/toonz/sources/toonzqt/functionsheet.cppindex 96ddedc64..6cf78badf 100644--- a/toonz/sources/toonzqt/functionsheet.cpp+++ b/toonz/sources/toonzqt/functionsheet.cpp@@ -196,8 +196,7 @@ FunctionSheetButtonArea::FunctionSheetButtonArea(QWidget *parent)m_syncSizeBtn = new QPushButton("", this);m_syncSizeBtn->setCheckable(true);m_syncSizeBtn->setFixedSize(20, 20);- static QPixmap syncScaleImg =- recolorPixmap(svgToPixmap(getIconThemePath("actions/17/syncscale.svg")));+ static QPixmap syncScaleImg = generateIconPixmap("syncscale");QPixmap offPm(17, 17);offPm.fill(Qt::transparent);{diff --git a/toonz/sources/toonzqt/gutil.cpp b/toonz/sources/toonzqt/gutil.cppindex a02ec0d32..0904f06f1 100644--- a/toonz/sources/toonzqt/gutil.cpp+++ b/toonz/sources/toonzqt/gutil.cpp@@ -17,6 +17,7 @@#include "tmsgcore.h"// Qt includes+#include <QDirIterator>#include <QPixmap>#include <QImage>#include <QPainter>@@ -33,6 +34,7 @@#include <QSvgRenderer>#include <QScreen>#include <QWindow>+#include <QDebug>using namespace DVGui;@@ -185,40 +187,83 @@ QPixmap scalePixmapKeepingAspectRatio(QPixmap pixmap, QSize size,//------------------------------------------------------------------------------QPixmap svgToPixmap(const QString &svgFilePath, const QSize &size,- Qt::AspectRatioMode aspectRatioMode, QColor bgColor) {- static int devPixRatio = getHighestDevicePixelRatio();- QSvgRenderer svgRenderer(svgFilePath);- QSize pixmapSize;- QRectF renderRect;- if (size.isEmpty()) {- pixmapSize = svgRenderer.defaultSize() * devPixRatio;- renderRect = QRectF(QPointF(), QSizeF(pixmapSize));+int getDevicePixelRatio(const QWidget *widget) {+ if (hasScreensWithDifferentDevPixRatio() && widget) {+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))+ return widget->screen()->devicePixelRatio();+#else+ if (!widget->windowHandle()) widget->winId();+ if (widget->windowHandle())+ return widget->windowHandle()->devicePixelRatio();+#endif+ }+ static int devPixRatio = QApplication::desktop()->devicePixelRatio();+ return devPixRatio;+}++//-----------------------------------------------------------------------------++// Calculate render params for use by svgToImage() and svgToPixmap()+SvgRenderParams calculateSvgRenderParams(const QSize &desiredSize,+ QSize &imageSize,+ Qt::AspectRatioMode aspectRatioMode) {+ SvgRenderParams params;+ if (desiredSize.isEmpty()) {+ params.size = imageSize;+ params.rect = QRectF(QPointF(), QSizeF(params.size));} else {- pixmapSize = size * devPixRatio;+ params.size = desiredSize;if (aspectRatioMode == Qt::KeepAspectRatio ||aspectRatioMode == Qt::KeepAspectRatioByExpanding) {- QSize imgSize = svgRenderer.defaultSize();- QPointF scaleFactor((float)pixmapSize.width() / (float)imgSize.width(),- (float)pixmapSize.height() / (float)imgSize.height());+ QPointF scaleFactor(+ (float)params.size.width() / (float)imageSize.width(),+ (float)params.size.height() / (float)imageSize.height());float factor = (aspectRatioMode == Qt::KeepAspectRatio)? std::min(scaleFactor.x(), scaleFactor.y()): std::max(scaleFactor.x(), scaleFactor.y());- QSizeF renderSize(factor * (float)imgSize.width(),- factor * (float)imgSize.height());+ QSizeF renderSize(factor * (float)imageSize.width(),+ factor * (float)imageSize.height());QPointF topLeft(- ((float)pixmapSize.width() - renderSize.width()) * 0.5f,- ((float)pixmapSize.height() - renderSize.height()) * 0.5f);- renderRect = QRectF(topLeft, renderSize);+ ((float)params.size.width() - renderSize.width()) * 0.5f,+ ((float)params.size.height() - renderSize.height()) * 0.5f);+ params.rect = QRectF(topLeft, renderSize);} else { // Qt::IgnoreAspectRatio:- renderRect = QRectF(QPointF(), QSizeF(pixmapSize));+ params.rect = QRectF(QPointF(), QSizeF(params.size));}}- QPixmap pixmap(pixmapSize);+ return params;+}++//-----------------------------------------------------------------------------++QPixmap svgToPixmap(const QString &svgFilePath, QSize size,+ Qt::AspectRatioMode aspectRatioMode, QColor bgColor) {+ if (svgFilePath.isEmpty()) return QPixmap();++ QSvgRenderer svgRenderer(svgFilePath);++ // Check if SVG file was loaded correctly+ if (!svgRenderer.isValid()) {+ qDebug() << "Invalid SVG file:" << svgFilePath;+ return QPixmap();+ }++ static int devPixRatio = getHighestDevicePixelRatio();+ if (!size.isEmpty()) size *= devPixRatio;++ QSize imageSize = svgRenderer.defaultSize() * devPixRatio;+ SvgRenderParams params =+ calculateSvgRenderParams(size, imageSize, aspectRatioMode);+ QPixmap pixmap(params.size);QPainter painter;pixmap.fill(bgColor);- painter.begin(&pixmap);- svgRenderer.render(&painter, renderRect);++ if (!painter.begin(&pixmap)) {+ qDebug() << "Failed to begin QPainter on pixmap";+ return QPixmap();+ }++ svgRenderer.render(&painter, params.rect);painter.end();pixmap.setDevicePixelRatio(devPixRatio);return pixmap;@@ -226,290 +271,256 @@ QPixmap svgToPixmap(const QString &svgFilePath, const QSize &size,//------------------------------------------------------------------------------int getDevicePixelRatio(const QWidget *widget) {- if (hasScreensWithDifferentDevPixRatio() && widget) {-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))- return widget->screen()->devicePixelRatio();-#else- if (!widget->windowHandle()) widget->winId();- if (widget->windowHandle())- return widget->windowHandle()->devicePixelRatio();-#endif+QImage svgToImage(const QString &svgFilePath, QSize size,+ Qt::AspectRatioMode aspectRatioMode, QColor bgColor) {+ if (svgFilePath.isEmpty()) return QImage();++ QSvgRenderer svgRenderer(svgFilePath);++ // Check if SVG file was loaded correctly+ if (!svgRenderer.isValid()) {+ qDebug() << "Invalid SVG file:" << svgFilePath;+ return QImage();}- static int devPixRatio = QApplication::desktop()->devicePixelRatio();- return devPixRatio;++ static int devPixRatio = getHighestDevicePixelRatio();++ QSize imageSize = svgRenderer.defaultSize() * devPixRatio;+ SvgRenderParams params =+ calculateSvgRenderParams(size, imageSize, aspectRatioMode);+ QImage image(params.size, QImage::Format_ARGB32_Premultiplied);+ QPainter painter;+ image.fill(bgColor);++ if (!painter.begin(&image)) {+ qDebug() << "Failed to begin QPainter on image";+ return QImage();+ }++ svgRenderer.render(&painter, params.rect);+ painter.end();+ return image;}//------------------------------------------------------------------------------QString getIconThemePath(const QString &fileSVGPath) {- // Use as follows:- // QPixmap pixmapIcon = getIconThemePath("path/to/file.svg");- // Is equal to: :icons/*theme*/path/to/file.svg+// Change the opacity of a QImage (0.0 - 1.0)+QImage adjustImageOpacity(const QImage &input, qreal opacity) {+ if (input.isNull()) return QImage();++ QImage result(input.size(), QImage::Format_ARGB32_Premultiplied);- // Set themeable directory- static QString theme = Preferences::instance()->getIconTheme()- ? ":icons/dark/"- : ":icons/light/";+ QPainter painter(&result);+ if (!painter.isActive()) return QImage();- // If no file in light icon theme directory, fallback to dark directory- if (!QFile::exists(QString(theme + fileSVGPath))) theme = ":icons/dark/";+ painter.setCompositionMode(QPainter::CompositionMode_Source);+ painter.fillRect(result.rect(), Qt::transparent);+ painter.setCompositionMode(QPainter::CompositionMode_SourceOver);+ painter.drawImage(0, 0, input);+ painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);+ painter.fillRect(+ result.rect(),+ QColor(0, 0, 0, qBound(0, static_cast<int>(opacity * 255), 255)));+ painter.end();- return theme + fileSVGPath;+ return result;}//------------------------------------------------------------------------------QPixmap compositePixmap(QPixmap pixmap, const qreal &opacity, const QSize &size,- const int leftAdj, const int topAdj, QColor bgColor) {- static int devPixRatio = getHighestDevicePixelRatio();+// Resizes a QImage, if scaleInput is true then input image will scale according+// to newSize otherwise the input image will be centered and not scaled+QImage compositeImage(const QImage &input, QSize newSize, bool scaleInput,+ QColor bgColor) {+ if (input.isNull()) return QImage();++ int devPixRatio = getHighestDevicePixelRatio();++ int w, h, x = 0, y = 0;+ if (newSize.isEmpty()) {+ w = input.width();+ h = input.height();+ } else {+ w = newSize.width() * devPixRatio;+ h = newSize.height() * devPixRatio;+ if (!scaleInput) {+ x = (w - input.width()) / 2;+ y = (h - input.height()) / 2;+ }+ }++ QImage newImage(w, h, QImage::Format_ARGB32_Premultiplied);+ newImage.fill(bgColor);++ if (scaleInput) {+ return input.scaled(w, h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);+ } else {+ QPainter painter(&newImage);+ if (!painter.isActive()) return QImage();+ painter.drawImage(QPoint(x, y), input);+ painter.end();- // Sets size of destination pixmap for source to be drawn onto, if size is- // empty use source pixmap size, else use custom size.- QPixmap destination(size.isEmpty() ? pixmap.size() : size * devPixRatio);- destination.setDevicePixelRatio(devPixRatio);- destination.fill(bgColor);-- if (!pixmap.isNull()) {- QPainter p(&destination);- pixmap = pixmap.scaled(pixmap.size(), Qt::KeepAspectRatio);- pixmap.setDevicePixelRatio(devPixRatio);- p.setBackgroundMode(Qt::TransparentMode);- p.setBackground(QBrush(Qt::transparent));- p.eraseRect(pixmap.rect());- p.setOpacity(opacity);- p.drawPixmap(leftAdj, topAdj, pixmap);+ return newImage;}- return destination;}//------------------------------------------------------------------------------QPixmap recolorPixmap(QPixmap pixmap, QColor color) {- // Change black pixels to any chosen color- QImage img = pixmap.toImage().convertToFormat(QImage::Format_ARGB32);- for (int y = 0; y < img.height(); y++) {- QRgb *pixel = reinterpret_cast<QRgb *>(img.scanLine(y));- QRgb *end = pixel + img.width();- for (; pixel != end; pixel++) {- // Only recolor zero value (black) pixels- if (QColor::fromRgba(*pixel).value() == 0)- *pixel =- QColor(color.red(), color.green(), color.blue(), qAlpha(*pixel))- .rgba();- }- }- pixmap = QPixmap::fromImage(img);+// Convert QImage to QPixmap and set device pixel ratio+QPixmap convertImageToPixmap(const QImage &image) {+ if (image.isNull()) return QPixmap();++ QPixmap pixmap(QPixmap::fromImage(image));+ int devPixRatio = getHighestDevicePixelRatio();+ pixmap.setDevicePixelRatio(devPixRatio);+return pixmap;}//------------------------------------------------------------------------------QIcon createQIcon(const char *iconSVGName, bool useFullOpacity,- bool isForMenuItem) {- static int devPixRatio = getHighestDevicePixelRatio();+// Load, theme colorize and change opacity of an icon image+QImage generateIconImage(const QString &iconSVGName, qreal opacity,+ QSize newSize, Qt::AspectRatioMode aspectRatioMode) {+ static ThemeManager &themeManager = ThemeManager::getInstance();- QIcon themeIcon = QIcon::fromTheme(iconSVGName);+ if (iconSVGName.isEmpty() || !themeManager.hasIcon(iconSVGName)) {+ return QImage();+ }- // Get icon dimensions- QSize iconSize(0, 0);- for (QList<QSize> sizes = themeIcon.availableSizes(); !sizes.isEmpty();- sizes.removeFirst())- if (sizes.first().width() > iconSize.width())- iconSize = sizes.first() * devPixRatio;+ int devPixRatio = getHighestDevicePixelRatio();+ newSize *= devPixRatio;- // Control lightness of the icons- const qreal activeOpacity = 1;- const qreal baseOpacity = useFullOpacity ? 1 : 0.8;- const qreal disabledOpacity = 0.15;+ // Path to icon image+ const QString imgPath = themeManager.getIconPath(iconSVGName);- // Pseudo state name strings- QString overStr = QString(iconSVGName) + "_over";- QString onStr = QString(iconSVGName) + "_on";+ // Convert SVG to QImage+ QImage image(svgToImage(imgPath, newSize, aspectRatioMode));- //----------+ // Colorize QImage+ image = themeManager.recolorBlackPixels(image);- // Base pixmap- QPixmap themeIconPixmap(recolorPixmap(themeIcon.pixmap(iconSize)));- if (!themeIconPixmap.isNull()) { // suppress message- themeIconPixmap.setDevicePixelRatio(devPixRatio);- themeIconPixmap = themeIconPixmap.scaled(iconSize, Qt::KeepAspectRatio,- Qt::SmoothTransformation);- }+ // Change opacity if required+ if (opacity != qreal(1.0)) image = adjustImageOpacity(image, opacity);- // Over pixmap- QPixmap overPixmap(recolorPixmap(QIcon::fromTheme(overStr).pixmap(iconSize)));- if (!overPixmap.isNull()) { // suppress message- overPixmap.setDevicePixelRatio(devPixRatio);- overPixmap = overPixmap.scaled(iconSize, Qt::KeepAspectRatio,- Qt::SmoothTransformation);- }+ return image;+}- // On pixmap- QPixmap onPixmap(recolorPixmap(QIcon::fromTheme(onStr).pixmap(iconSize)));- if (!onPixmap.isNull()) { // suppress message- onPixmap.setDevicePixelRatio(devPixRatio);- onPixmap = onPixmap.scaled(iconSize, Qt::KeepAspectRatio,- Qt::SmoothTransformation);- }+//------------------------------------------------------------------------------ //----------+// Load, theme colorize and change opacity of an icon image file+QPixmap generateIconPixmap(const QString &iconSVGName, qreal opacity,+ QSize newSize, Qt::AspectRatioMode aspectRatioMode) {+ QImage image =+ generateIconImage(iconSVGName, opacity, newSize, aspectRatioMode);+ return convertImageToPixmap(image);+}- QIcon icon;+//------------------------------------------------------------------------------#ifdef _WIN32- bool showIconInMenu = Preferences::instance()->getBoolValue(showIconsInMenu);- // set transparent icon- if (isForMenuItem &&- themeIconPixmap.size() == QSize(16 * devPixRatio, 16 * devPixRatio) &&- !showIconInMenu) {- static QPixmap emptyPm(16 * devPixRatio, 16 * devPixRatio);- emptyPm.fill(Qt::transparent);+// Process and populate all modes and states of a QIcon+void addImagesToIcon(QIcon &icon, const QImage &baseImg, const QImage &overImg,+ const QImage &onImg, bool useFullOpacity) {+ if (baseImg.isNull()) return;- icon.addPixmap(emptyPm, QIcon::Normal, QIcon::Off);- icon.addPixmap(emptyPm, QIcon::Normal, QIcon::On);- icon.addPixmap(emptyPm, QIcon::Disabled, QIcon::Off);- icon.addPixmap(emptyPm, QIcon::Disabled, QIcon::On);- icon.addPixmap(emptyPm, QIcon::Active);- } else-#endif- {- // Base icon- icon.addPixmap(compositePixmap(themeIconPixmap, baseOpacity), QIcon::Normal,- QIcon::Off);- icon.addPixmap(compositePixmap(themeIconPixmap, disabledOpacity),- QIcon::Disabled, QIcon::Off);-- // Over icon- icon.addPixmap(!overPixmap.isNull()- ? compositePixmap(overPixmap, activeOpacity)- : compositePixmap(themeIconPixmap, activeOpacity),- QIcon::Active);-- // On icon- if (!onPixmap.isNull()) {- icon.addPixmap(compositePixmap(onPixmap, activeOpacity), QIcon::Normal,- QIcon::On);- icon.addPixmap(compositePixmap(onPixmap, disabledOpacity),- QIcon::Disabled, QIcon::On);- } else {- icon.addPixmap(compositePixmap(themeIconPixmap, activeOpacity),- QIcon::Normal, QIcon::On);- icon.addPixmap(compositePixmap(themeIconPixmap, disabledOpacity),- QIcon::Disabled, QIcon::On);- }- }- //------------ // For icons intended for menus that are 16x16 in dimensions, to repurpose- // them for use in toolbars that are set for 20x20 we want to draw them onto a- // 20x20 pixmap so they don't get resized in the GUI, they will be loaded into- // the icon along with the original 16x16 pixmap.-- if (themeIconPixmap.size() == QSize(16 * devPixRatio, 16 * devPixRatio)) {- const QSize drawOnSize(20, 20);- const int x = (drawOnSize.width() - 16) / 2; // left adjust- const int y = (drawOnSize.height() - 16) / 2; // top adjust-- // Base icon- icon.addPixmap(- compositePixmap(themeIconPixmap, baseOpacity, drawOnSize, x, y),- QIcon::Normal, QIcon::Off);- icon.addPixmap(- compositePixmap(themeIconPixmap, disabledOpacity, drawOnSize, x, y),- QIcon::Disabled, QIcon::Off);-- // Over icon- icon.addPixmap(- !overPixmap.isNull()- ? compositePixmap(overPixmap, activeOpacity, drawOnSize, x, y)- : compositePixmap(themeIconPixmap, activeOpacity, drawOnSize, x, y),- QIcon::Active);-- // On icon- if (!onPixmap.isNull()) {- icon.addPixmap(compositePixmap(onPixmap, activeOpacity, drawOnSize, x, y),- QIcon::Normal, QIcon::On);- icon.addPixmap(- compositePixmap(onPixmap, disabledOpacity, drawOnSize, x, y),- QIcon::Disabled, QIcon::On);- } else {- icon.addPixmap(- compositePixmap(themeIconPixmap, activeOpacity, drawOnSize, x, y),- QIcon::Normal, QIcon::On);- icon.addPixmap(- compositePixmap(themeIconPixmap, disabledOpacity, drawOnSize, x, y),- QIcon::Disabled, QIcon::On);- }- }+ ThemeManager &themeManager = ThemeManager::getInstance();+ const qreal offOpacity = useFullOpacity ? 1.0 : themeManager.getOffOpacity();+ const qreal onOpacity = themeManager.getOnOpacity();+ const qreal disabledOpacity = themeManager.getDisabledOpacity();- return icon;+ // Generate more images using input images for other modes and states+ QImage offImg = adjustImageOpacity(baseImg, offOpacity);+ QImage disabledImg = adjustImageOpacity(baseImg, disabledOpacity);+ QImage onDisabledImg =+ !onImg.isNull() ? adjustImageOpacity(onImg, disabledOpacity) : QImage();++ // Convert images to pixmaps and set device pixel ratio+ QPixmap basePm(convertImageToPixmap(baseImg));+ QPixmap offPm(convertImageToPixmap(offImg));+ QPixmap disabledPm(convertImageToPixmap(disabledImg));+ QPixmap overPm(convertImageToPixmap(overImg));+ QPixmap onPm(convertImageToPixmap(onImg));+ QPixmap onDisabledPm(convertImageToPixmap(onDisabledImg));++ // Add pixmaps to icon and fallback to basePm if 'over' and 'on' are null+ icon.addPixmap(offPm, QIcon::Normal, QIcon::Off);+ icon.addPixmap(disabledPm, QIcon::Disabled, QIcon::Off);+ icon.addPixmap(!overPm.isNull() ? overPm : basePm, QIcon::Active);+ icon.addPixmap(!onPm.isNull() ? onPm : basePm, QIcon::Normal, QIcon::On);+ icon.addPixmap(!onPm.isNull() ? onDisabledPm : disabledPm, QIcon::Disabled,+ QIcon::On);}//------------------------------------------------------------------------------void addSpecifiedSizedImageToIcon(QIcon &icon, const char *iconSVGName,- QSize newSize) {- static int devPixRatio = getHighestDevicePixelRatio();- newSize *= devPixRatio;- QIcon themeIcon = QIcon::fromTheme(iconSVGName);- // Pseudo state name strings- QString overStr = QString(iconSVGName) + "_over";- QString onStr = QString(iconSVGName) + "_on";- // Control lightness of the icons- const qreal activeOpacity = 1;- const qreal baseOpacity = 0.8;- const qreal disabledOpacity = 0.15;- //------------ // Base pixmap- QPixmap themeIconPixmap(recolorPixmap(themeIcon.pixmap(newSize)));- if (!themeIconPixmap.isNull()) { // suppress message- themeIconPixmap.setDevicePixelRatio(devPixRatio);- themeIconPixmap = themeIconPixmap.scaled(newSize, Qt::KeepAspectRatio,- Qt::SmoothTransformation);+// Add the same pixmap to all modes and states of a QIcon+void addPixmapToAllModesAndStates(QIcon &icon, const QPixmap &pixmap) {+ QIcon::Mode modes[] = {QIcon::Normal, QIcon::Disabled, QIcon::Active,+ QIcon::Selected};+ QIcon::State states[] = {QIcon::On, QIcon::Off};++ for (const auto &mode : modes) {+ for (const auto &state : states) {+ icon.addPixmap(pixmap, mode, state);+ }}+}++//------------------------------------------------------------------------------ // Over pixmap- QPixmap overPixmap(recolorPixmap(QIcon::fromTheme(overStr).pixmap(newSize)));- if (!overPixmap.isNull()) { // suppress message- overPixmap.setDevicePixelRatio(devPixRatio);- overPixmap = overPixmap.scaled(newSize, Qt::KeepAspectRatio,- Qt::SmoothTransformation);+/// @brief Return a themed icon+/// @param iconSVGName Name of the icon (SVG file base name)+/// @param useFullOpacity If true the icon will be max brightness+/// @param isForMenuItem For special handling of menu icons+/// @param newSize Render the SVG images of the icon at the specified size+/// @return QIcon+QIcon createQIcon(const QString &iconSVGName, bool useFullOpacity,+ bool isForMenuItem, QSize newSize) {+ static ThemeManager &themeManager = ThemeManager::getInstance();+ if (iconSVGName.isEmpty() || !themeManager.hasIcon(iconSVGName)) {+ // Use debug to check if something calls for an icon that doesn't exist+ //qDebug () << "File not found:" << iconSVGName;+ return QIcon();}- // On pixmap- QPixmap onPixmap(recolorPixmap(QIcon::fromTheme(onStr).pixmap(newSize)));- if (!onPixmap.isNull()) { // suppress message- onPixmap.setDevicePixelRatio(devPixRatio);- onPixmap =- onPixmap.scaled(newSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);+ static int devPixRatio = getHighestDevicePixelRatio();++ QImage baseImg(generateIconImage(iconSVGName, qreal(1.0), newSize));+ QImage overImg(generateIconImage(iconSVGName + "_over", qreal(1.0), newSize));+ QImage onImg(generateIconImage(iconSVGName + "_on", qreal(1.0), newSize));++ QIcon icon;++ addImagesToIcon(icon, baseImg, overImg, onImg, useFullOpacity);++ // START_BUG_WORKAROUND: #20230627+ // Set an empty pixmap for menu icons when hiding icons from menus is true,+ // search bug ID for more info.+#ifdef _WIN32+ bool showIconInMenu = Preferences::instance()->getBoolValue(showIconsInMenu);+ if (isForMenuItem && baseImg.width() == (16 * devPixRatio) &&+ baseImg.height() == (16 * devPixRatio) && !showIconInMenu) {+ static QPixmap emptyPm(16 * devPixRatio, 16 * devPixRatio);+ emptyPm.fill(Qt::transparent);+ addPixmapToAllModesAndStates(icon, emptyPm);+ } else+#endif // END_BUG_WORKAROUND+ {+ addImagesToIcon(icon, baseImg, overImg, onImg, useFullOpacity);}- // Base icon- icon.addPixmap(compositePixmap(themeIconPixmap, baseOpacity), QIcon::Normal,- QIcon::Off);- icon.addPixmap(compositePixmap(themeIconPixmap, disabledOpacity),- QIcon::Disabled, QIcon::Off);-- // Over icon- icon.addPixmap(!overPixmap.isNull()- ? compositePixmap(overPixmap, activeOpacity)- : compositePixmap(themeIconPixmap, activeOpacity),- QIcon::Active);-- // On icon- if (!onPixmap.isNull()) {- icon.addPixmap(compositePixmap(onPixmap, activeOpacity), QIcon::Normal,- QIcon::On);- icon.addPixmap(compositePixmap(onPixmap, disabledOpacity), QIcon::Disabled,- QIcon::On);- } else {- icon.addPixmap(compositePixmap(themeIconPixmap, activeOpacity),- QIcon::Normal, QIcon::On);- icon.addPixmap(compositePixmap(themeIconPixmap, disabledOpacity),- QIcon::Disabled, QIcon::On);+ // For tool bars we draw menu sized icons onto tool bar sized images otherwise+ // there can be scaling artifacts with high dpi and load these in addition+ if (baseImg.width() == (16 * devPixRatio) &&+ baseImg.height() == (16 * devPixRatio)) {+ QSize expandSize(20, 20);+ QImage toolBaseImg(compositeImage(baseImg, expandSize));+ QImage toolOverImg(compositeImage(overImg, expandSize));+ QImage toolOnImg(compositeImage(onImg, expandSize));+ addImagesToIcon(icon, toolBaseImg, toolOverImg, toolOnImg, useFullOpacity);}++ return icon;}//-----------------------------------------------------------------------------@@ -548,11 +559,8 @@ QIcon createQIconOnOffPNG(const char *iconPNGName, bool withOver) {//-----------------------------------------------------------------------------QIcon createTemporaryIconFromName(const char *commandName) {- const int visibleIconSize = 20;- const int menubarIconSize = 16;- const qreal activeOpacity = 1;- const qreal baseOpacity = 0.8;- const qreal disabledOpacity = 0.15;+ const int visibleIconSize = 20;+ const int menubarIconSize = 16;QString name(commandName);QList<QChar> iconChar;@@ -577,18 +585,19 @@ QIcon createTemporaryIconFromName(const char *commandName) {for (auto c : iconChar) iconStr.append(c);QIcon icon;- // prepare for both normal and high dpi+ // Prepare for both normal and high dpifor (int devPixelRatio = 1; devPixelRatio <= 2; devPixelRatio++) {- QPixmap transparentPm(menubarIconSize * devPixelRatio,- menubarIconSize * devPixelRatio);- transparentPm.fill(Qt::transparent);+ QImage transparentImg(menubarIconSize * devPixelRatio,+ menubarIconSize * devPixelRatio,+ QImage::Format_ARGB32);+ transparentImg.fill(Qt::transparent);int pxSize = visibleIconSize * devPixelRatio;- QPixmap pixmap(pxSize, pxSize);+ QImage charImg(pxSize, pxSize, QImage::Format_ARGB32_Premultiplied);QPainter painter;- pixmap.fill(Qt::transparent);- painter.begin(&pixmap);+ charImg.fill(Qt::transparent);+ painter.begin(&charImg);painter.setPen(Preferences::instance()->getIconTheme() ? Qt::black: Qt::white);@@ -601,29 +610,17 @@ QIcon createTemporaryIconFromName(const char *commandName) {QFont font = painter.font();font.setPixelSize(pxSize);painter.setFont(font);-painter.drawText(rect, Qt::AlignCenter, iconStr);painter.end();// For menu only- icon.addPixmap(transparentPm, QIcon::Normal, QIcon::Off);- icon.addPixmap(transparentPm, QIcon::Active);- icon.addPixmap(transparentPm, QIcon::Normal, QIcon::On);- icon.addPixmap(transparentPm, QIcon::Disabled, QIcon::Off);- icon.addPixmap(transparentPm, QIcon::Disabled, QIcon::On);+ addPixmapToAllModesAndStates(icon, QPixmap::fromImage(transparentImg));// For toolbars- icon.addPixmap(compositePixmap(pixmap, baseOpacity), QIcon::Normal,- QIcon::Off);- icon.addPixmap(compositePixmap(pixmap, disabledOpacity), QIcon::Disabled,- QIcon::Off);- icon.addPixmap(compositePixmap(pixmap, activeOpacity), QIcon::Active);- icon.addPixmap(compositePixmap(pixmap, activeOpacity), QIcon::Normal,- QIcon::On);- icon.addPixmap(compositePixmap(pixmap, disabledOpacity), QIcon::Disabled,- QIcon::On);+ addImagesToIcon(icon, charImg);}+return icon;}@@ -843,3 +840,150 @@ void ToolBarContainer::paintEvent(QPaintEvent *event) { QPainter p(this); }QString operator+(const QString &a, const TFilePath &fp) {return a + QString::fromStdWString(fp.getWideString());}++//=============================================================================+// Theme Manager+//-----------------------------------------------------------------------------++class ThemeManager::ThemeManagerImpl {+public:+ QMap<QString, QString> m_iconPaths;+ qreal m_onOpacity = 1.0;+ qreal m_offOpacity = 0.8;+ qreal m_disabledOpacity = 0.3;+};++//-----------------------------------------------------------------------------++ThemeManager::ThemeManager() : impl(new ThemeManagerImpl) {}++//-----------------------------------------------------------------------------++ThemeManager::~ThemeManager() {}++//-----------------------------------------------------------------------------++ThemeManager &ThemeManager::getInstance() {+ static ThemeManager instance;+ return instance;+}++//-----------------------------------------------------------------------------++// Populate a QMap with icon filepaths and assign their basename as the key+void ThemeManager::buildIconPathsMap(const QString &path) {+ QDir dir(path);+ if (!dir.exists(path)) {+ qDebug() << "Resource path does not exist:" << path;+ return;+ }++ QDirIterator it(path,+ QStringList() << "*.svg"+ << "*.png",+ QDir::Files, QDirIterator::Subdirectories);++ while (it.hasNext()) {+ it.next();++ const QString iconPath = it.fileInfo().filePath();+ const QString iconName = it.fileInfo().baseName();++ if (!impl->m_iconPaths.contains(iconName)) {+ impl->m_iconPaths.insert(iconName, iconPath);+ } else {+ qDebug() << "Icon with file name already exists in iconPaths, ensure "+ "icons have unique file names:"+ << "\nCurrently added:" << getIconPath(iconName)+ << "\nTried to add:" << iconPath;+ }+ }+}++//-----------------------------------------------------------------------------++// Get the full filepath of an icon image by basename+QString ThemeManager::getIconPath(const QString &iconName) const {+ return impl->m_iconPaths.value(iconName);+}++//-----------------------------------------------------------------------------++// Boolean to check if iconName is contained within the iconPaths QMap+bool ThemeManager::hasIcon(const QString &iconName) const {+ return impl->m_iconPaths.contains(iconName);+}++//-----------------------------------------------------------------------------++qreal ThemeManager::getOnOpacity() const { return impl->m_onOpacity; }++//-----------------------------------------------------------------------------++qreal ThemeManager::getOffOpacity() const { return impl->m_offOpacity; }++//-----------------------------------------------------------------------------++qreal ThemeManager::getDisabledOpacity() const {+ return impl->m_disabledOpacity;+}++//-----------------------------------------------------------------------------++// Colorize black pixels in a QImage while retaining other colors, however be+// mindful that if black pixels overlap color pixels it can cause artifacting+QImage ThemeManager::recolorBlackPixels(const QImage &input, QColor color) {+ if (input.isNull() || color == Qt::black) return QImage();++ // Default is icon theme color+ if (!color.isValid())+ color = Preferences::instance()->getIconTheme() ? Qt::black : Qt::white;++ QImage image = input.convertToFormat(QImage::Format_ARGB32);+ QRgb targetColor = color.rgb();+ int height = image.height();+ int width = image.width();+ for (int y = 0; y < height; ++y) {+ QRgb *pixel = reinterpret_cast<QRgb *>(image.scanLine(y));+ QRgb *end = pixel + width;+ for (; pixel != end; ++pixel) {+ if (qGray(*pixel) == 0) {+ *pixel = (targetColor & 0x00FFFFFF) | (qAlpha(*pixel) << 24);+ }+ }+ }++ return image;+}++//-----------------------------------------------------------------------------++// Colorize black pixels in a QPixmap while retaining other colors, however be+// mindful that if black pixels overlap color pixels if can cause artifacting+QPixmap ThemeManager::recolorBlackPixels(const QPixmap &input, QColor color) {+ if (input.isNull() || color == Qt::black) return QPixmap();++ QImage image = input.toImage();+ QImage recoloredImage = recolorBlackPixels(image, color);+ QPixmap pixmap = convertImageToPixmap(recoloredImage);++ return pixmap;+}++//-----------------------------------------------------------------------------++// For debugging contents+void ThemeManager::printiconPathsMap() {+ const QMap<QString, QString> map = impl->m_iconPaths;+ qDebug() << "Contents of QMap:";+ for (auto it = map.constBegin(); it != map.constEnd(); ++it) {+ qDebug() << it.key() << ":" << it.value();+ }+}++//-----------------------------------------------------------------------------++// Public version of ThemeManager::getIconPath()+QString getIconPath(const QString &path) {+ return ThemeManager::getInstance().getIconPath(path);+}diff --git a/toonz/sources/toonzqt/icongenerator.cpp b/toonz/sources/toonzqt/icongenerator.cppindex 0314ce261..560f3c016 100644--- a/toonz/sources/toonzqt/icongenerator.cpp+++ b/toonz/sources/toonzqt/icongenerator.cpp@@ -504,14 +504,15 @@ IconRenderer::~IconRenderer() {}class NoImageIconRenderer final : public IconRenderer {public:- NoImageIconRenderer(const std::string &id, const TDimension &iconSize):- IconRenderer(id, iconSize) { }+ NoImageIconRenderer(const std::string &id, const TDimension &iconSize)+ : IconRenderer(id, iconSize) {}void run() override {try {TRaster32P ras(getIconSize());ras->fill(TPixel32::Gray);setIcon(ras);- } catch(...){}+ } catch (...) {+ }}};@@ -1105,9 +1106,9 @@ Qt::transparent)bbox = (bbox * icon->getBounds()).enlarge(-1); // Add a 1 pixel transparent margin - this- //if (bbox.getLx() > 0 &&- // bbox.getLy() > 0) // way the actual content doesn't look trimmed.- // ::makeChessBackground(icon->extract(bbox));+ // if (bbox.getLx() > 0 &&+ // bbox.getLy() > 0) // way the actual content doesn't look trimmed.+ // ::makeChessBackground(icon->extract(bbox));} elseicon->fill(TPixel32(255, 0, 0));@@ -1188,30 +1189,30 @@ void FileIconRenderer::run() {setIcon(rasterFromQImage(palette));return;} else if (type == "svg") {- QPixmap svg(svgToPixmap(getIconThemePath("mimetypes/60/svg_icon.svg"),- QSize(iconSize.lx, iconSize.ly),- Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(svg));+ QImage svg(generateIconImage("svg_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(svg));return;} else if (type == "tzu") {QImage palette(":Resources/tzuicon.png");setIcon(rasterFromQImage(palette));return;} else if (TFileType::getInfo(m_path) == TFileType::AUDIO_LEVEL) {- QPixmap loudspeaker(- svgToPixmap(getIconThemePath("mimetypes/60/audio_icon.svg"),- QSize(iconSize.lx, iconSize.ly), Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(loudspeaker));+ QImage loudspeaker(generateIconImage("audio_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(loudspeaker));return;} else if (type == "scr") {QImage screensaver(":Resources/savescreen.png");setIcon(rasterFromQImage(screensaver));return;} else if (type == "psd") {- QPixmap psdPath(svgToPixmap(getIconThemePath("mimetypes/60/psd_icon.svg"),- QSize(iconSize.lx, iconSize.ly),- Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(psdPath));+ QImage psdPath(generateIconImage("psd_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(psdPath));return;} else if (type == "mesh")iconRaster = IconGenerator::generateMeshFileIcon(m_path, iconSize, m_fid);@@ -1219,80 +1220,80 @@ void FileIconRenderer::run() {iconRaster =IconGenerator::generateRasterFileIcon(m_path, iconSize, m_fid);else if (type == "mpath") {- QPixmap motionPath(- svgToPixmap(getIconThemePath("mimetypes/60/motionpath_icon.svg"),- QSize(iconSize.lx, iconSize.ly), Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(motionPath));+ QImage motionPath(generateIconImage("motionpath_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(motionPath));return;} else if (type == "curve") {- QPixmap curve(svgToPixmap(getIconThemePath("mimetypes/60/curve_icon.svg"),- QSize(iconSize.lx, iconSize.ly),- Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(curve));+ QImage curve(generateIconImage("curve_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(curve));return;} else if (type == "cln") {- QPixmap cln(svgToPixmap(getIconThemePath("mimetypes/60/cleanup_icon.svg"),- QSize(iconSize.lx, iconSize.ly),- Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(cln));+ QImage cln(generateIconImage("cleanup_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(cln));return;} else if (type == "tnzbat") {- QPixmap tnzBat(- svgToPixmap(getIconThemePath("mimetypes/60/tasklist_icon.svg"),- QSize(iconSize.lx, iconSize.ly), Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(tnzBat));+ QImage tnzBat(generateIconImage("tasklist_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(tnzBat));return;} else if (type == "tls") {- QPixmap tls(svgToPixmap(":Resources/magpie.svg",- QSize(iconSize.lx, iconSize.ly),- Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(tls));+ QImage tls(svgToImage(":Resources/magpie.svg",+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(tls));return;} else if (type == "xdts") {- QPixmap xdts(svgToPixmap(getIconThemePath("mimetypes/60/xdts_icon.svg"),- QSize(iconSize.lx, iconSize.ly),- Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(xdts));+ QImage xdts(generateIconImage("xdts_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(xdts));return;} else if (type == "js") {- QPixmap script(- svgToPixmap(getIconThemePath("mimetypes/60/script_icon.svg"),- QSize(iconSize.lx, iconSize.ly), Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(script));+ QImage script(generateIconImage("script_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(script));return;} else if (type == "json") {- QPixmap json(svgToPixmap(getIconThemePath("mimetypes/60/json_icon.svg"),- QSize(iconSize.lx, iconSize.ly),- Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(json));+ QImage json(generateIconImage("json_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(json));return;}else {- QPixmap unknown(- svgToPixmap(getIconThemePath("mimetypes/60/unknown_icon.svg"),- QSize(iconSize.lx, iconSize.ly), Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(unknown));+ QImage unknown(generateIconImage("unknown_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(unknown));return;}if (!iconRaster) {- QPixmap broken(- svgToPixmap(getIconThemePath("mimetypes/60/broken_icon.svg"),- QSize(iconSize.lx, iconSize.ly), Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(broken));+ QImage broken(generateIconImage("broken_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(broken));return;}setIcon(iconRaster);} catch (const TImageVersionException &) {- QPixmap unknown(- svgToPixmap(getIconThemePath("mimetypes/60/unknown_icon.svg"),- QSize(iconSize.lx, iconSize.ly), Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(unknown));+ QImage unknown(generateIconImage("unknown_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(unknown));} catch (...) {- QPixmap broken(svgToPixmap(getIconThemePath("mimetypes/60/broken_icon.svg"),- QSize(iconSize.lx, iconSize.ly),- Qt::KeepAspectRatio));- setIcon(rasterFromQPixmap(broken));+ QImage broken(generateIconImage("broken_icon", qreal(1.0),+ QSize(iconSize.lx, iconSize.ly),+ Qt::KeepAspectRatio));+ setIcon(rasterFromQImage(broken));}}diff --git a/toonz/sources/toonzqt/menubarcommand.cpp b/toonz/sources/toonzqt/menubarcommand.cppindex e8cd8c654..e39dc4550 100644--- a/toonz/sources/toonzqt/menubarcommand.cpp+++ b/toonz/sources/toonzqt/menubarcommand.cpp@@ -410,8 +410,8 @@ void CommandManager::enlargeIcon(CommandId id, const QSize dstSize) {return;}- addSpecifiedSizedImageToIcon(icon, iconSVGName, dstSize);-+ icon = createQIcon(iconSVGName, false, false, dstSize);+action->setIcon(icon);}