Skip to content

Commit

Permalink
v1.5
Browse files Browse the repository at this point in the history
- New: Drag Activator
- Fixed: Update notification
- New: Customizability
- Removed: CoreUpdater dependency
- Fixed: Weather not updating
  • Loading branch information
EnhancedJax committed Jul 25, 2021
1 parent 8c1603d commit 0bcfabe
Show file tree
Hide file tree
Showing 14 changed files with 154 additions and 39 deletions.
Binary file removed @Resources/Actions/INSTALL.rmskin
Binary file not shown.
3 changes: 3 additions & 0 deletions @Resources/Actions/InstallData.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Data]
DownloadLink=https://github.com/EnhancedJax/-JaxCore/releases/download/v00011/JaxCore_v00011.rmskin
SaveLocation=C:\Users\enhan\Documents\Rainmeter\Skins\#CoreUpdater\@Resources\Actions
6 changes: 6 additions & 0 deletions @Resources/Actions/Installer.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
SendMode Input
SetWorkingDir, %A_ScriptDir%

IniRead, SaveLocation, InstallData.ini, Data, SaveLocation
IniRead, DownloadLink, InstallData.ini, Data, DownloadLink

SplashTextOn , 400, 100, Rainmeter, "Downloading skin..."
UrlDownloadToFile, %DownloadLink%, %SaveLocation%\INSTALL.rmskin
SplashTextOff
Run, INSTALL.rmskin
WinWait, Rainmeter Skin Installer
Sleep, 100
Expand Down
Binary file modified @Resources/Images/Cover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified @Resources/Includes/GlobalWeather.inc
Binary file not shown.
10 changes: 8 additions & 2 deletions @Resources/Vars.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ NPName=Spotify
Weather=1
Music=1
Animation=1
KeyHook=0
HideOnFullScreen=1
HotKey=LWin Shift

ColorMode=0
MainColor=34, 34, 36
Expand All @@ -30,3 +28,11 @@ WeatherLocation=Hong Kong
WeatherUnits=Metric
; The units of the weather info. Valid values are "Metric" and "Imperial".
Language=en

TweenTime1=300
Easing=InOutSine
BlurBool=0
BlurType=Blur

