Skip to content

Commit 102bf59

Browse files
EnhancedJaxEnhancedJax
committed
Start menu update.
1 parent ea3fec1 commit 102bf59

File tree

5 files changed

+222
-94
lines changed

5 files changed

+222
-94
lines changed

‎@Resources/Version.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[Variables]
2-
Version=1.3
2+
Version=1.4

‎@Start/Logic.lua

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
function check()
2+
mVer = SKIN:GetMeasure('mVer')
3+
CoreVer = tonumber(SKIN:GetVariable('Core.Ver', '00000'))
4+
ParsedVer = tonumber(mVer:GetStringValue())
5+
ParsedVerFull = mVer:GetStringValue()
6+
SavePos = SKIN:GetVariable('@')..'Actions\\InstallData.ini'
7+
SaveLocation = SKIN:GetVariable('@')..'Actions'
8+
if ParsedVer == CoreVer then
9+
print('Up2date - '..ParsedVer..'=='..CoreVer)
10+
SKIN:Bang('!UpdateMeasure', 'JaxCoreYes')
11+
elseif ParsedVer <= CoreVer then
12+
print('Beta - '..ParsedVer..'<='..CoreVer)
13+
SKIN:Bang('!UpdateMeasure', 'JaxCoreYes')
14+
else
15+
print('Update required - '..ParsedVer..'>='..CoreVer)
16+
SKIN:Bang('!WriteKeyValue', 'Data', 'DownloadLink', 'https://github.com/EnhancedJax/-JaxCore/releases/download/v'..ParsedVerFull..'/JaxCore_v'..ParsedVerFull..'.rmskin', SavePos)
17+
SKIN:Bang('!WriteKeyValue', 'Data', 'SaveLocation', SaveLocation, SavePos)
18+
SKIN:Bang('!UpdateMeasure', 'JaxCoreNo')
19+
end
20+
end

‎@Start/Main.ini

