From bd41d19d24c576c6b01fd6bf31de811e92e2a3c9 Mon Sep 17 00:00:00 2001
From: NamedKitten <kitteh@namedkitten.pw>
Date: Mon, 19 Nov 2018 13:01:38 +0000
Subject: [PATCH] [UI] More user customizable colours.

---
 src/qml/ControlsBar.qml | 17 ++++++++---------
 src/qml/main.qml        |  5 +++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/qml/ControlsBar.qml b/src/qml/ControlsBar.qml
index 7bcc2b1..581cdab 100644
--- a/src/qml/ControlsBar.qml
+++ b/src/qml/ControlsBar.qml
@@ -158,7 +158,7 @@ Item {
                     id: progressLength
                     width: progressBar.visualPosition * parent.width
                     height: parent.height
-                    color: "red"
+                    color: appearance.progressSliderColor
                     opacity: 1
                     radius: height
                     anchors.leftMargin: 100
@@ -197,8 +197,7 @@ Item {
                 implicitHeight: radius
                 implicitWidth: radius
                 radius: 12 + (progressBackground.height / 2)
-                color: fun.nyanCat ? "transparent" : "red"
-                //border.color: "red"
+                color: fun.nyanCat ? "transparent" : appearance.progressSliderColor
                 AnimatedImage {
                     visible: fun.nyanCat
                     paused: progressBar.pressed
@@ -215,7 +214,7 @@ Item {
             id: playlistPrevButton
             objectName: "playlistPrevButton"
             icon.source: "icons/prev.svg"
-            icon.color: "white"
+            icon.color: appearance.buttonColor
             display: AbstractButton.IconOnly
             anchors.top: parent.top
             anchors.bottom: parent.bottom
@@ -239,7 +238,7 @@ Item {
         Button {
             id: playPauseButton
             icon.source: "icons/pause.svg"
-            icon.color: "white"
+            icon.color: appearance.buttonColor
             display: AbstractButton.IconOnly
             anchors.top: parent.top
             anchors.bottom: parent.bottom
@@ -263,7 +262,7 @@ Item {
             id: playlistNextButton
             //icon.name: "next"
             icon.source: "icons/next.svg"
-            icon.color: "white"
+            icon.color: appearance.buttonColor
             display: AbstractButton.IconOnly
             anchors.top: parent.top
             anchors.bottom: parent.bottom
@@ -278,7 +277,7 @@ Item {
             id: volumeButton
             objectName: "volumeButton"
             icon.source: "icons/volume-up.svg"
-            icon.color: "white"
+            icon.color: appearance.buttonColor
             display: AbstractButton.IconOnly
             anchors.top: parent.top
             anchors.bottom: parent.bottom
@@ -376,7 +375,7 @@ Item {
             id: settingsButton
             //icon.name: "settings"
             icon.source: "icons/settings.svg"
-            icon.color: "white"
+            icon.color: appearance.buttonColor
             Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
             anchors.right: fullscreenButton.left
             anchors.top: parent.top
@@ -392,7 +391,7 @@ Item {
             id: fullscreenButton
             //icon.name: "fullscreen"
             icon.source: "icons/fullscreen.svg"
-            icon.color: "white"
+            icon.color: appearance.buttonColor
             Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
             anchors.right: parent.right
             anchors.top: parent.top
diff --git a/src/qml/main.qml b/src/qml/main.qml
index 2f58b24..0e464df 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -27,6 +27,8 @@ ApplicationWindow {
             property bool useMpvSubs: false
             property string fontName: "Roboto"
             property string mainBackground: "#9C000000"
+            property string buttonColor: "white"
+            property string progressSliderColor: "red"
         }
         Settings {
             id: i18n
@@ -212,8 +214,7 @@ ApplicationWindow {
 
         MouseArea {
             id: mouseAreaBar
-            x: 0
-            y: parent.height
+
             width: parent.width
             height: (controlsBar.controls.height * 2) + controlsBar.progress.height
             anchors.bottom: parent.bottom