Detect.Location=0
Detect.Size=10
2 changes: 1 addition & 1 deletion @Resources/Version.inc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Variables]
Version=1.4
Version=1.5
21 changes: 21 additions & 0 deletions @Start/Logic.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
function check()
mVer = SKIN:GetMeasure('mVer')
CoreVer = tonumber(SKIN:GetVariable('Core.Ver', '00000'))
ParsedVer = tonumber(mVer:GetStringValue())
ParsedVerFull = mVer:GetStringValue()
SavePos = SKIN:GetVariable('@')..'Actions\\InstallData.ini'
SaveLocation = SKIN:GetVariable('@')..'Actions'
if ParsedVer == CoreVer then
print('Up2date - '..ParsedVer..'=='..CoreVer)
SKIN:Bang('!ActivateConfig', '#JaxCore\\Main', 'Home.ini')
elseif ParsedVer <= CoreVer then
print('Beta - '..ParsedVer..'<='..CoreVer)
SKIN:Bang('!ActivateConfig', '#JaxCore\\Main', 'Home.ini')
else
print('Update required - '..ParsedVer..'>='..CoreVer)
SKIN:Bang('!WriteKeyValue', 'Data', 'DownloadLink', 'https://github.com/EnhancedJax/-JaxCore/releases/download/v'..ParsedVerFull..'/JaxCore_v'..ParsedVerFull..'.rmskin', SavePos)
SKIN:Bang('!WriteKeyValue', 'Data', 'SaveLocation', SaveLocation, SavePos)
SKIN:Bang('!UpdateMeasure', 'Update')
end
SKIN:Bang('!DeactivateConfig')
end
53 changes: 39 additions & 14 deletions @Start/Main.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ Update=20
DefaultUpdateDivider=-1
SkinHeight=#HH#
SkinWidth=#WW#
OnRefreshAction=[!Move (#SCREENAREAWIDTH#/2-#WW#/2) (#SCREENAREAHEIGHT#/2-#HH#/2)][!Zpos 2][!CommandMeasure mTween "Start(0)"][!Delay 1000][!CommandMeasure mTween "Start(1)"]

@includeUpdater=#SKINSPATH##CoreUpdater\@Resources\PresenceCheck.inc
OnRefreshAction=[!Delay 100][!EnableMeasureGroup NUOL]
Rightmouseupaction=[]

[mTween]
Measure=Script
Expand All @@ -18,6 +17,7 @@ Optional0=Easing InOutSine
UpdateDivider=1

[Variables]
@includeSetVar=#SKINSPATH#\#JaxCore\@Resources\Version.inc
TweenNode1=0
TweenNode2=0
TweenNode3=0
Expand All @@ -29,6 +29,10 @@ ImageW=128
Measure=Calc
OnUpdateAction=[!WriteKeyvalue Variables Scale (#SCREENAREAWIDTH#/1920) "#@#Vars.inc"][!WriteKeyvalue Variables P (40*#SCREENAREAWIDTH#/1920) "#@#Vars.inc"][!WriteKeyvalue Variables R (10*#SCREENAREAWIDTH#/1920) "#@#Vars.inc"][!WriteKeyvalue Variables GlobalP (10*#SCREENAREAWIDTH#/1920) "#@#Vars.inc"][!WriteKeyValue Variables RMPATH "#PROGRAMPATH#Rainmeter.exe" "#@#Actions\Hotkeys.ini"][!Delay 100][!EnableMeasureGroup NUOL]

[mL]
Measure=Calc
OnUpdateAction=[!Move (#SCREENAREAWIDTH#/2-#WW#/2) (#SCREENAREAHEIGHT#/2-#HH#/2)][!Zpos 2][!CommandMeasure mTween "Start(0)"][!Delay 1000][!CommandMeasure mTween "Start(1)"]

[B]
Meter=Shape
Shape=Path That | StrokeWidth 0 | Fill Color 25,25,25
Expand Down Expand Up @@ -56,17 +60,7 @@ This=StrokeColor 255,255,255,(#TweenNode2#/100*150)
Arrow=(#WW#-20-20),(#HH#/2-20) | LineTo (#WW#-20),(#HH#/2) | LineTo (#WW#-#HH#*0.5-20+10),(#HH#-10)
MouseOverAction=[!SetOption Arrow This "StrokeColor 255,255,255,(255)"][!UpdateMeter Arrow][!Redraw]
MouseLeaveAction=[!SetOption Arrow This "StrokeColor 255,255,255,(#*TweenNode2*#/100*150)"][!UpdateMeter Arrow][!Redraw]
Leftmouseupaction=[!CommandMeasure mTween "Reverse(0)"][!CommandMeasure mTween "Reverse(1)"][!CommandMeasure mTween "Reverse(2)"][!Delay 1000][!UpdateMeasure mCheckforPresence][!DeactivateConfig #CURRENTCONFIG#]

[mCheckforPresence]
Measure=String
String=#*Updater*#
IfMatch=#Updater#
Disabled=1
Group=NUOl
IfMatchAction=["#@#Actions\AHK.exe" "#@#Actions\Installer.ahk"]
IfNotMatchAction=[!ActivateConfig "#CoreUpdater\Main"]
IfMatchMode=1
Leftmouseupaction=[!CommandMeasure mTween "Reverse(0)"][!CommandMeasure mTween "Reverse(1)"][!CommandMeasure mTween "Reverse(2)"][!Delay 1000][!EnableMeasureGroup Updater][!DeactivateConfig #CURRENTCONFIG#]

[Logo]
Meter=Image
Expand Down Expand Up @@ -110,3 +104,34 @@ FontSize=60
X=(#WW#-#HH#/2-300)
Y=(#HH#)
Container=BC



;============================

[WebParser]
Measure=WebParser
URL=https://raw.githubusercontent.com/EnhancedJax/-JaxCore/main/%40Resources/Version.inc
RegExp==(.*)$
Disabled=1
UpdateDivider=50
Group=Updater
FinishAction=[!Delay 1000][!CommandMeasure LogicalScript "check()"]

[mVer]
Measure=WebParser
URL=[WebParser]
Disabled=1
UpdateDivider=50
Group=Updater
StringIndex=1

[LogicalScript]
Measure=Script
ScriptFile=Logic.lua

[Update]
Measure=String
Group=NUOL
Disabled=1
OnUpdateAction=["#@#Actions\AHK.exe" "#@#Actions\Installer.ahk"]
16 changes: 16 additions & 0 deletions Activator/FullScreen.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
function Update()
local MyMeasure = SKIN:GetMeasure('MeasureIsFullScreen')
local mString = MyMeasure:GetStringValue()
local mNum = MyMeasure:GetValue()
if mString:match('Rainmeter%.exe') then
mBool = 1
else
mBool = 0
end
local check = (mNum .. mBool)
if string.match(check, '10') then
SKIN:Bang('!Hide')
else
SKIN:Bang('!Show')
end
end
50 changes: 50 additions & 0 deletions Activator/Main.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[Rainmeter]
Update=2000
DefaultUpdateDivider=-1
Rightmouseupaction=[]
OnRefreshAction=[!Draggable 0][!ZPos 2][!Delay 200][!EnableMeasureGroup NUOL][!SetOption DetectionArea SolidColor 0,0,0,1][!UpdateMeter DetectionArea][!Redraw]

[Variables]
@includeVars=#@#Vars.inc

[Move]
Measure=String
String=#Detect.Location#
IfMatch=1
IfMatchAction=[!Move (#SCREENAREAWIDTH#-#Detect.Size#) 0]
IfNotMatchAction=[!Move 0 0]

[MeasureIsFullScreen]
Measure=Plugin
Plugin=IsFullScreen
OnChangeAction=[!UpdateMeasure FuncFull]
UpdateDivider=1

[FuncFull]
Measure=Script
ScriptFile=FullScreen.lua
UpdateDivider=-1

[mAction]
Measure=Calc
Formula=#Mouse.1Pos# - #Mouse.0Pos#
IfCondition=mAction > 20
IfTrueAction=!UpdateMeasure mToggle "MIUI-Shade\Main"
; IfCondition2=mAction < -20
; IfTrueAction2=
; IfCondition3=(mAction >= -50) && (mAction <= 50)
; IfTrueAction3=
DynamicVariables=1
IfConditionMode=1
Group=NUOL
Disabled=1

[DetectionArea]
Meter=String
X=-#Detect.Location#
Y=#Detect.Location#
W=#Detect.Size#
H=100
SolidColor=255,0,0
LeftMouseDownAction=[!Setvariable Mouse.0Pos $MouseY$]
LeftMouseUpAction=[!Setvariable Mouse.1Pos $MouseY$][!UpdateMeasure mAction]
3 changes: 3 additions & 0 deletions MIUIShadeWorkspace.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"folders": [
{
"path": "."
},
{
"path": "..\\#JaxCore"
}
],
"settings": {}
Expand Down
2 changes: 1 addition & 1 deletion Main/Inc/Notifs1/Update.inc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Group=UpdateC

[WebParser]
Measure=WebParser
URL=https://raw.githubusercontent.com/EnhancedJax/#Skin.Name#/main/%40Resources/Version.inc
URL=https://raw.githubusercontent.com/EnhancedJax/MIUI-Shade/main/%40Resources/Version.inc
RegExp==(.*)$
FinishAction=[!Delay 1000][!EnableMeasure mC4U][!UpdateMeasure mC4U]

Expand Down
27 changes: 6 additions & 21 deletions Main/Main.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
Update=(#Animation# = 1 ? 20 : 1000)
SkinWidth=#SCREENAREAWIDTH#
SkinHeight=#SCREENAREAHEIGHT#
OnRefreshAction=[!ZPOS 1][!Draggable 0][!Hide]["#@#Actions\AHK.exe" "#@#Actions\CloseScript.ahk"][!Delay 100][!EnableMEasureGroup NUOL]#BT_CheckBluetooth#
OnRefreshAction=[!ZPOS 1][!Draggable 0][!Hide][!Delay 100][!EnableMEasureGroup NUOL]["#@#Actions\AHK.exe" "#@#Actions\Source Code\Start.ahk"]#BT_CheckBluetooth#
DefaultUpdateDivider=-1
MouseActionCursor=0
@includeCtx=#SKINSPATH##JaxCore\Core\}{CtxItms.inc

[Variables]
TweenNode1=(#Animation# = 1 ? 0 : 100)
TweenTime1=300

BoxP=(20*#Scale#)
BarH=(55*#scale#)
Expand All @@ -36,18 +35,10 @@ BT_AfterBluetoothToggle=#BT_CheckBluetooth#

@include2=#@#bluetooth\bluetooth.inc

[mL]
Measure=Calc
Formula=#KeyHook#
IfCondition=mL = 0
IfTrueAction=[!Delay 100]["#@#Actions\AHK.exe" "#@#Actions\Source Code\Start.ahk"][!CommandMeasure mK "Stop"]
; IfFalseAction=
OnUpdateAction=[!Delay 100][!DisableMeasure mL]

[FrostedGlass]
Measure=Plugin
Plugin=FrostedGlass
Blur=Acrylic
Type=#BlurType#

[FuncFull]
Measure=Script
Expand All @@ -61,12 +52,6 @@ Plugin=IsFullScreen
OnChangeAction=[!UpdateMeasure FuncFull]
UpdateDivider=1

[mK]
Measure=Plugin
Plugin=HotKey
HotKey=#HotKey#
KeyDownAction=!UpdateMeasure mToggle

[mToggle]
Measure=Calc
Formula=1 - mToggle
Expand Down Expand Up @@ -97,10 +82,10 @@ Group=NUOL
Measure=Script
ScriptFile=#@#LuaTween/Main.lua
TweenGroup=Ani
Tween0=Single | Variable | TweenNode1 | 0 | 100 | 300
Tween1=Single | Variable | TweenNode1 | 100 | -50 | 450
Optional0=Easing InOutSine | Group Start
Optional1=Easing InOutSine | Group Start
Tween0=Single | Variable | TweenNode1 | 0 | 100 | #TweenTime1#
Tween1=Single | Variable | TweenNode1 | 100 | -50 | (#TweenTime1#*1.5)
Optional0=Easing #Easing# | Group Start
Optional1=Easing #Easing# | Group Start
UpdateDivider=1
Disabled=(1-#Animation#)

Expand Down

0 comments on commit 0bcfabe

Please sign in to comment.