From 8ed87e10b46e8a3e6dbd844c04b621b9bd21dcec Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 5 Nov 2019 17:06:57 -0800
Subject: [PATCH] Change PC icon to be consistent with iOS and Android

---
 app/gui/PcView.qml                              | 6 +++---
 app/res/desktop_windows-48px.svg                | 4 ++++
 app/res/ic_remove_circle_outline_white_48px.svg | 4 ----
 app/res/ic_remove_from_queue_white_48px.svg     | 9 ---------
 app/res/ic_tv_white_48px.svg                    | 4 ----
 app/resources.qrc                               | 4 +---
 6 files changed, 8 insertions(+), 23 deletions(-)
 create mode 100644 app/res/desktop_windows-48px.svg
 delete mode 100644 app/res/ic_remove_circle_outline_white_48px.svg
 delete mode 100644 app/res/ic_remove_from_queue_white_48px.svg
 delete mode 100644 app/res/ic_tv_white_48px.svg

diff --git a/app/gui/PcView.qml b/app/gui/PcView.qml
index ba6ec3f7..ea5d1887 100644
--- a/app/gui/PcView.qml
+++ b/app/gui/PcView.qml
@@ -104,7 +104,7 @@ CenteredGridView {
         Image {
             id: pcIcon
             anchors.horizontalCenter: parent.horizontalCenter
-            source: "qrc:/res/ic_tv_white_48px.svg"
+            source: "qrc:/res/desktop_windows-48px.svg"
             sourceSize {
                 width: 200
                 height: 200
@@ -116,7 +116,7 @@ CenteredGridView {
             id: stateIcon
             anchors.horizontalCenter: pcIcon.horizontalCenter
             anchors.verticalCenter: pcIcon.verticalCenter
-            anchors.verticalCenterOffset: -10
+            anchors.verticalCenterOffset: -15
             visible: !model.statusUnknown && (!model.online || !model.paired)
             source: !model.online ? "qrc:/res/baseline-warning-24px.svg" : "qrc:/res/baseline-lock-24px.svg"
             sourceSize {
@@ -129,7 +129,7 @@ CenteredGridView {
             id: statusUnknownSpinner
             anchors.horizontalCenter: pcIcon.horizontalCenter
             anchors.verticalCenter: pcIcon.verticalCenter
-            anchors.verticalCenterOffset: -10
+            anchors.verticalCenterOffset: -15
             width: 75
             height: 75
             visible: model.statusUnknown
diff --git a/app/res/desktop_windows-48px.svg b/app/res/desktop_windows-48px.svg
new file mode 100644
index 00000000..6cb0ceec
--- /dev/null
+++ b/app/res/desktop_windows-48px.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="#FFFFFF" width="48" height="48" viewBox="0 0 24 24">
+    <path fill="none" d="M0 0h24v24H0V0z"/>
+    <path d="M21 2H3c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h7v2H8v2h8v-2h-2v-2h7c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm0 14H3V4h18v12z"/>
+</svg>
\ No newline at end of file
diff --git a/app/res/ic_remove_circle_outline_white_48px.svg b/app/res/ic_remove_circle_outline_white_48px.svg
deleted file mode 100644
index 22468895..00000000
--- a/app/res/ic_remove_circle_outline_white_48px.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/>
-</svg>
\ No newline at end of file
diff --git a/app/res/ic_remove_from_queue_white_48px.svg b/app/res/ic_remove_from_queue_white_48px.svg
deleted file mode 100644
index 9ad352f4..00000000
--- a/app/res/ic_remove_from_queue_white_48px.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg fill="#FFFFFF" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <path d="M0 0h24v24H0V0z" id="a"/>
-    </defs>
-    <clipPath id="b">
-        <use overflow="visible" xlink:href="#a"/>
-    </clipPath>
-    <path clip-path="url(#b)" d="M21 3H3c-1.11 0-2 .89-2 2v12c0 1.1.89 2 2 2h5v2h8v-2h5c1.1 0 1.99-.9 1.99-2L23 5c0-1.11-.9-2-2-2zm0 14H3V5h18v12zm-5-7v2H8v-2h8z"/>
-</svg>
\ No newline at end of file
diff --git a/app/res/ic_tv_white_48px.svg b/app/res/ic_tv_white_48px.svg
deleted file mode 100644
index b163cf7f..00000000
--- a/app/res/ic_tv_white_48px.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M21 3H3c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h5v2h8v-2h5c1.1 0 1.99-.9 1.99-2L23 5c0-1.1-.9-2-2-2zm0 14H3V5h18v12z"/>
-</svg>
\ No newline at end of file
diff --git a/app/resources.qrc b/app/resources.qrc
index 252a8176..eed55f6b 100644
--- a/app/resources.qrc
+++ b/app/resources.qrc
@@ -1,9 +1,7 @@
 <RCC>
     <qresource prefix="/">
-        <file>res/ic_remove_circle_outline_white_48px.svg</file>
-        <file>res/ic_remove_from_queue_white_48px.svg</file>
         <file>res/ic_videogame_asset_white_48px.svg</file>
-        <file>res/ic_tv_white_48px.svg</file>
+        <file>res/desktop_windows-48px.svg</file>
         <file>res/ic_add_to_queue_white_48px.svg</file>
         <file>res/baseline-lock-24px.svg</file>
         <file>res/baseline-play_circle_filled_white-48px.svg</file>