Added the small modifications to the Aga.Controls required by the Ope…

…n Hardware Monitor.
me21 · May 27, 2012 · b18dfb5 · b18dfb5
1 parent 998a139
commit b18dfb5
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 16 deletions.
diff --git a/External/Aga.Controls.dll b/External/Aga.Controls.dll
diff --git a/External/Aga.Controls/Aga.Controls.csproj b/External/Aga.Controls/Aga.Controls.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,31 +18,53 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <SignAssembly>false</SignAssembly>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>Bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;PERF_TEST</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <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>
+    <CodeAnalysisRules>
+    </CodeAnalysisRules>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>Migrated rules for Aga.Controls.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>Bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -210,6 +233,23 @@
   <ItemGroup>
     <Content Include="Resources\DVSplit.cur" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/External/Aga.Controls/Aga.Controls.sln b/External/Aga.Controls/Aga.Controls.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/External/Aga.Controls/Properties/Resources.Designer.cs b/External/Aga.Controls/Properties/Resources.Designer.cs
diff --git a/External/Aga.Controls/Tree/NodeControls/BaseTextControl.cs b/External/Aga.Controls/Tree/NodeControls/BaseTextControl.cs
@@ -233,7 +233,7 @@ private void CreateBrushes(TreeNodeAdv node, DrawContext context, string text, o
                 backgroundBrush = SystemBrushes.InactiveBorder;
 			}
 			else if (context.DrawSelection == DrawSelectionMode.FullRowSelect)
-				textColor = SystemColors.HighlightText;
+				textColor = SystemColors.ControlText;
 
 			if (!context.Enabled)
 				textColor = SystemColors.GrayText;

diff --git a/External/Aga.Controls/Tree/TreeNodeAdv.cs b/External/Aga.Controls/Tree/TreeNodeAdv.cs
@@ -336,7 +336,7 @@ internal bool IsExpandingNow
 			set { _isExpandingNow = value; }
 		}
 
-		private bool _autoExpandOnStructureChanged = false;
+		private bool _autoExpandOnStructureChanged = true;
 		public bool AutoExpandOnStructureChanged
 		{
 			get { return _autoExpandOnStructureChanged; }

diff --git a/External/Aga.Controls/Tree/TreeViewAdv.Draw.cs b/External/Aga.Controls/Tree/TreeViewAdv.Draw.cs
@@ -135,6 +135,10 @@ private void DrawRow(PaintEventArgs e, ref DrawContext context, int row, Rectang
 
 			OnRowDraw(e, node, context, row, rowRect);
 
+			if ((GridLineStyle & GridLineStyle.Horizontal) == GridLineStyle.Horizontal) {
+				e.Graphics.DrawLine(LightGrayPen, 0, rowRect.Bottom, e.Graphics.ClipBounds.Right, rowRect.Bottom);
+      }
+
 			if (FullRowSelect)
 			{
 				context.DrawFocus = false;
@@ -143,26 +147,26 @@ private void DrawRow(PaintEventArgs e, ref DrawContext context, int row, Rectang
 					Rectangle focusRect = new Rectangle(OffsetX, rowRect.Y, ClientRectangle.Width, rowRect.Height);
 					if (context.DrawSelection == DrawSelectionMode.Active)
 					{
-						e.Graphics.FillRectangle(SystemBrushes.Highlight, focusRect);
+						e.Graphics.FillRectangle(GrayBrush, focusRect);
 						context.DrawSelection = DrawSelectionMode.FullRowSelect;
 					}
 					else
 					{
-						e.Graphics.FillRectangle(SystemBrushes.InactiveBorder, focusRect);
+						e.Graphics.FillRectangle(GrayBrush, focusRect);
 						context.DrawSelection = DrawSelectionMode.None;
 					}
 				}
 			}
 
-            if ((GridLineStyle & GridLineStyle.Horizontal) == GridLineStyle.Horizontal)
-				e.Graphics.DrawLine(SystemPens.InactiveBorder, 0, rowRect.Bottom, e.Graphics.ClipBounds.Right, rowRect.Bottom);
-
 			if (ShowLines)
 				DrawLines(e.Graphics, node, rowRect);
 
 			DrawNode(node, context);
 		}
 
+		private Brush GrayBrush = new SolidBrush(Color.FromArgb(240, 240, 240));
+		private Pen LightGrayPen = new Pen(Color.FromArgb(247, 247, 247));
+
 		private void DrawVerticalGridLines(Graphics gr, int y)
 		{
 			int x = 0;

diff --git a/External/Aga.Controls/Tree/TreeViewAdv.Properties.cs b/External/Aga.Controls/Tree/TreeViewAdv.Properties.cs
@@ -326,8 +326,7 @@ public ITreeModel Model
 			}
 		}
 
-        // Tahoma is the default font
-        private static Font _font = new Font("Tahoma", 8.25F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)), false);
+        private static Font _font = SystemFonts.MessageBoxFont; 
         /// <summary>
         /// The font to render <see cref="TreeViewAdv"/> content in.
         /// </summary>