From 9c9477178e71b27ed1370d20ca746e73bbfa3e53 Mon Sep 17 00:00:00 2001 From: christianwade Date: Sun, 27 Aug 2017 12:58:38 -0700 Subject: [PATCH] More dpi --- .../BismNormalizer.CommandLine/App.config | 8 ---- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../BismNormalizer/BismNormalizer.csproj | 3 ++ .../BismNormalizer/Properties/AssemblyInfo.cs | 4 +- .../TabularCompare/UI/BlobCredentials.cs | 18 ++++++-- .../UI/ImpersonationCredentials.cs | 20 ++++++-- BismNormalizer/BismNormalizer/app.config | 2 +- BismNormalizer/BismNormalizer/packages.config | 1 + .../source.extension.vsixmanifest | 46 +++++++++---------- 10 files changed, 63 insertions(+), 47 deletions(-) diff --git a/BismNormalizer/BismNormalizer.CommandLine/App.config b/BismNormalizer/BismNormalizer.CommandLine/App.config index 959051b..a375bc0 100644 --- a/BismNormalizer/BismNormalizer.CommandLine/App.config +++ b/BismNormalizer/BismNormalizer.CommandLine/App.config @@ -3,12 +3,4 @@ - - - - - - - - diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index 241b25f..84eaaef 100644 --- a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0.0.13")] -[assembly: AssemblyFileVersion("4.0.0.13")] +[assembly: AssemblyVersion("4.0.0.14")] +[assembly: AssemblyFileVersion("4.0.0.14")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 864ffc8..811c429 100644 --- a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0.0.13")] -[assembly: AssemblyFileVersion("4.0.0.13")] +[assembly: AssemblyVersion("4.0.0.14")] +[assembly: AssemblyFileVersion("4.0.0.14")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.csproj b/BismNormalizer/BismNormalizer/BismNormalizer.csproj index c1277a6..8c0a239 100644 --- a/BismNormalizer/BismNormalizer/BismNormalizer.csproj +++ b/BismNormalizer/BismNormalizer/BismNormalizer.csproj @@ -170,6 +170,9 @@ ..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll True + + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + True diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs index a951c85..917d3aa 100644 --- a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0.0.13")] -[assembly: AssemblyFileVersion("4.0.0.13")] +[assembly: AssemblyVersion("4.0.0.14")] +[assembly: AssemblyFileVersion("4.0.0.14")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/BlobCredentials.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/BlobCredentials.cs index 6cee6ad..d6d593a 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/BlobCredentials.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/BlobCredentials.cs @@ -52,12 +52,22 @@ namespace BismNormalizer.TabularCompare.UI float dpiScaleFactorFudged = _dpiScaleFactor * HighDPIUtils.PrimaryFudgeFactor; this.Scale(new SizeF(dpiScaleFactorFudged * 0.44f, dpiScaleFactorFudged * 0.38f)); - this.Width = Convert.ToInt32(this.Width * dpiScaleFactorFudged * 0.6f); + this.Width = Convert.ToInt32(this.Width * dpiScaleFactorFudged * 0.8f); foreach (Control control in HighDPIUtils.GetChildInControl(this)) { - control.Font = new Font(control.Font.FontFamily, - control.Font.Size * dpiScaleFactorFudged * HighDPIUtils.PrimaryFudgeFactor, - control.Font.Style); + if (control is Button) + { + control.Font = new Font(control.Font.FontFamily, + control.Font.Size * dpiScaleFactorFudged * 1.1f * HighDPIUtils.PrimaryFudgeFactor, + control.Font.Style); + } + else + { + control.Font = new Font(control.Font.FontFamily, + //cbw todo check * 1.4f works on remote desktop setting + control.Font.Size * dpiScaleFactorFudged * 1.4f * HighDPIUtils.PrimaryFudgeFactor, + control.Font.Style); + } } } diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/ImpersonationCredentials.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/ImpersonationCredentials.cs index c246e9f..6a60e58 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/ImpersonationCredentials.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/ImpersonationCredentials.cs @@ -56,14 +56,24 @@ namespace BismNormalizer.TabularCompare.UI { //DPI float dpiScaleFactorFudged = _dpiScaleFactor * HighDPIUtils.PrimaryFudgeFactor; - - this.Scale(new SizeF(dpiScaleFactorFudged * 0.44f, dpiScaleFactorFudged * 0.38f)); + this.Scale(new SizeF(dpiScaleFactorFudged * 0.44f, dpiScaleFactorFudged * 0.35f)); this.Width = Convert.ToInt32(this.Width * dpiScaleFactorFudged * 0.6f); + foreach (Control control in HighDPIUtils.GetChildInControl(this)) { - control.Font = new Font(control.Font.FontFamily, - control.Font.Size * dpiScaleFactorFudged * HighDPIUtils.PrimaryFudgeFactor, - control.Font.Style); + if (control is Button) + { + control.Font = new Font(control.Font.FontFamily, + control.Font.Size * dpiScaleFactorFudged * 1.1f * HighDPIUtils.PrimaryFudgeFactor, + control.Font.Style); + } + else + { + control.Font = new Font(control.Font.FontFamily, + //cbw todo check * 1.4f works on remote desktop setting + control.Font.Size * dpiScaleFactorFudged * 1.4f * HighDPIUtils.PrimaryFudgeFactor, + control.Font.Style); + } } } diff --git a/BismNormalizer/BismNormalizer/app.config b/BismNormalizer/BismNormalizer/app.config index f803b17..0de6272 100644 --- a/BismNormalizer/BismNormalizer/app.config +++ b/BismNormalizer/BismNormalizer/app.config @@ -80,7 +80,7 @@ - + diff --git a/BismNormalizer/BismNormalizer/packages.config b/BismNormalizer/BismNormalizer/packages.config index 38b501f..1fa392f 100644 --- a/BismNormalizer/BismNormalizer/packages.config +++ b/BismNormalizer/BismNormalizer/packages.config @@ -17,4 +17,5 @@ + \ No newline at end of file diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index d83f827..8eaeb7f 100644 --- a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest +++ b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest @@ -1,26 +1,26 @@  - - - BISM Normalizer - BISM Normalizer manages Analysis Services tabular models - http://bism-normalizer.com/ - Resources\LicenseTerms.txt - Resources\BismNormalizerLogo.png - Resources\BismNormalizerLogoText.png - - - - - - - - - - - - - - - + + + BISM Normalizer + BISM Normalizer manages Analysis Services tabular models + http://bism-normalizer.com/ + Resources\LicenseTerms.txt + Resources\BismNormalizerLogo.png + Resources\BismNormalizerLogoText.png + + + + + + + + + + + + + + +