Update to 1.2

supercam19 · Sep 27, 2021 · 6e1d068 · 6e1d068
1 parent 64f7650
commit 6e1d068
Show file tree

Hide file tree

Showing 14 changed files with 227 additions and 80 deletions.
diff --git a/@Resources/config.ini b/@Resources/config.ini
@@ -0,0 +1,11 @@
+[Variables]
+
+; ---------------------
+;     Config File
+; ---------------------
+
+; ---+ Custom Drive +---
+CustomDriveLetter=F
+; Set this value to a custom drive letter (not C, D, or E)
+; Will be shown in the "Custom Drive" skins
+
diff --git a/@Resources/gvars.ini b/@Resources/gvars.ini
@@ -0,0 +1,10 @@
+[Variables]
+; -----+ Colors +-----
+RED=255,0,0,255
+GREEN=0,255,0,255
+BLUE=0,0,255,255
+ORANGE=247,140,0,255
+YELLOW=247,235,0,255
+BLACK=0,0,0,255
+WHITE=255,255,255,255
+; --------------------
diff --git a/System/CPU/CPU Color Coded.ini b/System/CPU/CPU Color Coded.ini
@@ -4,13 +4,7 @@ DynamicWindowSize=1
 AccurateText=1
 
 [Variables]
-RED=255,0,0,255
-GREEN=0,255,0,255
-BLUE=0,0,255,255
-ORANGE=247,140,0,255
-YELLOW=247,235,0,255
-BLACK=0,0,0,255
-WHITE=255,255,255,255
+@include=#@#gvars.ini
 
 [MeasureCPU]
 Measure=CPU
@@ -32,7 +26,7 @@ FontColor=#WHITE#
 FontSize=12
 FontFace=Arial
 StringStyle=Bold
-Text=CPU:                         %1%
+Text=CPU:                          %1%
 
 [MeterCPUBar]
 MeasureName=MeasureCPU

diff --git a/System/CPU/CPU Sleek.ini b/System/CPU/CPU Sleek.ini
@@ -23,7 +23,7 @@ FontColor=#WHITE#
 FontSize=12
 FontFace=Arial
 StringStyle=Bold
-Text=CPU:                         %1%
+Text=CPU:                          %1%
 
 [MeterCPUBar]
 MeasureName=MeasureCPU

diff --git a/System/Drive/C Drive/C Drive Color Coded.ini b/System/Drive/C Drive/C Drive Color Coded.ini
@@ -4,13 +4,7 @@ DynamicWindowSize=1
 AccurateText=1
 
 [Variables]
-RED=255,0,0,255
-GREEN=0,255,0,255
-BLUE=0,0,255,255
-ORANGE=247,140,0,255
-YELLOW=247,235,0,255
-BLACK=0,0,0,255
-WHITE=255,255,255,255
+@include=#@#gvars.ini
 
 [MeasureDriveLabel]
 Measure=FreeDiskSpace

