From 97f76f99e5ed919d3d3d9ec29f558fb14c8bf6b2 Mon Sep 17 00:00:00 2001
From: gxalpha <beckmann.sebastian@outlook.de>
Date: Sat, 20 Aug 2022 15:26:31 +0200
Subject: [PATCH] UI: Remove separate trash icon themeID

The removeIconSmall is now also a trash icon, so we don't need a
separate (now duplicate) themeID for it anymore.
The icon itself of course needs to stay as it's still needed.
---
 UI/data/themes/Acri.qss      | 4 ----
 UI/data/themes/Dark.qss      | 4 ----
 UI/data/themes/Grey.qss      | 4 ----
 UI/data/themes/Light.qss     | 4 ----
 UI/data/themes/Rachni.qss    | 4 ----
 UI/data/themes/System.qss    | 4 ----
 UI/data/themes/Yami.qss      | 4 ----
 UI/forms/images/trash.svg    | 4 ----
 UI/forms/obs.qrc             | 1 -
 UI/window-extra-browsers.cpp | 2 +-
 10 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 UI/forms/images/trash.svg

diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
index e6ac9ea14..5b4119dd8 100644
--- a/UI/data/themes/Acri.qss
+++ b/UI/data/themes/Acri.qss
@@ -1163,10 +1163,6 @@ VisibilityCheckBox::indicator:unchecked:hover {
     image: url(:res/images/invisible.svg);
 }
 
-* [themeID="trashIcon"] {
-    qproperty-icon: url(./Dark/trash.svg);
-}
-
 * [themeID="revertIcon"] {
     qproperty-icon: url(./Dark/revert.svg);
 }
diff --git a/UI/data/themes/Dark.qss b/UI/data/themes/Dark.qss
index 6a3e5b141..d1a8ab2ed 100644
--- a/UI/data/themes/Dark.qss
+++ b/UI/data/themes/Dark.qss
@@ -810,10 +810,6 @@ VisibilityCheckBox::indicator:unchecked {
     image: url(:res/images/invisible.svg);
 }
 
-* [themeID="trashIcon"] {
-    qproperty-icon: url(./Dark/trash.svg);
-}
-
 * [themeID="revertIcon"] {
     qproperty-icon: url(./Dark/revert.svg);
 }
diff --git a/UI/data/themes/Grey.qss b/UI/data/themes/Grey.qss
index a628faceb..d8de36333 100644
--- a/UI/data/themes/Grey.qss
+++ b/UI/data/themes/Grey.qss
@@ -1152,10 +1152,6 @@ VisibilityCheckBox::indicator:unchecked:hover {
     image: url(:res/images/invisible.svg);
 }
 
-* [themeID="trashIcon"] {
-    qproperty-icon: url(./Dark/trash.svg);
-}
-
 * [themeID="revertIcon"] {
     qproperty-icon: url(./Dark/revert.svg);
 }
diff --git a/UI/data/themes/Light.qss b/UI/data/themes/Light.qss
index e8261a251..5b2cb5061 100644
--- a/UI/data/themes/Light.qss
+++ b/UI/data/themes/Light.qss
@@ -1152,10 +1152,6 @@ VisibilityCheckBox::indicator:unchecked:hover {
     image: url(:res/images/invisible.svg);
 }
 
-* [themeID="trashIcon"] {
-    qproperty-icon: url(./Light/trash.svg);
-}
-
 * [themeID="revertIcon"] {
     qproperty-icon: url(./Light/revert.svg);
 }
diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
index 9a73c0398..94d3144ca 100644
--- a/UI/data/themes/Rachni.qss
+++ b/UI/data/themes/Rachni.qss
@@ -1156,10 +1156,6 @@ VisibilityCheckBox::indicator:unchecked:hover {
     image: url(:res/images/invisible.svg);
 }
 
-* [themeID="trashIcon"] {
-    qproperty-icon: url(./Dark/trash.svg);
-}
-
 * [themeID="revertIcon"] {
     qproperty-icon: url(./Dark/revert.svg);
 }
diff --git a/UI/data/themes/System.qss b/UI/data/themes/System.qss
index f63dea2e4..ea27013a3 100644
--- a/UI/data/themes/System.qss
+++ b/UI/data/themes/System.qss
@@ -231,10 +231,6 @@ VisibilityCheckBox::indicator:unchecked {
     image: url(:res/images/invisible.svg);
 }
 
-* [themeID="trashIcon"] {
-    qproperty-icon: url(:res/images/trash.svg);
-}
-
 * [themeID="revertIcon"] {
     qproperty-icon: url(:res/images/revert.svg);
 }
diff --git a/UI/data/themes/Yami.qss b/UI/data/themes/Yami.qss
index 259e19ff1..5bc941deb 100644
--- a/UI/data/themes/Yami.qss
+++ b/UI/data/themes/Yami.qss
@@ -1156,10 +1156,6 @@ VisibilityCheckBox::indicator:unchecked:hover {
     image: url(:res/images/invisible.svg);
 }
 
-* [themeID="trashIcon"] {
-    qproperty-icon: url(./Dark/trash.svg);
-}
-
 * [themeID="revertIcon"] {
     qproperty-icon: url(./Dark/revert.svg);
 }
diff --git a/UI/forms/images/trash.svg b/UI/forms/images/trash.svg
deleted file mode 100644
index e1b894925..000000000
--- a/UI/forms/images/trash.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 5.984375 0.00390625 l -1 0.99609375 l -3 0.003906 s -1 0 -1 1 l 0.015625 0.996094 h 15 l -0.015625 -0.996094 c 0 -1 -1 -1 -1 -1 l -3 -0.003906 l -1 -0.99609375 z m -3.984375 3.99609375 v 9 c 0 3 3 3 3 3 h 7 c 3 0 3 -3 3 -3 v -9 h -2 v 9 c 0 1 -1 1 -1 1 h -7 s -1 0 -1 -1 v -9 z m 4 1 v 7 h 1 v -7 z m 2 0 v 7 h 1 v -7 z m 2 0 v 7 h 1 v -7 z m 0 0" fill="#000000"/>
-</svg>
diff --git a/UI/forms/obs.qrc b/UI/forms/obs.qrc
index 2424b956f..0b09567a9 100644
--- a/UI/forms/obs.qrc
+++ b/UI/forms/obs.qrc
@@ -28,7 +28,6 @@
     <file>images/visible.svg</file>
     <file>images/help.svg</file>
     <file>images/help_light.svg</file>
-    <file>images/trash.svg</file>
     <file>images/revert.svg</file>
     <file>images/alert.svg</file>
     <file>images/warning.svg</file>
diff --git a/UI/window-extra-browsers.cpp b/UI/window-extra-browsers.cpp
index 9387d0b88..21e16a398 100644
--- a/UI/window-extra-browsers.cpp
+++ b/UI/window-extra-browsers.cpp
@@ -137,7 +137,7 @@ void ExtraBrowsersModel::AddDeleteButton(int idx)
 	QModelIndex index = createIndex(idx, (int)Column::Delete, nullptr);
 
 	QPushButton *del = new DelButton(index);
-	del->setProperty("themeID", "trashIcon");
+	del->setProperty("themeID", "removeIconSmall");
 	del->setObjectName("extraPanelDelete");
 	del->setMinimumSize(QSize(20, 20));
 	connect(del, &QPushButton::clicked, this,