diff --git a/Eve-O-Preview/Presentation/MainPresenter.cs b/Eve-O-Preview/Presentation/MainPresenter.cs index 71b9d68..0dc4621 100644 --- a/Eve-O-Preview/Presentation/MainPresenter.cs +++ b/Eve-O-Preview/Presentation/MainPresenter.cs @@ -54,6 +54,7 @@ namespace EveOPreview.UI { this.LoadApplicationSettings(); this.View.SetForumUrl(MainPresenter.ForumUrl); + this.View.SetVersionInfo(this.GetApplicationVersion()); if (this._configuration.MinimizeToTray) { this.View.Minimize(); @@ -222,6 +223,12 @@ namespace EveOPreview.UI Process.Start(processStartInfo); } + private string GetApplicationVersion() + { + Version version = System.Reflection.Assembly.GetEntryAssembly().GetName().Version; + return String.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Revision); + } + private void ExitApplication() { this._exitApplication = true; diff --git a/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs b/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs index bc611ec..2aec563 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs +++ b/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs @@ -55,7 +55,6 @@ namespace EveOPreview.UI System.Windows.Forms.Panel AboutPanel; System.Windows.Forms.Label DescriptionLabel; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - System.Windows.Forms.Label VersionLabel; System.Windows.Forms.Label NameLabel; this.EnableClientLayoutTrackingCheckBox = new System.Windows.Forms.CheckBox(); this.HideActiveClientThumbnailCheckBox = new System.Windows.Forms.CheckBox(); @@ -85,10 +84,11 @@ namespace EveOPreview.UI this.ShowThumbnailOverlaysCheckBox = new System.Windows.Forms.CheckBox(); this.ShowThumbnailFramesCheckBox = new System.Windows.Forms.CheckBox(); this.ThumbnailsList = new System.Windows.Forms.CheckedListBox(); + this.label1 = new System.Windows.Forms.Label(); + this.VersionLabel = new System.Windows.Forms.Label(); this.ForumLinkLabel = new System.Windows.Forms.LinkLabel(); this.NotifyIcon = new System.Windows.Forms.NotifyIcon(this.components); this.TrayMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.label1 = new System.Windows.Forms.Label(); RestoreWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); TitleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -112,7 +112,6 @@ namespace EveOPreview.UI AboutTabPage = new System.Windows.Forms.TabPage(); AboutPanel = new System.Windows.Forms.Panel(); DescriptionLabel = new System.Windows.Forms.Label(); - VersionLabel = new System.Windows.Forms.Label(); NameLabel = new System.Windows.Forms.Label(); ContentTabControl.SuspendLayout(); GeneralTabPage.SuspendLayout(); @@ -741,7 +740,7 @@ namespace EveOPreview.UI AboutPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; AboutPanel.Controls.Add(this.label1); AboutPanel.Controls.Add(DescriptionLabel); - AboutPanel.Controls.Add(VersionLabel); + AboutPanel.Controls.Add(this.VersionLabel); AboutPanel.Controls.Add(NameLabel); AboutPanel.Controls.Add(this.ForumLinkLabel); AboutPanel.Dock = System.Windows.Forms.DockStyle.Fill; @@ -750,6 +749,15 @@ namespace EveOPreview.UI AboutPanel.Size = new System.Drawing.Size(262, 210); AboutPanel.TabIndex = 2; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(0, 157); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(206, 13); + this.label1.TabIndex = 6; + this.label1.Text = "For more information visit our forum thread:"; + // // DescriptionLabel // DescriptionLabel.Location = new System.Drawing.Point(0, 41); @@ -760,13 +768,13 @@ namespace EveOPreview.UI // // VersionLabel // - VersionLabel.AutoSize = true; - VersionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - VersionLabel.Location = new System.Drawing.Point(140, 9); - VersionLabel.Name = "VersionLabel"; - VersionLabel.Size = new System.Drawing.Size(112, 20); - VersionLabel.TabIndex = 4; - VersionLabel.Text = "v ##.###.###"; + this.VersionLabel.AutoSize = true; + this.VersionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.VersionLabel.Location = new System.Drawing.Point(133, 9); + this.VersionLabel.Name = "VersionLabel"; + this.VersionLabel.Size = new System.Drawing.Size(49, 20); + this.VersionLabel.TabIndex = 4; + this.VersionLabel.Text = "1.0.0"; // // NameLabel // @@ -807,15 +815,6 @@ namespace EveOPreview.UI this.TrayMenu.Name = "contextMenuStrip1"; this.TrayMenu.Size = new System.Drawing.Size(152, 76); // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(0, 157); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(206, 13); - this.label1.TabIndex = 6; - this.label1.Text = "For more information visit our forum thread:"; - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -894,7 +893,8 @@ namespace EveOPreview.UI private CheckBox ShowThumbnailOverlaysCheckBox; private CheckBox ShowThumbnailFramesCheckBox; private CheckedListBox ThumbnailsList; - private LinkLabel ForumLinkLabel; + private LinkLabel DocumentationLink; private Label label1; + private Label VersionLabel; } } \ No newline at end of file diff --git a/Eve-O-Preview/UI/Implementation/MainForm.cs b/Eve-O-Preview/UI/Implementation/MainForm.cs index 88a364b..71b92fc 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.cs +++ b/Eve-O-Preview/UI/Implementation/MainForm.cs @@ -200,6 +200,11 @@ namespace EveOPreview.UI this.ForumLinkLabel.Text = url; } + public void SetDocumentationUrl(string url) + { + this.DocumentationLink.Text = url; + } + public void AddThumbnails(IList thumbnails) { if (thumbnails.Count == 0) diff --git a/Eve-O-Preview/UI/Implementation/MainForm.resx b/Eve-O-Preview/UI/Implementation/MainForm.resx index 66b5c55..562c799 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.resx +++ b/Eve-O-Preview/UI/Implementation/MainForm.resx @@ -132,204 +132,60 @@ False - - True - False - - True - False - - True - - - True - - - True - - - True - - - True - - - True - - - True - False - - True - False - - True - False - - True - False - - True - - - True - - - True - - - True - False - - True - - - True - False - - True - False - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - False - - True - - - True - - - True - False - - True - False - - True - - - True - - - True - - - True - - - True - - - True - False - - True - False - - True - - - True - False - - True - False - - True - False - - True - - - True - False - - True - An advanced task switcher for EVE Online clients. @@ -339,21 +195,9 @@ The program does NOT - broadcast any keyboard or mouse events - anyhow interact with EVE Online except of bringing its main window to foreground or resizing it - - False - - - True - False - - True - - - True - 17, 17 @@ -940,9 +784,6 @@ The program does NOT AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////// - - True - 36 diff --git a/Eve-O-Preview/UI/Interface/IMainView.cs b/Eve-O-Preview/UI/Interface/IMainView.cs index b6193ad..bc43e39 100644 --- a/Eve-O-Preview/UI/Interface/IMainView.cs +++ b/Eve-O-Preview/UI/Interface/IMainView.cs @@ -33,6 +33,7 @@ namespace EveOPreview.UI Color ActiveClientHighlightColor { get; set; } void SetForumUrl(string url); + void SetVersionInfo(string version); void SetThumbnailSizeLimitations(Size minimumSize, Size maximumSize); void Minimize();