diff --git a/LibreHardwareMonitor/UI/AboutBox.Designer.cs b/LibreHardwareMonitor/UI/AboutBox.Designer.cs index 036cd82..d501fba 100644 --- a/LibreHardwareMonitor/UI/AboutBox.Designer.cs +++ b/LibreHardwareMonitor/UI/AboutBox.Designer.cs @@ -1,38 +1,38 @@ -/* - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - - Copyright (C) 2009-2017 Michael Möller - -*/ +// Mozilla Public License 2.0 +// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. +// Copyright (C) LibreHardwareMonitor and Contributors +// All Rights Reserved -namespace LibreHardwareMonitor.UI { - sealed partial class AboutBox { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; +namespace LibreHardwareMonitor.UI +{ + sealed partial class AboutBox + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutBox)); this.okButton = new System.Windows.Forms.Button(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); @@ -44,9 +44,9 @@ namespace LibreHardwareMonitor.UI { this.licenseLinkLabel = new System.Windows.Forms.LinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); - // + // // okButton - // + // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.okButton.Location = new System.Drawing.Point(269, 79); @@ -55,9 +55,9 @@ namespace LibreHardwareMonitor.UI { this.okButton.TabIndex = 0; this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; - // + // // pictureBox1 - // + // this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); this.pictureBox1.Location = new System.Drawing.Point(10, 11); this.pictureBox1.Name = "pictureBox1"; @@ -65,9 +65,9 @@ namespace LibreHardwareMonitor.UI { this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.pictureBox1.TabIndex = 1; this.pictureBox1.TabStop = false; - // + // // label1 - // + // this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(74, 12); this.label1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -75,9 +75,9 @@ namespace LibreHardwareMonitor.UI { this.label1.Size = new System.Drawing.Size(117, 13); this.label1.TabIndex = 2; this.label1.Text = "Libre Hardware Monitor"; - // + // // label2 - // + // this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(74, 46); this.label2.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -85,9 +85,9 @@ namespace LibreHardwareMonitor.UI { this.label2.Size = new System.Drawing.Size(250, 13); this.label2.TabIndex = 3; this.label2.Text = "Copyright © LibreHardwareMonitor and Contributors"; - // + // // label3 - // + // this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(74, 29); this.label3.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -95,9 +95,9 @@ namespace LibreHardwareMonitor.UI { this.label3.Size = new System.Drawing.Size(127, 13); this.label3.TabIndex = 4; this.label3.Text = "Version 9.0.30729.1 Beta"; - // + // // projectLinkLabel - // + // this.projectLinkLabel.AutoSize = true; this.projectLinkLabel.Location = new System.Drawing.Point(164, 80); this.projectLinkLabel.Margin = new System.Windows.Forms.Padding(0); @@ -107,9 +107,9 @@ namespace LibreHardwareMonitor.UI { this.projectLinkLabel.TabStop = true; this.projectLinkLabel.Text = "Project Website"; this.projectLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLabel_LinkClicked); - // + // // flowLayoutPanel1 - // + // this.flowLayoutPanel1.AutoSize = true; this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.flowLayoutPanel1.Location = new System.Drawing.Point(10, 100); @@ -117,9 +117,9 @@ namespace LibreHardwareMonitor.UI { this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(0, 0); this.flowLayoutPanel1.TabIndex = 8; - // + // // licenseLinkLabel - // + // this.licenseLinkLabel.AutoSize = true; this.licenseLinkLabel.Location = new System.Drawing.Point(25, 80); this.licenseLinkLabel.Margin = new System.Windows.Forms.Padding(0); @@ -129,9 +129,9 @@ namespace LibreHardwareMonitor.UI { this.licenseLinkLabel.TabStop = true; this.licenseLinkLabel.Text = "Licensing Information"; this.licenseLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLabel_LinkClicked); - // + // // AboutBox - // + // this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; @@ -156,17 +156,17 @@ namespace LibreHardwareMonitor.UI { this.ResumeLayout(false); this.PerformLayout(); + } + + #endregion + + private System.Windows.Forms.Button okButton; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.LinkLabel projectLinkLabel; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private System.Windows.Forms.LinkLabel licenseLinkLabel; } - - #endregion - - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.LinkLabel projectLinkLabel; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.LinkLabel licenseLinkLabel; - } } diff --git a/LibreHardwareMonitor/UI/AboutBox.cs b/LibreHardwareMonitor/UI/AboutBox.cs index e7859c4..a486b0c 100644 --- a/LibreHardwareMonitor/UI/AboutBox.cs +++ b/LibreHardwareMonitor/UI/AboutBox.cs @@ -19,7 +19,7 @@ namespace LibreHardwareMonitor.UI projectLinkLabel.Links.Remove(projectLinkLabel.Links[0]); projectLinkLabel.Links.Add(0, projectLinkLabel.Text.Length, "https://github.com/LibreHardwareMonitor/LibreHardwareMonitor"); licenseLinkLabel.Links.Remove(licenseLinkLabel.Links[0]); - licenseLinkLabel.Links.Add(0, licenseLinkLabel.Text.Length, "https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/blob/master/LICENSE"); + licenseLinkLabel.Links.Add(0, licenseLinkLabel.Text.Length, "https://www.mozilla.org/en-US/MPL/2.0/"); } private void LinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) diff --git a/LibreHardwareMonitor/UI/MainForm.Designer.cs b/LibreHardwareMonitor/UI/MainForm.Designer.cs index 2ea2f7f..e49c20f 100644 --- a/LibreHardwareMonitor/UI/MainForm.Designer.cs +++ b/LibreHardwareMonitor/UI/MainForm.Designer.cs @@ -1,38 +1,38 @@ -/* - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - - Copyright (C) 2009-2013 Michael Möller - -*/ +// Mozilla Public License 2.0 +// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. +// Copyright (C) LibreHardwareMonitor and Contributors +// All Rights Reserved -namespace LibreHardwareMonitor.UI { - sealed partial class MainForm { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; +namespace LibreHardwareMonitor.UI +{ + sealed partial class MainForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.sensor = new Aga.Controls.Tree.TreeColumn(); @@ -127,51 +127,51 @@ namespace LibreHardwareMonitor.UI { this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.SuspendLayout(); this.SuspendLayout(); - // + // // sensor - // + // this.sensor.Header = "Sensor"; this.sensor.SortOrder = System.Windows.Forms.SortOrder.None; this.sensor.TooltipText = null; this.sensor.Width = 250; - // + // // value - // + // this.value.Header = "Value"; this.value.SortOrder = System.Windows.Forms.SortOrder.None; this.value.TooltipText = null; this.value.Width = 100; - // + // // min - // + // this.min.Header = "Min"; this.min.SortOrder = System.Windows.Forms.SortOrder.None; this.min.TooltipText = null; this.min.Width = 100; - // + // // max - // + // this.max.Header = "Max"; this.max.SortOrder = System.Windows.Forms.SortOrder.None; this.max.TooltipText = null; this.max.Width = 100; - // + // // nodeImage - // + // this.nodeImage.DataPropertyName = "Image"; this.nodeImage.LeftMargin = 1; this.nodeImage.ParentColumn = this.sensor; this.nodeImage.ScaleMode = Aga.Controls.Tree.ImageScaleMode.Fit; - // + // // nodeCheckBox - // + // this.nodeCheckBox.DataPropertyName = "Plot"; this.nodeCheckBox.EditEnabled = true; this.nodeCheckBox.LeftMargin = 3; this.nodeCheckBox.ParentColumn = this.sensor; - // + // // nodeTextBoxText - // + // this.nodeTextBoxText.DataPropertyName = "Text"; this.nodeTextBoxText.EditEnabled = true; this.nodeTextBoxText.IncrementalSearchEnabled = true; @@ -179,44 +179,44 @@ namespace LibreHardwareMonitor.UI { this.nodeTextBoxText.ParentColumn = this.sensor; this.nodeTextBoxText.Trimming = System.Drawing.StringTrimming.EllipsisCharacter; this.nodeTextBoxText.UseCompatibleTextRendering = true; - // + // // nodeTextBoxValue - // + // this.nodeTextBoxValue.DataPropertyName = "Value"; this.nodeTextBoxValue.IncrementalSearchEnabled = true; this.nodeTextBoxValue.LeftMargin = 3; this.nodeTextBoxValue.ParentColumn = this.value; this.nodeTextBoxValue.Trimming = System.Drawing.StringTrimming.EllipsisCharacter; this.nodeTextBoxValue.UseCompatibleTextRendering = true; - // + // // nodeTextBoxMin - // + // this.nodeTextBoxMin.DataPropertyName = "Min"; this.nodeTextBoxMin.IncrementalSearchEnabled = true; this.nodeTextBoxMin.LeftMargin = 3; this.nodeTextBoxMin.ParentColumn = this.min; this.nodeTextBoxMin.Trimming = System.Drawing.StringTrimming.EllipsisCharacter; this.nodeTextBoxMin.UseCompatibleTextRendering = true; - // + // // nodeTextBoxMax - // + // this.nodeTextBoxMax.DataPropertyName = "Max"; this.nodeTextBoxMax.IncrementalSearchEnabled = true; this.nodeTextBoxMax.LeftMargin = 3; this.nodeTextBoxMax.ParentColumn = this.max; this.nodeTextBoxMax.Trimming = System.Drawing.StringTrimming.EllipsisCharacter; this.nodeTextBoxMax.UseCompatibleTextRendering = true; - // + // // mainMenu - // + // this.mainMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.fileMenuItem, this.viewMenuItem, this.optionsMenuItem, this.helpMenuItem}); - // + // // fileMenuItem - // + // this.fileMenuItem.Index = 0; this.fileMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.saveReportMenuItem, @@ -226,26 +226,26 @@ namespace LibreHardwareMonitor.UI { this.menuItem6, this.exitMenuItem}); this.fileMenuItem.Text = "File"; - // + // // saveReportMenuItem - // + // this.saveReportMenuItem.Index = 0; this.saveReportMenuItem.Text = "Save Report..."; this.saveReportMenuItem.Click += new System.EventHandler(this.SaveReportMenuItem_Click); - // + // // MenuItem2 - // + // this.MenuItem2.Index = 1; this.MenuItem2.Text = "-"; - // + // // resetMenuItem - // + // this.resetMenuItem.Index = 2; this.resetMenuItem.Text = "Reset"; this.resetMenuItem.Click += new System.EventHandler(this.ResetClick); - // + // // menuItem5 - // + // this.menuItem5.Index = 3; this.menuItem5.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.mainboardMenuItem, @@ -256,55 +256,55 @@ namespace LibreHardwareMonitor.UI { this.hddMenuItem, this.nicMenuItem}); this.menuItem5.Text = "Hardware"; - // + // // mainboardMenuItem - // + // this.mainboardMenuItem.Index = 0; this.mainboardMenuItem.Text = "Motherboard"; - // + // // cpuMenuItem - // + // this.cpuMenuItem.Index = 1; this.cpuMenuItem.Text = "CPU"; - // + // // ramMenuItem - // + // this.ramMenuItem.Index = 2; this.ramMenuItem.Text = "RAM"; - // + // // gpuMenuItem - // + // this.gpuMenuItem.Index = 3; this.gpuMenuItem.Text = "GPU"; - // + // // fanControllerMenuItem - // + // this.fanControllerMenuItem.Index = 4; this.fanControllerMenuItem.Text = "Fan Controllers"; - // + // // hddMenuItem - // + // this.hddMenuItem.Index = 5; this.hddMenuItem.Text = "Hard Disk Drives"; - // + // // nicMenuItem - // + // this.nicMenuItem.Index = 6; this.nicMenuItem.Text = "Network"; - // + // // menuItem6 - // + // this.menuItem6.Index = 4; this.menuItem6.Text = "-"; - // + // // exitMenuItem - // + // this.exitMenuItem.Index = 5; this.exitMenuItem.Text = "Exit"; this.exitMenuItem.Click += new System.EventHandler(this.ExitClick); - // + // // viewMenuItem - // + // this.viewMenuItem.Index = 1; this.viewMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.resetMinMaxMenuItem, @@ -315,64 +315,64 @@ namespace LibreHardwareMonitor.UI { this.MenuItem1, this.columnsMenuItem}); this.viewMenuItem.Text = "View"; - // + // // resetMinMaxMenuItem - // + // this.resetMinMaxMenuItem.Index = 0; this.resetMinMaxMenuItem.Text = "Reset Min/Max"; this.resetMinMaxMenuItem.Click += new System.EventHandler(this.ResetMinMaxMenuItem_Click); - // + // // MenuItem3 - // + // this.MenuItem3.Index = 1; this.MenuItem3.Text = "-"; - // + // // hiddenMenuItem - // + // this.hiddenMenuItem.Index = 2; this.hiddenMenuItem.Text = "Show Hidden Sensors"; - // + // // plotMenuItem - // + // this.plotMenuItem.Index = 3; this.plotMenuItem.Text = "Show Plot"; - // + // // gadgetMenuItem - // + // this.gadgetMenuItem.Index = 4; this.gadgetMenuItem.Text = "Show Gadget"; - // + // // MenuItem1 - // + // this.MenuItem1.Index = 5; this.MenuItem1.Text = "-"; - // + // // columnsMenuItem - // + // this.columnsMenuItem.Index = 6; this.columnsMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.valueMenuItem, this.minMenuItem, this.maxMenuItem}); this.columnsMenuItem.Text = "Columns"; - // + // // valueMenuItem - // + // this.valueMenuItem.Index = 0; this.valueMenuItem.Text = "Value"; - // + // // minMenuItem - // + // this.minMenuItem.Index = 1; this.minMenuItem.Text = "Min"; - // + // // maxMenuItem - // + // this.maxMenuItem.Index = 2; this.maxMenuItem.Text = "Max"; - // + // // optionsMenuItem - // + // this.optionsMenuItem.Index = 2; this.optionsMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.startMinMenuItem, @@ -389,93 +389,93 @@ namespace LibreHardwareMonitor.UI { this.webMenuItemSeparator, this.webMenuItem}); this.optionsMenuItem.Text = "Options"; - // + // // startMinMenuItem - // + // this.startMinMenuItem.Index = 0; this.startMinMenuItem.Text = "Start Minimized"; - // + // // minTrayMenuItem - // + // this.minTrayMenuItem.Index = 1; this.minTrayMenuItem.Text = "Minimize To Tray"; - // + // // minCloseMenuItem - // + // this.minCloseMenuItem.Index = 2; this.minCloseMenuItem.Text = "Minimize On Close"; - // + // // startupMenuItem - // + // this.startupMenuItem.Index = 3; this.startupMenuItem.Text = "Run On Windows Startup"; - // + // // separatorMenuItem - // + // this.separatorMenuItem.Index = 4; this.separatorMenuItem.Text = "-"; - // + // // temperatureUnitsMenuItem - // + // this.temperatureUnitsMenuItem.Index = 5; this.temperatureUnitsMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.celsiusMenuItem, this.fahrenheitMenuItem}); this.temperatureUnitsMenuItem.Text = "Temperature Unit"; - // + // // celsiusMenuItem - // + // this.celsiusMenuItem.Index = 0; this.celsiusMenuItem.RadioCheck = true; this.celsiusMenuItem.Text = "Celsius"; this.celsiusMenuItem.Click += new System.EventHandler(this.CelsiusMenuItem_Click); - // + // // fahrenheitMenuItem - // + // this.fahrenheitMenuItem.Index = 1; this.fahrenheitMenuItem.RadioCheck = true; this.fahrenheitMenuItem.Text = "Fahrenheit"; this.fahrenheitMenuItem.Click += new System.EventHandler(this.FahrenheitMenuItem_Click); - // + // // plotLocationMenuItem - // + // this.plotLocationMenuItem.Index = 6; this.plotLocationMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.plotWindowMenuItem, this.plotBottomMenuItem, this.plotRightMenuItem}); this.plotLocationMenuItem.Text = "Plot Location"; - // + // // plotWindowMenuItem - // + // this.plotWindowMenuItem.Index = 0; this.plotWindowMenuItem.RadioCheck = true; this.plotWindowMenuItem.Text = "Window"; - // + // // plotBottomMenuItem - // + // this.plotBottomMenuItem.Index = 1; this.plotBottomMenuItem.RadioCheck = true; this.plotBottomMenuItem.Text = "Bottom"; - // + // // plotRightMenuItem - // + // this.plotRightMenuItem.Index = 2; this.plotRightMenuItem.RadioCheck = true; this.plotRightMenuItem.Text = "Right"; - // + // // logSeparatorMenuItem - // + // this.logSeparatorMenuItem.Index = 7; this.logSeparatorMenuItem.Text = "-"; - // + // // logSensorsMenuItem - // + // this.logSensorsMenuItem.Index = 8; this.logSensorsMenuItem.Text = "Log Sensors"; - // + // // loggingIntervalMenuItem - // + // this.loggingIntervalMenuItem.Index = 9; this.loggingIntervalMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.log1sMenuItem, @@ -492,87 +492,87 @@ namespace LibreHardwareMonitor.UI { this.log2hMenuItem, this.log6hMenuItem}); this.loggingIntervalMenuItem.Text = "Logging Interval"; - // + // // log1sMenuItem - // + // this.log1sMenuItem.Index = 0; this.log1sMenuItem.RadioCheck = true; this.log1sMenuItem.Text = "1s"; - // + // // log2sMenuItem - // + // this.log2sMenuItem.Index = 1; this.log2sMenuItem.RadioCheck = true; this.log2sMenuItem.Text = "2s"; - // + // // log5sMenuItem - // + // this.log5sMenuItem.Index = 2; this.log5sMenuItem.RadioCheck = true; this.log5sMenuItem.Text = "5s"; - // + // // log10sMenuItem - // + // this.log10sMenuItem.Index = 3; this.log10sMenuItem.RadioCheck = true; this.log10sMenuItem.Text = "10s"; - // + // // log30sMenuItem - // + // this.log30sMenuItem.Index = 4; this.log30sMenuItem.RadioCheck = true; this.log30sMenuItem.Text = "30s"; - // + // // log1minMenuItem - // + // this.log1minMenuItem.Index = 5; this.log1minMenuItem.RadioCheck = true; this.log1minMenuItem.Text = "1min"; - // + // // log2minMenuItem - // + // this.log2minMenuItem.Index = 6; this.log2minMenuItem.RadioCheck = true; this.log2minMenuItem.Text = "2min"; - // + // // log5minMenuItem - // + // this.log5minMenuItem.Index = 7; this.log5minMenuItem.RadioCheck = true; this.log5minMenuItem.Text = "5min"; - // + // // log10minMenuItem - // + // this.log10minMenuItem.Index = 8; this.log10minMenuItem.RadioCheck = true; this.log10minMenuItem.Text = "10min"; - // + // // log30minMenuItem - // + // this.log30minMenuItem.Index = 9; this.log30minMenuItem.RadioCheck = true; this.log30minMenuItem.Text = "30min"; - // + // // log1hMenuItem - // + // this.log1hMenuItem.Index = 10; this.log1hMenuItem.RadioCheck = true; this.log1hMenuItem.Text = "1h"; - // + // // log2hMenuItem - // + // this.log2hMenuItem.Index = 11; this.log2hMenuItem.RadioCheck = true; this.log2hMenuItem.Text = "2h"; - // + // // log6hMenuItem - // + // this.log6hMenuItem.Index = 12; this.log6hMenuItem.RadioCheck = true; this.log6hMenuItem.Text = "6h"; - // + // // sensorValuesTimeWindowMenuItem - // + // this.sensorValuesTimeWindowMenuItem.Index = 10; this.sensorValuesTimeWindowMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.timeWindow30sMenuItem, @@ -587,146 +587,146 @@ namespace LibreHardwareMonitor.UI { this.timeWindow12hMenuItem, this.timeWindow24hMenuItem}); this.sensorValuesTimeWindowMenuItem.Text = "Sensor Values Time Window"; - // + // // timeWindow30sMenuItem - // + // this.timeWindow30sMenuItem.Index = 0; this.timeWindow30sMenuItem.RadioCheck = true; this.timeWindow30sMenuItem.Text = "30s"; - // + // // timeWindow1minMenuItem - // + // this.timeWindow1minMenuItem.Index = 1; this.timeWindow1minMenuItem.RadioCheck = true; this.timeWindow1minMenuItem.Text = "1min"; - // + // // timeWindow2minMenuItem - // + // this.timeWindow2minMenuItem.Index = 2; this.timeWindow2minMenuItem.RadioCheck = true; this.timeWindow2minMenuItem.Text = "2min"; - // + // // timeWindow5minMenuItem - // + // this.timeWindow5minMenuItem.Index = 3; this.timeWindow5minMenuItem.RadioCheck = true; this.timeWindow5minMenuItem.Text = "5min"; - // + // // timeWindow10minMenuItem - // + // this.timeWindow10minMenuItem.Index = 4; this.timeWindow10minMenuItem.RadioCheck = true; this.timeWindow10minMenuItem.Text = "10min"; - // + // // timeWindow30minMenuItem - // + // this.timeWindow30minMenuItem.Index = 5; this.timeWindow30minMenuItem.RadioCheck = true; this.timeWindow30minMenuItem.Text = "30min"; - // + // // timeWindow1hMenuItem - // + // this.timeWindow1hMenuItem.Index = 6; this.timeWindow1hMenuItem.RadioCheck = true; this.timeWindow1hMenuItem.Text = "1h"; - // + // // timeWindow2hMenuItem - // + // this.timeWindow2hMenuItem.Index = 7; this.timeWindow2hMenuItem.RadioCheck = true; this.timeWindow2hMenuItem.Text = "2n"; - // + // // timeWindow6hMenuItem - // + // this.timeWindow6hMenuItem.Index = 8; this.timeWindow6hMenuItem.RadioCheck = true; this.timeWindow6hMenuItem.Text = "6h"; - // + // // timeWindow12hMenuItem - // + // this.timeWindow12hMenuItem.Index = 9; this.timeWindow12hMenuItem.RadioCheck = true; this.timeWindow12hMenuItem.Text = "12h"; - // + // // timeWindow24hMenuItem - // + // this.timeWindow24hMenuItem.Index = 10; this.timeWindow24hMenuItem.RadioCheck = true; this.timeWindow24hMenuItem.Text = "24h"; - // + // // webMenuItemSeparator - // + // this.webMenuItemSeparator.Index = 11; this.webMenuItemSeparator.Text = "-"; - // + // // webMenuItem - // + // this.webMenuItem.Index = 12; this.webMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.runWebServerMenuItem, this.serverPortMenuItem}); this.webMenuItem.Text = "Remote Web Server"; - // + // // runWebServerMenuItem - // + // this.runWebServerMenuItem.Index = 0; this.runWebServerMenuItem.Text = "Run"; - // + // // serverPortMenuItem - // + // this.serverPortMenuItem.Index = 1; this.serverPortMenuItem.Text = "Port"; this.serverPortMenuItem.Click += new System.EventHandler(this.ServerPortMenuItem_Click); - // + // // helpMenuItem - // + // this.helpMenuItem.Index = 3; this.helpMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.aboutMenuItem}); this.helpMenuItem.Text = "Help"; - // + // // aboutMenuItem - // + // this.aboutMenuItem.Index = 0; this.aboutMenuItem.Text = "About"; this.aboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click); - // + // // saveFileDialog - // + // this.saveFileDialog.DefaultExt = "txt"; this.saveFileDialog.FileName = "LibreHardwareMonitor.Report.txt"; this.saveFileDialog.Filter = "Text Documents|*.txt|All Files|*.*"; this.saveFileDialog.RestoreDirectory = true; this.saveFileDialog.Title = "Save Report As"; - // + // // timer - // + // this.timer.Interval = 1000; this.timer.Tick += new System.EventHandler(this.Timer_Tick); - // + // // splitContainer - // + // this.splitContainer.Border3DStyle = System.Windows.Forms.Border3DStyle.Raised; this.splitContainer.Color = System.Drawing.SystemColors.Control; this.splitContainer.Cursor = System.Windows.Forms.Cursors.Default; this.splitContainer.Location = new System.Drawing.Point(12, 12); this.splitContainer.Name = "splitContainer"; this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal; - // + // // splitContainer.Panel1 - // + // this.splitContainer.Panel1.Controls.Add(this.treeView); - // + // // splitContainer.Panel2 - // + // this.splitContainer.Panel2.Cursor = System.Windows.Forms.Cursors.Default; this.splitContainer.Size = new System.Drawing.Size(386, 483); this.splitContainer.SplitterDistance = 354; this.splitContainer.SplitterWidth = 5; this.splitContainer.TabIndex = 3; - // + // // treeView - // + // this.treeView.BackColor = System.Drawing.SystemColors.Window; this.treeView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.treeView.Columns.Add(this.sensor); @@ -758,9 +758,9 @@ namespace LibreHardwareMonitor.UI { this.treeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TreeView_MouseDown); this.treeView.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TreeView_MouseMove); this.treeView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TreeView_MouseUp); - // + // // MainForm - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(418, 533); @@ -779,98 +779,98 @@ namespace LibreHardwareMonitor.UI { this.splitContainer.ResumeLayout(false); this.ResumeLayout(false); + } + + #endregion + + private Aga.Controls.Tree.TreeViewAdv treeView; + private System.Windows.Forms.MainMenu mainMenu; + private System.Windows.Forms.MenuItem fileMenuItem; + private System.Windows.Forms.MenuItem exitMenuItem; + private Aga.Controls.Tree.TreeColumn sensor; + private Aga.Controls.Tree.TreeColumn value; + private Aga.Controls.Tree.TreeColumn min; + private Aga.Controls.Tree.TreeColumn max; + private Aga.Controls.Tree.NodeControls.NodeIcon nodeImage; + private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxText; + private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxValue; + private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxMin; + private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxMax; + private SplitContainerAdv splitContainer; + private System.Windows.Forms.MenuItem viewMenuItem; + private System.Windows.Forms.MenuItem plotMenuItem; + private Aga.Controls.Tree.NodeControls.NodeCheckBox nodeCheckBox; + private System.Windows.Forms.MenuItem helpMenuItem; + private System.Windows.Forms.MenuItem aboutMenuItem; + private System.Windows.Forms.MenuItem saveReportMenuItem; + private System.Windows.Forms.MenuItem optionsMenuItem; + private System.Windows.Forms.MenuItem hddMenuItem; + private System.Windows.Forms.MenuItem minTrayMenuItem; + private System.Windows.Forms.MenuItem separatorMenuItem; + private System.Windows.Forms.ContextMenu treeContextMenu; + private System.Windows.Forms.MenuItem startMinMenuItem; + private System.Windows.Forms.MenuItem startupMenuItem; + private System.Windows.Forms.SaveFileDialog saveFileDialog; + private System.Windows.Forms.Timer timer; + private System.Windows.Forms.MenuItem hiddenMenuItem; + private System.Windows.Forms.MenuItem MenuItem1; + private System.Windows.Forms.MenuItem columnsMenuItem; + private System.Windows.Forms.MenuItem valueMenuItem; + private System.Windows.Forms.MenuItem minMenuItem; + private System.Windows.Forms.MenuItem maxMenuItem; + private System.Windows.Forms.MenuItem temperatureUnitsMenuItem; + private System.Windows.Forms.MenuItem webMenuItemSeparator; + private System.Windows.Forms.MenuItem celsiusMenuItem; + private System.Windows.Forms.MenuItem fahrenheitMenuItem; + private System.Windows.Forms.MenuItem MenuItem2; + private System.Windows.Forms.MenuItem resetMinMaxMenuItem; + private System.Windows.Forms.MenuItem MenuItem3; + private System.Windows.Forms.MenuItem gadgetMenuItem; + private System.Windows.Forms.MenuItem minCloseMenuItem; + private System.Windows.Forms.MenuItem resetMenuItem; + private System.Windows.Forms.MenuItem menuItem6; + private System.Windows.Forms.MenuItem plotLocationMenuItem; + private System.Windows.Forms.MenuItem plotWindowMenuItem; + private System.Windows.Forms.MenuItem plotBottomMenuItem; + private System.Windows.Forms.MenuItem plotRightMenuItem; + private System.Windows.Forms.MenuItem webMenuItem; + private System.Windows.Forms.MenuItem runWebServerMenuItem; + private System.Windows.Forms.MenuItem serverPortMenuItem; + private System.Windows.Forms.MenuItem menuItem5; + private System.Windows.Forms.MenuItem mainboardMenuItem; + private System.Windows.Forms.MenuItem cpuMenuItem; + private System.Windows.Forms.MenuItem gpuMenuItem; + private System.Windows.Forms.MenuItem fanControllerMenuItem; + private System.Windows.Forms.MenuItem ramMenuItem; + private System.Windows.Forms.MenuItem logSensorsMenuItem; + private System.Windows.Forms.MenuItem logSeparatorMenuItem; + private System.Windows.Forms.MenuItem loggingIntervalMenuItem; + private System.Windows.Forms.MenuItem log1sMenuItem; + private System.Windows.Forms.MenuItem log2sMenuItem; + private System.Windows.Forms.MenuItem log5sMenuItem; + private System.Windows.Forms.MenuItem log10sMenuItem; + private System.Windows.Forms.MenuItem log30sMenuItem; + private System.Windows.Forms.MenuItem log1minMenuItem; + private System.Windows.Forms.MenuItem log2minMenuItem; + private System.Windows.Forms.MenuItem log5minMenuItem; + private System.Windows.Forms.MenuItem log10minMenuItem; + private System.Windows.Forms.MenuItem log30minMenuItem; + private System.Windows.Forms.MenuItem log1hMenuItem; + private System.Windows.Forms.MenuItem log2hMenuItem; + private System.Windows.Forms.MenuItem log6hMenuItem; + private System.Windows.Forms.MenuItem nicMenuItem; + private System.Windows.Forms.MenuItem sensorValuesTimeWindowMenuItem; + private System.Windows.Forms.MenuItem timeWindow30sMenuItem; + private System.Windows.Forms.MenuItem timeWindow1minMenuItem; + private System.Windows.Forms.MenuItem timeWindow2minMenuItem; + private System.Windows.Forms.MenuItem timeWindow5minMenuItem; + private System.Windows.Forms.MenuItem timeWindow10minMenuItem; + private System.Windows.Forms.MenuItem timeWindow30minMenuItem; + private System.Windows.Forms.MenuItem timeWindow1hMenuItem; + private System.Windows.Forms.MenuItem timeWindow2hMenuItem; + private System.Windows.Forms.MenuItem timeWindow6hMenuItem; + private System.Windows.Forms.MenuItem timeWindow12hMenuItem; + private System.Windows.Forms.MenuItem timeWindow24hMenuItem; } - - #endregion - - private Aga.Controls.Tree.TreeViewAdv treeView; - private System.Windows.Forms.MainMenu mainMenu; - private System.Windows.Forms.MenuItem fileMenuItem; - private System.Windows.Forms.MenuItem exitMenuItem; - private Aga.Controls.Tree.TreeColumn sensor; - private Aga.Controls.Tree.TreeColumn value; - private Aga.Controls.Tree.TreeColumn min; - private Aga.Controls.Tree.TreeColumn max; - private Aga.Controls.Tree.NodeControls.NodeIcon nodeImage; - private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxText; - private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxValue; - private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxMin; - private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxMax; - private SplitContainerAdv splitContainer; - private System.Windows.Forms.MenuItem viewMenuItem; - private System.Windows.Forms.MenuItem plotMenuItem; - private Aga.Controls.Tree.NodeControls.NodeCheckBox nodeCheckBox; - private System.Windows.Forms.MenuItem helpMenuItem; - private System.Windows.Forms.MenuItem aboutMenuItem; - private System.Windows.Forms.MenuItem saveReportMenuItem; - private System.Windows.Forms.MenuItem optionsMenuItem; - private System.Windows.Forms.MenuItem hddMenuItem; - private System.Windows.Forms.MenuItem minTrayMenuItem; - private System.Windows.Forms.MenuItem separatorMenuItem; - private System.Windows.Forms.ContextMenu treeContextMenu; - private System.Windows.Forms.MenuItem startMinMenuItem; - private System.Windows.Forms.MenuItem startupMenuItem; - private System.Windows.Forms.SaveFileDialog saveFileDialog; - private System.Windows.Forms.Timer timer; - private System.Windows.Forms.MenuItem hiddenMenuItem; - private System.Windows.Forms.MenuItem MenuItem1; - private System.Windows.Forms.MenuItem columnsMenuItem; - private System.Windows.Forms.MenuItem valueMenuItem; - private System.Windows.Forms.MenuItem minMenuItem; - private System.Windows.Forms.MenuItem maxMenuItem; - private System.Windows.Forms.MenuItem temperatureUnitsMenuItem; - private System.Windows.Forms.MenuItem webMenuItemSeparator; - private System.Windows.Forms.MenuItem celsiusMenuItem; - private System.Windows.Forms.MenuItem fahrenheitMenuItem; - private System.Windows.Forms.MenuItem MenuItem2; - private System.Windows.Forms.MenuItem resetMinMaxMenuItem; - private System.Windows.Forms.MenuItem MenuItem3; - private System.Windows.Forms.MenuItem gadgetMenuItem; - private System.Windows.Forms.MenuItem minCloseMenuItem; - private System.Windows.Forms.MenuItem resetMenuItem; - private System.Windows.Forms.MenuItem menuItem6; - private System.Windows.Forms.MenuItem plotLocationMenuItem; - private System.Windows.Forms.MenuItem plotWindowMenuItem; - private System.Windows.Forms.MenuItem plotBottomMenuItem; - private System.Windows.Forms.MenuItem plotRightMenuItem; - private System.Windows.Forms.MenuItem webMenuItem; - private System.Windows.Forms.MenuItem runWebServerMenuItem; - private System.Windows.Forms.MenuItem serverPortMenuItem; - private System.Windows.Forms.MenuItem menuItem5; - private System.Windows.Forms.MenuItem mainboardMenuItem; - private System.Windows.Forms.MenuItem cpuMenuItem; - private System.Windows.Forms.MenuItem gpuMenuItem; - private System.Windows.Forms.MenuItem fanControllerMenuItem; - private System.Windows.Forms.MenuItem ramMenuItem; - private System.Windows.Forms.MenuItem logSensorsMenuItem; - private System.Windows.Forms.MenuItem logSeparatorMenuItem; - private System.Windows.Forms.MenuItem loggingIntervalMenuItem; - private System.Windows.Forms.MenuItem log1sMenuItem; - private System.Windows.Forms.MenuItem log2sMenuItem; - private System.Windows.Forms.MenuItem log5sMenuItem; - private System.Windows.Forms.MenuItem log10sMenuItem; - private System.Windows.Forms.MenuItem log30sMenuItem; - private System.Windows.Forms.MenuItem log1minMenuItem; - private System.Windows.Forms.MenuItem log2minMenuItem; - private System.Windows.Forms.MenuItem log5minMenuItem; - private System.Windows.Forms.MenuItem log10minMenuItem; - private System.Windows.Forms.MenuItem log30minMenuItem; - private System.Windows.Forms.MenuItem log1hMenuItem; - private System.Windows.Forms.MenuItem log2hMenuItem; - private System.Windows.Forms.MenuItem log6hMenuItem; - private System.Windows.Forms.MenuItem nicMenuItem; - private System.Windows.Forms.MenuItem sensorValuesTimeWindowMenuItem; - private System.Windows.Forms.MenuItem timeWindow30sMenuItem; - private System.Windows.Forms.MenuItem timeWindow1minMenuItem; - private System.Windows.Forms.MenuItem timeWindow2minMenuItem; - private System.Windows.Forms.MenuItem timeWindow5minMenuItem; - private System.Windows.Forms.MenuItem timeWindow10minMenuItem; - private System.Windows.Forms.MenuItem timeWindow30minMenuItem; - private System.Windows.Forms.MenuItem timeWindow1hMenuItem; - private System.Windows.Forms.MenuItem timeWindow2hMenuItem; - private System.Windows.Forms.MenuItem timeWindow6hMenuItem; - private System.Windows.Forms.MenuItem timeWindow12hMenuItem; - private System.Windows.Forms.MenuItem timeWindow24hMenuItem; - } } diff --git a/LibreHardwareMonitor/UI/ParameterForm.Designer.cs b/LibreHardwareMonitor/UI/ParameterForm.Designer.cs index 8728467..33cc566 100644 --- a/LibreHardwareMonitor/UI/ParameterForm.Designer.cs +++ b/LibreHardwareMonitor/UI/ParameterForm.Designer.cs @@ -1,200 +1,201 @@ -/* - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - - Copyright (C) 2009-2010 Michael Möller - -*/ +// Mozilla Public License 2.0 +// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. +// Copyright (C) LibreHardwareMonitor and Contributors +// All Rights Reserved -namespace LibreHardwareMonitor.UI { - partial class ParameterForm { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; +namespace LibreHardwareMonitor.UI +{ + partial class ParameterForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.okButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); - this.captionLabel = new System.Windows.Forms.Label(); - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Default = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.ValueColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bindingSource = new System.Windows.Forms.BindingSource(this.components); - this.descriptionLabel = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit(); - this.SuspendLayout(); - // - // okButton - // - this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.okButton.Location = new System.Drawing.Point(186, 213); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 2; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.OkButton_Click); - // - // cancelButton - // - this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(267, 213); - this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 3; - this.cancelButton.Text = "Cancel"; - this.cancelButton.UseVisualStyleBackColor = true; - // - // captionLabel - // - this.captionLabel.AutoSize = true; - this.captionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.captionLabel.Location = new System.Drawing.Point(12, 9); - this.captionLabel.Name = "captionLabel"; - this.captionLabel.Size = new System.Drawing.Size(80, 13); - this.captionLabel.TabIndex = 4; - this.captionLabel.Text = "captionLabel"; - // - // dataGridView - // - this.dataGridView.AllowUserToAddRows = false; - this.dataGridView.AllowUserToDeleteRows = false; - this.dataGridView.AllowUserToResizeRows = false; - this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dataGridView.AutoGenerateColumns = false; - this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; - this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + this.okButton = new System.Windows.Forms.Button(); + this.cancelButton = new System.Windows.Forms.Button(); + this.captionLabel = new System.Windows.Forms.Label(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Default = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.ValueColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bindingSource = new System.Windows.Forms.BindingSource(this.components); + this.descriptionLabel = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit(); + this.SuspendLayout(); + // + // okButton + // + this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.Location = new System.Drawing.Point(186, 213); + this.okButton.Name = "okButton"; + this.okButton.Size = new System.Drawing.Size(75, 23); + this.okButton.TabIndex = 2; + this.okButton.Text = "OK"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.OkButton_Click); + // + // cancelButton + // + this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.Location = new System.Drawing.Point(267, 213); + this.cancelButton.Name = "cancelButton"; + this.cancelButton.Size = new System.Drawing.Size(75, 23); + this.cancelButton.TabIndex = 3; + this.cancelButton.Text = "Cancel"; + this.cancelButton.UseVisualStyleBackColor = true; + // + // captionLabel + // + this.captionLabel.AutoSize = true; + this.captionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.captionLabel.Location = new System.Drawing.Point(12, 9); + this.captionLabel.Name = "captionLabel"; + this.captionLabel.Size = new System.Drawing.Size(80, 13); + this.captionLabel.TabIndex = 4; + this.captionLabel.Text = "captionLabel"; + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.AllowUserToResizeRows = false; + this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridView.AutoGenerateColumns = false; + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.NameColumn, this.Default, this.ValueColumn}); - this.dataGridView.DataSource = this.bindingSource; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridView.Location = new System.Drawing.Point(15, 30); - this.dataGridView.MultiSelect = false; - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowHeadersVisible = false; - this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView.ShowRowErrors = false; - this.dataGridView.Size = new System.Drawing.Size(327, 121); - this.dataGridView.TabIndex = 0; - this.dataGridView.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_RowEnter); - this.dataGridView.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.DataGridView_CellValidating); - this.dataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellEndEdit); - this.dataGridView.CurrentCellDirtyStateChanged += new System.EventHandler(this.DataGridView_CurrentCellDirtyStateChanged); - // - // NameColumn - // - this.NameColumn.DataPropertyName = "Name"; - this.NameColumn.HeaderText = "Name"; - this.NameColumn.Name = "NameColumn"; - this.NameColumn.ReadOnly = true; - this.NameColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // Default - // - this.Default.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; - this.Default.DataPropertyName = "Default"; - this.Default.HeaderText = "Default"; - this.Default.Name = "Default"; - this.Default.Width = 47; - // - // ValueColumn - // - this.ValueColumn.DataPropertyName = "Value"; - this.ValueColumn.HeaderText = "Value"; - this.ValueColumn.Name = "ValueColumn"; - this.ValueColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // bindingSource - // - this.bindingSource.AllowNew = false; - // - // descriptionLabel - // - this.descriptionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.descriptionLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.descriptionLabel.Location = new System.Drawing.Point(15, 154); - this.descriptionLabel.Name = "descriptionLabel"; - this.descriptionLabel.Padding = new System.Windows.Forms.Padding(2); - this.descriptionLabel.Size = new System.Drawing.Size(327, 50); - this.descriptionLabel.TabIndex = 6; - this.descriptionLabel.Text = "descriptionLabel"; - // - // ParameterForm - // - this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(354, 248); - this.Controls.Add(this.descriptionLabel); - this.Controls.Add(this.dataGridView); - this.Controls.Add(this.captionLabel); - this.Controls.Add(this.cancelButton); - this.Controls.Add(this.okButton); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "ParameterForm"; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Parameters"; - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.dataGridView.DataSource = this.bindingSource; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView.DefaultCellStyle = dataGridViewCellStyle2; + this.dataGridView.Location = new System.Drawing.Point(15, 30); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.ShowRowErrors = false; + this.dataGridView.Size = new System.Drawing.Size(327, 121); + this.dataGridView.TabIndex = 0; + this.dataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellEndEdit); + this.dataGridView.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.DataGridView_CellValidating); + this.dataGridView.CurrentCellDirtyStateChanged += new System.EventHandler(this.DataGridView_CurrentCellDirtyStateChanged); + this.dataGridView.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_RowEnter); + // + // NameColumn + // + this.NameColumn.DataPropertyName = "Name"; + this.NameColumn.HeaderText = "Name"; + this.NameColumn.Name = "NameColumn"; + this.NameColumn.ReadOnly = true; + this.NameColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // Default + // + this.Default.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; + this.Default.DataPropertyName = "Default"; + this.Default.HeaderText = "Default"; + this.Default.Name = "Default"; + this.Default.Width = 47; + // + // ValueColumn + // + this.ValueColumn.DataPropertyName = "Value"; + this.ValueColumn.HeaderText = "Value"; + this.ValueColumn.Name = "ValueColumn"; + this.ValueColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // bindingSource + // + this.bindingSource.AllowNew = false; + // + // descriptionLabel + // + this.descriptionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.descriptionLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.descriptionLabel.Location = new System.Drawing.Point(15, 154); + this.descriptionLabel.Name = "descriptionLabel"; + this.descriptionLabel.Padding = new System.Windows.Forms.Padding(2); + this.descriptionLabel.Size = new System.Drawing.Size(327, 50); + this.descriptionLabel.TabIndex = 6; + this.descriptionLabel.Text = "descriptionLabel"; + // + // ParameterForm + // + this.AcceptButton = this.okButton; + this.AccessibleName = ""; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(354, 248); + this.Controls.Add(this.descriptionLabel); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.captionLabel); + this.Controls.Add(this.cancelButton); + this.Controls.Add(this.okButton); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ParameterForm"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Parameters"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button okButton; + private System.Windows.Forms.Button cancelButton; + public System.Windows.Forms.Label captionLabel; + private System.Windows.Forms.DataGridView dataGridView; + private System.Windows.Forms.Label descriptionLabel; + private System.Windows.Forms.BindingSource bindingSource; + private System.Windows.Forms.DataGridViewTextBoxColumn NameColumn; + private System.Windows.Forms.DataGridViewCheckBoxColumn Default; + private System.Windows.Forms.DataGridViewTextBoxColumn ValueColumn; } - - #endregion - - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.Button cancelButton; - public System.Windows.Forms.Label captionLabel; - private System.Windows.Forms.DataGridView dataGridView; - private System.Windows.Forms.Label descriptionLabel; - private System.Windows.Forms.BindingSource bindingSource; - private System.Windows.Forms.DataGridViewTextBoxColumn NameColumn; - private System.Windows.Forms.DataGridViewCheckBoxColumn Default; - private System.Windows.Forms.DataGridViewTextBoxColumn ValueColumn; - - } -} \ No newline at end of file +} diff --git a/LibreHardwareMonitor/UI/ParameterForm.cs b/LibreHardwareMonitor/UI/ParameterForm.cs index 7a32a8b..4bfa3bf 100644 --- a/LibreHardwareMonitor/UI/ParameterForm.cs +++ b/LibreHardwareMonitor/UI/ParameterForm.cs @@ -33,7 +33,9 @@ namespace LibreHardwareMonitor.UI _parameterRows = new BindingList(); foreach (IParameter parameter in _parameters) + { _parameterRows.Add(new ParameterRow(parameter)); + } bindingSource.DataSource = _parameterRows; } @@ -42,9 +44,17 @@ namespace LibreHardwareMonitor.UI private class ParameterRow : INotifyPropertyChanged { public readonly IParameter Parameter; + private float _value = float.NaN; + private bool _default = true; public event PropertyChangedEventHandler PropertyChanged; + private void NotifyPropertyChanged(String propertyName) + { + if (PropertyChanged != null) + PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + public ParameterRow(IParameter parameter) { Parameter = parameter; @@ -52,9 +62,35 @@ namespace LibreHardwareMonitor.UI Default = parameter.IsDefault; } - public float Value { get; } + public string Name + { + get { return Parameter.Name; } + } - public bool Default { get; } + public float Value + { + get { return _value; } + set + { + _default = false; + _value = value; + NotifyPropertyChanged(nameof(Default)); + NotifyPropertyChanged(nameof(Value)); + } + } + + public bool Default + { + get { return _default; } + set + { + _default = value; + if (_default) + _value = Parameter.DefaultValue; + NotifyPropertyChanged(nameof(Default)); + NotifyPropertyChanged(nameof(Value)); + } + } } private void DataGridView_RowEnter(object sender, DataGridViewCellEventArgs e) diff --git a/LibreHardwareMonitor/UI/PortForm.Designer.cs b/LibreHardwareMonitor/UI/PortForm.Designer.cs index 136452b..3f5f517 100644 --- a/LibreHardwareMonitor/UI/PortForm.Designer.cs +++ b/LibreHardwareMonitor/UI/PortForm.Designer.cs @@ -1,180 +1,190 @@ -namespace LibreHardwareMonitor.UI { - partial class PortForm { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; +// Mozilla Public License 2.0 +// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. +// Copyright (C) LibreHardwareMonitor and Contributors +// All Rights Reserved - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } +namespace LibreHardwareMonitor.UI +{ + partial class PortForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - #region Windows Form Designer generated code + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { - this.portOKButton = new System.Windows.Forms.Button(); - this.portCancelButton = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.webServerLinkLabel = new System.Windows.Forms.LinkLabel(); - this.portNumericUpDn = new System.Windows.Forms.NumericUpDown(); - this.label5 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.portNumericUpDn)).BeginInit(); - this.SuspendLayout(); - // - // portOKButton - // - this.portOKButton.Location = new System.Drawing.Point(244, 137); - this.portOKButton.Name = "portOKButton"; - this.portOKButton.Size = new System.Drawing.Size(75, 23); - this.portOKButton.TabIndex = 0; - this.portOKButton.Text = "OK"; - this.portOKButton.UseVisualStyleBackColor = true; - this.portOKButton.Click += new System.EventHandler(this.PortOKButton_Click); - // - // portCancelButton - // - this.portCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.portCancelButton.Location = new System.Drawing.Point(162, 137); - this.portCancelButton.Name = "portCancelButton"; - this.portCancelButton.Size = new System.Drawing.Size(75, 23); - this.portCancelButton.TabIndex = 1; - this.portCancelButton.Text = "Cancel"; - this.portCancelButton.UseVisualStyleBackColor = true; - this.portCancelButton.Click += new System.EventHandler(this.PortCancelButton_Click); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(13, 106); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(377, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Note: You will need to open the port in firewall settings of the operating system" + - "."; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(13, 9); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(193, 13); - this.label2.TabIndex = 4; - this.label2.Text = "Port number for the remote web server:"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(13, 39); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(443, 13); - this.label3.TabIndex = 5; - this.label3.Text = "If the web server is running then it will need to be restarted for the port chang" + - "e to take effect."; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(13, 62); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(262, 13); - this.label4.TabIndex = 6; - this.label4.Text = "The web server will be accessible from the browser at "; - // - // webServerLinkLabel - // - this.webServerLinkLabel.AutoSize = true; - this.webServerLinkLabel.Location = new System.Drawing.Point(269, 62); - this.webServerLinkLabel.Name = "webServerLinkLabel"; - this.webServerLinkLabel.Size = new System.Drawing.Size(55, 13); - this.webServerLinkLabel.TabIndex = 7; - this.webServerLinkLabel.TabStop = true; - this.webServerLinkLabel.Text = "linkLabel1"; - this.webServerLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.WebServerLinkLabel_LinkClicked); - // - // portNumericUpDn - // - this.portNumericUpDn.Location = new System.Drawing.Point(208, 7); - this.portNumericUpDn.Maximum = new decimal(new int[] { + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.portOKButton = new System.Windows.Forms.Button(); + this.portCancelButton = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.webServerLinkLabel = new System.Windows.Forms.LinkLabel(); + this.portNumericUpDn = new System.Windows.Forms.NumericUpDown(); + this.label5 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.portNumericUpDn)).BeginInit(); + this.SuspendLayout(); + // + // portOKButton + // + this.portOKButton.Location = new System.Drawing.Point(244, 137); + this.portOKButton.Name = "portOKButton"; + this.portOKButton.Size = new System.Drawing.Size(75, 23); + this.portOKButton.TabIndex = 0; + this.portOKButton.Text = "OK"; + this.portOKButton.UseVisualStyleBackColor = true; + this.portOKButton.Click += new System.EventHandler(this.PortOKButton_Click); + // + // portCancelButton + // + this.portCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.portCancelButton.Location = new System.Drawing.Point(162, 137); + this.portCancelButton.Name = "portCancelButton"; + this.portCancelButton.Size = new System.Drawing.Size(75, 23); + this.portCancelButton.TabIndex = 1; + this.portCancelButton.Text = "Cancel"; + this.portCancelButton.UseVisualStyleBackColor = true; + this.portCancelButton.Click += new System.EventHandler(this.PortCancelButton_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(13, 106); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(377, 13); + this.label1.TabIndex = 3; + this.label1.Text = "Note: You will need to open the port in firewall settings of the operating system" + + "."; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(13, 9); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(193, 13); + this.label2.TabIndex = 4; + this.label2.Text = "Port number for the remote web server:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(13, 39); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(443, 13); + this.label3.TabIndex = 5; + this.label3.Text = "If the web server is running then it will need to be restarted for the port chang" + + "e to take effect."; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(13, 62); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(262, 13); + this.label4.TabIndex = 6; + this.label4.Text = "The web server will be accessible from the browser at "; + // + // webServerLinkLabel + // + this.webServerLinkLabel.AutoSize = true; + this.webServerLinkLabel.Location = new System.Drawing.Point(269, 62); + this.webServerLinkLabel.Name = "webServerLinkLabel"; + this.webServerLinkLabel.Size = new System.Drawing.Size(55, 13); + this.webServerLinkLabel.TabIndex = 7; + this.webServerLinkLabel.TabStop = true; + this.webServerLinkLabel.Text = "linkLabel1"; + this.webServerLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.WebServerLinkLabel_LinkClicked); + // + // portNumericUpDn + // + this.portNumericUpDn.Location = new System.Drawing.Point(208, 7); + this.portNumericUpDn.Maximum = new decimal(new int[] { 20000, 0, 0, 0}); - this.portNumericUpDn.Minimum = new decimal(new int[] { + this.portNumericUpDn.Minimum = new decimal(new int[] { 8080, 0, 0, 0}); - this.portNumericUpDn.Name = "portNumericUpDn"; - this.portNumericUpDn.Size = new System.Drawing.Size(75, 20); - this.portNumericUpDn.TabIndex = 8; - this.portNumericUpDn.Value = new decimal(new int[] { + this.portNumericUpDn.Name = "portNumericUpDn"; + this.portNumericUpDn.Size = new System.Drawing.Size(75, 20); + this.portNumericUpDn.TabIndex = 8; + this.portNumericUpDn.Value = new decimal(new int[] { 8080, 0, 0, 0}); - this.portNumericUpDn.ValueChanged += new System.EventHandler(this.PortNumericUpDn_ValueChanged); - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(13, 84); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(304, 13); - this.label5.TabIndex = 9; - this.label5.Text = "You will have to start the server by clicking Run from the menu."; - // - // PortForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.portCancelButton; - this.ClientSize = new System.Drawing.Size(466, 170); - this.Controls.Add(this.label5); - this.Controls.Add(this.portNumericUpDn); - this.Controls.Add(this.webServerLinkLabel); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.portCancelButton); - this.Controls.Add(this.portOKButton); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "PortForm"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Set Port"; - this.Load += new System.EventHandler(this.PortForm_Load); - ((System.ComponentModel.ISupportInitialize)(this.portNumericUpDn)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.portNumericUpDn.ValueChanged += new System.EventHandler(this.PortNumericUpDn_ValueChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(13, 84); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(304, 13); + this.label5.TabIndex = 9; + this.label5.Text = "You will have to start the server by clicking Run from the menu."; + // + // PortForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.portCancelButton; + this.ClientSize = new System.Drawing.Size(466, 170); + this.Controls.Add(this.label5); + this.Controls.Add(this.portNumericUpDn); + this.Controls.Add(this.webServerLinkLabel); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.portCancelButton); + this.Controls.Add(this.portOKButton); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "PortForm"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Set Port"; + this.Load += new System.EventHandler(this.PortForm_Load); + ((System.ComponentModel.ISupportInitialize)(this.portNumericUpDn)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + } + + #endregion + + private System.Windows.Forms.Button portOKButton; + private System.Windows.Forms.Button portCancelButton; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.LinkLabel webServerLinkLabel; + private System.Windows.Forms.NumericUpDown portNumericUpDn; + private System.Windows.Forms.Label label5; } - - #endregion - - private System.Windows.Forms.Button portOKButton; - private System.Windows.Forms.Button portCancelButton; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.LinkLabel webServerLinkLabel; - private System.Windows.Forms.NumericUpDown portNumericUpDn; - private System.Windows.Forms.Label label5; - } -} \ No newline at end of file +} diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs index d05f3a9..64e5f96 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs @@ -87,6 +87,14 @@ namespace LibreHardwareMonitor.Hardware.Motherboard return Model.AB350M_PRO4; case "AB350M": return Model.AB350M; + case "B450 Steel Legend": + return Model.B450_STEEL_LEGEND; + case "B450M Steel Legend": + return Model.B450M_STEEL_LEGEND; + case "B450 Pro4": + return Model.B450_PRO4; + case "B450M Pro4": + return Model.B450M_PRO4; case "Fatal1ty AB350 Gaming K4": return Model.Fatal1ty_AB350_Gaming_K4; case "AB350M-HDV": diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs index 7010645..0dc3c7b 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs @@ -26,6 +26,10 @@ namespace LibreHardwareMonitor.Hardware.Motherboard AB350M_HDV, PHANTOM_GAMING_6, A320M_HDV, + B450_STEEL_LEGEND, + B450M_STEEL_LEGEND, + B450_PRO4, + B450M_PRO4, // ASUS Crosshair_III_Formula, diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index 221f4fa..ce61dbc 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -483,7 +483,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard break; } - + break; case Manufacturer.DFI: @@ -1472,15 +1472,19 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Model.AB350M: case Model.Fatal1ty_AB350_Gaming_K4: case Model.AB350M_HDV: - v.Add(new Voltage("1 Vcore", 0, 10, 10)); + case Model.B450_STEEL_LEGEND: + case Model.B450M_STEEL_LEGEND: + case Model.B450_PRO4: + case Model.B450M_PRO4: + v.Add(new Voltage("Vcore", 0, 10, 10)); //v.Add(new Voltage("#Unused", 1, 0, 1, 0, true)); - v.Add(new Voltage("3 AVCC", 2, 10, 10)); - v.Add(new Voltage("4 3VCC", 3, 10, 10)); - v.Add(new Voltage("5 +12V", 4, 28, 5)); - //v.Add(new Voltage("#Unused 5", 5, 0, 1, 0, true)); + v.Add(new Voltage("AVCC", 2, 10, 10)); + v.Add(new Voltage("3VCC", 3, 10, 10)); + v.Add(new Voltage("+12V", 4, 28, 5)); + v.Add(new Voltage("Vcore Refin", 5, 0, 1, 0)); //v.Add(new Voltage("#Unused 6", 6, 0, 1, 0, true)); v.Add(new Voltage("3VSB", 7, 10, 10)); - v.Add(new Voltage("9 VBat", 8, 34, 34)); + v.Add(new Voltage("VBat", 8, 34, 34)); //v.Add(new Voltage("#Unused 9", 9, 0, 1, 0, true)); //v.Add(new Voltage("#Unused 10", 10, 0, 1, 0, true)); v.Add(new Voltage("Chipset 1.05V", 11, 0, 1)); @@ -1494,7 +1498,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("AUX", 3)); t.Add(new Temperature("VRM", 4)); t.Add(new Temperature("AUXTIN2", 5)); - t.Add(new Temperature("Temperature #6", 6)); + //t.Add(new Temperature("Temperature #6", 6)); for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -2122,7 +2126,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard public Voltage(string name, int index, bool hidden = false) : this(name, index, 0, 1, 0, hidden) { } - + public Voltage(string name, int index, float ri, float rf, float vf = 0, bool hidden = false) { Name = name;