Project restructure, updated skin metadata

mrhatch97 · Oct 7, 2018 · b4bae0e · b4bae0e
1 parent f92e989
commit b4bae0e
Show file tree

Hide file tree

Showing 36 changed files with 152 additions and 152 deletions.
diff --git a/...rces/CPU/Core Temp/Core_Load_Measures.inc → ...s/Include/CoreTemp/Core_Load_Measures.inc b/...rces/CPU/Core Temp/Core_Load_Measures.inc → ...s/Include/CoreTemp/Core_Load_Measures.inc
diff --git a/...rces/CPU/Core Temp/Core_Temp_Measures.inc → ...s/Include/CoreTemp/Core_Temp_Measures.inc b/...rces/CPU/Core Temp/Core_Temp_Measures.inc → ...s/Include/CoreTemp/Core_Temp_Measures.inc
diff --git a/System/System Resources/CPU/MeterCPULine.inc → @Resources/Include/CoreTemp/MeterCPULine.inc b/System/System Resources/CPU/MeterCPULine.inc → @Resources/Include/CoreTemp/MeterCPULine.inc
diff --git a/System/System Resources/CPU/MeterCPULoad.inc → @Resources/Include/CoreTemp/MeterCPULoad.inc b/System/System Resources/CPU/MeterCPULoad.inc → @Resources/Include/CoreTemp/MeterCPULoad.inc
diff --git a/System/Data/Drive1Measures.inc → @Resources/Include/Drives/Drive1Measures.inc b/System/Data/Drive1Measures.inc → @Resources/Include/Drives/Drive1Measures.inc
diff --git a/System/Data/Drive1Meter.inc → @Resources/Include/Drives/Drive1Meter.inc b/System/Data/Drive1Meter.inc → @Resources/Include/Drives/Drive1Meter.inc
diff --git a/System/Data/Drive2Measures.inc → @Resources/Include/Drives/Drive2Measures.inc b/System/Data/Drive2Measures.inc → @Resources/Include/Drives/Drive2Measures.inc
diff --git a/System/Data/Drive2Meter.inc → @Resources/Include/Drives/Drive2Meter.inc b/System/Data/Drive2Meter.inc → @Resources/Include/Drives/Drive2Meter.inc
diff --git a/System/Data/DriveGraphMeter.inc → ...ources/Include/Drives/DriveGraphMeter.inc b/System/Data/DriveGraphMeter.inc → ...ources/Include/Drives/DriveGraphMeter.inc
diff --git a/...m Resources/Primary/MainGaugeMeasures.inc → ...s/Include/MainGauge/MainGaugeMeasures.inc b/...m Resources/Primary/MainGaugeMeasures.inc → ...s/Include/MainGauge/MainGaugeMeasures.inc
diff --git a/...ystem Resources/Primary/MainGaugeText.inc → ...urces/Include/MainGauge/MainGaugeText.inc b/...ystem Resources/Primary/MainGaugeText.inc → ...urces/Include/MainGauge/MainGaugeText.inc
diff --git a/System/Data/NetGraphMeter.inc → @Resources/Include/Network/NetGraphMeter.inc b/System/Data/NetGraphMeter.inc → @Resources/Include/Network/NetGraphMeter.inc
diff --git a/System/Data/NetMeasures.inc → @Resources/Include/Network/NetMeasures.inc b/System/Data/NetMeasures.inc → @Resources/Include/Network/NetMeasures.inc
diff --git a/System/Data/NetMeter.inc → @Resources/Include/Network/NetMeter.inc b/System/Data/NetMeter.inc → @Resources/Include/Network/NetMeter.inc
diff --git a/System/Audio/Visualizer/FFTMeasures.inc → @Resources/Visualizer/FFTMeasures.inc b/System/Audio/Visualizer/FFTMeasures.inc → @Resources/Visualizer/FFTMeasures.inc
diff --git a/System/Audio/Visualizer/FFTMeters.inc → @Resources/Visualizer/FFTMeters.inc b/System/Audio/Visualizer/FFTMeters.inc → @Resources/Visualizer/FFTMeters.inc
diff --git a/System/Audio/Visualizer/RMSMeasures.inc → @Resources/Visualizer/RMSMeasures.inc b/System/Audio/Visualizer/RMSMeasures.inc → @Resources/Visualizer/RMSMeasures.inc
diff --git a/System/Audio/AudioControl/AudioControl.ini → AudioControl/AudioControl.ini b/System/Audio/AudioControl/AudioControl.ini → AudioControl/AudioControl.ini
@@ -6,10 +6,10 @@ SkinWidth=#SkinWidth#
 
 [Metadata]
 Name=AudioControl
