Improve skin formatting and status detection

tterb · Feb 10, 2017 · 99767e6 · 99767e6
1 parent 17d1891
commit 99767e6
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 53 deletions.
diff --git a/PlayMusic(Landscape).ini b/PlayMusic(Landscape).ini
@@ -3,24 +3,28 @@
 ; Project: PlayMusic
 ; Author: Brett Stevenson
 ; Contact: BStevensonDev@gmail.com
-; Version: v1.2.0
+; Version: v1.2.1
 ; License: GNU AGPLv3.0
-; Updated: Feb 1, 2017
+; Updated: Feb 10, 2017
 ; Copyright (c) 2016 Brett Stevenson
 ;
 ; Have any advice for how to make this skin better?
 ; Let me know: https://github.com/JonSn0w/PlayMusic/issues/new
-;#############################################################################
+;##############################################################################
 
+[Metadata]
+Name=PlayMusic(Landscape)
+Author=Brett Stevenson
+Version=v1.2.1
+License=GNU AGPLv3
 
 [Rainmeter]
-Name=PlayMusic
-Author=Brett Stevenson
-Contact=BStevensonDev@gmail.com
 MiddleMouseUpAction=!Refresh #CURRENTCONFIG#
 OnUpdateAction=[!WriteKeyValue Variables variant "Landscape" "#@#Variables.inc"][!UpdateMeasure VisualizerScript]
 ContextTitle="Config"
 ContextAction=[!ToggleConfig "PlayMusic\Config" "Settings.ini"][!Redraw]
