From 36715ab3c870012d069589be93f42912dbbb9bc2 Mon Sep 17 00:00:00 2001 From: redsaph Date: Tue, 7 Nov 2017 22:28:21 +0800 Subject: [PATCH 01/11] Removed useless styles in Cleartext Pure --- Cleartext Pure.ini | Bin 6912 -> 6268 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Cleartext Pure.ini b/Cleartext Pure.ini index 7343d8ca753c4a7c97a0c007faf10cd1516df138..6e51bd43f242b8a5cfe749e32c299de292c6e73e 100644 GIT binary patch delta 16 XcmZoL`(vV0pvL|Nuatw6srq1v$B+n003;#KEVJ0 From 1cf472a38294caeab701d4d922b0d45e740a94b4 Mon Sep 17 00:00:00 2001 From: redsaph Date: Sun, 12 Nov 2017 13:59:35 +0800 Subject: [PATCH 02/11] Fixed missing fonts for Settings panel --- Settings/Settings.ini | Bin 48650 -> 48602 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Settings/Settings.ini b/Settings/Settings.ini index d164e32924388335e608c1599d9a0f2feeea4842..f36d2006590d899370d417885c0e0414daa29112 100644 GIT binary patch delta 52 zcmeDB!*uI6(}sV7lO4(>CU;1=O->L~*xVsx!aP|ZS!wbs(N`de%|FC)n8Az=siwsM DRHhZX delta 120 zcmccho2ly$(}sV7+zJdn44Dk+3>ge1lMl8^PL7aro2=j_G1)+rV{?s=2{Vd Date: Sun, 26 Nov 2017 09:51:21 +0800 Subject: [PATCH 03/11] More comprehensive RegEx substitution for song info --- @Resources/base.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/@Resources/base.ini b/@Resources/base.ini index bd819bf..b9cf976 100644 --- a/@Resources/base.ini +++ b/@Resources/base.ini @@ -20,14 +20,14 @@ Plugin=NowPlaying.dll PlayerName=#Player# PlayerType=TITLE RegExpSubstitute=#removeExtraFromText# -Substitute="^(.+) (-.+|((\(|\[)?\s?(remix|Remix|REMIX|with|With|WITH|feat|Feat|FEAT|ft|Ft|FT|(w|W)\/).+))+$":"\1" +Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|live|unplugged|acoustic|bootleg|demo|cover|theme|remaster|as heard|w\/).+))+$":"\1" [mTitle1] Measure=Plugin Plugin=SpotifyPlugin.dll Type=TrackName RegExpSubstitute=#removeExtraFromText# -Substitute="^(.+) (-.+|((\(|\[)?\s?(remix|Remix|REMIX|with|With|WITH|feat|Feat|FEAT|ft|Ft|FT|(w|W)\/).+))+$":"\1" +Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|live|unplugged|acoustic|bootleg|demo|cover|theme|remaster|as heard|w\/).+))+$":"\1" [mTitle2] Measure=Plugin @@ -60,14 +60,14 @@ Plugin=NowPlaying.dll PlayerName=#Player# PlayerType=ALBUM RegExpSubstitute=#removeExtraFromText# -Substitute="^(.+) (-.+|((\(|\[)?\s?(remix|Remix|REMIX|with|With|WITH|feat|Feat|FEAT|ft|Ft|FT|(w|W)\/).+))+$":"\1" +Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|live|unplugged|acoustic|bootleg|demo|cover|theme|remaster|as heard|w\/).+))+$":"\1" [mAlbum1] Measure=Plugin Plugin=SpotifyPlugin.dll Type=AlbumName RegExpSubstitute=#removeExtraFromText# -Substitute="^(.+) (-.+|((\(|\[)?\s?(remix|Remix|REMIX|with|With|WITH|feat|Feat|FEAT|ft|Ft|FT|(w|W)\/).+))+$":"\1" +Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|live|unplugged|acoustic|bootleg|demo|cover|theme|remaster|as heard|w\/).+))+$":"\1" [mAlbum2] Measure=Plugin From 6cae7afa8d190ea4daf2de027b2e33a60110536f Mon Sep 17 00:00:00 2001 From: Joshua Velasco Date: Sun, 26 Nov 2017 13:17:21 +0800 Subject: [PATCH 04/11] Added rewritten autoswitch. Currently set player in settings now calls CurrentlySetName. CurrentlySet has been split into two: CurrentlySetName and CurrentlySetPlayer. New SwitchPlayer() function in Settings. SetPlayer() was rewritten. Added player statuses in base.ini. --- @Resources/autoswitch.lua | 44 ++++++++++++++++++++++++++++++++++++++ @Resources/base.ini | 24 ++++++++++++++++++++- @Resources/settings.lua | 28 ++++++++++++++++++------ @Resources/variables.inc | 5 ++++- Settings/Settings.ini | Bin 48602 -> 48674 bytes 5 files changed, 92 insertions(+), 9 deletions(-) create mode 100644 @Resources/autoswitch.lua diff --git a/@Resources/autoswitch.lua b/@Resources/autoswitch.lua new file mode 100644 index 0000000..f9193a7 --- /dev/null +++ b/@Resources/autoswitch.lua @@ -0,0 +1,44 @@ +-- +-- DO NOT DELETE +-- +-- SMART SWITCHER ACTIONS FOR SPOTIFY AND NOWPLAYING +-- Made by Redsaph exclusively for Cleartext +-- +-- redsaph.ml +-- +-- If you have read this and have the intention +-- of using this, please do not delete this flower box +-- and just append on it. +-- +-- Thank you very much. +-- +-- Last modified by Redsaph on November 26, 2017 +-- + + +function Initialize() + dofile(SKIN:GetVariable('@')..'settings.lua') +end -- ends Initialize + +function Update() + activePlugin = SKIN:GetVariable('activePlugin') + currentPlayer = SKIN:GetVariable('currentlySetName') + nowPlayingStatus = SKIN:GetMeasure('mStatus0'):GetValue() + spotifyStatus = SKIN:GetMeasure('mStatus1'):GetValue() + + print ('Spotify ' .. spotifyStatus .. ' Now Playing ' .. + nowPlayingStatus .. '\t Plugin: ' .. activePlugin .. '\t Player: ' .. currentPlayer) + + if not (nowPlayingStatus == 1 and spotifyStatus == 1) then + if activePlugin ~= 'Spotify' and spotifyStatus == 1 then + switchPlayer('Spotify') + refreshCleartext() + elseif activePlugin == 'Spotify' and nowPlayingStatus == 1 then + switchPlayer(currentPlayer) + refreshCleartext() + end -- end player active check + else + print ("Both players are open. Please close one to continue.") + end -- end conflict check + +end -- ends Update \ No newline at end of file diff --git a/@Resources/base.ini b/@Resources/base.ini index b9cf976..9a3d243 100644 --- a/@Resources/base.ini +++ b/@Resources/base.ini @@ -1,6 +1,7 @@ ; DO NOT DELETE [Rainmeter] +Update=250 Author=Redsaph [Metadata] @@ -149,11 +150,27 @@ Plugin=WebNowPlaying PlayerType=State Substitute="0":"play","1":"pause","2":"play","3":"replay" +[mStatus0] +Measure=Plugin +Plugin=NowPlaying.dll +PlayerName=#currentlySetPlayer# +PlayerType=Status + +[mStatus1] +Measure=Plugin +Plugin=Process +ProcessName=Spotify.exe + +[mStatus2] +Measure=Plugin +Plugin=WebNowPlaying +PlayerType=Status + [mAdaptiveHide0] Measure=Plugin Plugin=NowPlaying.dll PlayerName=#Player# -PlayerType=STATUS +PlayerType=Status IfBelowValue=1 IfBelowAction=!HideFade IfAboveValue=0 @@ -182,6 +199,11 @@ Disabled=(#MusicSwitch# = 2 ? (#adaptiveHideActive# = 1 ? 0 : 1) : 1) ;------------ MISCELLANEOUS --------------------- +[mAutoSwitch] +Measure=Script +ScriptFile=#@#autoswitch.lua +UpdateDivider=4 + [mVersion] Measure=Plugin Plugin=WebParser diff --git a/@Resources/settings.lua b/@Resources/settings.lua index d749644..990c9c3 100644 --- a/@Resources/settings.lua +++ b/@Resources/settings.lua @@ -117,11 +117,25 @@ function alignRight() SKIN:Bang('!Refresh #CURRENTCONFIG#') end -- ends alignRight -function setPlayer(currentlySet) +function switchPlayer(currentlySet) SKIN:Bang('!WriteKeyValue Variables MusicSwitch ' .. playerTable[currentlySet]['musicSwitch'] .. ' "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables playerController ' .. playerTable[currentlySet]['playerController'] .. ' "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables Player ' .. playerTable[currentlySet]['player'] .. ' "#@#variables.inc"') - SKIN:Bang('!WriteKeyValue Variables currentlySet "' .. currentlySet .. '" "#@#variables.inc"') + + if currentlySet == 'Spotify' then + SKIN:Bang('!WriteKeyValue Variables activePlugin Spotify #@#variables.inc') + else + SKIN:Bang('!WriteKeyValue Variables activePlugin NowPlaying #@#variables.inc') + end + + print('Setting ' .. currentlySet) +end -- ends switchPlayer + + +function setPlayer(selectedPlayerName) + SKIN:Bang('!WriteKeyValue Variables currentlySetName "' .. selectedPlayerName .. '" "#@#variables.inc"') + SKIN:Bang('!WriteKeyValue Variables currentlySetPlayer ' .. playerTable[selectedPlayer]['player'] .. ' "#@#variables.inc"') + SKIN:Bang('!UpdateMeter "playerTextDialogSubtitle" "Settings.ini"') SKIN:Bang('!Redraw "Cleartext/Settings" "Settings.ini"') end -- ends setPlayer @@ -149,11 +163,11 @@ function refreshCleartext() -- print('alignment: ' .. alignment) -- print('width: ' .. width) - if alignment == 'right' then - alignRight() - elseif alignment == 'left' then - alignLeft() - end + -- if alignment == 'right' then + -- alignRight() + -- elseif alignment == 'left' then + -- alignLeft() + -- end end -- ends refreshCleartext diff --git a/@Resources/variables.inc b/@Resources/variables.inc index 3ff2b85..ca1f158 100644 --- a/@Resources/variables.inc +++ b/@Resources/variables.inc @@ -3,12 +3,15 @@ Player=Spotify alignRight=0 +activePlugin=Spotify + Size=(#WORKAREAWIDTH#*0.3) ; 0 = MUSIC, 1 = SPOTIFY, 2 = WEBNOWPLAYING MusicSwitch=1 playerController=Title0 -currentlySet=Spotify +currentlySetName=Windows Media Player +currentlySetPlayer=WMP adaptiveHideActive=1 diff --git a/Settings/Settings.ini b/Settings/Settings.ini index f36d2006590d899370d417885c0e0414daa29112..448fdd2bd96b8f8edcad796980b560590760b649 100644 GIT binary patch delta 93 zcmcchn`zM>rVV0@*1-(f44Djh4B Date: Sun, 26 Nov 2017 13:24:13 +0800 Subject: [PATCH 05/11] Fixed currentlySetPlayer assignment in setPlayer() --- @Resources/settings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/@Resources/settings.lua b/@Resources/settings.lua index 990c9c3..24abda5 100644 --- a/@Resources/settings.lua +++ b/@Resources/settings.lua @@ -134,7 +134,7 @@ end -- ends switchPlayer function setPlayer(selectedPlayerName) SKIN:Bang('!WriteKeyValue Variables currentlySetName "' .. selectedPlayerName .. '" "#@#variables.inc"') - SKIN:Bang('!WriteKeyValue Variables currentlySetPlayer ' .. playerTable[selectedPlayer]['player'] .. ' "#@#variables.inc"') + SKIN:Bang('!WriteKeyValue Variables currentlySetPlayer ' .. playerTable[selectedPlayerName]['player'] .. ' "#@#variables.inc"') SKIN:Bang('!UpdateMeter "playerTextDialogSubtitle" "Settings.ini"') SKIN:Bang('!Redraw "Cleartext/Settings" "Settings.ini"') From b94d4d64c930fc4189b6611689558dbeb436c644 Mon Sep 17 00:00:00 2001 From: Joshua Velasco Date: Sun, 26 Nov 2017 14:00:37 +0800 Subject: [PATCH 06/11] Added support for WebNowPlaying for Autoswitch --- @Resources/autoswitch.lua | 13 +++++++++---- @Resources/settings.lua | 4 +++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/@Resources/autoswitch.lua b/@Resources/autoswitch.lua index f9193a7..5fe5c43 100644 --- a/@Resources/autoswitch.lua +++ b/@Resources/autoswitch.lua @@ -25,20 +25,25 @@ function Update() currentPlayer = SKIN:GetVariable('currentlySetName') nowPlayingStatus = SKIN:GetMeasure('mStatus0'):GetValue() spotifyStatus = SKIN:GetMeasure('mStatus1'):GetValue() + webNowPlayingStatus = SKIN:GetMeasure('mStatus2'):GetValue() - print ('Spotify ' .. spotifyStatus .. ' Now Playing ' .. - nowPlayingStatus .. '\t Plugin: ' .. activePlugin .. '\t Player: ' .. currentPlayer) + -- print ('Spotify ' .. spotifyStatus .. ' Now Playing ' .. + -- nowPlayingStatus .. ' Web ' .. webNowPlayingStatus .. '\t Plugin: ' .. activePlugin .. '\t Player: ' .. currentPlayer) - if not (nowPlayingStatus == 1 and spotifyStatus == 1) then + if not (nowPlayingStatus == 1 and spotifyStatus == 1) and not (webNowPlayingStatus == 1 and spotifyStatus == 1) then if activePlugin ~= 'Spotify' and spotifyStatus == 1 then switchPlayer('Spotify') refreshCleartext() + elseif activePlugin ~= 'WebNowPlaying' and webNowPlayingStatus == 1 then + switchPlayer('WebNowPlaying') + refreshCleartext() elseif activePlugin == 'Spotify' and nowPlayingStatus == 1 then switchPlayer(currentPlayer) refreshCleartext() end -- end player active check else - print ("Both players are open. Please close one to continue.") + print ('Two music players are running. Please close one to continue. If closing does not\n' .. + 'fix the issue, check if its process is closed in the Task Manager.') end -- end conflict check end -- ends Update \ No newline at end of file diff --git a/@Resources/settings.lua b/@Resources/settings.lua index 24abda5..b7a4991 100644 --- a/@Resources/settings.lua +++ b/@Resources/settings.lua @@ -49,7 +49,7 @@ playerTable = { ["WebNowPlaying"] = { playerController = "StateButton2", musicSwitch = "2", - player = "WMP" + player = "iTunes" }, ["MediaMonkey"] = { playerController = "Title0", @@ -124,6 +124,8 @@ function switchPlayer(currentlySet) if currentlySet == 'Spotify' then SKIN:Bang('!WriteKeyValue Variables activePlugin Spotify #@#variables.inc') + elseif currentlySet == 'WebNowPlaying' then + SKIN:Bang('!WriteKeyValue Variables activePlugin WebNowPlaying #@#variables.inc') else SKIN:Bang('!WriteKeyValue Variables activePlugin NowPlaying #@#variables.inc') end From 8c5956af5aa4ccb8681ff6621ed8ddf7f07db6f0 Mon Sep 17 00:00:00 2001 From: Joshua Velasco Date: Sun, 26 Nov 2017 14:41:33 +0800 Subject: [PATCH 07/11] Refinements in Settings panel and Adaptive Hide text. --- Settings/Settings.ini | Bin 48674 -> 48382 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Settings/Settings.ini b/Settings/Settings.ini index 448fdd2bd96b8f8edcad796980b560590760b649..07dcb3ab2de4ab6be3629fd9aded07db5eddc101 100644 GIT binary patch delta 197 zcmZ4Vhw0x>rVU|2lm7|JOg0er+Pp`|i+Qp{8_#ATF(yWk=w<`)Wjw;c45&Q5EBH2l+j)!$0QDb4(f|Me delta 234 zcmezOlWEZ(rVU|2lV?b|P5uxlF}XmLWAh#%FXqV!lXx}@i7_!wekWcvd4Vv`iHm?%b;hAi-MP@Ub$~AYxe1;+h1%`5l42D#OJRmEWp@1Qup@bomA&sFD$j@Xb z29n7PIY7~3pqiA)8x!p(C*%uk?#NkVz1d@h8qkK#GK{91yH_q|5Djau2Z`NC1#JHJlQxM~1h4p-!=j`ZX+#Ipljdiott|Ls77pxH4ykJ8JBLH5k BP80wD From 33ff417a3e59cd3a2e9373d544e8099532c7dc84 Mon Sep 17 00:00:00 2001 From: Joshua Velasco Date: Sun, 26 Nov 2017 15:11:50 +0800 Subject: [PATCH 08/11] Added player conflict indicators for left align cleartext --- @Resources/autoswitch.lua | 4 +++- @Resources/variables.inc | 2 ++ Cleartext Pure.ini | Bin 6268 -> 7204 bytes Cleartext.ini | Bin 8950 -> 9878 bytes 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/@Resources/autoswitch.lua b/@Resources/autoswitch.lua index 5fe5c43..14ceaff 100644 --- a/@Resources/autoswitch.lua +++ b/@Resources/autoswitch.lua @@ -41,9 +41,11 @@ function Update() switchPlayer(currentPlayer) refreshCleartext() end -- end player active check + return 1 else - print ('Two music players are running. Please close one to continue. If closing does not\n' .. + error ('Two music players are running. Please close one to continue. If closing does not ' .. 'fix the issue, check if its process is closed in the Task Manager.') + return 2 end -- end conflict check end -- ends Update \ No newline at end of file diff --git a/@Resources/variables.inc b/@Resources/variables.inc index ca1f158..efd560f 100644 --- a/@Resources/variables.inc +++ b/@Resources/variables.inc @@ -41,3 +41,5 @@ playCtrlPositionHor=(#Size#*0.1) settingsTextPositionHor=(#Size#*0.115) indicatorPositionHor=(#Size#*0.08) indicatorPositionHorPure=(#Size#*0.04) +conflictIndicatorPositionHor=(#Size#*0.05) +conflictIndicatorPositionHorPure=(#Size#*0.08) \ No newline at end of file diff --git a/Cleartext Pure.ini b/Cleartext Pure.ini index 6e51bd43f242b8a5cfe749e32c299de292c6e73e..b52739224d61bac279326b3ef803716def471248 100644 GIT binary patch delta 400 zcmY+9u}T9`5Jj&|LJAfC;AtnQh?O7~!77Cym`*HYvq=`s+pznVC>HsM{e@Ikf|Z4Z zU!kr45y3NWO_Aa~?#!Kg=g#tYar*kw*}hONuc024DN(4OTiuP%`lI!}ldLo9)wA~5 z?u{nus#1Wx)(llZH`cA3&Uq*GZ~JTBhsmiXOqS8vY08c}JtvOLC@?rg_86_k(K3TA ziIVCdT3a{KJvcK<{t)$30_QO1W@nhrqO3v=sP=8GrEIMG@fNeX1bN;Fc|qR2`e*a- JZPEGO`UCj_QXK#Q delta 24 gcmZ2t@yB4pD$dDg_;@B4Nb*gV<1^YkkGG8v0Depe@&Et; diff --git a/Cleartext.ini b/Cleartext.ini index 5807ccc980b48f3188eb756fe6d0e2cb7edf6988..27af6bda2bd08ea8acc4b8bc06bd801d23486700 100644 GIT binary patch delta 406 zcmY+9F-rqM5QU$8^b`x*#YP0N&{`y@MT&r6tR#h8F3F*}3wL{{Repmk*jri%f|Yju z2mgniwcqS%VKK{_dGp@9{XTisq-|`S9H7E`5Zr&f8l0pHVM7E$?q# zXr`_jdDt`Epz`RZ8p`Q_+M^ET!u{$-I9_>Q4A?1|&Ct~GhSQvDm%3A?ikSmfV8`2# zrC_VjM7vB*+05YU$ftDWFSgXCu^f&B*88Yzn47l8uiOHv6}6^LBUZC`wg7n+$H;D@ z)ihe>ur*OK?L=#vrn&;>X36WLeoo*L#@y^1rn4x2AxCuEcGgn1)`R#Lv+9EiYJ$8X L@8;`ca=!ipAJS3V delta 12 TcmbQ{`^|O375>d7!b-vbC-DU# From 670eabed20ebba8fdfa7c3e9f18f6cc7a462b997 Mon Sep 17 00:00:00 2001 From: Joshua Velasco Date: Sun, 26 Nov 2017 15:23:06 +0800 Subject: [PATCH 09/11] Reduced update values. Performance improved. --- @Resources/base.ini | 58 +++++++++++++++++++++++++++++++++------ @Resources/variables.inc | 2 +- Cleartext Pure.ini | Bin 7204 -> 7208 bytes Cleartext.ini | Bin 9878 -> 9948 bytes 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/@Resources/base.ini b/@Resources/base.ini index 9a3d243..ae591f8 100644 --- a/@Resources/base.ini +++ b/@Resources/base.ini @@ -1,9 +1,39 @@ ; DO NOT DELETE [Rainmeter] -Update=250 +Update=50 Author=Redsaph + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [Metadata] Name=Cleartext Base Author=Redsaph @@ -34,7 +64,6 @@ Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|liv Measure=Plugin Plugin=WebNowPlaying PlayerType=Title -UpdateDivider = 5 Substitute="":"N/A" [mArtist0] @@ -52,7 +81,6 @@ Type=ArtistName Measure=Plugin Plugin=WebNowPlaying PlayerType=Artist -UpdateDivider = 5 Substitute="":"N/A" [mAlbum0] @@ -74,7 +102,6 @@ Substitute="^(?siU)^(.+) (-.+|((\(|\[).*(mix|with|feat|ft|from|version|track|liv Measure=Plugin Plugin=WebNowPlaying PlayerType=Album -UpdateDivider = 5 Substitute="":"N/A" [mPosition0] @@ -82,54 +109,61 @@ Measure=Plugin Plugin=NowPlaying.dll PlayerName=#Player# PlayerType=POSITION +UpdateDivider=20 [mPosition1] Measure=Plugin Plugin=SpotifyPlugin.dll Type=Position +UpdateDivider=20 [mPosition2] Measure=Plugin Plugin=WebNowPlaying PlayerType=Position -UpdateDivider = 5 Substitute="":"N/A" +UpdateDivider=20 [mLength0] Measure=Plugin Plugin=NowPlaying.dll PlayerName=#Player# PlayerType=DURATION +UpdateDivider=20 [mLength1] Measure=Plugin Plugin=SpotifyPlugin.dll Type=Length +UpdateDivider=20 [mLength2] Measure=Plugin Plugin=WebNowPlaying PlayerType=Duration -UpdateDivider = 5 Substitute="":"N/A" +UpdateDivider=20 [mProgress0] Measure=Plugin Plugin=NowPlaying.dll PlayerName=#Player# PlayerType=PROGRESS +UpdateDivider=20 [mProgress1] Measure=Plugin Plugin=SpotifyPlugin.dll Type=Progress Decimals=0 +UpdateDivider=20 [mProgress2] Measure=Plugin Plugin=WebNowPlaying PlayerType=Progress Substitute="":"N/A" +UpdateDivider=20 [mStateButton0] Measure=Plugin @@ -155,16 +189,19 @@ Measure=Plugin Plugin=NowPlaying.dll PlayerName=#currentlySetPlayer# PlayerType=Status +UpdateDivider=10 [mStatus1] Measure=Plugin Plugin=Process ProcessName=Spotify.exe +UpdateDivider=10 [mStatus2] Measure=Plugin Plugin=WebNowPlaying PlayerType=Status +UpdateDivider=10 [mAdaptiveHide0] Measure=Plugin @@ -176,6 +213,7 @@ IfBelowAction=!HideFade IfAboveValue=0 IfAboveAction=!ShowFade Disabled=(#MusicSwitch# = 0 ? (#adaptiveHideActive# = 1 ? 0 : 1) : 1) +UpdateDivider=10 [mAdaptiveHide1] Measure=Plugin @@ -186,6 +224,7 @@ IfBelowAction=[!HideFade] IfAboveValue=0 IfAboveAction=[!ShowFade] Disabled=(#MusicSwitch# = 1 ? (#adaptiveHideActive# = 1 ? 0 : 1) : 1) +UpdateDivider=10 [mAdaptiveHide2] Measure=Plugin @@ -196,21 +235,24 @@ IfBelowAction=[!HideFade] IfAboveValue=0 IfAboveAction=[!ShowFade] Disabled=(#MusicSwitch# = 2 ? (#adaptiveHideActive# = 1 ? 0 : 1) : 1) +UpdateDivider=10 ;------------ MISCELLANEOUS --------------------- [mAutoSwitch] Measure=Script ScriptFile=#@#autoswitch.lua -UpdateDivider=4 +UpdateDivider=20 [mVersion] Measure=Plugin Plugin=WebParser URL=http://www.redsaph.ml/updates/cleartext/version.ini RegExp=(?siU)(.*)$ +UpdateDivider=144 [mVersionEvaluator] Measure=Calc Formula=[mVersion] -DynamicVariables=1 \ No newline at end of file +DynamicVariables=1 +UpdateDivider=144 \ No newline at end of file diff --git a/@Resources/variables.inc b/@Resources/variables.inc index efd560f..ca653c4 100644 --- a/@Resources/variables.inc +++ b/@Resources/variables.inc @@ -42,4 +42,4 @@ settingsTextPositionHor=(#Size#*0.115) indicatorPositionHor=(#Size#*0.08) indicatorPositionHorPure=(#Size#*0.04) conflictIndicatorPositionHor=(#Size#*0.05) -conflictIndicatorPositionHorPure=(#Size#*0.08) \ No newline at end of file +conflictIndicatorPositionHorPure=(#Size#*0.08) diff --git a/Cleartext Pure.ini b/Cleartext Pure.ini index b52739224d61bac279326b3ef803716def471248..c8b9f1abe5633f28a7505cb81da7401c9c73a17f 100644 GIT binary patch delta 16 XcmZ2tvBF}47ONqH0fWIt?Vr*BE2{+k delta 12 TcmZ2svBYA67NhA#{h!hR9>)Zs diff --git a/Cleartext.ini b/Cleartext.ini index 27af6bda2bd08ea8acc4b8bc06bd801d23486700..6f93438b1ffe2f294bd0a8692c8b2c1896092d87 100644 GIT binary patch delta 37 scmbQ{d&hTz7ONqH0fWIt-H)u3D|loWO(#pT{ha(w3CP;a%ibvu0Oqm_u>b%7 delta 23 fcmccPJI!~37PAq9=|=sJtdpJCzHE+QZ;=N8X`Tp+ From da819d7dc2398ecff1d3ecdb64418187b679f124 Mon Sep 17 00:00:00 2001 From: Joshua Velasco Date: Sun, 26 Nov 2017 15:49:55 +0800 Subject: [PATCH 10/11] Modified right align values for indicators. Set versioning for 4.2 --- @Resources/autoswitch.lua | 1 + @Resources/base.ini | 4 ++-- @Resources/constant.inc | 2 +- @Resources/settings.lua | 9 +++++++-- @Resources/variables.inc | 4 ++-- Cleartext Pure.ini | Bin 7208 -> 7208 bytes Cleartext.ini | Bin 9948 -> 9948 bytes Settings/Settings.ini | Bin 48382 -> 48382 bytes 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/@Resources/autoswitch.lua b/@Resources/autoswitch.lua index 14ceaff..b713b76 100644 --- a/@Resources/autoswitch.lua +++ b/@Resources/autoswitch.lua @@ -5,6 +5,7 @@ -- Made by Redsaph exclusively for Cleartext -- -- redsaph.ml +-- github.com/redsaph/cleartext -- -- If you have read this and have the intention -- of using this, please do not delete this flower box diff --git a/@Resources/base.ini b/@Resources/base.ini index ae591f8..d88aa1a 100644 --- a/@Resources/base.ini +++ b/@Resources/base.ini @@ -249,10 +249,10 @@ Measure=Plugin Plugin=WebParser URL=http://www.redsaph.ml/updates/cleartext/version.ini RegExp=(?siU)(.*)$ -UpdateDivider=144 +UpdateDivider=20 [mVersionEvaluator] Measure=Calc Formula=[mVersion] DynamicVariables=1 -UpdateDivider=144 \ No newline at end of file +UpdateDivider=20 \ No newline at end of file diff --git a/@Resources/constant.inc b/@Resources/constant.inc index f4eb677..4bd1cb3 100644 --- a/@Resources/constant.inc +++ b/@Resources/constant.inc @@ -1,6 +1,6 @@ [Variables] -currentVersion=410 +currentVersion=420 baseColumn1=42 baseColumn2=220 diff --git a/@Resources/settings.lua b/@Resources/settings.lua index b7a4991..cba939d 100644 --- a/@Resources/settings.lua +++ b/@Resources/settings.lua @@ -5,6 +5,7 @@ -- Made by Redsaph exclusively for Cleartext -- -- redsaph.ml +-- github.com/redsaph/cleartext -- -- If you have read this and have the intention -- of using this, please do not delete this flower box @@ -93,8 +94,10 @@ function alignLeft() SKIN:Bang('!WriteKeyValue Variables topTextPositionHor "(#Size#*0.2475)" "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables playCtrlPositionHor "(#Size#*0.1)" "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables settingsTextPositionHor "(#Size#*0.115)" "#@#variables.inc"') - SKIN:Bang('!WriteKeyValue Variables indicatorPositionHor "(#Size#*0.08)" "#@#variables.inc"') + SKIN:Bang('!WriteKeyValue Variables indicatorPositionHor "(#Size#*0.07)" "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables indicatorPositionHorPure "(#Size#*0.04)" "#@#variables.inc"') + SKIN:Bang('!WriteKeyValue Variables conflictIndicatorPositionHor "(#Size#*0.03)" "#@#variables.inc"') + SKIN:Bang('!WriteKeyValue Variables conflictIndicatorPositionHorPure "(#Size#*0.08)" "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables currentlySetAlign left') SKIN:Bang('!WriteKeyValue Variables alignRight 0 "#@#variables.inc"') SKIN:Bang('!Refresh #CURRENTCONFIG#') @@ -110,8 +113,10 @@ function alignRight() SKIN:Bang('!WriteKeyValue Variables topTextPositionHor "(#Size#*0.855)" "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables playCtrlPositionHor "(#Size#*1.0)" "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables settingsTextPositionHor "(#Size#*0.98)" "#@#variables.inc"') - SKIN:Bang('!WriteKeyValue Variables indicatorPositionHor "(#Size#*1.02)" "#@#variables.inc"') + SKIN:Bang('!WriteKeyValue Variables indicatorPositionHor "(#Size#*1.03)" "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables indicatorPositionHorPure "(#Size#*0.97)" "#@#variables.inc"') + SKIN:Bang('!WriteKeyValue Variables conflictIndicatorPositionHor "(#Size#*1.07)" "#@#variables.inc"') + SKIN:Bang('!WriteKeyValue Variables conflictIndicatorPositionHorPure "(#Size#*0.93)" "#@#variables.inc"') SKIN:Bang('!WriteKeyValue Variables currentlySetAlign right') SKIN:Bang('!WriteKeyValue Variables alignRight 1 "#@#variables.inc"') SKIN:Bang('!Refresh #CURRENTCONFIG#') diff --git a/@Resources/variables.inc b/@Resources/variables.inc index ca653c4..35073b0 100644 --- a/@Resources/variables.inc +++ b/@Resources/variables.inc @@ -39,7 +39,7 @@ hairlinePositionHor=(#Size#*0.215) topTextPositionHor=(#Size#*0.2475) playCtrlPositionHor=(#Size#*0.1) settingsTextPositionHor=(#Size#*0.115) -indicatorPositionHor=(#Size#*0.08) +indicatorPositionHor=(#Size#*0.07) indicatorPositionHorPure=(#Size#*0.04) -conflictIndicatorPositionHor=(#Size#*0.05) +conflictIndicatorPositionHor=(#Size#*0.03) conflictIndicatorPositionHorPure=(#Size#*0.08) diff --git a/Cleartext Pure.ini b/Cleartext Pure.ini index c8b9f1abe5633f28a7505cb81da7401c9c73a17f..623ab96bf769f4e3fad0f2232ba46cdb02ddf9a4 100644 GIT binary patch delta 14 VcmZ2svBF{l6EmaHW@ctpNdO{}1E2r^ delta 14 VcmZ2svBF{l6EmaXW@ctpNdO{@1D^l@ diff --git a/Cleartext.ini b/Cleartext.ini index 6f93438b1ffe2f294bd0a8692c8b2c1896092d87..5482f13f4bd50faaf9e96952ac596733b34fe1be 100644 GIT binary patch delta 14 VcmccPd&hUf92Q2S&2w4ol>jm91&aUx delta 14 VcmccPd&hUf92Q2y&2w4ol>jm31&ROw diff --git a/Settings/Settings.ini b/Settings/Settings.ini index 07dcb3ab2de4ab6be3629fd9aded07db5eddc101..c060051655ef293fe4b2ab9444bbefed6fe98ca4 100644 GIT binary patch delta 48 zcmV-00MGya`2zm=0YN&rAe0odmKdf60Wy=}oJF&O GAAFqv%M@k+ delta 48 zcmV-00MGya`2zm=0G GAAFtLpAzH% From b1fe6cb40cfd6f3195afd2cd14e50102f98ae458 Mon Sep 17 00:00:00 2001 From: Joshua Velasco Date: Sun, 26 Nov 2017 16:10:53 +0800 Subject: [PATCH 11/11] Hidden error message. UpdateRate for version checker added --- @Resources/autoswitch.lua | 4 ++-- @Resources/base.ini | 1 + Cleartext Pure.ini | Bin 7208 -> 7266 bytes Cleartext.ini | Bin 9948 -> 10006 bytes 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/@Resources/autoswitch.lua b/@Resources/autoswitch.lua index b713b76..61b6d97 100644 --- a/@Resources/autoswitch.lua +++ b/@Resources/autoswitch.lua @@ -44,8 +44,8 @@ function Update() end -- end player active check return 1 else - error ('Two music players are running. Please close one to continue. If closing does not ' .. - 'fix the issue, check if its process is closed in the Task Manager.') + -- error ('Two music players are running. Please close one to continue. If closing does not ' .. + -- 'fix the issue, check if its process is closed in the Task Manager.') return 2 end -- end conflict check diff --git a/@Resources/base.ini b/@Resources/base.ini index d88aa1a..b9a5606 100644 --- a/@Resources/base.ini +++ b/@Resources/base.ini @@ -250,6 +250,7 @@ Plugin=WebParser URL=http://www.redsaph.ml/updates/cleartext/version.ini RegExp=(?siU)(.*)$ UpdateDivider=20 +UpdateRate=600 [mVersionEvaluator] Measure=Calc diff --git a/Cleartext Pure.ini b/Cleartext Pure.ini index 623ab96bf769f4e3fad0f2232ba46cdb02ddf9a4..ea8d43b15548281418ee3bd24ca9c6be248d8a03 100644 GIT binary patch delta 68 zcmZ2s@yKF>60f-eLl8qMLmER7kSu1%U{GKv0g|aex|kuGA(J5w$VvptmjK0z7|Ma{ OB8C)(;?45BocsV7)((IG delta 30 mcmaE4vBF}55-+3DWI;aD$vpgAlh;Y|O^)F++I)w%jSm2m#R+2o diff --git a/Cleartext.ini b/Cleartext.ini index 5482f13f4bd50faaf9e96952ac596733b34fe1be..6023fd3e657484414608e869d757715487cafd38 100644 GIT binary patch delta 68 zcmccPJI!xHo3Ob8Ll8qMLmER7kSu1%U{GKv0g|aex|kuGA(J5w$VvptmjK0z7|Ma{ OB8C)(;?2#%k-`8vc@Mh) delta 12 TcmbQ{cgJ@_oABlX!ePPyCe8&$