# HG changeset patch # User StephaneLenclud # Date 1366211361 -7200 # Node ID 2a02ad86a7768c4250dea1703f8284aef02151ec # Parent f43bab5fc81ebced77136a3cf8610ca2853f02fd Adding FrontView menu with persistent options for time display and packed mode. Adding support for editorconfig and rebracer. diff -r f43bab5fc81e -r 2a02ad86a776 .editorconfig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.editorconfig Wed Apr 17 17:09:21 2013 +0200 @@ -0,0 +1,12 @@ +; Top-most EditorConfig file +root = true + +; Windows-style newlines +[*] +end_of_line = crlf + +; 2-column tab indentation +[*.cs] +indent_style = space +indent_size = 2 +trim_trailing_whitespace = false \ No newline at end of file diff -r f43bab5fc81e -r 2a02ad86a776 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 @@ -111,6 +111,9 @@ this.log1hMenuItem = new System.Windows.Forms.MenuItem(); this.log2hMenuItem = new System.Windows.Forms.MenuItem(); this.log6hMenuItem = new System.Windows.Forms.MenuItem(); + this.frontViewMenuItem = new System.Windows.Forms.MenuItem(); + this.frontViewPackedMenuItem = new System.Windows.Forms.MenuItem(); + this.frontViewDisplayTimeMenuItem = new System.Windows.Forms.MenuItem(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.SuspendLayout(); this.SuspendLayout(); @@ -373,6 +376,7 @@ this.logSeparatorMenuItem, this.logSensorsMenuItem, this.loggingIntervalMenuItem, + this.frontViewMenuItem, this.webMenuItemSeparator, this.webMenuItem}); this.optionsMenuItem.Text = "Options"; @@ -451,14 +455,32 @@ this.plotRightMenuItem.RadioCheck = true; this.plotRightMenuItem.Text = "Right"; // + // frontViewMenuItem + // + this.frontViewMenuItem.Index = 10; + this.frontViewMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.frontViewPackedMenuItem, + this.frontViewDisplayTimeMenuItem}); + this.frontViewMenuItem.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 = 10; + this.webMenuItemSeparator.Index = 11; this.webMenuItemSeparator.Text = "-"; // // webMenuItem // - this.webMenuItem.Index = 11; + this.webMenuItem.Index = 12; this.webMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.runWebServerMenuItem, this.serverPortMenuItem}); @@ -737,7 +759,7 @@ 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 webMenuItem; private System.Windows.Forms.MenuItem runWebServerMenuItem; private System.Windows.Forms.MenuItem serverPortMenuItem; private System.Windows.Forms.MenuItem menuItem5; @@ -762,6 +784,9 @@ private System.Windows.Forms.MenuItem log1hMenuItem; private System.Windows.Forms.MenuItem log2hMenuItem; private System.Windows.Forms.MenuItem log6hMenuItem; + private System.Windows.Forms.MenuItem frontViewMenuItem; + private System.Windows.Forms.MenuItem frontViewPackedMenuItem; + private System.Windows.Forms.MenuItem frontViewDisplayTimeMenuItem; } } diff -r f43bab5fc81e -r 2a02ad86a776 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; @@ -228,6 +230,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 f43bab5fc81e -r 2a02ad86a776 OpenHardwareMonitor.sln --- a/OpenHardwareMonitor.sln Wed Apr 17 15:57:32 2013 +0200 +++ b/OpenHardwareMonitor.sln Wed Apr 17 17:09:21 2013 +0200 @@ -10,6 +10,11 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UacHelpers.UserAccountControl", "UacHelpers.CppLibrary\UacHelpers.CppLibrary.vcxproj", "{D043A646-FE7A-4334-B23D-E327593C1AE2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4EB0F26C-88F1-436F-8C2D-C628B31C512C}" + ProjectSection(SolutionItems) = preProject + Rebracer.xml = Rebracer.xml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff -r f43bab5fc81e -r 2a02ad86a776 Rebracer.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Rebracer.xml Wed Apr 17 17:09:21 2013 +0200 @@ -0,0 +1,120 @@ + + + + + + + + + + + + + TODO:2 + HACK:2 + UNDONE:2 + UnresolvedMergeConflict:3 + + true + true + false + + + + + 1 + 1 + 2 + 80 + 1 + 1 + 1 + 0 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 0 + 1 + 0 + 1 + 0 + 0 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 50 + 50 + 1 + 0 + 0 + 1 + 1 + + + false + false + true + false + false + true + false + + + Preserve + true + true + true + true + true + true + true + true + true + Preserve + true + false + DoubleQuote + 120 + false + + + + \ No newline at end of file