Added the small modifications to the Aga.Controls required by the Open Hardware Monitor.
1.1 Binary file External/Aga.Controls.dll has changed
2.1 --- a/External/Aga.Controls/Aga.Controls.csproj Sun May 27 15:16:19 2012 +0000
2.2 +++ b/External/Aga.Controls/Aga.Controls.csproj Sun May 27 16:08:54 2012 +0000
2.3 @@ -1,4 +1,5 @@
2.4 -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
2.5 +<?xml version="1.0" encoding="utf-8"?>
2.6 +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2.7 <PropertyGroup>
2.8 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
2.9 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
2.10 @@ -17,31 +18,53 @@
2.11 </SccAuxPath>
2.12 <SccProvider>
2.13 </SccProvider>
2.14 + <SignAssembly>false</SignAssembly>
2.15 + <AssemblyOriginatorKeyFile>
2.16 + </AssemblyOriginatorKeyFile>
2.17 <FileUpgradeFlags>
2.18 </FileUpgradeFlags>
2.19 - <OldToolsVersion>2.0</OldToolsVersion>
2.20 + <OldToolsVersion>3.5</OldToolsVersion>
2.21 <UpgradeBackupLocation>
2.22 </UpgradeBackupLocation>
2.23 + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
2.24 + <PublishUrl>publish\</PublishUrl>
2.25 + <Install>true</Install>
2.26 + <InstallFrom>Disk</InstallFrom>
2.27 + <UpdateEnabled>false</UpdateEnabled>
2.28 + <UpdateMode>Foreground</UpdateMode>
2.29 + <UpdateInterval>7</UpdateInterval>
2.30 + <UpdateIntervalUnits>Days</UpdateIntervalUnits>
2.31 + <UpdatePeriodically>false</UpdatePeriodically>
2.32 + <UpdateRequired>false</UpdateRequired>
2.33 + <MapFileExtensions>true</MapFileExtensions>
2.34 + <ApplicationRevision>0</ApplicationRevision>
2.35 + <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
2.36 + <IsWebBootstrapper>false</IsWebBootstrapper>
2.37 + <UseApplicationTrust>false</UseApplicationTrust>
2.38 + <BootstrapperEnabled>true</BootstrapperEnabled>
2.39 </PropertyGroup>
2.40 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2.41 <DebugSymbols>true</DebugSymbols>
2.42 <DebugType>full</DebugType>
2.43 <Optimize>false</Optimize>
2.44 - <OutputPath>bin\Debug\</OutputPath>
2.45 + <OutputPath>Bin\Debug\</OutputPath>
2.46 <DefineConstants>TRACE;DEBUG;PERF_TEST</DefineConstants>
2.47 <ErrorReport>prompt</ErrorReport>
2.48 <WarningLevel>4</WarningLevel>
2.49 - <CodeAnalysisRules>-Microsoft.Design#CA1020;-Microsoft.Design#CA1060;-Microsoft.Design#CA1062;-Microsoft.Globalization#CA1301;-Microsoft.Globalization#CA1302;-Microsoft.Globalization#CA1303;-Microsoft.Globalization#CA1306;-Microsoft.Globalization#CA1304;-Microsoft.Globalization#CA1305;-Microsoft.Globalization#CA1300;-Microsoft.Maintainability#CA1501;-Microsoft.Mobility#CA1601;-Microsoft.Performance#CA1805;-Microsoft.Performance#CA1815;-Microsoft.Performance#CA1819;-Microsoft.Usage#CA2208</CodeAnalysisRules>
2.50 + <CodeAnalysisRules>
2.51 + </CodeAnalysisRules>
2.52 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2.53 + <CodeAnalysisRuleSet>Migrated rules for Aga.Controls.ruleset</CodeAnalysisRuleSet>
2.54 </PropertyGroup>
2.55 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2.56 <DebugType>pdbonly</DebugType>
2.57 <Optimize>true</Optimize>
2.58 - <OutputPath>bin\Release\</OutputPath>
2.59 + <OutputPath>Bin\Release\</OutputPath>
2.60 <DefineConstants>TRACE</DefineConstants>
2.61 <ErrorReport>prompt</ErrorReport>
2.62 <WarningLevel>4</WarningLevel>
2.63 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2.64 + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
2.65 </PropertyGroup>
2.66 <ItemGroup>
2.67 <Reference Include="System" />
2.68 @@ -210,6 +233,23 @@
2.69 <ItemGroup>
2.70 <Content Include="Resources\DVSplit.cur" />
2.71 </ItemGroup>
2.72 + <ItemGroup>
2.73 + <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
2.74 + <Visible>False</Visible>
2.75 + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
2.76 + <Install>false</Install>
2.77 + </BootstrapperPackage>
2.78 + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
2.79 + <Visible>False</Visible>
2.80 + <ProductName>.NET Framework 3.5 SP1</ProductName>
2.81 + <Install>true</Install>
2.82 + </BootstrapperPackage>
2.83 + <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
2.84 + <Visible>False</Visible>
2.85 + <ProductName>Windows Installer 3.1</ProductName>
2.86 + <Install>true</Install>
2.87 + </BootstrapperPackage>
2.88 + </ItemGroup>
2.89 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
2.90 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
2.91 Other similar extension points exist, see Microsoft.Common.targets.
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/External/Aga.Controls/Aga.Controls.sln Sun May 27 16:08:54 2012 +0000
3.3 @@ -0,0 +1,20 @@
3.4 +
3.5 +Microsoft Visual Studio Solution File, Format Version 11.00
3.6 +# Visual Studio 2010
3.7 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
3.8 +EndProject
3.9 +Global
3.10 + GlobalSection(SolutionConfigurationPlatforms) = preSolution
3.11 + Debug|Any CPU = Debug|Any CPU
3.12 + Release|Any CPU = Release|Any CPU
3.13 + EndGlobalSection
3.14 + GlobalSection(ProjectConfigurationPlatforms) = postSolution
3.15 + {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3.16 + {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
3.17 + {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
3.18 + {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
3.19 + EndGlobalSection
3.20 + GlobalSection(SolutionProperties) = preSolution
3.21 + HideSolutionNode = FALSE
3.22 + EndGlobalSection
3.23 +EndGlobal
4.1 --- a/External/Aga.Controls/Properties/Resources.Designer.cs Sun May 27 15:16:19 2012 +0000
4.2 +++ b/External/Aga.Controls/Properties/Resources.Designer.cs Sun May 27 16:08:54 2012 +0000
4.3 @@ -1,7 +1,7 @@
4.4 //------------------------------------------------------------------------------
4.5 // <auto-generated>
4.6 // This code was generated by a tool.
4.7 -// Runtime Version:2.0.50727.3053
4.8 +// Runtime Version:4.0.30319.235
4.9 //
4.10 // Changes to this file may cause incorrect behavior and will be lost if
4.11 // the code is regenerated.
4.12 @@ -19,7 +19,7 @@
4.13 // class via a tool like ResGen or Visual Studio.
4.14 // To add or remove a member, edit your .ResX file then rerun ResGen
4.15 // with the /str option, or rebuild your VS project.
4.16 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
4.17 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
4.18 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
4.19 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
4.20 internal class Resources {
5.1 --- a/External/Aga.Controls/Tree/NodeControls/BaseTextControl.cs Sun May 27 15:16:19 2012 +0000
5.2 +++ b/External/Aga.Controls/Tree/NodeControls/BaseTextControl.cs Sun May 27 16:08:54 2012 +0000
5.3 @@ -233,7 +233,7 @@
5.4 backgroundBrush = SystemBrushes.InactiveBorder;
5.5 }
5.6 else if (context.DrawSelection == DrawSelectionMode.FullRowSelect)
5.7 - textColor = SystemColors.HighlightText;
5.8 + textColor = SystemColors.ControlText;
5.9
5.10 if (!context.Enabled)
5.11 textColor = SystemColors.GrayText;
6.1 --- a/External/Aga.Controls/Tree/TreeNodeAdv.cs Sun May 27 15:16:19 2012 +0000
6.2 +++ b/External/Aga.Controls/Tree/TreeNodeAdv.cs Sun May 27 16:08:54 2012 +0000
6.3 @@ -336,7 +336,7 @@
6.4 set { _isExpandingNow = value; }
6.5 }
6.6
6.7 - private bool _autoExpandOnStructureChanged = false;
6.8 + private bool _autoExpandOnStructureChanged = true;
6.9 public bool AutoExpandOnStructureChanged
6.10 {
6.11 get { return _autoExpandOnStructureChanged; }
7.1 --- a/External/Aga.Controls/Tree/TreeViewAdv.Draw.cs Sun May 27 15:16:19 2012 +0000
7.2 +++ b/External/Aga.Controls/Tree/TreeViewAdv.Draw.cs Sun May 27 16:08:54 2012 +0000
7.3 @@ -135,6 +135,10 @@
7.4
7.5 OnRowDraw(e, node, context, row, rowRect);
7.6
7.7 + if ((GridLineStyle & GridLineStyle.Horizontal) == GridLineStyle.Horizontal) {
7.8 + e.Graphics.DrawLine(LightGrayPen, 0, rowRect.Bottom, e.Graphics.ClipBounds.Right, rowRect.Bottom);
7.9 + }
7.10 +
7.11 if (FullRowSelect)
7.12 {
7.13 context.DrawFocus = false;
7.14 @@ -143,26 +147,26 @@
7.15 Rectangle focusRect = new Rectangle(OffsetX, rowRect.Y, ClientRectangle.Width, rowRect.Height);
7.16 if (context.DrawSelection == DrawSelectionMode.Active)
7.17 {
7.18 - e.Graphics.FillRectangle(SystemBrushes.Highlight, focusRect);
7.19 + e.Graphics.FillRectangle(GrayBrush, focusRect);
7.20 context.DrawSelection = DrawSelectionMode.FullRowSelect;
7.21 }
7.22 else
7.23 {
7.24 - e.Graphics.FillRectangle(SystemBrushes.InactiveBorder, focusRect);
7.25 + e.Graphics.FillRectangle(GrayBrush, focusRect);
7.26 context.DrawSelection = DrawSelectionMode.None;
7.27 }
7.28 }
7.29 }
7.30
7.31 - if ((GridLineStyle & GridLineStyle.Horizontal) == GridLineStyle.Horizontal)
7.32 - e.Graphics.DrawLine(SystemPens.InactiveBorder, 0, rowRect.Bottom, e.Graphics.ClipBounds.Right, rowRect.Bottom);
7.33 -
7.34 if (ShowLines)
7.35 DrawLines(e.Graphics, node, rowRect);
7.36
7.37 DrawNode(node, context);
7.38 }
7.39
7.40 + private Brush GrayBrush = new SolidBrush(Color.FromArgb(240, 240, 240));
7.41 + private Pen LightGrayPen = new Pen(Color.FromArgb(247, 247, 247));
7.42 +
7.43 private void DrawVerticalGridLines(Graphics gr, int y)
7.44 {
7.45 int x = 0;
8.1 --- a/External/Aga.Controls/Tree/TreeViewAdv.Properties.cs Sun May 27 15:16:19 2012 +0000
8.2 +++ b/External/Aga.Controls/Tree/TreeViewAdv.Properties.cs Sun May 27 16:08:54 2012 +0000
8.3 @@ -326,8 +326,7 @@
8.4 }
8.5 }
8.6
8.7 - // Tahoma is the default font
8.8 - private static Font _font = new Font("Tahoma", 8.25F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)), false);
8.9 + private static Font _font = SystemFonts.MessageBoxFont;
8.10 /// <summary>
8.11 /// The font to render <see cref="TreeViewAdv"/> content in.
8.12 /// </summary>