Fixed problems moving or resizing the main window while PuTTY (SSH/telnet/rlogin/raw) connections are open. Fixed PuTTY processes not closing on Vista and 7 with UAC enabled. Updated DockPanel Suite from 2.2.0 to 2.3.1.

2026-02-17 22:11:48 +08:00 · 2010-01-24 00:47:05 -06:00
parent d6f145ede7
commit 80a9c4de37
11 changed files with 213 additions and 90 deletions
--- a/mRemoteV1/App/App.Info.vb
+++ b/mRemoteV1/App/App.Info.vb
@@ -11,8 +11,6 @@ Namespace App
            Public Shared ReadOnly HomePath As String = My.Application.Info.DirectoryPath
            Public Shared EncryptionKey As String = "mR3m"
            Public Shared ReportingFilePath As String = ""
-            Public Shared SmartCodeURL As String = "http://www.s-code.com/products/viewerx/"
-            Public Shared FamFamFamURL As String = "http://www.famfamfam.com/"
        End Class

        Public Class Settings
--- a/mRemoteV1/App/App.Native.vb
+++ b/mRemoteV1/App/App.Native.vb
@@ -20,7 +20,7 @@ Namespace App
        End Function

        <DllImport("user32.dll")> _
-        Public Shared Function SetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer, ByVal dwNewLong As Integer) As Integer
+        Public Shared Function SetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer, ByVal dwNewLong As Long) As Integer
        End Function

        <DllImport("user32.dll", SetLastError:=True)> _
@@ -117,6 +117,10 @@ Namespace App
        Public Const MF_BYPOSITION As Integer = &H400
        Public Const MF_POPUP As Integer = &H10

+        Public Const WM_GETTEXT As Integer = &HD
+        Public Const WM_ACTIVATEAPP As Integer = &H1C
+        Public Const WM_WINDOWPOSCHANGED As Integer = &H47
+
        Public Const WM_SYSCOMMAND As Integer = &H112

        Public Const WM_LBUTTONDOWN As Integer = &H201
--- a/mRemoteV1/CHANGELOG.TXT
+++ b/mRemoteV1/CHANGELOG.TXT
@@ -1,5 +1,8 @@
 1.63:
  New icon and logo
+  Fixed problems moving or resizing the main window while PuTTY (SSH/telnet/rlogin/raw) connections are open
+  Fixed PuTTY processes not closing on Vista and 7 with UAC enabled
+  Updated DockPanel Suite from 2.2.0 to 2.3.1

 1.62:
  Switched to VncSharp, an open source VNC component
--- a/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb
+++ b/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb
@@ -10,8 +10,6 @@ Namespace Connection
            Inherits Connection.Protocol.Base

 #Region "Private Properties"
-            Private PuttyProcessStartInfo As New ProcessStartInfo()
-            Private Arguments As String
 #End Region

 #Region "Public Properties"
@@ -101,50 +99,52 @@ Namespace Connection

            Public Overrides Function Connect() As Boolean
                Try
-                    PuttyProcessStartInfo.FileName = _PuttyPath
+                    PuttyProcess = New Process

-                    Select Case Me._PuttyProtocol
-                        Case Putty_Protocol.raw
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.rlogin
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.ssh
-                            Dim UserArg As String = ""
-                            Dim PassArg As String = ""
+                    With PuttyProcess.StartInfo
+                        .FileName = _PuttyPath

