mujiannan/Analysis-Services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Annotation

Browse Source
This commit is contained in:
Christian Wade 2019-12-05 16:01:10 -08:00
parent 169c36d3cb
commit 7b6526a516
6 changed files with 162 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
BismNormalizer/AlmToolkit/About.Designer.cs generated
View File

@ -40,20 +40,20 @@
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.okButton.Location = new System.Drawing.Point(292, 109);
this.okButton.Margin = new System.Windows.Forms.Padding(4);
this.okButton.Location = new System.Drawing.Point(511, 198);
this.okButton.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(100, 31);
this.okButton.Size = new System.Drawing.Size(175, 56);
this.okButton.TabIndex = 24;
this.okButton.Text = "&OK";
//
// logoPictureBox
//
this.logoPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("logoPictureBox.Image")));
this.logoPictureBox.Location = new System.Drawing.Point(16, 11);
this.logoPictureBox.Margin = new System.Windows.Forms.Padding(4);
this.logoPictureBox.Location = new System.Drawing.Point(28, 20);
this.logoPictureBox.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.logoPictureBox.Name = "logoPictureBox";
this.logoPictureBox.Size = new System.Drawing.Size(84, 83);
this.logoPictureBox.Size = new System.Drawing.Size(147, 150);
this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.logoPictureBox.TabIndex = 12;
this.logoPictureBox.TabStop = false;
@ -61,27 +61,30 @@
// lblProductVersion
//
this.lblProductVersion.AutoSize = true;
this.lblProductVersion.Location = new System.Drawing.Point(117, 44);
this.lblProductVersion.Location = new System.Drawing.Point(205, 80);
this.lblProductVersion.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lblProductVersion.Name = "lblProductVersion";
this.lblProductVersion.Size = new System.Drawing.Size(45, 16);
this.lblProductVersion.Size = new System.Drawing.Size(79, 29);
this.lblProductVersion.TabIndex = 26;
this.lblProductVersion.Text = "label1";
//
// lblProductName
//
this.lblProductName.AutoSize = true;
this.lblProductName.Location = new System.Drawing.Point(117, 11);
this.lblProductName.Location = new System.Drawing.Point(205, 20);
this.lblProductName.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lblProductName.Name = "lblProductName";
this.lblProductName.Size = new System.Drawing.Size(45, 16);
this.lblProductName.Size = new System.Drawing.Size(79, 29);
this.lblProductName.TabIndex = 27;
this.lblProductName.Text = "label1";
//
// linkDocumentation
//
this.linkDocumentation.AutoSize = true;
this.linkDocumentation.Location = new System.Drawing.Point(117, 78);
this.linkDocumentation.Location = new System.Drawing.Point(205, 141);
this.linkDocumentation.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.linkDocumentation.Name = "linkDocumentation";
this.linkDocumentation.Size = new System.Drawing.Size(98, 16);
this.linkDocumentation.Size = new System.Drawing.Size(174, 29);
this.linkDocumentation.TabIndex = 28;
this.linkDocumentation.TabStop = true;
this.linkDocumentation.Text = "Documentation";
@ -90,20 +93,21 @@
// About
//
this.AcceptButton = this.okButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(408, 155);
this.CancelButton = this.okButton;
this.ClientSize = new System.Drawing.Size(714, 281);
this.Controls.Add(this.linkDocumentation);
this.Controls.Add(this.lblProductName);
this.Controls.Add(this.lblProductVersion);
this.Controls.Add(this.logoPictureBox);
this.Controls.Add(this.okButton);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(4);
this.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "About";
this.Padding = new System.Windows.Forms.Padding(12, 11, 12, 11);
this.Padding = new System.Windows.Forms.Padding(21, 20, 21, 20);
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

8
BismNormalizer/AlmToolkit/ComparisonForm.cs
View File

