mirror of
https://github.com/openhardwaremonitor/openhardwaremonitor
synced 2025-08-29 13:28:04 +00:00
Added some GUI improvements: Better handling of the row selection, minimal row spacing of 18 pixel (to get nice dotted lines) and 3 decimal digits for voltages. Also changed the tree view font rendering to get better quality without ClearType.
This commit is contained in:
Michael Möller
parent
0fb52a4723
commit
58fcb67dcd
31
GUI/MainForm.Designer.cs
generated
31
GUI/MainForm.Designer.cs
generated
@ -77,6 +77,8 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.saveReportMenuItem = new System.Windows.Forms.MenuItem();
|
||||
this.sumbitReportMenuItem = new System.Windows.Forms.MenuItem();
|
||||
this.MenuItem2 = new System.Windows.Forms.MenuItem();
|
||||
this.resetMenuItem = new System.Windows.Forms.MenuItem();
|
||||
this.menuItem6 = new System.Windows.Forms.MenuItem();
|
||||
this.exitMenuItem = new System.Windows.Forms.MenuItem();
|
||||
this.viewMenuItem = new System.Windows.Forms.MenuItem();
|
||||
this.resetMinMaxMenuItem = new System.Windows.Forms.MenuItem();
|
||||
@ -108,8 +110,6 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.splitContainer = new OpenHardwareMonitor.GUI.SplitContainerAdv();
|
||||
this.treeView = new Aga.Controls.Tree.TreeViewAdv();
|
||||
this.plotPanel = new OpenHardwareMonitor.GUI.PlotPanel();
|
||||
this.resetMenuItem = new System.Windows.Forms.MenuItem();
|
||||
this.menuItem6 = new System.Windows.Forms.MenuItem();
|
||||
this.splitContainer.Panel1.SuspendLayout();
|
||||
this.splitContainer.Panel2.SuspendLayout();
|
||||
this.splitContainer.SuspendLayout();
|
||||
@ -165,6 +165,7 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.nodeTextBoxText.LeftMargin = 3;
|
||||
this.nodeTextBoxText.ParentColumn = this.sensor;
|
||||
this.nodeTextBoxText.Trimming = System.Drawing.StringTrimming.EllipsisCharacter;
|
||||
this.nodeTextBoxText.UseCompatibleTextRendering = true;
|
||||
//
|
||||
// nodeTextBoxValue
|
||||
//
|
||||
@ -173,6 +174,7 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.nodeTextBoxValue.LeftMargin = 3;
|
||||
this.nodeTextBoxValue.ParentColumn = this.value;
|
||||
this.nodeTextBoxValue.Trimming = System.Drawing.StringTrimming.EllipsisCharacter;
|
||||
this.nodeTextBoxValue.UseCompatibleTextRendering = true;
|
||||
//
|
||||
// nodeTextBoxMin
|
||||
//
|
||||
@ -181,6 +183,7 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.nodeTextBoxMin.LeftMargin = 3;
|
||||
this.nodeTextBoxMin.ParentColumn = this.min;
|
||||
this.nodeTextBoxMin.Trimming = System.Drawing.StringTrimming.EllipsisCharacter;
|
||||
this.nodeTextBoxMin.UseCompatibleTextRendering = true;
|
||||
//
|
||||
// nodeTextBoxMax
|
||||
//
|
||||
@ -189,6 +192,7 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.nodeTextBoxMax.LeftMargin = 3;
|
||||
this.nodeTextBoxMax.ParentColumn = this.max;
|
||||
this.nodeTextBoxMax.Trimming = System.Drawing.StringTrimming.EllipsisCharacter;
|
||||
this.nodeTextBoxMax.UseCompatibleTextRendering = true;
|
||||
//
|
||||
// mainMenu
|
||||
//
|
||||
@ -227,6 +231,17 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.MenuItem2.Index = 2;
|
||||
this.MenuItem2.Text = "-";
|
||||
//
|
||||
// resetMenuItem
|
||||
//
|
||||
this.resetMenuItem.Index = 3;
|
||||
this.resetMenuItem.Text = "Reset";
|
||||
this.resetMenuItem.Click += new System.EventHandler(this.resetClick);
|
||||
//
|
||||
// menuItem6
|
||||
//
|
||||
this.menuItem6.Index = 4;
|
||||
this.menuItem6.Text = "-";
|
||||
//
|
||||
// exitMenuItem
|
||||
//
|
||||
this.exitMenuItem.Index = 5;
|
||||
@ -448,6 +463,7 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.treeView.UseColumns = true;
|
||||
this.treeView.NodeMouseDoubleClick += new System.EventHandler<Aga.Controls.Tree.TreeNodeAdvMouseEventArgs>(this.treeView_NodeMouseDoubleClick);
|
||||
this.treeView.Click += new System.EventHandler(this.treeView_Click);
|
||||
this.treeView.MouseMove += new System.Windows.Forms.MouseEventHandler(this.treeView_MouseMove);
|
||||
//
|
||||
// plotPanel
|
||||
//
|
||||
@ -457,17 +473,6 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.plotPanel.Size = new System.Drawing.Size(386, 124);
|
||||
this.plotPanel.TabIndex = 0;
|
||||
//
|
||||
// resetMenuItem
|
||||
//
|
||||
this.resetMenuItem.Index = 3;
|
||||
this.resetMenuItem.Text = "Reset";
|
||||
this.resetMenuItem.Click += new System.EventHandler(this.resetClick);
|
||||
//
|
||||
// menuItem6
|
||||
//
|
||||
this.menuItem6.Index = 4;
|
||||
this.menuItem6.Text = "-";
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
|
||||
@ -120,7 +120,7 @@ namespace OpenHardwareMonitor.GUI {
|
||||
|
||||
int p = (int)Environment.OSVersion.Platform;
|
||||
if ((p == 4) || (p == 128)) { // Unix
|
||||
treeView.RowHeight = Math.Max(treeView.RowHeight, 17);
|
||||
treeView.RowHeight = Math.Max(treeView.RowHeight, 18);
|
||||
splitContainer.BorderStyle = BorderStyle.None;
|
||||
splitContainer.Border3DStyle = Border3DStyle.Adjust;
|
||||
splitContainer.SplitterWidth = 4;
|
||||
@ -131,7 +131,7 @@ namespace OpenHardwareMonitor.GUI {
|
||||
minTrayMenuItem.Visible = false;
|
||||
startMinMenuItem.Visible = false;
|
||||
} else { // Windows
|
||||
treeView.RowHeight = Math.Max(treeView.Font.Height + 1, 17);
|
||||
treeView.RowHeight = Math.Max(treeView.Font.Height + 1, 18);
|
||||
|
||||
gadget = new SensorGadget(computer, settings, unitManager);
|
||||
gadget.HideShowCommand += hideShowClick;
|
||||
@ -627,5 +627,11 @@ namespace OpenHardwareMonitor.GUI {
|
||||
// restore the MainIcon setting
|
||||
systemTray.IsMainIconEnabled = minimizeToTray.Value;
|
||||
}
|
||||
|
||||
private void treeView_MouseMove(object sender, MouseEventArgs e) {
|
||||
if ((e.Button & (MouseButtons.Left | MouseButtons.Right)) > 0) {
|
||||
treeView.SelectedNode = treeView.GetNodeAt(e.Location);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -118,16 +118,16 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>226, 17</value>
|
||||
<value>373, 17</value>
|
||||
</metadata>
|
||||
<metadata name="sensorContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>334, 17</value>
|
||||
</metadata>
|
||||
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="treeContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>164, 17</value>
|
||||
</metadata>
|
||||
<metadata name="timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>146, 17</value>
|
||||
<value>293, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
||||
@ -67,7 +67,7 @@ namespace OpenHardwareMonitor.GUI {
|
||||
this.settings = settings;
|
||||
this.unitManager = unitManager;
|
||||
switch (sensor.SensorType) {
|
||||
case SensorType.Voltage: format = "{0:F2} V"; break;
|
||||
case SensorType.Voltage: format = "{0:F3} V"; break;
|
||||
case SensorType.Clock: format = "{0:F0} MHz"; break;
|
||||
case SensorType.Load: format = "{0:F1} %"; break;
|
||||
case SensorType.Temperature: format = "{0:F1} °C"; break;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user