-                            If My.Settings.EmptyCredentials = "windows" Then
-                                UserArg = " -l """ & Environment.UserName & """"
-                            ElseIf My.Settings.EmptyCredentials = "custom" Then
-                                UserArg = " -l """ & My.Settings.DefaultUsername & """"
-                                PassArg = " -pw """ & Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) & """"
-                            End If
+                        Select Case Me._PuttyProtocol
+                            Case Putty_Protocol.raw
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.rlogin
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.ssh
+                                Dim UserArg As String = ""
+                                Dim PassArg As String = ""

-                            If Me.InterfaceControl.Info.Username <> "" Then
-                                UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
-                            End If
+                                If My.Settings.EmptyCredentials = "windows" Then
+                                    UserArg = " -l """ & Environment.UserName & """"
+                                ElseIf My.Settings.EmptyCredentials = "custom" Then
+                                    UserArg = " -l """ & My.Settings.DefaultUsername & """"
+                                    PassArg = " -pw """ & Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) & """"
+                                End If

-                            If Me.InterfaceControl.Info.Password <> "" Then
-                                PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
-                            End If
+                                If Me.InterfaceControl.Info.Username <> "" Then
+                                    UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
+                                End If

-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -" & Me._PuttySSHVersion & UserArg & PassArg & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.telnet
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.serial
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                    End Select
+                                If Me.InterfaceControl.Info.Password <> "" Then
+                                    PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
+                                End If

-                    'REMOVE IN RELEASE!
-                    'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & Arguments, True)
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -" & Me._PuttySSHVersion & UserArg & PassArg & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.telnet
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.serial
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                        End Select

-                    PuttyProcessStartInfo.Arguments = Arguments
+                        'REMOVE IN RELEASE!
+                        'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & .Arguments, True)
+                    End With

-                    PuttyProcess = Process.Start(PuttyProcessStartInfo)
                    PuttyProcess.EnableRaisingEvents = True
-                    PuttyProcess.WaitForInputIdle()
-
                    AddHandler PuttyProcess.Exited, AddressOf ProcessExited

+                    PuttyProcess.Start()
+                    PuttyProcess.WaitForInputIdle()
+
                    Dim TryCount As Integer = 0
                    Do Until PuttyProcess.MainWindowHandle <> IntPtr.Zero And Me.InterfaceControl.Handle <> IntPtr.Zero And Me.PuttyProcess.MainWindowTitle <> "Default IME"
                        If TryCount >= My.Settings.MaxPuttyWaitTime * 2 Then
@@ -167,9 +167,8 @@ Namespace Connection
                    mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Title: " & PuttyProcess.MainWindowTitle, True)
                    mC.AddMessage(Messages.MessageClass.InformationMsg, "Panel Handle: " & Me.InterfaceControl.Parent.Handle.ToString, True)

-                    SetParent(Me.PuttyHandle, Me.InterfaceControl.Parent.Handle)
-                    SetWindowLong(Me.PuttyHandle, 0, WS_VISIBLE)
-                    ShowWindow(Me.PuttyHandle, SW_SHOWMAXIMIZED)
+                    SetParent(PuttyHandle, InterfaceControl.Parent.Handle)
+                    ShowWindow(PuttyHandle, SW_SHOWMAXIMIZED)
                    Resize()

                    MyBase.Connect()
@@ -183,7 +182,7 @@ Namespace Connection

            Public Overrides Sub Focus()
                Try
-                    SetForegroundWindow(PuttyHandle)
+                    'SetForegroundWindow(PuttyHandle)
                Catch ex As Exception
                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Focus (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
                End Try
--- a/mRemoteV1/Forms/frmMain.vb
+++ b/mRemoteV1/Forms/frmMain.vb
@@ -1,6 +1,7 @@
 Imports mRemote.App.Runtime
 Imports System.Reflection
 Imports Crownwood
+Imports mRemote.App.Native

 Public Class frmMain
    Public prevWindowsState As FormWindowState
@@ -111,10 +112,13 @@ Public Class frmMain
            End If
        End If

+        For Each Window As UI.Window.Base In wL
+            Window.Close()
+        Next
+
        App.Runtime.Shutdown.BeforeQuit()

        Debug.Print("[END] - " & Now)
-        End
    End Sub
 #End Region

@@ -562,10 +566,6 @@ Public Class frmMain
    End Sub

 #Region "Window Overrides and DockPanel Stuff"
-    Private Const WM_GETTEXT As Integer = &HD
-    Private Const WM_ACTIVATEAPP As Integer = &H1C
-    Private Const WM_WINDOWPOSCHANGED As Integer = &H47
-
    Private bWmGetTextFlag As Boolean = False
    Private bWmWindowPosChangedFlag As Boolean = False

--- a/mRemoteV1/Language/Language.EN.vb
+++ b/mRemoteV1/Language/Language.EN.vb
@@ -180,10 +180,6 @@
        Public Const Root As String = "Root"
        Public Const SureToDeleteItem As String = "Are you sure you want to delete this Item?"
        Public Const License As String = "License"
-        Public Const About As String = "About"
-        Public Const ChangeLog As String = "Change Log:"
-        Public Const ReleasedUnderGPL As String = "Released under the GNU General Public License (GPL)"
-        Public Const SomeIconsBy As String = "Some Icons by"
        Public Const Change As String = "Change"
        Public Const Inheritance As String = "Inheritance"
        Public Const Default_ As String = "Default"
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -753,6 +753,69 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to About.
+        '''</summary>
+        Friend ReadOnly Property strAbout() As String
+            Get
+                Return ResourceManager.GetString("strAbout", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Change Log:.
+        '''</summary>
+        Friend ReadOnly Property strChangeLogLabel() As String
+            Get
+                Return ResourceManager.GetString("strChangeLogLabel", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Includes icons by [FAMFAMFAM].
+        '''</summary>
+        Friend ReadOnly Property strFAMFAMFAMAttribution() As String
+            Get
+                Return ResourceManager.GetString("strFAMFAMFAMAttribution", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to http://www.famfamfam.com/.
+        '''</summary>
+        Friend ReadOnly Property strFAMFAMFAMAttributionURL() As String
+            Get
+                Return ResourceManager.GetString("strFAMFAMFAMAttributionURL", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Uses the Magic library by [Crownwood Software].
+        '''</summary>
+        Friend ReadOnly Property strMagicLibraryAttribution() As String
+            Get
+                Return ResourceManager.GetString("strMagicLibraryAttribution", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to http://www.dotnetmagic.com/.
+        '''</summary>
+        Friend ReadOnly Property strMagicLibraryAttributionURL() As String
+            Get
+                Return ResourceManager.GetString("strMagicLibraryAttributionURL", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Released under the GNU General Public License (GPL).
+        '''</summary>
+        Friend ReadOnly Property strReleasedUnderGPL() As String
+            Get
+                Return ResourceManager.GetString("strReleasedUnderGPL", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Every {0} days.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -457,4 +457,25 @@
  <data name="strUpdateFrequencyWeekly" xml:space="preserve">
    <value>Weekly</value>
  </data>
+  <data name="strFAMFAMFAMAttribution" xml:space="preserve">
+    <value>Includes icons by [FAMFAMFAM]</value>
+  </data>
+  <data name="strFAMFAMFAMAttributionURL" xml:space="preserve">
+    <value>http://www.famfamfam.com/</value>
+  </data>
+  <data name="strMagicLibraryAttribution" xml:space="preserve">
+    <value>Uses the Magic library by [Crownwood Software]</value>
+  </data>
+  <data name="strMagicLibraryAttributionURL" xml:space="preserve">
+    <value>http://www.dotnetmagic.com/</value>
+  </data>
+  <data name="strAbout" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="strChangeLogLabel" xml:space="preserve">
+    <value>Change Log:</value>
+  </data>
+  <data name="strReleasedUnderGPL" xml:space="preserve">
+    <value>Released under the GNU General Public License (GPL)</value>
+  </data>
 </root>
--- a/mRemoteV1/References/WeifenLuo.WinFormsUI.Docking.dll
+++ b/mRemoteV1/References/WeifenLuo.WinFormsUI.Docking.dll
--- a/mRemoteV1/UI/UI.Window.About.vb
+++ b/mRemoteV1/UI/UI.Window.About.vb
@@ -17,7 +17,8 @@ Namespace UI
            Friend WithEvents pnlBottom As System.Windows.Forms.Panel
            Friend WithEvents pbLogo As System.Windows.Forms.PictureBox
            Friend WithEvents lblEdition As System.Windows.Forms.Label
-            Friend WithEvents llblCopyright3 As System.Windows.Forms.LinkLabel
+            Friend WithEvents llblFAMFAMFAM As System.Windows.Forms.LinkLabel
+            Friend WithEvents llblMagicLibrary As System.Windows.Forms.LinkLabel
            Friend WithEvents pnlTop As System.Windows.Forms.Panel

            Private Sub InitializeComponent()
@@ -25,7 +26,8 @@ Namespace UI
                Me.lblEdition = New System.Windows.Forms.Label
                Me.pbLogo = New System.Windows.Forms.PictureBox
                Me.pnlBottom = New System.Windows.Forms.Panel
-                Me.llblCopyright3 = New System.Windows.Forms.LinkLabel
+                Me.llblMagicLibrary = New System.Windows.Forms.LinkLabel
+                Me.llblFAMFAMFAM = New System.Windows.Forms.LinkLabel
                Me.txtChangeLog = New System.Windows.Forms.TextBox
                Me.lblTitle = New System.Windows.Forms.Label
                Me.lblVersion = New System.Windows.Forms.Label
@@ -79,7 +81,8 @@ Namespace UI
                            Or System.Windows.Forms.AnchorStyles.Left) _
                            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                Me.pnlBottom.BackColor = System.Drawing.SystemColors.Control
-                Me.pnlBottom.Controls.Add(Me.llblCopyright3)
+                Me.pnlBottom.Controls.Add(Me.llblMagicLibrary)
+                Me.pnlBottom.Controls.Add(Me.llblFAMFAMFAM)
                Me.pnlBottom.Controls.Add(Me.txtChangeLog)
                Me.pnlBottom.Controls.Add(Me.lblTitle)
                Me.pnlBottom.Controls.Add(Me.lblVersion)
@@ -92,19 +95,33 @@ Namespace UI
                Me.pnlBottom.Size = New System.Drawing.Size(788, 418)
                Me.pnlBottom.TabIndex = 1
                '
-                'llblCopyright3
+                'llblMagicLibrary
                '
-                Me.llblCopyright3.AutoSize = True
-                Me.llblCopyright3.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-                Me.llblCopyright3.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.llblCopyright3.LinkColor = System.Drawing.Color.Blue
-                Me.llblCopyright3.Location = New System.Drawing.Point(16, 116)
-                Me.llblCopyright3.Name = "llblCopyright3"
-                Me.llblCopyright3.Size = New System.Drawing.Size(79, 22)
-                Me.llblCopyright3.TabIndex = 4
-                Me.llblCopyright3.TabStop = True
-                Me.llblCopyright3.Text = "Copyright3"
-                Me.llblCopyright3.UseCompatibleTextRendering = True
+                Me.llblMagicLibrary.AutoSize = True
+                Me.llblMagicLibrary.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+                Me.llblMagicLibrary.ForeColor = System.Drawing.SystemColors.ControlText
+                Me.llblMagicLibrary.LinkColor = System.Drawing.Color.Blue
+                Me.llblMagicLibrary.Location = New System.Drawing.Point(16, 136)
+                Me.llblMagicLibrary.Name = "llblMagicLibrary"
+                Me.llblMagicLibrary.Size = New System.Drawing.Size(92, 22)
+                Me.llblMagicLibrary.TabIndex = 8
+                Me.llblMagicLibrary.TabStop = True
+                Me.llblMagicLibrary.Text = "MagicLibrary"
+                Me.llblMagicLibrary.UseCompatibleTextRendering = True
+                '
+                'llblFAMFAMFAM
+                '
+                Me.llblFAMFAMFAM.AutoSize = True
+                Me.llblFAMFAMFAM.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+                Me.llblFAMFAMFAM.ForeColor = System.Drawing.SystemColors.ControlText
+                Me.llblFAMFAMFAM.LinkColor = System.Drawing.Color.Blue
+                Me.llblFAMFAMFAM.Location = New System.Drawing.Point(16, 116)
+                Me.llblFAMFAMFAM.Name = "llblFAMFAMFAM"
+                Me.llblFAMFAMFAM.Size = New System.Drawing.Size(101, 22)
+                Me.llblFAMFAMFAM.TabIndex = 4
+                Me.llblFAMFAMFAM.TabStop = True
+                Me.llblFAMFAMFAM.Text = "FAMFAMFAM"
+                Me.llblFAMFAMFAM.UseCompatibleTextRendering = True
                '
                'txtChangeLog
                '
@@ -116,12 +133,12 @@ Namespace UI
                Me.txtChangeLog.Cursor = System.Windows.Forms.Cursors.Default
                Me.txtChangeLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                Me.txtChangeLog.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.txtChangeLog.Location = New System.Drawing.Point(24, 184)
+                Me.txtChangeLog.Location = New System.Drawing.Point(24, 200)
                Me.txtChangeLog.Multiline = True
                Me.txtChangeLog.Name = "txtChangeLog"
                Me.txtChangeLog.ReadOnly = True
                Me.txtChangeLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-                Me.txtChangeLog.Size = New System.Drawing.Size(761, 232)
+                Me.txtChangeLog.Size = New System.Drawing.Size(760, 216)
                Me.txtChangeLog.TabIndex = 7
                Me.txtChangeLog.TabStop = False
                '
@@ -154,7 +171,7 @@ Namespace UI
                Me.lblChangeLog.AutoSize = True
                Me.lblChangeLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                Me.lblChangeLog.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.lblChangeLog.Location = New System.Drawing.Point(16, 160)
+                Me.lblChangeLog.Location = New System.Drawing.Point(16, 176)
                Me.lblChangeLog.Name = "lblChangeLog"
                Me.lblChangeLog.Size = New System.Drawing.Size(92, 22)
                Me.lblChangeLog.TabIndex = 6
@@ -191,6 +208,7 @@ Namespace UI
                Me.ClientSize = New System.Drawing.Size(784, 564)
                Me.Controls.Add(Me.pnlTop)
                Me.Controls.Add(Me.pnlBottom)
+                Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                Me.ForeColor = System.Drawing.SystemColors.ControlText
                Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon
                Me.MaximumSize = New System.Drawing.Size(20000, 10000)
@@ -216,19 +234,51 @@ Namespace UI
            End Sub
 #End Region

+#Region "Private Methods"
+            Private Sub ApplyLanguage()
+                lblLicense.Text = My.Resources.strReleasedUnderGPL
+                lblChangeLog.Text = My.Resources.strChangeLogLabel
+                TabText = My.Resources.strAbout
+                Text = My.Resources.strAbout
+            End Sub
+
+            Private Sub ApplyEditions()
+                If App.Editions.Spanlink.Enabled Then
+                    lblEdition.Text = "Spanlink Communications"
+                    lblEdition.Visible = True
+                End If
+            End Sub
+
+            Private Sub FillLinkLabel(ByVal llbl As LinkLabel, ByVal Text As String, ByVal URL As String)
+                llbl.Links.Clear()
+
+                Dim Open As Integer = Text.IndexOf("[")
+                Dim Close As Integer
+                While Open <> -1
+                    Text = Text.Remove(Open, 1)
+                    Close = Text.IndexOf("]", Open)
+                    If Close = -1 Then Exit While
+                    Text = Text.Remove(Close, 1)
+                    llbl.Links.Add(Open, Close - Open, URL)
+                    Open = Text.IndexOf("[", Open)
+                End While
+
+                llbl.Text = Text
+            End Sub
+#End Region
+
 #Region "Form Stuff"
            Private Sub About_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
                ApplyLanguage()
                ApplyEditions()

                Try
+                    lblCopyright.Text = My.Application.Info.Copyright
+
                    Me.lblVersion.Text = "Version " & My.Application.Info.Version.Major & "." & My.Application.Info.Version.Minor
-                    Me.lblLicense.Text = Language.Base.ReleasedUnderGPL

-                    Me.lblCopyright.Text = My.Application.Info.Copyright
-
-                    Me.llblCopyright3.Text = "Includes icons by FAMFAMFAM"
-                    Me.llblCopyright3.Links.Add(18, 9, (App.Info.General.FamFamFamURL))
+                    FillLinkLabel(llblFAMFAMFAM, My.Resources.strFAMFAMFAMAttribution, My.Resources.strFAMFAMFAMAttributionURL)
+                    FillLinkLabel(llblMagicLibrary, My.Resources.strMagicLibraryAttribution, My.Resources.strMagicLibraryAttributionURL)

                    If File.Exists(My.Application.Info.DirectoryPath & "\CHANGELOG.TXT") Then
                        Dim sR As New StreamReader(My.Application.Info.DirectoryPath & "\CHANGELOG.TXT")
@@ -240,25 +290,14 @@ Namespace UI
                End Try
            End Sub

-            Private Sub ApplyLanguage()
-                lblChangeLog.Text = Language.Base.ChangeLog
-                lblLicense.Text = Language.Base.License
-                TabText = Language.Base.About
-                Text = Language.Base.About
+            Private Sub llblFAMFAMFAM_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles llblFAMFAMFAM.LinkClicked
+                App.Runtime.GoToURL(My.Resources.strFAMFAMFAMAttributionURL)
            End Sub

-            Private Sub ApplyEditions()
-                If App.Editions.Spanlink.Enabled Then
-                    lblEdition.Text = "Spanlink Communications"
-                    lblEdition.Visible = True
-                End If
-            End Sub
-
-            Private Sub llblCopyright3_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles llblCopyright3.LinkClicked
-                App.Runtime.GoToURL(App.Info.General.FamFamFamURL)
+            Private Sub llblMagicLibrary_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles llblMagicLibrary.LinkClicked
+                App.Runtime.GoToURL(My.Resources.strMagicLibraryAttributionURL)
            End Sub
 #End Region
-
        End Class
    End Namespace
 End Namespace
--- a/mRemoteV1/UI/UI.Window.Update.vb
+++ b/mRemoteV1/UI/UI.Window.Update.vb
@@ -374,7 +374,7 @@ Namespace UI

            Private Sub ApplyLanguage()
                btnCheckForUpdate.Text = Language.Base.CheckForUpdate
-                lblChangeLogLabel.Text = Language.Base.ChangeLog
+                lblChangeLogLabel.Text = My.Resources.strChangeLogLabel
                btnDownload.Text = Language.Base.DownloadAndInstall
                lblCurrentVersionLabel.Text = Language.Base.AvailableVersion & ":"
                lblInstalledVersionLabel.Text = Language.Base.CurrentVersion & ":"