Skip to content

Commit 8a439dc

Browse files
RadAdRadAd
committed
Simplify skin
1 parent 97053b3 commit 8a439dc

File tree

2 files changed

+43
-67
lines changed

2 files changed

+43
-67
lines changed

‎Skins/VirtualDesktopDemo/VirtualDesktop/VirtualDesktop.ini‎

Lines changed: 38 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Name=Virtual Desktop Demo
33
Author=Adam Gates
44
Information=Demonstrates the VirtualDesktop plugin
55
License=Creative Commons BY-NC-SA 4.0
6-
Version=1.0.0
6+
Version=1.1.0
77

88
[Rainmeter]
99
Update=10000
@@ -16,24 +16,25 @@ ContextTitle2=Remove Desktop
1616
ContextAction2=[!CommandMeasure MeasureVirtualDesktop "Remove"]
1717

1818
[Variables]
19+
TextColor=255,255,255,255
20+
ButtonTextColor=0,0,0,255
1921
NormalColor=255,255,255,255
20-
#SelectedColor=0,0,255,255
2122
SelectedColor=9,134,9,255
2223
PressedColor=9,200,9,255
2324
OverColor=9,255,9,255
2425

2526
[StyleText]
2627
X=R
2728
Y=r
28-
FontColor=#NormalColor#
29+
FontColor=#TextColor#
2930
FontSize=14
3031
AntiAlias=1
3132

3233
[ButtonText]
3334
X=9r
3435
Y=10r
3536
StringAlign=CenterCenter
36-
FontColor=0,0,0,255
37+
FontColor=#ButtonTextColor#
3738

