Prep for release

raiguard · Nov 17, 2018 · f3c7871 · f3c7871
1 parent e4c9910
commit f3c7871
Show file tree

Hide file tree

Showing 27 changed files with 34 additions and 35 deletions.
diff --git a/Skins/ModernGadgets/@Resources/Readme.txt b/Skins/ModernGadgets/@Resources/Readme.txt
@@ -1,5 +1,5 @@
 MODERNGADGETS
-v1.5.0-beta.2
+v1.5.0-beta.3
 By raiguard
 
 ----------------------------------------

diff --git a/Skins/ModernGadgets/@Resources/Settings/NetworkSettings.inc b/Skins/ModernGadgets/@Resources/Settings/NetworkSettings.inc
@@ -1,5 +1,5 @@
 [Variables]
-interfaceEthernet=Intel(R) Ethernet Connection (2) I219-V
+interfaceEthernet=
 interfaceWireless=
 interfaceOther=
 
@@ -9,10 +9,12 @@ showPing=0
 showNetTotals=1
 showLineGraph=1
 showPeakNetworkUsage=0
-useNetMonitor=1
+useNetMonitor=0
 
 pingUrl=google.com
 
 colorUpload=107,238,98
 colorDownload=255,246,42
 colorPeak=99,125,217
+
+autoAdapterConfig=1
diff --git a/Skins/ModernGadgets/@Resources/Settings/ProcessSettings.inc b/Skins/ModernGadgets/@Resources/Settings/ProcessSettings.inc
@@ -1,10 +1,10 @@
 [Variables]
-showAvgUsage=0
+showAvgUsage=1
 showBars=1
-showLineGraph=0
+showLineGraph=1
 processLabelFontFace=Roboto Cn
 
-processes=5
+processes=10
 processMode=1
 processBlacklist=_Total|Idle|dwm|csrss|svchost|lsass|System|spoolsv
 

diff --git a/Skins/ModernGadgets/@Resources/StyleSheet.inc b/Skins/ModernGadgets/@Resources/StyleSheet.inc
@@ -3,7 +3,7 @@
 ; you change anything in this file, it WILL break things. Proceed at your own risk!
 
 [Variables]
-mgVersion=1.5.0-beta.2
+mgVersion=1.5.0-beta.3
 
 ; Positioning
 bgOffset=5

diff --git a/Skins/ModernGadgets/Chronometer/Chronometer.ini b/Skins/ModernGadgets/Chronometer/Chronometer.ini
@@ -19,7 +19,7 @@ Name=Chronometer
 Author=raiguard
 Information=A modern digital clock with timers, stopwatches, alarms, and an event countdown function.
 License=Creative Commons BY-NC-SA 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/Chronometer/Settings/ChronometerSettings.ini b/Skins/ModernGadgets/Chronometer/Settings/ChronometerSettings.ini
@@ -8,7 +8,7 @@ Name=Chronometer Config
 Author=raiguard
 Information=Configuration for the Chronometer.
 License=Creative Commons BY-NC-SA 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Chronometer/Stopwatch/Stopwatch.ini b/Skins/ModernGadgets/Chronometer/Stopwatch/Stopwatch.ini
@@ -11,7 +11,7 @@ Name=Stopwatch
 Author=raiguard
 Information=Extension of the Chronometer, a stopwatch with lap support.
 License=Creative Commons BY-NC-SA 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/CpuMeter/CpuMeter.ini b/Skins/ModernGadgets/CpuMeter/CpuMeter.ini
@@ -20,7 +20,7 @@ Name=CPU
 Author=raiguard
 Information=A Rainmeter recreation of the All CPU Meter gadget, updated and enhanced to give it a "modern" feel.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/CpuMeter/Settings/CpuMeterSettings.ini b/Skins/ModernGadgets/CpuMeter/Settings/CpuMeterSettings.ini
@@ -8,7 +8,7 @@ Name=CPU Config
 Author=raiguard
 Information=Configuration for CPU Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/DisksMeter/DisksMeter.ini b/Skins/ModernGadgets/DisksMeter/DisksMeter.ini
@@ -19,7 +19,7 @@ Name=Disks Meter
 Author=raiguard
 Information=A Rainmeter recreation of the Drives Meter gadget, updated and enhanced to give it a "modern" feel.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/DisksMeter/Settings/DisksMeterSettings.ini b/Skins/ModernGadgets/DisksMeter/Settings/DisksMeterSettings.ini
@@ -8,7 +8,7 @@ Name=Disks Config
 Author=raiguard
 Information=Configuration for Disks Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/GpuMeter/GPU0/GpuMeter.ini b/Skins/ModernGadgets/GpuMeter/GPU0/GpuMeter.ini