diff --git a/System/Drive/Custom/Custom Drive Color Coded.ini b/System/Drive/Custom/Custom Drive Color Coded.ini
@@ -0,0 +1,78 @@
+[RainMeter]
+Update=1000
+DynamicWindowSize=1
+AccurateText=1
+
+[Variables]
+@include=#@#gvars.ini
+@include2=#@#config.ini
+
+[MeasureDriveLabel]
+Measure=FreeDiskSpace
+Drive=#CustomDriveLetter#:
+Label=1
+UpdateDivider=2
+
+[MeasureDiskTotal]
+Measure=FreeDiskSpace
+Drive=#CustomDriveLetter#:
+Total=1
+UpdateDivider=5
+
+[MeasureFreeSpace]
+Measure=FreeDiskSpace
+Drive=#CustomDriveLetter#:
+UpdateDivider=5
+
+[MeasureUsedSpace]
+Measure=FreeDiskSpace
+Drive=#CustomDriveLetter#:
+InvertMeasure=1
+UpdateDivider=5
+
+[MeasureDisk]
+Measure=Calc
+Formula=ROUND(100 - ((MeasureFreeSpace / (MeasureDiskTotal + 1)) * 100))
+MinValue=0
+MaxValue=100
+IfCondition=MeasureDisk < 25
+IfTrueAction=[!SetOption MeterDiskBar BarColor #GREEN#]
+IfCondition2=(MeasureDisk >= 25) && (MeasureDisk <= 49)
+IfTrueAction2=[!SetOption MeterDiskBar BarColor #YELLOW#]
+IfCondition3=(MeasureDisk >= 50) && (MeasureDisk <= 74)
+IfTrueAction3=[!SetOption MeterDiskBar BarColor #ORANGE#]
+IfCondition4=MeasureDisk > 74
+IfTrueAction4=[!SetOption MeterDiskBar BarColor #RED#]
+
+[DiskDelay]
+Measure=Calc
+Formula=MeasureDisk
+
+[MeterDisk]
+Meter=String
+MeasureName=MeasureDisk
+AntiAlias=1
+FontColor=255,255,255,255
+FontFace=Arial
+StringStyle=Bold
+FontSize=12
+Percentual=1
+X=0
+Y=0
+Text=Drive #CustomDriveLetter#:                     %1%
+
+[MeterDiskBar]
+MeasureName=MeasureDisk
+Meter=BAR
+Y=17r
+W=180
+H=5
+SolidColor=0,0,0,0
+BarOrientation=Horizontal
+
+[BarLine]
+Meter=IMAGE
+Y=5r
+H=5
+W=180
+SolidColor=125,125,125,175
diff --git a/System/Drive/Custom/Custom Drive Sleek.ini b/System/Drive/Custom/Custom Drive Sleek.ini
@@ -0,0 +1,80 @@
+[RainMeter]
+Update=1000
+DynamicWindowSize=1
+AccurateText=1
+
+[Variables]
+RED=255,0,0,255
+GREEN=0,255,0,255
+BLUE=0,0,255,255
+ORANGE=247,140,0,255
+YELLOW=247,235,0,255
+BLACK=0,0,0,255
+WHITE=255,255,255,255
+color=0,0,0,0
+@include=#@#config.ini
+
+[MeasureDriveLabel]
+Measure=FreeDiskSpace
+Drive=#CustomDriveLetter#:
+Label=1
+UpdateDivider=2
+
+[MeasureDiskTotal]
+Measure=FreeDiskSpace
+Drive=#CustomDriveLetter#:
+Total=1
+UpdateDivider=5
+
+[MeasureFreeSpace]
+Measure=FreeDiskSpace
+Drive=#CustomDriveLetter#:
+UpdateDivider=5
+
+[MeasureUsedSpace]
+Measure=FreeDiskSpace
+Drive=#CustomDriveLetter#:
+InvertMeasure=1
+UpdateDivider=5
+
+[MeasureDisk]
+Measure=Calc
+Formula=ROUND(100 - ((MeasureFreeSpace / (MeasureDiskTotal + 1)) * 100))
+MinValue=0
+MaxValue=100
+
+[DiskDelay]
+Measure=Calc
+Formula=MeasureDisk
+
+[MeterDisk]
+Meter=String
+MeasureName=MeasureDisk
+AntiAlias=1
+FontColor=255,255,255,255
+FontFace=Arial
+StringStyle=Bold
+FontSize=12
+Percentual=1
+X=0
+Y=0
+Text=Drive #CustomDriveLetter#:                      %1%
+
+[MeterDiskBar]
+MeasureName=MeasureDisk
+Meter=BAR
+Y=17r
+X=0r
+W=180
+H=5
+BarColor=255,255,255,255
+SolidColor=0,0,0,0
+BarOrientation=Horizontal
+
+[BarLine]
+Meter=IMAGE
+Y=5r
+X=0r
+H=5
+W=180
+SolidColor=125,125,125,175
diff --git a/System/Drive/D Drive/D Drive Color Coded.ini b/System/Drive/D Drive/D Drive Color Coded.ini
@@ -4,14 +4,7 @@ DynamicWindowSize=1
 AccurateText=1
 
 [Variables]
-RED=255,0,0,255
-GREEN=0,255,0,255
-BLUE=0,0,255,255
-ORANGE=247,140,0,255
-YELLOW=247,235,0,255
-BLACK=0,0,0,255
-WHITE=255,255,255,255
-color=0,0,0,0
+@include=#@#gvars.ini
 
 [MeasureDriveLabel]
 Measure=FreeDiskSpace
@@ -41,11 +34,11 @@ Measure=Calc
 Formula=ROUND(100 - ((MeasureFreeSpace / (MeasureDiskTotal + 1)) * 100))
 MinValue=0
 MaxValue=100
-IfCondition=MeasureUsedSpace < 25
-IfTrueAction=[!SetOption MeterDiskBar BarColor 0,255,0,255]
-IfCondition2=(MeasureUsedSpace >= 25) && (MeasureUsedSpace <= 49)
+IfCondition=MeasureDisk < 25
+IfTrueAction=[!SetOption MeterDiskBar BarColor #GREEN#]
+IfCondition2=(MeasureDisk >= 25) && (MeasureDisk <= 49)
 IfTrueAction2=[!SetOption MeterDiskBar BarColor #YELLOW#]
-IfCondition3=(MeasureUsedSpace >= 50) && (MeasureUsedSpace <= 74)
+IfCondition3=(MeasureDisk >= 50) && (MeasureDisk <= 74)
 IfTrueAction3=[!SetOption MeterDiskBar BarColor #ORANGE#]
 IfCondition4=MeasureDisk > 74
 IfTrueAction4=[!SetOption MeterDiskBar BarColor #RED#]
@@ -71,7 +64,6 @@ Text=Drive D:                     %1%
 MeasureName=MeasureDisk
 Meter=BAR
 Y=17r
-X=0r
 W=180
 H=5
 SolidColor=0,0,0,0
@@ -80,7 +72,6 @@ BarOrientation=Horizontal
 [BarLine]
 Meter=IMAGE
 Y=5r
-X=0r
 H=5
 W=180
 SolidColor=125,125,125,175
diff --git a/System/Drive/E Drive/E Drive Color Coded.ini b/System/Drive/E Drive/E Drive Color Coded.ini
@@ -4,13 +4,7 @@ DynamicWindowSize=1
 AccurateText=1
 
 [Variables]
-RED=255,0,0,255
-GREEN=0,255,0,255
-BLUE=0,0,255,255
-ORANGE=247,140,0,255
-YELLOW=247,235,0,255
-BLACK=0,0,0,255
-WHITE=255,255,255,255
+@include=#@#gvars.ini
 
 [MeasureDriveLabel]
 Measure=FreeDiskSpace
@@ -40,11 +34,11 @@ Measure=Calc
 Formula=ROUND(100 - ((MeasureFreeSpace / (MeasureDiskTotal + 1)) * 100))
 MinValue=0
 MaxValue=100
-IfCondition=MeasureUsedSpace < 25
+IfCondition=MeasureDisk < 25
 IfTrueAction=[!SetOption MeterDiskBar BarColor #GREEN#]
-IfCondition2=(MeasureUsedSpace >= 25) && (MeasureUsedSpace <= 49)
+IfCondition2=(MeasureDisk >= 25) && (MeasureDisk <= 49)
 IfTrueAction2=[!SetOption MeterDiskBar BarColor #YELLOW#]
-IfCondition3=(MeasureUsedSpace >= 50) && (MeasureUsedSpace <= 74)
+IfCondition3=(MeasureDisk >= 50) && (MeasureDisk <= 74)
 IfTrueAction3=[!SetOption MeterDiskBar BarColor #ORANGE#]
 IfCondition4=MeasureDisk > 74
 IfTrueAction4=[!SetOption MeterDiskBar BarColor #RED#]
@@ -70,7 +64,6 @@ Text=Drive E:                     %1%
 MeasureName=MeasureDisk
 Meter=BAR
 Y=17r
-X=0r
 W=180
 H=5
 SolidColor=0,0,0,0
@@ -79,7 +72,6 @@ BarOrientation=Horizontal
 [BarLine]
 Meter=IMAGE
 Y=5r
-X=0r
 H=5
 W=180
 SolidColor=125,125,125,175
diff --git a/System/Memory/RAM/RAM Color Coded.ini b/System/Memory/RAM/RAM Color Coded.ini
@@ -3,14 +3,7 @@ Update=1000
 AccurateText=1
 
 [Variables]
-RED=255,0,0,255
-GREEN=0,255,0,255
-BLUE=0,0,255,255
-ORANGE=247,140,0,255
-YELLOW=247,235,0,255
-BLACK=0,0,0,255
-WHITE=255,255,255,255
-color=0,0,0,0
+@include=#@#gvars.ini
 
 [MeasureRAMTotal]
 Measure=PhysicalMemory

diff --git a/System/Memory/SWAP/SWAP Color Coded.ini b/System/Memory/SWAP/SWAP Color Coded.ini
@@ -4,13 +4,7 @@ DynamicWindowSize=1
 AccurateText=1
 
 [Variables]
-RED=255,0,0,255
-GREEN=0,255,0,255
-BLUE=0,0,255,255
-ORANGE=247,140,0,255
-YELLOW=247,235,0,255
-BLACK=0,0,0,255
-WHITE=255,255,255,255
+@include=#@#gvars.ini
 
 [MeasureSWAPTotal]
 Measure=SwapMemory

diff --git a/System/Memory/Virtual/VIRTUAL Color Coded.ini b/System/Memory/Virtual/VIRTUAL Color Coded.ini
@@ -4,13 +4,7 @@ DynamicWindowSize=1
 AccurateText=1
 
 [Variables]
-RED=255,0,0,255
-GREEN=0,255,0,255
-BLUE=0,0,255,255
-ORANGE=247,140,0,255
-YELLOW=247,235,0,255
-BLACK=0,0,0,255
-WHITE=255,255,255,255
+@include=#@#gvars.ini
 
 [MeasureMEMTotal]
 Measure=Memory