3839
[StyleSolidButton]
3940
X=2R
@@ -58,74 +59,14 @@ BevelType=2
5859
Measure=Plugin
5960
Plugin=VirtualDesktop
6061
UpdateDivider=-1
61-
IfCondition=MeasureVirtualDesktop = 0
62-
IfTrueAction=[!SetOption Desktop0 SolidColor "#SelectedColor#"][!UpdateMeter Desktop0][!Redraw]
63-
IfFalseAction=[!SetOption Desktop0 SolidColor ""][!UpdateMeter Desktop0][!Redraw]
64-
IfCondition2=MeasureVirtualDesktop = 1
65-
IfTrueAction2=[!SetOption Desktop1 SolidColor "#SelectedColor#"][!UpdateMeter Desktop1][!Redraw]
66-
IfFalseAction2=[!SetOption Desktop1 SolidColor ""][!UpdateMeter Desktop1][!Redraw]
67-
IfCondition3=MeasureVirtualDesktop = 2
68-
IfTrueAction3=[!SetOption Desktop2 SolidColor "#SelectedColor#"][!UpdateMeter Desktop2][!Redraw]
69-
IfFalseAction3=[!SetOption Desktop2 SolidColor ""][!UpdateMeter Desktop2][!Redraw]
70-
IfCondition4=MeasureVirtualDesktop = 3
71-
IfTrueAction4=[!SetOption Desktop3 SolidColor "#SelectedColor#"][!UpdateMeter Desktop3][!Redraw]
72-
IfFalseAction4=[!SetOption Desktop3 SolidColor ""][!UpdateMeter Desktop3][!Redraw]
73-
IfCondition5=MeasureVirtualDesktop = 4
74-
IfTrueAction5=[!SetOption Desktop4 SolidColor "#SelectedColor#"][!UpdateMeter Desktop4][!Redraw]
75-
IfFalseAction5=[!SetOption Desktop4 SolidColor ""][!UpdateMeter Desktop4][!Redraw]
76-
IfCondition6=MeasureVirtualDesktop = 5
77-
IfTrueAction6=[!SetOption Desktop5 SolidColor "#SelectedColor#"][!UpdateMeter Desktop5][!Redraw]
78-
IfFalseAction6=[!SetOption Desktop5 SolidColor ""][!UpdateMeter Desktop5][!Redraw]
79-
IfCondition7=MeasureVirtualDesktop = 6
80-
IfTrueAction7=[!SetOption Desktop6 SolidColor "#SelectedColor#"][!UpdateMeter Desktop6][!Redraw]
81-
IfFalseAction7=[!SetOption Desktop6 SolidColor ""][!UpdateMeter Desktop6][!Redraw]
82-
IfCondition8=MeasureVirtualDesktop = 7
83-
IfTrueAction8=[!SetOption Desktop7 SolidColor "#SelectedColor#"][!UpdateMeter Desktop7][!Redraw]
84-
IfFalseAction8=[!SetOption Desktop7 SolidColor ""][!UpdateMeter Desktop7][!Redraw]
85-
IfCondition9=MeasureVirtualDesktop = 8
86-
IfTrueAction9=[!SetOption Desktop8 SolidColor "#SelectedColor#"][!UpdateMeter Desktop8][!Redraw]
87-
IfFalseAction9=[!SetOption Desktop8 SolidColor ""][!UpdateMeter Desktop8][!Redraw]
88-
IfCondition10=MeasureVirtualDesktop = 9
89-
IfTrueAction10=[!SetOption Desktop9 SolidColor "#SelectedColor#"][!UpdateMeter Desktop9][!Redraw]
90-
IfFalseAction10=[!SetOption Desktop9 SolidColor ""][!UpdateMeter Desktop9][!Redraw]
91-
OnUpdateAction=[!UpdateMeter MeasureName][!Redraw]
92-
DynamicVariables=1
62+
OnUpdateAction=[!UpdateMeter MeasureName][!SetOptionGroup DesktopButton SolidColor ""][!SetOption "Desktop[MeasureVirtualDesktop:]" SolidColor #SelectedColor#][!UpdateMeterGroup DesktopButton][!Redraw]
9363

9464
[MeasureVirtualDesktopCount]
9565
Measure=Plugin
9666
Plugin=VirtualDesktop
9767
Type=Count
9868
UpdateDivider=-1
99-
IfCondition=MeasureVirtualDesktopCount > 0
100-
IfTrueAction=[!SetOption Desktop0 Hidden "0"][!UpdateMeter Desktop0][!Redraw]
101-
IfFalseAction=[!SetOption Desktop0 Hidden "1"][!UpdateMeter Desktop0][!Redraw]
102-
IfCondition2=MeasureVirtualDesktopCount > 1
103-
IfTrueAction2=[!SetOption Desktop1 Hidden "0"][!UpdateMeter Desktop1][!Redraw]
104-
IfFalseAction2=[!SetOption Desktop1 Hidden "1"][!UpdateMeter Desktop1][!Redraw]
105-
IfCondition3=MeasureVirtualDesktopCount > 2
106-
IfTrueAction3=[!SetOption Desktop2 Hidden "0"][!UpdateMeter Desktop2][!Redraw]
107-
IfFalseAction3=[!SetOption Desktop2 Hidden "1"][!UpdateMeter Desktop2][!Redraw]
108-
IfCondition4=MeasureVirtualDesktopCount > 3
109-
IfTrueAction4=[!SetOption Desktop3 Hidden "0"][!UpdateMeter Desktop3][!Redraw]
110-
IfFalseAction4=[!SetOption Desktop3 Hidden "1"][!UpdateMeter Desktop3][!Redraw]
111-
IfCondition5=MeasureVirtualDesktopCount > 4
112-
IfTrueAction5=[!SetOption Desktop4 Hidden "0"][!UpdateMeter Desktop4][!Redraw]
113-
IfFalseAction5=[!SetOption Desktop4 Hidden "1"][!UpdateMeter Desktop4][!Redraw]
114-
IfCondition6=MeasureVirtualDesktopCount > 5
115-
IfTrueAction6=[!SetOption Desktop5 Hidden "0"][!UpdateMeter Desktop5][!Redraw]
116-
IfFalseAction6=[!SetOption Desktop5 Hidden "1"][!UpdateMeter Desktop5][!Redraw]
117-
IfCondition7=MeasureVirtualDesktopCount > 6
118-
IfTrueAction7=[!SetOption Desktop6 Hidden "0"][!UpdateMeter Desktop6][!Redraw]
119-
IfFalseAction7=[!SetOption Desktop6 Hidden "1"][!UpdateMeter Desktop6][!Redraw]
120-
IfCondition8=MeasureVirtualDesktopCount > 7
121-
IfTrueAction8=[!SetOption Desktop7 Hidden "0"][!UpdateMeter Desktop7][!Redraw]
122-
IfFalseAction8=[!SetOption Desktop7 Hidden "1"][!UpdateMeter Desktop7][!Redraw]
123-
IfCondition9=MeasureVirtualDesktopCount > 8
124-
IfTrueAction9=[!SetOption Desktop8 Hidden "0"][!UpdateMeter Desktop8][!Redraw]
125-
IfFalseAction9=[!SetOption Desktop8 Hidden "1"][!UpdateMeter Desktop8][!Redraw]
126-
IfCondition10=MeasureVirtualDesktopCount > 9
127-
IfTrueAction10=[!SetOption Desktop9 Hidden "0"][!UpdateMeter Desktop9][!Redraw]
128-
IfFalseAction10=[!SetOption Desktop9 Hidden "1"][!UpdateMeter Desktop9][!Redraw]
69+
OnUpdateAction=[!UpdateMeterGroup DesktopButton][!Redraw]
12970

13071
[ButtonPrev]
13172
Meter=Button
@@ -156,65 +97,95 @@ Meter=String
15697
MeasureName=MeasureVirtualDesktop
15798
X=-17R
15899
Y=-10r
159-
W=80
100+
W=100
160101
MeterStyle=StyleText
161102

162103
[Desktop0]
163104
Meter=Button
164105
MeterStyle=StyleSolidButton
106+
Group=DesktopButton
165107
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 0"]
166108
ToolTipText=[MeasureVirtualDesktop:Name(0)]
109+
Hidden=([MeasureVirtualDesktopCount]<=0?)
110+
DynamicVariables=1
167111

168112
[Desktop1]
169113
Meter=Button
170114
MeterStyle=StyleSolidButton
115+
Group=DesktopButton
171116
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 1"]
172117
ToolTipText=[MeasureVirtualDesktop:Name(1)]
118+
Hidden=([MeasureVirtualDesktopCount]<=1?)
119+
DynamicVariables=1
173120

174121
[Desktop2]
175122
Meter=Button
176123
MeterStyle=StyleSolidButton
124+
Group=DesktopButton
177125
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 2"]
178126
ToolTipText=[MeasureVirtualDesktop:Name(2)]
127+
Hidden=([MeasureVirtualDesktopCount]<=2?)
128+
DynamicVariables=1
179129

180130
[Desktop3]
181131
Meter=Button
182132
MeterStyle=StyleSolidButton
133+
Group=DesktopButton
183134
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 3"]
184135
ToolTipText=[MeasureVirtualDesktop:Name(3)]
136+
Hidden=([MeasureVirtualDesktopCount]<=3?)
137+
DynamicVariables=1
185138

186139
[Desktop4]
187140
Meter=Button
188141
MeterStyle=StyleSolidButton
142+
Group=DesktopButton
189143
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 4"]
190144
ToolTipText=[MeasureVirtualDesktop:Name(4)]
145+
Hidden=([MeasureVirtualDesktopCount]<=4?)
146+
DynamicVariables=1
191147

192148
[Desktop5]
193149
Meter=Button
194150
MeterStyle=StyleSolidButton
151+
Group=DesktopButton
195152
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 5"]
196153
ToolTipText=[MeasureVirtualDesktop:Name(5)]
154+
Hidden=([MeasureVirtualDesktopCount]<=5?)
155+
DynamicVariables=1
197156

198157
[Desktop6]
199158
Meter=Button
200159
MeterStyle=StyleSolidButton
160+
Group=DesktopButton
201161
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 6"]
202162
ToolTipText=[MeasureVirtualDesktop:Name(6)]
163+
Hidden=([MeasureVirtualDesktopCount]<=6?)
164+
DynamicVariables=1
203165

204166
[Desktop7]
205167
Meter=Button
206168
MeterStyle=StyleSolidButton
169+
Group=DesktopButton
207170
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 7"]
208171
ToolTipText=[MeasureVirtualDesktop:Name(7)]
172+
Hidden=([MeasureVirtualDesktopCount]<=7?)
173+
DynamicVariables=1
209174

210175
[Desktop8]
211176
Meter=Button
212177
MeterStyle=StyleSolidButton
178+
Group=DesktopButton
213179
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 8"]
214180
ToolTipText=[MeasureVirtualDesktop:Name(8)]
181+
Hidden=([MeasureVirtualDesktopCount]<=8?)
182+
DynamicVariables=1
215183

216184
[Desktop9]
217185
Meter=Button
218186
MeterStyle=StyleSolidButton
187+
Group=DesktopButton
219188
ButtonCommand=[!CommandMeasure MeasureVirtualDesktop "Switch 9"]
220189
ToolTipText=[MeasureVirtualDesktop:Name(9)]
190+
Hidden=([MeasureVirtualDesktopCount]<=9?)
191+
DynamicVariables=1

‎VirtualDesktop.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ VisualStudioVersion = 16.0.32106.194
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VirtualDesktop", "src\VirtualDesktop.vcxproj", "{ECAE7A3B-B18E-481D-992E-7DD70DCA0478}"
77
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FD400E4C-0F51-4400-8AAF-2B5DD9125A1B}"
9+
ProjectSection(SolutionItems) = preProject
10+
Skins\VirtualDesktopDemo\VirtualDesktop\VirtualDesktop.ini = Skins\VirtualDesktopDemo\VirtualDesktop\VirtualDesktop.ini
11+
EndProjectSection
12+
EndProject
813
Global
914
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1015
Debug|x32 = Debug|x32

0 commit comments

Comments
 (0)