diff --git a/AboutForm.Designer.cs b/AboutForm.Designer.cs index eaa4954..47797f6 100755 --- a/AboutForm.Designer.cs +++ b/AboutForm.Designer.cs @@ -32,17 +32,22 @@ private void InitializeComponent() this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.CrcVersionLabel = new System.Windows.Forms.Label(); this.OcpVersion = new System.Windows.Forms.Label(); this.TrayVersion = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // label1 @@ -53,9 +58,9 @@ private void InitializeComponent() this.label1.Location = new System.Drawing.Point(2, 0); this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(256, 21); + this.label1.Size = new System.Drawing.Size(253, 21); this.label1.TabIndex = 5; - this.label1.Text = "Red Hat CodeReady Containers version:"; + this.label1.Text = "Red Hat CodeReady Containers version"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label2 @@ -66,9 +71,9 @@ private void InitializeComponent() this.label2.Location = new System.Drawing.Point(2, 21); this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(357, 21); + this.label2.Size = new System.Drawing.Size(354, 21); this.label2.TabIndex = 6; - this.label2.Text = "Red Hat OpenShift Container platform bundled version:"; + this.label2.Text = "Red Hat OpenShift Container Platform bundled version"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label3 @@ -79,9 +84,9 @@ private void InitializeComponent() this.label3.Location = new System.Drawing.Point(2, 42); this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(87, 25); + this.label3.Size = new System.Drawing.Size(85, 25); this.label3.TabIndex = 7; - this.label3.Text = "Tray version:"; + this.label3.Text = "Tray Version"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // linkLabel1 @@ -90,41 +95,16 @@ private void InitializeComponent() this.linkLabel1.Dock = System.Windows.Forms.DockStyle.Fill; this.linkLabel1.Font = new System.Drawing.Font("Calibri", 9.857143F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.linkLabel1.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; - this.linkLabel1.Location = new System.Drawing.Point(25, 0); + this.linkLabel1.Location = new System.Drawing.Point(2, 0); this.linkLabel1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(116, 23); + this.linkLabel1.Size = new System.Drawing.Size(98, 23); this.linkLabel1.TabIndex = 8; this.linkLabel1.TabStop = true; this.linkLabel1.Text = "Documentation"; this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // - // pictureBox2 - // - this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox2.Image = global::tray_windows.Resource.crc_logo; - this.pictureBox2.Location = new System.Drawing.Point(157, 7); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(217, 93); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox2.TabIndex = 1; - this.pictureBox2.TabStop = false; - // - // pictureBox3 - // - this.pictureBox3.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBox3.Image = global::tray_windows.Resource.web_icon; - this.pictureBox3.Location = new System.Drawing.Point(2, 2); - this.pictureBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(19, 19); - this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox3.TabIndex = 11; - this.pictureBox3.TabStop = false; - // // CrcVersionLabel // this.CrcVersionLabel.AutoSize = true; @@ -170,7 +150,7 @@ private void InitializeComponent() this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2); this.tableLayoutPanel1.Controls.Add(this.CrcVersionLabel, 1, 0); this.tableLayoutPanel1.Location = new System.Drawing.Point(11, 142); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); @@ -182,40 +162,113 @@ private void InitializeComponent() // tableLayoutPanel2 // this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 23F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 91.98113F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel2.Controls.Add(this.pictureBox3, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.linkLabel1, 1, 0); - this.tableLayoutPanel2.Location = new System.Drawing.Point(193, 262); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tableLayoutPanel2.Controls.Add(this.linkLabel1, 0, 0); + this.tableLayoutPanel2.Location = new System.Drawing.Point(11, 265); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(2); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(143, 23); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(125, 23); this.tableLayoutPanel2.TabIndex = 17; // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 2; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 91.98113F)); + this.tableLayoutPanel3.Controls.Add(this.pictureBox1, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.linkLabel2, 1, 0); + this.tableLayoutPanel3.Location = new System.Drawing.Point(395, 263); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(2); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 1; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(124, 23); + this.tableLayoutPanel3.TabIndex = 18; + // + // linkLabel2 + // + this.linkLabel2.AutoSize = true; + this.linkLabel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.linkLabel2.Font = new System.Drawing.Font("Calibri", 9.857143F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.linkLabel2.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.linkLabel2.Location = new System.Drawing.Point(27, 0); + this.linkLabel2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(95, 23); + this.linkLabel2.TabIndex = 8; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "Tray Repository"; + this.linkLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked_1); + // + // pictureBox1 + // + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox1.Image = global::tray_windows.Resource.gh_icon; + this.pictureBox1.Location = new System.Drawing.Point(2, 2); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(21, 19); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 11; + this.pictureBox1.TabStop = false; + // + // pictureBox3 + // + this.pictureBox3.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox3.Image = global::tray_windows.Resource.external_link; + this.pictureBox3.Location = new System.Drawing.Point(104, 2); + this.pictureBox3.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(19, 19); + this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox3.TabIndex = 12; + this.pictureBox3.TabStop = false; + // + // pictureBox2 + // + this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pictureBox2.Image = global::tray_windows.Resource.crc_logo; + this.pictureBox2.Location = new System.Drawing.Point(157, 7); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(217, 93); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 1; + this.pictureBox2.TabStop = false; + // // AboutForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(530, 305); + this.Controls.Add(this.tableLayoutPanel3); this.Controls.Add(this.tableLayoutPanel2); this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.pictureBox2); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AboutForm"; this.ShowInTaskbar = false; this.Text = "AboutForm"; this.Load += new System.EventHandler(this.AboutForm_Load); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -227,11 +280,14 @@ private void InitializeComponent() private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; private System.Windows.Forms.LinkLabel linkLabel1; - private System.Windows.Forms.PictureBox pictureBox3; private System.Windows.Forms.Label CrcVersionLabel; private System.Windows.Forms.Label OcpVersion; private System.Windows.Forms.Label TrayVersion; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.LinkLabel linkLabel2; + private System.Windows.Forms.PictureBox pictureBox3; } } \ No newline at end of file diff --git a/AboutForm.cs b/AboutForm.cs index 369809b..5dd4ae1 100755 --- a/AboutForm.cs +++ b/AboutForm.cs @@ -58,11 +58,6 @@ private void AboutForm_FormClosing(object sender, FormClosingEventArgs e) e.Cancel = true; // this cancels the close event. } - private void TrayGHRepoLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - System.Diagnostics.Process.Start("https://github.com/code-ready/tray-windows"); - } - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { var crcVersionWithGitSha = version.CrcVersion.Split('+'); @@ -70,5 +65,10 @@ private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs var docsUrl = string.Format("https://access.redhat.com/documentation/en-us/red_hat_codeready_containers/{0}/", v); System.Diagnostics.Process.Start(docsUrl); } + + private void linkLabel2_LinkClicked_1(object sender, LinkLabelLinkClickedEventArgs e) + { + System.Diagnostics.Process.Start("https://github.com/code-ready/tray-windows"); + } } } diff --git a/Resource.Designer.cs b/Resource.Designer.cs index 61d3100..543054d 100755 --- a/Resource.Designer.cs +++ b/Resource.Designer.cs @@ -70,6 +70,16 @@ internal static System.Drawing.Bitmap crc_logo { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap external_link { + get { + object obj = ResourceManager.GetObject("external_link", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Resource.resx b/Resource.resx index a2e44bf..7bf47cc 100755 --- a/Resource.resx +++ b/Resource.resx @@ -121,6 +121,9 @@ Resources\Logo-Red_Hat-CodeReady_Containers-B-Standard-RGB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\external-link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\iconfinder_mark-github_298822.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Resources/external-link.png b/Resources/external-link.png new file mode 100755 index 0000000..b8523dc Binary files /dev/null and b/Resources/external-link.png differ diff --git a/tray-windows.csproj b/tray-windows.csproj index 2defa63..5337b20 100755 --- a/tray-windows.csproj +++ b/tray-windows.csproj @@ -200,6 +200,12 @@ + + + + + +