+ContextTitle2="Open GPMDP"
+ContextAction2=[#AppPath#]
 MouseActionCursor=0
 Update=30
 
@@ -33,7 +37,7 @@ Update=30
 scale=1
 visualizerWidth=(#size#*45.8)
 bandSpace=2+(#size#-4.5)
-bandCount=(#visualizerWidth#)/(#barWidth#+#bandSpace#)
+bandCount=(#visualizerWidth#)/(#barWidth#+#bandSpace#)+(#barWidth#-5)/4
 BarHeightScale=(17*#size#*#scale#)
 BarWidthScale=(#barWidth#)*#scale#
 
@@ -88,12 +92,6 @@ Measure=Plugin
 Plugin=WebParser
 URL=[MeasureJSON]
 StringIndex=2
-DynamicVariables=1
-UpdateDivider=15
-
-[MeasureShuffle]
-Measure=String
-String=[ShuffleStatus]
 IfMatch=NO_SHUFFLE
 IfMatchAction=[!SetOption MeterShuffle ImageAlpha 45][!Redraw]
 IfNotMatchAction=[!SetOption MeterShuffle ImageAlpha 255][!Redraw]
@@ -105,12 +103,6 @@ Measure=Plugin
 Plugin=WebParser
 URL=[MeasureJSON]
 StringIndex=3
-DynamicVariables=1
-UpdateDivider=15
-
-[MeasureRepeat]
-Measure=String
-String=[RepeatStatus]
 IfMatch=NO_REPEAT
 IfMatchAction=[!SetOption MeterRepeat ImageAlpha 45][!Redraw]
 IfNotMatchAction=[!SetOption MeterRepeat ImageAlpha 255][!Redraw]
@@ -206,7 +198,7 @@ Type=RMS
 Meter=Bar
 Group=Active | Visualizer
 MeasureName=MeasureBand0
-X=(18.5*#size#)+((#size#-4.5)*4)
+X=(18.7*#size#)+((#size#-4.5)*4)
 Y=(#size#*2.5)+((#size#-4.5))
 DynamicVariables=1
 AntiAlias=1
@@ -302,15 +294,15 @@ W=(#size#*63.3)
 Meter=Image
 Group=Active
 ImageName=#@#Images\dots.png
-ImageAlpha=85
-X=(#size#*59.1)
-Y=(#size#*13.1)
-H=(#size#*4.2)
+ImageAlpha=95
+X=(#size#*59.6)
+Y=(#size#*13.4)
+H=(#size#*5.1)
 PreserveAspectRatio=1
 MouseOverAction=[!SetOption MeterInfo ImageAlpha 255][!Redraw]
-MouseLeaveAction=[!SetOption MeterInfo ImageAlpha 85][!Redraw]
+MouseLeaveAction=[!SetOption MeterInfo ImageAlpha 95][!Redraw]
 LeftMouseDownAction=[!SetOption MeterInfo ImageAlpha 255][!Redraw]
-LeftMouseUpAction=[!SetOption MeterInfo ImageAlpha 85][!ToggleConfig "PlayMusic\Config" "Settings.ini"][!Redraw]
+LeftMouseUpAction=[!SetOption MeterInfo ImageAlpha 95][!ToggleConfig "PlayMusic\Config" "Settings.ini"][!Redraw]
 MouseActionCursor=1
 UpdateDivider=15
 

diff --git a/PlayMusic(Square).ini b/PlayMusic(Square).ini
@@ -3,23 +3,28 @@
 ; Project: PlayMusic
 ; Author: Brett Stevenson
 ; Contact: BStevensonDev@gmail.com
-; Version: v1.2.0
+; Version: v1.2.1
 ; License: GNU AGPLv3.0
-; Updated: Feb 1, 2017
+; Updated: Feb 10, 2017
 ; Copyright (c) 2016 Brett Stevenson
 ;
 ; Have any advice for how to make this skin better?
 ; Let me know: https://github.com/JonSn0w/PlayMusic/issues/new
 ;###############################################################################
 
-[Rainmeter]
-Name=PlayMusic
+[Metadata]
+Name=PlayMusic(Square)
 Author=Brett Stevenson
-Contact=BStevensonDev@gmail.com
+Version=v1.2.1
+License=GNU AGPLv3
+
+[Rainmeter]
 MiddleMouseUpAction=!Refresh #CURRENTCONFIG#
 OnUpdateAction=[!WriteKeyValue Variables variant "Square" "#@#Variables.inc"][!UpdateMeasure VisualizerScript]
 ContextTitle="Config"
 ContextAction=[!ToggleConfig "PlayMusic\Config" "Settings.ini"][!Redraw]
+ContextTitle2="Open GPMDP"
+ContextAction2=[#AppPath#]
 MouseActionCursor=0
 Update=30
 
@@ -87,34 +92,22 @@ Measure=Plugin
 Plugin=WebParser
 URL=[MeasureJSON]
 StringIndex=1
-DynamicVariables=1
-UpdateDivider=20
-
-[MeasureShuffle]
-Measure=String
-String=[ShuffleStatus]
 IfMatch=NO_SHUFFLE
 IfMatchAction=[!SetOption MeterShuffle ImageAlpha 125][!Redraw]
 IfNotMatchAction=[!SetOption MeterShuffle ImageAlpha 255][!Redraw]
 DynamicVariables=1
-UpdateDivider=20
+UpdateDivider=15
 
 [RepeatStatus]
 Measure=Plugin
 Plugin=WebParser
 URL=[MeasureJSON]
 StringIndex=2
-DynamicVariables=1
-UpdateDivider=20
-
-[MeasureRepeat]
-Measure=String
-String=[RepeatStatus]
 IfMatch=NO_REPEAT
 IfMatchAction=[!SetOption MeterRepeat ImageAlpha 125][!Redraw]
 IfNotMatchAction=[!SetOption MeterRepeat ImageAlpha 255][!Redraw]
 DynamicVariables=1
-UpdateDivider=20
+UpdateDivider=15
 
 [MeasureTime]
 Measure=Calc
@@ -225,7 +218,7 @@ UpdateDivider=10
 Meter=Bar
 Group=Active | Visualizer
 MeasureName=MeasureBand0
-X=(#size#*31.2)+((#size#-4.5)*5.8)
+X=(#size#*31.1)+((#size#-4.5)*5.8)
 Y=(#size#*11.7)+((#size#-4.5)*1.8)
 DynamicVariables=1
 AntiAlias=1
@@ -236,7 +229,7 @@ AntiAlias=1
 [Filter]
 Meter=Shape
 Group=Active | Info
-Shape=Rectangle (#size#*31.6), (#size#*0.8), (#size#*31.1), (#size#*31.1), 0 | Fill Color 0,0,0,100 | Stroke 1 | Stroke Color 0,0,0,0
+Shape=Rectangle (#size#*31.4), (#size#*0.7), (#size#*31.4), (#size#*31.1), 0 | Fill Color 0,0,0,100 | Stroke 1 | Stroke Color 0,0,0,0
 UpdateDivider=10
 
 [MeterVolumeBox]
@@ -302,10 +295,10 @@ Group=Active
 MeterStyle=TimeStyle
 MeasureName=MeasureTime
 SolidColor=225,225,225,50
-X=(#size#*31.6)
+X=(#size#*31.4)
 Y=(#size#*31.8)
-H=(#size#*0.6)
-W=(#size#*31)
+H=(#size#*0.7)
+W=(#size#*31.3)
 
 [MeterInfo]
 Meter=Image
@@ -314,7 +307,7 @@ ImageName=#@#Images\dots.png
 ImageTint=245,245,245
 ImageAlpha=135
 PreserveAspectRatio=1
-X=(#size#*31.8)
+X=(#size#*31.7)
 Y=(#size#*1.3)
 W=(#size#*2.9)
 MouseOverAction=[!SetOption MeterInfo ImageAlpha 245][!Redraw]
@@ -329,10 +322,10 @@ Meter=Bar
 MeasureName=MeasureVolume
 Group=Active | Volume
 BarOrientation=Vertical
-X=(#size#*30.8)
+X=(#size#*30.9)
 Y=(#size#*0.5)
 H=(#size#*30.9)
-W=(#size#*0.8)
+W=(#size#*0.7)
 SolidColor=30,30,30,110
 BarColor=#volumeColor#
 DynamicVariables=1