Skip to content

Commit 8ef8061

Browse files
committed
v2.1
1 parent d0d4382 commit 8ef8061

File tree

11 files changed

+83
-20
lines changed

11 files changed

+83
-20
lines changed

@Resources/Vars.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Scale=1
33
;I H
44
2412=I
55

6-
ColorMode=1
7-
MainColor=255,255,255
8-
OppositeColor=12,12,12
6+
ColorMode=0
7+
MainColor=12,12,12
8+
OppositeColor=255,255,255
99

10-
Style=Measure
10+
Style=Light
1111

1212
Rm.Update=25
1313
Render=Color

@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=2.0
2+
Version=2.1

Core/Appearance.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Variables]
22
Sec.SaveLocation=#SKINSPATH##Skin.Name#\Main\Styles\Vars\#Style#.inc
33
Sec.SaveLocation2=#SKINSPATH##Skin.Name#\@Resources\Vars.inc
4-
VersionPage=1
4+
VersionPage=2
55

66
[Export:M]
77
Measure=String

Core/Appearance/Arc.inc

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[Option06]
2+
Meter=String
3+
Text=Color Render: Arc color
4+
Hidden=(1-[&Func:returnBool('Render', 'Color')])
5+
MeterStyle=Set.String:S | Set.OptionName:S
6+
7+
[Divider19wdaw328]
8+
Meter=Shape
9+
MeterStyle=Set.Div:S
10+
11+
[Option07]
12+
Meter=String
13+
Text=Color Render: Text color
14+
Hidden=(1-[&Func:returnBool('Render', 'Color')])
15+
MeterStyle=Set.String:S | Set.OptionName:S
16+
17+
; ---------------------------------------------------------------------------- ;
18+
; Function ;
19+
; ---------------------------------------------------------------------------- ;
20+
21+
[PrimaryColor]
22+
Meter=Shape
23+
MeterStyle=Set.Color:S
24+
Hidden=(1-[&Func:returnBool('Render', 'Color')])
25+
Y=([Option06:Y]-#Set.P#+(-30/2+8)*[Set.S])
26+
27+
[Secondarycolor]
28+
Meter=Shape
29+
MeterStyle=Set.Color:S
30+
Hidden=(1-[&Func:returnBool('Render', 'Color')])
31+
Y=([Option07:Y]-#Set.P#+(-30/2+8)*[Set.S])

Core/Appearance/Light.inc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[Option06]
2+
Meter=String
3+
Text=Color Render: color
4+
Hidden=(1-[&Func:returnBool('Render', 'Color')])
5+
MeterStyle=Set.String:S | Set.OptionName:S
6+
7+
; ---------------------------------------------------------------------------- ;
8+
; Function ;
9+
; ---------------------------------------------------------------------------- ;
10+
11+
[Primary]
12+
Meter=Shape
13+
MeterStyle=Set.ColorPacity:S
14+
Hidden=(1-[&Func:returnBool('Render', 'Color')])
15+
Y=([Option06:Y]-#Set.P#+(-30/2+8)*[Set.S])
16+
[Value02]
17+
Meter=String
18+
Text=#PrimaryOpacity#
19+
Hidden=(1-[&Func:returnBool('Render', 'Color')])
20+
MeterStyle=Set.String:S | Set.Pacity:S

Main/Styles/Arc.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Y=(160*#Scale#)
3030
FontWeight=450
3131
StringAlign=CenterCenter
3232
MeasureName=mHour
33-
FontColor=255,255,255
3433
DynamicVariables=1
34+
FontColor=#Secondarycolor#
3535
[Min]
3636
Meter=String
3737
MeterStyle=String:S
@@ -42,22 +42,22 @@ StringAlign=CenterCenter
4242
FontWeight=450
4343
MeasureName=mMIn
4444
DynamicVariables=1
45-
InlineSetting=GradientColor | 270 | #OppositeColor# ; 0.2 | #OppositeColor#,0 ; 0.8
45+
InlineSetting=GradientColor | 270 | #Secondarycolor# ; 0.2 | #Secondarycolor#,0 ; 0.8
4646

4747
[TextContainer]
4848
Meter=Shape
4949
X=r
5050
Y=(-(370*#scale#-#SW#/2))r
5151
Container=Min
52-
Shape=Path This | StrokeWidth 0 | OffSet 0,0
52+
Shape=Path This | StrokeWidth 0 | OffSet 0,0 | Fill Color #Secondarycolor#
5353
This=0,0 | LineTo (-250*#scale#),0 | LineTo ((#SW#/2-#P#*2) * cos(Rad(#ArcStart#))),((#SW#/2-#P#*2) * sin(Rad(#ArcStart#))+((#ArcStart#-130)*6*#scale#)) | ArcTo ((#SW#/2-#P#*2) * cos(Rad(#ArcEnd#))),((#SW#/2-#P#*2) * sin(Rad(#ArcEnd#))+((#ArcStart#-130)*6*#scale#)),(#SW#/2-#P#*2),(#SW#/2-#P#*2),0,0 | LineTo (250*#scale#),0 |ClosePath 1
5454

5555
[Arc]
5656
Meter=Shape
5757
X=(#SW#/2)
5858
Y=(#SW#/2+(#ArcStart#-130)*6*#scale#)
5959
Shape=Arc ((#SW#/2-#P#*2) * cos(Rad(#ArcStart#))),((#SW#/2-#P#*2) * sin(Rad(#ArcStart#))),((#SW#/2-#P#*2) * cos(Rad(#ArcEnd#))),((#SW#/2-#P#*2) * sin(Rad(#ArcEnd#))),(#SW#/2-#P#*2),(#SW#/2-#P#*2),0,0 | Extend Common | Stroke LinearGradient This | OffSet 0,5
60-
This=0 | #OppositeColor# ; 0.1 | #OppositeColor#,0 ; 1.0
60+
This=0 | #Primarycolor# ; 0.1 | #Primarycolor#,0 ; 1.0
6161
Common=StrokeStartCap Round | StrokeEndCap Round | StrokeWidth 10
6262
UpdateDivider=-1
6363

@@ -71,9 +71,9 @@ FontWeight=450
7171
FontFace=Metropolis Light
7272
StringAlign=CenterCenter
7373
MeasureName=mDate
74-
FontColor=255,255,255
74+
FontColor=#Primarycolor#
7575
InlinePattern=/
7676
INlineSetting=Size | (12*#scale#)
7777
InlinePattern2=/
78-
INlineSetting2=Color | 255,255,255,150
78+
INlineSetting2=Color | #Primarycolor#,150
7979
DynamicVariables=1

Main/Styles/Light.inc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ Measure=Time
1919
Format=%Y | %m | %d
2020
[mWeekday]
2121
Measure=Time
22-
Format=%A
22+
Format=%A
23+
FormatLocale=Local
2324
[mTimeZone]
2425
Measure=Time
2526
Format=%Z
27+
FormatLocale=Local
2628
[mHour]
2729
Measure=Time
2830
Format=%I
@@ -48,13 +50,14 @@ MeasureName=mWeekday
4850
FontSize=(60*#scale#)
4951
InlineSetting=CharacterSpacing | 2 | 2
5052
MeterStyle=String:S
53+
FontColor=#Primarycolor#,#PrimaryOpacity#
5154

5255
[BarShape]
5356
Meter=Shape
5457
X=0
5558
Y=(10*#scale#)R
56-
Shape=Line 0,0,465,0 | StrokeColor #FC# | StrokeWidth 2 | StrokeStartCap Round | StrokeEndCap Round | Scale #Scale#,1,0,0
57-
Shape2=Ellipse (480*#scale#),0,4 | Fill Color #FC# | StrokeWidth 0 | Scale #Scale#,#Scale#
59+
Shape=Line 0,0,465,0 | StrokeColor #Primarycolor#,#PrimaryOpacity# | StrokeWidth 2 | StrokeStartCap Round | StrokeEndCap Round | Scale #Scale#,1,0,0
60+
Shape2=Ellipse (480*#scale#),0,4 | Fill Color #Primarycolor#,#PrimaryOpacity# | StrokeWidth 0 | Scale #Scale#,#Scale#
5861

5962
[WeatherText]
6063
Meter=String
@@ -72,6 +75,7 @@ MeasureName=mHour
7275
MeasureName2=mMinHead
7376
Measurename3=mMinTail
7477
MeasureName4=mTimeZone
78+
FontColor=#Primarycolor#,#PrimaryOpacity#
7579

7680
[DateText]
7781
Meter=String
@@ -81,4 +85,5 @@ Y=(10*#scale#)R
8185
FontSize=(10*#scale#)
8286
Text=%1
8387
MeasureName=mDate
84-
DynamicVariables=1
88+
DynamicVariables=1
89+
FontColor=#Primarycolor#,#PrimaryOpacity#

Main/Styles/Smart.inc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ MeterStyle=String:S | Time#Align#
2929
[WeatherIcon]
3030
Meter=Image
3131
Y=R
32-
W=(50*#Scale#*#Weather#)
33-
H=(50*#Scale#*#Weather#)
32+
W=(50*#Scale#)
33+
H=(50*#Scale#)
34+
Hidden=(1-#Weather#)
3435
ImageName=#@#Icons\JD Weather Icons\[mCurrentIcon].png
3536
DynamicVariables=1
3637
MeterStyle=Wea#Align# | WeaTint#TintIcon#
@@ -74,7 +75,7 @@ StringAlign=Right
7475
[WeaLeft]
7576
X=0
7677
[WeaCenter]
77-
X=(-([WeatherText:W]+50)/2*#Scale#+#CURRENTCONFIGWIDTH#/2)
78+
X=(-([WeatherText:W]+50*#Scale#)/2+#CURRENTCONFIGWIDTH#/2)
7879
[WeaRight]
7980
X=(#SW#-[#CURRENTSECTION#:W])
8081

Main/Styles/Vars/Arc.inc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
[Variables]
22
ArcStart=(180-#ArcEnd#)
3-
ArcEnd=30
3+
ArcEnd=30
4+
PrimaryColor=0,106,255
5+
Secondarycolor=255,255,255

Main/Styles/Vars/Light.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[Variables]
2+
PrimaryColor=255,255,255
3+
PrimaryOpacity=255

0 commit comments

Comments
 (0)