-Author=mhatch
+Author=Matthew Hatch
 Information=Basic volume control and display.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+Version=1.0.1
+License=MIT License
 
 [Variables]
 @includeGlobal=#@#Styles\GlobalVariables.inc

diff --git a/CPU/CPULoad.ini b/CPU/CPULoad.ini
@@ -0,0 +1,24 @@
+[Rainmeter]
+Update=1000
+AccurateText=1
+BackgroundMode=2
+SolidColor=#BackgroundColor#
+SkinWidth=#SkinWidth#
+
+[Metadata]
+Name=CPULoad
+Author=Matthew Hatch
+Information=Shows current load on up to 4 CPU cores.
+Version=1.0.1
+License=MIT License
+
+[Variables]
+@includeGlobal=#@#Styles\GlobalVariables.inc
+@include=#StylePath#StyleSheetVars.inc
+@include2=#StylePath#MeterStyles.inc
+
+@includeMeasures1="#@#Include\CoreTemp\Core_Load_Measures.inc"
+
+@includeMeters1="#@#Include\CoreTemp\MeterCPULoad.inc"
+
+@includeMeters2="#@#Include\CoreTemp\MeterCPULine.inc"
diff --git a/...tem Resources/CPU/Core Temp/Core_Temp.ini → CPU/CPUMonitor.ini b/...tem Resources/CPU/Core Temp/Core_Temp.ini → CPU/CPUMonitor.ini
@@ -6,11 +6,11 @@ SolidColor=#BackgroundColor#
 SkinWidth=#SkinWidth#
 
 [Metadata]
-Name=Core_Temp
-Author=mhatch
+Name=CPUMonitor
+Author=Matthew Hatch
 Information=Shows current load and temperature on up to 4 CPU cores.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+Version=1.0.1
+License=MIT License
 
 [Variables]
 @includeGlobal=#@#Styles\GlobalVariables.inc
