Merge branch 'v1.4.1' into devrelease

raiguard · Oct 12, 2018 · 4a3eb99 · 4a3eb99
2 parents 7b6809d + c7fd0ac
commit 4a3eb99
Show file tree

Hide file tree

Showing 26 changed files with 2,276 additions and 31 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1,11 +1,11 @@
 [ReleaseVersions]
 stable=1.4.0
-dev=1.4.0
+dev=1.4.1-rc.1
 
 [Changelogs]
 stableChangelog=v1.4.0 - 2018-10-09[#CRLF]- Added Chronometer[#CRLF]- Added Process Meter[#CRLF]- Added tentative Snapdragon support to CPU Meter[#CRLF]- Added support for CoreTemp and Speedfan in CPU Meter[#CRLF]- Added dynamic fan display to CPU Meter[#CRLF]- Added All Cores mode to CPU Meter line graph[#CRLF]- Added session total and simultaneous bits/bytes display to Network Meter[#CRLF]- Added separate bits/bytes peak traffic displays to Network Meter[#CRLF]- Added three additional GPU Meters for monitoring up to four GPUs simultaneously[#CRLF]- Added disk temperatures to Disks Meter[#CRLF]- Added setting to hide disk read/write speeds in Disks Meter[#CRLF]- Added Disk Read/Write Letters option[#CRLF]- Added setting to only display fixed disks in Disks Meter[#CRLF]- Added global color customization[#CRLF]- Added "open config file" buttons to all settings skins to allow access to more advanced settings[#CRLF]- Added 'Welcome' dialog for first-time users[#CRLF]- Added update check interval customization[#CRLF]- Added controls for settings backups in global settings skin[#CRLF]- Darkened default accent color[#CRLF]- Enhanced update download button to directly download and open the update .RMSKIN without a browser[#CRLF]- Increased supported threads in CPU Meter from 32 to 64 (AMD Threadripper 2)[#CRLF]- Increased precision of readouts in Network Meter[#CRLF]- Removed condensed font toggle for Network traffic (condensed is now the only option)[#CRLF]- Network Meter globe is no longer affected by accent color changes[#CRLF]- Removed dual GPU meter option (replaced by separate GPU Meters)[#CRLF]- Enhanced Disk Eject functionality with support for USB card readers and virtual disks (requires admin privileges)[#CRLF]- Significantly improved Disks Meter performance[#CRLF]- Consolidated graph and background borders into their respective background meters[#CRLF]- Standardized graph positioning[#CRLF]- Refactored input box visuals[#CRLF]- Implemented new HWiNFO SMV application, replacing the HWiNFO Config Tool[#CRLF]- Updated dynamic settings system with more consistent and flexible functions[#CRLF]- Updated LoadSkin and UpdateChecker scripts for Rainmeter 4.2 compatibility[#CRLF]- Settings backups are now made upon closing a settings skin, rather than at a preset interval[#CRLF]- Changelog button now shows local changelog rather than the one from GitHub[#CRLF]- Replaced readme link with MG Wiki link[#CRLF]- Reordered toggles in gadget manager[#CRLF]- Fixed error with the update checker reading a file while it was being written by WebParser[#CRLF]- Fixed oversight where clicking the total reset button in Network Meter Pro would not work[#CRLF]- Fixed inconsistent NetMonitor button logic[#CRLF]- Fixed NetMonitor controls not appearing on non-English systems[#CRLF]- Fixed update notification not being centered on the monitor properly[#CRLF]- Fixed settings backup import overwriting HWiNFO SMV sections[#CRLF]- Fixed settings backup import crashing if a settings file doesn't exist in the backup[#CRLF]- Fixed settings backup overwriting default colors[#CRLF]- Corrected date formatting in changelog
-devChangelog=v1.4.0 - 2018-10-09[#CRLF]- Added Chronometer[#CRLF]- Added Process Meter[#CRLF]- Added tentative Snapdragon support to CPU Meter[#CRLF]- Added support for CoreTemp and Speedfan in CPU Meter[#CRLF]- Added dynamic fan display to CPU Meter[#CRLF]- Added All Cores mode to CPU Meter line graph[#CRLF]- Added session total and simultaneous bits/bytes display to Network Meter[#CRLF]- Added separate bits/bytes peak traffic displays to Network Meter[#CRLF]- Added three additional GPU Meters for monitoring up to four GPUs simultaneously[#CRLF]- Added disk temperatures to Disks Meter[#CRLF]- Added setting to hide disk read/write speeds in Disks Meter[#CRLF]- Added Disk Read/Write Letters option[#CRLF]- Added setting to only display fixed disks in Disks Meter[#CRLF]- Added global color customization[#CRLF]- Added "open config file" buttons to all settings skins to allow access to more advanced settings[#CRLF]- Added 'Welcome' dialog for first-time users[#CRLF]- Added update check interval customization[#CRLF]- Added controls for settings backups in global settings skin[#CRLF]- Darkened default accent color[#CRLF]- Enhanced update download button to directly download and open the update .RMSKIN without a browser[#CRLF]- Increased supported threads in CPU Meter from 32 to 64 (AMD Threadripper 2)[#CRLF]- Increased precision of readouts in Network Meter[#CRLF]- Removed condensed font toggle for Network traffic (condensed is now the only option)[#CRLF]- Network Meter globe is no longer affected by accent color changes[#CRLF]- Removed dual GPU meter option (replaced by separate GPU Meters)[#CRLF]- Enhanced Disk Eject functionality with support for USB card readers and virtual disks (requires admin privileges)[#CRLF]- Significantly improved Disks Meter performance[#CRLF]- Consolidated graph and background borders into their respective background meters[#CRLF]- Standardized graph positioning[#CRLF]- Refactored input box visuals[#CRLF]- Implemented new HWiNFO SMV application, replacing the HWiNFO Config Tool[#CRLF]- Updated dynamic settings system with more consistent and flexible functions[#CRLF]- Updated LoadSkin and UpdateChecker scripts for Rainmeter 4.2 compatibility[#CRLF]- Settings backups are now made upon closing a settings skin, rather than at a preset interval[#CRLF]- Changelog button now shows local changelog rather than the one from GitHub[#CRLF]- Replaced readme link with MG Wiki link[#CRLF]- Reordered toggles in gadget manager[#CRLF]- Fixed error with the update checker reading a file while it was being written by WebParser[#CRLF]- Fixed oversight where clicking the total reset button in Network Meter Pro would not work[#CRLF]- Fixed inconsistent NetMonitor button logic[#CRLF]- Fixed NetMonitor controls not appearing on non-English systems[#CRLF]- Fixed update notification not being centered on the monitor properly[#CRLF]- Fixed settings backup import overwriting HWiNFO SMV sections[#CRLF]- Fixed settings backup import crashing if a settings file doesn't exist in the backup[#CRLF]- Fixed settings backup overwriting default colors[#CRLF]- Corrected date formatting in changelog
+devChangelog=v1.4.1-rc.1 - 2018-10-12[#CRLF]- Added safeguards for extraordinarily long changelogs preventing access to the download button[#CRLF]- Fixed dynamic fan display bar always staying at 100%
 
 [URLs]
 stableUrl=https://github.com/raiguard/ModernGadgets/releases/download/v1.4.0/ModernGadgets_1.4.0.rmskin
-devUrl=https://github.com/raiguard/ModernGadgets/releases/download/v1.4.0/ModernGadgets_1.4.0.rmskin
+devUrl=https://github.com/raiguard/ModernGadgets/releases/download/v1.4.1-rc.1/ModernGadgets_1.4.1-rc.1.rmskin
diff --git a/Skins/ModernGadgets/@Resources/Changelog.txt b/Skins/ModernGadgets/@Resources/Changelog.txt
@@ -138,6 +138,10 @@ v1.0.0 - 2016-12-04
 
 Development Releases
 
+v1.4.1-rc.1 - 2018-10-12
+- Added safeguards for extraordinarily long changelogs preventing access to the download button
+- Fixed dynamic fan display bar always staying at 100%
+
 v1.4.0-rc.6 - 2018-10-08
 - Redesigned HWiNFO SMV report link
 - Fixed import backup prompt disappearing if an update is available

diff --git a/Skins/ModernGadgets/@Resources/Readme.txt b/Skins/ModernGadgets/@Resources/Readme.txt
@@ -1,5 +1,5 @@
 MODERNGADGETS
-v1.4.0
+v1.4.1-rc.1
 By raiguard
 
 ----------------------------------------

diff --git a/Skins/ModernGadgets/@Resources/Settings/GlobalSettings.inc b/Skins/ModernGadgets/@Resources/Settings/GlobalSettings.inc
@@ -6,7 +6,7 @@ isHwinfoAvailable=1
 notifyUpdates=1
 updateCheckRate=90
 autoBackups=1
-checkForPrereleases=0
+checkForPrereleases=1
 
 showBgBorder=1
 rowSpacing=1

diff --git a/Skins/ModernGadgets/@Resources/StyleSheet.inc b/Skins/ModernGadgets/@Resources/StyleSheet.inc
@@ -1,7 +1,7 @@
 ; MODERNGADGETS STYLESHEET
 
 [Variables]
-mgVersion=1.4.0
+mgVersion=1.4.1-rc.1
 
 ; Positioning
 bgOffset=5

diff --git a/Skins/ModernGadgets/CPU/CPU.ini b/Skins/ModernGadgets/CPU/CPU.ini
@@ -19,7 +19,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.4.0
+Version=1.4.1-rc.1
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/Chronometer/Chronometer.ini b/Skins/ModernGadgets/Chronometer/Chronometer.ini
@@ -18,7 +18,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.4.0
+Version=1.4.1-rc.1
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/Chronometer/Stopwatch/Stopwatch.ini b/Skins/ModernGadgets/Chronometer/Stopwatch/Stopwatch.ini
@@ -10,7 +10,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.4.0
+Version=1.4.1-rc.1
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/Config/CPU/Config.ini b/Skins/ModernGadgets/Config/CPU/Config.ini
@@ -9,7 +9,7 @@ Name=CPU Config
 Author=raiguard
 Information=Configuration for CPU Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.4.0
+Version=1.4.1-rc.1
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Config/Chronometer/Config.ini b/Skins/ModernGadgets/Config/Chronometer/Config.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.4.0
+Version=1.4.1-rc.1
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Config/Disks/Config.ini b/Skins/ModernGadgets/Config/Disks/Config.ini
@@ -9,7 +9,7 @@ Name=Disks Config
 Author=raiguard
 Information=Configuration for Disks Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.4.0
+Version=1.4.1-rc.1
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Config/GPU/Config.ini b/Skins/ModernGadgets/Config/GPU/Config.ini
@@ -9,7 +9,7 @@ Name=GPU Config
 Author=raiguard
 Information=Configuration for GPU Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.4.0
+Version=1.4.1-rc.1
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Config/GadgetManager/Config.ini b/Skins/ModernGadgets/Config/GadgetManager/Config.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.4.0
+Version=1.4.1-rc.1
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Config/Global/Config.ini b/Skins/ModernGadgets/Config/Global/Config.ini
@@ -9,7 +9,7 @@ Name=Global Config
 Author=raiguard
 Information=Configuration for all gadgets.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.4.0
+Version=1.4.1-rc.1
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Config/Network/Config.ini b/Skins/ModernGadgets/Config/Network/Config.ini
@@ -10,7 +10,7 @@ Name=Network Config
 Author=raiguard
 Information=Configuration for Network Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.4.0
+Version=1.4.1-rc.1
 
 ; ========= Variables and Styles =========
 

diff --git a/Skins/ModernGadgets/Config/Process/Config.ini b/Skins/ModernGadgets/Config/Process/Config.ini
@@ -9,7 +9,7 @@ Name=Process Config
 Author=raiguard
 Information=Configuration for Process Meter.
 License=Creative Commons Attribution-NonCommercial-ShareAlike 3.0
-Version=1.4.0
+Version=1.4.1-rc.1
 
 [Variables]
 @includeStyleSheet=#@#StyleSheet.inc

diff --git a/Skins/ModernGadgets/Config/Setup/Config.ini b/Skins/ModernGadgets/Config/Setup/Config.ini
@@ -3,7 +3,6 @@ MiddleMouseDownAction=[!Refresh]
 Group=ModernGadgets | ModernGadgetsSetup
 ; LeftMouseUpAction=[!CommandMeasure MeasureSettingsBackupScript "ImportBackup()"]
 ; RightMouseUpAction=[!ShowMeterGroup Essentials][!ShowMeterGroup ImportBackupPrompt][!Redraw]
-; OnRefreshAction=[!CommandMeasure MeasureUpdateCheckerScript "CheckForUpdate('1.1.2', '1.2.0')"]
 ; OnRefreshAction=[!Hide][!ShowMeterGroup Essentials][!ShowMeterGroup ImportBackupPrompt][!SetVariable page "Import"][!UpdateMeterGroup Essentials][!Redraw][!EnableMeasure MeasureMove][!UpdateMeasure MeasureMove]
 ; OnRefreshAction=[!CommandMeasure MeasureSettingsBackupScript "CheckForBackup()"]
 ; OnRefreshAction=[!Move "((#SCREENAREAWIDTH# / 2) - (#CURRENTCONFIGWIDTH# / 2))" "((#SCREENAREAHEIGHT# / 2) - (#CURRENTCONFIGHEIGHT# / 2))"]
@@ -14,7 +13,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.4.0
+Version=1.4.1-rc.1
 
 ; ========= Variables and Styles =========
 
@@ -43,17 +42,24 @@ ScriptFile=#@#Scripts\UpdateChecker.lua
 CheckForPrereleases=#checkForPrereleases#
 ;UpToDateAction=[!Log "ModernGadgets is up-to-date" "Notice"]
 ;DevAction=[!Log "Dev version" "Notice"]
-UpdateAvailableAction=[!Log "An update is available!" "Notice"][!CommandMeasure MeasureCreateBackup "Run"][!Hide][!HideMeterGroup ImportBackupPrompt][!HideMeterGroup Welcome][!UpdateMeterGroup UpdateAvailable][!ShowMeterGroup UpdateAvailable][!SetVariable page "Update"][!UpdateMeterGroup Essentials][!UpdateMeter Background][!ShowMeterGroup Essentials][!Redraw][!EnableMeasure MeasureMove][!UpdateMeasure MeasureMove]
+UpdateAvailableAction=[!Log "An update is available!" "Notice"][!CommandMeasure MeasureCreateBackup "Run"][!Hide][!HideMeterGroup ImportBackupPrompt][!HideMeterGroup Welcome][!UpdateMeterGroup UpdateAvailable][!ShowMeterGroup UpdateAvailable][!SetVariable page "Update"][!UpdateMeterGroup Essentials][!UpdateMeter Background][!ShowMeterGroup Essentials][!Redraw][!EnableMeasure MeasureCheckSkinHeight][!UpdateMeasure MeasureCheckSkinHeight]
 ParsingErrorAction=[!Log "Error parsing version numbers" "Error"]
 
 [MeasureMove]
 Measure=Calc
-Formula=1
 IfCondition=1
 IfTrueAction=[!Move "((#SCREENAREAWIDTH# / 2) - (#CURRENTCONFIGWIDTH# / 2))" "((#SCREENAREAHEIGHT# / 2) - (#CURRENTCONFIGHEIGHT# / 2))"][!ShowFade][!DisableMeasure MeasureMove]
 DynamicVariables=1
 Disabled=1
 
+[MeasureCheckSkinHeight]
+Measure=Calc
+IfCondition=(#CURRENTCONFIGHEIGHT# + 60) > #SCREENAREAHEIGHT#
+IfTrueAction=[!HideMeter MeterChangelog][!ShowMeter MeterChangelogTooLong][!UpdateMeterGroup Changelog][!UpdateMeterGroup Essentials][!Redraw][!EnableMeasure MeasureMove][!UpdateMeasure MeasureMove][!DisableMeasure MeasureCheckSkinHeight]
+IfFalseAction=[!EnableMeasure MeasureMove][!UpdateMeasure MeasureMove][!DisableMeasure MeasureCheckSkinHeight]
+DynamicVariables=1
+Disabled=1
+
 [MeasureUpdateCheck]
 Measure=WebParser
 URL=https://api.github.com/repos/raiguard/ModernGadgets/releases
@@ -136,15 +142,28 @@ Text=Update available!
 Hidden=1
 Group=UpdateAvailable
 
-[ChangelogString]
+[MeterChangelog]
 Meter=String
 MeterStyle=StyleString | StyleStringParagraph
 FontSize=8
 FontColor=180,180,180
 X=(#contentMargin# + 4)
 Text=[&MeasureUpdateCheckerScript:GetReleaseInfo('changelog')]
 DynamicVariables=1
-Group=UpdateAvailable
+Group=UpdateAvailable | Changelog
+Hidden=1
+
+[MeterChangelogTooLong]
+Meter=String
+MeterStyle=StyleString | StyleStringParagraph
+FontSize=9
+FontColor=180,180,180
+Text=Update version: [&MeasureUpdateCheckerScript:GetReleaseInfo('name')]#CRLF##CRLF#The changelog is so long that it won't fit on your screen! Click here to view the changelog in your browser.
+LeftMouseUpAction=["https://raw.githubusercontent.com/raiguard/ModernGadgets/master/Skins/ModernGadgets/%40Resources/Changelog.txt"]
+ToolTipText=This will open the full ModernGadgets changelog, so you may need to scroll for a bit to find the changelog for this release.
+ToolTipWidth=200
+DynamicVariables=1
+Group=Changelog
 Hidden=1
 
 [MeterDownloadUpdateButtonLabel]