Adding FrontView menu with persistent options for time display and packed mode.
Adding support for editorconfig and rebracer.
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/.editorconfig Wed Apr 17 17:09:21 2013 +0200
1.3 @@ -0,0 +1,12 @@
1.4 +; Top-most EditorConfig file
1.5 +root = true
1.6 +
1.7 +; Windows-style newlines
1.8 +[*]
1.9 +end_of_line = crlf
1.10 +
1.11 +; 2-column tab indentation
1.12 +[*.cs]
1.13 +indent_style = space
1.14 +indent_size = 2
1.15 +trim_trailing_whitespace = false
1.16 \ No newline at end of file
2.1 --- a/GUI/MainForm.Designer.cs Wed Apr 17 15:57:32 2013 +0200
2.2 +++ b/GUI/MainForm.Designer.cs Wed Apr 17 17:09:21 2013 +0200
2.3 @@ -111,6 +111,9 @@
2.4 this.log1hMenuItem = new System.Windows.Forms.MenuItem();
2.5 this.log2hMenuItem = new System.Windows.Forms.MenuItem();
2.6 this.log6hMenuItem = new System.Windows.Forms.MenuItem();
2.7 + this.frontViewMenuItem = new System.Windows.Forms.MenuItem();
2.8 + this.frontViewPackedMenuItem = new System.Windows.Forms.MenuItem();
2.9 + this.frontViewDisplayTimeMenuItem = new System.Windows.Forms.MenuItem();
2.10 this.splitContainer.Panel1.SuspendLayout();
2.11 this.splitContainer.SuspendLayout();
2.12 this.SuspendLayout();
2.13 @@ -373,6 +376,7 @@
2.14 this.logSeparatorMenuItem,
2.15 this.logSensorsMenuItem,
2.16 this.loggingIntervalMenuItem,
2.17 + this.frontViewMenuItem,
2.18 this.webMenuItemSeparator,
2.19 this.webMenuItem});
2.20 this.optionsMenuItem.Text = "Options";
2.21 @@ -451,14 +455,32 @@
2.22 this.plotRightMenuItem.RadioCheck = true;
2.23 this.plotRightMenuItem.Text = "Right";
2.24 //
2.25 + // frontViewMenuItem
2.26 + //
2.27 + this.frontViewMenuItem.Index = 10;
2.28 + this.frontViewMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
2.29 + this.frontViewPackedMenuItem,
2.30 + this.frontViewDisplayTimeMenuItem});
2.31 + this.frontViewMenuItem.Text = "FrontView";
2.32 + //
2.33 + // frontViewPackedMenuItem
2.34 + //
2.35 + this.frontViewPackedMenuItem.Index = 0;
2.36 + this.frontViewPackedMenuItem.Text = "Packed";
2.37 + //
2.38 + // frontViewDisplayTimeMenuItem
2.39 + //
2.40 + this.frontViewDisplayTimeMenuItem.Index = 1;
2.41 + this.frontViewDisplayTimeMenuItem.Text = "Display time";
2.42 + //
2.43 // webMenuItemSeparator
2.44 //
2.45 - this.webMenuItemSeparator.Index = 10;
2.46 + this.webMenuItemSeparator.Index = 11;
2.47 this.webMenuItemSeparator.Text = "-";
2.48 //
2.49 // webMenuItem
2.50 //
2.51 - this.webMenuItem.Index = 11;
2.52 + this.webMenuItem.Index = 12;
2.53 this.webMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
2.54 this.runWebServerMenuItem,
2.55 this.serverPortMenuItem});
2.56 @@ -737,7 +759,7 @@
2.57 private System.Windows.Forms.MenuItem plotWindowMenuItem;
2.58 private System.Windows.Forms.MenuItem plotBottomMenuItem;
2.59 private System.Windows.Forms.MenuItem plotRightMenuItem;
2.60 - private System.Windows.Forms.MenuItem webMenuItem;
2.61 + private System.Windows.Forms.MenuItem webMenuItem;
2.62 private System.Windows.Forms.MenuItem runWebServerMenuItem;
2.63 private System.Windows.Forms.MenuItem serverPortMenuItem;
2.64 private System.Windows.Forms.MenuItem menuItem5;
2.65 @@ -762,6 +784,9 @@
2.66 private System.Windows.Forms.MenuItem log1hMenuItem;
2.67 private System.Windows.Forms.MenuItem log2hMenuItem;
2.68 private System.Windows.Forms.MenuItem log6hMenuItem;
2.69 + private System.Windows.Forms.MenuItem frontViewMenuItem;
2.70 + private System.Windows.Forms.MenuItem frontViewPackedMenuItem;
2.71 + private System.Windows.Forms.MenuItem frontViewDisplayTimeMenuItem;
2.72 }
2.73 }
2.74
3.1 --- a/GUI/MainForm.cs Wed Apr 17 15:57:32 2013 +0200
3.2 +++ b/GUI/MainForm.cs Wed Apr 17 17:09:21 2013 +0200
3.3 @@ -55,6 +55,8 @@
3.4 private UserOption minimizeToTray;
3.5 private UserOption minimizeOnClose;
3.6 private UserOption autoStart;
3.7 + private UserOption frontViewPacked; //Tells whether FrontView should cycle or pack sensors
3.8 + private UserOption frontViewDisplayTime; //Tells whether or not FrontView should display current time
3.9
3.10 private UserOption readMainboardSensors;
3.11 private UserOption readCpuSensors;
3.12 @@ -228,6 +230,9 @@
3.13 }
3.14 };
3.15
3.16 + frontViewPacked = new UserOption("frontViewPackedMenuItem", false, frontViewPackedMenuItem, settings);
3.17 + frontViewDisplayTime = new UserOption("frontViewDisplayTimeMenuItem", false, frontViewDisplayTimeMenuItem, settings);
3.18 +
3.19 readMainboardSensors = new UserOption("mainboardMenuItem", true,
3.20 mainboardMenuItem, settings);
3.21 readMainboardSensors.Changed += delegate(object sender, EventArgs e) {
4.1 --- a/OpenHardwareMonitor.sln Wed Apr 17 15:57:32 2013 +0200
4.2 +++ b/OpenHardwareMonitor.sln Wed Apr 17 17:09:21 2013 +0200
4.3 @@ -10,6 +10,11 @@
4.4 EndProject
4.5 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UacHelpers.UserAccountControl", "UacHelpers.CppLibrary\UacHelpers.CppLibrary.vcxproj", "{D043A646-FE7A-4334-B23D-E327593C1AE2}"
4.6 EndProject
4.7 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4EB0F26C-88F1-436F-8C2D-C628B31C512C}"
4.8 + ProjectSection(SolutionItems) = preProject
4.9 + Rebracer.xml = Rebracer.xml
4.10 + EndProjectSection
4.11 +EndProject
4.12 Global
4.13 GlobalSection(SolutionConfigurationPlatforms) = preSolution
4.14 Debug|Any CPU = Debug|Any CPU
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/Rebracer.xml Wed Apr 17 17:09:21 2013 +0200
5.3 @@ -0,0 +1,120 @@
5.4 +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
5.5 +<!--Rebracer Solution Settings File-->
5.6 +<!--This file contains Visual Studio settings for OpenHardwareMonitor.sln.-->
5.7 +<!--Rebracer uses this file to apply settings for this solution-->
5.8 +<!--when the solution is opened.-->
5.9 +<!--Install Rebracer from http://visualstudiogallery.msdn.microsoft.com/410e9b9f-65f3-4495-b68e-15567e543c58 -->
5.10 +<!--See https://github.com/SLaks/Rebracer for more information-->
5.11 +<UserSettings>
5.12 + <ToolsOptions>
5.13 + <ToolsOptionsCategory name="Environment">
5.14 + <ToolsOptionsSubCategory name="TaskList">
5.15 + <PropertyValue name="CommentTokens" ArrayType="VT_VARIANT" ArrayElementCount="4">
5.16 + <PropertyValue name="0">TODO:2</PropertyValue>
5.17 + <PropertyValue name="1">HACK:2</PropertyValue>
5.18 + <PropertyValue name="2">UNDONE:2</PropertyValue>
5.19 + <PropertyValue name="3">UnresolvedMergeConflict:3</PropertyValue>
5.20 + </PropertyValue>
5.21 + <PropertyValue name="ConfirmTaskDeletion">true</PropertyValue>
5.22 + <PropertyValue name="DontShowFilePaths">true</PropertyValue>
5.23 + <PropertyValue name="WarnOnAddingHiddenItem">false</PropertyValue>
5.24 + </ToolsOptionsSubCategory>
5.25 + </ToolsOptionsCategory>
5.26 + <ToolsOptionsCategory name="TextEditor">
5.27 + <ToolsOptionsSubCategory name="CSharp-Specific">
5.28 + <PropertyValue name="AutoComment">1</PropertyValue>
5.29 + <PropertyValue name="CodeDefinitionWindow_DocumentationComment_IndentBase">1</PropertyValue>
5.30 + <PropertyValue name="CodeDefinitionWindow_DocumentationComment_IndentOffset">2</PropertyValue>
5.31 + <PropertyValue name="CodeDefinitionWindow_DocumentationComment_WrapLength">80</PropertyValue>
5.32 + <PropertyValue name="Formatting_TriggerOnBlockCompletion">1</PropertyValue>
5.33 + <PropertyValue name="Formatting_TriggerOnPaste">1</PropertyValue>
5.34 + <PropertyValue name="Formatting_TriggerOnStatementCompletion">1</PropertyValue>
5.35 + <PropertyValue name="ImplementInterface_InsertRegionTags">0</PropertyValue>
5.36 + <PropertyValue name="Indent_BlockContents">1</PropertyValue>
5.37 + <PropertyValue name="Indent_Braces">0</PropertyValue>
5.38 + <PropertyValue name="Indent_CaseContents">1</PropertyValue>
5.39 + <PropertyValue name="Indent_CaseLabels">1</PropertyValue>
5.40 + <PropertyValue name="Indent_FlushLabelsLeft">0</PropertyValue>
5.41 + <PropertyValue name="Indent_UnindentLabels">1</PropertyValue>
5.42 + <PropertyValue name="NewLines_AnonymousTypeInitializer_EachMember">0</PropertyValue>
5.43 + <PropertyValue name="NewLines_Braces_AnonymousMethod">0</PropertyValue>
5.44 + <PropertyValue name="NewLines_Braces_AnonymousTypeInitializer">0</PropertyValue>
5.45 + <PropertyValue name="NewLines_Braces_ArrayInitializer">0</PropertyValue>
5.46 + <PropertyValue name="NewLines_Braces_CollectionInitializer">0</PropertyValue>
5.47 + <PropertyValue name="NewLines_Braces_ControlFlow">0</PropertyValue>
5.48 + <PropertyValue name="NewLines_Braces_LambdaExpressionBody">0</PropertyValue>
5.49 + <PropertyValue name="NewLines_Braces_Method">0</PropertyValue>
5.50 + <PropertyValue name="NewLines_Braces_ObjectInitializer">0</PropertyValue>
5.51 + <PropertyValue name="NewLines_Braces_Type">0</PropertyValue>
5.52 + <PropertyValue name="NewLines_Keywords_Catch">0</PropertyValue>
5.53 + <PropertyValue name="NewLines_Keywords_Else">0</PropertyValue>
5.54 + <PropertyValue name="NewLines_Keywords_Finally">0</PropertyValue>
5.55 + <PropertyValue name="NewLines_ObjectInitializer_EachMember">0</PropertyValue>
5.56 + <PropertyValue name="NewLines_QueryExpression_EachClause">0</PropertyValue>
5.57 + <PropertyValue name="RemoveUnusedUsings">1</PropertyValue>
5.58 + <PropertyValue name="SortUsings">1</PropertyValue>
5.59 + <PropertyValue name="SortUsings_PlaceSystemFirst">1</PropertyValue>
5.60 + <PropertyValue name="Space_AfterBasesColon">1</PropertyValue>
5.61 + <PropertyValue name="Space_AfterCast">0</PropertyValue>
5.62 + <PropertyValue name="Space_AfterComma">1</PropertyValue>
5.63 + <PropertyValue name="Space_AfterDot">0</PropertyValue>
5.64 + <PropertyValue name="Space_AfterLambdaArrow">1</PropertyValue>
5.65 + <PropertyValue name="Space_AfterMethodCallName">0</PropertyValue>
5.66 + <PropertyValue name="Space_AfterMethodDeclarationName">0</PropertyValue>
5.67 + <PropertyValue name="Space_AfterSemicolonsInForStatement">1</PropertyValue>
5.68 + <PropertyValue name="Space_AroundBinaryOperator">1</PropertyValue>
5.69 + <PropertyValue name="Space_BeforeBasesColon">1</PropertyValue>
5.70 + <PropertyValue name="Space_BeforeComma">0</PropertyValue>
5.71 + <PropertyValue name="Space_BeforeDot">0</PropertyValue>
5.72 + <PropertyValue name="Space_BeforeLambdaArrow">1</PropertyValue>
5.73 + <PropertyValue name="Space_BeforeOpenSquare">0</PropertyValue>
5.74 + <PropertyValue name="Space_BeforeSemicolonsInForStatement">0</PropertyValue>
5.75 + <PropertyValue name="Space_BetweenEmptyMethodCallParentheses">0</PropertyValue>
5.76 + <PropertyValue name="Space_BetweenEmptyMethodDeclarationParentheses">0</PropertyValue>
5.77 + <PropertyValue name="Space_BetweenEmptySquares">0</PropertyValue>
5.78 + <PropertyValue name="Space_InControlFlowConstruct">1</PropertyValue>
5.79 + <PropertyValue name="Space_Normalize">0</PropertyValue>
5.80 + <PropertyValue name="Space_WithinCastParentheses">0</PropertyValue>
5.81 + <PropertyValue name="Space_WithinExpressionParentheses">0</PropertyValue>
5.82 + <PropertyValue name="Space_WithinMethodCallParentheses">0</PropertyValue>
5.83 + <PropertyValue name="Space_WithinMethodDeclarationParentheses">0</PropertyValue>
5.84 + <PropertyValue name="Space_WithinOtherParentheses">0</PropertyValue>
5.85 + <PropertyValue name="Space_WithinSquares">0</PropertyValue>
5.86 + <PropertyValue name="TimeSliceForQuickSearchCaching">50</PropertyValue>
5.87 + <PropertyValue name="TimeSliceForQuickSearchSearching">50</PropertyValue>
5.88 + <PropertyValue name="WarnWhenMembersCauseCompilerGeneratedReferences">1</PropertyValue>
5.89 + <PropertyValue name="Wrapping_IgnoreSpacesAroundBinaryOperators">0</PropertyValue>
5.90 + <PropertyValue name="Wrapping_IgnoreSpacesAroundVariableDeclaration">0</PropertyValue>
5.91 + <PropertyValue name="Wrapping_KeepStatementsOnSingleLine">1</PropertyValue>
5.92 + <PropertyValue name="Wrapping_PreserveSingleLine">1</PropertyValue>
5.93 + </ToolsOptionsSubCategory>
5.94 + <ToolsOptionsSubCategory name="C/C++ Specific">
5.95 + <PropertyValue name="AlwaysUseFallbackLocation">false</PropertyValue>
5.96 + <PropertyValue name="AutoIndentOnTab">false</PropertyValue>
5.97 + <PropertyValue name="ColorizeInactiveBlocksDifferently">true</PropertyValue>
5.98 + <PropertyValue name="DisableErrorReporting">false</PropertyValue>
5.99 + <PropertyValue name="EnumerateCommentTasks">false</PropertyValue>
5.100 + <PropertyValue name="HighlightMatchingTokens">true</PropertyValue>
5.101 + <PropertyValue name="IndentBraces">false</PropertyValue>
5.102 + </ToolsOptionsSubCategory>
5.103 + <ToolsOptionsSubCategory name="XAML Specific">
5.104 + <PropertyValue name="AttributeFormat">Preserve</PropertyValue>
5.105 + <PropertyValue name="AutoInsertAttributeQuotes">true</PropertyValue>
5.106 + <PropertyValue name="AutoInsertCommas">true</PropertyValue>
5.107 + <PropertyValue name="AutoInsertEndBraces">true</PropertyValue>
5.108 + <PropertyValue name="AutoInsertEndTags">true</PropertyValue>
5.109 + <PropertyValue name="AutoOutlining">true</PropertyValue>
5.110 + <PropertyValue name="AutoReformatOnEndTag">true</PropertyValue>
5.111 + <PropertyValue name="AutoReformatOnPaste">true</PropertyValue>
5.112 + <PropertyValue name="AutoReformatOnStartTag">true</PropertyValue>
5.113 + <PropertyValue name="AutoToolboxPopulate">true</PropertyValue>
5.114 + <PropertyValue name="BlankLineOption">Preserve</PropertyValue>
5.115 + <PropertyValue name="KeepFirstAttributeOnSameLine">true</PropertyValue>
5.116 + <PropertyValue name="MaximizeXamlEditor">false</PropertyValue>
5.117 + <PropertyValue name="QuoteStyle">DoubleQuote</PropertyValue>
5.118 + <PropertyValue name="WrapColumn">120</PropertyValue>
5.119 + <PropertyValue name="WrapTags">false</PropertyValue>
5.120 + </ToolsOptionsSubCategory>
5.121 + </ToolsOptionsCategory>
5.122 + </ToolsOptions>
5.123 +</UserSettings>
5.124 \ No newline at end of file