@ -379,7 +379,7 @@ namespace AlmToolkit
{
if (_comparisonInfo.ConnectionInfoSource.UseDesktop)
{
txtSource.Text = "PBI Desktop/SSDT: " + _comparisonInfo.ConnectionInfoSource.DesktopName;
txtSource.Text = "PBI Desktop/SSDT: " + _comparisonInfo.ConnectionInfoSource.ServerName + ";" + _comparisonInfo.ConnectionInfoSource.DesktopName;
}
else if (_comparisonInfo.ConnectionInfoSource.UseBimFile)
{
@ -392,7 +392,7 @@ namespace AlmToolkit
if (_comparisonInfo.ConnectionInfoTarget.UseDesktop)
{
txtTarget.Text = "PBI Desktop/SSDT: " + _comparisonInfo.ConnectionInfoTarget.DesktopName;
txtTarget.Text = "PBI Desktop/SSDT: " + _comparisonInfo.ConnectionInfoTarget.ServerName + ";" + _comparisonInfo.ConnectionInfoTarget.DesktopName;
}
else if (_comparisonInfo.ConnectionInfoTarget.UseBimFile)
{
@ -627,7 +627,7 @@ namespace AlmToolkit
private void btnUpdate_Click(object sender, EventArgs e)
{
if (MessageBox.Show($"Are you sure you want to update target {(_comparisonInfo.ConnectionInfoTarget.UseProject ? "project" : "database")}?", Utils.AssemblyProduct, MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
if (MessageBox.Show($"Are you sure you want to update target?", Utils.AssemblyProduct, MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
{
return;
}
@ -648,7 +648,7 @@ namespace AlmToolkit
toolStripStatusLabel1.Text = "ALM Toolkit - finished committing changes";
SetNotComparedState();
if (update && MessageBox.Show($"Updated {(_comparisonInfo.ConnectionInfoTarget.UseProject ? "project " + _comparisonInfo.ConnectionInfoTarget.ProjectName : "database " + _comparisonInfo.ConnectionInfoTarget.DatabaseName)}.\n\nDo you want to refresh the comparison?", Utils.AssemblyProduct, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
if (update && MessageBox.Show($"Updated the target.\n\nDo you want to refresh the comparison?", Utils.AssemblyProduct, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
this.CompareTabularModels();
}

8
BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs
View File

@ -1704,6 +1704,14 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
/// <returns>Boolean indicating whether update was successful.</returns>
public bool Update()
{
//Set model annotation for telemetry tagging later
const string AnnotationName = "__BNorm";
Tom.Annotation annotationBNorm = new Tom.Annotation();
annotationBNorm.Name = AnnotationName;
annotationBNorm.Value = "1";
if (!_model.TomModel.Annotations.Contains(AnnotationName))
_model.TomModel.Annotations.Add(annotationBNorm);
if (_connectionInfo.UseBimFile)
{
SaveBimFile();

4
BismNormalizer/BismNormalizer/TabularCompare/UI/ComparisonControl.cs
View File

@ -903,7 +903,7 @@ namespace BismNormalizer.TabularCompare.UI
private void btnUpdate_Click(object sender, EventArgs e)
{
if (MessageBox.Show($"Are you sure you want to update target {(_comparisonInfo.ConnectionInfoTarget.UseProject ? "project" : "database")}?", _bismNormalizerCaption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
if (MessageBox.Show($"Are you sure you want to update target?", _bismNormalizerCaption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
{
return;
}
@ -925,7 +925,7 @@ namespace BismNormalizer.TabularCompare.UI
}
SetNotComparedState();
if (update && MessageBox.Show($"Updated {(_comparisonInfo.ConnectionInfoTarget.UseProject ? "project " + _comparisonInfo.ConnectionInfoTarget.ProjectName : "database " + _comparisonInfo.ConnectionInfoTarget.DatabaseName)}.\n\nDo you want to refresh the comparison?", _bismNormalizerCaption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
if (update && MessageBox.Show($"Updated the target.\n\nDo you want to refresh the comparison?", _bismNormalizerCaption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
this.CompareTabularModels();
}

220
BismNormalizer/BismNormalizer/TabularCompare/UI/ConnectionsAlmt.Designer.cs generated
View File

@ -81,10 +81,11 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cboSourceDatabase.FormattingEnabled = true;
this.cboSourceDatabase.Location = new System.Drawing.Point(11, 39);
this.cboSourceDatabase.Location = new System.Drawing.Point(26, 87);
this.cboSourceDatabase.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.cboSourceDatabase.MaxDropDownItems = 11;
this.cboSourceDatabase.Name = "cboSourceDatabase";
this.cboSourceDatabase.Size = new System.Drawing.Size(396, 21);
this.cboSourceDatabase.Size = new System.Drawing.Size(942, 37);
this.cboSourceDatabase.TabIndex = 2;
this.cboSourceDatabase.Enter += new System.EventHandler(this.cboSourceDatabase_Enter);
//
@ -94,28 +95,31 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cboSourceServer.FormattingEnabled = true;
this.cboSourceServer.Location = new System.Drawing.Point(11, 7);
this.cboSourceServer.Location = new System.Drawing.Point(26, 16);
this.cboSourceServer.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.cboSourceServer.MaxDropDownItems = 11;
this.cboSourceServer.Name = "cboSourceServer";
this.cboSourceServer.Size = new System.Drawing.Size(396, 21);
this.cboSourceServer.Size = new System.Drawing.Size(942, 37);
this.cboSourceServer.TabIndex = 1;
this.cboSourceServer.TextChanged += new System.EventHandler(this.cboSourceServer_TextChanged);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(33, 99);
this.label2.Location = new System.Drawing.Point(77, 221);
this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(44, 13);
this.label2.Size = new System.Drawing.Size(100, 29);
this.label2.TabIndex = 2;
this.label2.Text = "Dataset";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(33, 67);
this.label1.Location = new System.Drawing.Point(77, 149);
this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(62, 13);
this.label1.Size = new System.Drawing.Size(140, 29);
this.label1.TabIndex = 1;
this.label1.Text = "Workspace";
//
@ -125,9 +129,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.pnlSourceDataset.Controls.Add(this.cboSourceServer);
this.pnlSourceDataset.Controls.Add(this.cboSourceDatabase);
this.pnlSourceDataset.Location = new System.Drawing.Point(100, 57);
this.pnlSourceDataset.Location = new System.Drawing.Point(233, 127);
this.pnlSourceDataset.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.pnlSourceDataset.Name = "pnlSourceDataset";
this.pnlSourceDataset.Size = new System.Drawing.Size(416, 66);
this.pnlSourceDataset.Size = new System.Drawing.Size(994, 147);
this.pnlSourceDataset.TabIndex = 1;
//
// grpSource
@ -144,8 +149,10 @@
this.grpSource.Dock = System.Windows.Forms.DockStyle.Top;
this.grpSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.grpSource.Location = new System.Drawing.Point(0, 0);
this.grpSource.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.grpSource.Name = "grpSource";
this.grpSource.Size = new System.Drawing.Size(522, 211);
this.grpSource.Padding = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.grpSource.Size = new System.Drawing.Size(1241, 471);
this.grpSource.TabIndex = 16;
this.grpSource.TabStop = false;
//
@ -156,20 +163,21 @@
this.pnlSourceFile.Controls.Add(this.btnSourceFileOpen);
this.pnlSourceFile.Controls.Add(this.txtSourceFile);
this.pnlSourceFile.Enabled = false;
this.pnlSourceFile.Location = new System.Drawing.Point(100, 166);
this.pnlSourceFile.Location = new System.Drawing.Point(233, 370);
this.pnlSourceFile.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.pnlSourceFile.Name = "pnlSourceFile";
this.pnlSourceFile.Size = new System.Drawing.Size(416, 31);
this.pnlSourceFile.Size = new System.Drawing.Size(994, 69);
this.pnlSourceFile.TabIndex = 21;
//
// btnSourceFileOpen
//
this.btnSourceFileOpen.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.btnSourceFileOpen.Location = new System.Drawing.Point(380, 7);
this.btnSourceFileOpen.Margin = new System.Windows.Forms.Padding(2);
this.btnSourceFileOpen.Location = new System.Drawing.Point(910, 16);
this.btnSourceFileOpen.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.btnSourceFileOpen.Name = "btnSourceFileOpen";
this.btnSourceFileOpen.Size = new System.Drawing.Size(27, 20);
this.btnSourceFileOpen.TabIndex = 1;
this.btnSourceFileOpen.Size = new System.Drawing.Size(63, 45);
this.btnSourceFileOpen.TabIndex = 7;
this.btnSourceFileOpen.Text = "...";
this.btnSourceFileOpen.UseVisualStyleBackColor = true;
this.btnSourceFileOpen.Click += new System.EventHandler(this.btnSourceFileOpen_Click);
@ -179,11 +187,11 @@
this.txtSourceFile.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.txtSourceFile.Location = new System.Drawing.Point(11, 7);
this.txtSourceFile.Margin = new System.Windows.Forms.Padding(2);
this.txtSourceFile.Location = new System.Drawing.Point(26, 16);
this.txtSourceFile.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.txtSourceFile.Name = "txtSourceFile";
this.txtSourceFile.Size = new System.Drawing.Size(365, 20);
this.txtSourceFile.TabIndex = 0;
this.txtSourceFile.Size = new System.Drawing.Size(869, 36);
this.txtSourceFile.TabIndex = 6;
//
// pnlSourceDesktop
//
@ -191,9 +199,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.pnlSourceDesktop.Controls.Add(this.cboSourceDesktop);
this.pnlSourceDesktop.Enabled = false;
this.pnlSourceDesktop.Location = new System.Drawing.Point(172, 129);
this.pnlSourceDesktop.Location = new System.Drawing.Point(401, 288);
this.pnlSourceDesktop.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.pnlSourceDesktop.Name = "pnlSourceDesktop";
this.pnlSourceDesktop.Size = new System.Drawing.Size(344, 31);
this.pnlSourceDesktop.Size = new System.Drawing.Size(826, 69);
this.pnlSourceDesktop.TabIndex = 19;
//
// cboSourceDesktop
@ -204,19 +213,21 @@
this.cboSourceDesktop.DisplayMember = "Name";
this.cboSourceDesktop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboSourceDesktop.FormattingEnabled = true;
this.cboSourceDesktop.Location = new System.Drawing.Point(11, 8);
this.cboSourceDesktop.Location = new System.Drawing.Point(26, 18);
this.cboSourceDesktop.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.cboSourceDesktop.MaxDropDownItems = 11;
this.cboSourceDesktop.Name = "cboSourceDesktop";
this.cboSourceDesktop.Size = new System.Drawing.Size(324, 21);
this.cboSourceDesktop.TabIndex = 9;
this.cboSourceDesktop.Size = new System.Drawing.Size(774, 37);
this.cboSourceDesktop.TabIndex = 4;
//
// rdoSourceFile
//
this.rdoSourceFile.AutoSize = true;
this.rdoSourceFile.Location = new System.Drawing.Point(15, 174);
this.rdoSourceFile.Location = new System.Drawing.Point(35, 388);
this.rdoSourceFile.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.rdoSourceFile.Name = "rdoSourceFile";
this.rdoSourceFile.Size = new System.Drawing.Size(41, 17);
this.rdoSourceFile.TabIndex = 11;
this.rdoSourceFile.Size = new System.Drawing.Size(85, 33);
this.rdoSourceFile.TabIndex = 5;
this.rdoSourceFile.Text = "File";
this.rdoSourceFile.UseVisualStyleBackColor = true;
this.rdoSourceFile.CheckedChanged += new System.EventHandler(this.rdoSourceFile_CheckedChanged);
@ -224,10 +235,11 @@
// rdoSourceDesktop
//
this.rdoSourceDesktop.AutoSize = true;
this.rdoSourceDesktop.Location = new System.Drawing.Point(15, 138);
this.rdoSourceDesktop.Location = new System.Drawing.Point(35, 308);
this.rdoSourceDesktop.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.rdoSourceDesktop.Name = "rdoSourceDesktop";
this.rdoSourceDesktop.Size = new System.Drawing.Size(151, 17);
this.rdoSourceDesktop.TabIndex = 5;
this.rdoSourceDesktop.Size = new System.Drawing.Size(333, 33);
this.rdoSourceDesktop.TabIndex = 3;
this.rdoSourceDesktop.Text = "Power BI Desktop / SSDT";
this.rdoSourceDesktop.UseVisualStyleBackColor = true;
this.rdoSourceDesktop.CheckedChanged += new System.EventHandler(this.rdoSourceDesktop_CheckedChanged);
@ -236,10 +248,11 @@
//
this.rdoSourceDataset.AutoSize = true;
this.rdoSourceDataset.Checked = true;
this.rdoSourceDataset.Location = new System.Drawing.Point(15, 34);
this.rdoSourceDataset.Location = new System.Drawing.Point(35, 76);
this.rdoSourceDataset.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.rdoSourceDataset.Name = "rdoSourceDataset";
this.rdoSourceDataset.Size = new System.Drawing.Size(62, 17);
this.rdoSourceDataset.TabIndex = 4;
this.rdoSourceDataset.Size = new System.Drawing.Size(131, 33);
this.rdoSourceDataset.TabIndex = 0;
this.rdoSourceDataset.TabStop = true;
this.rdoSourceDataset.Text = "Dataset";
this.rdoSourceDataset.UseVisualStyleBackColor = true;
@ -249,9 +262,10 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label5.Location = new System.Drawing.Point(12, 9);
this.label5.Location = new System.Drawing.Point(28, 20);
this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 17);
this.label5.Size = new System.Drawing.Size(116, 36);
this.label5.TabIndex = 3;
this.label5.Text = "Source";
//
@ -259,10 +273,11 @@
//
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(362, 10);
this.btnOK.Location = new System.Drawing.Point(868, 22);
this.btnOK.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(69, 23);
this.btnOK.TabIndex = 6;
this.btnOK.Size = new System.Drawing.Size(161, 51);
this.btnOK.TabIndex = 17;
this.btnOK.Text = "OK";
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
@ -271,10 +286,11 @@
//
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(437, 10);
this.btnCancel.Location = new System.Drawing.Point(1043, 22);
this.btnCancel.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(71, 23);
this.btnCancel.TabIndex = 7;
this.btnCancel.Size = new System.Drawing.Size(166, 51);
this.btnCancel.TabIndex = 18;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
//
@ -282,10 +298,11 @@
//
this.btnSwitch.BackgroundImage = global::BismNormalizer.Resources.ButtonSwitch;
this.btnSwitch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.btnSwitch.Location = new System.Drawing.Point(236, 3);
this.btnSwitch.Location = new System.Drawing.Point(551, 7);
this.btnSwitch.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.btnSwitch.Name = "btnSwitch";
this.btnSwitch.Size = new System.Drawing.Size(56, 32);
this.btnSwitch.TabIndex = 3;
this.btnSwitch.Size = new System.Drawing.Size(131, 71);
this.btnSwitch.TabIndex = 8;
this.btnSwitch.UseVisualStyleBackColor = true;
this.btnSwitch.Click += new System.EventHandler(this.btnSwitch_Click);
//
@ -294,20 +311,20 @@
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, 473);
this.panel2.Margin = new System.Windows.Forms.Padding(1);
this.panel2.Location = new System.Drawing.Point(0, 1070);
this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(522, 45);
this.panel2.Size = new System.Drawing.Size(1241, 100);
this.panel2.TabIndex = 22;
//
// panel1
//
this.panel1.Controls.Add(this.btnSwitch);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 211);
this.panel1.Margin = new System.Windows.Forms.Padding(1);
this.panel1.Location = new System.Drawing.Point(0, 471);
this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(522, 38);
this.panel1.Size = new System.Drawing.Size(1241, 85);
this.panel1.TabIndex = 25;
//
// grpTarget
@ -322,9 +339,11 @@
this.grpTarget.Controls.Add(this.label4);
this.grpTarget.Controls.Add(this.pnlTargetDataset);
this.grpTarget.Dock = System.Windows.Forms.DockStyle.Top;
this.grpTarget.Location = new System.Drawing.Point(0, 249);
this.grpTarget.Location = new System.Drawing.Point(0, 556);
this.grpTarget.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.grpTarget.Name = "grpTarget";
this.grpTarget.Size = new System.Drawing.Size(522, 218);
this.grpTarget.Padding = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.grpTarget.Size = new System.Drawing.Size(1241, 486);
this.grpTarget.TabIndex = 26;
this.grpTarget.TabStop = false;
//
@ -335,20 +354,21 @@
this.pnlTargetFile.Controls.Add(this.btnTargetFileOpen);
this.pnlTargetFile.Controls.Add(this.txtTargetFile);
this.pnlTargetFile.Enabled = false;
this.pnlTargetFile.Location = new System.Drawing.Point(100, 173);
this.pnlTargetFile.Location = new System.Drawing.Point(233, 386);
this.pnlTargetFile.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.pnlTargetFile.Name = "pnlTargetFile";
this.pnlTargetFile.Size = new System.Drawing.Size(416, 31);
this.pnlTargetFile.Size = new System.Drawing.Size(994, 69);
this.pnlTargetFile.TabIndex = 21;
//
// btnTargetFileOpen
//
this.btnTargetFileOpen.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.btnTargetFileOpen.Location = new System.Drawing.Point(380, 3);
this.btnTargetFileOpen.Margin = new System.Windows.Forms.Padding(2);
this.btnTargetFileOpen.Location = new System.Drawing.Point(910, 7);
this.btnTargetFileOpen.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.btnTargetFileOpen.Name = "btnTargetFileOpen";
this.btnTargetFileOpen.Size = new System.Drawing.Size(27, 20);
this.btnTargetFileOpen.TabIndex = 2;
this.btnTargetFileOpen.Size = new System.Drawing.Size(63, 45);
this.btnTargetFileOpen.TabIndex = 16;
this.btnTargetFileOpen.Text = "...";
this.btnTargetFileOpen.UseVisualStyleBackColor = true;
this.btnTargetFileOpen.Click += new System.EventHandler(this.btnTargetFileOpen_Click);
@ -358,19 +378,20 @@
this.txtTargetFile.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.txtTargetFile.Location = new System.Drawing.Point(11, 3);
this.txtTargetFile.Margin = new System.Windows.Forms.Padding(2);
this.txtTargetFile.Location = new System.Drawing.Point(26, 7);
this.txtTargetFile.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.txtTargetFile.Name = "txtTargetFile";
this.txtTargetFile.Size = new System.Drawing.Size(365, 20);
this.txtTargetFile.TabIndex = 1;
this.txtTargetFile.Size = new System.Drawing.Size(869, 35);
this.txtTargetFile.TabIndex = 15;
//
// rdoTargetFile
//
this.rdoTargetFile.AutoSize = true;
this.rdoTargetFile.Location = new System.Drawing.Point(15, 178);
this.rdoTargetFile.Location = new System.Drawing.Point(35, 397);
this.rdoTargetFile.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.rdoTargetFile.Name = "rdoTargetFile";
this.rdoTargetFile.Size = new System.Drawing.Size(41, 17);
this.rdoTargetFile.TabIndex = 20;
this.rdoTargetFile.Size = new System.Drawing.Size(85, 33);
this.rdoTargetFile.TabIndex = 14;
this.rdoTargetFile.Text = "File";
this.rdoTargetFile.UseVisualStyleBackColor = true;
this.rdoTargetFile.CheckedChanged += new System.EventHandler(this.rdoTargetFile_CheckedChanged);
@ -381,9 +402,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.pnlTargetDesktop.Controls.Add(this.cboTargetDesktop);
this.pnlTargetDesktop.Enabled = false;
this.pnlTargetDesktop.Location = new System.Drawing.Point(172, 132);
this.pnlTargetDesktop.Location = new System.Drawing.Point(401, 294);
this.pnlTargetDesktop.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.pnlTargetDesktop.Name = "pnlTargetDesktop";
this.pnlTargetDesktop.Size = new System.Drawing.Size(344, 31);
this.pnlTargetDesktop.Size = new System.Drawing.Size(826, 69);
this.pnlTargetDesktop.TabIndex = 19;
//
// cboTargetDesktop
@ -394,19 +416,21 @@
this.cboTargetDesktop.DisplayMember = "Name";
this.cboTargetDesktop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboTargetDesktop.FormattingEnabled = true;
this.cboTargetDesktop.Location = new System.Drawing.Point(10, 8);
this.cboTargetDesktop.Location = new System.Drawing.Point(23, 18);
this.cboTargetDesktop.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.cboTargetDesktop.MaxDropDownItems = 11;
this.cboTargetDesktop.Name = "cboTargetDesktop";
this.cboTargetDesktop.Size = new System.Drawing.Size(325, 21);
this.cboTargetDesktop.TabIndex = 9;
this.cboTargetDesktop.Size = new System.Drawing.Size(776, 37);
this.cboTargetDesktop.TabIndex = 13;
//
// rdoTargetDesktop
//
this.rdoTargetDesktop.AutoSize = true;
this.rdoTargetDesktop.Location = new System.Drawing.Point(15, 141);
this.rdoTargetDesktop.Location = new System.Drawing.Point(35, 315);
this.rdoTargetDesktop.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.rdoTargetDesktop.Name = "rdoTargetDesktop";
this.rdoTargetDesktop.Size = new System.Drawing.Size(151, 17);
this.rdoTargetDesktop.TabIndex = 18;
this.rdoTargetDesktop.Size = new System.Drawing.Size(321, 33);
this.rdoTargetDesktop.TabIndex = 12;
this.rdoTargetDesktop.Text = "Power BI Desktop / SSDT";
this.rdoTargetDesktop.UseVisualStyleBackColor = true;
this.rdoTargetDesktop.CheckedChanged += new System.EventHandler(this.rdoTargetDesktop_CheckedChanged);
@ -415,10 +439,11 @@
//
this.rdoTargetDataset.AutoSize = true;
this.rdoTargetDataset.Checked = true;
this.rdoTargetDataset.Location = new System.Drawing.Point(15, 37);
this.rdoTargetDataset.Location = new System.Drawing.Point(35, 83);
this.rdoTargetDataset.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.rdoTargetDataset.Name = "rdoTargetDataset";
this.rdoTargetDataset.Size = new System.Drawing.Size(62, 17);
this.rdoTargetDataset.TabIndex = 17;
this.rdoTargetDataset.Size = new System.Drawing.Size(125, 33);
this.rdoTargetDataset.TabIndex = 9;
this.rdoTargetDataset.TabStop = true;
this.rdoTargetDataset.Text = "Dataset";
this.rdoTargetDataset.UseVisualStyleBackColor = true;
@ -428,27 +453,30 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label6.Location = new System.Drawing.Point(12, 9);
this.label6.Location = new System.Drawing.Point(28, 20);
this.label6.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(56, 17);
this.label6.Size = new System.Drawing.Size(106, 36);
this.label6.TabIndex = 16;
this.label6.Text = "Target";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(33, 70);
this.label3.Location = new System.Drawing.Point(77, 156);
this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(62, 13);
this.label3.Size = new System.Drawing.Size(134, 29);
this.label3.TabIndex = 4;
this.label3.Text = "Workspace";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(33, 102);
this.label4.Location = new System.Drawing.Point(77, 228);
this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(44, 13);
this.label4.Size = new System.Drawing.Size(94, 29);
this.label4.TabIndex = 5;
this.label4.Text = "Dataset";
//
@ -458,9 +486,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.pnlTargetDataset.Controls.Add(this.cboTargetServer);
this.pnlTargetDataset.Controls.Add(this.cboTargetDatabase);
this.pnlTargetDataset.Location = new System.Drawing.Point(100, 60);
this.pnlTargetDataset.Location = new System.Drawing.Point(233, 134);
this.pnlTargetDataset.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.pnlTargetDataset.Name = "pnlTargetDataset";
this.pnlTargetDataset.Size = new System.Drawing.Size(416, 66);
this.pnlTargetDataset.Size = new System.Drawing.Size(994, 147);
this.pnlTargetDataset.TabIndex = 15;
//
// cboTargetServer
@ -469,11 +498,12 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cboTargetServer.FormattingEnabled = true;
this.cboTargetServer.Location = new System.Drawing.Point(11, 7);
this.cboTargetServer.Location = new System.Drawing.Point(26, 16);
this.cboTargetServer.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.cboTargetServer.MaxDropDownItems = 11;
this.cboTargetServer.Name = "cboTargetServer";
this.cboTargetServer.Size = new System.Drawing.Size(396, 21);
this.cboTargetServer.TabIndex = 4;
this.cboTargetServer.Size = new System.Drawing.Size(942, 37);
this.cboTargetServer.TabIndex = 10;
this.cboTargetServer.TextChanged += new System.EventHandler(this.cboTargetServer_TextChanged);
//
// cboTargetDatabase
@ -482,25 +512,27 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cboTargetDatabase.FormattingEnabled = true;
this.cboTargetDatabase.Location = new System.Drawing.Point(11, 39);
this.cboTargetDatabase.Location = new System.Drawing.Point(26, 87);
this.cboTargetDatabase.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.cboTargetDatabase.MaxDropDownItems = 11;
this.cboTargetDatabase.Name = "cboTargetDatabase";
this.cboTargetDatabase.Size = new System.Drawing.Size(396, 21);
this.cboTargetDatabase.TabIndex = 5;
this.cboTargetDatabase.Size = new System.Drawing.Size(942, 37);
this.cboTargetDatabase.TabIndex = 11;
this.cboTargetDatabase.Enter += new System.EventHandler(this.cboTargetDatabase_Enter);
//
// ConnectionsAlmt
//
this.AcceptButton = this.btnOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(522, 518);
this.ClientSize = new System.Drawing.Size(1241, 1170);
this.Controls.Add(this.grpTarget);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.grpSource);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ConnectionsAlmt";

2
BismNormalizer/BismNormalizer/TabularCompare/UI/ConnectionsAlmt.cs
View File

@ -37,6 +37,8 @@ namespace BismNormalizer.TabularCompare.UI
//this.Width = Convert.ToInt32(this.Width * 1.3);
this.Height = Convert.ToInt32(grpSource.Height * 2.6);
if (_dpiScaleFactor > 1)
{
//DPI