5.0.2 Improvements

@Resources/base.ini

@@ -46,8 +46,7 @@ License=Creative Commons BY-NC-SA 3.0
 @include3=#@#constant.inc
 
 [mTitle0]
-Measure=Plugin
-Plugin=NowPlaying.dll
+Measure=NowPlaying
 PlayerName=#Player#
 PlayerType=TITLE
 RegExpSubstitute=#removeExtraFromText#
@@ -67,8 +66,7 @@ PlayerType=Title
 Substitute="":"N/A"
 
 [mArtist0]
-Measure=Plugin
-Plugin=NowPlaying.dll
+Measure=NowPlaying
 PlayerName=#Player#
 PlayerType=ARTIST
 
@@ -84,8 +82,7 @@ PlayerType=Artist
 Substitute="":"N/A"
 
 [mAlbum0]
-Measure=Plugin
-Plugin=NowPlaying.dll
+Measure=NowPlaying
 PlayerName=#Player#
 PlayerType=ALBUM
 RegExpSubstitute=#removeExtraFromText#
@@ -105,8 +102,7 @@ PlayerType=Album
 Substitute="":"N/A"
 
 [mPosition0]
-Measure=Plugin
-Plugin=NowPlaying.dll
+Measure=NowPlaying
 PlayerName=#Player#
 PlayerType=POSITION
 UpdateDivider=20
@@ -125,8 +121,7 @@ Substitute="":"N/A"
 UpdateDivider=20
 
 [mLength0]
-Measure=Plugin
-Plugin=NowPlaying.dll
+Measure=NowPlaying
 PlayerName=#Player#
 PlayerType=DURATION
 UpdateDivider=20
@@ -144,35 +139,43 @@ PlayerType=Duration
 Substitute="":"N/A"
 UpdateDivider=20
 
-[mProgress0]
-Measure=Plugin
-Plugin=NowPlaying.dll
+[mProgress0W]
+Measure=NowPlaying
 PlayerName=#Player#
 PlayerType=PROGRESS
 UpdateDivider=20
 
-[mProgressSpotify]
+[mProgress0P]
+Measure=Calc
+Formula=[mProgress0W] / 100
+DynamicVariables=1
+
+[mProgress1P]
 Measure=Plugin
 Plugin=SpotifyPlugin.dll
 Type=Progress
 UpdateDivider=20
 
-[mProgress1]
+[mProgress1W]
 Measure=Calc
-Formula=[mProgressSpotify] * 100
+Formula=[mProgress1P] * 100
 DynamicVariables=1
 UpdateDivider=20
 
-[mProgress2]
+[mProgress2W]
 Measure=Plugin
 Plugin=WebNowPlaying
 PlayerType=Progress
 Substitute="":"N/A"
 UpdateDivider=20
 
+[mProgress2P]
+Measure=Calc
+Formula=[mProgress2W] / 100
+DynamicVariables=1
+
 [mStateButton0]
-Measure=Plugin
-Plugin=NowPlaying.dll
+Measure=NowPlaying
 PlayerName=#Player#
 PlayerType=STATE
 Substitute="0":"play","1":"pause","2":"play"
@@ -189,9 +192,12 @@ Plugin=WebNowPlaying
 PlayerType=State
 Substitute="0":"play","1":"pause","2":"play","3":"replay"
 
-[mStatus0]
+[mPlayControl1]
 Measure=Plugin
-Plugin=NowPlaying.dll
+Plugin=SpotifyPlugin.dll
+
+[mStatus0]
+Measure=NowPlaying
 PlayerName=#currentlySetPlayer#
 PlayerType=Status
 UpdateDivider=10
@@ -209,8 +215,7 @@ PlayerType=Status
 UpdateDivider=10
 
 [mAdaptiveHide0]
-Measure=Plugin
-Plugin=NowPlaying.dll
+Measure=NowPlaying
 PlayerName=#Player#
 PlayerType=Status
 IfBelowValue=1

@Resources/constant.inc

@@ -1,6 +1,6 @@
 [Variables]
 
-currentVersion=500
+currentVersion=502
 
 baseColumn1=42
 baseColumn2=220

@Resources/settings.lua

@@ -33,7 +33,7 @@ playerTable = {
 		player = "CAD"
 	},
 	["Spotify"] = {
-		playerController = "Title0",
+		playerController = "Title1",
 		musicSwitch = "1",
 		player = "Spotify"
 	},

@Resources/variables.inc

@@ -1,7 +1,7 @@
 [Variables]
 
 skinSize=(#SCREENAREAHEIGHT#*0.5)
-bottomTextWidth=200
+bottomTextWidth=218
 
 
 Player=Spotify
@@ -12,7 +12,7 @@ activePlugin=Spotify
 
 ; 0 = MUSIC, 1 = SPOTIFY, 2 = WEBNOWPLAYING
 MusicSwitch=1
-playerController=Title0
+playerController=Title1
 currentlySetName=Windows Media Player
 currentlySetPlayer=WMP
 
@@ -30,6 +30,7 @@ removeExtraFromText=0
 
 thinFont=Metropolis Extra Light
 thickFont=Metropolis Medium
+controlsFont=Metropolis Medium
 
 mediaTextPositionHor=0
 mediaTextAlignment=LeftBottom

_Defaults/defaultvariables.ini

@@ -16,7 +16,7 @@ playerController=Title0
 currentlySetName=Windows Media Player
 currentlySetPlayer=WMP
 
-adaptiveHideActive=1
+adaptiveHideActive=0
 
 stowAway=0
 stowAwayName=NULL
@@ -30,6 +30,7 @@ removeExtraFromText=0
 
 thinFont=Metropolis Extra Light
 thickFont=Metropolis Medium
+controlsFont=Metropolis Medium
 
 mediaTextPositionHor=0
 mediaTextAlignment=LeftBottom