@@ -20,7 +20,7 @@ Name=GPU Meter
 Author=raiguard
 Information=A Rainmeter recreation of the GPU Meter gadget, updated and enhanced to give it a "modern" feel.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/GpuMeter/GPU1/GpuMeter.ini b/Skins/ModernGadgets/GpuMeter/GPU1/GpuMeter.ini
@@ -19,7 +19,7 @@ Name=GPU Meter
 Author=raiguard
 Information=A Rainmeter recreation of the GPU Meter gadget, updated and enhanced to give it a "modern" feel.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/GpuMeter/GPU2/GpuMeter.ini b/Skins/ModernGadgets/GpuMeter/GPU2/GpuMeter.ini
@@ -19,7 +19,7 @@ Name=GPU Meter
 Author=raiguard
 Information=A Rainmeter recreation of the GPU Meter gadget, updated and enhanced to give it a "modern" feel.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/GpuMeter/GPU3/GpuMeter.ini b/Skins/ModernGadgets/GpuMeter/GPU3/GpuMeter.ini
@@ -19,7 +19,7 @@ Name=GPU Meter
 Author=raiguard
 Information=A Rainmeter recreation of the GPU Meter gadget, updated and enhanced to give it a "modern" feel.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/GpuMeter/Settings/GpuMeterSettings.ini b/Skins/ModernGadgets/GpuMeter/Settings/GpuMeterSettings.ini
@@ -8,7 +8,7 @@ Name=GPU Config
 Author=raiguard
 Information=Configuration for GPU Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/NetworkMeter/NetworkMeter.ini b/Skins/ModernGadgets/NetworkMeter/NetworkMeter.ini
@@ -18,7 +18,7 @@ Name=Network Meter
 Author=raiguard
 Information=A Rainmeter recreation of the Network Meter gadget, updated and enhanced to give it a "modern" feel.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 
