From 05e90580e4a87709ad35ccea7a58b9ab70748771 Mon Sep 17 00:00:00 2001
From: Kim <kimknight@gmail.com>
Date: Tue, 1 Sep 2020 00:15:23 +1000
Subject: [PATCH] Put the assembly description into the MainWindow title bar
and about window - for Pre-release/Debug versions.
---
remoteapp-tool/RemoteAppAboutWindow.vb | 2 +-
remoteapp-tool/RemoteAppMainWindow.vb | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/remoteapp-tool/RemoteAppAboutWindow.vb b/remoteapp-tool/RemoteAppAboutWindow.vb
index b23684c..9d67a01 100644
--- a/remoteapp-tool/RemoteAppAboutWindow.vb
+++ b/remoteapp-tool/RemoteAppAboutWindow.vb
@@ -6,7 +6,7 @@ Public Class RemoteAppAboutWindow
Private Sub RemoteAppAboutWindow_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Me.Text = "About " & My.Application.Info.Title
Me.TitleLabel.Text = My.Application.Info.Title
- Me.VersionLabel.Text = "Version " & My.Application.Info.Version.ToString
+ Me.VersionLabel.Text = "Version " & My.Application.Info.Version.ToString & " " & My.Application.Info.Description.ToLower
End Sub
Private Sub SiteLinkLabel_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles SiteLinkLabel.LinkClicked
diff --git a/remoteapp-tool/RemoteAppMainWindow.vb b/remoteapp-tool/RemoteAppMainWindow.vb
index 6935d7f..ef50b44 100644
--- a/remoteapp-tool/RemoteAppMainWindow.vb
+++ b/remoteapp-tool/RemoteAppMainWindow.vb
@@ -22,7 +22,12 @@ Public Class RemoteAppMainWindow
End
End Try
- Me.Text = My.Application.Info.Title & " " & My.Application.Info.Version.ToString & " (" & System.Net.Dns.GetHostName & ")"
+ Dim VersionString = My.Application.Info.Version.ToString
+ If Not My.Application.Info.Description = Nothing Then
+ VersionString = My.Application.Info.Version.ToString & " " & My.Application.Info.Description.ToLower
+ End If
+
+ Me.Text = My.Application.Info.Title & " " & versionstring & " (" & System.Net.Dns.GetHostName & ")"
If Not My.Computer.Keyboard.ShiftKeyDown Then
If Not My.Settings.MainWindowWidth < Me.MinimumSize.Width Then Me.Width = My.Settings.MainWindowWidth
If Not My.Settings.MainWindowHeight < Me.MinimumSize.Height Then Me.Height = My.Settings.MainWindowHeight