# HG changeset patch # User lenclud@WUE-9BW295J.ad.garmin.com # Date 1366211361 -7200 # Node ID 580df602ff73ad15bdc787040970e995dcff5e11 # Parent b9cacc55888efe551d16b633e585a2f3bd49ce74 Adding FrontView menu with persistent options for time display and packed mode. diff -r b9cacc55888e -r 580df602ff73 GUI/MainForm.Designer.cs --- a/GUI/MainForm.Designer.cs Wed Apr 17 15:57:32 2013 +0200 +++ b/GUI/MainForm.Designer.cs Wed Apr 17 17:09:21 2013 +0200 @@ -33,163 +33,167 @@ /// 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(); - this.value = new Aga.Controls.Tree.TreeColumn(); - this.min = new Aga.Controls.Tree.TreeColumn(); - this.max = 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.mainMenu = new System.Windows.Forms.MainMenu(this.components); - this.fileMenuItem = new System.Windows.Forms.MenuItem(); - 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.menuItem5 = new System.Windows.Forms.MenuItem(); - this.mainboardMenuItem = new System.Windows.Forms.MenuItem(); - this.cpuMenuItem = new System.Windows.Forms.MenuItem(); - this.ramMenuItem = new System.Windows.Forms.MenuItem(); - this.gpuMenuItem = new System.Windows.Forms.MenuItem(); - this.fanControllerMenuItem = new System.Windows.Forms.MenuItem(); - this.hddMenuItem = 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(); - this.MenuItem3 = new System.Windows.Forms.MenuItem(); - this.hiddenMenuItem = new System.Windows.Forms.MenuItem(); - this.plotMenuItem = new System.Windows.Forms.MenuItem(); - this.gadgetMenuItem = new System.Windows.Forms.MenuItem(); - this.MenuItem1 = new System.Windows.Forms.MenuItem(); - this.columnsMenuItem = new System.Windows.Forms.MenuItem(); - this.valueMenuItem = new System.Windows.Forms.MenuItem(); - this.minMenuItem = new System.Windows.Forms.MenuItem(); - this.maxMenuItem = new System.Windows.Forms.MenuItem(); - this.optionsMenuItem = new System.Windows.Forms.MenuItem(); - this.startMinMenuItem = new System.Windows.Forms.MenuItem(); - this.minTrayMenuItem = new System.Windows.Forms.MenuItem(); - this.minCloseMenuItem = new System.Windows.Forms.MenuItem(); - this.startupMenuItem = new System.Windows.Forms.MenuItem(); - this.separatorMenuItem = new System.Windows.Forms.MenuItem(); - this.temperatureUnitsMenuItem = new System.Windows.Forms.MenuItem(); - this.celsiusMenuItem = new System.Windows.Forms.MenuItem(); - this.fahrenheitMenuItem = new System.Windows.Forms.MenuItem(); - this.plotLocationMenuItem = new System.Windows.Forms.MenuItem(); - this.plotWindowMenuItem = new System.Windows.Forms.MenuItem(); - this.plotBottomMenuItem = new System.Windows.Forms.MenuItem(); - this.plotRightMenuItem = new System.Windows.Forms.MenuItem(); - this.webMenuItemSeparator = new System.Windows.Forms.MenuItem(); - this.webMenuItem = new System.Windows.Forms.MenuItem(); - this.runWebServerMenuItem = new System.Windows.Forms.MenuItem(); - this.serverPortMenuItem = new System.Windows.Forms.MenuItem(); - this.helpMenuItem = new System.Windows.Forms.MenuItem(); - this.aboutMenuItem = new System.Windows.Forms.MenuItem(); - this.treeContextMenu = new System.Windows.Forms.ContextMenu(); - this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); - this.timer = new System.Windows.Forms.Timer(this.components); - this.splitContainer = new OpenHardwareMonitor.GUI.SplitContainerAdv(); - this.treeView = new Aga.Controls.Tree.TreeViewAdv(); - 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; - this.nodeTextBoxText.LeftMargin = 3; - 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.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + this.sensor = new Aga.Controls.Tree.TreeColumn(); + this.value = new Aga.Controls.Tree.TreeColumn(); + this.min = new Aga.Controls.Tree.TreeColumn(); + this.max = 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.mainMenu = new System.Windows.Forms.MainMenu(this.components); + this.fileMenuItem = new System.Windows.Forms.MenuItem(); + 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.menuItem5 = new System.Windows.Forms.MenuItem(); + this.mainboardMenuItem = new System.Windows.Forms.MenuItem(); + this.cpuMenuItem = new System.Windows.Forms.MenuItem(); + this.ramMenuItem = new System.Windows.Forms.MenuItem(); + this.gpuMenuItem = new System.Windows.Forms.MenuItem(); + this.fanControllerMenuItem = new System.Windows.Forms.MenuItem(); + this.hddMenuItem = 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(); + this.MenuItem3 = new System.Windows.Forms.MenuItem(); + this.hiddenMenuItem = new System.Windows.Forms.MenuItem(); + this.plotMenuItem = new System.Windows.Forms.MenuItem(); + this.gadgetMenuItem = new System.Windows.Forms.MenuItem(); + this.MenuItem1 = new System.Windows.Forms.MenuItem(); + this.columnsMenuItem = new System.Windows.Forms.MenuItem(); + this.valueMenuItem = new System.Windows.Forms.MenuItem(); + this.minMenuItem = new System.Windows.Forms.MenuItem(); + this.maxMenuItem = new System.Windows.Forms.MenuItem(); + this.optionsMenuItem = new System.Windows.Forms.MenuItem(); + this.startMinMenuItem = new System.Windows.Forms.MenuItem(); + this.minTrayMenuItem = new System.Windows.Forms.MenuItem(); + this.minCloseMenuItem = new System.Windows.Forms.MenuItem(); + this.startupMenuItem = new System.Windows.Forms.MenuItem(); + this.separatorMenuItem = new System.Windows.Forms.MenuItem(); + this.temperatureUnitsMenuItem = new System.Windows.Forms.MenuItem(); + this.celsiusMenuItem = new System.Windows.Forms.MenuItem(); + this.fahrenheitMenuItem = new System.Windows.Forms.MenuItem(); + this.plotLocationMenuItem = new System.Windows.Forms.MenuItem(); + this.plotWindowMenuItem = new System.Windows.Forms.MenuItem(); + this.plotBottomMenuItem = new System.Windows.Forms.MenuItem(); + this.plotRightMenuItem = new System.Windows.Forms.MenuItem(); + this.menuItem4 = new System.Windows.Forms.MenuItem(); + this.frontViewPackedMenuItem = new System.Windows.Forms.MenuItem(); + this.frontViewDisplayTimeMenuItem = new System.Windows.Forms.MenuItem(); + this.webMenuItemSeparator = new System.Windows.Forms.MenuItem(); + this.webMenuItem = new System.Windows.Forms.MenuItem(); + this.runWebServerMenuItem = new System.Windows.Forms.MenuItem(); + this.serverPortMenuItem = new System.Windows.Forms.MenuItem(); + this.helpMenuItem = new System.Windows.Forms.MenuItem(); + this.aboutMenuItem = new System.Windows.Forms.MenuItem(); + this.treeContextMenu = new System.Windows.Forms.ContextMenu(); + this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); + this.timer = new System.Windows.Forms.Timer(this.components); + this.splitContainer = new OpenHardwareMonitor.GUI.SplitContainerAdv(); + this.treeView = new Aga.Controls.Tree.TreeViewAdv(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); + 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; + this.nodeTextBoxText.LeftMargin = 3; + 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[] { + // + // fileMenuItem + // + this.fileMenuItem.Index = 0; + this.fileMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.saveReportMenuItem, this.sumbitReportMenuItem, this.MenuItem2, @@ -197,88 +201,88 @@ this.menuItem5, 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); - // - // sumbitReportMenuItem - // - this.sumbitReportMenuItem.Index = 1; - this.sumbitReportMenuItem.Text = "Submit Report..."; - this.sumbitReportMenuItem.Click += new System.EventHandler(this.sumbitReportMenuItem_Click); - // - // MenuItem2 - // - this.MenuItem2.Index = 2; - this.MenuItem2.Text = "-"; - // - // resetMenuItem - // - this.resetMenuItem.Index = 3; - this.resetMenuItem.Text = "Reset"; - this.resetMenuItem.Click += new System.EventHandler(this.resetClick); - // - // menuItem5 - // - this.menuItem5.Index = 4; - this.menuItem5.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.fileMenuItem.Text = "File"; + // + // saveReportMenuItem + // + this.saveReportMenuItem.Index = 0; + this.saveReportMenuItem.Text = "Save Report..."; + this.saveReportMenuItem.Click += new System.EventHandler(this.saveReportMenuItem_Click); + // + // sumbitReportMenuItem + // + this.sumbitReportMenuItem.Index = 1; + this.sumbitReportMenuItem.Text = "Submit Report..."; + this.sumbitReportMenuItem.Click += new System.EventHandler(this.sumbitReportMenuItem_Click); + // + // MenuItem2 + // + this.MenuItem2.Index = 2; + this.MenuItem2.Text = "-"; + // + // resetMenuItem + // + this.resetMenuItem.Index = 3; + this.resetMenuItem.Text = "Reset"; + this.resetMenuItem.Click += new System.EventHandler(this.resetClick); + // + // menuItem5 + // + this.menuItem5.Index = 4; + this.menuItem5.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.mainboardMenuItem, this.cpuMenuItem, this.ramMenuItem, this.gpuMenuItem, this.fanControllerMenuItem, this.hddMenuItem}); - this.menuItem5.Text = "Hardware"; - // - // mainboardMenuItem - // - this.mainboardMenuItem.Index = 0; - this.mainboardMenuItem.Text = "Mainboard"; - // - // 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"; - // - // menuItem6 - // - this.menuItem6.Index = 5; - this.menuItem6.Text = "-"; - // - // exitMenuItem - // - this.exitMenuItem.Index = 6; - 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.menuItem5.Text = "Hardware"; + // + // mainboardMenuItem + // + this.mainboardMenuItem.Index = 0; + this.mainboardMenuItem.Text = "Mainboard"; + // + // 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"; + // + // menuItem6 + // + this.menuItem6.Index = 5; + this.menuItem6.Text = "-"; + // + // exitMenuItem + // + this.exitMenuItem.Index = 6; + 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, this.MenuItem3, this.hiddenMenuItem, @@ -286,67 +290,67 @@ this.gadgetMenuItem, 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.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.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, this.minTrayMenuItem, this.minCloseMenuItem, @@ -354,207 +358,227 @@ this.separatorMenuItem, this.temperatureUnitsMenuItem, this.plotLocationMenuItem, + this.menuItem4, 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.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.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"; - // - // MenuItem4 - // - this.webMenuItemSeparator.Index = 7; - this.webMenuItemSeparator.Text = "-"; - // - // webMenuItem - // - this.webMenuItem.Index = 8; - this.webMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + 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"; + // + // menuItem4 + // + this.menuItem4.Index = 7; + this.menuItem4.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.frontViewPackedMenuItem, + this.frontViewDisplayTimeMenuItem}); + this.menuItem4.Text = "FrontView"; + // + // frontViewPackedMenuItem + // + this.frontViewPackedMenuItem.Index = 0; + this.frontViewPackedMenuItem.Text = "Packed"; + // + // frontViewDisplayTimeMenuItem + // + this.frontViewDisplayTimeMenuItem.Index = 1; + this.frontViewDisplayTimeMenuItem.Text = "Display time"; + // + // webMenuItemSeparator + // + this.webMenuItemSeparator.Index = 8; + this.webMenuItemSeparator.Text = "-"; + // + // webMenuItem + // + this.webMenuItem.Index = 9; + 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.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 = "OpenHardwareMonitor.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); - this.treeView.Columns.Add(this.value); - this.treeView.Columns.Add(this.min); - this.treeView.Columns.Add(this.max); - this.treeView.DefaultToolTipProvider = null; - this.treeView.Dock = System.Windows.Forms.DockStyle.Fill; - this.treeView.DragDropMarkColor = System.Drawing.Color.Black; - this.treeView.FullRowSelect = true; - this.treeView.GridLineStyle = Aga.Controls.Tree.GridLineStyle.Horizontal; - this.treeView.LineColor = System.Drawing.SystemColors.ControlDark; - this.treeView.Location = new System.Drawing.Point(0, 0); - this.treeView.Model = null; - this.treeView.Name = "treeView"; - this.treeView.NodeControls.Add(this.nodeImage); - this.treeView.NodeControls.Add(this.nodeCheckBox); - this.treeView.NodeControls.Add(this.nodeTextBoxText); - this.treeView.NodeControls.Add(this.nodeTextBoxValue); - this.treeView.NodeControls.Add(this.nodeTextBoxMin); - this.treeView.NodeControls.Add(this.nodeTextBoxMax); - this.treeView.SelectedNode = null; - this.treeView.Size = new System.Drawing.Size(386, 354); - this.treeView.TabIndex = 0; - this.treeView.Text = "treeView"; - this.treeView.UseColumns = true; - this.treeView.NodeMouseDoubleClick += new System.EventHandler(this.treeView_NodeMouseDoubleClick); - this.treeView.Click += new System.EventHandler(this.treeView_Click); - 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, 554); - this.Controls.Add(this.splitContainer); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Menu = this.mainMenu; - this.Name = "MainForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; - this.Text = "Open Hardware Monitor"; - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); - this.Load += new System.EventHandler(this.MainForm_Load); - this.ResizeEnd += new System.EventHandler(this.MainForm_MoveOrResize); - this.Move += new System.EventHandler(this.MainForm_MoveOrResize); - this.splitContainer.Panel1.ResumeLayout(false); - this.splitContainer.ResumeLayout(false); - this.ResumeLayout(false); + 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 = "OpenHardwareMonitor.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); + this.treeView.Columns.Add(this.value); + this.treeView.Columns.Add(this.min); + this.treeView.Columns.Add(this.max); + this.treeView.DefaultToolTipProvider = null; + this.treeView.Dock = System.Windows.Forms.DockStyle.Fill; + this.treeView.DragDropMarkColor = System.Drawing.Color.Black; + this.treeView.FullRowSelect = true; + this.treeView.GridLineStyle = Aga.Controls.Tree.GridLineStyle.Horizontal; + this.treeView.LineColor = System.Drawing.SystemColors.ControlDark; + this.treeView.Location = new System.Drawing.Point(0, 0); + this.treeView.Model = null; + this.treeView.Name = "treeView"; + this.treeView.NodeControls.Add(this.nodeImage); + this.treeView.NodeControls.Add(this.nodeCheckBox); + this.treeView.NodeControls.Add(this.nodeTextBoxText); + this.treeView.NodeControls.Add(this.nodeTextBoxValue); + this.treeView.NodeControls.Add(this.nodeTextBoxMin); + this.treeView.NodeControls.Add(this.nodeTextBoxMax); + this.treeView.SelectedNode = null; + this.treeView.Size = new System.Drawing.Size(386, 354); + this.treeView.TabIndex = 0; + this.treeView.Text = "treeView"; + this.treeView.UseColumns = true; + this.treeView.NodeMouseDoubleClick += new System.EventHandler(this.treeView_NodeMouseDoubleClick); + this.treeView.Click += new System.EventHandler(this.treeView_Click); + 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, 554); + this.Controls.Add(this.splitContainer); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Menu = this.mainMenu; + this.Name = "MainForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; + this.Text = "Open Hardware Monitor"; + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); + this.Load += new System.EventHandler(this.MainForm_Load); + this.ResizeEnd += new System.EventHandler(this.MainForm_MoveOrResize); + this.Move += new System.EventHandler(this.MainForm_MoveOrResize); + this.splitContainer.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); + this.splitContainer.ResumeLayout(false); + this.ResumeLayout(false); } @@ -620,6 +644,9 @@ private System.Windows.Forms.MenuItem gpuMenuItem; private System.Windows.Forms.MenuItem fanControllerMenuItem; private System.Windows.Forms.MenuItem ramMenuItem; + private System.Windows.Forms.MenuItem menuItem4; + private System.Windows.Forms.MenuItem frontViewPackedMenuItem; + private System.Windows.Forms.MenuItem frontViewDisplayTimeMenuItem; } } diff -r b9cacc55888e -r 580df602ff73 GUI/MainForm.cs --- a/GUI/MainForm.cs Wed Apr 17 15:57:32 2013 +0200 +++ b/GUI/MainForm.cs Wed Apr 17 17:09:21 2013 +0200 @@ -55,6 +55,8 @@ private UserOption minimizeToTray; private UserOption minimizeOnClose; private UserOption autoStart; + private UserOption frontViewPacked; //Tells whether FrontView should cycle or pack sensors + private UserOption frontViewDisplayTime; //Tells whether or not FrontView should display current time private UserOption readMainboardSensors; private UserOption readCpuSensors; @@ -222,6 +224,9 @@ } }; + frontViewPacked = new UserOption("frontViewPackedMenuItem", false, frontViewPackedMenuItem, settings); + frontViewDisplayTime = new UserOption("frontViewDisplayTimeMenuItem", false, frontViewDisplayTimeMenuItem, settings); + readMainboardSensors = new UserOption("mainboardMenuItem", true, mainboardMenuItem, settings); readMainboardSensors.Changed += delegate(object sender, EventArgs e) { diff -r b9cacc55888e -r 580df602ff73 GUI/MainForm.resx --- a/GUI/MainForm.resx Wed Apr 17 15:57:32 2013 +0200 +++ b/GUI/MainForm.resx Wed Apr 17 17:09:21 2013 +0200 @@ -112,24 +112,24 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 373, 17 - + 17, 17 - + 164, 17 - + 293, 17 - + AAABAAMAEBAAAAEAIABoBAAANgAAACAgAAABACAAqBAAAJ4EAAAwMAAAAQAgAKglAABGFQAAKAAAABAA