From 30e56c2d08a57171bc253df135f9d853758e4c88 Mon Sep 17 00:00:00 2001
From: Kitteh <kitteh@namedkitten.pw>
Date: Mon, 29 Oct 2018 00:35:24 +0000
Subject: [PATCH] [UI] Improve Nyan Cat Rainbow.

---
 src/qml/icons/rainbow.png | Bin 0 -> 1244 bytes
 src/qml/main.qml          |  60 ++++++++++++--------------------------
 src/qml/qml.qrc           |   1 +
 3 files changed, 19 insertions(+), 42 deletions(-)
 create mode 100644 src/qml/icons/rainbow.png

diff --git a/src/qml/icons/rainbow.png b/src/qml/icons/rainbow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6dd5dcb4adf7c154e2695feb522f4c9c166734a
GIT binary patch
literal 1244
zcmV<21S9*2P)<h;3K|Lk000e1NJLTq000O8000pL0{{R368P}z00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0000I
zP)t-s{{R60fB^sh009300D%9C7ynKi1X}<A00Cl4M??kqZ|TPX000McNliru;tCxA
z126w)=}-Uw1DkqOSaechcOY<bZ)Rz1Wgv8UaAhE8X=XZjZEzrDVRT`5ZEyepNQsSA
zNs=2m47~FdegcV&;QWT`#2hAK4nFw#lc;KUOX?2WQb<+YkU$~<roaC=fBpFPzi+F5
z?|7zf_>|0)_*Adiim?sTDwK^(ty;6qi)f!Q#v#IdGl?0ktg<-Es#zF&-I{o+z2cy9
z?Xp!2PZ(szAtFA!Df6t(y}IEbeqx1kjBMJj94lcy!56U;UU0t`utl%!mmeQSFgN0e
zyq}<~E=x1Pvt*}UQ>?VvXu+Gzg%KiGZkQ{qZ1K*OCT8hv{ov{N$Cwak!iJ8m@B|C+
z;N?ra5gNe<<E|tk_7d2=wi1zf6?`*y1as>3p&h@=+X~bIID9WJ=<<SS-6rtlio~Q~
zqdG!@{aAma_ss`5fFvO@vUai5zz%j`j8*VU00X0!M>nO9SqN%_)@NTYsQr-~yffYw
zqHrsz=5QUP=AT)5H7N_K`K{UXZ1>SD46X;`w`s1TAy|7goqp%?qv?=z1y|T}!W`HO
zh6wvL-S&g#8#(MtkgG5vkv9#1WAl?3Gm7I}d)Pb#c_~x)L2Q|z*sK1K*n2Cr52%Z^
zF0saubwdovRGM7HcyB^r?JCdCA}R%I00fW%qOxOLxL~A0&;>!v&P`DL4rfpnF&)Ri
z<tuUo!&RdO!@p0!p)N_EknI`y8TTvLTf*rDTQ3b8ura`UWG_D?z1tHrLCo!4`Xw*?
zYhE7xOAov};{E|I&#(!&^5?kkuy4JS&d>5rU)T5Rw!0I(&px!?yPNV(vGm0SfPn5+
zU+M1Mxtx90nP;4S+VN8%cRg|#6<khE`|Q2fo_p-R+xA_zZQT-1?XvSaYp=ED8mq6i
zd{xx4-VI@umFJmzt~t{jv(Gkt)@f6xO!z*_%;Stb)|j}A`e?&P9X52x;6bB|+)v+q
z_1Q=7y>(9=_fOX@9lfBJp4(}=tv1_ey|v~IeY9zl=(Mf0?8mn+pFX^Mb9a#CxJ;7c
zD)8dDp1SL*vku&J4V=|#(L^B%s%R#Wf~(~X3sE|*&`Y-9mB4OJdUWg3sYAOqb%l6T
zHB>-aG|Q0<-A@^UdKX70GpGkz5i}LakqBNW5grg$gH}QVdMSpWr)a#J7H+aZ9WBI>
zJ|n2$>Rh;M%PG68GRr8vwBo7MVnvHUi&RR<`DCOjgY68$GGfk#9tLQ%Ei9-10c~LW
z4XCn!00000AW1|)R0!8&U_b?eK!8Lj0Ra+W3<OAo3lJa?p+Ep801&7Op+;r<Jpcdz
zC3HntbYx+4WjbSWWnpw>05UK!I4v<SEiyS&FfckWGdeXfD=;uRFfgjRVnYA`03~!q
zSaf7zbY(hiZ)9m^c>ppnF*q$TFfB4UR4_0)Ff%$dH!CnOIxsMFo$p%!0000<MNUMn
GLSTaMc_=FY

