From 8afdea035402eaeeb1b9e5cc49b0e56348bc9a33 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Thu, 13 Jan 2022 16:46:03 -0800 Subject: [PATCH] Options dialog HDPI fix --- .../AlmToolkit/Properties/AssemblyInfo.cs | 4 +- .../AlmToolkitSetup/AlmToolkitSetup.vdproj | 141 +++++++++-- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../BismNormalizer.IconSetup.exe | Bin 10240 -> 10240 bytes .../BismNormalizer/BismNormalizer.exe | Bin 16384 -> 16384 bytes .../BismNormalizer/Properties/AssemblyInfo.cs | 4 +- .../UI/ConnectionsAlmt.Designer.cs | 218 +++++++++--------- .../TabularCompare/UI/Options.Designer.cs | 154 +++++++------ .../TabularCompare/UI/Options.cs | 7 +- .../source.extension.vsixmanifest | 2 +- 11 files changed, 334 insertions(+), 204 deletions(-) diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index cf57d52..323fff8 100644 --- a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs +++ b/BismNormalizer/AlmToolkit/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("5.0.24.0")] -[assembly: AssemblyFileVersion("5.0.24.0")] +[assembly: AssemblyVersion("5.0.28.0")] +[assembly: AssemblyFileVersion("5.0.28.0")] diff --git a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj index d2a6e89..9025af4 100644 --- a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj +++ b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj @@ -21,12 +21,6 @@ } "Entry" { - "MsmKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" @@ -46,6 +40,12 @@ "Entry" { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" "OwnerKey" = "8:_3BA1BB04BE8689BEF79234210621C61F" "MsmSig" = "8:_UNDEFINED" } @@ -309,6 +309,12 @@ } "Entry" { + "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1BC4692718F94CD799480D14260E2A0D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -357,6 +363,12 @@ } "Entry" { + "MsmKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_24119C3E255B44849B7051DE458A42AA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -532,6 +544,12 @@ "Entry" { "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -652,6 +670,12 @@ "Entry" { "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } @@ -994,6 +1018,12 @@ "Entry" { "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1107,6 +1137,12 @@ } "Entry" { + "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7C66897615D04979AA00553FFBE9F869" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1162,6 +1198,12 @@ "Entry" { "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1318,6 +1360,12 @@ "Entry" { "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1378,6 +1426,12 @@ "Entry" { "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1714,6 +1768,12 @@ "Entry" { "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1780,6 +1840,12 @@ "Entry" { "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" "MsmSig" = "8:_UNDEFINED" } @@ -2158,6 +2224,12 @@ "Entry" { "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" "OwnerKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "MsmSig" = "8:_UNDEFINED" } @@ -2241,6 +2313,12 @@ } "Entry" { + "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_EF0C782C601F42DE8C7EF094FA4ED82E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2476,6 +2554,12 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_0FD8120FEC5AB531A28085D3548D2C38" "MsmSig" = "8:_UNDEFINED" } @@ -2758,7 +2842,7 @@ { "Name" = "8:.NET Framework" "Message" = "8:[VSDNETMSG]" - "FrameworkVersion" = "8:v4.6.1 " + "FrameworkVersion" = "8:v4.6.1 " "AllowLaterVersions" = "11:FALSE" "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" } @@ -2770,7 +2854,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.23.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.27.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "ScatterAssemblies" { "_0020EC0A2900F50F0F5DCC3E7BBE4237" @@ -3703,6 +3787,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1F23AE629378259BAD7F2BCAB42727AD" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.27.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_1F23AE629378259BAD7F2BCAB42727AD" + { + "Name" = "8:BismNormalizer.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\BismNormalizer\\bin\\ReleaseObfusc\\BismNormalizer.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24119C3E255B44849B7051DE458A42AA" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\d3dcompiler_47.dll" @@ -6896,11 +7011,11 @@ { "_A5BA815907352422F79655A4124433EC" { - "Name" = "8:CefSharp.BrowserSubprocess.Core.DLL" + "Name" = "8:CefSharp.BrowserSubprocess.Core.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:CefSharp.BrowserSubprocess.Core.DLL" + "SourcePath" = "8:CefSharp.BrowserSubprocess.Core.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8B6F278685F945AF8D59CF597AF590B1" @@ -9173,15 +9288,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Power BI ALM Toolkit" - "ProductCode" = "8:{FA2840D9-205A-4631-ABC3-35994FC99A48}" - "PackageCode" = "8:{A1E02B12-3043-49DC-ABBD-BA84DE9430BF}" + "ProductCode" = "8:{224D820C-DDB9-48EE-8919-B08A0E34118B}" + "PackageCode" = "8:{C8A6939B-5F35-40A9-922F-F6E6A1FA284D}" "UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:5.0.24" + "ProductVersion" = "8:5.0.28" "Manufacturer" = "8:Power BI ALM Toolkit" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index 44fa44b..b16dc41 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("5.0.24.0")] -[assembly: AssemblyFileVersion("5.0.24.0")] +[assembly: AssemblyVersion("5.0.28.0")] +[assembly: AssemblyFileVersion("5.0.28.0")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index bd26234..46a8f09 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("5.0.24.0")] -[assembly: AssemblyFileVersion("5.0.24.0")] +[assembly: AssemblyVersion("5.0.28.0")] +[assembly: AssemblyFileVersion("5.0.28.0")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index e2e896a0bd5ed073aef83a046adc56923293e037..f2d0fb270f1625897deb79d343d24e6c84e31212 100644 GIT binary patch delta 134 zcmZn&Xb70l!Te?I{f*tf*%@Uvw{r+`3MizTfBVq3$z^Zv7c=(j?cJMK2tHwCw3ys0 z9IgXYn#ceIOh7Ed$iVQ&5Qv2t7=nUbf`eNSzMvKY(#*rWmle3K_1-{JudDh!2(QSKF>jmNax&E7{7#lHj$}li6umZ8n=JRIl XjEokW!!0HQsmZS`t$`eMtDCF<#mO!C delta 122 zcmZo@U~Fh$oY28s&@*FW_i|xIiOI$ys*DnwBSqY01SC{y3mpSu{dctO{@cqi+iCL# zgE%Helga$Xksu9|vyCMMlDS`tblfa)Y`t+@>i1)oBb%of8!>ZAFfcH%0 private void InitializeComponent() { - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOK = new System.Windows.Forms.Button(); this.chkRoles = new System.Windows.Forms.CheckBox(); this.chkPartitions = new System.Windows.Forms.CheckBox(); this.chkMeasureDependencies = new System.Windows.Forms.CheckBox(); @@ -48,45 +46,24 @@ this.chkAffectedTables = new System.Windows.Forms.CheckBox(); this.cboProcessingOption = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // - // btnCancel - // - this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(548, 991); - this.btnCancel.Margin = new System.Windows.Forms.Padding(6); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(150, 44); - this.btnCancel.TabIndex = 21; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - // - // btnOK - // - this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(388, 991); - this.btnOK.Margin = new System.Windows.Forms.Padding(6); - this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(150, 44); - this.btnOK.TabIndex = 20; - this.btnOK.Text = "OK"; - this.btnOK.UseVisualStyleBackColor = true; - this.btnOK.Click += new System.EventHandler(this.btnOK_Click); - // // chkRoles // this.chkRoles.AutoSize = true; this.chkRoles.Checked = true; this.chkRoles.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRoles.Location = new System.Drawing.Point(28, 233); + this.chkRoles.Location = new System.Drawing.Point(38, 233); this.chkRoles.Margin = new System.Windows.Forms.Padding(6); this.chkRoles.Name = "chkRoles"; this.chkRoles.Size = new System.Drawing.Size(166, 29); - this.chkRoles.TabIndex = 5; + this.chkRoles.TabIndex = 7; this.chkRoles.Text = "Include roles"; this.chkRoles.UseVisualStyleBackColor = true; this.chkRoles.CheckedChanged += new System.EventHandler(this.chkRoles_CheckedChanged); @@ -94,11 +71,11 @@ // chkPartitions // this.chkPartitions.AutoSize = true; - this.chkPartitions.Location = new System.Drawing.Point(28, 331); + this.chkPartitions.Location = new System.Drawing.Point(38, 331); this.chkPartitions.Margin = new System.Windows.Forms.Padding(6); this.chkPartitions.Name = "chkPartitions"; this.chkPartitions.Size = new System.Drawing.Size(451, 29); - this.chkPartitions.TabIndex = 6; + this.chkPartitions.TabIndex = 9; this.chkPartitions.Text = "Consider partitions when comparing tables"; this.chkPartitions.UseVisualStyleBackColor = true; // @@ -109,18 +86,18 @@ this.chkMeasureDependencies.AutoSize = true; this.chkMeasureDependencies.Checked = true; this.chkMeasureDependencies.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkMeasureDependencies.Location = new System.Drawing.Point(28, 655); + this.chkMeasureDependencies.Location = new System.Drawing.Point(38, 655); this.chkMeasureDependencies.Margin = new System.Windows.Forms.Padding(6); this.chkMeasureDependencies.Name = "chkMeasureDependencies"; this.chkMeasureDependencies.Size = new System.Drawing.Size(86, 29); - this.chkMeasureDependencies.TabIndex = 7; + this.chkMeasureDependencies.TabIndex = 15; this.chkMeasureDependencies.Text = "XXX"; this.chkMeasureDependencies.UseVisualStyleBackColor = true; // // chkPerspectives // this.chkPerspectives.AutoSize = true; - this.chkPerspectives.Location = new System.Drawing.Point(28, 46); + this.chkPerspectives.Location = new System.Drawing.Point(38, 46); this.chkPerspectives.Margin = new System.Windows.Forms.Padding(6); this.chkPerspectives.Name = "chkPerspectives"; this.chkPerspectives.Size = new System.Drawing.Size(241, 29); @@ -131,9 +108,6 @@ // // groupBox1 // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.Controls.Add(this.chkRetainRefreshPolicy); this.groupBox1.Controls.Add(this.chkRetainRoleMembers); this.groupBox1.Controls.Add(this.chkLineageTag); @@ -147,11 +121,12 @@ this.groupBox1.Controls.Add(this.chkMeasureDependencies); this.groupBox1.Controls.Add(this.chkPartitions); this.groupBox1.Controls.Add(this.chkRoles); - this.groupBox1.Location = new System.Drawing.Point(24, 21); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Margin = new System.Windows.Forms.Padding(6); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(6); - this.groupBox1.Size = new System.Drawing.Size(676, 739); + this.groupBox1.Size = new System.Drawing.Size(822, 756); this.groupBox1.TabIndex = 22; this.groupBox1.TabStop = false; this.groupBox1.Text = "Comparison Options"; @@ -159,11 +134,11 @@ // chkRetainRefreshPolicy // this.chkRetainRefreshPolicy.AutoSize = true; - this.chkRetainRefreshPolicy.Location = new System.Drawing.Point(28, 552); + this.chkRetainRefreshPolicy.Location = new System.Drawing.Point(38, 552); this.chkRetainRefreshPolicy.Margin = new System.Windows.Forms.Padding(6); this.chkRetainRefreshPolicy.Name = "chkRetainRefreshPolicy"; this.chkRetainRefreshPolicy.Size = new System.Drawing.Size(413, 29); - this.chkRetainRefreshPolicy.TabIndex = 15; + this.chkRetainRefreshPolicy.TabIndex = 13; this.chkRetainRefreshPolicy.Text = "For table updates, retain refresh policy"; this.chkRetainRefreshPolicy.UseVisualStyleBackColor = true; // @@ -172,33 +147,33 @@ this.chkRetainRoleMembers.AutoSize = true; this.chkRetainRoleMembers.Checked = true; this.chkRetainRoleMembers.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRetainRoleMembers.Location = new System.Drawing.Point(68, 277); + this.chkRetainRoleMembers.Location = new System.Drawing.Point(78, 277); this.chkRetainRoleMembers.Margin = new System.Windows.Forms.Padding(6); this.chkRetainRoleMembers.Name = "chkRetainRoleMembers"; this.chkRetainRoleMembers.Size = new System.Drawing.Size(361, 29); - this.chkRetainRoleMembers.TabIndex = 14; + this.chkRetainRoleMembers.TabIndex = 8; this.chkRetainRoleMembers.Text = "For role updates, retain members"; this.chkRetainRoleMembers.UseVisualStyleBackColor = true; // // chkLineageTag // this.chkLineageTag.AutoSize = true; - this.chkLineageTag.Location = new System.Drawing.Point(28, 390); + this.chkLineageTag.Location = new System.Drawing.Point(38, 390); this.chkLineageTag.Margin = new System.Windows.Forms.Padding(6); this.chkLineageTag.Name = "chkLineageTag"; this.chkLineageTag.Size = new System.Drawing.Size(413, 29); - this.chkLineageTag.TabIndex = 13; + this.chkLineageTag.TabIndex = 10; this.chkLineageTag.Text = "Consider LineageTag when comparing"; this.chkLineageTag.UseVisualStyleBackColor = true; // // chkRetainStorageMode // this.chkRetainStorageMode.AutoSize = true; - this.chkRetainStorageMode.Location = new System.Drawing.Point(28, 605); + this.chkRetainStorageMode.Location = new System.Drawing.Point(38, 605); this.chkRetainStorageMode.Margin = new System.Windows.Forms.Padding(6); this.chkRetainStorageMode.Name = "chkRetainStorageMode"; this.chkRetainStorageMode.Size = new System.Drawing.Size(415, 29); - this.chkRetainStorageMode.TabIndex = 12; + this.chkRetainStorageMode.TabIndex = 14; this.chkRetainStorageMode.Text = "For table updates, retain storage mode"; this.chkRetainStorageMode.UseVisualStyleBackColor = true; // @@ -206,22 +181,22 @@ // this.chkRetainPolicyPartitions.AutoSize = true; this.chkRetainPolicyPartitions.Enabled = false; - this.chkRetainPolicyPartitions.Location = new System.Drawing.Point(68, 492); + this.chkRetainPolicyPartitions.Location = new System.Drawing.Point(78, 492); this.chkRetainPolicyPartitions.Margin = new System.Windows.Forms.Padding(6); this.chkRetainPolicyPartitions.Name = "chkRetainPolicyPartitions"; this.chkRetainPolicyPartitions.Size = new System.Drawing.Size(447, 29); - this.chkRetainPolicyPartitions.TabIndex = 11; + this.chkRetainPolicyPartitions.TabIndex = 12; this.chkRetainPolicyPartitions.Text = "Retain only refresh-policy based partitions"; this.chkRetainPolicyPartitions.UseVisualStyleBackColor = true; // // chkRetainPartitions // this.chkRetainPartitions.AutoSize = true; - this.chkRetainPartitions.Location = new System.Drawing.Point(28, 452); + this.chkRetainPartitions.Location = new System.Drawing.Point(38, 452); this.chkRetainPartitions.Margin = new System.Windows.Forms.Padding(6); this.chkRetainPartitions.Name = "chkRetainPartitions"; this.chkRetainPartitions.Size = new System.Drawing.Size(372, 29); - this.chkRetainPartitions.TabIndex = 10; + this.chkRetainPartitions.TabIndex = 11; this.chkRetainPartitions.Text = "For table updates, retain partitions"; this.chkRetainPartitions.UseVisualStyleBackColor = true; this.chkRetainPartitions.CheckedChanged += new System.EventHandler(this.ChkRetainPartitions_CheckedChanged); @@ -230,22 +205,22 @@ // this.chkMergeCultures.AutoSize = true; this.chkMergeCultures.Enabled = false; - this.chkMergeCultures.Location = new System.Drawing.Point(68, 185); + this.chkMergeCultures.Location = new System.Drawing.Point(78, 185); this.chkMergeCultures.Margin = new System.Windows.Forms.Padding(6); this.chkMergeCultures.Name = "chkMergeCultures"; this.chkMergeCultures.Size = new System.Drawing.Size(546, 29); - this.chkMergeCultures.TabIndex = 9; + this.chkMergeCultures.TabIndex = 6; this.chkMergeCultures.Text = "For culture updates, merge translations (not replace)"; this.chkMergeCultures.UseVisualStyleBackColor = true; // // chkCultures // this.chkCultures.AutoSize = true; - this.chkCultures.Location = new System.Drawing.Point(28, 144); + this.chkCultures.Location = new System.Drawing.Point(38, 144); this.chkCultures.Margin = new System.Windows.Forms.Padding(6); this.chkCultures.Name = "chkCultures"; this.chkCultures.Size = new System.Drawing.Size(195, 29); - this.chkCultures.TabIndex = 8; + this.chkCultures.TabIndex = 5; this.chkCultures.Text = "Include cultures"; this.chkCultures.UseVisualStyleBackColor = true; this.chkCultures.CheckedChanged += new System.EventHandler(this.chkCultures_CheckedChanged); @@ -254,7 +229,7 @@ // this.chkMergePerspectives.AutoSize = true; this.chkMergePerspectives.Enabled = false; - this.chkMergePerspectives.Location = new System.Drawing.Point(68, 88); + this.chkMergePerspectives.Location = new System.Drawing.Point(78, 88); this.chkMergePerspectives.Margin = new System.Windows.Forms.Padding(6); this.chkMergePerspectives.Name = "chkMergePerspectives"; this.chkMergePerspectives.Size = new System.Drawing.Size(578, 29); @@ -264,16 +239,15 @@ // // groupBox2 // - this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.groupBox2.Controls.Add(this.chkAffectedTables); this.groupBox2.Controls.Add(this.cboProcessingOption); this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Location = new System.Drawing.Point(24, 774); + this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBox2.Location = new System.Drawing.Point(0, 756); this.groupBox2.Margin = new System.Windows.Forms.Padding(6); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(6); - this.groupBox2.Size = new System.Drawing.Size(676, 194); + this.groupBox2.Size = new System.Drawing.Size(822, 194); this.groupBox2.TabIndex = 23; this.groupBox2.TabStop = false; this.groupBox2.Text = "Database Deployment"; @@ -283,11 +257,11 @@ this.chkAffectedTables.AutoSize = true; this.chkAffectedTables.Checked = true; this.chkAffectedTables.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAffectedTables.Location = new System.Drawing.Point(28, 121); + this.chkAffectedTables.Location = new System.Drawing.Point(38, 121); this.chkAffectedTables.Margin = new System.Windows.Forms.Padding(6); this.chkAffectedTables.Name = "chkAffectedTables"; this.chkAffectedTables.Size = new System.Drawing.Size(315, 29); - this.chkAffectedTables.TabIndex = 9; + this.chkAffectedTables.TabIndex = 31; this.chkAffectedTables.Text = "Process only affected tables"; this.chkAffectedTables.UseVisualStyleBackColor = true; // @@ -301,33 +275,68 @@ "Default", "Do Not Process", "Full"}); - this.cboProcessingOption.Location = new System.Drawing.Point(228, 46); + this.cboProcessingOption.Location = new System.Drawing.Point(238, 46); this.cboProcessingOption.Margin = new System.Windows.Forms.Padding(6); this.cboProcessingOption.Name = "cboProcessingOption"; - this.cboProcessingOption.Size = new System.Drawing.Size(258, 33); - this.cboProcessingOption.TabIndex = 8; + this.cboProcessingOption.Size = new System.Drawing.Size(404, 33); + this.cboProcessingOption.TabIndex = 30; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(24, 54); + this.label1.Location = new System.Drawing.Point(34, 54); this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(194, 25); this.label1.TabIndex = 0; this.label1.Text = "Processing Option:"; // + // panel2 + // + this.panel2.Controls.Add(this.btnCancel); + this.panel2.Controls.Add(this.btnOK); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 972); + this.panel2.Margin = new System.Windows.Forms.Padding(2); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(822, 86); + this.panel2.TabIndex = 24; + // + // btnCancel + // + this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(652, 19); + this.btnCancel.Margin = new System.Windows.Forms.Padding(6); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(142, 44); + this.btnCancel.TabIndex = 36; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // btnOK + // + this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(502, 19); + this.btnOK.Margin = new System.Windows.Forms.Padding(6); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(138, 44); + this.btnOK.TabIndex = 35; + this.btnOK.Text = "OK"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // // Options // this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(724, 1066); + this.ClientSize = new System.Drawing.Size(822, 1058); + this.Controls.Add(this.panel2); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnOK); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Margin = new System.Windows.Forms.Padding(6); this.MaximizeBox = false; @@ -342,14 +351,12 @@ this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); + this.panel2.ResumeLayout(false); this.ResumeLayout(false); } #endregion - - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnOK; private System.Windows.Forms.CheckBox chkRoles; private System.Windows.Forms.CheckBox chkPartitions; private System.Windows.Forms.CheckBox chkMeasureDependencies; @@ -368,5 +375,8 @@ private System.Windows.Forms.CheckBox chkLineageTag; private System.Windows.Forms.CheckBox chkRetainRoleMembers; private System.Windows.Forms.CheckBox chkRetainRefreshPolicy; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; } } \ No newline at end of file diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs index 849597f..7099ac7 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs @@ -22,6 +22,10 @@ namespace BismNormalizer.TabularCompare.UI private void Options_Load(object sender, EventArgs e) { + this.Height = Convert.ToInt32(groupBox1.Height + groupBox2.Height + panel2.Height*2.1); + //MessageBox.Show($"Scale factor: {_dpiScaleFactor}\nSecondary scale factor: {Utils.SecondaryFudgeFactor}\n\n" + + // $"Groupbox1 height: {groupBox1.Height}\nGroupbox2 height: {groupBox2.Height}\nPanel2 height:{panel2.Height}\n\nForm height: {this.Height}"); + if (_dpiScaleFactor > 1) { float dpiScaleFactorFudged = _dpiScaleFactor * Utils.PrimaryFudgeFactor; @@ -38,6 +42,8 @@ namespace BismNormalizer.TabularCompare.UI } } this.cboProcessingOption.Left = label1.Right + Convert.ToInt32(12 * dpiScaleFactorFudged); + + //this.Height = Convert.ToInt32(this.Height * _dpiScaleFactor * Utils.SecondaryFudgeFactor); } this.KeyPreview = true; @@ -133,6 +139,5 @@ namespace BismNormalizer.TabularCompare.UI get { return _dpiScaleFactor; } set { _dpiScaleFactor = value; } } - } } diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index b090105..2865f5d 100644 --- a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest +++ b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + BISM Normalizer BISM Normalizer manages Analysis Services tabular models http://bism-normalizer.com/