From 61dc844000e58ac82904e93c10a91bc6fe05710d Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Fri, 22 May 2020 21:17:03 -0600
Subject: [PATCH] Added more chromecast icons

---
 sublime/ui/app_styles.css                     | 14 +++--
 .../icons/chromecast-connected-symbolic.svg   |  3 +
 .../chromecast-connecting-0-symbolic.svg      |  8 +++
 .../chromecast-connecting-1-symbolic.svg      |  8 +++
 .../chromecast-connecting-2-symbolic.svg      |  7 +++
 sublime/ui/icons/chromecast-symbolic.svg      |  2 +-
 sublime/ui/icons/server-online.svg            | 62 +++++++++++++++++++
 sublime/ui/main.py                            | 20 ++++++
 sublime/ui/player_controls.py                 |  2 +-
 9 files changed, 119 insertions(+), 7 deletions(-)
 create mode 100644 sublime/ui/icons/chromecast-connected-symbolic.svg
 create mode 100644 sublime/ui/icons/chromecast-connecting-0-symbolic.svg
 create mode 100644 sublime/ui/icons/chromecast-connecting-1-symbolic.svg
 create mode 100644 sublime/ui/icons/chromecast-connecting-2-symbolic.svg
 create mode 100644 sublime/ui/icons/server-online.svg

diff --git a/sublime/ui/app_styles.css b/sublime/ui/app_styles.css
index 6431ce0..88aaa96 100644
--- a/sublime/ui/app_styles.css
+++ b/sublime/ui/app_styles.css
@@ -1,11 +1,15 @@
 /* ********** Main ********** */
-#server-connection-icon { /* TODO remove */
-  /* box-shadow: 0px 0px 3px green; */
+#connected-to-label {
+  margin: 5px 15px;
+  font-size: 1.2em;
 }
 
-#connected-to-label {
-  margin-top: 5px;
-  font-size: 1.2em;
+#connected-status-row {
+  margin-bottom: 5px;
+}
+
+#online-status-icon {
+  margin-right: 10px;
 }
 
 #menu-header {
diff --git a/sublime/ui/icons/chromecast-connected-symbolic.svg b/sublime/ui/icons/chromecast-connected-symbolic.svg
new file mode 100644
index 0000000..da2b1de
--- /dev/null
+++ b/sublime/ui/icons/chromecast-connected-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M1 18v3h3c0-1.66-1.34-3-3-3zm0-4v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7zm18-7H5v1.63c3.96 1.28 7.09 4.41 8.37 8.37H19V7zM1 10v2a9 9 0 019 9h2c0-6.08-4.93-11-11-11zm20-7H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+</svg>
diff --git a/sublime/ui/icons/chromecast-connecting-0-symbolic.svg b/sublime/ui/icons/chromecast-connecting-0-symbolic.svg
new file mode 100644
index 0000000..7366a7c
--- /dev/null
+++ b/sublime/ui/icons/chromecast-connecting-0-symbolic.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none" fill-rule="evenodd">
+    <path d="M1 18v3h3c0-1.66-1.34-3-3-3z"/>
+    <path d="M1 14v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7z" opacity=".3"/>
+    <path d="M1 10v2a9 9 0 019 9h2c0-6.08-4.93-11-11-11z" opacity=".3"/>
+    <path d="M21 3H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+  </g>
+</svg>
diff --git a/sublime/ui/icons/chromecast-connecting-1-symbolic.svg b/sublime/ui/icons/chromecast-connecting-1-symbolic.svg
new file mode 100644
index 0000000..8870bff
--- /dev/null
+++ b/sublime/ui/icons/chromecast-connecting-1-symbolic.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none" fill-rule="evenodd">
+    <path d="M1 18v3h3c0-1.66-1.34-3-3-3z" opacity=".3"/>
+    <path d="M1 14v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7z"/>
+    <path d="M1 10v2a9 9 0 019 9h2c0-6.08-4.93-11-11-11z" opacity=".3"/>
+    <path d="M21 3H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+  </g>
+</svg>
diff --git a/sublime/ui/icons/chromecast-connecting-2-symbolic.svg b/sublime/ui/icons/chromecast-connecting-2-symbolic.svg
new file mode 100644
index 0000000..6e5e810
--- /dev/null
+++ b/sublime/ui/icons/chromecast-connecting-2-symbolic.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none" fill-rule="evenodd">
+    <path d="M1 18v3h3c0-1.66-1.34-3-3-3zM1 14v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7z" opacity=".3"/>
+    <path d="M1 10v2a9 9 0 019 9h2c0-6.08-4.93-11-11-11z"/>
+    <path d="M21 3H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+  </g>
+</svg>
diff --git a/sublime/ui/icons/chromecast-symbolic.svg b/sublime/ui/icons/chromecast-symbolic.svg
index 16d727f..9bc8f80 100644
--- a/sublime/ui/icons/chromecast-symbolic.svg
+++ b/sublime/ui/icons/chromecast-symbolic.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg">
-  <path d="M1 18v3h3c0-1.66-1.34-3-3-3zm0-4v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7zm0-4v2a9 9 0 019 9h2c0-6.08-4.93-11-11-11zm20-7H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z" fill="#000"/>
+  <path d="M1 18v3h3c0-1.66-1.34-3-3-3zm0-4v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7zm0-4v2a9 9 0 019 9h2c0-6.08-4.93-11-11-11zm20-7H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
 </svg>