@@ -33,8 +33,8 @@ IfBelowAction=[!SetOption MeterCPUVolt Text "0.0000"][!SetVariable GaugeRotation
 IfAboveValue=0
 IfAboveAction=[!SetOption MeterCPUVolt Text ""][!SetVariable GaugeRotationAngle 240][!EnableMeasureGroup Cores][!SetOption MeterCPUTemp0Text Text ""][!SetOption MeterCPUTemp1Text Text ""][!SetOption MeterCPUTemp2Text Text ""][!SetOption MeterCPUTemp3Text Text ""][!UpdateMeasure MeasureTjMax]
 
-@includeMeasures1="#ROOTCONFIGPATH#System\System Resources\CPU\Core Temp\Core_Temp_Measures.inc"
-@includeMeasures2="#ROOTCONFIGPATH#System\System Resources\CPU\Core Temp\Core_Load_Measures.inc"
+@includeMeasures1="#@#Include\CoreTemp\Core_Temp_Measures.inc"
+@includeMeasures2="#@#Include\CoreTemp\Core_Load_Measures.inc"
 
 ;Meters
 
@@ -224,6 +224,6 @@ FontColor=#Core3StatusColor#
 DynamicVariables=1
 Text=%1
 
-@includeMeters1="#ROOTCONFIGPATH#System\System Resources\CPU\MeterCPULoad.inc"
+@includeMeters1="#@#Include\CoreTemp\MeterCPULoad.inc"
 
-@includeMeters2="#ROOTCONFIGPATH#System\System Resources\CPU\MeterCPULine.inc"
+@includeMeters2="#@#Include\CoreTemp\MeterCPULine.inc"
diff --git a/Time/Clock.ini → Clock/Clock.ini b/Time/Clock.ini → Clock/Clock.ini
@@ -7,10 +7,10 @@ SkinWidth=#SkinWidth#
 
 [Metadata]
 Name=Connection
-Author=mhatch
+Author=Matthew Hatch
 Information=Shows current time, date, and day of week.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+Version=1.0.1
+License=MIT License
 
 [Variables]
 @includeGlobal=#@#Styles\GlobalVariables.inc

diff --git a/Time/Counts/Counts.ini → Clock/Counts/Counts.ini b/Time/Counts/Counts.ini → Clock/Counts/Counts.ini
@@ -7,10 +7,10 @@ SkinWidth=#SkinWidth#
 
 [Metadata]
 Name=Counts
-Author=mhatch
+Author=Matthew Hatch
 Information=Shows current day and week of year.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+Version=1.0.1
+License=MIT License
 
 [Variables]
 @includeGlobal=#@#Styles\GlobalVariables.inc

diff --git a/Time/MinimalClock.ini → Clock/MinimalClock.ini b/Time/MinimalClock.ini → Clock/MinimalClock.ini
@@ -6,10 +6,10 @@ SkinWidth=#SkinWidth#
 
 [Metadata]
 Name=Connection
-Author=mhatch
+Author=Matthew Hatch
 Information=Shows current time, date, and day of week in a compact format.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+Version=1.0.1
+License=MIT License
 
 [Variables]
 @includeGlobal=#@#Styles\GlobalVariables.inc

diff --git a/Time/Uptime/Uptime.ini → Clock/Uptime/Uptime.ini b/Time/Uptime/Uptime.ini → Clock/Uptime/Uptime.ini
@@ -7,10 +7,10 @@ SkinWidth=#SkinWidth#
 
 [Metadata]
 Name=Uptime
-Author=mhatch
+Author=Matthew Hatch
 Information=Shows time since system booted.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+Version=1.0.1
+License=MIT License
 
 [Variables]
 @includeGlobal=#@#Styles\GlobalVariables.inc

diff --git a/DriveNet/DriveNet.ini b/DriveNet/DriveNet.ini
@@ -0,0 +1,35 @@
+[Rainmeter]
+Update=1000
+AccurateText=1
+BackgroundMode=2
+SolidColor=#BackgroundColor#
+SkinWidth=#SkinWidth#
+
+[Metadata]
+Name=DriveNet
+Author=Matthew Hatch
+Information=Combined status display for two drives and network I/O.
+Version=1.0.1
+License=MIT License
+
+[Variables]
+@includeGlobal=#@#Styles\GlobalVariables.inc
+@include=#StylePath#StyleSheetVars.inc
+@include2=#StylePath#MeterStyles.inc
+
+;Measures
+
+@includeMeasures1="#@#Include\Drives\Drive1Measures.inc"
+@includeMeasures2="#@#Include\Drives\Drive2Measures.inc"
+@includeMeasures3="#@#Include\Network\NetMeasures.inc"
+
+@includeMeters1="#@#Include\Network\NetMeter.inc"
+
+;Activity Graphs
+
+@includeMeters3="#@#Include\Network\NetGraphMeter.inc"
+
+@includeMeters4="#@#Include\Drives\DriveGraphMeter.inc"
+
+@includeMeters5="#@#Include\Drives\Drive1Meter.inc"
+@includeMeters6="#@#Include\Drives\Drive2Meter.inc"
diff --git a/Drives/Drives.ini b/Drives/Drives.ini
@@ -0,0 +1,28 @@
+[Rainmeter]
+Update=1000
+AccurateText=1
+BackgroundMode=2
+SolidColor=#BackgroundColor#
+SkinWidth=#SkinWidth#
+
+[Metadata]
+Name=Drives
+Author=Matthew Hatch
+Information=Status display for two drives.
+Version=1.0.1
+License=MIT License
+
+[Variables]
+@includeGlobal=#@#Styles\GlobalVariables.inc
+@include=#StylePath#StyleSheetVars.inc
+@include2=#StylePath#MeterStyles.inc
+
+@includeMeasures1="#@#Include\Drives\Drive1Measures.inc"
+@includeMeasures2="#@#Include\Drives\Drive2Measures.inc"
+
+;Meters
+
+@includeMeters1="#@#Include\Drives\DriveGraphMeter.inc"
+
+@includeMeters2="#@#Include\Drives\Drive1Meter.inc"
+@includeMeters3="#@#Include\Drives\Drive2Meter.inc"
diff --git a/...m/System Resources/Primary/Main Gauge.ini → MainGauge/MainGauge.ini b/...m/System Resources/Primary/Main Gauge.ini → MainGauge/MainGauge.ini
@@ -6,17 +6,17 @@ SkinWidth=#SkinWidth#
 
 [Metadata]
 Name=Main Gauge
-Author=mhatch
+Author=Matthew Hatch
 Information=Shows current CPU time usage and physical memory usage.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+Version=1.0.1
+License=MIT License
 
 [Variables]
 @includeGlobal=#@#Styles\GlobalVariables.inc
 @include=#StylePath#StyleSheetVars.inc
 @include2=#StylePath#MeterStyles.inc
 
-@includeMeasures1="#ROOTCONFIGPATH#System\System Resources\Primary\MainGaugeMeasures.inc"
+@includeMeasures1="#@#Include\MainGauge\MainGaugeMeasures.inc"
 
 [MeterGaugeBackground]
 Meter=Shape

diff --git a/Net/Net.ini b/Net/Net.ini
@@ -0,0 +1,22 @@
+[Rainmeter]
+Update=1000
+BackgroundMode=2
+SolidColor=#BackgroundColor#
+
+[Metadata]
+Name=Net
+Author=Matthew Hatch
+Information=Displays current network I/O and IP address.
+Version=1.0.1
+License=MIT License
+
+[Variables]
+@includeGlobal=#@#Styles\GlobalVariables.inc
+@include=#StylePath#StyleSheetVars.inc
+@include2=#StylePath#MeterStyles.inc
+
+@includeMeasures1="#@#Include\Network\NetMeasures.inc"
+
+@includeMeters1="#@#Include\Network\NetMeter.inc"
+
+@includeMeters2="#@#Include\Network\NetGraphMeter.inc"
diff --git a/Sidebar_Background.ini b/Sidebar_Background.ini
@@ -2,10 +2,10 @@
 
 [Metadata]
 Name=Connection
-Author=mhatch
+Author=Matthew Hatch
 Information=Skin background.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+Version=1.0.1
+License=MIT License
 
 [Variables]
 @include=#@#Styles\MasterVariables.inc

diff --git a/System/Audio/Spotify/Spotify.ini → Spotify/Spotify.ini b/System/Audio/Spotify/Spotify.ini → Spotify/Spotify.ini
@@ -7,10 +7,10 @@ SkinWidth=#SkinWidth#
 
 [Metadata]
 Name=Spotify
-Author=mhatch
+Author=Matthew Hatch
 Information=Indicates current status of Spotify player, with media controls.
 Version=1.0.1
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
+License=MIT License
 
 [Variables]
 @includeGlobal=#@#Styles\GlobalVariables.inc

diff --git a/System/Data/DriveNet/DriveNet.ini b/System/Data/DriveNet/DriveNet.ini
diff --git a/System/Data/Drives/Drives.ini b/System/Data/Drives/Drives.ini
diff --git a/System/Data/Net/Net.ini b/System/Data/Net/Net.ini
diff --git a/System/System Resources/CPU/Core Temp/Core_Load.ini b/System/System Resources/CPU/Core Temp/Core_Load.ini