From c9e838c908c89ae36d80ec5cddf625802bd5ead2 Mon Sep 17 00:00:00 2001
From: devl0rd <dmhzmxn@gmail.com>
Date: Wed, 22 Apr 2020 16:11:08 -0600
Subject: [PATCH] UI fixes and adjustments

---
 SkyNX-Streamer/css/styles.css      |  2 +-
 SkyNX-Streamer/css/windowStyle.css | 19 ++-------
 SkyNX-Streamer/index.html          | 63 +++++++++++++++++++-----------
 SkyNX-Streamer/js/settings.js      |  2 +-
 SkyNX-Streamer/main.js             |  8 +++-
 5 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/SkyNX-Streamer/css/styles.css b/SkyNX-Streamer/css/styles.css
index 78f9c00..49aae50 100644
--- a/SkyNX-Streamer/css/styles.css
+++ b/SkyNX-Streamer/css/styles.css
@@ -1,5 +1,5 @@
 #main {
-    padding: 8px;
+    padding: 0px;
 }
 #settings {
     padding: 8px;
diff --git a/SkyNX-Streamer/css/windowStyle.css b/SkyNX-Streamer/css/windowStyle.css
index 626504e..84f9463 100644
--- a/SkyNX-Streamer/css/windowStyle.css
+++ b/SkyNX-Streamer/css/windowStyle.css
@@ -215,7 +215,7 @@ textarea:focus, input:focus{
     left: 50px;
     height: calc(100% - 57px);
     width: calc(100% - 50px);
-    background: rgba(0,0,0,0.5);
+    background: rgba(50,50,50,0.5);
     overflow: hidden;
 }
 .contentAreaScrollable{
@@ -223,19 +223,9 @@ textarea:focus, input:focus{
     overflow-y: auto;
     overflow-x: hidden;
 }
-#settingsSearch {
-    background: black;
-    border: none;
-    border-radius: 25px;
-    color: white;
-    padding-left: 8px;
-    height: 40px;
-    width: calc(100% - 20px);
-    margin-top: 10px;
-    margin-left: 10px;
-    margin-bottom: 10px;
-};
-
+.sidePanel {
+    background: rgba(30,30,30,0.5);
+}
 .dark-group-text {
 background-color: rgba(40,40,0.75);
 color: white;
@@ -249,7 +239,6 @@ color: white;
     border: 3px solid tomato;
 }
 
-
 .selected{
     background: rgba(255, 255, 255, 0.1);
 }
\ No newline at end of file
diff --git a/SkyNX-Streamer/index.html b/SkyNX-Streamer/index.html
index 84279c0..346dd4c 100644
--- a/SkyNX-Streamer/index.html
+++ b/SkyNX-Streamer/index.html
@@ -31,34 +31,53 @@
         title="Settings"><i class="fas fa-cogs"></i></button>
     </div>
     <div id="main" class="contentArea">
-      <div class="form-group">
-        <label for="ipInput">Switch IP Address</label>
-        <input id="ipInput" type="text" class="form-control" placeholder="Switch IP">
-      </div>
-      <form class="form-group">
-        <label id="qualityLabel" for="qualitySlider">Quality: 5Mbps</label>
-        <input id="qualitySlider" type="range" class="custom-range" min="1" max="80" value="5" />
-      </form>
+      <div class="row">
+        <div class="col-8">
+          <div class="form-group">
+            <label for="ipInput">Switch IP Address</label>
+            <input id="ipInput" type="text" class="form-control" placeholder="Switch IP">
+          </div>
+          <form class="form-group">
+            <label id="qualityLabel" for="qualitySlider">Quality: 5Mbps</label>
+            <input id="qualitySlider" type="range" class="custom-range" min="1" max="80" value="5" />
+          </form>
+
+          <form class="form-group">
+            <button id="startBtn" type="button" class="btn btn-dark btn-lg btn-block">Start Streamer</button>
+          </form>
+        </div>
+        <div class="col-4 sidePanel">
+          <label>More Settings coming soon..</label>
+        </div>
+      </div>
 
-      <form class="form-group">
-        <button id="startBtn" type="button" class="btn btn-dark btn-lg btn-block">Start Streamer</button>
-      </form>
     </div>
     <div id="settings" class="contentArea contentAreaScrollable customScroll" style="display: none;">
+
       <form class="form-group">
-        <button id="installScpVBusBtn" type="button" class="btn btn-dark btn-block">Install Xbox
-          Controller</button>
+
+
+        <div class="row">
+          <div class="col">
+            <button id="installScpVBusBtn" type="button" class="btn btn-dark btn-block">Install Controller</button>
+          </div>
+          <div class="col">
+            <button id="unInstallScpVBusBtn" type="button" class="btn btn-danger btn-block">Un-Install
+              Controller</button>
+          </div>
+        </div>
       </form>
       <form class="form-group">
-        <button id="unInstallScpVBusBtn" type="button" class="btn btn-dark btn-block">Un-Install Xbox
-          Controller</button>
-      </form>
-      <form class="form-group">
-        <button id="installAudioDriverBtn" type="button" class="btn btn-dark btn-block">Install Audio Driver</button>
-      </form>
-      <form class="form-group">
-        <button id="unInstallAudioDriverBtn" type="button" class="btn btn-dark btn-block">Un-Install Audio
-          Driver</button>
+        <div class="row">
+          <div class="col">
+            <button id="installAudioDriverBtn" type="button" class="btn btn-dark btn-block">Install Audio
+              Driver</button>
+          </div>
+          <div class="col">
+            <button id="unInstallAudioDriverBtn" type="button" class="btn btn-danger btn-block">Un-Install Audio
+              Driver</button>
+          </div>
+        </div>
       </form>
       <div class="form-group">
         <label class="switch">
diff --git a/SkyNX-Streamer/js/settings.js b/SkyNX-Streamer/js/settings.js
index a351db2..f8ad926 100644
--- a/SkyNX-Streamer/js/settings.js
+++ b/SkyNX-Streamer/js/settings.js
@@ -80,8 +80,8 @@ function applyClientSettings() {
         ipcRenderer.send('installScpVBus');
         ipcRenderer.send('installAudioDriver');
         clientSettings.firstInstall = true;
-        saveClientSettings();
     }
+    saveClientSettings();
 }
 $("#rainbowEnabled").on('change', function () {
     clientSettings.rainbowEnabled = $("#rainbowEnabled").prop("checked");
diff --git a/SkyNX-Streamer/main.js b/SkyNX-Streamer/main.js
index b728ff5..92803c2 100644
--- a/SkyNX-Streamer/main.js
+++ b/SkyNX-Streamer/main.js
@@ -23,7 +23,7 @@ function createWindow() {
     y: mainWindowState.y,
     // width: mainWindowState.width,
     // height: mainWindowState.height,
-    width: 350,
+    width: 400,
     height: 280,
     // minWidth: 350,
     // minHeight: 300,
@@ -47,7 +47,11 @@ function createWindow() {
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
     mainWindow = null
-    streamerProcess.kill();
+    try {
+      streamerProcess.kill();
+    } catch (error) {
+
+    }
   });
 }