diff --git a/sublime/ui/icons/server-online.svg b/sublime/ui/icons/server-online.svg
new file mode 100644
index 0000000..3149ae5
--- /dev/null
+++ b/sublime/ui/icons/server-online.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="server-online.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 7.9374995 7.9374995"
+   height="30"
+   width="30">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="44"
+     inkscape:window-x="0"
+     inkscape:window-height="1394"
+     inkscape:window-width="2556"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="13.255986"
+     inkscape:cx="24.041419"
+     inkscape:zoom="22.4"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <circle
+       r="3.3851781"
+       cy="3.96875"
+       cx="3.96875"
+       id="path835"
+       style="fill:#18c918;fill-opacity:1;stroke-width:0.34228" />
+  </g>
+</svg>
diff --git a/sublime/ui/main.py b/sublime/ui/main.py
index 344d6b3..20965fc 100644
--- a/sublime/ui/main.py
+++ b/sublime/ui/main.py
@@ -338,6 +338,7 @@ class MainWindow(Gtk.ApplicationWindow):
         vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
 
         # Current Server
+
         self.connected_to_label = self._create_label(
             "<i>No Music Source Selected</i>",
             name="connected-to-label",
@@ -345,6 +346,25 @@ class MainWindow(Gtk.ApplicationWindow):
         )
         vbox.add(self.connected_to_label)
 
+        connected_status_box = Gtk.Box(
+            orientation=Gtk.Orientation.HORIZONTAL, name="connected-status-row"
+        )
+        connected_status_box.pack_start(Gtk.Box(), True, True, 0)
+
+        self.connection_status_icon = Gtk.Image.new_from_icon_name(
+            "server-online", Gtk.IconSize.BUTTON
+        )
+        self.connection_status_icon.set_name("online-status-icon")
+        connected_status_box.add(self.connection_status_icon)
+
+        self.connection_status_label = Gtk.Label(
+            label="Connected", name="connection-status-label"
+        )
+        connected_status_box.add(self.connection_status_label)
+
+        connected_status_box.pack_start(Gtk.Box(), True, True, 0)
+        vbox.add(connected_status_box)
+
         # Offline Mode
         offline_box, self.offline_mode_switch = self._create_toggle_menu_button(
             "Offline Mode", "offline_mode"
diff --git a/sublime/ui/player_controls.py b/sublime/ui/player_controls.py
index a96ba53..dd2cb33 100644
--- a/sublime/ui/player_controls.py
+++ b/sublime/ui/player_controls.py
@@ -609,7 +609,7 @@ class PlayerControls(Gtk.ActionBar):
 
         # Device button (for chromecast)
         self.device_button = IconButton(
-            "chromecast-symbolic",
+            "chromecast-connected-symbolic",
             "Show available audio output devices",
             icon_size=Gtk.IconSize.LARGE_TOOLBAR,
         )