literal 0
HcmV?d00001

diff --git a/src/qml/main.qml b/src/qml/main.qml
index 0d2c977..00bb984 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -1,4 +1,4 @@
- import QtQuick 2.11
+import QtQuick 2.11
 import QtQuick.Controls 2.4
 import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.11
@@ -144,11 +144,12 @@ ApplicationWindow {
 
         function setProgressBarEnd(val) {
             progressBar.to = val
-     }
+        }
 
         function setProgressBarValue(val) {
             timeLabel.text = createTimestamp(val) + " / " + createTimestamp(
-                        progressBar.to) + " (" + parseFloat(player.getProperty("speed").toFixed(2)) + "x)"
+                        progressBar.to) + " (" + parseFloat(
+                        player.getProperty("speed").toFixed(2)) + "x)"
             progressBar.value = val
         }
 
@@ -693,7 +694,7 @@ ApplicationWindow {
                 Action {
                     text: "Toggle Nyan Cat"
                     onTriggered: {
-                        fun.nyanCat = ! fun.nyanCat
+                        fun.nyanCat = !fun.nyanCat
                     }
                     shortcut: keybinds.nyanCat
                 }
@@ -886,8 +887,9 @@ ApplicationWindow {
 
         Rectangle {
             id: controlsBackground
-            height: controlsBar.visible ? controlsBar.height + progressBackground.height + (progressBar.topPadding * 2)
-                                          - (progressBackground.height * 2): 0
+            height: controlsBar.visible ? controlsBar.height + progressBackground.height
+                                          + (progressBar.topPadding * 2)
+                                          - (progressBackground.height * 2) : 0
             anchors.bottom: parent.bottom
             anchors.left: parent.left
             anchors.right: parent.right
@@ -905,7 +907,7 @@ ApplicationWindow {
             anchors.right: controlsBar.right
             anchors.bottom: controlsBackground.top
             anchors.bottomMargin: 0
-    
+
             radius: 5
             color: "transparent"
             TextMetrics {
@@ -942,7 +944,7 @@ ApplicationWindow {
         }
 
         function setCachedDuration(val) {
-            cachedLength.width = ((progressBar.width / progressBar.to) * val) - progressLength.width 
+            cachedLength.width = ((progressBar.width / progressBar.to) * val) - progressLength.width
         }
 
         Rectangle {
@@ -987,7 +989,7 @@ ApplicationWindow {
                         onClicked: loadDialog.open()
                     }
                 }
-            }   
+            }
 
             Slider {
                 id: progressBar
@@ -1019,47 +1021,21 @@ ApplicationWindow {
                         height: parent.height
                         color: "red"
                         opacity: 1
-                        LinearGradient {
-                            height: parent.height
+                        Image {
                             visible: fun.nyanCat
+                            id: rainbow
                             anchors.fill: parent
-                            gradient: Gradient {
-                                GradientStop {
-                                    position: 0.0
-                                    color: "#f00"
-                                }
-                                GradientStop {
-                                    position: 0.17
-                                    color: "#f90"
-                                }
-                                GradientStop {
-                                    position: 0.33
-                                    color: "#ff0"
-                                }
-                                GradientStop {
-                                    position: 0.50
-                                    color: "#3f0"
-                                }
-                                GradientStop {
-                                    position: 0.67
-                                    color: "#09f"
-                                }
-                                GradientStop {
-                                    position: 0.83
-                                    color: "#63f"
-                                }
-                                GradientStop {
-                                    position: 1
-                                    color: "#63f"
-                                }
-                            }
+                            height: parent.height
+                            width: parent.width
+                            source: "qrc:/player/icons/rainbow.png"
+                            fillMode: Image.TileHorizontally
                         }
                     }
                     Rectangle {
                         id: cachedLength
                         z: 10
                         anchors.left: progressLength.right
-                        anchors.leftMargin: progressBar.handle.width -2
+                        anchors.leftMargin: progressBar.handle.width - 2
                         //anchors.left: progressBar.handle.horizontalCenter
                         anchors.bottom: progressBar.background.bottom
                         anchors.top: progressBar.background.top
diff --git a/src/qml/qml.qrc b/src/qml/qml.qrc
index 5ba75d5..a639534 100644
--- a/src/qml/qml.qrc
+++ b/src/qml/qml.qrc
@@ -16,6 +16,7 @@
         <file>icons/prev.svg</file>
         <file>icons/subtitles.svg</file>
         <file>icons/nyancat.gif</file>
+        <file>icons/rainbow.png</file> 
         <file>fonts/NotoSans.ttf</file>
         <file>icons/playlist.svg</file>
         <file>codes.js</file>