From 546df57ed07e796f271851bbf598c2db5dab3955 Mon Sep 17 00:00:00 2001
From: MrBlockCat <37186692+MrBlockCat@users.noreply.github.com>
Date: Mar 18 2020 02:11:56 +0000
Subject: Makes all Command Bar/Xsheet Toolbar icons SVG
toolbar_arrow.png was replaced with toolbar_arrow.svg, but I don't know where it's used in the code so this shouldn't be pulled into OpenToonz until that's sorted out!
---
diff --git a/toonz/sources/toonz/Resources/collapse.png b/toonz/sources/toonz/Resources/collapse.png
deleted file mode 100644
index 4cce38c..0000000
Binary files a/toonz/sources/toonz/Resources/collapse.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/collapse.svg b/toonz/sources/toonz/Resources/collapse.svg
new file mode 100644
index 0000000..09745a2
--- /dev/null
+++ b/toonz/sources/toonz/Resources/collapse.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/collapse_click.png b/toonz/sources/toonz/Resources/collapse_click.png
deleted file mode 100644
index 5eac829..0000000
Binary files a/toonz/sources/toonz/Resources/collapse_click.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/collapse_click.svg b/toonz/sources/toonz/Resources/collapse_click.svg
new file mode 100644
index 0000000..4724c90
--- /dev/null
+++ b/toonz/sources/toonz/Resources/collapse_click.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/collapse_over.png b/toonz/sources/toonz/Resources/collapse_over.png
deleted file mode 100644
index 4cce38c..0000000
Binary files a/toonz/sources/toonz/Resources/collapse_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/collapse_over.svg b/toonz/sources/toonz/Resources/collapse_over.svg
new file mode 100644
index 0000000..09745a2
--- /dev/null
+++ b/toonz/sources/toonz/Resources/collapse_over.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/plastic.svg b/toonz/sources/toonz/Resources/plastic.svg
index 1b8c80d..63a9283 100644
--- a/toonz/sources/toonz/Resources/plastic.svg
+++ b/toonz/sources/toonz/Resources/plastic.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/preferences.svg b/toonz/sources/toonz/Resources/preferences.svg
index 423a527..c3459af 100644
--- a/toonz/sources/toonz/Resources/preferences.svg
+++ b/toonz/sources/toonz/Resources/preferences.svg
@@ -1 +1,3 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/redo.svg b/toonz/sources/toonz/Resources/redo.svg
index 6c68477..3b29783 100644
--- a/toonz/sources/toonz/Resources/redo.svg
+++ b/toonz/sources/toonz/Resources/redo.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/repeat_icon.png b/toonz/sources/toonz/Resources/repeat_icon.png
deleted file mode 100644
index e782e2e..0000000
Binary files a/toonz/sources/toonz/Resources/repeat_icon.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/repeat_icon.svg b/toonz/sources/toonz/Resources/repeat_icon.svg
new file mode 100644
index 0000000..b532093
--- /dev/null
+++ b/toonz/sources/toonz/Resources/repeat_icon.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/repeat_icon_click.png b/toonz/sources/toonz/Resources/repeat_icon_click.png
deleted file mode 100644
index 3fb4de3..0000000
Binary files a/toonz/sources/toonz/Resources/repeat_icon_click.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/repeat_icon_click.svg b/toonz/sources/toonz/Resources/repeat_icon_click.svg
new file mode 100644
index 0000000..9e1f7ed
--- /dev/null
+++ b/toonz/sources/toonz/Resources/repeat_icon_click.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/repeat_icon_over.png b/toonz/sources/toonz/Resources/repeat_icon_over.png
deleted file mode 100644
index e782e2e..0000000
Binary files a/toonz/sources/toonz/Resources/repeat_icon_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/repeat_icon_over.svg b/toonz/sources/toonz/Resources/repeat_icon_over.svg
new file mode 100644
index 0000000..b532093
--- /dev/null
+++ b/toonz/sources/toonz/Resources/repeat_icon_over.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/sub_enter.png b/toonz/sources/toonz/Resources/sub_enter.png
deleted file mode 100644
index 5d75fc9..0000000
Binary files a/toonz/sources/toonz/Resources/sub_enter.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/sub_enter.svg b/toonz/sources/toonz/Resources/sub_enter.svg
new file mode 100644
index 0000000..6e241b3
--- /dev/null
+++ b/toonz/sources/toonz/Resources/sub_enter.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/sub_enter_click.png b/toonz/sources/toonz/Resources/sub_enter_click.png
deleted file mode 100644
index 3739d80..0000000
Binary files a/toonz/sources/toonz/Resources/sub_enter_click.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/sub_enter_click.svg b/toonz/sources/toonz/Resources/sub_enter_click.svg
new file mode 100644
index 0000000..1524782
--- /dev/null
+++ b/toonz/sources/toonz/Resources/sub_enter_click.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/sub_enter_over.png b/toonz/sources/toonz/Resources/sub_enter_over.png
deleted file mode 100644
index 5d75fc9..0000000
Binary files a/toonz/sources/toonz/Resources/sub_enter_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/sub_enter_over.svg b/toonz/sources/toonz/Resources/sub_enter_over.svg
new file mode 100644
index 0000000..6e241b3
--- /dev/null
+++ b/toonz/sources/toonz/Resources/sub_enter_over.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/sub_leave.png b/toonz/sources/toonz/Resources/sub_leave.png
deleted file mode 100644
index 2efdee8..0000000
Binary files a/toonz/sources/toonz/Resources/sub_leave.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/sub_leave.svg b/toonz/sources/toonz/Resources/sub_leave.svg
new file mode 100644
index 0000000..b02dc46
--- /dev/null
+++ b/toonz/sources/toonz/Resources/sub_leave.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/sub_leave_click.png b/toonz/sources/toonz/Resources/sub_leave_click.png
deleted file mode 100644
index 2646963..0000000
Binary files a/toonz/sources/toonz/Resources/sub_leave_click.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/sub_leave_click.svg b/toonz/sources/toonz/Resources/sub_leave_click.svg
new file mode 100644
index 0000000..5e087b8
--- /dev/null
+++ b/toonz/sources/toonz/Resources/sub_leave_click.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/sub_leave_over.png b/toonz/sources/toonz/Resources/sub_leave_over.png
deleted file mode 100644
index 2efdee8..0000000
Binary files a/toonz/sources/toonz/Resources/sub_leave_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/sub_leave_over.svg b/toonz/sources/toonz/Resources/sub_leave_over.svg
new file mode 100644
index 0000000..b02dc46
--- /dev/null
+++ b/toonz/sources/toonz/Resources/sub_leave_over.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/timestretch.svg b/toonz/sources/toonz/Resources/timestretch.svg
index 2ca3efd..8fb5bf3 100644
--- a/toonz/sources/toonz/Resources/timestretch.svg
+++ b/toonz/sources/toonz/Resources/timestretch.svg
@@ -1 +1,10 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/toolbar_arrow.png b/toonz/sources/toonz/Resources/toolbar_arrow.png
deleted file mode 100644
index f4403dc..0000000
Binary files a/toonz/sources/toonz/Resources/toolbar_arrow.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/toolbar_arrow.svg b/toonz/sources/toonz/Resources/toolbar_arrow.svg
new file mode 100644
index 0000000..2b6f90e
--- /dev/null
+++ b/toonz/sources/toonz/Resources/toolbar_arrow.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/undo.svg b/toonz/sources/toonz/Resources/undo.svg
index 33ea1e0..dce6fac 100644
--- a/toonz/sources/toonz/Resources/undo.svg
+++ b/toonz/sources/toonz/Resources/undo.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index fa82231..37693c5 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -1764,19 +1764,19 @@ void MainWindow::defineActions() {
QAction *openChildAction =
createMenuXsheetAction(MI_OpenChild, tr("&Open Sub-xsheet"), "");
openChildAction->setIconText("Open Sub-XSheet");
- openChildAction->setIcon(createQIconOnOffPNG("sub_enter"));
+ openChildAction->setIcon(createQIconOnOff(":Resources/sub_enter"));
QAction *closeChildAction =
createMenuXsheetAction(MI_CloseChild, tr("&Close Sub-xsheet"), "");
closeChildAction->setIconText("Close Sub-XSheet");
- closeChildAction->setIcon(createQIconOnOffPNG("sub_leave"));
+ closeChildAction->setIcon(createQIconOnOff(":Resources/sub_leave"));
createMenuXsheetAction(MI_ExplodeChild, tr("Explode Sub-xsheet"), "");
QAction *collapseAction =
createMenuXsheetAction(MI_Collapse, tr("Collapse"), "");
collapseAction->setIconText("Collapse");
- collapseAction->setIcon(createQIconOnOffPNG("collapse"));
+ collapseAction->setIcon(createQIconOnOff(":Resources/collapse"));
toggle = createToggle(MI_ToggleEditInPlace, tr("&Toggle Edit In Place"), "",
EditInPlaceToggleAction ? 1 : 0, MenuXsheetCommandType);
@@ -1821,7 +1821,7 @@ void MainWindow::defineActions() {
QAction *repeatAction = createMenuCellsAction(MI_Dup, tr("&Repeat..."), "");
repeatAction->setIconText("Repeat");
- repeatAction->setIcon(createQIconOnOffPNG("repeat_icon"));
+ repeatAction->setIcon(createQIconOnOff(":Resources/repeat_icon"));
createMenuCellsAction(MI_ResetStep, tr("&Reset Step"), "");
createMenuCellsAction(MI_IncreaseStep, tr("&Increase Step"), "'");
diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc
index 2a15dc3..3fb5e09 100644
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@@ -57,9 +57,9 @@
Resources/clone.svg
Resources/pane_close.svg
Resources/pane_close_rollover.svg
- Resources/collapse.png
- Resources/collapse_click.png
- Resources/collapse_over.png
+ Resources/collapse.svg
+ Resources/collapse_click.svg
+ Resources/collapse_over.svg
Resources/controlpointeditor.svg
Resources/controlpointeditor_rollover.svg
Resources/compare.svg
@@ -216,9 +216,9 @@
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
+ Resources/repeat_icon.svg
+ Resources/repeat_icon_click.svg
+ Resources/repeat_icon_over.svg
Resources/resizeColumnNode.svg
Resources/rightTitle_inactive.png
Resources/rightTitle.png
@@ -278,12 +278,12 @@
Resources/sub2.png
Resources/sub3.png
Resources/sub4.png
- Resources/sub_enter.png
- Resources/sub_enter_over.png
- Resources/sub_enter_click.png
- Resources/sub_leave.png
- Resources/sub_leave_over.png
- Resources/sub_leave_click.png
+ Resources/sub_enter.svg
+ Resources/sub_enter_over.svg
+ Resources/sub_enter_click.svg
+ Resources/sub_leave.svg
+ Resources/sub_leave_over.svg
+ Resources/sub_leave_click.svg
Resources/swap_off.svg
Resources/swap_on.svg
Resources/svg.svg
@@ -301,7 +301,7 @@
Resources/toggle_audibility_click.png
Resources/toggle_audibility_over.png
Resources/toggle_lock.png
- Resources/toolbar_arrow.png
+ Resources/toolbar_arrow.svg
Resources/touch.svg
Resources/tracker.svg
Resources/tracker_rollover.svg