JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed Issue 69.

Browse Source
This commit is contained in:
Michael Möller
2010-06-06 11:07:57 +00:00
parent c641a6a2fc
commit dd67a0aa5c
12 changed files with 27 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GUI/MainForm.Designer.cs
Generated
+5 -39
View File
@@ -67,14 +67,12 @@ namespace OpenHardwareMonitor.GUI {
this.value = new Aga.Controls.Tree.TreeColumn();
this.min = new Aga.Controls.Tree.TreeColumn();
this.max = new Aga.Controls.Tree.TreeColumn();
this.limit = new Aga.Controls.Tree.TreeColumn();
this.nodeImage = new Aga.Controls.Tree.NodeControls.NodeIcon();
this.nodeCheckBox = new Aga.Controls.Tree.NodeControls.NodeCheckBox();
this.nodeTextBoxText = new Aga.Controls.Tree.NodeControls.NodeTextBox();
this.nodeTextBoxValue = new Aga.Controls.Tree.NodeControls.NodeTextBox();
this.nodeTextBoxMin = new Aga.Controls.Tree.NodeControls.NodeTextBox();
this.nodeTextBoxMax = new Aga.Controls.Tree.NodeControls.NodeTextBox();
this.nodeTextBoxLimit = new Aga.Controls.Tree.NodeControls.NodeTextBox();
this.menuStrip = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -87,7 +85,6 @@ namespace OpenHardwareMonitor.GUI {
this.valueMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.minMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.maxMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.limitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.startMinMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.minTrayMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -118,7 +115,6 @@ namespace OpenHardwareMonitor.GUI {
this.treeView.Columns.Add(this.value);
this.treeView.Columns.Add(this.min);
this.treeView.Columns.Add(this.max);
this.treeView.Columns.Add(this.limit);
this.treeView.DefaultToolTipProvider = null;
this.treeView.Dock = System.Windows.Forms.DockStyle.Fill;
this.treeView.DragDropMarkColor = System.Drawing.Color.Black;
@@ -134,7 +130,6 @@ namespace OpenHardwareMonitor.GUI {
this.treeView.NodeControls.Add(this.nodeTextBoxValue);
this.treeView.NodeControls.Add(this.nodeTextBoxMin);
this.treeView.NodeControls.Add(this.nodeTextBoxMax);
this.treeView.NodeControls.Add(this.nodeTextBoxLimit);
this.treeView.RowHeight = 18;
this.treeView.SelectedNode = null;
this.treeView.Size = new System.Drawing.Size(410, 488);
@@ -172,13 +167,6 @@ namespace OpenHardwareMonitor.GUI {
this.max.TooltipText = null;
this.max.Width = 100;
//
// limit
//
this.limit.Header = "Limit";
this.limit.SortOrder = System.Windows.Forms.SortOrder.None;
this.limit.TooltipText = null;
this.limit.Width = 100;
//
// nodeImage
//
this.nodeImage.DataPropertyName = "Image";
@@ -222,14 +210,6 @@ namespace OpenHardwareMonitor.GUI {
this.nodeTextBoxMax.LeftMargin = 3;
this.nodeTextBoxMax.ParentColumn = this.max;
//
// nodeTextBoxLimit
//
this.nodeTextBoxLimit.DataPropertyName = "Limit";
this.nodeTextBoxLimit.EditEnabled = true;
this.nodeTextBoxLimit.IncrementalSearchEnabled = true;
this.nodeTextBoxLimit.LeftMargin = 3;
this.nodeTextBoxLimit.ParentColumn = this.limit;
//
// menuStrip
//
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -305,8 +285,7 @@ namespace OpenHardwareMonitor.GUI {
this.columnsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.valueMenuItem,
this.minMenuItem,
this.maxMenuItem,
this.limitMenuItem});
this.maxMenuItem});
this.columnsToolStripMenuItem.Name = "columnsToolStripMenuItem";
this.columnsToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.columnsToolStripMenuItem.Text = "Columns";
@@ -317,7 +296,7 @@ namespace OpenHardwareMonitor.GUI {
this.valueMenuItem.CheckOnClick = true;
this.valueMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.valueMenuItem.Name = "valueMenuItem";
this.valueMenuItem.Size = new System.Drawing.Size(103, 22);
this.valueMenuItem.Size = new System.Drawing.Size(152, 22);
this.valueMenuItem.Text = "Value";
this.valueMenuItem.CheckedChanged += new System.EventHandler(this.valueMenuItem_CheckedChanged);
//
@@ -327,7 +306,7 @@ namespace OpenHardwareMonitor.GUI {
this.minMenuItem.CheckOnClick = true;
this.minMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.minMenuItem.Name = "minMenuItem";
this.minMenuItem.Size = new System.Drawing.Size(103, 22);
this.minMenuItem.Size = new System.Drawing.Size(152, 22);
this.minMenuItem.Text = "Min";
this.minMenuItem.CheckedChanged += new System.EventHandler(this.minMenuItem_CheckedChanged);
//
@@ -337,20 +316,10 @@ namespace OpenHardwareMonitor.GUI {
this.maxMenuItem.CheckOnClick = true;
this.maxMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.maxMenuItem.Name = "maxMenuItem";
this.maxMenuItem.Size = new System.Drawing.Size(103, 22);
this.maxMenuItem.Size = new System.Drawing.Size(152, 22);
this.maxMenuItem.Text = "Max";
this.maxMenuItem.CheckedChanged += new System.EventHandler(this.maxMenuItem_CheckedChanged);
//
// limitMenuItem
//
this.limitMenuItem.Checked = true;
this.limitMenuItem.CheckOnClick = true;
this.limitMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.limitMenuItem.Name = "limitMenuItem";
this.limitMenuItem.Size = new System.Drawing.Size(103, 22);
this.limitMenuItem.Text = "Limit";
this.limitMenuItem.CheckedChanged += new System.EventHandler(this.limitMenuItem_CheckedChanged);
//
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -476,7 +445,7 @@ namespace OpenHardwareMonitor.GUI {
// sensorContextMenuStrip
//
this.sensorContextMenuStrip.Name = "sensorContextMenuStrip";
this.sensorContextMenuStrip.Size = new System.Drawing.Size(153, 26);
this.sensorContextMenuStrip.Size = new System.Drawing.Size(61, 4);
//
// saveFileDialog
//
@@ -536,8 +505,6 @@ namespace OpenHardwareMonitor.GUI {
private Aga.Controls.Tree.NodeControls.NodeCheckBox nodeCheckBox;
private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
private Aga.Controls.Tree.TreeColumn limit;
private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBoxLimit;
private System.Windows.Forms.ToolStripMenuItem saveReportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem hddMenuItem;
@@ -554,7 +521,6 @@ namespace OpenHardwareMonitor.GUI {
private System.Windows.Forms.ToolStripMenuItem valueMenuItem;
private System.Windows.Forms.ToolStripMenuItem minMenuItem;
private System.Windows.Forms.ToolStripMenuItem maxMenuItem;
private System.Windows.Forms.ToolStripMenuItem limitMenuItem;
private System.Windows.Forms.ToolStripMenuItem temperatureUnitsToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
private System.Windows.Forms.ToolStripMenuItem celciusToolStripMenuItem;
GUI/MainForm.cs
-13
View File
@@ -73,7 +73,6 @@ namespace OpenHardwareMonitor.GUI {
nodeTextBoxValue.DrawText += nodeTextBoxText_DrawText;
nodeTextBoxMin.DrawText += nodeTextBoxText_DrawText;
nodeTextBoxMax.DrawText += nodeTextBoxText_DrawText;
nodeTextBoxLimit.DrawText += nodeTextBoxLimit_DrawText;
if (Utilities.Config.Contains("mainForm.Location.X")) {
int x = Utilities.Config.Get("mainForm.Location.X", Location.X);
@@ -131,7 +130,6 @@ namespace OpenHardwareMonitor.GUI {
valueMenuItem.Checked = Config.Get(valueMenuItem.Name, true);
minMenuItem.Checked = Config.Get(minMenuItem.Name, false);
maxMenuItem.Checked = Config.Get(maxMenuItem.Name, true);
limitMenuItem.Checked = Config.Get(limitMenuItem.Name, false);
startMinMenuItem.Checked = Config.Get(startMinMenuItem.Name, false);
minTrayMenuItem.Checked = Config.Get(minTrayMenuItem.Name, true);
@@ -193,12 +191,6 @@ namespace OpenHardwareMonitor.GUI {
root.Nodes.Remove(node);
}
private void nodeTextBoxLimit_DrawText(object sender, DrawEventArgs e) {
SensorNode sensorNode = e.Node.Tag as SensorNode;
if (sensorNode != null)
e.Text = sensorNode.ValueToString(sensorNode.Sensor.Limit);
}
private void nodeTextBoxText_DrawText(object sender, DrawEventArgs e) {
Node node = e.Node.Tag as Node;
if (node != null) {
@@ -262,7 +254,6 @@ namespace OpenHardwareMonitor.GUI {
Config.Set(valueMenuItem.Name, valueMenuItem.Checked);
Config.Set(minMenuItem.Name, minMenuItem.Checked);
Config.Set(maxMenuItem.Name, maxMenuItem.Checked);
Config.Set(limitMenuItem.Name, limitMenuItem.Checked);
Config.Set(startMinMenuItem.Name, startMinMenuItem.Checked);
Config.Set(minTrayMenuItem.Name, minTrayMenuItem.Checked);
@@ -443,10 +434,6 @@ namespace OpenHardwareMonitor.GUI {
treeView.Columns[3].IsVisible = maxMenuItem.Checked;
}
private void limitMenuItem_CheckedChanged(object sender, EventArgs e) {
treeView.Columns[4].IsVisible = limitMenuItem.Checked;
}
private void celciusToolStripMenuItem_Click(object sender, EventArgs e) {
celciusToolStripMenuItem.Checked = true;
fahrenheitToolStripMenuItem.Checked = false;
GUI/SensorNode.cs
-12
View File
@@ -111,18 +111,6 @@ namespace OpenHardwareMonitor.GUI {
get { return ValueToString(sensor.Max); }
}
public String Limit {
get {
return sensor.Limit.ToString();
}
set {
if (value != "")
sensor.Limit = float.Parse(value);
else
sensor.Limit = null;
}
}
public override bool Equals(System.Object obj) {
if (obj == null)
return false;