diff --git a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss index a45a8b5..78d0296 100644 --- a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss +++ b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss @@ -1551,6 +1551,14 @@ PopupButton::menu-indicator:disabled { #XSheetToolbar #XSheetToolbarLevelButton { padding: 2; } +QToolBar#MediumPaddingToolBar QToolButton { + padding-left: 3; + padding-right: 3; +} +QToolBar#WidePaddingToolBar QToolButton { + padding-left: 6; + padding-right: 6; +} /* ----------------------------------------------------------------------------- ComboViewer / Viewer / FlipBook ----------------------------------------------------------------------------- */ @@ -1582,13 +1590,15 @@ FlipBook #ToolBarContainer QLineEdit { border-bottom-right-radius: 0; height: 16px; } -#FlipConsolePlayToolBar::separator:horizontal { +QToolBar#FlipConsolePlayToolBar::separator:horizontal { margin: 0 2px; } -#FlipConsolePlayToolBar QToolButton { +QToolBar#FlipConsolePlayToolBar QToolButton { margin-top: 2px; margin-bottom: 2px; height: 16px; + padding-left: 6px; + padding-right: 6px; } #ViewerFpsSlider { background-color: transparent; diff --git a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss index a45a8b5..78d0296 100644 --- a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss +++ b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss @@ -1551,6 +1551,14 @@ PopupButton::menu-indicator:disabled { #XSheetToolbar #XSheetToolbarLevelButton { padding: 2; } +QToolBar#MediumPaddingToolBar QToolButton { + padding-left: 3; + padding-right: 3; +} +QToolBar#WidePaddingToolBar QToolButton { + padding-left: 6; + padding-right: 6; +} /* ----------------------------------------------------------------------------- ComboViewer / Viewer / FlipBook ----------------------------------------------------------------------------- */ @@ -1582,13 +1590,15 @@ FlipBook #ToolBarContainer QLineEdit { border-bottom-right-radius: 0; height: 16px; } -#FlipConsolePlayToolBar::separator:horizontal { +QToolBar#FlipConsolePlayToolBar::separator:horizontal { margin: 0 2px; } -#FlipConsolePlayToolBar QToolButton { +QToolBar#FlipConsolePlayToolBar QToolButton { margin-top: 2px; margin-bottom: 2px; height: 16px; + padding-left: 6px; + padding-right: 6px; } #ViewerFpsSlider { background-color: transparent; diff --git a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss index 911816b..a16dcc8 100644 --- a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss +++ b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss @@ -1551,6 +1551,14 @@ PopupButton::menu-indicator:disabled { #XSheetToolbar #XSheetToolbarLevelButton { padding: 2; } +QToolBar#MediumPaddingToolBar QToolButton { + padding-left: 3; + padding-right: 3; +} +QToolBar#WidePaddingToolBar QToolButton { + padding-left: 6; + padding-right: 6; +} /* ----------------------------------------------------------------------------- ComboViewer / Viewer / FlipBook ----------------------------------------------------------------------------- */ @@ -1582,13 +1590,15 @@ FlipBook #ToolBarContainer QLineEdit { border-bottom-right-radius: 0; height: 16px; } -#FlipConsolePlayToolBar::separator:horizontal { +QToolBar#FlipConsolePlayToolBar::separator:horizontal { margin: 0 2px; } -#FlipConsolePlayToolBar QToolButton { +QToolBar#FlipConsolePlayToolBar QToolButton { margin-top: 2px; margin-bottom: 2px; height: 16px; + padding-left: 6px; + padding-right: 6px; } #ViewerFpsSlider { background-color: transparent; diff --git a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss index 911816b..a16dcc8 100644 --- a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss +++ b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss @@ -1551,6 +1551,14 @@ PopupButton::menu-indicator:disabled { #XSheetToolbar #XSheetToolbarLevelButton { padding: 2; } +QToolBar#MediumPaddingToolBar QToolButton { + padding-left: 3; + padding-right: 3; +} +QToolBar#WidePaddingToolBar QToolButton { + padding-left: 6; + padding-right: 6; +} /* ----------------------------------------------------------------------------- ComboViewer / Viewer / FlipBook ----------------------------------------------------------------------------- */ @@ -1582,13 +1590,15 @@ FlipBook #ToolBarContainer QLineEdit { border-bottom-right-radius: 0; height: 16px; } -#FlipConsolePlayToolBar::separator:horizontal { +QToolBar#FlipConsolePlayToolBar::separator:horizontal { margin: 0 2px; } -#FlipConsolePlayToolBar QToolButton { +QToolBar#FlipConsolePlayToolBar QToolButton { margin-top: 2px; margin-bottom: 2px; height: 16px; + padding-left: 6px; + padding-right: 6px; } #ViewerFpsSlider { background-color: transparent; diff --git a/stuff/config/qss/Astral_072_Dark/less/layouts/toolbar.less b/stuff/config/qss/Astral_072_Dark/less/layouts/toolbar.less index 79f7b82..8c90d2d 100644 --- a/stuff/config/qss/Astral_072_Dark/less/layouts/toolbar.less +++ b/stuff/config/qss/Astral_072_Dark/less/layouts/toolbar.less @@ -112,3 +112,17 @@ PopupButton { padding: 2; } } + +QToolBar#MediumPaddingToolBar { //Schematic Toolbars + & QToolButton { + padding-left: 3; + padding-right: 3; + } +} + +QToolBar#WidePaddingToolBar { //FrameNavigator + & QToolButton { + padding-left: 6; + padding-right: 6; + } +} \ No newline at end of file diff --git a/stuff/config/qss/Astral_072_Dark/less/layouts/viewer.less b/stuff/config/qss/Astral_072_Dark/less/layouts/viewer.less index 7cf4a93..ebf47d4 100644 --- a/stuff/config/qss/Astral_072_Dark/less/layouts/viewer.less +++ b/stuff/config/qss/Astral_072_Dark/less/layouts/viewer.less @@ -52,7 +52,7 @@ FlipBook { } } -#FlipConsolePlayToolBar { +QToolBar#FlipConsolePlayToolBar { &::separator:horizontal { margin: 0 2px; } @@ -60,6 +60,8 @@ FlipBook { margin-top: 2px; margin-bottom: 2px; height: 16px; + padding-left: 6px; + padding-right: 6px; } } diff --git a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss index 3995b1f..c5aa6b6 100644 --- a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss +++ b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss @@ -1551,6 +1551,14 @@ PopupButton::menu-indicator:disabled { #XSheetToolbar #XSheetToolbarLevelButton { padding: 2; } +QToolBar#MediumPaddingToolBar QToolButton { + padding-left: 3; + padding-right: 3; +} +QToolBar#WidePaddingToolBar QToolButton { + padding-left: 6; + padding-right: 6; +} /* ----------------------------------------------------------------------------- ComboViewer / Viewer / FlipBook ----------------------------------------------------------------------------- */ @@ -1582,13 +1590,15 @@ FlipBook #ToolBarContainer QLineEdit { border-bottom-right-radius: 0; height: 16px; } -#FlipConsolePlayToolBar::separator:horizontal { +QToolBar#FlipConsolePlayToolBar::separator:horizontal { margin: 0 2px; } -#FlipConsolePlayToolBar QToolButton { +QToolBar#FlipConsolePlayToolBar QToolButton { margin-top: 2px; margin-bottom: 2px; height: 16px; + padding-left: 6px; + padding-right: 6px; } #ViewerFpsSlider { background-color: transparent; diff --git a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss index 3995b1f..c5aa6b6 100644 --- a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss +++ b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss @@ -1551,6 +1551,14 @@ PopupButton::menu-indicator:disabled { #XSheetToolbar #XSheetToolbarLevelButton { padding: 2; } +QToolBar#MediumPaddingToolBar QToolButton { + padding-left: 3; + padding-right: 3; +} +QToolBar#WidePaddingToolBar QToolButton { + padding-left: 6; + padding-right: 6; +} /* ----------------------------------------------------------------------------- ComboViewer / Viewer / FlipBook ----------------------------------------------------------------------------- */ @@ -1582,13 +1590,15 @@ FlipBook #ToolBarContainer QLineEdit { border-bottom-right-radius: 0; height: 16px; } -#FlipConsolePlayToolBar::separator:horizontal { +QToolBar#FlipConsolePlayToolBar::separator:horizontal { margin: 0 2px; } -#FlipConsolePlayToolBar QToolButton { +QToolBar#FlipConsolePlayToolBar QToolButton { margin-top: 2px; margin-bottom: 2px; height: 16px; + padding-left: 6px; + padding-right: 6px; } #ViewerFpsSlider { background-color: transparent; diff --git a/toonz/sources/tnztools/tooloptionscontrols.cpp b/toonz/sources/tnztools/tooloptionscontrols.cpp index 457e7dc..72bdf8f 100644 --- a/toonz/sources/tnztools/tooloptionscontrols.cpp +++ b/toonz/sources/tnztools/tooloptionscontrols.cpp @@ -650,9 +650,14 @@ ToolOptionPopupButton::ToolOptionPopupButton(TTool *tool, TEnumProperty::Range range = property->getRange(); TEnumProperty::Range::iterator it; - for (it = range.begin(); it != range.end(); ++it) - addItem(createQIconPNG(QString::fromStdWString(*it).toUtf8())); - + for (it = range.begin(); it != range.end(); ++it) { + QString iconName = QString::fromStdWString(*it); + QAction *action = addItem(createQIcon(iconName.toUtf8())); + // make the tooltip text + iconName = iconName.replace('_', ' '); + iconName = iconName.left(1).toUpper() + iconName.mid(1); + action->setToolTip(iconName); + } setCurrentIndex(0); updateStatus(); connect(this, SIGNAL(activated(int)), this, SLOT(onActivated(int))); diff --git a/toonz/sources/toonz/Resources/addcleanup_off.png b/toonz/sources/toonz/Resources/addcleanup_off.png deleted file mode 100644 index 88e7b07..0000000 Binary files a/toonz/sources/toonz/Resources/addcleanup_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/addcleanup_off.svg b/toonz/sources/toonz/Resources/addcleanup_off.svg new file mode 100644 index 0000000..5521c7c --- /dev/null +++ b/toonz/sources/toonz/Resources/addcleanup_off.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/addcleanup_on.png b/toonz/sources/toonz/Resources/addcleanup_on.png deleted file mode 100644 index e8337df..0000000 Binary files a/toonz/sources/toonz/Resources/addcleanup_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/addcleanup_on.svg b/toonz/sources/toonz/Resources/addcleanup_on.svg new file mode 100644 index 0000000..17efc90 --- /dev/null +++ b/toonz/sources/toonz/Resources/addcleanup_on.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/addrender_off.png b/toonz/sources/toonz/Resources/addrender_off.png deleted file mode 100644 index a31db07..0000000 Binary files a/toonz/sources/toonz/Resources/addrender_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/addrender_off.svg b/toonz/sources/toonz/Resources/addrender_off.svg new file mode 100644 index 0000000..3856732 --- /dev/null +++ b/toonz/sources/toonz/Resources/addrender_off.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/addrender_on.png b/toonz/sources/toonz/Resources/addrender_on.png deleted file mode 100644 index 7c21bc1..0000000 Binary files a/toonz/sources/toonz/Resources/addrender_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/addrender_on.svg b/toonz/sources/toonz/Resources/addrender_on.svg new file mode 100644 index 0000000..fb1980f --- /dev/null +++ b/toonz/sources/toonz/Resources/addrender_on.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/bevel_join.png b/toonz/sources/toonz/Resources/bevel_join.png deleted file mode 100644 index e91c52e..0000000 Binary files a/toonz/sources/toonz/Resources/bevel_join.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/bevel_join.svg b/toonz/sources/toonz/Resources/bevel_join.svg new file mode 100644 index 0000000..8d62610 --- /dev/null +++ b/toonz/sources/toonz/Resources/bevel_join.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/butt_cap.png b/toonz/sources/toonz/Resources/butt_cap.png deleted file mode 100644 index e2c51a0..0000000 Binary files a/toonz/sources/toonz/Resources/butt_cap.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/butt_cap.svg b/toonz/sources/toonz/Resources/butt_cap.svg new file mode 100644 index 0000000..07e1015 --- /dev/null +++ b/toonz/sources/toonz/Resources/butt_cap.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelblue.png b/toonz/sources/toonz/Resources/channelblue.png deleted file mode 100644 index 0683e32..0000000 Binary files a/toonz/sources/toonz/Resources/channelblue.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelblue.svg b/toonz/sources/toonz/Resources/channelblue.svg index 97f44ea..151560a 100644 --- a/toonz/sources/toonz/Resources/channelblue.svg +++ b/toonz/sources/toonz/Resources/channelblue.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelblue_click.png b/toonz/sources/toonz/Resources/channelblue_click.png deleted file mode 100644 index 8a3b08e..0000000 Binary files a/toonz/sources/toonz/Resources/channelblue_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelblue_click.svg b/toonz/sources/toonz/Resources/channelblue_click.svg index 3df884e..c5d7244 100644 --- a/toonz/sources/toonz/Resources/channelblue_click.svg +++ b/toonz/sources/toonz/Resources/channelblue_click.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelblue_over.png b/toonz/sources/toonz/Resources/channelblue_over.png deleted file mode 100644 index 09f90d6..0000000 Binary files a/toonz/sources/toonz/Resources/channelblue_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelblue_over.svg b/toonz/sources/toonz/Resources/channelblue_over.svg index 1dae935..dfd1b95 100644 --- a/toonz/sources/toonz/Resources/channelblue_over.svg +++ b/toonz/sources/toonz/Resources/channelblue_over.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelgreen.png b/toonz/sources/toonz/Resources/channelgreen.png deleted file mode 100644 index 03160a4..0000000 Binary files a/toonz/sources/toonz/Resources/channelgreen.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelgreen.svg b/toonz/sources/toonz/Resources/channelgreen.svg index 82a3e1a..2cbf7a5 100644 --- a/toonz/sources/toonz/Resources/channelgreen.svg +++ b/toonz/sources/toonz/Resources/channelgreen.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelgreen_click.png b/toonz/sources/toonz/Resources/channelgreen_click.png deleted file mode 100644 index 1f958f2..0000000 Binary files a/toonz/sources/toonz/Resources/channelgreen_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelgreen_click.svg b/toonz/sources/toonz/Resources/channelgreen_click.svg index 457d160..2713893 100644 --- a/toonz/sources/toonz/Resources/channelgreen_click.svg +++ b/toonz/sources/toonz/Resources/channelgreen_click.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelgreen_over.png b/toonz/sources/toonz/Resources/channelgreen_over.png deleted file mode 100644 index e3ddc86..0000000 Binary files a/toonz/sources/toonz/Resources/channelgreen_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelgreen_over.svg b/toonz/sources/toonz/Resources/channelgreen_over.svg index e49ede8..aad0657 100644 --- a/toonz/sources/toonz/Resources/channelgreen_over.svg +++ b/toonz/sources/toonz/Resources/channelgreen_over.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelmatte.png b/toonz/sources/toonz/Resources/channelmatte.png deleted file mode 100644 index da89409..0000000 Binary files a/toonz/sources/toonz/Resources/channelmatte.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelmatte.svg b/toonz/sources/toonz/Resources/channelmatte.svg index 126a855..b7b92f8 100644 --- a/toonz/sources/toonz/Resources/channelmatte.svg +++ b/toonz/sources/toonz/Resources/channelmatte.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelmatte_click.png b/toonz/sources/toonz/Resources/channelmatte_click.png deleted file mode 100644 index 0fee16e..0000000 Binary files a/toonz/sources/toonz/Resources/channelmatte_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelmatte_click.svg b/toonz/sources/toonz/Resources/channelmatte_click.svg index 14d2f47..d357ce0 100644 --- a/toonz/sources/toonz/Resources/channelmatte_click.svg +++ b/toonz/sources/toonz/Resources/channelmatte_click.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelmatte_over.png b/toonz/sources/toonz/Resources/channelmatte_over.png deleted file mode 100644 index 176f20e..0000000 Binary files a/toonz/sources/toonz/Resources/channelmatte_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelmatte_over.svg b/toonz/sources/toonz/Resources/channelmatte_over.svg index 9a364da..b2c5896 100644 --- a/toonz/sources/toonz/Resources/channelmatte_over.svg +++ b/toonz/sources/toonz/Resources/channelmatte_over.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelred.png b/toonz/sources/toonz/Resources/channelred.png deleted file mode 100644 index eba971e..0000000 Binary files a/toonz/sources/toonz/Resources/channelred.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelred.svg b/toonz/sources/toonz/Resources/channelred.svg index b0a191f..6caf7cf 100644 --- a/toonz/sources/toonz/Resources/channelred.svg +++ b/toonz/sources/toonz/Resources/channelred.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelred_click.png b/toonz/sources/toonz/Resources/channelred_click.png deleted file mode 100644 index 9c15b93..0000000 Binary files a/toonz/sources/toonz/Resources/channelred_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelred_click.svg b/toonz/sources/toonz/Resources/channelred_click.svg index b200272..5902207 100644 --- a/toonz/sources/toonz/Resources/channelred_click.svg +++ b/toonz/sources/toonz/Resources/channelred_click.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/channelred_over.png b/toonz/sources/toonz/Resources/channelred_over.png deleted file mode 100644 index ed592d9..0000000 Binary files a/toonz/sources/toonz/Resources/channelred_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/channelred_over.svg b/toonz/sources/toonz/Resources/channelred_over.svg index a0a1efc..58cd793 100644 --- a/toonz/sources/toonz/Resources/channelred_over.svg +++ b/toonz/sources/toonz/Resources/channelred_over.svg @@ -1,38 +1,19 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cleanup_computing.png b/toonz/sources/toonz/Resources/cleanup_computing.png deleted file mode 100644 index 0cea776..0000000 Binary files a/toonz/sources/toonz/Resources/cleanup_computing.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cleanup_computing.svg b/toonz/sources/toonz/Resources/cleanup_computing.svg new file mode 100644 index 0000000..e2952b3 --- /dev/null +++ b/toonz/sources/toonz/Resources/cleanup_computing.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cleanup_done.png b/toonz/sources/toonz/Resources/cleanup_done.png deleted file mode 100644 index cafcd9a..0000000 Binary files a/toonz/sources/toonz/Resources/cleanup_done.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cleanup_done.svg b/toonz/sources/toonz/Resources/cleanup_done.svg new file mode 100644 index 0000000..1484bfb --- /dev/null +++ b/toonz/sources/toonz/Resources/cleanup_done.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cleanup_done_with_errors.png b/toonz/sources/toonz/Resources/cleanup_done_with_errors.png deleted file mode 100644 index 83462fa..0000000 Binary files a/toonz/sources/toonz/Resources/cleanup_done_with_errors.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cleanup_done_with_errors.svg b/toonz/sources/toonz/Resources/cleanup_done_with_errors.svg new file mode 100644 index 0000000..edd7981 --- /dev/null +++ b/toonz/sources/toonz/Resources/cleanup_done_with_errors.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cleanup_failed.png b/toonz/sources/toonz/Resources/cleanup_failed.png deleted file mode 100644 index 0ae0120..0000000 Binary files a/toonz/sources/toonz/Resources/cleanup_failed.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cleanup_failed.svg b/toonz/sources/toonz/Resources/cleanup_failed.svg new file mode 100644 index 0000000..f27676a --- /dev/null +++ b/toonz/sources/toonz/Resources/cleanup_failed.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cleanup_suspended.png b/toonz/sources/toonz/Resources/cleanup_suspended.png deleted file mode 100644 index 6edf133..0000000 Binary files a/toonz/sources/toonz/Resources/cleanup_suspended.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cleanup_suspended.svg b/toonz/sources/toonz/Resources/cleanup_suspended.svg new file mode 100644 index 0000000..b5b374c --- /dev/null +++ b/toonz/sources/toonz/Resources/cleanup_suspended.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cln_computing.png b/toonz/sources/toonz/Resources/cln_computing.png deleted file mode 100644 index b67cd8a..0000000 Binary files a/toonz/sources/toonz/Resources/cln_computing.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cln_computing.svg b/toonz/sources/toonz/Resources/cln_computing.svg new file mode 100644 index 0000000..da183ac --- /dev/null +++ b/toonz/sources/toonz/Resources/cln_computing.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cln_done.png b/toonz/sources/toonz/Resources/cln_done.png deleted file mode 100644 index 4977171..0000000 Binary files a/toonz/sources/toonz/Resources/cln_done.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cln_done.svg b/toonz/sources/toonz/Resources/cln_done.svg new file mode 100644 index 0000000..b7fe4b1 --- /dev/null +++ b/toonz/sources/toonz/Resources/cln_done.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cln_done_with_errors.png b/toonz/sources/toonz/Resources/cln_done_with_errors.png deleted file mode 100644 index 4c2ed78..0000000 Binary files a/toonz/sources/toonz/Resources/cln_done_with_errors.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cln_done_with_errors.svg b/toonz/sources/toonz/Resources/cln_done_with_errors.svg new file mode 100644 index 0000000..6769e5a --- /dev/null +++ b/toonz/sources/toonz/Resources/cln_done_with_errors.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cln_failed.png b/toonz/sources/toonz/Resources/cln_failed.png deleted file mode 100644 index 274d60c..0000000 Binary files a/toonz/sources/toonz/Resources/cln_failed.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cln_failed.svg b/toonz/sources/toonz/Resources/cln_failed.svg new file mode 100644 index 0000000..1151a7b --- /dev/null +++ b/toonz/sources/toonz/Resources/cln_failed.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/cln_suspended.png b/toonz/sources/toonz/Resources/cln_suspended.png deleted file mode 100644 index cf6bb9c..0000000 Binary files a/toonz/sources/toonz/Resources/cln_suspended.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/cln_suspended.svg b/toonz/sources/toonz/Resources/cln_suspended.svg new file mode 100644 index 0000000..a760467 --- /dev/null +++ b/toonz/sources/toonz/Resources/cln_suspended.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/compare.png b/toonz/sources/toonz/Resources/compare.png deleted file mode 100644 index aac7123..0000000 Binary files a/toonz/sources/toonz/Resources/compare.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/compare.svg b/toonz/sources/toonz/Resources/compare.svg new file mode 100644 index 0000000..597ccf8 --- /dev/null +++ b/toonz/sources/toonz/Resources/compare.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/compare_click.png b/toonz/sources/toonz/Resources/compare_click.png deleted file mode 100644 index 05d7fdb..0000000 Binary files a/toonz/sources/toonz/Resources/compare_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/compare_click.svg b/toonz/sources/toonz/Resources/compare_click.svg new file mode 100644 index 0000000..ff81b4f --- /dev/null +++ b/toonz/sources/toonz/Resources/compare_click.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/compare_over.png b/toonz/sources/toonz/Resources/compare_over.png deleted file mode 100644 index 7ed9f5c..0000000 Binary files a/toonz/sources/toonz/Resources/compare_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/compare_over.svg b/toonz/sources/toonz/Resources/compare_over.svg new file mode 100644 index 0000000..a1bf390 --- /dev/null +++ b/toonz/sources/toonz/Resources/compare_over.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/define_subcamera_preview.png b/toonz/sources/toonz/Resources/define_subcamera_preview.png deleted file mode 100644 index b4a27be..0000000 Binary files a/toonz/sources/toonz/Resources/define_subcamera_preview.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/define_subcamera_preview.svg b/toonz/sources/toonz/Resources/define_subcamera_preview.svg new file mode 100644 index 0000000..ea183b3 --- /dev/null +++ b/toonz/sources/toonz/Resources/define_subcamera_preview.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/define_subcamera_preview_click.png b/toonz/sources/toonz/Resources/define_subcamera_preview_click.png deleted file mode 100644 index 5ff535b..0000000 Binary files a/toonz/sources/toonz/Resources/define_subcamera_preview_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/define_subcamera_preview_click.svg b/toonz/sources/toonz/Resources/define_subcamera_preview_click.svg new file mode 100644 index 0000000..431667a --- /dev/null +++ b/toonz/sources/toonz/Resources/define_subcamera_preview_click.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/define_subcamera_preview_over.png b/toonz/sources/toonz/Resources/define_subcamera_preview_over.png deleted file mode 100644 index 30b7d77..0000000 Binary files a/toonz/sources/toonz/Resources/define_subcamera_preview_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/define_subcamera_preview_over.svg b/toonz/sources/toonz/Resources/define_subcamera_preview_over.svg new file mode 100644 index 0000000..3fd26fc --- /dev/null +++ b/toonz/sources/toonz/Resources/define_subcamera_preview_over.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/delete_off.png b/toonz/sources/toonz/Resources/delete_off.png deleted file mode 100644 index 4d545cd..0000000 Binary files a/toonz/sources/toonz/Resources/delete_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/delete_off.svg b/toonz/sources/toonz/Resources/delete_off.svg new file mode 100644 index 0000000..fc32734 --- /dev/null +++ b/toonz/sources/toonz/Resources/delete_off.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/delete_on.png b/toonz/sources/toonz/Resources/delete_on.png deleted file mode 100644 index a9ee116..0000000 Binary files a/toonz/sources/toonz/Resources/delete_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/delete_on.svg b/toonz/sources/toonz/Resources/delete_on.svg new file mode 100644 index 0000000..d37dd8e --- /dev/null +++ b/toonz/sources/toonz/Resources/delete_on.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/farm_tasks.png b/toonz/sources/toonz/Resources/farm_tasks.png deleted file mode 100644 index 20d2365..0000000 Binary files a/toonz/sources/toonz/Resources/farm_tasks.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/farm_tasks.svg b/toonz/sources/toonz/Resources/farm_tasks.svg new file mode 100644 index 0000000..8515433 --- /dev/null +++ b/toonz/sources/toonz/Resources/farm_tasks.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/fb_history_back_disable.png b/toonz/sources/toonz/Resources/fb_history_back_disable.png deleted file mode 100644 index a555412..0000000 Binary files a/toonz/sources/toonz/Resources/fb_history_back_disable.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/fb_history_back_disable.svg b/toonz/sources/toonz/Resources/fb_history_back_disable.svg new file mode 100644 index 0000000..2c6865b --- /dev/null +++ b/toonz/sources/toonz/Resources/fb_history_back_disable.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/fb_history_back_enable.png b/toonz/sources/toonz/Resources/fb_history_back_enable.png deleted file mode 100644 index a40b354..0000000 Binary files a/toonz/sources/toonz/Resources/fb_history_back_enable.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/fb_history_back_enable.svg b/toonz/sources/toonz/Resources/fb_history_back_enable.svg new file mode 100644 index 0000000..8141f38 --- /dev/null +++ b/toonz/sources/toonz/Resources/fb_history_back_enable.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/fb_history_fwd_disable.png b/toonz/sources/toonz/Resources/fb_history_fwd_disable.png deleted file mode 100644 index 4f6c56a..0000000 Binary files a/toonz/sources/toonz/Resources/fb_history_fwd_disable.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/fb_history_fwd_disable.svg b/toonz/sources/toonz/Resources/fb_history_fwd_disable.svg new file mode 100644 index 0000000..a6e0642 --- /dev/null +++ b/toonz/sources/toonz/Resources/fb_history_fwd_disable.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/fb_history_fwd_enable.png b/toonz/sources/toonz/Resources/fb_history_fwd_enable.png deleted file mode 100644 index d5d7a3b..0000000 Binary files a/toonz/sources/toonz/Resources/fb_history_fwd_enable.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/fb_history_fwd_enable.svg b/toonz/sources/toonz/Resources/fb_history_fwd_enable.svg new file mode 100644 index 0000000..00cc554 --- /dev/null +++ b/toonz/sources/toonz/Resources/fb_history_fwd_enable.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/folderup.png b/toonz/sources/toonz/Resources/folderup.png deleted file mode 100644 index 1da9162..0000000 Binary files a/toonz/sources/toonz/Resources/folderup.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/folderup.svg b/toonz/sources/toonz/Resources/folderup.svg new file mode 100644 index 0000000..18c928b --- /dev/null +++ b/toonz/sources/toonz/Resources/folderup.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/folderup_over.png b/toonz/sources/toonz/Resources/folderup_over.png deleted file mode 100644 index 8e18846..0000000 Binary files a/toonz/sources/toonz/Resources/folderup_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/folderup_over.svg b/toonz/sources/toonz/Resources/folderup_over.svg new file mode 100644 index 0000000..4f5a627 --- /dev/null +++ b/toonz/sources/toonz/Resources/folderup_over.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framefirst.png b/toonz/sources/toonz/Resources/framefirst.png deleted file mode 100644 index 9f6ae70..0000000 Binary files a/toonz/sources/toonz/Resources/framefirst.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framefirst.svg b/toonz/sources/toonz/Resources/framefirst.svg index 71fae3b..d1b3cd2 100644 --- a/toonz/sources/toonz/Resources/framefirst.svg +++ b/toonz/sources/toonz/Resources/framefirst.svg @@ -1,39 +1,20 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framefirst_click.png b/toonz/sources/toonz/Resources/framefirst_click.png deleted file mode 100644 index 247a234..0000000 Binary files a/toonz/sources/toonz/Resources/framefirst_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framefirst_click.svg b/toonz/sources/toonz/Resources/framefirst_click.svg index 5767acd..225680d 100644 --- a/toonz/sources/toonz/Resources/framefirst_click.svg +++ b/toonz/sources/toonz/Resources/framefirst_click.svg @@ -1,39 +1,24 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framefirst_over.png b/toonz/sources/toonz/Resources/framefirst_over.png deleted file mode 100644 index 247a234..0000000 Binary files a/toonz/sources/toonz/Resources/framefirst_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framefirst_over.svg b/toonz/sources/toonz/Resources/framefirst_over.svg index 399b3d2..88b653a 100644 --- a/toonz/sources/toonz/Resources/framefirst_over.svg +++ b/toonz/sources/toonz/Resources/framefirst_over.svg @@ -1,39 +1,24 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framelast.png b/toonz/sources/toonz/Resources/framelast.png deleted file mode 100644 index 15fa34a..0000000 Binary files a/toonz/sources/toonz/Resources/framelast.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framelast.svg b/toonz/sources/toonz/Resources/framelast.svg index 03fb54b..b4f321b 100644 --- a/toonz/sources/toonz/Resources/framelast.svg +++ b/toonz/sources/toonz/Resources/framelast.svg @@ -1,39 +1,24 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framelast_click.png b/toonz/sources/toonz/Resources/framelast_click.png deleted file mode 100644 index 2b95d35..0000000 Binary files a/toonz/sources/toonz/Resources/framelast_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framelast_click.svg b/toonz/sources/toonz/Resources/framelast_click.svg index b713370..29be56c 100644 --- a/toonz/sources/toonz/Resources/framelast_click.svg +++ b/toonz/sources/toonz/Resources/framelast_click.svg @@ -1,39 +1,24 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framelast_over.png b/toonz/sources/toonz/Resources/framelast_over.png deleted file mode 100644 index 2b95d35..0000000 Binary files a/toonz/sources/toonz/Resources/framelast_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framelast_over.svg b/toonz/sources/toonz/Resources/framelast_over.svg index b3c3985..b7aa303 100644 --- a/toonz/sources/toonz/Resources/framelast_over.svg +++ b/toonz/sources/toonz/Resources/framelast_over.svg @@ -1,39 +1,24 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framenext.png b/toonz/sources/toonz/Resources/framenext.png deleted file mode 100644 index 4366214..0000000 Binary files a/toonz/sources/toonz/Resources/framenext.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framenext.svg b/toonz/sources/toonz/Resources/framenext.svg index 4a44d82..3f255dc 100644 --- a/toonz/sources/toonz/Resources/framenext.svg +++ b/toonz/sources/toonz/Resources/framenext.svg @@ -1,39 +1,22 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framenext_click.png b/toonz/sources/toonz/Resources/framenext_click.png deleted file mode 100644 index 31472de..0000000 Binary files a/toonz/sources/toonz/Resources/framenext_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framenext_click.svg b/toonz/sources/toonz/Resources/framenext_click.svg index 30e8696..041acd8 100644 --- a/toonz/sources/toonz/Resources/framenext_click.svg +++ b/toonz/sources/toonz/Resources/framenext_click.svg @@ -1,39 +1,22 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/framenext_over.png b/toonz/sources/toonz/Resources/framenext_over.png deleted file mode 100644 index 31472de..0000000 Binary files a/toonz/sources/toonz/Resources/framenext_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/framenext_over.svg b/toonz/sources/toonz/Resources/framenext_over.svg index 95776b2..468a525 100644 --- a/toonz/sources/toonz/Resources/framenext_over.svg +++ b/toonz/sources/toonz/Resources/framenext_over.svg @@ -1,39 +1,22 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/frameprev.png b/toonz/sources/toonz/Resources/frameprev.png deleted file mode 100644 index 3993839..0000000 Binary files a/toonz/sources/toonz/Resources/frameprev.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/frameprev.svg b/toonz/sources/toonz/Resources/frameprev.svg index 69b23e3..7bb8920 100644 --- a/toonz/sources/toonz/Resources/frameprev.svg +++ b/toonz/sources/toonz/Resources/frameprev.svg @@ -1,39 +1,24 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/frameprev_click.png b/toonz/sources/toonz/Resources/frameprev_click.png deleted file mode 100644 index a98be27..0000000 Binary files a/toonz/sources/toonz/Resources/frameprev_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/frameprev_click.svg b/toonz/sources/toonz/Resources/frameprev_click.svg index 09efaa6..e56f0d1 100644 --- a/toonz/sources/toonz/Resources/frameprev_click.svg +++ b/toonz/sources/toonz/Resources/frameprev_click.svg @@ -1,39 +1,22 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/frameprev_over.png b/toonz/sources/toonz/Resources/frameprev_over.png deleted file mode 100644 index a98be27..0000000 Binary files a/toonz/sources/toonz/Resources/frameprev_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/frameprev_over.svg b/toonz/sources/toonz/Resources/frameprev_over.svg index a461466..ee23bb7 100644 --- a/toonz/sources/toonz/Resources/frameprev_over.svg +++ b/toonz/sources/toonz/Resources/frameprev_over.svg @@ -1,39 +1,22 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_B.png b/toonz/sources/toonz/Resources/half_B.png deleted file mode 100644 index 9361c07..0000000 Binary files a/toonz/sources/toonz/Resources/half_B.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_B.svg b/toonz/sources/toonz/Resources/half_B.svg new file mode 100644 index 0000000..fef1eae --- /dev/null +++ b/toonz/sources/toonz/Resources/half_B.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_B_click.png b/toonz/sources/toonz/Resources/half_B_click.png deleted file mode 100644 index a830a1c..0000000 Binary files a/toonz/sources/toonz/Resources/half_B_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_B_click.svg b/toonz/sources/toonz/Resources/half_B_click.svg new file mode 100644 index 0000000..5a33c09 --- /dev/null +++ b/toonz/sources/toonz/Resources/half_B_click.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_B_over.png b/toonz/sources/toonz/Resources/half_B_over.png deleted file mode 100644 index d35ce2c..0000000 Binary files a/toonz/sources/toonz/Resources/half_B_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_B_over.svg b/toonz/sources/toonz/Resources/half_B_over.svg new file mode 100644 index 0000000..a1dad7e --- /dev/null +++ b/toonz/sources/toonz/Resources/half_B_over.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_G.png b/toonz/sources/toonz/Resources/half_G.png deleted file mode 100644 index 84f43d6..0000000 Binary files a/toonz/sources/toonz/Resources/half_G.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_G.svg b/toonz/sources/toonz/Resources/half_G.svg new file mode 100644 index 0000000..c66acab --- /dev/null +++ b/toonz/sources/toonz/Resources/half_G.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_G_click.png b/toonz/sources/toonz/Resources/half_G_click.png deleted file mode 100644 index 6fb4e67..0000000 Binary files a/toonz/sources/toonz/Resources/half_G_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_G_click.svg b/toonz/sources/toonz/Resources/half_G_click.svg new file mode 100644 index 0000000..7b2235d --- /dev/null +++ b/toonz/sources/toonz/Resources/half_G_click.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_G_over.png b/toonz/sources/toonz/Resources/half_G_over.png deleted file mode 100644 index ad8548f..0000000 Binary files a/toonz/sources/toonz/Resources/half_G_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_G_over.svg b/toonz/sources/toonz/Resources/half_G_over.svg new file mode 100644 index 0000000..608778d --- /dev/null +++ b/toonz/sources/toonz/Resources/half_G_over.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_R.png b/toonz/sources/toonz/Resources/half_R.png deleted file mode 100644 index 3cb1f46..0000000 Binary files a/toonz/sources/toonz/Resources/half_R.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_R.svg b/toonz/sources/toonz/Resources/half_R.svg new file mode 100644 index 0000000..4f2182e --- /dev/null +++ b/toonz/sources/toonz/Resources/half_R.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_R_click.png b/toonz/sources/toonz/Resources/half_R_click.png deleted file mode 100644 index 07a26fb..0000000 Binary files a/toonz/sources/toonz/Resources/half_R_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_R_click.svg b/toonz/sources/toonz/Resources/half_R_click.svg new file mode 100644 index 0000000..71d4de6 --- /dev/null +++ b/toonz/sources/toonz/Resources/half_R_click.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_R_over.png b/toonz/sources/toonz/Resources/half_R_over.png deleted file mode 100644 index b3f61bc..0000000 Binary files a/toonz/sources/toonz/Resources/half_R_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_R_over.svg b/toonz/sources/toonz/Resources/half_R_over.svg new file mode 100644 index 0000000..64c761d --- /dev/null +++ b/toonz/sources/toonz/Resources/half_R_over.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_bw.png b/toonz/sources/toonz/Resources/half_bw.png deleted file mode 100644 index c39240a..0000000 Binary files a/toonz/sources/toonz/Resources/half_bw.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_bw.svg b/toonz/sources/toonz/Resources/half_bw.svg new file mode 100644 index 0000000..3afb63d --- /dev/null +++ b/toonz/sources/toonz/Resources/half_bw.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_bw_click.png b/toonz/sources/toonz/Resources/half_bw_click.png deleted file mode 100644 index 8f6c1dd..0000000 Binary files a/toonz/sources/toonz/Resources/half_bw_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_bw_click.svg b/toonz/sources/toonz/Resources/half_bw_click.svg new file mode 100644 index 0000000..c13bc65 --- /dev/null +++ b/toonz/sources/toonz/Resources/half_bw_click.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/half_bw_over.png b/toonz/sources/toonz/Resources/half_bw_over.png deleted file mode 100644 index 2d1291e..0000000 Binary files a/toonz/sources/toonz/Resources/half_bw_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/half_bw_over.svg b/toonz/sources/toonz/Resources/half_bw_over.svg new file mode 100644 index 0000000..eacd1e1 --- /dev/null +++ b/toonz/sources/toonz/Resources/half_bw_over.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/histograms.svg b/toonz/sources/toonz/Resources/histograms.svg new file mode 100644 index 0000000..29ecf29 --- /dev/null +++ b/toonz/sources/toonz/Resources/histograms.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/histograms_click.svg b/toonz/sources/toonz/Resources/histograms_click.svg new file mode 100644 index 0000000..927b21b --- /dev/null +++ b/toonz/sources/toonz/Resources/histograms_click.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/histograms_over.svg b/toonz/sources/toonz/Resources/histograms_over.svg new file mode 100644 index 0000000..5356a5c --- /dev/null +++ b/toonz/sources/toonz/Resources/histograms_over.svg @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/load_off.png b/toonz/sources/toonz/Resources/load_off.png deleted file mode 100644 index 6cb4e5a..0000000 Binary files a/toonz/sources/toonz/Resources/load_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/load_off.svg b/toonz/sources/toonz/Resources/load_off.svg new file mode 100644 index 0000000..540ba14 --- /dev/null +++ b/toonz/sources/toonz/Resources/load_off.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/load_on.png b/toonz/sources/toonz/Resources/load_on.png deleted file mode 100644 index 212aa55..0000000 Binary files a/toonz/sources/toonz/Resources/load_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/load_on.svg b/toonz/sources/toonz/Resources/load_on.svg new file mode 100644 index 0000000..0a34e34 --- /dev/null +++ b/toonz/sources/toonz/Resources/load_on.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/locator.png b/toonz/sources/toonz/Resources/locator.png deleted file mode 100644 index 439df63..0000000 Binary files a/toonz/sources/toonz/Resources/locator.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/locator.svg b/toonz/sources/toonz/Resources/locator.svg new file mode 100644 index 0000000..09ec776 --- /dev/null +++ b/toonz/sources/toonz/Resources/locator.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/locator_click.png b/toonz/sources/toonz/Resources/locator_click.png deleted file mode 100644 index 8045221..0000000 Binary files a/toonz/sources/toonz/Resources/locator_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/locator_click.svg b/toonz/sources/toonz/Resources/locator_click.svg new file mode 100644 index 0000000..289b49b --- /dev/null +++ b/toonz/sources/toonz/Resources/locator_click.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/locator_over.png b/toonz/sources/toonz/Resources/locator_over.png deleted file mode 100644 index 8045221..0000000 Binary files a/toonz/sources/toonz/Resources/locator_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/locator_over.svg b/toonz/sources/toonz/Resources/locator_over.svg new file mode 100644 index 0000000..1318919 --- /dev/null +++ b/toonz/sources/toonz/Resources/locator_over.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/loop.png b/toonz/sources/toonz/Resources/loop.png deleted file mode 100644 index b2f612c..0000000 Binary files a/toonz/sources/toonz/Resources/loop.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/loop.svg b/toonz/sources/toonz/Resources/loop.svg index 0fd7774..b8bd788 100644 --- a/toonz/sources/toonz/Resources/loop.svg +++ b/toonz/sources/toonz/Resources/loop.svg @@ -1,50 +1,17 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/toonz/sources/toonz/Resources/loop_click.png b/toonz/sources/toonz/Resources/loop_click.png deleted file mode 100644 index 61c53b4..0000000 Binary files a/toonz/sources/toonz/Resources/loop_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/loop_click.svg b/toonz/sources/toonz/Resources/loop_click.svg index dbb1ba9..347556f 100644 --- a/toonz/sources/toonz/Resources/loop_click.svg +++ b/toonz/sources/toonz/Resources/loop_click.svg @@ -1,50 +1,21 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/loop_over.png b/toonz/sources/toonz/Resources/loop_over.png deleted file mode 100644 index 61c53b4..0000000 Binary files a/toonz/sources/toonz/Resources/loop_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/loop_over.svg b/toonz/sources/toonz/Resources/loop_over.svg index dbb1ba9..778309a 100644 --- a/toonz/sources/toonz/Resources/loop_over.svg +++ b/toonz/sources/toonz/Resources/loop_over.svg @@ -1,50 +1,21 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/missing.png b/toonz/sources/toonz/Resources/missing.png deleted file mode 100644 index 7f6199f..0000000 Binary files a/toonz/sources/toonz/Resources/missing.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/missing.svg b/toonz/sources/toonz/Resources/missing.svg new file mode 100644 index 0000000..3a3c61f --- /dev/null +++ b/toonz/sources/toonz/Resources/missing.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + ? + + diff --git a/toonz/sources/toonz/Resources/miter_join.png b/toonz/sources/toonz/Resources/miter_join.png deleted file mode 100644 index 994d12a..0000000 Binary files a/toonz/sources/toonz/Resources/miter_join.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/miter_join.svg b/toonz/sources/toonz/Resources/miter_join.svg new file mode 100644 index 0000000..4b6eb5c --- /dev/null +++ b/toonz/sources/toonz/Resources/miter_join.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/newmemo.png b/toonz/sources/toonz/Resources/newmemo.png deleted file mode 100644 index 8d56006..0000000 Binary files a/toonz/sources/toonz/Resources/newmemo.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/newmemo.svg b/toonz/sources/toonz/Resources/newmemo.svg new file mode 100644 index 0000000..3388f47 --- /dev/null +++ b/toonz/sources/toonz/Resources/newmemo.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/newmemo_disabled.png b/toonz/sources/toonz/Resources/newmemo_disabled.png deleted file mode 100644 index 5336171..0000000 Binary files a/toonz/sources/toonz/Resources/newmemo_disabled.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/newmemo_disabled.svg b/toonz/sources/toonz/Resources/newmemo_disabled.svg new file mode 100644 index 0000000..f707bac --- /dev/null +++ b/toonz/sources/toonz/Resources/newmemo_disabled.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/newpage.png b/toonz/sources/toonz/Resources/newpage.png deleted file mode 100644 index c40780f..0000000 Binary files a/toonz/sources/toonz/Resources/newpage.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/newpage_over.png b/toonz/sources/toonz/Resources/newpage_over.png deleted file mode 100644 index 96c4534..0000000 Binary files a/toonz/sources/toonz/Resources/newpage_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/pause.png b/toonz/sources/toonz/Resources/pause.png deleted file mode 100644 index b99784e..0000000 Binary files a/toonz/sources/toonz/Resources/pause.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/pause.svg b/toonz/sources/toonz/Resources/pause.svg index ac525f9..44f3bf7 100644 --- a/toonz/sources/toonz/Resources/pause.svg +++ b/toonz/sources/toonz/Resources/pause.svg @@ -1,39 +1,22 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/pause_click.png b/toonz/sources/toonz/Resources/pause_click.png deleted file mode 100644 index bbf2422..0000000 Binary files a/toonz/sources/toonz/Resources/pause_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/pause_click.svg b/toonz/sources/toonz/Resources/pause_click.svg index e56d71b..95fdd44 100644 --- a/toonz/sources/toonz/Resources/pause_click.svg +++ b/toonz/sources/toonz/Resources/pause_click.svg @@ -1,39 +1,22 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/pause_disabled.png b/toonz/sources/toonz/Resources/pause_disabled.png deleted file mode 100644 index d7241fc..0000000 Binary files a/toonz/sources/toonz/Resources/pause_disabled.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/pause_disabled.svg b/toonz/sources/toonz/Resources/pause_disabled.svg new file mode 100644 index 0000000..cacde7e --- /dev/null +++ b/toonz/sources/toonz/Resources/pause_disabled.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/pause_over.png b/toonz/sources/toonz/Resources/pause_over.png deleted file mode 100644 index bbf2422..0000000 Binary files a/toonz/sources/toonz/Resources/pause_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/pause_over.svg b/toonz/sources/toonz/Resources/pause_over.svg index e56d71b..8454058 100644 --- a/toonz/sources/toonz/Resources/pause_over.svg +++ b/toonz/sources/toonz/Resources/pause_over.svg @@ -1,39 +1,22 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/play.png b/toonz/sources/toonz/Resources/play.png deleted file mode 100644 index cc7b4f3..0000000 Binary files a/toonz/sources/toonz/Resources/play.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/play.svg b/toonz/sources/toonz/Resources/play.svg index 7eb4b20..82acb02 100644 --- a/toonz/sources/toonz/Resources/play.svg +++ b/toonz/sources/toonz/Resources/play.svg @@ -1,37 +1,15 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/toonz/sources/toonz/Resources/play_click.png b/toonz/sources/toonz/Resources/play_click.png deleted file mode 100644 index a8a6219..0000000 Binary files a/toonz/sources/toonz/Resources/play_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/play_click.svg b/toonz/sources/toonz/Resources/play_click.svg index 9180fdf..c63628d 100644 --- a/toonz/sources/toonz/Resources/play_click.svg +++ b/toonz/sources/toonz/Resources/play_click.svg @@ -1,37 +1,13 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + diff --git a/toonz/sources/toonz/Resources/play_disabled.png b/toonz/sources/toonz/Resources/play_disabled.png deleted file mode 100644 index 2471d45..0000000 Binary files a/toonz/sources/toonz/Resources/play_disabled.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/play_disabled.svg b/toonz/sources/toonz/Resources/play_disabled.svg new file mode 100644 index 0000000..4ebac08 --- /dev/null +++ b/toonz/sources/toonz/Resources/play_disabled.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/play_over.png b/toonz/sources/toonz/Resources/play_over.png deleted file mode 100644 index a8a6219..0000000 Binary files a/toonz/sources/toonz/Resources/play_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/play_over.svg b/toonz/sources/toonz/Resources/play_over.svg index 9180fdf..74d1d0c 100644 --- a/toonz/sources/toonz/Resources/play_over.svg +++ b/toonz/sources/toonz/Resources/play_over.svg @@ -1,37 +1,15 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/toonz/sources/toonz/Resources/projecting_cap.png b/toonz/sources/toonz/Resources/projecting_cap.png deleted file mode 100644 index 43e417f..0000000 Binary files a/toonz/sources/toonz/Resources/projecting_cap.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/projecting_cap.svg b/toonz/sources/toonz/Resources/projecting_cap.svg new file mode 100644 index 0000000..8c1b8d3 --- /dev/null +++ b/toonz/sources/toonz/Resources/projecting_cap.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/record.png b/toonz/sources/toonz/Resources/record.png deleted file mode 100644 index b58f39d..0000000 Binary files a/toonz/sources/toonz/Resources/record.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/record.svg b/toonz/sources/toonz/Resources/record.svg new file mode 100644 index 0000000..847106d --- /dev/null +++ b/toonz/sources/toonz/Resources/record.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/record_click.png b/toonz/sources/toonz/Resources/record_click.png deleted file mode 100644 index b58f39d..0000000 Binary files a/toonz/sources/toonz/Resources/record_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/record_click.svg b/toonz/sources/toonz/Resources/record_click.svg new file mode 100644 index 0000000..7254c7f --- /dev/null +++ b/toonz/sources/toonz/Resources/record_click.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/record_disabled.png b/toonz/sources/toonz/Resources/record_disabled.png deleted file mode 100644 index e52c1af..0000000 Binary files a/toonz/sources/toonz/Resources/record_disabled.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/record_disabled.svg b/toonz/sources/toonz/Resources/record_disabled.svg new file mode 100644 index 0000000..d74dcfb --- /dev/null +++ b/toonz/sources/toonz/Resources/record_disabled.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/record_over.png b/toonz/sources/toonz/Resources/record_over.png deleted file mode 100644 index b58f39d..0000000 Binary files a/toonz/sources/toonz/Resources/record_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/record_over.svg b/toonz/sources/toonz/Resources/record_over.svg new file mode 100644 index 0000000..8e19fa6 --- /dev/null +++ b/toonz/sources/toonz/Resources/record_over.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/refresh.png b/toonz/sources/toonz/Resources/refresh.png deleted file mode 100644 index ac100b8..0000000 Binary files a/toonz/sources/toonz/Resources/refresh.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/refresh.svg b/toonz/sources/toonz/Resources/refresh.svg new file mode 100644 index 0000000..a884f38 --- /dev/null +++ b/toonz/sources/toonz/Resources/refresh.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/refresh_over.png b/toonz/sources/toonz/Resources/refresh_over.png deleted file mode 100644 index 987448e..0000000 Binary files a/toonz/sources/toonz/Resources/refresh_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/refresh_over.svg b/toonz/sources/toonz/Resources/refresh_over.svg new file mode 100644 index 0000000..4168460 --- /dev/null +++ b/toonz/sources/toonz/Resources/refresh_over.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/render_computing.png b/toonz/sources/toonz/Resources/render_computing.png deleted file mode 100644 index 44d3c75..0000000 Binary files a/toonz/sources/toonz/Resources/render_computing.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/render_computing.svg b/toonz/sources/toonz/Resources/render_computing.svg new file mode 100644 index 0000000..d7a2abd --- /dev/null +++ b/toonz/sources/toonz/Resources/render_computing.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/render_done.png b/toonz/sources/toonz/Resources/render_done.png deleted file mode 100644 index c916027..0000000 Binary files a/toonz/sources/toonz/Resources/render_done.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/render_done.svg b/toonz/sources/toonz/Resources/render_done.svg new file mode 100644 index 0000000..fa4039b --- /dev/null +++ b/toonz/sources/toonz/Resources/render_done.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/render_done_with_errors.png b/toonz/sources/toonz/Resources/render_done_with_errors.png deleted file mode 100644 index 476d12d..0000000 Binary files a/toonz/sources/toonz/Resources/render_done_with_errors.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/render_done_with_errors.svg b/toonz/sources/toonz/Resources/render_done_with_errors.svg new file mode 100644 index 0000000..a019c16 --- /dev/null +++ b/toonz/sources/toonz/Resources/render_done_with_errors.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/render_failed.png b/toonz/sources/toonz/Resources/render_failed.png deleted file mode 100644 index ae99eb5..0000000 Binary files a/toonz/sources/toonz/Resources/render_failed.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/render_failed.svg b/toonz/sources/toonz/Resources/render_failed.svg new file mode 100644 index 0000000..a4a6044 --- /dev/null +++ b/toonz/sources/toonz/Resources/render_failed.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/render_suspended.png b/toonz/sources/toonz/Resources/render_suspended.png deleted file mode 100644 index fa751f9..0000000 Binary files a/toonz/sources/toonz/Resources/render_suspended.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/render_suspended.svg b/toonz/sources/toonz/Resources/render_suspended.svg new file mode 100644 index 0000000..274dc8a --- /dev/null +++ b/toonz/sources/toonz/Resources/render_suspended.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/round_cap.png b/toonz/sources/toonz/Resources/round_cap.png deleted file mode 100644 index 85a3142..0000000 Binary files a/toonz/sources/toonz/Resources/round_cap.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/round_cap.svg b/toonz/sources/toonz/Resources/round_cap.svg new file mode 100644 index 0000000..bb153dd --- /dev/null +++ b/toonz/sources/toonz/Resources/round_cap.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/round_join.png b/toonz/sources/toonz/Resources/round_join.png deleted file mode 100644 index 877e443..0000000 Binary files a/toonz/sources/toonz/Resources/round_join.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/round_join.svg b/toonz/sources/toonz/Resources/round_join.svg new file mode 100644 index 0000000..f25f7cc --- /dev/null +++ b/toonz/sources/toonz/Resources/round_join.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/save_off.png b/toonz/sources/toonz/Resources/save_off.png deleted file mode 100644 index 0d0742b..0000000 Binary files a/toonz/sources/toonz/Resources/save_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/save_off.svg b/toonz/sources/toonz/Resources/save_off.svg new file mode 100644 index 0000000..7ee9aad --- /dev/null +++ b/toonz/sources/toonz/Resources/save_off.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/save_on.png b/toonz/sources/toonz/Resources/save_on.png deleted file mode 100644 index 9d7360f..0000000 Binary files a/toonz/sources/toonz/Resources/save_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/save_on.svg b/toonz/sources/toonz/Resources/save_on.svg new file mode 100644 index 0000000..d0a628e --- /dev/null +++ b/toonz/sources/toonz/Resources/save_on.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/saveas_off.png b/toonz/sources/toonz/Resources/saveas_off.png deleted file mode 100644 index c41cbde..0000000 Binary files a/toonz/sources/toonz/Resources/saveas_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/saveas_off.svg b/toonz/sources/toonz/Resources/saveas_off.svg new file mode 100644 index 0000000..ac0100c --- /dev/null +++ b/toonz/sources/toonz/Resources/saveas_off.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/saveas_on.png b/toonz/sources/toonz/Resources/saveas_on.png deleted file mode 100644 index ad7cdb9..0000000 Binary files a/toonz/sources/toonz/Resources/saveas_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/saveas_on.svg b/toonz/sources/toonz/Resources/saveas_on.svg new file mode 100644 index 0000000..7edd6f6 --- /dev/null +++ b/toonz/sources/toonz/Resources/saveas_on.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/snapshot.png b/toonz/sources/toonz/Resources/snapshot.png deleted file mode 100644 index d479c49..0000000 Binary files a/toonz/sources/toonz/Resources/snapshot.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/snapshot.svg b/toonz/sources/toonz/Resources/snapshot.svg new file mode 100644 index 0000000..e8b2ad3 --- /dev/null +++ b/toonz/sources/toonz/Resources/snapshot.svg @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/snapshot_click.png b/toonz/sources/toonz/Resources/snapshot_click.png deleted file mode 100644 index 249d3ec..0000000 Binary files a/toonz/sources/toonz/Resources/snapshot_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/snapshot_click.svg b/toonz/sources/toonz/Resources/snapshot_click.svg new file mode 100644 index 0000000..9c9d1da --- /dev/null +++ b/toonz/sources/toonz/Resources/snapshot_click.svg @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/snapshot_over.png b/toonz/sources/toonz/Resources/snapshot_over.png deleted file mode 100644 index d479c49..0000000 Binary files a/toonz/sources/toonz/Resources/snapshot_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/snapshot_over.svg b/toonz/sources/toonz/Resources/snapshot_over.svg new file mode 100644 index 0000000..2875a1d --- /dev/null +++ b/toonz/sources/toonz/Resources/snapshot_over.svg @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/sound.png b/toonz/sources/toonz/Resources/sound.png deleted file mode 100644 index ee6c741..0000000 Binary files a/toonz/sources/toonz/Resources/sound.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/sound.svg b/toonz/sources/toonz/Resources/sound.svg new file mode 100644 index 0000000..656769f --- /dev/null +++ b/toonz/sources/toonz/Resources/sound.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/sound_click.png b/toonz/sources/toonz/Resources/sound_click.png deleted file mode 100644 index a88cb27..0000000 Binary files a/toonz/sources/toonz/Resources/sound_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/sound_click.svg b/toonz/sources/toonz/Resources/sound_click.svg new file mode 100644 index 0000000..9c52db4 --- /dev/null +++ b/toonz/sources/toonz/Resources/sound_click.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/sound_over.png b/toonz/sources/toonz/Resources/sound_over.png deleted file mode 100644 index 2562a90..0000000 Binary files a/toonz/sources/toonz/Resources/sound_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/sound_over.svg b/toonz/sources/toonz/Resources/sound_over.svg new file mode 100644 index 0000000..ced895f --- /dev/null +++ b/toonz/sources/toonz/Resources/sound_over.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/splash.png b/toonz/sources/toonz/Resources/splash.png deleted file mode 100644 index 0a9395a..0000000 Binary files a/toonz/sources/toonz/Resources/splash.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/splash.svg b/toonz/sources/toonz/Resources/splash.svg new file mode 100644 index 0000000..644175b --- /dev/null +++ b/toonz/sources/toonz/Resources/splash.svg @@ -0,0 +1,802 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/start_off.png b/toonz/sources/toonz/Resources/start_off.png deleted file mode 100644 index 6eb60d7..0000000 Binary files a/toonz/sources/toonz/Resources/start_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/start_off.svg b/toonz/sources/toonz/Resources/start_off.svg new file mode 100644 index 0000000..8cdb0d0 --- /dev/null +++ b/toonz/sources/toonz/Resources/start_off.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/start_on.png b/toonz/sources/toonz/Resources/start_on.png deleted file mode 100644 index fea99a5..0000000 Binary files a/toonz/sources/toonz/Resources/start_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/start_on.svg b/toonz/sources/toonz/Resources/start_on.svg new file mode 100644 index 0000000..51d23e0 --- /dev/null +++ b/toonz/sources/toonz/Resources/start_on.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/stop.png b/toonz/sources/toonz/Resources/stop.png deleted file mode 100644 index 8bf569a..0000000 Binary files a/toonz/sources/toonz/Resources/stop.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/stop.svg b/toonz/sources/toonz/Resources/stop.svg new file mode 100644 index 0000000..04e734d --- /dev/null +++ b/toonz/sources/toonz/Resources/stop.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/stop_click.png b/toonz/sources/toonz/Resources/stop_click.png deleted file mode 100644 index 8bf569a..0000000 Binary files a/toonz/sources/toonz/Resources/stop_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/stop_click.svg b/toonz/sources/toonz/Resources/stop_click.svg new file mode 100644 index 0000000..e17a4ff --- /dev/null +++ b/toonz/sources/toonz/Resources/stop_click.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/stop_disabled.png b/toonz/sources/toonz/Resources/stop_disabled.png deleted file mode 100644 index 4924e9a..0000000 Binary files a/toonz/sources/toonz/Resources/stop_disabled.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/stop_disabled.svg b/toonz/sources/toonz/Resources/stop_disabled.svg new file mode 100644 index 0000000..01864de --- /dev/null +++ b/toonz/sources/toonz/Resources/stop_disabled.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/stop_off.png b/toonz/sources/toonz/Resources/stop_off.png deleted file mode 100644 index 6048019..0000000 Binary files a/toonz/sources/toonz/Resources/stop_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/stop_off.svg b/toonz/sources/toonz/Resources/stop_off.svg new file mode 100644 index 0000000..372bf61 --- /dev/null +++ b/toonz/sources/toonz/Resources/stop_off.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/toonz/sources/toonz/Resources/stop_on.png b/toonz/sources/toonz/Resources/stop_on.png deleted file mode 100644 index bef4134..0000000 Binary files a/toonz/sources/toonz/Resources/stop_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/stop_on.svg b/toonz/sources/toonz/Resources/stop_on.svg new file mode 100644 index 0000000..101d753 --- /dev/null +++ b/toonz/sources/toonz/Resources/stop_on.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/toonz/sources/toonz/Resources/stop_over.png b/toonz/sources/toonz/Resources/stop_over.png deleted file mode 100644 index 8bf569a..0000000 Binary files a/toonz/sources/toonz/Resources/stop_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/stop_over.svg b/toonz/sources/toonz/Resources/stop_over.svg new file mode 100644 index 0000000..94c6507 --- /dev/null +++ b/toonz/sources/toonz/Resources/stop_over.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/swap_off.png b/toonz/sources/toonz/Resources/swap_off.png deleted file mode 100644 index 6ba43b4..0000000 Binary files a/toonz/sources/toonz/Resources/swap_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/swap_off.svg b/toonz/sources/toonz/Resources/swap_off.svg new file mode 100644 index 0000000..9cc7c66 --- /dev/null +++ b/toonz/sources/toonz/Resources/swap_off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonz/Resources/swap_on.png b/toonz/sources/toonz/Resources/swap_on.png deleted file mode 100644 index 63b0a7e..0000000 Binary files a/toonz/sources/toonz/Resources/swap_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/swap_on.svg b/toonz/sources/toonz/Resources/swap_on.svg new file mode 100644 index 0000000..0cb56c3 --- /dev/null +++ b/toonz/sources/toonz/Resources/swap_on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonz/Resources/use_subcamera_preview.png b/toonz/sources/toonz/Resources/use_subcamera_preview.png deleted file mode 100644 index f6ee8be..0000000 Binary files a/toonz/sources/toonz/Resources/use_subcamera_preview.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/use_subcamera_preview.svg b/toonz/sources/toonz/Resources/use_subcamera_preview.svg new file mode 100644 index 0000000..fdbc7d5 --- /dev/null +++ b/toonz/sources/toonz/Resources/use_subcamera_preview.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/use_subcamera_preview_click.png b/toonz/sources/toonz/Resources/use_subcamera_preview_click.png deleted file mode 100644 index 935b359..0000000 Binary files a/toonz/sources/toonz/Resources/use_subcamera_preview_click.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/use_subcamera_preview_click.svg b/toonz/sources/toonz/Resources/use_subcamera_preview_click.svg new file mode 100644 index 0000000..1918304 --- /dev/null +++ b/toonz/sources/toonz/Resources/use_subcamera_preview_click.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/use_subcamera_preview_over.png b/toonz/sources/toonz/Resources/use_subcamera_preview_over.png deleted file mode 100644 index 6136a92..0000000 Binary files a/toonz/sources/toonz/Resources/use_subcamera_preview_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/use_subcamera_preview_over.svg b/toonz/sources/toonz/Resources/use_subcamera_preview_over.svg new file mode 100644 index 0000000..6176434 --- /dev/null +++ b/toonz/sources/toonz/Resources/use_subcamera_preview_over.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/viewicon_off.png b/toonz/sources/toonz/Resources/viewicon_off.png deleted file mode 100644 index 962447c..0000000 Binary files a/toonz/sources/toonz/Resources/viewicon_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/viewicon_off.svg b/toonz/sources/toonz/Resources/viewicon_off.svg new file mode 100644 index 0000000..57d8874 --- /dev/null +++ b/toonz/sources/toonz/Resources/viewicon_off.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/viewicon_on.png b/toonz/sources/toonz/Resources/viewicon_on.png deleted file mode 100644 index 6f069d0..0000000 Binary files a/toonz/sources/toonz/Resources/viewicon_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/viewicon_on.svg b/toonz/sources/toonz/Resources/viewicon_on.svg new file mode 100644 index 0000000..a4229c7 --- /dev/null +++ b/toonz/sources/toonz/Resources/viewicon_on.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/viewicon_over.png b/toonz/sources/toonz/Resources/viewicon_over.png deleted file mode 100644 index 5a5b8c3..0000000 Binary files a/toonz/sources/toonz/Resources/viewicon_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/viewicon_over.svg b/toonz/sources/toonz/Resources/viewicon_over.svg new file mode 100644 index 0000000..e962264 --- /dev/null +++ b/toonz/sources/toonz/Resources/viewicon_over.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/viewlist_off.png b/toonz/sources/toonz/Resources/viewlist_off.png deleted file mode 100644 index 4493174..0000000 Binary files a/toonz/sources/toonz/Resources/viewlist_off.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/viewlist_off.svg b/toonz/sources/toonz/Resources/viewlist_off.svg new file mode 100644 index 0000000..3b99e3b --- /dev/null +++ b/toonz/sources/toonz/Resources/viewlist_off.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/viewlist_on.png b/toonz/sources/toonz/Resources/viewlist_on.png deleted file mode 100644 index d7dffa2..0000000 Binary files a/toonz/sources/toonz/Resources/viewlist_on.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/viewlist_on.svg b/toonz/sources/toonz/Resources/viewlist_on.svg new file mode 100644 index 0000000..db105ba --- /dev/null +++ b/toonz/sources/toonz/Resources/viewlist_on.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/Resources/viewlist_over.png b/toonz/sources/toonz/Resources/viewlist_over.png deleted file mode 100644 index 77315ad..0000000 Binary files a/toonz/sources/toonz/Resources/viewlist_over.png and /dev/null differ diff --git a/toonz/sources/toonz/Resources/viewlist_over.svg b/toonz/sources/toonz/Resources/viewlist_over.svg new file mode 100644 index 0000000..8400456 --- /dev/null +++ b/toonz/sources/toonz/Resources/viewlist_over.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/audiorecordingpopup.cpp b/toonz/sources/toonz/audiorecordingpopup.cpp index 69ae7c7..9a38077 100644 --- a/toonz/sources/toonz/audiorecordingpopup.cpp +++ b/toonz/sources/toonz/audiorecordingpopup.cpp @@ -86,23 +86,27 @@ AudioRecordingPopup::AudioRecordingPopup() m_pauseRecordingButton->setMaximumWidth(25); m_pausePlaybackButton->setMaximumWidth(25); - QString playDisabled = QString(":Resources/play_disabled.png"); - QString pauseDisabled = QString(":Resources/pause_disabled.png"); - QString stopDisabled = QString(":Resources/stop_disabled.png"); - QString recordDisabled = QString(":Resources/record_disabled.png"); + QString playDisabled = QString(":Resources/play_disabled.svg"); + QString pauseDisabled = QString(":Resources/pause_disabled.svg"); + QString stopDisabled = QString(":Resources/stop_disabled.svg"); + QString recordDisabled = QString(":Resources/record_disabled.svg"); - m_pauseIcon = createQIconPNG("pause"); + m_pauseIcon = createQIcon("pause"); m_pauseIcon.addFile(pauseDisabled, QSize(), QIcon::Disabled); - m_playIcon = createQIconPNG("play"); + m_playIcon = createQIcon("play"); m_playIcon.addFile(playDisabled, QSize(), QIcon::Disabled); - m_recordIcon = createQIconPNG("record"); + m_recordIcon = createQIcon("record"); m_recordIcon.addFile(recordDisabled, QSize(), QIcon::Disabled); - m_stopIcon = createQIconPNG("stop"); + m_stopIcon = createQIcon("stop"); m_stopIcon.addFile(stopDisabled, QSize(), QIcon::Disabled); m_pauseRecordingButton->setIcon(m_pauseIcon); + m_pauseRecordingButton->setIconSize(QSize(17, 17)); m_playButton->setIcon(m_playIcon); + m_playButton->setIconSize(QSize(17, 17)); m_recordButton->setIcon(m_recordIcon); + m_recordButton->setIconSize(QSize(17, 17)); m_pausePlaybackButton->setIcon(m_pauseIcon); + m_pausePlaybackButton->setIconSize(QSize(17, 17)); QStringList inputs = m_audioRecorder->audioInputs(); m_deviceListCB->addItems(inputs); diff --git a/toonz/sources/toonz/dvitemview.cpp b/toonz/sources/toonz/dvitemview.cpp index a4d55a2..00d780c 100644 --- a/toonz/sources/toonz/dvitemview.cpp +++ b/toonz/sources/toonz/dvitemview.cpp @@ -1022,7 +1022,7 @@ void DvItemViewerPanel::paintThumbnailItem(QPainter &p, int index) { if (!thumbnail.isNull()) p.drawPixmap(iconRect.topLeft(), thumbnail); //} else { - static QPixmap missingPixmap = QPixmap(":Resources/missing.png"); + static QPixmap missingPixmap = QPixmap(":Resources/missing.svg"); QRect pixmapRect(rect.left() + (rect.width() - missingPixmap.width()) / 2, rect.top(), missingPixmap.width(), missingPixmap.height()); p.drawPixmap(pixmapRect.topLeft(), missingPixmap); @@ -1793,24 +1793,20 @@ DvItemViewerButtonBar::DvItemViewerButtonBar(DvItemViewer *itemViewer, QWidget *parent) : QToolBar(parent) { setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - setIconSize(QSize(17, 15)); + setIconSize(QSize(17, 17)); setObjectName("buttonBar"); // buttonBar->setIconSize(QSize(10,10)); - static QPixmap backButtonEnablePM = - QPixmap(":Resources/fb_history_back_enable.png"); - static QPixmap backButtonDisablePM = - QPixmap(":Resources/fb_history_back_disable.png"); - static QPixmap fwdButtonEnablePM = - QPixmap(":Resources/fb_history_fwd_enable.png"); - static QPixmap fwdButtonDisablePM = - QPixmap(":Resources/fb_history_fwd_disable.png"); + QString backButtonEnable = QString(":Resources/fb_history_back_enable.svg"); + QString backButtonDisable = QString(":Resources/fb_history_back_disable.svg"); + QString fwdButtonEnable = QString(":Resources/fb_history_fwd_enable.svg"); + QString fwdButtonDisable = QString(":Resources/fb_history_fwd_disable.svg"); QIcon backButtonIcon, fwdButtonIcon; - backButtonIcon.addPixmap(backButtonEnablePM, QIcon::Normal); - backButtonIcon.addPixmap(backButtonDisablePM, QIcon::Disabled); - fwdButtonIcon.addPixmap(fwdButtonEnablePM, QIcon::Normal); - fwdButtonIcon.addPixmap(fwdButtonDisablePM, QIcon::Disabled); + backButtonIcon.addFile(backButtonEnable, QSize(), QIcon::Normal); + backButtonIcon.addFile(backButtonDisable, QSize(), QIcon::Disabled); + fwdButtonIcon.addFile(fwdButtonEnable, QSize(), QIcon::Normal); + fwdButtonIcon.addFile(fwdButtonDisable, QSize(), QIcon::Disabled); m_folderBack = new QAction(backButtonIcon, tr("Back"), this); m_folderBack->setIconText(""); @@ -1819,13 +1815,13 @@ DvItemViewerButtonBar::DvItemViewerButtonBar(DvItemViewer *itemViewer, m_folderFwd->setIconText(""); addAction(m_folderFwd); - QIcon folderUpIcon = createQIconPNG("folderup"); + QIcon folderUpIcon = createQIcon("folderup"); QAction *folderUp = new QAction(folderUpIcon, tr("Up One Level"), this); folderUp->setIconText(tr("Up")); addAction(folderUp); addSeparator(); - QIcon newFolderIcon = createQIconPNG("newfolder"); + QIcon newFolderIcon = createQIcon("newfolder"); QAction *newFolder = new QAction(newFolderIcon, tr("New Folder"), this); newFolder->setIconText(tr("New")); addAction(newFolder); @@ -1835,7 +1831,7 @@ DvItemViewerButtonBar::DvItemViewerButtonBar(DvItemViewer *itemViewer, QActionGroup *actions = new QActionGroup(this); actions->setExclusive(true); - QIcon thumbViewIcon = createQIconOnOffPNG("viewicon"); + QIcon thumbViewIcon = createQIconOnOff("viewicon"); QAction *thumbView = new QAction(thumbViewIcon, tr("Icons View"), this); thumbView->setCheckable(true); thumbView->setIconText(tr("Icon")); @@ -1846,7 +1842,7 @@ DvItemViewerButtonBar::DvItemViewerButtonBar(DvItemViewer *itemViewer, actions->addAction(thumbView); addAction(thumbView); - QIcon listViewIcon = createQIconOnOffPNG("viewlist"); + QIcon listViewIcon = createQIconOnOff("viewlist"); QAction *listView = new QAction(listViewIcon, tr("List View"), this); listView->setCheckable(true); listView->setIconText(tr("List")); diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index 347408c..e8a0288 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -367,7 +367,9 @@ int main(int argc, char *argv[]) { #endif // splash screen - QPixmap splashPixmap(":Resources/splash.png"); + QPixmap splashPixmap = QIcon(":Resources/splash.svg").pixmap(QSize(610, 344)); + splashPixmap.setDevicePixelRatio(QApplication::desktop()->devicePixelRatio()); +// QPixmap splashPixmap(":Resources/splash.png"); #ifdef _WIN32 QFont font("Arial", -1); #else diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index c93ebc8..0d2c90e 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1050,8 +1050,10 @@ void MainWindow::onUpgradeTabPro() {} //----------------------------------------------------------------------------- void MainWindow::onAbout() { - QLabel *label = new QLabel(); - label->setPixmap(QPixmap(":Resources/splash.png")); + QLabel *label = new QLabel(); + QPixmap pixmap = QIcon(":Resources/splash.svg").pixmap(QSize(610, 344)); + pixmap.setDevicePixelRatio(QApplication::desktop()->devicePixelRatio()); + label->setPixmap(pixmap); DVGui::Dialog *dialog = new DVGui::Dialog(this, true); dialog->setWindowTitle(tr("About OpenToonz")); @@ -1757,7 +1759,10 @@ void MainWindow::defineActions() { createMenuXsheetAction(MI_DeleteInk, tr("&Delete Lines..."), ""); createMenuXsheetAction(MI_MergeColumns, tr("&Merge Levels"), ""); createMenuXsheetAction(MI_InsertFx, tr("&New FX..."), "Ctrl+F"); - createMenuXsheetAction(MI_NewOutputFx, tr("&New Output"), "Ctrl+F"); + QAction *newOutputAction = + createMenuXsheetAction(MI_NewOutputFx, tr("&New Output"), "Ctrl+F"); + newOutputAction->setIcon(createQIconOnOff("output", false)); + createRightClickMenuAction(MI_FxParamEditor, tr("&Edit FX..."), "Ctrl+K"); createMenuXsheetAction(MI_InsertSceneFrame, tr("Insert Frame"), ""); @@ -2086,7 +2091,7 @@ void MainWindow::defineActions() { QAction *refreshAct = createMiscAction(MI_RefreshTree, tr("Refresh Folder Tree"), ""); refreshAct->setIconText(tr("Refresh")); - refreshAct->setIcon(createQIconOnOffPNG("refresh")); + refreshAct->setIcon(createQIcon("refresh")); createToolOptionsAction("A_ToolOption_GlobalKey", tr("Global Key"), ""); diff --git a/toonz/sources/toonz/tasksviewer.cpp b/toonz/sources/toonz/tasksviewer.cpp index 1b2a985..b4941d3 100644 --- a/toonz/sources/toonz/tasksviewer.cpp +++ b/toonz/sources/toonz/tasksviewer.cpp @@ -53,10 +53,10 @@ void TasksViewer::add(const QString &iconName, QString text, QToolBar *toolBar, const char *slot, QString iconText) { #if QT_VERSION >= 0x050500 QAction *action = new QAction( - createQIconOnOffPNG(iconName.toLatin1().constData(), false), text, this); + createQIconOnOff(iconName.toLatin1().constData(), false), text, this); #else QAction *action = new QAction( - createQIconOnOffPNG(iconName.toAscii().constData(), false), text, this); + createQIconOnOff(iconName.toAscii().constData(), false), text, this); #endif action->setIconText(iconText); bool ret = connect(action, SIGNAL(triggered(bool)), @@ -1021,6 +1021,7 @@ TaskTreeView::TaskTreeView(TasksViewer *parent, TaskTreeModel *treeModel) if (!treeModel) treeModel = new TaskTreeModel(this); setModel(treeModel); setObjectName("taskeditortree"); + setIconSize(QSize(21, 17)); // connect(this, SIGNAL(pressed (const QModelIndex &) ), this, // SLOT(onActivated(const QModelIndex &))); @@ -1130,7 +1131,7 @@ QVariant TaskTreeModel::data(const QModelIndex &index, int role) const { case 0: return QVariant(); case 1: - return QIcon(":Resources/farm_tasks.png"); + return QIcon(":Resources/farm_tasks.svg"); case 2: case 3: TFarmTask *t = item->getTask(); @@ -1138,33 +1139,33 @@ QVariant TaskTreeModel::data(const QModelIndex &index, int role) const { switch (t->m_status) { case Suspended: return QIcon(t->m_isComposerTask - ? ":Resources/render_suspended.png" + ? ":Resources/render_suspended.svg" : (sourceFileIsCLN - ? ":Resources/cln_suspended.png" - : ":Resources/cleanup_suspended.png")); + ? ":Resources/cln_suspended.svg" + : ":Resources/cleanup_suspended.svg")); case Waiting: return QIcon(t->m_isComposerTask - ? ":Resources/render_done_with_errors.png" + ? ":Resources/render_done_with_errors.svg" : (sourceFileIsCLN - ? ":Resources/cln_done_with_errors.png" - : ":Resources/cleanup_done_with_errors.png")); + ? ":Resources/cln_done_with_errors.svg" + : ":Resources/cleanup_done_with_errors.svg")); case Running: return QIcon(t->m_isComposerTask - ? ":Resources/render_computing.png" + ? ":Resources/render_computing.svg" : (sourceFileIsCLN - ? ":Resources/cln_computing.png" - : ":Resources/cleanup_computing.png")); + ? ":Resources/cln_computing.svg" + : ":Resources/cleanup_computing.svg")); case Completed: return QIcon(t->m_isComposerTask - ? ":Resources/render_done.png" - : (sourceFileIsCLN ? ":Resources/cln_done.png" - : ":Resources/cleanup_done.png")); + ? ":Resources/render_done.svg" + : (sourceFileIsCLN ? ":Resources/cln_done.svg" + : ":Resources/cleanup_done.svg")); case Aborted: case TaskUnknown: return QIcon(t->m_isComposerTask - ? ":Resources/render_failed.png" - : (sourceFileIsCLN ? ":Resources/cln_failed.png" - : ":Resources/cleanup_failed.png")); + ? ":Resources/render_failed.svg" + : (sourceFileIsCLN ? ":Resources/cln_failed.svg" + : ":Resources/cleanup_failed.svg")); default: assert(false); } diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc index af625c0..bb5bcbe 100644 --- a/toonz/sources/toonz/toonz.qrc +++ b/toonz/sources/toonz/toonz.qrc @@ -33,25 +33,25 @@ Resources/centerHTitle.png Resources/centerHTitle_inactive.png Resources/centerVTitle.png - Resources/channelblue.png - Resources/channelblue_click.png - Resources/channelblue_over.png - Resources/channelgreen.png - Resources/channelgreen_click.png - Resources/channelgreen_over.png - Resources/channelmatte.png - Resources/channelmatte_click.png - Resources/channelmatte_over.png - Resources/channelred.png - Resources/channelred_click.png - Resources/channelred_over.png + Resources/channelblue.svg + Resources/channelblue_click.svg + Resources/channelblue_over.svg + Resources/channelgreen.svg + Resources/channelgreen_click.svg + Resources/channelgreen_over.svg + Resources/channelmatte.svg + Resources/channelmatte_click.svg + Resources/channelmatte_over.svg + Resources/channelred.svg + Resources/channelred_click.svg + Resources/channelred_over.svg Resources/check.png Resources/clapboard.png - Resources/cleanup_failed.png - Resources/cleanup_done.png - Resources/cleanup_done_with_errors.png - Resources/cleanup_computing.png - Resources/cleanup_suspended.png + Resources/cleanup_failed.svg + Resources/cleanup_done.svg + Resources/cleanup_done_with_errors.svg + Resources/cleanup_computing.svg + Resources/cleanup_suspended.svg Resources/close_pane.png Resources/close_pane_rollover.png Resources/closedfolder.png @@ -60,9 +60,9 @@ Resources/collapse_over.png Resources/controlpointeditor.svg Resources/controlpointeditor_rollover.svg - Resources/compare.png - Resources/compare_click.png - Resources/compare_over.png + Resources/compare.svg + Resources/compare_click.svg + Resources/compare_over.svg Resources/curve.png Resources/custom_off.svg Resources/custom_on.svg @@ -79,7 +79,7 @@ Resources/eraser.png Resources/eraser.svg Resources/eraser_rollover.svg - Resources/farm_tasks.png + Resources/farm_tasks.svg Resources/fill.png Resources/fill.svg Resources/fill_rollover.svg @@ -88,20 +88,20 @@ Resources/folder_new_over.png Resources/folderpreset_open.png Resources/folderpreset_close.png - Resources/folderup.png - Resources/folderup_over.png - Resources/framefirst.png - Resources/framefirst_click.png - Resources/framefirst_over.png - Resources/framelast.png - Resources/framelast_click.png - Resources/framelast_over.png - Resources/framenext.png - Resources/framenext_click.png - Resources/framenext_over.png - Resources/frameprev.png - Resources/frameprev_click.png - Resources/frameprev_over.png + Resources/folderup.svg + Resources/folderup_over.svg + Resources/framefirst.svg + Resources/framefirst_click.svg + Resources/framefirst_over.svg + Resources/framelast.svg + Resources/framelast_click.svg + Resources/framelast_over.svg + Resources/framenext.svg + Resources/framenext_click.svg + Resources/framenext_over.svg + Resources/frameprev.svg + Resources/frameprev_click.svg + Resources/frameprev_over.svg Resources/freeze.png Resources/freeze_on.png Resources/freeze_over.png @@ -114,8 +114,8 @@ Resources/h_slider.png Resources/hand.svg Resources/hand_rollover.svg - Resources/histograms.png - Resources/histograms_over.png + Resources/histograms.svg + Resources/histograms_over.svg Resources/history.png Resources/hook.svg Resources/hook_rollover.svg @@ -143,9 +143,9 @@ Resources/link_parent.bmp Resources/lock.png Resources/lock_over.png - Resources/loop.png - Resources/loop_click.png - Resources/loop_over.png + Resources/loop.svg + Resources/loop_click.svg + Resources/loop_over.svg Resources/lock_toggle.png Resources/magnet.png Resources/magnet.svg @@ -167,11 +167,8 @@ Resources/new_vector_level.png Resources/new_vector_level_click.png Resources/new_vector_level_over.png - Resources/newmemo.png - Resources/newmemo_disabled.png - Resources/newpage.png - Resources/newpage_click.png - Resources/newpage_over.png + Resources/newmemo.svg + Resources/newmemo_disabled.svg Resources/newstyle.png Resources/newstyle_click.png Resources/newstyle_over.png @@ -197,10 +194,10 @@ Resources/palette_view_mode.bmp Resources/paletteicon.png Resources/pan.png - Resources/pause.png - Resources/pause_click.png - Resources/pause_disabled.png - Resources/pause_over.png + Resources/pause.svg + Resources/pause_click.svg + Resources/pause_disabled.svg + Resources/pause_over.svg Resources/pegging_top_arrow.png Resources/pegging_topright_arrow.png Resources/pen.png @@ -216,10 +213,10 @@ Resources/plaincolor_on.svg Resources/plastic.svg Resources/plastic_rollover.svg - Resources/play.png - Resources/play_click.png - Resources/play_disabled.png - Resources/play_over.png + Resources/play.svg + Resources/play_click.svg + Resources/play_disabled.svg + Resources/play_over.svg Resources/preview_toggle.png Resources/previuos_folder.png Resources/prevkey.png @@ -230,15 +227,15 @@ Resources/pump.png Resources/pump.svg Resources/pump_rollover.svg - Resources/record.png - Resources/record_click.png - Resources/record_disabled.png - Resources/record_over.png - Resources/render_failed.png - Resources/render_done.png - Resources/render_done_with_errors.png - Resources/render_computing.png - Resources/render_suspended.png + Resources/record.svg + Resources/record_click.svg + Resources/record_disabled.svg + Resources/record_over.svg + Resources/render_failed.svg + Resources/render_done.svg + Resources/render_done_with_errors.svg + Resources/render_computing.svg + Resources/render_suspended.svg Resources/repeat_icon.png Resources/repeat_icon_click.png Resources/repeat_icon_over.png @@ -270,30 +267,30 @@ Resources/shear.png Resources/skeleton.svg Resources/skeleton_rollover.svg - Resources/snapshot.png - Resources/snapshot_click.png - Resources/snapshot_over.png - Resources/sound.png - Resources/sound_click.png - Resources/sound_over.png + Resources/snapshot.svg + Resources/snapshot_click.svg + Resources/snapshot_over.svg + Resources/sound.svg + Resources/sound_click.svg + Resources/sound_over.svg Resources/sound_header_off.png Resources/sound_header_on.png Resources/sound_toggle.png Resources/special_off.svg Resources/special_on.svg - Resources/splash.png + Resources/splash.svg Resources/standard.png Resources/standard_on.png Resources/standard_over.png Resources/startup.png - Resources/start_off.png - Resources/start_on.png - Resources/stop.png - Resources/stop_click.png - Resources/stop_disabled.png - Resources/stop_over.png - Resources/stop_off.png - Resources/stop_on.png + Resources/start_off.svg + Resources/start_on.svg + Resources/stop.svg + Resources/stop_click.svg + Resources/stop_disabled.svg + Resources/stop_over.svg + Resources/stop_off.svg + Resources/stop_on.svg Resources/stroke_select.png Resources/stylepicker.svg Resources/stylepicker_rollover.svg @@ -307,8 +304,8 @@ Resources/sub_leave.png Resources/sub_leave_over.png Resources/sub_leave_click.png - Resources/swap_off.png - Resources/swap_on.png + Resources/swap_off.svg + Resources/swap_on.svg Resources/svg.png Resources/switch.png Resources/switch_on.png @@ -338,12 +335,12 @@ Resources/view_camera.png Resources/view_camera_on.png Resources/view_camera_over.png - Resources/viewicon_off.png - Resources/viewicon_on.png - Resources/viewicon_over.png - Resources/viewlist_off.png - Resources/viewlist_on.png - Resources/viewlist_over.png + Resources/viewicon_off.svg + Resources/viewicon_on.svg + Resources/viewicon_over.svg + Resources/viewlist_off.svg + Resources/viewlist_on.svg + Resources/viewlist_over.svg Resources/viewpreview.png Resources/viewpreview_on.png Resources/viewpreview_over.png @@ -360,30 +357,30 @@ Resources/browser_scene_close.png Resources/browser_project_open.png Resources/browser_project_close.png - Resources/half_R.png - Resources/half_R_click.png - Resources/half_R_over.png - Resources/half_G.png - Resources/half_G_click.png - Resources/half_G_over.png - Resources/half_B.png - Resources/half_B_click.png - Resources/half_B_over.png - Resources/half_bw.png - Resources/half_bw_click.png - Resources/half_bw_over.png - Resources/addcleanup_off.png - Resources/addcleanup_on.png - Resources/addrender_off.png - Resources/addrender_on.png - Resources/delete_off.png - Resources/delete_on.png - Resources/save_off.png - Resources/save_on.png - Resources/saveas_off.png - Resources/saveas_on.png - Resources/load_off.png - Resources/load_on.png + Resources/half_R.svg + Resources/half_R_click.svg + Resources/half_R_over.svg + Resources/half_G.svg + Resources/half_G_click.svg + Resources/half_G_over.svg + Resources/half_B.svg + Resources/half_B_click.svg + Resources/half_B_over.svg + Resources/half_bw.svg + Resources/half_bw_click.svg + Resources/half_bw_over.svg + Resources/addcleanup_off.svg + Resources/addcleanup_on.svg + Resources/addrender_off.svg + Resources/addrender_on.svg + Resources/delete_off.svg + Resources/delete_on.svg + Resources/save_off.svg + Resources/save_on.svg + Resources/saveas_off.svg + Resources/saveas_on.svg + Resources/load_off.svg + Resources/load_on.svg Resources/flip_h.png Resources/flip_v.png Resources/level_select.png @@ -404,23 +401,23 @@ Resources/halfRed.png Resources/halfBronze.png Resources/plus.png - Resources/missing.png + Resources/missing.svg Resources/forbidden.png - Resources/define_subcamera_preview.png - Resources/define_subcamera_preview_over.png - Resources/define_subcamera_preview_click.png - Resources/use_subcamera_preview.png - Resources/use_subcamera_preview_over.png - Resources/use_subcamera_preview_click.png + Resources/define_subcamera_preview.svg + Resources/define_subcamera_preview_over.svg + Resources/define_subcamera_preview_click.svg + Resources/use_subcamera_preview.svg + Resources/use_subcamera_preview_over.svg + Resources/use_subcamera_preview_click.svg Resources/subcamera_preview.png Resources/subcamera_preview_over.png Resources/subcamera_preview_on.png - Resources/round_cap.png - Resources/butt_cap.png - Resources/projecting_cap.png - Resources/round_join.png - Resources/bevel_join.png - Resources/miter_join.png + Resources/round_cap.svg + Resources/butt_cap.svg + Resources/projecting_cap.svg + Resources/round_join.svg + Resources/bevel_join.svg + Resources/miter_join.svg Resources/init.js Resources/scripticon.png Resources/safearea.png @@ -434,10 +431,10 @@ Resources/folderup_icon.png Resources/link_icon.png Resources/folder_icon.png - Resources/fb_history_back_enable.png - Resources/fb_history_back_disable.png - Resources/fb_history_fwd_enable.png - Resources/fb_history_fwd_disable.png + Resources/fb_history_back_enable.svg + Resources/fb_history_back_disable.svg + Resources/fb_history_fwd_enable.svg + Resources/fb_history_fwd_disable.svg Resources/x_prev_eye.png Resources/x_table_view.png Resources/x_table_view_transp.png @@ -459,11 +456,11 @@ Resources/history_xsheet.png Resources/history_filmstrip.png Resources/history_unidentified.png - Resources/cln_suspended.png - Resources/cln_done_with_errors.png - Resources/cln_computing.png - Resources/cln_done.png - Resources/cln_failed.png + Resources/cln_suspended.svg + Resources/cln_done_with_errors.svg + Resources/cln_computing.svg + Resources/cln_done.svg + Resources/cln_failed.svg Resources/match_lup_nogap.png Resources/match_rup_nogap.png Resources/match_lup_gap.png @@ -472,10 +469,10 @@ Resources/finger_rollover.svg Resources/ruler.svg Resources/ruler_rollover.svg - Resources/locator.png - Resources/locator_click.png - Resources/locator_over.png - Resources/refresh.png - Resources/refresh_over.png + Resources/locator.svg + Resources/locator_click.svg + Resources/locator_over.svg + Resources/refresh.svg + Resources/refresh_over.svg diff --git a/toonz/sources/toonz/vectorizerpopup.cpp b/toonz/sources/toonz/vectorizerpopup.cpp index 3aa13db..0b1335f 100644 --- a/toonz/sources/toonz/vectorizerpopup.cpp +++ b/toonz/sources/toonz/vectorizerpopup.cpp @@ -451,6 +451,10 @@ VectorizerPopup::VectorizerPopup(QWidget *parent, Qt::WFlags flags) addWidget(splitter); QToolBar *leftToolBar = new QToolBar, *rightToolBar = new QToolBar; + leftToolBar->setObjectName("MediumPaddingToolBar"); + rightToolBar->setObjectName("MediumPaddingToolBar"); + leftToolBar->setIconSize(QSize(17, 17)); + rightToolBar->setIconSize(QSize(17, 17)); { QWidget *toolbarsContainer = new QWidget(this); toolbarsContainer->setFixedHeight(22); @@ -732,19 +736,18 @@ paramsLayout->addWidget(m_cThicknessRatio, row++, 1);*/ //---------------------- Toolbar -------------------------- - QAction *swatchAct = new QAction(createQIconOnOffPNG("preview", true), + QAction *swatchAct = new QAction(createQIconOnOff("preview", true), tr("Toggle Swatch Preview"), this); swatchAct->setCheckable(true); leftToolBar->addAction(swatchAct); - QAction *centerlineAct = - new QAction(createQIconOnOffPNG("opacitycheck", true), - tr("Toggle Centerlines Check"), this); + QAction *centerlineAct = new QAction(createQIconOnOff("opacitycheck", true), + tr("Toggle Centerlines Check"), this); centerlineAct->setCheckable(true); leftToolBar->addAction(centerlineAct); QToolButton *visibilityButton = new QToolButton(this); - visibilityButton->setIcon(createQIconPNG("options")); + visibilityButton->setIcon(createQIcon("options")); visibilityButton->setPopupMode(QToolButton::InstantPopup); QMenu *visibilityMenu = new QMenu(visibilityButton); @@ -753,15 +756,15 @@ paramsLayout->addWidget(m_cThicknessRatio, row++, 1);*/ rightToolBar->addWidget(visibilityButton); rightToolBar->addSeparator(); - QAction *saveAct = new QAction(createQIconOnOffPNG("save", false), - tr("Save Settings"), this); + QAction *saveAct = + new QAction(createQIconOnOff("save", false), tr("Save Settings"), this); rightToolBar->addAction(saveAct); - QAction *loadAct = new QAction(createQIconOnOffPNG("load", false), - tr("Load Settings"), this); + QAction *loadAct = + new QAction(createQIconOnOff("load", false), tr("Load Settings"), this); rightToolBar->addAction(loadAct); rightToolBar->addSeparator(); - QAction *resetAct = new QAction(createQIconOnOffPNG("resetsize", false), + QAction *resetAct = new QAction(createQIconOnOff("resetsize", false), tr("Reset Settings"), this); rightToolBar->addAction(resetAct); diff --git a/toonz/sources/toonz/xshnoteviewer.cpp b/toonz/sources/toonz/xshnoteviewer.cpp index 3805bf4..55b0015 100644 --- a/toonz/sources/toonz/xshnoteviewer.cpp +++ b/toonz/sources/toonz/xshnoteviewer.cpp @@ -463,24 +463,24 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags) toolButton->setObjectName("ToolbarToolButton"); toolButton->setFixedSize(44, 26); toolButton->setIconSize(QSize(38, 20)); - QIcon addNoteIcon = createQIconPNG("newmemo"); - addNoteIcon.addFile(QString(":Resources/newmemo_disabled.png"), QSize(), + QIcon addNoteIcon = createQIcon("newmemo"); + addNoteIcon.addFile(QString(":Resources/newmemo_disabled.svg"), QSize(), QIcon::Disabled); toolButton->setIcon(addNoteIcon); m_precNoteButton->setObjectName("ToolbarToolButton"); m_precNoteButton->setFixedSize(22, 22); - m_precNoteButton->setIconSize(QSize(15, 23)); - QIcon precNoteIcon = createQIconPNG("prevkey"); - precNoteIcon.addFile(QString(":Resources/prevkey_disabled.png"), QSize(), + m_precNoteButton->setIconSize(QSize(17, 17)); + QIcon precNoteIcon = createQIcon("prevkey"); + precNoteIcon.addFile(QString(":Resources/prevkey_disabled.svg"), QSize(), QIcon::Disabled); m_precNoteButton->setIcon(precNoteIcon); m_nextNoteButton->setObjectName("ToolbarToolButton"); m_nextNoteButton->setFixedSize(22, 22); - m_nextNoteButton->setIconSize(QSize(15, 23)); - QIcon nextNoteIcon = createQIconPNG("nextkey"); - nextNoteIcon.addFile(QString(":Resources/nextkey_disabled.png"), QSize(), + m_nextNoteButton->setIconSize(QSize(17, 17)); + QIcon nextNoteIcon = createQIcon("nextkey"); + nextNoteIcon.addFile(QString(":Resources/nextkey_disabled.svg"), QSize(), QIcon::Disabled); m_nextNoteButton->setIcon(nextNoteIcon); diff --git a/toonz/sources/toonzqt/Resources/camera_off.png b/toonz/sources/toonzqt/Resources/camera_off.png deleted file mode 100644 index 84a4b0b..0000000 Binary files a/toonz/sources/toonzqt/Resources/camera_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/camera_off.svg b/toonz/sources/toonzqt/Resources/camera_off.svg new file mode 100644 index 0000000..c803318 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/camera_off.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/camera_on.png b/toonz/sources/toonzqt/Resources/camera_on.png deleted file mode 100644 index 560ec9f..0000000 Binary files a/toonz/sources/toonzqt/Resources/camera_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/camera_on.svg b/toonz/sources/toonzqt/Resources/camera_on.svg new file mode 100644 index 0000000..ee2b627 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/camera_on.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/centerselection_off.png b/toonz/sources/toonzqt/Resources/centerselection_off.png deleted file mode 100644 index 796bd10..0000000 Binary files a/toonz/sources/toonzqt/Resources/centerselection_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/centerselection_off.svg b/toonz/sources/toonzqt/Resources/centerselection_off.svg new file mode 100644 index 0000000..d44c273 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/centerselection_off.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/centerselection_on.png b/toonz/sources/toonzqt/Resources/centerselection_on.png deleted file mode 100644 index 5f03dd9..0000000 Binary files a/toonz/sources/toonzqt/Resources/centerselection_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/centerselection_on.svg b/toonz/sources/toonzqt/Resources/centerselection_on.svg new file mode 100644 index 0000000..bf383c2 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/centerselection_on.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/fit_off.png b/toonz/sources/toonzqt/Resources/fit_off.png deleted file mode 100644 index e69571d..0000000 Binary files a/toonz/sources/toonzqt/Resources/fit_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/fit_off.svg b/toonz/sources/toonzqt/Resources/fit_off.svg new file mode 100644 index 0000000..02de5ab --- /dev/null +++ b/toonz/sources/toonzqt/Resources/fit_off.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/fit_on.png b/toonz/sources/toonzqt/Resources/fit_on.png deleted file mode 100644 index 7bd55c9..0000000 Binary files a/toonz/sources/toonzqt/Resources/fit_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/fit_on.svg b/toonz/sources/toonzqt/Resources/fit_on.svg new file mode 100644 index 0000000..58228bb --- /dev/null +++ b/toonz/sources/toonzqt/Resources/fit_on.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/fx_off.png b/toonz/sources/toonzqt/Resources/fx_off.png deleted file mode 100644 index a8d3c78..0000000 Binary files a/toonz/sources/toonzqt/Resources/fx_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/fx_off.svg b/toonz/sources/toonzqt/Resources/fx_off.svg new file mode 100644 index 0000000..e2b640f --- /dev/null +++ b/toonz/sources/toonzqt/Resources/fx_off.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/fx_on.png b/toonz/sources/toonzqt/Resources/fx_on.png deleted file mode 100644 index 62d09d0..0000000 Binary files a/toonz/sources/toonzqt/Resources/fx_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/fx_on.svg b/toonz/sources/toonzqt/Resources/fx_on.svg new file mode 100644 index 0000000..9c4c0e4 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/fx_on.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/fxport_blue.png b/toonz/sources/toonzqt/Resources/fxport_blue.png deleted file mode 100644 index 45b8ddd..0000000 Binary files a/toonz/sources/toonzqt/Resources/fxport_blue.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/fxport_blue.svg b/toonz/sources/toonzqt/Resources/fxport_blue.svg new file mode 100644 index 0000000..34bf755 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/fxport_blue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/fxport_red.png b/toonz/sources/toonzqt/Resources/fxport_red.png deleted file mode 100644 index 4059f4f..0000000 Binary files a/toonz/sources/toonzqt/Resources/fxport_red.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/fxport_red.svg b/toonz/sources/toonzqt/Resources/fxport_red.svg new file mode 100644 index 0000000..ec97806 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/fxport_red.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/key_no.png b/toonz/sources/toonzqt/Resources/key_no.png deleted file mode 100644 index 4eb8454..0000000 Binary files a/toonz/sources/toonzqt/Resources/key_no.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/key_no.svg b/toonz/sources/toonzqt/Resources/key_no.svg new file mode 100644 index 0000000..79a7b6c --- /dev/null +++ b/toonz/sources/toonzqt/Resources/key_no.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/key_no_over.png b/toonz/sources/toonzqt/Resources/key_no_over.png deleted file mode 100644 index f4443a7..0000000 Binary files a/toonz/sources/toonzqt/Resources/key_no_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/key_no_over.svg b/toonz/sources/toonzqt/Resources/key_no_over.svg new file mode 100644 index 0000000..8058085 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/key_no_over.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/key_partial.png b/toonz/sources/toonzqt/Resources/key_partial.png deleted file mode 100644 index 8d14e3d..0000000 Binary files a/toonz/sources/toonzqt/Resources/key_partial.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/key_partial.svg b/toonz/sources/toonzqt/Resources/key_partial.svg new file mode 100644 index 0000000..ad64ce9 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/key_partial.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/key_partial_over.png b/toonz/sources/toonzqt/Resources/key_partial_over.png deleted file mode 100644 index e2d88ab..0000000 Binary files a/toonz/sources/toonzqt/Resources/key_partial_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/key_partial_over.svg b/toonz/sources/toonzqt/Resources/key_partial_over.svg new file mode 100644 index 0000000..ecf94fd --- /dev/null +++ b/toonz/sources/toonzqt/Resources/key_partial_over.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/key_total.png b/toonz/sources/toonzqt/Resources/key_total.png deleted file mode 100644 index 5e5d10d..0000000 Binary files a/toonz/sources/toonzqt/Resources/key_total.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/key_total.svg b/toonz/sources/toonzqt/Resources/key_total.svg new file mode 100644 index 0000000..a64cb18 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/key_total.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/key_total_over.png b/toonz/sources/toonzqt/Resources/key_total_over.png deleted file mode 100644 index 692c1b9..0000000 Binary files a/toonz/sources/toonzqt/Resources/key_total_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/key_total_over.svg b/toonz/sources/toonzqt/Resources/key_total_over.svg new file mode 100644 index 0000000..1106352 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/key_total_over.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/lockpalette_off.png b/toonz/sources/toonzqt/Resources/lockpalette_off.png deleted file mode 100644 index 5d05f9d..0000000 Binary files a/toonz/sources/toonzqt/Resources/lockpalette_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/lockpalette_off.svg b/toonz/sources/toonzqt/Resources/lockpalette_off.svg new file mode 100644 index 0000000..ec39975 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/lockpalette_off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/lockpalette_on.png b/toonz/sources/toonzqt/Resources/lockpalette_on.png deleted file mode 100644 index afc8f0d..0000000 Binary files a/toonz/sources/toonzqt/Resources/lockpalette_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/lockpalette_on.svg b/toonz/sources/toonzqt/Resources/lockpalette_on.svg new file mode 100644 index 0000000..0986299 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/lockpalette_on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/lockpalette_over.png b/toonz/sources/toonzqt/Resources/lockpalette_over.png deleted file mode 100644 index afc8f0d..0000000 Binary files a/toonz/sources/toonzqt/Resources/lockpalette_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/lockpalette_over.svg b/toonz/sources/toonzqt/Resources/lockpalette_over.svg new file mode 100644 index 0000000..f60668d --- /dev/null +++ b/toonz/sources/toonzqt/Resources/lockpalette_over.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/maximizenodes_off.png b/toonz/sources/toonzqt/Resources/maximizenodes_off.png deleted file mode 100644 index 3e92404..0000000 Binary files a/toonz/sources/toonzqt/Resources/maximizenodes_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/maximizenodes_off.svg b/toonz/sources/toonzqt/Resources/maximizenodes_off.svg new file mode 100644 index 0000000..b9270ab --- /dev/null +++ b/toonz/sources/toonzqt/Resources/maximizenodes_off.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/maximizenodes_on.png b/toonz/sources/toonzqt/Resources/maximizenodes_on.png deleted file mode 100644 index e5f291a..0000000 Binary files a/toonz/sources/toonzqt/Resources/maximizenodes_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/maximizenodes_on.svg b/toonz/sources/toonzqt/Resources/maximizenodes_on.svg new file mode 100644 index 0000000..919e339 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/maximizenodes_on.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/minimizenodes_off.png b/toonz/sources/toonzqt/Resources/minimizenodes_off.png deleted file mode 100644 index e2f3352..0000000 Binary files a/toonz/sources/toonzqt/Resources/minimizenodes_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/minimizenodes_off.svg b/toonz/sources/toonzqt/Resources/minimizenodes_off.svg new file mode 100644 index 0000000..b15aafb --- /dev/null +++ b/toonz/sources/toonzqt/Resources/minimizenodes_off.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/minimizenodes_on.png b/toonz/sources/toonzqt/Resources/minimizenodes_on.png deleted file mode 100644 index 2bf581e..0000000 Binary files a/toonz/sources/toonzqt/Resources/minimizenodes_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/minimizenodes_on.svg b/toonz/sources/toonzqt/Resources/minimizenodes_on.svg new file mode 100644 index 0000000..c59471f --- /dev/null +++ b/toonz/sources/toonzqt/Resources/minimizenodes_on.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/motionpath_off.png b/toonz/sources/toonzqt/Resources/motionpath_off.png deleted file mode 100644 index aec00e2..0000000 Binary files a/toonz/sources/toonzqt/Resources/motionpath_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/motionpath_off.svg b/toonz/sources/toonzqt/Resources/motionpath_off.svg new file mode 100644 index 0000000..ee522dc --- /dev/null +++ b/toonz/sources/toonzqt/Resources/motionpath_off.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/motionpath_on.png b/toonz/sources/toonzqt/Resources/motionpath_on.png deleted file mode 100644 index cd28a55..0000000 Binary files a/toonz/sources/toonzqt/Resources/motionpath_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/motionpath_on.svg b/toonz/sources/toonzqt/Resources/motionpath_on.svg new file mode 100644 index 0000000..38e0d05 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/motionpath_on.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/newfolder.png b/toonz/sources/toonzqt/Resources/newfolder.png deleted file mode 100644 index 6826f07..0000000 Binary files a/toonz/sources/toonzqt/Resources/newfolder.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/newfolder.svg b/toonz/sources/toonzqt/Resources/newfolder.svg new file mode 100644 index 0000000..c2af7d3 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/newfolder.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/newfolder_over.png b/toonz/sources/toonzqt/Resources/newfolder_over.png deleted file mode 100644 index 7ed85a6..0000000 Binary files a/toonz/sources/toonzqt/Resources/newfolder_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/newfolder_over.svg b/toonz/sources/toonzqt/Resources/newfolder_over.svg new file mode 100644 index 0000000..51cd666 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/newfolder_over.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/newpage.png b/toonz/sources/toonzqt/Resources/newpage.png deleted file mode 100644 index a6138db..0000000 Binary files a/toonz/sources/toonzqt/Resources/newpage.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/newpage.svg b/toonz/sources/toonzqt/Resources/newpage.svg new file mode 100644 index 0000000..be2399c --- /dev/null +++ b/toonz/sources/toonzqt/Resources/newpage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/newpage_over.png b/toonz/sources/toonzqt/Resources/newpage_over.png deleted file mode 100644 index 5c775a7..0000000 Binary files a/toonz/sources/toonzqt/Resources/newpage_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/newpage_over.svg b/toonz/sources/toonzqt/Resources/newpage_over.svg new file mode 100644 index 0000000..8bbe5fa --- /dev/null +++ b/toonz/sources/toonzqt/Resources/newpage_over.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/newstyle.png b/toonz/sources/toonzqt/Resources/newstyle.png deleted file mode 100644 index 07771a8..0000000 Binary files a/toonz/sources/toonzqt/Resources/newstyle.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/newstyle.svg b/toonz/sources/toonzqt/Resources/newstyle.svg new file mode 100644 index 0000000..80e36a0 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/newstyle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/newstyle_click.png b/toonz/sources/toonzqt/Resources/newstyle_click.png deleted file mode 100644 index f8c9880..0000000 Binary files a/toonz/sources/toonzqt/Resources/newstyle_click.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/newstyle_over.png b/toonz/sources/toonzqt/Resources/newstyle_over.png deleted file mode 100644 index 8b9100c..0000000 Binary files a/toonz/sources/toonzqt/Resources/newstyle_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/newstyle_over.svg b/toonz/sources/toonzqt/Resources/newstyle_over.svg new file mode 100644 index 0000000..d3b5554 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/newstyle_over.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/nextkey.png b/toonz/sources/toonzqt/Resources/nextkey.png deleted file mode 100644 index 1f667f2..0000000 Binary files a/toonz/sources/toonzqt/Resources/nextkey.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/nextkey.svg b/toonz/sources/toonzqt/Resources/nextkey.svg new file mode 100644 index 0000000..c75177d --- /dev/null +++ b/toonz/sources/toonzqt/Resources/nextkey.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/nextkey_disabled.png b/toonz/sources/toonzqt/Resources/nextkey_disabled.png deleted file mode 100644 index ce8ccb4..0000000 Binary files a/toonz/sources/toonzqt/Resources/nextkey_disabled.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/nextkey_disabled.svg b/toonz/sources/toonzqt/Resources/nextkey_disabled.svg new file mode 100644 index 0000000..48e3673 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/nextkey_disabled.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/nextkey_over.png b/toonz/sources/toonzqt/Resources/nextkey_over.png deleted file mode 100644 index 49b0621..0000000 Binary files a/toonz/sources/toonzqt/Resources/nextkey_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/nextkey_over.svg b/toonz/sources/toonzqt/Resources/nextkey_over.svg new file mode 100644 index 0000000..079997c --- /dev/null +++ b/toonz/sources/toonzqt/Resources/nextkey_over.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/opacitycheck_off.png b/toonz/sources/toonzqt/Resources/opacitycheck_off.png deleted file mode 100644 index a7e8544..0000000 Binary files a/toonz/sources/toonzqt/Resources/opacitycheck_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/opacitycheck_off.svg b/toonz/sources/toonzqt/Resources/opacitycheck_off.svg new file mode 100644 index 0000000..8c3e11b --- /dev/null +++ b/toonz/sources/toonzqt/Resources/opacitycheck_off.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/opacitycheck_on.png b/toonz/sources/toonzqt/Resources/opacitycheck_on.png deleted file mode 100644 index a1569f5..0000000 Binary files a/toonz/sources/toonzqt/Resources/opacitycheck_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/opacitycheck_on.svg b/toonz/sources/toonzqt/Resources/opacitycheck_on.svg new file mode 100644 index 0000000..d512d13 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/opacitycheck_on.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/opacitycheck_over.png b/toonz/sources/toonzqt/Resources/opacitycheck_over.png deleted file mode 100644 index 59b9565..0000000 Binary files a/toonz/sources/toonzqt/Resources/opacitycheck_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/opacitycheck_over.svg b/toonz/sources/toonzqt/Resources/opacitycheck_over.svg new file mode 100644 index 0000000..38e1eb5 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/opacitycheck_over.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/options.png b/toonz/sources/toonzqt/Resources/options.png deleted file mode 100644 index 485487f..0000000 Binary files a/toonz/sources/toonzqt/Resources/options.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/options.svg b/toonz/sources/toonzqt/Resources/options.svg new file mode 100644 index 0000000..27c64c2 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/options.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/options_click.png b/toonz/sources/toonzqt/Resources/options_click.png deleted file mode 100644 index 7a96556..0000000 Binary files a/toonz/sources/toonzqt/Resources/options_click.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/options_over.png b/toonz/sources/toonzqt/Resources/options_over.png deleted file mode 100644 index b3977c4..0000000 Binary files a/toonz/sources/toonzqt/Resources/options_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/options_over.svg b/toonz/sources/toonzqt/Resources/options_over.svg new file mode 100644 index 0000000..ce64781 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/options_over.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/output_off.png b/toonz/sources/toonzqt/Resources/output_off.png deleted file mode 100644 index 6f51f7e..0000000 Binary files a/toonz/sources/toonzqt/Resources/output_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/output_off.svg b/toonz/sources/toonzqt/Resources/output_off.svg new file mode 100644 index 0000000..d38a89f --- /dev/null +++ b/toonz/sources/toonzqt/Resources/output_off.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/output_on.png b/toonz/sources/toonzqt/Resources/output_on.png deleted file mode 100644 index 03c821e..0000000 Binary files a/toonz/sources/toonzqt/Resources/output_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/output_on.svg b/toonz/sources/toonzqt/Resources/output_on.svg new file mode 100644 index 0000000..112d8b3 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/output_on.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/pegbar_off.png b/toonz/sources/toonzqt/Resources/pegbar_off.png deleted file mode 100644 index edec711..0000000 Binary files a/toonz/sources/toonzqt/Resources/pegbar_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/pegbar_off.svg b/toonz/sources/toonzqt/Resources/pegbar_off.svg new file mode 100644 index 0000000..3599836 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/pegbar_off.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/pegbar_on.png b/toonz/sources/toonzqt/Resources/pegbar_on.png deleted file mode 100644 index 600da41..0000000 Binary files a/toonz/sources/toonzqt/Resources/pegbar_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/pegbar_on.svg b/toonz/sources/toonzqt/Resources/pegbar_on.svg new file mode 100644 index 0000000..7be2bf6 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/pegbar_on.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_black_off.png b/toonz/sources/toonzqt/Resources/preview_black_off.png deleted file mode 100644 index d9f3103..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_black_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_black_off.svg b/toonz/sources/toonzqt/Resources/preview_black_off.svg new file mode 100644 index 0000000..615e914 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_black_off.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_black_on.png b/toonz/sources/toonzqt/Resources/preview_black_on.png deleted file mode 100644 index f8a8ba2..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_black_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_black_on.svg b/toonz/sources/toonzqt/Resources/preview_black_on.svg new file mode 100644 index 0000000..5b234f3 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_black_on.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_black_over.png b/toonz/sources/toonzqt/Resources/preview_black_over.png deleted file mode 100644 index b97b6d0..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_black_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_black_over.svg b/toonz/sources/toonzqt/Resources/preview_black_over.svg new file mode 100644 index 0000000..4cb4345 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_black_over.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_checkboard_off.png b/toonz/sources/toonzqt/Resources/preview_checkboard_off.png deleted file mode 100644 index 0ee69a7..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_checkboard_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_checkboard_off.svg b/toonz/sources/toonzqt/Resources/preview_checkboard_off.svg new file mode 100644 index 0000000..63d64d8 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_checkboard_off.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_checkboard_on.png b/toonz/sources/toonzqt/Resources/preview_checkboard_on.png deleted file mode 100644 index c164fc5..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_checkboard_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_checkboard_on.svg b/toonz/sources/toonzqt/Resources/preview_checkboard_on.svg new file mode 100644 index 0000000..61e188d --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_checkboard_on.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_checkboard_over.png b/toonz/sources/toonzqt/Resources/preview_checkboard_over.png deleted file mode 100644 index 90f14b8..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_checkboard_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_checkboard_over.svg b/toonz/sources/toonzqt/Resources/preview_checkboard_over.svg new file mode 100644 index 0000000..1fc153a --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_checkboard_over.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_off.png b/toonz/sources/toonzqt/Resources/preview_off.png deleted file mode 100644 index 5e173b9..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_off.svg b/toonz/sources/toonzqt/Resources/preview_off.svg new file mode 100644 index 0000000..df18116 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_off.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_on.png b/toonz/sources/toonzqt/Resources/preview_on.png deleted file mode 100644 index c6854c5..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_on.svg b/toonz/sources/toonzqt/Resources/preview_on.svg new file mode 100644 index 0000000..fb2275d --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_on.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_over.png b/toonz/sources/toonzqt/Resources/preview_over.png deleted file mode 100644 index 7205d5f..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_over.svg b/toonz/sources/toonzqt/Resources/preview_over.svg new file mode 100644 index 0000000..93d3fd7 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_over.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_white_off.png b/toonz/sources/toonzqt/Resources/preview_white_off.png deleted file mode 100644 index 49ae2d2..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_white_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_white_off.svg b/toonz/sources/toonzqt/Resources/preview_white_off.svg new file mode 100644 index 0000000..cf61b80 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_white_off.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_white_on.png b/toonz/sources/toonzqt/Resources/preview_white_on.png deleted file mode 100644 index 58cfb26..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_white_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_white_on.svg b/toonz/sources/toonzqt/Resources/preview_white_on.svg new file mode 100644 index 0000000..6740cc2 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_white_on.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/preview_white_over.png b/toonz/sources/toonzqt/Resources/preview_white_over.png deleted file mode 100644 index b811a49..0000000 Binary files a/toonz/sources/toonzqt/Resources/preview_white_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/preview_white_over.svg b/toonz/sources/toonzqt/Resources/preview_white_over.svg new file mode 100644 index 0000000..0f2cf56 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/preview_white_over.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/prevkey.png b/toonz/sources/toonzqt/Resources/prevkey.png deleted file mode 100644 index fcaaa93..0000000 Binary files a/toonz/sources/toonzqt/Resources/prevkey.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/prevkey.svg b/toonz/sources/toonzqt/Resources/prevkey.svg new file mode 100644 index 0000000..766b53d --- /dev/null +++ b/toonz/sources/toonzqt/Resources/prevkey.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/prevkey_disabled.png b/toonz/sources/toonzqt/Resources/prevkey_disabled.png deleted file mode 100644 index d8f71be..0000000 Binary files a/toonz/sources/toonzqt/Resources/prevkey_disabled.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/prevkey_disabled.svg b/toonz/sources/toonzqt/Resources/prevkey_disabled.svg new file mode 100644 index 0000000..1efc8bc --- /dev/null +++ b/toonz/sources/toonzqt/Resources/prevkey_disabled.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/prevkey_over.png b/toonz/sources/toonzqt/Resources/prevkey_over.png deleted file mode 100644 index 47a67ca..0000000 Binary files a/toonz/sources/toonzqt/Resources/prevkey_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/prevkey_over.svg b/toonz/sources/toonzqt/Resources/prevkey_over.svg new file mode 100644 index 0000000..610d1b2 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/prevkey_over.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/reorder_off.png b/toonz/sources/toonzqt/Resources/reorder_off.png deleted file mode 100644 index 99bb9ac..0000000 Binary files a/toonz/sources/toonzqt/Resources/reorder_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/reorder_off.svg b/toonz/sources/toonzqt/Resources/reorder_off.svg new file mode 100644 index 0000000..e581434 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/reorder_off.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/reorder_on.png b/toonz/sources/toonzqt/Resources/reorder_on.png deleted file mode 100644 index 04b0eb3..0000000 Binary files a/toonz/sources/toonzqt/Resources/reorder_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/reorder_on.svg b/toonz/sources/toonzqt/Resources/reorder_on.svg new file mode 100644 index 0000000..86d55ba --- /dev/null +++ b/toonz/sources/toonzqt/Resources/reorder_on.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/resetsize_off.png b/toonz/sources/toonzqt/Resources/resetsize_off.png deleted file mode 100644 index e0d102a..0000000 Binary files a/toonz/sources/toonzqt/Resources/resetsize_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/resetsize_off.svg b/toonz/sources/toonzqt/Resources/resetsize_off.svg new file mode 100644 index 0000000..23c1fe3 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/resetsize_off.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/resetsize_on.png b/toonz/sources/toonzqt/Resources/resetsize_on.png deleted file mode 100644 index f7a7a55..0000000 Binary files a/toonz/sources/toonzqt/Resources/resetsize_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/resetsize_on.svg b/toonz/sources/toonzqt/Resources/resetsize_on.svg new file mode 100644 index 0000000..124f747 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/resetsize_on.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/save.svg b/toonz/sources/toonzqt/Resources/save.svg new file mode 100644 index 0000000..94b2dc6 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/save.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/save_click.svg b/toonz/sources/toonzqt/Resources/save_click.svg new file mode 100644 index 0000000..d0a628e --- /dev/null +++ b/toonz/sources/toonzqt/Resources/save_click.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/save_over.svg b/toonz/sources/toonzqt/Resources/save_over.svg new file mode 100644 index 0000000..d0a628e --- /dev/null +++ b/toonz/sources/toonzqt/Resources/save_over.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/savepalette_off.png b/toonz/sources/toonzqt/Resources/savepalette_off.png deleted file mode 100644 index 58dcd8a..0000000 Binary files a/toonz/sources/toonzqt/Resources/savepalette_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/savepalette_off.svg b/toonz/sources/toonzqt/Resources/savepalette_off.svg new file mode 100644 index 0000000..a16d2a0 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/savepalette_off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/savepalette_on.png b/toonz/sources/toonzqt/Resources/savepalette_on.png deleted file mode 100644 index 718b6d5..0000000 Binary files a/toonz/sources/toonzqt/Resources/savepalette_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/savepalette_on.svg b/toonz/sources/toonzqt/Resources/savepalette_on.svg new file mode 100644 index 0000000..b32b22e --- /dev/null +++ b/toonz/sources/toonzqt/Resources/savepalette_on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/savepaletteas_off.png b/toonz/sources/toonzqt/Resources/savepaletteas_off.png deleted file mode 100644 index 89ffcf5..0000000 Binary files a/toonz/sources/toonzqt/Resources/savepaletteas_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/savepaletteas_off.svg b/toonz/sources/toonzqt/Resources/savepaletteas_off.svg new file mode 100644 index 0000000..0365afe --- /dev/null +++ b/toonz/sources/toonzqt/Resources/savepaletteas_off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/savepaletteas_on.png b/toonz/sources/toonzqt/Resources/savepaletteas_on.png deleted file mode 100644 index 74b7e75..0000000 Binary files a/toonz/sources/toonzqt/Resources/savepaletteas_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/savepaletteas_on.svg b/toonz/sources/toonzqt/Resources/savepaletteas_on.svg new file mode 100644 index 0000000..834e86c --- /dev/null +++ b/toonz/sources/toonzqt/Resources/savepaletteas_on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonzqt/Resources/schematic_link.png b/toonz/sources/toonzqt/Resources/schematic_link.png deleted file mode 100644 index 3cb9e4c..0000000 Binary files a/toonz/sources/toonzqt/Resources/schematic_link.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/schematic_link.svg b/toonz/sources/toonzqt/Resources/schematic_link.svg new file mode 100644 index 0000000..3aac8f1 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/schematic_link.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/swap_off.png b/toonz/sources/toonzqt/Resources/swap_off.png deleted file mode 100644 index 6ba43b4..0000000 Binary files a/toonz/sources/toonzqt/Resources/swap_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/swap_off.svg b/toonz/sources/toonzqt/Resources/swap_off.svg new file mode 100644 index 0000000..25a1ddf --- /dev/null +++ b/toonz/sources/toonzqt/Resources/swap_off.svg @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/swap_on.png b/toonz/sources/toonzqt/Resources/swap_on.png deleted file mode 100644 index 63b0a7e..0000000 Binary files a/toonz/sources/toonzqt/Resources/swap_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/swap_on.svg b/toonz/sources/toonzqt/Resources/swap_on.svg new file mode 100644 index 0000000..ff7441d --- /dev/null +++ b/toonz/sources/toonzqt/Resources/swap_on.svg @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/switchport_off.png b/toonz/sources/toonzqt/Resources/switchport_off.png deleted file mode 100644 index 008a1cb..0000000 Binary files a/toonz/sources/toonzqt/Resources/switchport_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/switchport_off.svg b/toonz/sources/toonzqt/Resources/switchport_off.svg new file mode 100644 index 0000000..6237f82 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/switchport_off.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/switchport_on.png b/toonz/sources/toonzqt/Resources/switchport_on.png deleted file mode 100644 index fc23829..0000000 Binary files a/toonz/sources/toonzqt/Resources/switchport_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/switchport_on.svg b/toonz/sources/toonzqt/Resources/switchport_on.svg new file mode 100644 index 0000000..1f6a3f5 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/switchport_on.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/switchport_over.png b/toonz/sources/toonzqt/Resources/switchport_over.png deleted file mode 100644 index e403ff7..0000000 Binary files a/toonz/sources/toonzqt/Resources/switchport_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/switchport_over.svg b/toonz/sources/toonzqt/Resources/switchport_over.svg new file mode 100644 index 0000000..0e1bddc --- /dev/null +++ b/toonz/sources/toonzqt/Resources/switchport_over.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/viewcamera_off.png b/toonz/sources/toonzqt/Resources/viewcamera_off.png deleted file mode 100644 index c516071..0000000 Binary files a/toonz/sources/toonzqt/Resources/viewcamera_off.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/viewcamera_off.svg b/toonz/sources/toonzqt/Resources/viewcamera_off.svg new file mode 100644 index 0000000..f22146a --- /dev/null +++ b/toonz/sources/toonzqt/Resources/viewcamera_off.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/viewcamera_on.png b/toonz/sources/toonzqt/Resources/viewcamera_on.png deleted file mode 100644 index ddcd8a7..0000000 Binary files a/toonz/sources/toonzqt/Resources/viewcamera_on.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/viewcamera_on.svg b/toonz/sources/toonzqt/Resources/viewcamera_on.svg new file mode 100644 index 0000000..42da920 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/viewcamera_on.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/Resources/viewcamera_over.png b/toonz/sources/toonzqt/Resources/viewcamera_over.png deleted file mode 100644 index efeff9e..0000000 Binary files a/toonz/sources/toonzqt/Resources/viewcamera_over.png and /dev/null differ diff --git a/toonz/sources/toonzqt/Resources/viewcamera_over.svg b/toonz/sources/toonzqt/Resources/viewcamera_over.svg new file mode 100644 index 0000000..444f0a2 --- /dev/null +++ b/toonz/sources/toonzqt/Resources/viewcamera_over.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonzqt/flipconsole.cpp b/toonz/sources/toonzqt/flipconsole.cpp index f230afb..7fc8c0d 100644 --- a/toonz/sources/toonzqt/flipconsole.cpp +++ b/toonz/sources/toonzqt/flipconsole.cpp @@ -877,7 +877,7 @@ void FlipConsole::setCurrentFPS(int val) { void FlipConsole::createButton(UINT buttonMask, const char *iconStr, const QString &tip, bool checkable, QActionGroup *group) { - QIcon icon = createQIconPNG(iconStr); + QIcon icon = createQIcon(iconStr); QAction *action = new QAction(icon, tip, m_playToolBar); action->setData(QVariant(buttonMask)); action->setCheckable(checkable); @@ -891,7 +891,7 @@ void FlipConsole::createButton(UINT buttonMask, const char *iconStr, QAction *FlipConsole::createCheckedButtonWithBorderImage( UINT buttonMask, const char *iconStr, const QString &tip, bool checkable, QActionGroup *group, const char *cmdId) { - QIcon icon = createQIconPNG(iconStr); + QIcon icon = createQIcon(iconStr); QWidgetAction *action = new QWidgetAction(m_playToolBar); action->setIcon(icon); action->setToolTip(tip); @@ -923,8 +923,8 @@ QAction *FlipConsole::createDoubleButton( UINT buttonMask1, UINT buttonMask2, const char *iconStr1, const char *iconStr2, const QString &tip1, const QString &tip2, QActionGroup *group, DoubleButton *&widget) { - QAction *action1 = new QAction(createQIconPNG(iconStr1), tip1, m_playToolBar); - QAction *action2 = new QAction(createQIconPNG(iconStr2), tip2, m_playToolBar); + QAction *action1 = new QAction(createQIcon(iconStr1), tip1, m_playToolBar); + QAction *action2 = new QAction(createQIcon(iconStr2), tip2, m_playToolBar); m_actions[(EGadget)buttonMask1] = action1; m_actions[(EGadget)buttonMask2] = action2; @@ -949,7 +949,7 @@ QAction *FlipConsole::createDoubleButton( void FlipConsole::createOnOffButton(UINT buttonMask, const char *iconStr, const QString &tip, QActionGroup *group) { - QIcon icon = createQIconOnOffPNG(iconStr); + QIcon icon = createQIconOnOff(iconStr); QAction *action = new QAction(icon, tip, m_playToolBar); action->setData(QVariant(buttonMask)); action->setCheckable(true); @@ -1120,6 +1120,7 @@ void FlipConsole::createPlayToolBar(bool withCustomWidget) { m_playToolBar = new QToolBar(this); m_playToolBar->setMovable(false); m_playToolBar->setObjectName("FlipConsolePlayToolBar"); + m_playToolBar->setIconSize(QSize(17, 17)); // m_playToolBar->setObjectName("chackableButtonToolBar"); // m_playToolBar->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); @@ -1127,8 +1128,7 @@ void FlipConsole::createPlayToolBar(bool withCustomWidget) { createCustomizeMenu(withCustomWidget); if (m_gadgetsMask & eSave) { - // just reuse the icon file named "savepalette" - createButton(eSave, "savepalette", tr("&Save Images"), false); + createButton(eSave, "save", tr("&Save Images"), false); // m_saveSep = m_playToolBar->addSeparator(); } diff --git a/toonz/sources/toonzqt/framenavigator.cpp b/toonz/sources/toonzqt/framenavigator.cpp index 92985bf..56fe618 100644 --- a/toonz/sources/toonzqt/framenavigator.cpp +++ b/toonz/sources/toonzqt/framenavigator.cpp @@ -20,8 +20,10 @@ using namespace DVGui; FrameNavigator::FrameNavigator(QWidget *parent) : QToolBar(parent), m_frame(0), m_lineEdit(0), m_frameHandle(0) { setMaximumWidth(130); + setIconSize(QSize(17, 17)); + setObjectName("WidePaddingToolBar"); QAction *prevButton = - new QAction(createQIconPNG("frameprev"), tr("Previous Frame"), this); + new QAction(createQIcon("frameprev"), tr("Previous Frame"), this); connect(prevButton, SIGNAL(triggered()), this, SLOT(prevFrame())); addAction(prevButton); @@ -33,7 +35,7 @@ FrameNavigator::FrameNavigator(QWidget *parent) addWidget(m_lineEdit); QAction *nextButton = - new QAction(createQIconPNG("framenext"), tr("Next Frame"), this); + new QAction(createQIcon("framenext"), tr("Next Frame"), this); ret = ret && connect(nextButton, SIGNAL(triggered()), this, SLOT(nextFrame())); addAction(nextButton); diff --git a/toonz/sources/toonzqt/functiontoolbar.cpp b/toonz/sources/toonzqt/functiontoolbar.cpp index 304fb90..c66f7f6 100644 --- a/toonz/sources/toonzqt/functiontoolbar.cpp +++ b/toonz/sources/toonzqt/functiontoolbar.cpp @@ -63,8 +63,8 @@ FunctionToolbar::FunctionToolbar(QWidget *parent) space->setMinimumHeight(22); space->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - QIcon toggleIcon = createQIconOnOffPNG("swap", false); - QAction *toggleAction = new QAction(tr("&Function Editor Toggle"), this); + QIcon toggleIcon = createQIconOnOff("swap", false); + QAction *toggleAction = new QAction(tr("&Open Function Curve Editor"), this); assert(toggleAction); toggleAction->setIcon(toggleIcon); diff --git a/toonz/sources/toonzqt/fxschematicnode.cpp b/toonz/sources/toonzqt/fxschematicnode.cpp index d253ee8..ea47502 100644 --- a/toonz/sources/toonzqt/fxschematicnode.cpp +++ b/toonz/sources/toonzqt/fxschematicnode.cpp @@ -50,6 +50,7 @@ #include #include #include +#include //******************************************************************************** // Local namespace @@ -109,6 +110,12 @@ int getInputPortIndex(TFxPort *port, TFx *fx) { } return -1; } + +int getDevPixRatio() { + static int devPixRatio = QApplication::desktop()->devicePixelRatio(); + return devPixRatio; +} + } // namespace //***************************************************** @@ -337,8 +344,6 @@ void FxColumnPainter::contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) { QAction *addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx"); - QIcon addOutputFxIcon = createQIconOnOffPNG("output", false); - if (addOutputFx) addOutputFx->setIcon(addOutputFxIcon); QAction *addPaste = new QAction(tr("&Paste Add"), &menu); connect(addPaste, SIGNAL(triggered()), fxScene, SLOT(onAddPaste())); @@ -859,8 +864,6 @@ void FxPainter::contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) { QAction *addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx"); - QIcon addOutputFxIcon = createQIconOnOffPNG("output", false); - if (addOutputFx) addOutputFx->setIcon(addOutputFxIcon); QAction *deleteFx = new QAction(tr("&Delete"), &menu); connect(deleteFx, SIGNAL(triggered()), fxScene, SLOT(onDeleteFx())); @@ -1130,8 +1133,6 @@ void FxXSheetPainter::contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) { QAction *addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx"); - QIcon addOutputFxIcon = createQIconOnOffPNG("output", false); - if (addOutputFx) addOutputFx->setIcon(addOutputFxIcon); QAction *addPaste = new QAction(tr("&Paste Add"), &menu); connect(addPaste, SIGNAL(triggered()), fxScene, SLOT(onAddPaste())); @@ -1243,8 +1244,6 @@ void FxOutputPainter::contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) { } else { QAction *addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx"); - QIcon addOutputFxIcon = createQIconOnOffPNG("output", false); - addOutputFx->setIcon(addOutputFxIcon); menu.addAction(addOutputFx); } menu.exec(cme->screenPos()); @@ -1401,14 +1400,24 @@ void FxSchematicPort::paint(QPainter *painter, switch (getType()) { case eFxInputPort: case eFxGroupedInPort: { - QPixmap redPm = QPixmap(":Resources/fxport_red.png"); - painter->drawPixmap(boundingRect(), redPm, QRectF(0, 0, 50, 50)); + QRect sourceRect = + scene()->views()[0]->matrix().mapRect(boundingRect()).toRect(); + QPixmap redPm = + QIcon(":Resources/fxport_red.svg").pixmap(sourceRect.size()); + sourceRect = QRect(0, 0, sourceRect.width() * getDevPixRatio(), + sourceRect.height() * getDevPixRatio()); + painter->drawPixmap(boundingRect(), redPm, sourceRect); } break; case eFxOutputPort: case eFxGroupedOutPort: { - QPixmap bluePm = QPixmap(":Resources/fxport_blue.png"); - painter->drawPixmap(boundingRect(), bluePm, QRectF(0, 0, 50, 50)); + QRect sourceRect = + scene()->views()[0]->matrix().mapRect(boundingRect()).toRect(); + QPixmap bluePm = + QIcon(":Resources/fxport_blue.svg").pixmap(sourceRect.size()); + sourceRect = QRect(0, 0, sourceRect.width() * getDevPixRatio(), + sourceRect.height() * getDevPixRatio()); + painter->drawPixmap(boundingRect(), bluePm, sourceRect); FxSchematicDock *parentDock = dynamic_cast(parentItem()); if (parentDock) { @@ -1426,9 +1435,14 @@ void FxSchematicPort::paint(QPainter *painter, } break; case eFxLinkPort: // LinkPort - default: { - QPixmap linkPm = QPixmap(":Resources/schematic_link.png"); - painter->drawPixmap(boundingRect(), linkPm, QRectF(0, 0, 36, 14)); + default: { //ここから！！！ + QRect sourceRect = + scene()->views()[0]->matrix().mapRect(boundingRect()).toRect(); + QPixmap linkPm = + QIcon(":Resources/schematic_link.svg").pixmap(sourceRect.size()); + sourceRect = QRect(0, 0, sourceRect.width() * getDevPixRatio(), + sourceRect.height() * getDevPixRatio()); + painter->drawPixmap(boundingRect(), linkPm, sourceRect); } break; } } diff --git a/toonz/sources/toonzqt/fxschematicscene.cpp b/toonz/sources/toonzqt/fxschematicscene.cpp index aa1ecf7..be0019b 100644 --- a/toonz/sources/toonzqt/fxschematicscene.cpp +++ b/toonz/sources/toonzqt/fxschematicscene.cpp @@ -900,11 +900,9 @@ void FxSchematicScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) { QAction *addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx"); - QAction *copy = CommandManager::instance()->getAction("MI_Copy"); - QAction *cut = CommandManager::instance()->getAction("MI_Cut"); - QAction *paste = CommandManager::instance()->getAction("MI_Paste"); - QIcon addOutputFxIcon = createQIconOnOffPNG("output", false); - if (addOutputFx) addOutputFx->setIcon(addOutputFxIcon); + QAction *copy = CommandManager::instance()->getAction("MI_Copy"); + QAction *cut = CommandManager::instance()->getAction("MI_Cut"); + QAction *paste = CommandManager::instance()->getAction("MI_Paste"); m_addFxContextMenu.setCurrentCursorScenePos(cme->scenePos()); diff --git a/toonz/sources/toonzqt/fxsettings.cpp b/toonz/sources/toonzqt/fxsettings.cpp index 5d31582..ecd478d 100644 --- a/toonz/sources/toonzqt/fxsettings.cpp +++ b/toonz/sources/toonzqt/fxsettings.cpp @@ -1203,7 +1203,9 @@ void FxSettings::createToolBar() { m_toolBar = new QToolBar(this); m_toolBar->setMovable(false); m_toolBar->setFixedHeight(23); - m_toolBar->setIconSize(QSize(23, 21)); + m_toolBar->setIconSize(QSize(17, 17)); + m_toolBar->setObjectName("MediumPaddingToolBar"); + // m_toolBar->setIconSize(QSize(23, 21)); // m_toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, // QSizePolicy::MinimumExpanding); @@ -1211,13 +1213,13 @@ void FxSettings::createToolBar() { QActionGroup *viewModeActGroup = new QActionGroup(m_toolBar); viewModeActGroup->setExclusive(false); // camera - QIcon camera = createQIconOnOffPNG("viewcamera"); + QIcon camera = createQIconOnOff("viewcamera"); QAction *cameraAct = new QAction(camera, tr("&Camera Preview"), m_toolBar); cameraAct->setCheckable(true); viewModeActGroup->addAction(cameraAct); m_toolBar->addAction(cameraAct); // preview - QIcon preview = createQIconOnOffPNG("preview"); + QIcon preview = createQIconOnOff("preview"); QAction *previewAct = new QAction(preview, tr("&Preview"), m_toolBar); previewAct->setCheckable(true); viewModeActGroup->addAction(previewAct); @@ -1230,7 +1232,7 @@ void FxSettings::createToolBar() { QActionGroup *viewModeGroup = new QActionGroup(m_toolBar); viewModeGroup->setExclusive(true); - QAction *whiteBg = new QAction(createQIconOnOffPNG("preview_white"), + QAction *whiteBg = new QAction(createQIconOnOff("preview_white"), tr("&White Background"), m_toolBar); whiteBg->setCheckable(true); whiteBg->setChecked(true); @@ -1238,14 +1240,14 @@ void FxSettings::createToolBar() { connect(whiteBg, SIGNAL(triggered()), this, SLOT(setWhiteBg())); m_toolBar->addAction(whiteBg); - QAction *blackBg = new QAction(createQIconOnOffPNG("preview_black"), + QAction *blackBg = new QAction(createQIconOnOff("preview_black"), tr("&Black Background"), m_toolBar); blackBg->setCheckable(true); viewModeGroup->addAction(blackBg); connect(blackBg, SIGNAL(triggered()), this, SLOT(setBlackBg())); m_toolBar->addAction(blackBg); - m_checkboardBg = new QAction(createQIconOnOffPNG("preview_checkboard"), + m_checkboardBg = new QAction(createQIconOnOff("preview_checkboard"), tr("&Checkered Background"), m_toolBar); m_checkboardBg->setCheckable(true); viewModeGroup->addAction(m_checkboardBg); diff --git a/toonz/sources/toonzqt/keyframenavigator.cpp b/toonz/sources/toonzqt/keyframenavigator.cpp index 278295a..8abb65a 100644 --- a/toonz/sources/toonzqt/keyframenavigator.cpp +++ b/toonz/sources/toonzqt/keyframenavigator.cpp @@ -38,7 +38,7 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle) : QToolBar(parent), m_frameHandle(frameHandle) { setLayoutDirection(Qt::LeftToRight); - setIconSize(QSize(15, 23)); + setIconSize(QSize(18, 18)); setObjectName("keyFrameNavigator"); @@ -54,16 +54,16 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle) m_actPreviewKey); // obtain a widget generated from QAction prevWidget->setObjectName("PreviousKey"); - m_actKeyNo = new QAction(createQIconPNG("key_no"), tr("Set Key"), this); + m_actKeyNo = new QAction(createQIcon("key_no"), tr("Set Key"), this); connect(m_actKeyNo, SIGNAL(triggered()), SLOT(toggleKeyAct())); addAction(m_actKeyNo); m_actKeyPartial = - new QAction(createQIconPNG("key_partial"), tr("Set Key"), this); + new QAction(createQIcon("key_partial"), tr("Set Key"), this); connect(m_actKeyPartial, SIGNAL(triggered()), SLOT(toggleKeyAct())); addAction(m_actKeyPartial); - m_actKeyTotal = new QAction(createQIconPNG("key_total"), tr("Set Key"), this); + m_actKeyTotal = new QAction(createQIcon("key_total"), tr("Set Key"), this); connect(m_actKeyTotal, SIGNAL(triggered()), SLOT(toggleKeyAct())); addAction(m_actKeyTotal); diff --git a/toonz/sources/toonzqt/paletteviewer.cpp b/toonz/sources/toonzqt/paletteviewer.cpp index 2444ccb..7e5f3ea 100644 --- a/toonz/sources/toonzqt/paletteviewer.cpp +++ b/toonz/sources/toonzqt/paletteviewer.cpp @@ -301,7 +301,7 @@ void PaletteViewer::createPaletteToolBar() { // Lock button to avoid editing the palette by mistake if (m_viewType == LEVEL_PALETTE) { - QIcon lockIcon = createQIconOnOffPNG("lockpalette"); + QIcon lockIcon = createQIconOnOff("lockpalette"); m_lockPaletteToolButton = new QToolButton(this); m_lockPaletteToolButton->setIcon(lockIcon); @@ -321,7 +321,7 @@ void PaletteViewer::createPaletteToolBar() { QToolButton *toolButton = new QToolButton(this); toolButton->setPopupMode(QToolButton::InstantPopup); - QIcon lockIcon = createQIconOnOffPNG("lockpalette"); + QIcon lockIcon = createQIconOnOff("lockpalette"); toolButton->setIcon(lockIcon); toolButton->setObjectName("PaletteLockButton"); @@ -349,7 +349,7 @@ void PaletteViewer::createPaletteToolBar() { QToolButton *viewModeButton = new QToolButton(this); viewModeButton->setPopupMode(QToolButton::InstantPopup); - QIcon viewModeIcon = createQIconPNG("options"); + QIcon viewModeIcon = createQIcon("options"); viewModeButton->setIcon(viewModeIcon); QMenu *viewMode = new QMenu(QString("Options"), viewModeButton); viewMode->setToolTip(tr("Options")); @@ -410,14 +410,14 @@ void PaletteViewer::createPaletteToolBar() { if (m_hasPageCommand) { QAction *addPage; - QIcon addPageIcon = createQIconPNG("newpage"); + QIcon addPageIcon = createQIcon("newpage"); addPage = new QAction(addPageIcon, tr("&New Page"), m_paletteToolBar); connect(addPage, SIGNAL(triggered()), this, SLOT(addNewPage())); m_paletteToolBar->addAction(addPage); } - QIcon newColorIcon = createQIconPNG("newstyle"); + QIcon newColorIcon = createQIcon("newstyle"); QAction *addColor = new QAction(newColorIcon, tr("&New Style"), m_paletteToolBar); connect(addColor, SIGNAL(triggered()), this, SLOT(addNewColor())); @@ -450,11 +450,11 @@ void PaletteViewer::createSavePaletteToolBar() { } // save palette as - QIcon saveAsPaletteIcon = createQIconOnOffPNG("savepaletteas", false); + QIcon saveAsPaletteIcon = createQIconOnOff("savepaletteas", false); QAction *saveAsPalette = new QAction( saveAsPaletteIcon, tr("&Save Palette As"), m_savePaletteToolBar); // overwrite palette - QIcon savePaletteIcon = createQIconOnOffPNG("savepalette", false); + QIcon savePaletteIcon = createQIconOnOff("savepalette", false); QAction *savePalette = new QAction(savePaletteIcon, tr("&Save Palette"), m_savePaletteToolBar); diff --git a/toonz/sources/toonzqt/popupbutton.cpp b/toonz/sources/toonzqt/popupbutton.cpp index 8bdecee..664285c 100644 --- a/toonz/sources/toonzqt/popupbutton.cpp +++ b/toonz/sources/toonzqt/popupbutton.cpp @@ -14,7 +14,7 @@ PopupButton::PopupButton(QWidget *parent) : QPushButton(parent), m_index(-1) { QMenu *menu = new QMenu(this); setMenu(menu); - + menu->setToolTipsVisible(true); connect(this, SIGNAL(clicked(bool)), this, SLOT(showMenu())); } diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cpp index 4338903..36c030b 100644 --- a/toonz/sources/toonzqt/schematicviewer.cpp +++ b/toonz/sources/toonzqt/schematicviewer.cpp @@ -450,10 +450,10 @@ SchematicViewer::SchematicViewer(QWidget *parent) m_fxToolbar = new QToolBar(m_viewer); m_swapToolbar = new QToolBar(m_viewer); - m_commonToolbar->setObjectName("ToolBarWithoutBorder"); - m_stageToolbar->setObjectName("ToolBarWithoutBorder"); - m_fxToolbar->setObjectName("ToolBarWithoutBorder"); - m_swapToolbar->setObjectName("ToolBarWithoutBorder"); + m_commonToolbar->setObjectName("MediumPaddingToolBar"); + m_stageToolbar->setObjectName("MediumPaddingToolBar"); + m_fxToolbar->setObjectName("MediumPaddingToolBar"); + m_swapToolbar->setObjectName("MediumPaddingToolBar"); createToolbars(); createActions(); @@ -540,22 +540,22 @@ void SchematicViewer::setSchematicScene(SchematicScene *scene) { void SchematicViewer::createToolbars() { // Initialize them m_stageToolbar->setMovable(false); - m_stageToolbar->setIconSize(QSize(23, 17)); + m_stageToolbar->setIconSize(QSize(17, 17)); m_stageToolbar->setLayoutDirection(Qt::RightToLeft); m_stageToolbar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_commonToolbar->setMovable(false); - m_commonToolbar->setIconSize(QSize(23, 17)); + m_commonToolbar->setIconSize(QSize(17, 17)); m_commonToolbar->setLayoutDirection(Qt::RightToLeft); m_commonToolbar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_fxToolbar->setMovable(false); - m_fxToolbar->setIconSize(QSize(23, 17)); + m_fxToolbar->setIconSize(QSize(17, 17)); m_fxToolbar->setLayoutDirection(Qt::RightToLeft); m_fxToolbar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_swapToolbar->setMovable(false); - m_swapToolbar->setIconSize(QSize(23, 17)); + m_swapToolbar->setIconSize(QSize(17, 17)); m_swapToolbar->setLayoutDirection(Qt::RightToLeft); m_swapToolbar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); } @@ -568,29 +568,29 @@ void SchematicViewer::createActions() { *addOutputFx = 0, *switchPort = 0; { // Fit schematic - QIcon fitSchematicIcon = createQIconOnOffPNG("fit", false); + QIcon fitSchematicIcon = createQIconOnOff("fit", false); m_fitSchematic = new QAction(fitSchematicIcon, tr("&Fit to Window"), m_commonToolbar); connect(m_fitSchematic, SIGNAL(triggered()), m_viewer, SLOT(fitScene())); // Center On - QIcon centerOnIcon = createQIconOnOffPNG("centerselection", false); + QIcon centerOnIcon = createQIconOnOff("centerselection", false); m_centerOn = new QAction(centerOnIcon, tr("&Focus on Current"), m_commonToolbar); connect(m_centerOn, SIGNAL(triggered()), m_viewer, SLOT(centerOnCurrent())); // Reorder schematic - QIcon reorderIcon = createQIconOnOffPNG("reorder", false); + QIcon reorderIcon = createQIconOnOff("reorder", false); m_reorder = new QAction(reorderIcon, tr("&Reorder Nodes"), m_commonToolbar); connect(m_reorder, SIGNAL(triggered()), m_viewer, SLOT(reorderScene())); // Normalize schematic schematic - QIcon normalizeIcon = createQIconOnOffPNG("resetsize", false); + QIcon normalizeIcon = createQIconOnOff("resetsize", false); m_normalize = new QAction(normalizeIcon, tr("&Reset Size"), m_commonToolbar); connect(m_normalize, SIGNAL(triggered()), m_viewer, SLOT(normalizeScene())); - QIcon nodeSizeIcon = createQIconOnOffPNG( + QIcon nodeSizeIcon = createQIconOnOff( m_maximizedNode ? "minimizenodes" : "maximizenodes", false); m_nodeSize = new QAction(nodeSizeIcon, m_maximizedNode ? tr("&Minimize Nodes") @@ -601,21 +601,21 @@ void SchematicViewer::createActions() { if (m_fullSchematic) { // AddPegbar addPegbar = new QAction(tr("&New Pegbar"), m_stageToolbar); - QIcon addPegbarIcon = createQIconOnOffPNG("pegbar", false); + QIcon addPegbarIcon = createQIconOnOff("pegbar", false); addPegbar->setIcon(addPegbarIcon); connect(addPegbar, SIGNAL(triggered()), m_stageScene, SLOT(onPegbarAdded())); // AddCamera addCamera = new QAction(tr("&New Camera"), m_stageToolbar); - QIcon addCameraIcon = createQIconOnOffPNG("camera", false); + QIcon addCameraIcon = createQIconOnOff("camera", false); addCamera->setIcon(addCameraIcon); connect(addCamera, SIGNAL(triggered()), m_stageScene, SLOT(onCameraAdded())); // AddSpline addSpline = new QAction(tr("&New Motion Path"), m_stageToolbar); - QIcon addSplineIcon = createQIconOnOffPNG("motionpath", false); + QIcon addSplineIcon = createQIconOnOff("motionpath", false); addSpline->setIcon(addSplineIcon); connect(addSpline, SIGNAL(triggered()), m_stageScene, SLOT(onSplineAdded())); @@ -625,7 +625,7 @@ void SchematicViewer::createActions() { new QAction(tr("&Swtich output port display mode"), m_stageToolbar); switchPort->setCheckable(true); switchPort->setChecked(m_stageScene->isShowLetterOnPortFlagEnabled()); - QIcon switchPortIcon = createQIconOnOffPNG("switchport"); + QIcon switchPortIcon = createQIconOnOff("switchport"); switchPort->setIcon(switchPortIcon); connect(switchPort, SIGNAL(toggled(bool)), m_stageScene, SLOT(onSwitchPortModeToggled(bool))); @@ -633,17 +633,15 @@ void SchematicViewer::createActions() { // InsertFx insertFx = CommandManager::instance()->getAction("MI_InsertFx"); if (insertFx) { - QIcon insertFxIcon = createQIconOnOffPNG("fx", false); + QIcon insertFxIcon = createQIconOnOff("fx", false); insertFx->setIcon(insertFxIcon); } // AddOutputFx addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx"); - QIcon addOutputFxIcon = createQIconOnOffPNG("output", false); - if (addOutputFx) addOutputFx->setIcon(addOutputFxIcon); // Swap fx/stage schematic - QIcon changeSchematicIcon = createQIconOnOffPNG("swap", false); + QIcon changeSchematicIcon = createQIconOnOff("swap", false); m_changeScene = CommandManager::instance()->getAction("A_FxSchematicToggle", true); if (m_changeScene) { @@ -740,7 +738,7 @@ void SchematicViewer::onSceneSwitched() { ->getXsheet() ->getFxDag() ->getDagGridDimension() == 0; - QIcon nodeSizeIcon = createQIconOnOffPNG( + QIcon nodeSizeIcon = createQIconOnOff( m_maximizedNode ? "minimizenodes" : "maximizenodes", false); m_nodeSize->setIcon(nodeSizeIcon); QString label(m_maximizedNode ? tr("&Minimize Nodes") @@ -799,7 +797,7 @@ void SchematicViewer::changeNodeSize() { // aggiono l'icona del pulsante; m_fxScene->resizeNodes(m_maximizedNode); m_stageScene->resizeNodes(m_maximizedNode); - QIcon nodeSizeIcon = createQIconOnOffPNG( + QIcon nodeSizeIcon = createQIconOnOff( m_maximizedNode ? "minimizenodes" : "maximizenodes", false); m_nodeSize->setIcon(nodeSizeIcon); QString label(m_maximizedNode ? tr("&Minimize Nodes") diff --git a/toonz/sources/toonzqt/toonzqt.qrc b/toonz/sources/toonzqt/toonzqt.qrc index 6fc19a1..77c149f 100644 --- a/toonz/sources/toonzqt/toonzqt.qrc +++ b/toonz/sources/toonzqt/toonzqt.qrc @@ -10,12 +10,12 @@ Resources/bottomover.png Resources/bold_off.png Resources/bold_on.png - Resources/camera_off.png - Resources/camera_on.png + Resources/camera_off.svg + Resources/camera_on.svg Resources/camerastand_toggle.png Resources/camerastand_toggle_transp.png - Resources/centerselection_off.png - Resources/centerselection_on.png + Resources/centerselection_off.svg + Resources/centerselection_on.svg Resources/cleanup.png Resources/custom_off.svg Resources/custom_on.svg @@ -23,10 +23,10 @@ Resources/delete_over.png Resources/dragpalette.png Resources/dragpalette_over.png - Resources/fit_off.png - Resources/fit_on.png - Resources/fx_off.png - Resources/fx_on.png + Resources/fit_off.svg + Resources/fit_on.svg + Resources/fx_off.svg + Resources/fx_on.svg Resources/h_chandle.png Resources/icon.png Resources/italic_off.png @@ -39,37 +39,35 @@ Resources/folder_open.png Resources/folderanim_close.png Resources/folderanim_open.png - Resources/key_no.png - Resources/key_no_over.png - Resources/key_partial.png - Resources/key_partial_over.png - Resources/key_total.png - Resources/key_total_over.png + Resources/key_no.svg + Resources/key_no_over.svg + Resources/key_partial.svg + Resources/key_partial_over.svg + Resources/key_total.svg + Resources/key_total_over.svg Resources/magpie.png - Resources/maximizenodes_off.png - Resources/maximizenodes_on.png - Resources/minimizenodes_off.png - Resources/minimizenodes_on.png - Resources/motionpath_off.png - Resources/motionpath_on.png - Resources/newfolder.png - Resources/newfolder_over.png - Resources/newpage.png - Resources/newpage_over.png + Resources/maximizenodes_off.svg + Resources/maximizenodes_on.svg + Resources/minimizenodes_off.svg + Resources/minimizenodes_on.svg + Resources/motionpath_off.svg + Resources/motionpath_on.svg + Resources/newfolder.svg + Resources/newfolder_over.svg + Resources/newpage.svg + Resources/newpage_over.svg Resources/newpalette.png Resources/newpalette_over.png - Resources/newstyle.png - Resources/newstyle_click.png - Resources/newstyle_over.png - Resources/nextkey.png - Resources/nextkey_disabled.png - Resources/nextkey_over.png + Resources/newstyle.svg + Resources/newstyle_over.svg + Resources/nextkey.svg + Resources/nextkey_disabled.svg + Resources/nextkey_over.svg Resources/no_specialstyle.png - Resources/options.png - Resources/options_click.png - Resources/options_over.png - Resources/output_off.png - Resources/output_on.png + Resources/options.svg + Resources/options_over.svg + Resources/output_off.svg + Resources/output_on.svg Resources/palette.png Resources/palette_add_color.bmp Resources/palette_tabicon.png @@ -79,36 +77,39 @@ Resources/param_on.png Resources/paramanim_off.png Resources/paramanim_on.png - Resources/pegbar_off.png - Resources/pegbar_on.png + Resources/pegbar_off.svg + Resources/pegbar_on.svg Resources/plaincolor_off.svg Resources/plaincolor_on.svg - Resources/reorder_off.png - Resources/reorder_on.png - Resources/resetsize_off.png - Resources/resetsize_on.png + Resources/reorder_off.svg + Resources/reorder_on.svg + Resources/resetsize_off.svg + Resources/resetsize_on.svg Resources/settings_off.svg Resources/settings_on.svg - Resources/preview_black_off.png - Resources/preview_black_on.png - Resources/preview_black_over.png - Resources/preview_checkboard_off.png - Resources/preview_checkboard_on.png - Resources/preview_checkboard_over.png - Resources/preview_off.png - Resources/preview_on.png - Resources/preview_over.png + Resources/preview_black_off.svg + Resources/preview_black_on.svg + Resources/preview_black_over.svg + Resources/preview_checkboard_off.svg + Resources/preview_checkboard_on.svg + Resources/preview_checkboard_over.svg + Resources/preview_off.svg + Resources/preview_on.svg + Resources/preview_over.svg Resources/preview_toggle.png - Resources/preview_white_off.png - Resources/preview_white_on.png - Resources/preview_white_over.png - Resources/prevkey.png - Resources/prevkey_disabled.png - Resources/prevkey_over.png + Resources/preview_white_off.svg + Resources/preview_white_on.svg + Resources/preview_white_over.svg + Resources/prevkey.svg + Resources/prevkey_disabled.svg + Resources/prevkey_over.svg Resources/resizeColumnNode.svg Resources/savepalette.png + Resources/save.svg Resources/savepalette_click.png + Resources/save_click.svg Resources/savepalette_over.png + Resources/save_over.svg Resources/saveas_on.png Resources/saveas_off.png Resources/schematic_spin_arrows.svg @@ -128,8 +129,8 @@ Resources/sizemedium_over.png Resources/special_off.svg Resources/special_on.svg - Resources/swap_off.png - Resources/swap_on.png + Resources/swap_off.svg + Resources/swap_on.svg Resources/tasklist.png Resources/text_edit_button.png Resources/texture_off.svg @@ -137,25 +138,25 @@ Resources/underline_off.png Resources/underline_on.png Resources/v_chandle.png - Resources/viewcamera_off.png - Resources/viewcamera_on.png - Resources/viewcamera_over.png + Resources/viewcamera_off.svg + Resources/viewcamera_on.svg + Resources/viewcamera_over.svg Resources/unknown.png Resources/audio.png Resources/broken.png - Resources/opacitycheck_off.png - Resources/opacitycheck_on.png - Resources/opacitycheck_over.png + Resources/opacitycheck_off.svg + Resources/opacitycheck_on.svg + Resources/opacitycheck_over.svg Resources/tmsg_info.png Resources/tmsg_error.png Resources/tmsg_warning.png - Resources/lockpalette_off.png - Resources/lockpalette_on.png - Resources/lockpalette_over.png - Resources/savepalette_off.png - Resources/savepalette_on.png - Resources/savepaletteas_off.png - Resources/savepaletteas_on.png + Resources/lockpalette_off.svg + Resources/lockpalette_on.svg + Resources/lockpalette_over.svg + Resources/savepalette_off.svg + Resources/savepalette_on.svg + Resources/savepaletteas_off.svg + Resources/savepaletteas_on.svg Resources/studiopalette.png Resources/grad_r.png Resources/grad_g.png @@ -176,10 +177,10 @@ Resources/schematic_prev_eye.png Resources/schematic_table_view.png Resources/schematic_table_view_transp.png - Resources/fxport_red.png - Resources/fxport_blue.png + Resources/fxport_red.svg + Resources/fxport_blue.svg Resources/cachefx.png - Resources/schematic_link.png + Resources/schematic_link.svg Resources/schematic_thumbtoggle_on.png Resources/schematic_thumbtoggle_off.png Resources/dragcursor_exp_text.png @@ -303,9 +304,9 @@ Resources/keyframe_key.png Resources/keyframe_modified.png Resources/keyframe_inbetween.png - Resources/switchport_on.png - Resources/switchport_off.png - Resources/switchport_over.png + Resources/switchport_on.svg + Resources/switchport_off.svg + Resources/switchport_over.svg Resources/plus.png