From 67f8dd11923e7ebada8f0c9341d7ecf5da1c4a08 Mon Sep 17 00:00:00 2001
From: nopeinomicon <nopeinomicon@posteo.net>
Date: Mon, 28 Sep 2020 20:32:03 -0600
Subject: [PATCH] Added volume label

---
 .../VolumeControl/VolumeControlView.swift     |  3 +++
 .../VolumeControl/VolumeControlView.xib       | 23 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Mac/Components/VolumeControl/VolumeControlView.swift b/Mac/Components/VolumeControl/VolumeControlView.swift
index 1c6ed12..6ea83b3 100644
--- a/Mac/Components/VolumeControl/VolumeControlView.swift
+++ b/Mac/Components/VolumeControl/VolumeControlView.swift
@@ -29,10 +29,12 @@ class VolumeControlView: NSViewController {
     if newVolume != currentVolume {
       App.mpdClient.setVolume(to: newVolume)
       currentVolume = newVolume
+        volumeLabel.stringValue = String(currentVolume)
     }
   }
   
   @IBOutlet var volumeSlider: NSSlider!
+    @IBOutlet var volumeLabel: NSTextField!
 }
   
 extension VolumeControlView: StoreSubscriber {
@@ -41,5 +43,6 @@ extension VolumeControlView: StoreSubscriber {
   func newState(state: StoreSubscriberStateType) {
     volumeSlider.integerValue = state.volume
     currentVolume = state.volume
+    volumeLabel.stringValue = String(state.volume)
   }
 }
diff --git a/Mac/Components/VolumeControl/VolumeControlView.xib b/Mac/Components/VolumeControl/VolumeControlView.xib
index e34fb9e..cabb072 100644
--- a/Mac/Components/VolumeControl/VolumeControlView.xib
+++ b/Mac/Components/VolumeControl/VolumeControlView.xib
@@ -1,33 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="VolumeControlView" customModule="Persephone" customModuleProvider="target">
             <connections>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+                <outlet property="volumeLabel" destination="8rn-8o-AUj" id="fx9-Ai-fG7"/>
                 <outlet property="volumeSlider" destination="E78-vZ-qV0" id="7qP-Fm-MDY"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="36" height="145"/>
+            <rect key="frame" x="0.0" y="0.0" width="36" height="161"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <slider horizontalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="E78-vZ-qV0" userLabel="Volume Slider">
-                    <rect key="frame" x="9" y="12" width="19" height="121"/>
+                    <rect key="frame" x="9" y="28" width="19" height="121"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <sliderCell key="cell" continuous="YES" alignment="left" maxValue="100" doubleValue="50" tickMarkPosition="right" sliderType="linear" id="22u-9w-IXT"/>
                     <connections>
                         <action selector="volumeSliderAction:" target="-2" id="1yh-vH-sgN"/>
                     </connections>
                 </slider>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8rn-8o-AUj">
+                    <rect key="frame" x="-2" y="0.0" width="40" height="23"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Vol" placeholderString="50" id="CPT-Ih-89A">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <action selector="label:" target="-2" id="NaR-8h-tbQ"/>
+                    </connections>
+                </textField>
             </subviews>
-            <point key="canvasLocation" x="-83" y="90.5"/>
+            <point key="canvasLocation" x="-83" y="98.5"/>
         </customView>
     </objects>
 </document>