Lines changed: 201 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,221 @@
11
[Rainmeter]
2-
Update=20
3-
DefaultUpdateDivider=-1
4-
SkinHeight=#HH#
5-
SkinWidth=#WW#
6-
OnRefreshAction=[!Delay 100][!EnableMeasureGroup NUOL]
2+
Update=-1
3+
Rightmouseupaction=[]
4+
OnRefreshAction=[!ZPos 1][!Move (#SCREENAREAWIDTH#/2-#Sec.W#/2) (#SCREENAREAHEIGHT#/2-#Sec.H#/2)][!SetOption Dep3 MeterStyle "Dep.Shape:S | Dep.ShapeYes:S"][!UpdateMEter *][!Redraw]
75

8-
@includeUpdater=#SKINSPATH##CoreUpdater\@Resources\PresenceCheck.inc
6+
; ---------------------------------------------------------------------------- ;
7+
; Export vars ;
8+
; ---------------------------------------------------------------------------- ;
99

10-
[mTween]
11-
Measure=Script
12-
ScriptFile=#@#LuaTween/Main.lua
13-
TweenGroup=Tweenable
14-
Tween0=Single | Variable | TweenNode1 | 0 | 100 | 1000
15-
Tween1=Single | Variable | TweenNode2 | 0 | 100 | 500
16-
Tween2=Single | Variable | TweenNode3 | 0 | 100 | 500
17-
Optional0=Easing InOutSine
18-
UpdateDivider=1
10+
[ExportVariables]
11+
Measure=Calc
12+
OnUpdateAction=[!WriteKeyValue Variables RMPATH "#PROGRAMPATH#Rainmeter.exe" "#@#Actions\Hotkeys.ini"][!Delay 100][!EnableMeasureGroup NUOL]
1913

2014
[Variables]
21-
TweenNode1=0
22-
TweenNode2=0
23-
TweenNode3=0
24-
WW=700
25-
HH=(128+5+5)
26-
ImageW=128
27-
28-
[mL]
29-
Measure=Calc
30-
OnUpdateAction=[!Move (#SCREENAREAWIDTH#/2-#WW#/2) (#SCREENAREAHEIGHT#/2-#HH#/2)][!Zpos 2][!CommandMeasure mTween "Start(0)"][!Delay 1000][!CommandMeasure mTween "Start(1)"]
15+
@includeVersion=#@#Version.inc
16+
@includeJaxCoreChecker=#SKINSPATH#\#JaxCore\@Resources\Version.inc
17+
Sec.W=800
18+
Sec.H=500
19+
Sec.P=40
20+
Sec.L=350
21+
Sec.R=10
22+
23+
Pri_Color=12,12,12
24+
Sec_Color=28,28,28
25+
Ter_Color=35,35,35
26+
Accent_Color=255, 117, 81
27+
Text_Color=242,240,255
28+
SubText_Color=120,120,120
29+
30+
[String:S]
31+
FontColor=#Text_Color#
32+
Fontface=Roboto Light
33+
AntiAlias=1
34+
X=r
35+
Y=10R
36+
FontSize=10
37+
38+
[Dep.Shape:S]
39+
X=-20r
40+
Y=35r
41+
Shape=Rectangle 0,0,(#SEc.W#-#Sec.L#-#Sec.P#*2),50,2.5 | StrokeWidth 0 | Extend This
42+
Shape2=Rectangle 0,0,5,50,2.5 | StrokeWidth 0 | Fill Color #SubText_Color#
43+
This=fill Color 0,0,0,1
44+
MouseOverAction=[!SetOption #CURRENTSECTION# This "Fill Color #Ter_Color#"][!UpdateMeter #CURRENTSECTION#][!Redraw]
45+
MouseLeaveAction=[!SetOption #CURRENTSECTION# This "Fill Color 0,0,0,1"][!UpdateMeter #CURRENTSECTION#][!Redraw]
46+
[Dep.ShapeYes:S]
47+
Shape2=Rectangle 0,0,5,50,2.5 | StrokeWidth 0 | Fill Color 0,255,50,100
48+
This=Fill Color 0,255,50,50
49+
MouseOverAction=[!SetOption #CURRENTSECTION# This "Fill Color 0,255,50,100"][!UpdateMeter #CURRENTSECTION#][!Redraw]
50+
MouseLeaveAction=[!SetOption #CURRENTSECTION# This "Fill Color 0,255,50,50"][!UpdateMeter #CURRENTSECTION#][!Redraw]
51+
[Dep.ShapeNo:S]
52+
Shape2=Rectangle 0,0,5,50,2.5 | StrokeWidth 0 | Fill Color 255,0,0,100
53+
This=Fill Color 255,0,0,50
54+
MouseOverAction=[!SetOption #CURRENTSECTION# This "Fill Color 255,0,0,100"][!UpdateMeter #CURRENTSECTION#][!Redraw]
55+
MouseLeaveAction=[!SetOption #CURRENTSECTION# This "Fill Color 255,0,0,50"][!UpdateMeter #CURRENTSECTION#][!Redraw]
56+
[Dep.Text:S]
57+
X=20r
58+
Y=25r
59+
W=(#SEc.W#-#Sec.L#-#Sec.P#*2-50)
60+
clipString=2
61+
StringAlign=LeftCenter
62+
FontColor=#Text_Color#
63+
Fontface=Roboto
64+
AntiAlias=1
65+
FontSize=12
66+
InlinePattern=//.*
67+
InlineSetting=Color | #SubText_Color#
68+
InlinePattern2=//.*
69+
InlineSetting2=Size | 10
70+
71+
; ---------------------------------------------------------------------------- ;
72+
; Content ;
73+
; ---------------------------------------------------------------------------- ;
74+
75+
; ------------------------------------ Gen ----------------------------------- ;
3176

3277
[B]
3378
Meter=Shape
34-
Shape=Path That | StrokeWidth 0 | Fill Color 25,25,25
35-
That=0,(#HH#/2) | LineTo (#HH#/2),0 | LineTo (#WW#-#HH#/2),0 | LineTo (#WW#),(#HH#/2) | LineTo (#WW#-#HH#*0.5),#HH# | LineTo (#HH#/2),#HH# | ClosePath 1
36-
Shape2=Path Those | StrokeWidth 0 | Fill Color 15,15,15
37-
This=(((#TweenNode1#) * (#WW# - #HH#) / 100) + #HH#),(#HH#/2) | LineTo (#HH#/2),0 | LineTo (((#TweenNode1#) * (#WW# - #HH#) / 100) + #HH#*0.5),0 | LineTo (((#TweenNode1#) * (#WW# - #HH#) / 100) + #HH#),(#HH#/2) | LineTo (((#TweenNode1#) * (#WW# - #HH#) / 100) + #HH#*0.5),#HH# | LineTo (#HH#/2),#HH# | ClosePath 1
38-
Shape3=Path This | StrokeWidth 0 | Fill Color 12,12,12
39-
Those=(0),(#HH#/2) | LineTo (#HH#/2),0 | LineTo (((#TweenNode1#) * (#WW# - #HH#) / 100) + #HH#*0.5),0 | LineTo (((#TweenNode1#) * (#WW# - #HH#) / 100) + #HH#),(#HH#/2) | LineTo (((#TweenNode1#) * (#WW# - #HH#) / 100) + #HH#*0.5),#HH# | LineTo (#HH#/2),#HH# | ClosePath 1
40-
; Shape2=Rectangle 0,0,#WW#,#HH# | StrokeWidth 0 | Fill Color 255,255,255,100
41-
DynamicVariables=1
42-
Group=Tweenable
43-
79+
Shape=Rectangle 0,0,#Sec.W#,#Sec.H#,#sec.R# | strokeWidth 0 | Fill Color #Pri_Color#
4480
[BC]
4581
Meter=Shape
46-
Shape=Path That | StrokeWidth 0
47-
That=0,(#HH#/2) | LineTo (#HH#/2),0 | LineTo (#WW#-#HH#/2),0 | LineTo (#WW#),(#HH#/2) | LineTo (#WW#-#HH#*0.5),#HH# | LineTo (#HH#/2),#HH# | ClosePath 1
48-
49-
[Arrow]
50-
Meter=Shape
51-
Shape=Path Arrow | StrokeWidth 4 | StrokeStartCap Triangle | StrokeEndCap Triangle | Extend This
52-
Shape2=Path Arrow | StrokeWidth 10 | StrokeColor 0,0,0,1
53-
DynamicVariables=1
54-
Group=Tweenable
55-
This=StrokeColor 255,255,255,(#TweenNode2#/100*150)
56-
Arrow=(#WW#-20-20),(#HH#/2-20) | LineTo (#WW#-20),(#HH#/2) | LineTo (#WW#-#HH#*0.5-20+10),(#HH#-10)
57-
MouseOverAction=[!SetOption Arrow This "StrokeColor 255,255,255,(255)"][!UpdateMeter Arrow][!Redraw]
58-
MouseLeaveAction=[!SetOption Arrow This "StrokeColor 255,255,255,(#*TweenNode2*#/100*150)"][!UpdateMeter Arrow][!Redraw]
59-
Leftmouseupaction=[!CommandMeasure mTween "Reverse(0)"][!CommandMeasure mTween "Reverse(1)"][!CommandMeasure mTween "Reverse(2)"][!Delay 1000][!UpdateMeasure mCheckforPresence][!DeactivateConfig #CURRENTCONFIG#]
60-
61-
[mCheckforPresence]
62-
Measure=String
63-
String=#*Updater*#
64-
IfMatch=#Updater#
65-
Disabled=1
66-
Group=NUOl
67-
IfMatchAction=["#@#Actions\AHK.exe" "#@#Actions\Installer.ahk"]
68-
IfNotMatchAction=[!ActivateConfig "#CoreUpdater\Main"]
69-
IfMatchMode=1
70-
82+
X=(#Sec.W#-#SEc.L#)
83+
Shape=Rectangle 0,0,(#Sec.L#),#Sec.H#,#sec.R# | strokeWidth 0 | Fill LinearGradient This
84+
This=0 | 0,0,0,150 ; 0.0 | 0,0,0,0 ; 1.0
7185

7286
[Logo]
7387
Meter=Image
7488
ImageName=Logo.png
75-
X=((#WW#/2-#ImageW#/2)*(100-#TweenNode1#)/100+5)
76-
Y=5
77-
W=#ImageW#
78-
H=#ImageW#
79-
DynamicVariables=1
80-
ImageAlpha=((100-#TweenNode3#)/100*255)
81-
Group=Tweenable
89+
X=#Sec.P#
90+
Y=(#Sec.H#-#Sec.P#-40)
91+
W=40
92+
H=40
93+
94+
[Image]
95+
Meter=Image
96+
Container=BC
97+
; X=(#Sec.L#-#Sec.H#*6/4)
98+
; PreserveAspectRatio=0
99+
H=#Sec.H#
100+
; W=#Sec.L#
101+
; PreserveAspectRatio=2
102+
Leftmouseupaction=[!Refresh]
103+
ImageName=Plainext.png
104+
105+
; --------------------------------- Left --------------------------------- ;
82106

83107
[MainText]
84108
Meter=String
85-
Text=JaxOriginals
86-
StringAlign=LeftCenter
87-
Fontface=Roboto
88-
FontColor=255,255,255,(#TWeenNode3# > 0 ? ((100-#TweenNode3#)/100*255) : #TweenNode2#/100*255)
89-
DynamicVariables=1
90-
Group=Tweenable
91-
DynamicVariables=1
92-
AntiAlias=1
93-
FontWeight=450
94-
FontSize=20
95-
X=10R
96-
Y=(#HH#/2)
109+
X=(#Sec.P#)
110+
Y=#Sec.P#
111+
Text=Plainext by Jax | #Version#
112+
StringAlign=LEftTOp
113+
FontFace=Roboto Bold
114+
FontSize=25
115+
InlinePattern=by.*
116+
InlineSetting=Size | 10
117+
InlinePattern2=by.*
118+
InlineSetting2=Color | #SubText_Color#
119+
InlinePattern3=by.*
120+
InlineSetting3=Face | Roboto
121+
MeterStyle=String:S
97122

98-
[ContText]
123+
[Des]
99124
Meter=String
100-
Text=JaxOriginals
101-
FontFace=Runic
102-
StringAlign=LeftRight
103-
Angle=(Rad(-35))
104-
FontColor=255,255,255,(#TWeenNode3# > 0 ? ((100-#TweenNode3#)/100*13) : #TweenNode2#/100*13)
105-
DynamicVariables=1
106-
Group=Tweenable
125+
Text=Here you can find the list of dependencies. Click on any one of them to install, make sure you are connected to the internet. Refresh this page by clicking on the right.
126+
W=(#SEc.W#-#Sec.L#-#Sec.P#*2)
127+
clipString=2
128+
MeterStyle=String:S
129+
130+
; ------------------------------------ Dep ----------------------------------- ;
131+
132+
[Dep1]
133+
Meter=Shape
134+
X=r
135+
Y=20R
136+
MEterStyle=Dep.Shape:S
137+
[DepText1]
138+
Meter=String
139+
Text=JaxCore3 // Checking...
140+
MeterStyle=Dep.Text:S
141+
142+
; [Dep2]
143+
; Meter=Shape
144+
; MEterStyle=Dep.Shape:S
145+
; Leftmouseupaction=["https://github.com/khanhas/MagickMeter#how-to-install"]
146+
; [DepText2]
147+
; Meter=String
148+
; Text=ImageMagick // optional - required for parts of the skin, follow this guide for installation
149+
; MeterStyle=Dep.Text:S
150+
151+
[Dep3]
152+
Meter=Shape
153+
MEterStyle=Dep.Shape:S
154+
[DepText3]
155+
Meter=String
156+
Text=Your appreciation
157+
MeterStyle=Dep.Text:S
158+
159+
; ------------------------------------ Bot ----------------------------------- ;
160+
161+
[ContinueButton]
162+
Meter=Shape
163+
X=(#Sec.P#+50)
164+
Y=(#Sec.H#-#Sec.P#-40)
107165
DynamicVariables=1
108-
AntiAlias=1
109-
FontWeight=800
110-
FontSize=60
111-
X=(#WW#-#HH#/2-300)
112-
Y=(#HH#)
113-
Container=BC
166+
Shape=Rectangle 0,0,120,40,(#Sec.R#/3) | StrokeWidth 0 | Fill COlor 0,255,50,200
167+
Leftmouseupaction=[!ActivateConfig "#JaxCore\Main" "Home.ini"][!DeactivateConfig]
168+
Hidden=1
169+
Group=Button
170+
[ContinueText]
171+
Meter=String
172+
X=(60)r
173+
y=(20)r
174+
FontSize=(10)
175+
Text=Continue
176+
FontFace=Roboto
177+
FontWeight=700
178+
StringAlign=CenterCenter
179+
MeterStyle=String:S
180+
Hidden=1
181+
Group=Button
182+
183+
; ---------------------------------------------------------------------------- ;
184+
; Check for jax core ;
185+
; ---------------------------------------------------------------------------- ;
186+
187+
[WebParser]
188+
Measure=WebParser
189+
URL=https://raw.githubusercontent.com/EnhancedJax/-JaxCore/main/%40Resources/Version.inc
190+
RegExp==(.*)$
191+
FinishAction=[!Delay 1000][!CommandMeasure LogicalScript "check()"]
192+
OnConnectionErrorAction=[!SetOption Dep1 MeterStyle "Dep.Shape:S | Dep.ShapeNo:S"][!SetOption DepText1 Text "//Failed to connect to JaxCore github, if this is an issue please report to me"][!UpdateMEter *][!Redraw]
193+
OnRegExpErrorAction=[!Log Developer:RegExpFalse]
194+
195+
[InternetStatus]
196+
Measure=PLUGIN
197+
Plugin=SysInfo
198+
SysInfoType=INTERNET_CONNECTIVITY
199+
IfCondition=InternetStatus = -1
200+
ifTrueaction=[!SetOption Dep1 MeterStyle "Dep.Shape:S | Dep.ShapeNo:S"][!SetOption DepText1 Text "JaxCore // connection error, please check internet connection"][!UpdateMEter *][!Redraw]
201+
202+
[mVer]
203+
Measure=WebParser
204+
URL=[WebParser]
205+
StringIndex=1
206+
207+
[LogicalScript]
208+
Measure=Script
209+
ScriptFile=Logic.lua
210+
211+
[JaxCoreYes]
212+
Measure=String
213+
Group=NUOL
214+
Disabled=1
215+
OnUpdateAction=[!SetOption Dep1 MeterStyle "Dep.Shape:S | Dep.ShapeYes:S"][!SetOption DepText1 Text "JaxCore3 // v#Core.Ver# installed"][!ShowMeterGroup Button][!UpdateMEter *][!Redraw]
216+
217+
[JaxCoreNo]
218+
Measure=String
219+
Group=NUOL
220+
Disabled=1
221+
OnUpdateAction=[!SetOption Dep1 MeterStyle "Dep.Shape:S | Dep.ShapeNo:S"][!SetOption DepText1 Text "JaxCore3 // click here to install"][!SetOption Dep1 Leftmouseupaction """["#@#Actions\AHKv1.exe" "#@#Actions\Installer.ahk"]"""][!UpdateMEter *][!Redraw]

‎@Start/Plainext.png

206 KB
Loading

‎@Start/Warning.png

-1.77 KB
Binary file not shown.

0 commit comments

Comments
 (0)