@@ -44,7 +44,6 @@ textNetOutTotal=""
 totalColumnX=(#columnX#)
 netInOutFontFace=Roboto Cn
 adapterFound=0
-autoAdapterConfig=0
 
 ; External variables
 externalIp=
@@ -167,7 +166,7 @@ FinishAction=[!SetVariable InterfaceEthernet [MeasureRunGetEthernetInterface]][!
 [MeasureCheckAdapterConfig]
 Measure=Calc
 IfCondition=(#adapterFound# = 0) && (#autoAdapterConfig# = 1)
-IfTrueAction=[!Log "No network adapter found, auto-configuring..." Notice][!SetOption MeterGadgetTitle Text "Configuring..."][!WriteKeyValue Variables autoAdapterConfig 0][!CommandMeasure MeasureRunGetEthernetInterface "Run"]
+IfTrueAction=[!Log "No network adapter found, auto-configuring..." Notice][!SetOption MeterGadgetTitle Text "Configuring..."][!WriteKeyValue Variables autoAdapterConfig 0 "#networkSettingsPath#"][!CommandMeasure MeasureRunGetEthernetInterface "Run"]
 IfCondition2=(#adapterFound# = 0) && (#autoAdapterConfig# = 0)
 IfTrueAction2=[!Log "No network adapter found, monitoring active interface" Notice][!EnableMeasure MeasureGetActiveInterface][!UpdateMeasure MeasureGetActiveInterface]
 DynamicVariables=1

diff --git a/Skins/ModernGadgets/NetworkMeter/NetworkMeterPro.ini b/Skins/ModernGadgets/NetworkMeter/NetworkMeterPro.ini
@@ -18,7 +18,7 @@ Name=Network Meter Pro
 Author=raiguard
 Information=A Rainmeter recreation of the Network Meter gadget, updated and enhanced to give it a "modern" feel. This version uses the NetMonitor Windows service for more accurate monitoring (credit to SilverAzide for the method).
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 
@@ -46,7 +46,6 @@ totalColumnX=(#columnX#)
 netInOutFontFace=Roboto Cn
 
 adapterFound=0
-autoAdapterConfig=1
 
 ; External variables
 externalIp=

diff --git a/Skins/ModernGadgets/NetworkMeter/Settings/NetworkMeterSettings.ini b/Skins/ModernGadgets/NetworkMeter/Settings/NetworkMeterSettings.ini
@@ -9,7 +9,7 @@ Name=Network Config
 Author=raiguard
 Information=Configuration for Network Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/ProcessMeter/ProcessMeter.ini b/Skins/ModernGadgets/ProcessMeter/ProcessMeter.ini
@@ -19,7 +19,7 @@ Name=Process Meter
 Author=raiguard
 Information=A gadget to track processes that are using high amounts of CPU, or specific processes chosen by the user.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/ProcessMeter/Settings/ProcessMeterSettings.ini b/Skins/ModernGadgets/ProcessMeter/Settings/ProcessMeterSettings.ini
@@ -8,7 +8,7 @@ Name=Process Config
 Author=raiguard
 Information=Configuration for Process Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/ProcessMeter/TaskManager/TaskManager.ini b/Skins/ModernGadgets/ProcessMeter/TaskManager/TaskManager.ini
@@ -7,7 +7,7 @@ Group=ModernGadgets | MgImportRefresh | MgGlobalRefresh | MgProcessMeter
 Name=Task Manager
 Author=raiguard
 Information=Flyout for Process Meter that shows detailed information for processes, similar to task manager.
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 License=Creative Commons Attribution - Non - Commercial - Share Alike 3.0
 
 [Variables]

diff --git a/Skins/ModernGadgets/Settings/GadgetManager/GadgetManager.ini b/Skins/ModernGadgets/Settings/GadgetManager/GadgetManager.ini
@@ -9,7 +9,7 @@ Name=GadgetManager
 Author=raiguard
 Information=Load / unload gadgets and change global settings
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Settings/GlobalSettings/GlobalSettings.ini b/Skins/ModernGadgets/Settings/GlobalSettings/GlobalSettings.ini
@@ -8,7 +8,7 @@ Name=Global Config
 Author=raiguard
 Information=Configuration for all gadgets.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Settings/Setup/Setup.ini b/Skins/ModernGadgets/Settings/Setup/Setup.ini
@@ -9,7 +9,7 @@ Name=Setup
 Author=raiguard
 Information=Background skin for ModernGadgets, manages settings backups and update checking.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 ; ========= Variables and Styles =========
 
@@ -20,7 +20,7 @@ Version=1.5.0-beta.2
 scale=1
 bgWidth=250
 bgHeight=149
-loaded=1
+loaded=0
 contentMarginAbs=4
 
 page=Update

diff --git a/Skins/ModernGadgets/Settings/UnitTests/ReleasePrep.ini b/Skins/ModernGadgets/Settings/UnitTests/ReleasePrep.ini
@@ -17,7 +17,7 @@ MeterStyle=StyleString
 Y=#contentMargin#
 FontSize=12
 Text=Set
-LeftMouseUpAction=[!WriteKeyValue Variables useNetMonitor "0" "#networkSettingsPath#"][!WriteKeyValue Variables processes "10" "#processSettingsPath#"][!WriteKeyValue Variables showLineGraph "1" "#processSettingsPath#"][!WriteKeyValue Variables showAvgUsage "1" "#processSettingsPath#"][!WriteKeyValue Variables loaded "0" "#ROOTCONFIGPATH#Settings\Setup\Setup.ini"][!WriteKeyValue Variables loaded "0" "#ROOTCONFIGPATH#Settings\GadgetManager\GadgetManager.ini"][!WriteKeyValue Variables checkForPrereleases "1" "#globalSettingsPath#"]
+LeftMouseUpAction=[!WriteKeyValue Variables useNetMonitor "0" "#networkSettingsPath#"][!WriteKeyValue Variables processes "10" "#processSettingsPath#"][!WriteKeyValue Variables showLineGraph "1" "#processSettingsPath#"][!WriteKeyValue Variables showAvgUsage "1" "#processSettingsPath#"][!WriteKeyValue Variables loaded "0" "#ROOTCONFIGPATH#Settings\Setup\Setup.ini"][!WriteKeyValue Variables loaded "0" "#ROOTCONFIGPATH#Settings\GadgetManager\GadgetManager.ini"][!WriteKeyValue Variables checkForPrereleases "1" "#globalSettingsPath#"][!WriteKeyValue Variables autoAdapterConfig 1 "#networkSettingsPath#"][!WriteKeyValue Variables interfaceEthernet "" "#networkSettingsPath#"][!WriteKeyValue Variables interfaceWireless "" "#networkSettingsPath#"][!WriteKeyValue Variables interfaceOther "" "#networkSettingsPath#"]
 
 ;Release checklist:
 
@@ -28,7 +28,6 @@ LeftMouseUpAction=[!WriteKeyValue Variables useNetMonitor "0" "#networkSettingsP
 ; - CheckAdapterConfig on
 ; - All interfaces to blank
 ; - Process Meter: 10 processes, line graph shown, average usage shown
-;- Network Meter IP to blank (both variants)
 ;- Setup skin "loaded" to 0
 ;- Gadget manager "loaded" to 0
 ;

diff --git a/Skins/ModernGadgets/WeatherMeter/WeatherMeter.ini b/Skins/ModernGadgets/WeatherMeter/WeatherMeter.ini
@@ -18,7 +18,7 @@ Name=Weather Meter
 Author=raiguard
 Information=Displays current weather condition in a compact, clean gadget.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.5.0-beta.2
+Version=1.5.0-beta.3
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc