From 98347e358d9efeda8514ba199a8beb4692c67552 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Fri, 13 Dec 2019 21:15:27 -0800 Subject: [PATCH] Improved about links --- BismNormalizer/AlmToolkit/About.Designer.cs | 83 +++++++++++---------- BismNormalizer/AlmToolkit/About.cs | 12 +-- BismNormalizer/AlmToolkit/Utils.cs | 24 ------ 3 files changed, 49 insertions(+), 70 deletions(-) diff --git a/BismNormalizer/AlmToolkit/About.Designer.cs b/BismNormalizer/AlmToolkit/About.Designer.cs index 8bc63c0..e8dcc00 100644 --- a/BismNormalizer/AlmToolkit/About.Designer.cs +++ b/BismNormalizer/AlmToolkit/About.Designer.cs @@ -32,7 +32,7 @@ this.logoPictureBox = new System.Windows.Forms.PictureBox(); this.lblProductVersion = new System.Windows.Forms.Label(); this.lblProductName = new System.Windows.Forms.Label(); - this.linkReleaseHistory = new System.Windows.Forms.LinkLabel(); + this.linkReportIssue = new System.Windows.Forms.LinkLabel(); this.linkDocumentation = new System.Windows.Forms.LinkLabel(); this.linkALMTWebsite = new System.Windows.Forms.LinkLabel(); this.linkLatestVersion = new System.Windows.Forms.LinkLabel(); @@ -45,18 +45,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(203, 204); + this.okButton.Location = new System.Drawing.Point(474, 455); + this.okButton.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 25); + 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(12, 9); + 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(63, 67); + this.logoPictureBox.Size = new System.Drawing.Size(147, 149); this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.logoPictureBox.TabIndex = 12; this.logoPictureBox.TabStop = false; @@ -64,10 +66,10 @@ // lblProductVersion // this.lblProductVersion.AutoSize = true; - this.lblProductVersion.Location = new System.Drawing.Point(89, 92); - this.lblProductVersion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblProductVersion.Location = new System.Drawing.Point(208, 205); + this.lblProductVersion.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lblProductVersion.Name = "lblProductVersion"; - this.lblProductVersion.Size = new System.Drawing.Size(35, 13); + this.lblProductVersion.Size = new System.Drawing.Size(79, 29); this.lblProductVersion.TabIndex = 26; this.lblProductVersion.Text = "label1"; // @@ -75,32 +77,32 @@ // this.lblProductName.AutoSize = true; this.lblProductName.Font = new System.Drawing.Font("Microsoft Sans Serif", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblProductName.Location = new System.Drawing.Point(88, 10); - this.lblProductName.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblProductName.Location = new System.Drawing.Point(205, 22); + this.lblProductName.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.lblProductName.Name = "lblProductName"; - this.lblProductName.Size = new System.Drawing.Size(64, 22); + this.lblProductName.Size = new System.Drawing.Size(132, 44); this.lblProductName.TabIndex = 27; this.lblProductName.Text = "label1"; // // linkReleaseHistory // - this.linkReleaseHistory.AutoSize = true; - this.linkReleaseHistory.Location = new System.Drawing.Point(89, 140); - this.linkReleaseHistory.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.linkReleaseHistory.Name = "linkReleaseHistory"; - this.linkReleaseHistory.Size = new System.Drawing.Size(79, 13); - this.linkReleaseHistory.TabIndex = 28; - this.linkReleaseHistory.TabStop = true; - this.linkReleaseHistory.Text = "Release history"; - this.linkReleaseHistory.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkReleaseHistory_LinkClicked); + this.linkReportIssue.AutoSize = true; + this.linkReportIssue.Location = new System.Drawing.Point(208, 312); + this.linkReportIssue.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.linkReportIssue.Name = "linkReleaseHistory"; + this.linkReportIssue.Size = new System.Drawing.Size(181, 29); + this.linkReportIssue.TabIndex = 28; + this.linkReportIssue.TabStop = true; + this.linkReportIssue.Text = "Report an issue"; + this.linkReportIssue.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkReportIssue_LinkClicked); // // linkDocumentation // this.linkDocumentation.AutoSize = true; - this.linkDocumentation.Location = new System.Drawing.Point(89, 68); - this.linkDocumentation.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.linkDocumentation.Location = new System.Drawing.Point(208, 152); + this.linkDocumentation.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.linkDocumentation.Name = "linkDocumentation"; - this.linkDocumentation.Size = new System.Drawing.Size(79, 13); + this.linkDocumentation.Size = new System.Drawing.Size(174, 29); this.linkDocumentation.TabIndex = 30; this.linkDocumentation.TabStop = true; this.linkDocumentation.Text = "Documentation"; @@ -109,10 +111,10 @@ // linkALMTWebsite // this.linkALMTWebsite.AutoSize = true; - this.linkALMTWebsite.Location = new System.Drawing.Point(89, 44); - this.linkALMTWebsite.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.linkALMTWebsite.Location = new System.Drawing.Point(208, 98); + this.linkALMTWebsite.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.linkALMTWebsite.Name = "linkALMTWebsite"; - this.linkALMTWebsite.Size = new System.Drawing.Size(113, 13); + this.linkALMTWebsite.Size = new System.Drawing.Size(242, 29); this.linkALMTWebsite.TabIndex = 31; this.linkALMTWebsite.TabStop = true; this.linkALMTWebsite.Text = "http://alm-toolkit.com/"; @@ -121,10 +123,10 @@ // linkLatestVersion // this.linkLatestVersion.AutoSize = true; - this.linkLatestVersion.Location = new System.Drawing.Point(89, 115); - this.linkLatestVersion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.linkLatestVersion.Location = new System.Drawing.Point(208, 257); + this.linkLatestVersion.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.linkLatestVersion.Name = "linkLatestVersion"; - this.linkLatestVersion.Size = new System.Drawing.Size(73, 13); + this.linkLatestVersion.Size = new System.Drawing.Size(161, 29); this.linkLatestVersion.TabIndex = 32; this.linkLatestVersion.TabStop = true; this.linkLatestVersion.Text = "Latest version"; @@ -134,20 +136,20 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(89, 166); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(208, 370); + this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(61, 13); + this.label1.Size = new System.Drawing.Size(136, 29); this.label1.TabIndex = 33; this.label1.Text = "Created by "; // // linkTwitter // this.linkTwitter.AutoSize = true; - this.linkTwitter.Location = new System.Drawing.Point(145, 166); - this.linkTwitter.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.linkTwitter.Location = new System.Drawing.Point(338, 370); + this.linkTwitter.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.linkTwitter.Name = "linkTwitter"; - this.linkTwitter.Size = new System.Drawing.Size(79, 13); + this.linkTwitter.Size = new System.Drawing.Size(176, 29); this.linkTwitter.TabIndex = 34; this.linkTwitter.TabStop = true; this.linkTwitter.Text = "Christian Wade"; @@ -156,25 +158,26 @@ // About // this.AcceptButton = this.okButton; - 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.okButton; - this.ClientSize = new System.Drawing.Size(290, 241); + this.ClientSize = new System.Drawing.Size(677, 538); this.Controls.Add(this.linkTwitter); this.Controls.Add(this.label1); this.Controls.Add(this.linkLatestVersion); this.Controls.Add(this.linkALMTWebsite); this.Controls.Add(this.linkDocumentation); - this.Controls.Add(this.linkReleaseHistory); + this.Controls.Add(this.linkReportIssue); 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(7, 7, 7, 7); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "About"; - this.Padding = new System.Windows.Forms.Padding(9); + this.Padding = new System.Windows.Forms.Padding(21, 20, 21, 20); this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -191,7 +194,7 @@ private System.Windows.Forms.PictureBox logoPictureBox; private System.Windows.Forms.Label lblProductVersion; private System.Windows.Forms.Label lblProductName; - private System.Windows.Forms.LinkLabel linkReleaseHistory; + private System.Windows.Forms.LinkLabel linkReportIssue; private System.Windows.Forms.LinkLabel linkDocumentation; private System.Windows.Forms.LinkLabel linkALMTWebsite; private System.Windows.Forms.LinkLabel linkLatestVersion; diff --git a/BismNormalizer/AlmToolkit/About.cs b/BismNormalizer/AlmToolkit/About.cs index db0f1ce..dc72dcc 100644 --- a/BismNormalizer/AlmToolkit/About.cs +++ b/BismNormalizer/AlmToolkit/About.cs @@ -45,19 +45,19 @@ namespace AlmToolkit linkLatestVersion.Visible = true; linkLatestVersion.Text = String.Format("Latest version {0}", _latestVersion); } - this.linkReleaseHistory.LinkVisited = false; + this.linkReportIssue.LinkVisited = false; } private void linkALMTWebsite_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { this.linkALMTWebsite.LinkVisited = true; - System.Diagnostics.Process.Start(Utils.AlmtWebsiteUrl); + System.Diagnostics.Process.Start("http://alm-toolkit.com/"); } private void linkDocumentation_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { this.linkDocumentation.LinkVisited = true; - System.Diagnostics.Process.Start(Utils.DocumentationUrl); + System.Diagnostics.Process.Start("https://github.com/microsoft/Analysis-Services/blob/master/BismNormalizer/Model%20Comparison%20and%20Merging%20for%20Analysis%20Services.pdf"); } private void linkLatestVersion_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -66,10 +66,10 @@ namespace AlmToolkit System.Diagnostics.Process.Start(Utils.LatestVersionDownloadUrl); } - private void linkReleaseHistory_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + private void linkReportIssue_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - this.linkReleaseHistory.LinkVisited = true; - System.Diagnostics.Process.Start(Utils.ReleaseHistoryUrl); + this.linkReportIssue.LinkVisited = true; + System.Diagnostics.Process.Start("https://github.com/microsoft/Analysis-Services/issues"); } private void linkTwitter_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) diff --git a/BismNormalizer/AlmToolkit/Utils.cs b/BismNormalizer/AlmToolkit/Utils.cs index 296b719..6433733 100644 --- a/BismNormalizer/AlmToolkit/Utils.cs +++ b/BismNormalizer/AlmToolkit/Utils.cs @@ -60,22 +60,6 @@ namespace AlmToolkit } } - public static string AlmtWebsiteUrl - { - get - { - return "http://alm-toolkit.com/"; - } - } - - public static string DocumentationUrl - { - get - { - return "https://github.com/microsoft/Analysis-Services/blob/master/BismNormalizer/Model%20Comparison%20and%20Merging%20for%20Analysis%20Services.pdf"; - } - } - public static string LatestVersionDownloadUrl { get @@ -83,13 +67,5 @@ namespace AlmToolkit return "https://github.com/microsoft/Analysis-Services/releases/latest/download/AlmToolkitSetup.msi"; } } - - public static string ReleaseHistoryUrl - { - get - { - return "https://github.com/microsoft/Analysis-Services/releases/latest"; - } - } } }