Change version in installer to 1.62. Show password dialog if no password is saved for VNC connection. Added VncSharpNG.dll to source control.

Installer/mRemote.nsi

@@ -3,7 +3,7 @@
 !insertmacro VersionCompare
 
 !DEFINE PRODUCT_VERSION_MAJOR 1
-!DEFINE PRODUCT_VERSION_MINOR 60
+!DEFINE PRODUCT_VERSION_MINOR 62
 
 !DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
 !DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0"
@@ -95,7 +95,6 @@ Section "" ; Install
 
 	; Register ActiveX components
 	RegDLL "$INSTDIR\eolwtscom.dll"
-	RegDLL "$INSTDIR\scvncctrl.dll"
  
 	; Start Menu
 	CreateDirectory "$SMPROGRAMS\mRemoteNG"
@@ -105,16 +104,22 @@ Section "" ; Install
 	; Registry
 	WriteRegStr HKLM "Software\mRemoteNG" "InstallPath" $INSTDIR
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayName" "mRemoteNG"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "Publisher" "mRemoteNG"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 5816
+
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayVersion" ${PRODUCT_VERSION}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMinor" ${PRODUCT_VERSION_MINOR}
+
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "NoModify" 1
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "NoRepair" 1
 SectionEnd
 
 Section "un.Uninstall"
 	; Unregister ActiveX components
 	UnregDLL "$INSTDIR\eolwtscom.dll"
-	UnregDLL "$INSTDIR\scvncctrl.dll"
 
 	; Delete Files
 	RMDIR /r $INSTDIR

mRemoteV1/App/App.Runtime.vb

@@ -254,26 +254,33 @@ Namespace App
             End Sub
 
             Public Shared Sub UpdateCheck()
-                If My.Settings.CheckForUpdatesOnStartup Then
-                    frmMain.tmrShowUpdate.Enabled = True
-                    Windows.updateForm.CheckForUpdate()
-                    AddHandler Windows.updateForm.UpdateCheckCompleted, AddressOf UpdateCheckComplete
+                If My.Settings.CheckForUpdatesAsked And My.Settings.CheckForUpdatesOnStartup Then
+                    If My.Settings.UpdatePending Or My.Settings.CheckForUpdatesLastCheck < Date.Now.Subtract(TimeSpan.FromDays(My.Settings.CheckForUpdatesFrequencyDays)) Then
+                        frmMain.tmrShowUpdate.Enabled = True
+                        Windows.updateForm.CheckForUpdate()
+                        AddHandler Windows.updateForm.UpdateCheckCompleted, AddressOf UpdateCheckComplete
+                    End If
                 End If
             End Sub
 
             Private Shared Sub UpdateCheckComplete(ByVal UpdateAvailable As Boolean)
+                My.Settings.CheckForUpdatesLastCheck = Date.Now
+                My.Settings.UpdatePending = UpdateAvailable
                 IsUpdateAvailable = UpdateAvailable
             End Sub
 
             Public Shared Sub AnnouncementCheck()
-                If App.Editions.Spanlink.Enabled = False Then
-                    frmMain.tmrShowUpdate.Enabled = True
-                    Windows.AnnouncementForm.CheckForAnnouncement()
-                    AddHandler Windows.AnnouncementForm.AnnouncementCheckCompleted, AddressOf AnnouncementCheckComplete
+                If My.Settings.CheckForUpdatesAsked And My.Settings.CheckForUpdatesOnStartup And App.Editions.Spanlink.Enabled = False Then
+                    If My.Settings.CheckForUpdatesLastCheck < Date.Now.Subtract(TimeSpan.FromDays(My.Settings.CheckForUpdatesFrequencyDays)) Then
+                        frmMain.tmrShowUpdate.Enabled = True
+                        Windows.AnnouncementForm.CheckForAnnouncement()
+                        AddHandler Windows.AnnouncementForm.AnnouncementCheckCompleted, AddressOf AnnouncementCheckComplete
+                    End If
                 End If
             End Sub
 
             Private Shared Sub AnnouncementCheckComplete(ByVal AnnouncementAvailable As Boolean)
+                My.Settings.CheckForUpdatesLastCheck = Date.Now
                 IsAnnouncementAvailable = AnnouncementAvailable
             End Sub
 
@@ -1184,7 +1191,7 @@ Namespace App
                 Next
 
                 If qHost <> "" Then
-                    nCi.Name = "Quicky: " & qHost
+                    nCi.Name = "Quick: " & qHost
                     nCi.Hostname = qHost
                     nCi.Port = qPort
                     nCi.IsQuicky = True
@@ -1202,7 +1209,7 @@ Namespace App
                     '--------
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Creating quicky failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Creating quick connect failed" & vbNewLine & ex.Message)
             End Try
 
             Return Nothing

mRemoteV1/CHANGELOG.TXT

@@ -1,4 +1,24 @@
-1.60:
+1.62:
+  Switched to VncSharp, an open source VNC component
+  VNC is supported again except for the following features:
+    Windows authentication
+    Setting the compression, encoding and color settings
+    Connecting through a proxy server
+    Free SmartSize mode (it does the same thing as Aspect SmartSize mode now)
+  Rearranged the Options page and added an Updates tab
+  Added option to change how often updates are checked
+  Open Updates options tab before connecting for the first time
+  No longer show About page on first run
+  Renamed Quicky toolbar to Quick Connect toolbar
+  Changed back to allowing toolbars to dock to the left or right of the menu bar and added gripper to move it around
+  Added RDP, VNC and ICA version numbers to Components Check page
+  Fixed a bug with the inheritance buttons on the Config panel disappearing after awhile
+
+1.61:
+  Removed unlicensed SmartCode Solutions ViewerX VNC Viewer ActiveX
+  This version of mRemoteNG does not support VNC
+
+1.60:
   Changed name to mRemoteNG
   Fixed menu bar not staying docked to left side
   Removed snakes game Easter egg

mRemoteV1/Config/Config.Settings.Load.vb

@@ -26,9 +26,15 @@ Namespace Config
             Public Sub Load()
                 Try
                     With Me._MainForm
+                        ' Migrate settings from previous version
                         If My.Settings.DoUpgrade Then
                             My.Settings.Upgrade()
                             My.Settings.DoUpgrade = False
+
+                            ' Clear pending update flag
+                            ' This is used for automatic updates, not for settings migration, but it
+                            ' needs to be cleared here because we know that we just updated.
+                            My.Settings.UpdatePending = False
                         End If
 
                         If My.Settings.MainFormLocation <> New Point(999, 999) Then
@@ -79,9 +85,9 @@ Namespace Config
                         Me.LoadExternalAppsFromXML()
 
                         If My.Settings.ResetToolbars = False Then
-                            Me.LoadToolbarsFromSettings()
+                            LoadToolbarsFromSettings()
                         Else
-                            Me.SetToolbarsDefault()
+                            SetToolbarsDefault()
                         End If
                     End With
                 Catch ex As Exception

mRemoteV1/Connection/Connection.Info.vb

@@ -823,7 +823,7 @@ Namespace Connection
 #Region "VNC"
         Private _VNCCompression As mRemote.Connection.Protocol.VNC.Compression = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Compression), My.Settings.ConDefaultVNCCompression)
         <Category(Category4 & Language.Base.Props_Appearance), _
-           Browsable(True), _
+           Browsable(False), _
            DisplayName(Language.Base.Props_Compression), _
            Description(Language.Base.Descr_Compression), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
@@ -850,7 +850,7 @@ Namespace Connection
 
         Private _VNCEncoding As mRemote.Connection.Protocol.VNC.Encoding = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Encoding), My.Settings.ConDefaultVNCEncoding)
         <Category(Category4 & Language.Base.Props_Appearance), _
-           Browsable(True), _
+           Browsable(False), _
            DisplayName(Language.Base.Props_Encoding), _
            Description(Language.Base.Descr_Encoding), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
@@ -878,7 +878,7 @@ Namespace Connection
 
         Private _VNCAuthMode As mRemote.Connection.Protocol.VNC.AuthMode = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.AuthMode), My.Settings.ConDefaultVNCAuthMode)
         <Category(Category2 & Language.Base.Props_Connection), _
-            Browsable(True), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_AuthMode), _
             Description(Language.Base.Descr_AuthMode), _
             TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
@@ -905,7 +905,7 @@ Namespace Connection
 
         Private _VNCProxyType As mRemote.Connection.Protocol.VNC.ProxyType = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.ProxyType), My.Settings.ConDefaultVNCProxyType)
         <Category(Category6 & Language.Base.Props_Misc), _
-           Browsable(True), _
+           Browsable(False), _
            DisplayName(Language.Base.Props_ProxyType), _
            Description(Language.Base.Descr_ProxyType), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
@@ -932,7 +932,7 @@ Namespace Connection
 
         Private _VNCProxyIP As String = My.Settings.ConDefaultVNCProxyIP
         <Category(Category6 & Language.Base.Props_Misc), _
-            Browsable(True), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_ProxyIP), _
             Description(Language.Base.Descr_ProxyIP)> _
         Public Property VNCProxyIP() As String
@@ -958,7 +958,7 @@ Namespace Connection
 
         Private _VNCProxyPort As Integer = My.Settings.ConDefaultVNCProxyPort
         <Category(Category6 & Language.Base.Props_Misc), _
-            Browsable(True), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_ProxyPort), _
             Description(Language.Base.Descr_ProxyPort)> _
         Public Property VNCProxyPort() As Integer
@@ -984,7 +984,7 @@ Namespace Connection
 
         Private _VNCProxyUsername As String = My.Settings.ConDefaultVNCProxyUsername
         <Category(Category6 & Language.Base.Props_Misc), _
-            Browsable(True), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_ProxyUsername), _
             Description(Language.Base.Props_ProxyUsername)> _
         Public Property VNCProxyUsername() As String
@@ -1010,7 +1010,7 @@ Namespace Connection
 
         Private _VNCProxyPassword As String = My.Settings.ConDefaultVNCProxyPassword
         <Category(Category6 & Language.Base.Props_Misc), _
-            Browsable(True), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_ProxyPassword), _
             Description(Language.Base.Descr_ProxyPassword), _
             PasswordPropertyText(True)> _
@@ -1037,7 +1037,7 @@ Namespace Connection
 
         Private _VNCColors As mRemote.Connection.Protocol.VNC.Colors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Colors), My.Settings.ConDefaultVNCColors)
         <Category(Category4 & Language.Base.Props_Appearance), _
-           Browsable(True), _
+           Browsable(False), _
            DisplayName(Language.Base.Props_Colors), _
            Description(Language.Base.Descr_Colors), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _

mRemoteV1/Connection/Connection.Protocol.VNC.vb

@@ -1,5 +1,5 @@
 Imports mRemote.App.Runtime
-Imports AxViewerX
+Imports VncSharp
 Imports System.ComponentModel
 
 Namespace Connection
@@ -10,22 +10,10 @@ Namespace Connection
 #Region "Properties"
             Public Property SmartSize() As Boolean
                 Get
-                    If VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE Then
-                        Return False
-                    Else
-                        Return True
-                    End If
+                    Return VNC.Scaled
                 End Get
                 Set(ByVal value As Boolean)
-                    If value = False Then
-                        VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE
-                    Else
-                        If Info.VNCSmartSizeMode = SmartSizeMode.SmartSFree Then
-                            VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_FREE
-                        Else
-                            VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
-                        End If
-                    End If
+                    VNC.Scaled = value
                 End Set
             End Property
 
@@ -40,14 +28,13 @@ Namespace Connection
 #End Region
 
 #Region "Private Declarations"
-            Private VNC As AxCSC_ViewerXControl
+            Private VNC As VncSharp.RemoteDesktop
             Private Info As Connection.Info
 #End Region
 
 #Region "Public Methods"
             Public Sub New()
-                Me.Control = New AxCSC_ViewerXControl
-                SetupLicense(Me.Control)
+                Me.Control = New VncSharp.RemoteDesktop
             End Sub
 
             Public Overrides Function SetProps() As Boolean
@@ -58,84 +45,70 @@ Namespace Connection
 
                     Info = Me.InterfaceControl.Info
 
-                    VNC.BeginInit()
+                    VNC.VncPort = Me.Info.Port
 
-                    VNC.Port = Me.Info.Port
-                    VNC.HostIP = Me.Info.Hostname
+                    'If Info.VNCCompression <> Compression.CompNone Then
+                    '    VNC.JPEGCompression = True
+                    '    VNC.JPEGCompressionLevel = Info.VNCCompression
+                    'End If
 
-                    If Info.VNCCompression <> Compression.CompNone Then
-                        VNC.JPEGCompression = True
-                        VNC.JPEGCompressionLevel = Info.VNCCompression
-                    End If
+                    'Select Case Info.VNCEncoding
+                    '    Case Encoding.EncCorre
+                    '        VNC.Encoding = ViewerX.VNCEncoding.RFB_CORRE
+                    '    Case Encoding.EncHextile
+                    '        VNC.Encoding = ViewerX.VNCEncoding.RFB_HEXTILE
+                    '    Case Encoding.EncRaw
+                    '        VNC.Encoding = ViewerX.VNCEncoding.RFB_RAW
+                    '    Case Encoding.EncRRE
+                    '        VNC.Encoding = ViewerX.VNCEncoding.RFB_RRE
+                    '    Case Encoding.EncTight
+                    '        VNC.Encoding = ViewerX.VNCEncoding.RFB_TIGHT
+                    '    Case Encoding.EncZlib
+                    '        VNC.Encoding = ViewerX.VNCEncoding.RFB_ZLIB
+                    '    Case Encoding.EncZLibHex
+                    '        VNC.Encoding = ViewerX.VNCEncoding.RFB_ZLIBHEX
+                    '    Case Encoding.EncZRLE
+                    '        VNC.Encoding = ViewerX.VNCEncoding.RFB_ZRLE
+                    'End Select
 
-                    Select Case Info.VNCEncoding
-                        Case Encoding.EncCorre
-                            VNC.Encoding = ViewerX.VNCEncoding.RFB_CORRE
-                        Case Encoding.EncHextile
-                            VNC.Encoding = ViewerX.VNCEncoding.RFB_HEXTILE
-                        Case Encoding.EncRaw
-                            VNC.Encoding = ViewerX.VNCEncoding.RFB_RAW
-                        Case Encoding.EncRRE
-                            VNC.Encoding = ViewerX.VNCEncoding.RFB_RRE
-                        Case Encoding.EncTight
-                            VNC.Encoding = ViewerX.VNCEncoding.RFB_TIGHT
-                        Case Encoding.EncZlib
-                            VNC.Encoding = ViewerX.VNCEncoding.RFB_ZLIB
-                        Case Encoding.EncZLibHex
-                            VNC.Encoding = ViewerX.VNCEncoding.RFB_ZLIBHEX
-                        Case Encoding.EncZRLE
-                            VNC.Encoding = ViewerX.VNCEncoding.RFB_ZRLE
-                    End Select
+                    'If Info.VNCAuthMode = AuthMode.AuthWin Then
+                    '    VNC.LoginType = ViewerX.ViewerLoginType.VLT_MSWIN
+                    '    VNC.MsUser = Me.Info.Username
+                    '    VNC.MsDomain = Me.Info.Domain
+                    '    VNC.MsPassword = Me.Info.Password
+                    'Else
+                    '    VNC.LoginType = ViewerX.ViewerLoginType.VLT_VNC
+                    '    VNC.Password = Me.Info.Password
+                    'End If
 
-                    If Info.VNCAuthMode = AuthMode.AuthWin Then
-                        VNC.LoginType = ViewerX.ViewerLoginType.VLT_MSWIN
-                        VNC.MsUser = Me.Info.Username
-                        VNC.MsDomain = Me.Info.Domain
-                        VNC.MsPassword = Me.Info.Password
-                    Else
-                        VNC.LoginType = ViewerX.ViewerLoginType.VLT_VNC
-                        VNC.Password = Me.Info.Password
-                    End If
+                    'Select Case Info.VNCProxyType
+                    '    Case ProxyType.ProxyNone
+                    '        VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_NONE
+                    '    Case ProxyType.ProxyHTTP
+                    '        VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_HTTP
+                    '    Case ProxyType.ProxySocks5
+                    '        VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_SOCKS5
+                    '    Case ProxyType.ProxyUltra
+                    '        VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_ULTRA_REPEATER
+                    'End Select
 
-                    Select Case Info.VNCProxyType
-                        Case ProxyType.ProxyNone
-                            VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_NONE
-                        Case ProxyType.ProxyHTTP
-                            VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_HTTP
-                        Case ProxyType.ProxySocks5
-                            VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_SOCKS5
-                        Case ProxyType.ProxyUltra
-                            VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_ULTRA_REPEATER
-                    End Select
+                    'If Info.VNCProxyType <> ProxyType.ProxyNone Then
+                    '    VNC.ProxyIP = Info.VNCProxyIP
+                    '    VNC.ProxyPort = Info.VNCProxyPort
+                    '    VNC.ProxyUser = Info.VNCProxyUsername
+                    '    VNC.ProxyPassword = Info.VNCProxyPassword
+                    'End If
 
-                    If Info.VNCProxyType <> ProxyType.ProxyNone Then
-                        VNC.ProxyIP = Info.VNCProxyIP
-                        VNC.ProxyPort = Info.VNCProxyPort
-                        VNC.ProxyUser = Info.VNCProxyUsername
-                        VNC.ProxyPassword = Info.VNCProxyPassword
-                    End If
+                    'If Info.VNCColors = Colors.Col8Bit Then
+                    '    VNC.RestrictPixel = True
+                    'Else
+                    '    VNC.RestrictPixel = False
+                    'End If
 
-                    If Info.VNCColors = Colors.Col8Bit Then
-                        VNC.RestrictPixel = True
-                    Else
-                        VNC.RestrictPixel = False
-                    End If
-
-                    Select Case Info.VNCSmartSizeMode
-                        Case SmartSizeMode.SmartSNo
-                            VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE
-                        Case SmartSizeMode.SmartSFree
-                            VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_FREE
-                        Case SmartSizeMode.SmartSAspect
-                            VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
-                    End Select
-
-                    VNC.ViewOnly = Info.VNCViewOnly
-
-                    VNC.ConnectingText = Language.Base.Connecting & " (SmartCode VNC viewer)"
-                    VNC.DisconnectedText = Language.Base.Disconnected
-                    VNC.MessageBoxes = False
-                    VNC.EndInit()
+                    'VNC.ConnectingText = Language.Base.Connecting & " (SmartCode VNC viewer)"
+                    'VNC.DisconnectedText = Language.Base.Disconnected
+                    'VNC.MessageBoxes = False
+                    'VNC.EndInit()
 
                     Return True
                 Catch ex As Exception
@@ -148,7 +121,7 @@ Namespace Connection
                 Me.SetEventHandlers()
 
                 Try
-                    VNC.ConnectAsync()
+                    VNC.Connect(Me.Info.Hostname, Me.Info.VNCViewOnly, Info.VNCSmartSizeMode <> SmartSizeMode.SmartSNo)
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
                     Return False
@@ -169,9 +142,9 @@ Namespace Connection
                 Try
                     Select Case Keys
                         Case SpecialKeys.CtrlAltDel
-                            VNC.SendCAD()
+                            VNC.SendSpecialKeys(SpecialKeys.CtrlAltDel)
                         Case SpecialKeys.CtrlEsc
-                            VNC.SendCtrlEsq()
+                            VNC.SendSpecialKeys(SpecialKeys.CtrlEsc)
                     End Select
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SendSpecialKeys failed" & vbNewLine & ex.Message, True)
@@ -198,11 +171,11 @@ Namespace Connection
 
             Public Sub StartChat()
                 Try
-                    If VNC.Capabilities.Chat = True Then
-                        VNC.OpenChat()
-                    Else
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support chat")
-                    End If
+                    'If VNC.Capabilities.Chat = True Then
+                    '    VNC.OpenChat()
+                    'Else
+                    '    mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support chat")
+                    'End If
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC StartChat failed" & vbNewLine & ex.Message, True)
                 End Try
@@ -210,11 +183,11 @@ Namespace Connection
 
             Public Sub StartFileTransfer()
                 Try
-                    If VNC.Capabilities.FileTransfer = True Then
-                        VNC.OpenFileTransfer()
-                    Else
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support file transfers")
-                    End If
+                    'If VNC.Capabilities.FileTransfer = True Then
+                    '    VNC.OpenFileTransfer()
+                    'Else
+                    '    mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support file transfers")
+                    'End If
                 Catch ex As Exception
 
                 End Try
@@ -222,7 +195,7 @@ Namespace Connection
 
             Public Sub RefreshScreen()
                 Try
-                    VNC.RequestRefresh()
+                    VNC.FullScreenUpdate()
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC RefreshScreen failed" & vbNewLine & ex.Message, True)
                 End Try
@@ -232,33 +205,31 @@ Namespace Connection
 #Region "Private Methods"
             Private Sub SetEventHandlers()
                 Try
-                    AddHandler VNC.ConnectedEvent, AddressOf VNCEvent_Connected
-                    AddHandler VNC.Disconnected, AddressOf VNCEvent_Disconnected
+                    AddHandler VNC.ConnectComplete, AddressOf VNCEvent_Connected
+                    AddHandler VNC.ConnectionLost, AddressOf VNCEvent_Disconnected
+                    If Not String.IsNullOrEmpty(Info.Password) Then
+                        VNC.GetPassword = AddressOf VNCEvent_Authenticate
+                    End If
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetEventHandlers failed" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
-
-            Public Shared Sub SetupLicense(ByVal vncCtrl As Control)
-                Try
-                    Dim f As System.Reflection.FieldInfo
-                    f = GetType(AxHost).GetField("licenseKey", Reflection.BindingFlags.NonPublic Or Reflection.BindingFlags.Instance)
-                    f.SetValue(vncCtrl, "{072169039103041044176252035252117103057101225235137221179204110241121074}")
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetupLicense failed" & vbNewLine & ex.Message, True)
-                End Try
-            End Sub
 #End Region
 
 #Region "Private Events & Handlers"
             Private Sub VNCEvent_Connected(ByVal sender As Object, ByVal e As EventArgs)
                 MyBase.Event_Connected(Me)
+                VNC.AutoScroll = Info.VNCSmartSizeMode = SmartSizeMode.SmartSNo
             End Sub
 
             Private Sub VNCEvent_Disconnected(ByVal sender As Object, ByVal e As EventArgs)
                 MyBase.Event_Disconnected(sender, e.ToString)
                 MyBase.Close()
             End Sub
+
+            Private Function VNCEvent_Authenticate() As String
+                Return Info.Password
+            End Function
 #End Region
 
 #Region "Enums"

mRemoteV1/Forms/frmMain.Designer.vb

@@ -64,11 +64,14 @@ Partial Class frmMain
         Me.mMenInfo = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenInfoHelp = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenInfoSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenInfoBugReport = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoDonate = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenInfoWebsite = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoSep2 = New System.Windows.Forms.ToolStripSeparator
+        Me.mMenInfoDonate = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenInfoForum = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenInfoBugReport = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenInfoAnnouncements = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenToolsUpdate = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenInfoSep2 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenInfoAbout = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenSep3 = New System.Windows.Forms.ToolStripSeparator
         Me.lblQuickConnect = New System.Windows.Forms.ToolStripLabel
@@ -82,9 +85,6 @@ Partial Class frmMain
         Me.cMenToolbarShowText = New System.Windows.Forms.ToolStripMenuItem
         Me.tmrShowUpdate = New System.Windows.Forms.Timer(Me.components)
         Me.tmrAutoSave = New System.Windows.Forms.Timer(Me.components)
-        Me.mMenToolsUpdate = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoForum = New System.Windows.Forms.ToolStripMenuItem
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator
         Me.msMain.SuspendLayout()
         Me.tsContainer.ContentPanel.SuspendLayout()
         Me.tsContainer.TopToolStripPanel.SuspendLayout()
@@ -102,18 +102,20 @@ Partial Class frmMain
         Me.pnlDock.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow
         Me.pnlDock.Location = New System.Drawing.Point(0, 0)
         Me.pnlDock.Name = "pnlDock"
-        Me.pnlDock.Size = New System.Drawing.Size(842, 499)
+        Me.pnlDock.Size = New System.Drawing.Size(842, 474)
         Me.pnlDock.TabIndex = 13
         '
         'msMain
         '
         Me.msMain.Dock = System.Windows.Forms.DockStyle.None
-        Me.msMain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.msMain.GripMargin = New System.Windows.Forms.Padding(2, 0, 0, 0)
+        Me.msMain.GripMargin = New System.Windows.Forms.Padding(0)
+        Me.msMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Visible
         Me.msMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFile, Me.mMenView, Me.mMenTools, Me.mMenInfo})
-        Me.msMain.Location = New System.Drawing.Point(0, 0)
+        Me.msMain.Location = New System.Drawing.Point(3, 0)
         Me.msMain.Name = "msMain"
-        Me.msMain.Size = New System.Drawing.Size(842, 24)
+        Me.msMain.Padding = New System.Windows.Forms.Padding(2, 2, 0, 2)
+        Me.msMain.Size = New System.Drawing.Size(182, 24)
+        Me.msMain.Stretch = False
         Me.msMain.TabIndex = 16
         Me.msMain.Text = "Main Toolbar"
         '
@@ -121,7 +123,7 @@ Partial Class frmMain
         '
         Me.mMenFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFileNew, Me.mMenFileLoad, Me.mMenFileSep1, Me.mMenFileSave, Me.mMenFileSaveAs, Me.mMenFileSep2, Me.mMenFileExit})
         Me.mMenFile.Name = "mMenFile"
-        Me.mMenFile.Size = New System.Drawing.Size(35, 20)
+        Me.mMenFile.Size = New System.Drawing.Size(37, 20)
         Me.mMenFile.Text = "&File"
         '
         'mMenFileNew
@@ -129,7 +131,7 @@ Partial Class frmMain
         Me.mMenFileNew.Image = Global.mRemote.My.Resources.Resources.Connections_New
         Me.mMenFileNew.Name = "mMenFileNew"
         Me.mMenFileNew.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
-        Me.mMenFileNew.Size = New System.Drawing.Size(238, 22)
+        Me.mMenFileNew.Size = New System.Drawing.Size(256, 22)
         Me.mMenFileNew.Text = "New Connections"
         '
         'mMenFileLoad
@@ -137,20 +139,20 @@ Partial Class frmMain
         Me.mMenFileLoad.Image = Global.mRemote.My.Resources.Resources.Connections_Load
         Me.mMenFileLoad.Name = "mMenFileLoad"
         Me.mMenFileLoad.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
-        Me.mMenFileLoad.Size = New System.Drawing.Size(238, 22)
+        Me.mMenFileLoad.Size = New System.Drawing.Size(256, 22)
         Me.mMenFileLoad.Text = "Open Connections"
         '
         'mMenFileSep1
         '
         Me.mMenFileSep1.Name = "mMenFileSep1"
-        Me.mMenFileSep1.Size = New System.Drawing.Size(235, 6)
+        Me.mMenFileSep1.Size = New System.Drawing.Size(253, 6)
         '
         'mMenFileSave
         '
         Me.mMenFileSave.Image = Global.mRemote.My.Resources.Resources.Connections_Save
         Me.mMenFileSave.Name = "mMenFileSave"
         Me.mMenFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mMenFileSave.Size = New System.Drawing.Size(238, 22)
+        Me.mMenFileSave.Size = New System.Drawing.Size(256, 22)
         Me.mMenFileSave.Text = "Save Connections"
         '
         'mMenFileSaveAs
@@ -159,47 +161,47 @@ Partial Class frmMain
         Me.mMenFileSaveAs.Name = "mMenFileSaveAs"
         Me.mMenFileSaveAs.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _
                     Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mMenFileSaveAs.Size = New System.Drawing.Size(238, 22)
+        Me.mMenFileSaveAs.Size = New System.Drawing.Size(256, 22)
         Me.mMenFileSaveAs.Text = "Save Connections As"
         '
         'mMenFileSep2
         '
         Me.mMenFileSep2.Name = "mMenFileSep2"
-        Me.mMenFileSep2.Size = New System.Drawing.Size(235, 6)
+        Me.mMenFileSep2.Size = New System.Drawing.Size(253, 6)
         '
         'mMenFileExit
         '
         Me.mMenFileExit.Image = Global.mRemote.My.Resources.Resources.Quit
         Me.mMenFileExit.Name = "mMenFileExit"
         Me.mMenFileExit.ShortcutKeys = CType((System.Windows.Forms.Keys.Alt Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys)
-        Me.mMenFileExit.Size = New System.Drawing.Size(238, 22)
+        Me.mMenFileExit.Size = New System.Drawing.Size(256, 22)
         Me.mMenFileExit.Text = "Exit"
         '
         'mMenView
         '
         Me.mMenView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewAddConnectionPanel, Me.mMenViewConnectionPanels, Me.mMenViewSep1, Me.mMenViewConnections, Me.mMenViewConfig, Me.mMenViewSessions, Me.mMenViewErrorsAndInfos, Me.mMenViewScreenshotManager, Me.ToolStripSeparator1, Me.mMenViewJumpTo, Me.mMenViewSep2, Me.mMenViewQuickConnectToolbar, Me.mMenViewExtAppsToolbar, Me.mMenViewSep3, Me.mMenViewFullscreen})
         Me.mMenView.Name = "mMenView"
-        Me.mMenView.Size = New System.Drawing.Size(42, 20)
+        Me.mMenView.Size = New System.Drawing.Size(44, 20)
         Me.mMenView.Text = "&View"
         '
         'mMenViewAddConnectionPanel
         '
         Me.mMenViewAddConnectionPanel.Image = Global.mRemote.My.Resources.Resources.Panel_Add
         Me.mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel"
-        Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewAddConnectionPanel.Text = "Add Connection Panel"
         '
         'mMenViewConnectionPanels
         '
         Me.mMenViewConnectionPanels.Image = Global.mRemote.My.Resources.Resources.Panels
         Me.mMenViewConnectionPanels.Name = "mMenViewConnectionPanels"
-        Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewConnectionPanels.Text = "Connection Panels"
         '
         'mMenViewSep1
         '
         Me.mMenViewSep1.Name = "mMenViewSep1"
-        Me.mMenViewSep1.Size = New System.Drawing.Size(208, 6)
+        Me.mMenViewSep1.Size = New System.Drawing.Size(225, 6)
         '
         'mMenViewConnections
         '
@@ -207,7 +209,7 @@ Partial Class frmMain
         Me.mMenViewConnections.CheckState = System.Windows.Forms.CheckState.Checked
         Me.mMenViewConnections.Image = Global.mRemote.My.Resources.Resources.Root
         Me.mMenViewConnections.Name = "mMenViewConnections"
-        Me.mMenViewConnections.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewConnections.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewConnections.Text = "Connections"
         '
         'mMenViewConfig
@@ -216,7 +218,7 @@ Partial Class frmMain
         Me.mMenViewConfig.CheckState = System.Windows.Forms.CheckState.Checked
         Me.mMenViewConfig.Image = CType(resources.GetObject("mMenViewConfig.Image"), System.Drawing.Image)
         Me.mMenViewConfig.Name = "mMenViewConfig"
-        Me.mMenViewConfig.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewConfig.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewConfig.Text = "Config"
         '
         'mMenViewSessions
@@ -225,7 +227,7 @@ Partial Class frmMain
         Me.mMenViewSessions.CheckState = System.Windows.Forms.CheckState.Checked
         Me.mMenViewSessions.Image = CType(resources.GetObject("mMenViewSessions.Image"), System.Drawing.Image)
         Me.mMenViewSessions.Name = "mMenViewSessions"
-        Me.mMenViewSessions.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewSessions.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewSessions.Text = "Sessions"
         '
         'mMenViewErrorsAndInfos
@@ -234,27 +236,27 @@ Partial Class frmMain
         Me.mMenViewErrorsAndInfos.CheckState = System.Windows.Forms.CheckState.Checked
         Me.mMenViewErrorsAndInfos.Image = Global.mRemote.My.Resources.Resources.ErrorsAndInfos
         Me.mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos"
-        Me.mMenViewErrorsAndInfos.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewErrorsAndInfos.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewErrorsAndInfos.Text = "Errors and Infos"
         '
         'mMenViewScreenshotManager
         '
         Me.mMenViewScreenshotManager.Image = CType(resources.GetObject("mMenViewScreenshotManager.Image"), System.Drawing.Image)
         Me.mMenViewScreenshotManager.Name = "mMenViewScreenshotManager"
-        Me.mMenViewScreenshotManager.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewScreenshotManager.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewScreenshotManager.Text = "Screenshot Manager"
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(208, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(225, 6)
         '
         'mMenViewJumpTo
         '
         Me.mMenViewJumpTo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewJumpToConnectionsConfig, Me.mMenViewJumpToSessionsScreenshots, Me.mMenViewJumpToErrorsInfos})
         Me.mMenViewJumpTo.Image = Global.mRemote.My.Resources.Resources.JumpTo
         Me.mMenViewJumpTo.Name = "mMenViewJumpTo"
-        Me.mMenViewJumpTo.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewJumpTo.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewJumpTo.Text = "Jump To"
         '
         'mMenViewJumpToConnectionsConfig
@@ -262,7 +264,7 @@ Partial Class frmMain
         Me.mMenViewJumpToConnectionsConfig.Name = "mMenViewJumpToConnectionsConfig"
         Me.mMenViewJumpToConnectionsConfig.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
                     Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys)
-        Me.mMenViewJumpToConnectionsConfig.Size = New System.Drawing.Size(240, 22)
+        Me.mMenViewJumpToConnectionsConfig.Size = New System.Drawing.Size(260, 22)
         Me.mMenViewJumpToConnectionsConfig.Text = "Connections && Config"
         '
         'mMenViewJumpToSessionsScreenshots
@@ -270,7 +272,7 @@ Partial Class frmMain
         Me.mMenViewJumpToSessionsScreenshots.Name = "mMenViewJumpToSessionsScreenshots"
         Me.mMenViewJumpToSessionsScreenshots.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
                     Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mMenViewJumpToSessionsScreenshots.Size = New System.Drawing.Size(240, 22)
+        Me.mMenViewJumpToSessionsScreenshots.Size = New System.Drawing.Size(260, 22)
         Me.mMenViewJumpToSessionsScreenshots.Text = "Sessions && Screenshots"
         '
         'mMenViewJumpToErrorsInfos
@@ -278,99 +280,99 @@ Partial Class frmMain
         Me.mMenViewJumpToErrorsInfos.Name = "mMenViewJumpToErrorsInfos"
         Me.mMenViewJumpToErrorsInfos.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
                     Or System.Windows.Forms.Keys.E), System.Windows.Forms.Keys)
-        Me.mMenViewJumpToErrorsInfos.Size = New System.Drawing.Size(240, 22)
+        Me.mMenViewJumpToErrorsInfos.Size = New System.Drawing.Size(260, 22)
         Me.mMenViewJumpToErrorsInfos.Text = "Errors && Infos"
         '
         'mMenViewSep2
         '
         Me.mMenViewSep2.Name = "mMenViewSep2"
-        Me.mMenViewSep2.Size = New System.Drawing.Size(208, 6)
+        Me.mMenViewSep2.Size = New System.Drawing.Size(225, 6)
         '
         'mMenViewQuickConnectToolbar
         '
         Me.mMenViewQuickConnectToolbar.Image = Global.mRemote.My.Resources.Resources.Play_Quick
         Me.mMenViewQuickConnectToolbar.Name = "mMenViewQuickConnectToolbar"
-        Me.mMenViewQuickConnectToolbar.Size = New System.Drawing.Size(211, 22)
-        Me.mMenViewQuickConnectToolbar.Text = "Quicky Toolbar"
+        Me.mMenViewQuickConnectToolbar.Size = New System.Drawing.Size(228, 22)
+        Me.mMenViewQuickConnectToolbar.Text = "Quick Connect Toolbar"
         '
         'mMenViewExtAppsToolbar
         '
         Me.mMenViewExtAppsToolbar.Image = CType(resources.GetObject("mMenViewExtAppsToolbar.Image"), System.Drawing.Image)
         Me.mMenViewExtAppsToolbar.Name = "mMenViewExtAppsToolbar"
-        Me.mMenViewExtAppsToolbar.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewExtAppsToolbar.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewExtAppsToolbar.Text = "External Applications Toolbar"
         '
         'mMenViewSep3
         '
         Me.mMenViewSep3.Name = "mMenViewSep3"
-        Me.mMenViewSep3.Size = New System.Drawing.Size(208, 6)
+        Me.mMenViewSep3.Size = New System.Drawing.Size(225, 6)
         '
         'mMenViewFullscreen
         '
         Me.mMenViewFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen
         Me.mMenViewFullscreen.Name = "mMenViewFullscreen"
-        Me.mMenViewFullscreen.Size = New System.Drawing.Size(211, 22)
+        Me.mMenViewFullscreen.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewFullscreen.Text = "Fullscreen (Kiosk Mode)"
         '
         'mMenTools
         '
         Me.mMenTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenToolsSSHTransfer, Me.mMenToolsUVNCSC, Me.mMenToolsExternalApps, Me.mMenToolsPortScan, Me.mMenToolsSep1, Me.mMenToolsComponentsCheck, Me.mMenToolsOptions})
         Me.mMenTools.Name = "mMenTools"
-        Me.mMenTools.Size = New System.Drawing.Size(45, 20)
+        Me.mMenTools.Size = New System.Drawing.Size(48, 20)
         Me.mMenTools.Text = "&Tools"
         '
         'mMenToolsSSHTransfer
         '
         Me.mMenToolsSSHTransfer.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
         Me.mMenToolsSSHTransfer.Name = "mMenToolsSSHTransfer"
-        Me.mMenToolsSSHTransfer.Size = New System.Drawing.Size(173, 22)
+        Me.mMenToolsSSHTransfer.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsSSHTransfer.Text = "SSH File Transfer"
         '
         'mMenToolsUVNCSC
         '
         Me.mMenToolsUVNCSC.Image = Global.mRemote.My.Resources.Resources.UVNC_SC
         Me.mMenToolsUVNCSC.Name = "mMenToolsUVNCSC"
-        Me.mMenToolsUVNCSC.Size = New System.Drawing.Size(173, 22)
+        Me.mMenToolsUVNCSC.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsUVNCSC.Text = "UltraVNC SingleClick"
         '
         'mMenToolsExternalApps
         '
         Me.mMenToolsExternalApps.Image = CType(resources.GetObject("mMenToolsExternalApps.Image"), System.Drawing.Image)
         Me.mMenToolsExternalApps.Name = "mMenToolsExternalApps"
-        Me.mMenToolsExternalApps.Size = New System.Drawing.Size(173, 22)
+        Me.mMenToolsExternalApps.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsExternalApps.Text = "External Applications"
         '
         'mMenToolsPortScan
         '
         Me.mMenToolsPortScan.Image = Global.mRemote.My.Resources.Resources.PortScan
         Me.mMenToolsPortScan.Name = "mMenToolsPortScan"
-        Me.mMenToolsPortScan.Size = New System.Drawing.Size(173, 22)
+        Me.mMenToolsPortScan.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsPortScan.Text = "Port Scan"
         '
         'mMenToolsSep1
         '
         Me.mMenToolsSep1.Name = "mMenToolsSep1"
-        Me.mMenToolsSep1.Size = New System.Drawing.Size(170, 6)
+        Me.mMenToolsSep1.Size = New System.Drawing.Size(181, 6)
         '
         'mMenToolsComponentsCheck
         '
         Me.mMenToolsComponentsCheck.Image = Global.mRemote.My.Resources.Resources.ComponentsCheck
         Me.mMenToolsComponentsCheck.Name = "mMenToolsComponentsCheck"
-        Me.mMenToolsComponentsCheck.Size = New System.Drawing.Size(173, 22)
+        Me.mMenToolsComponentsCheck.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsComponentsCheck.Text = "Components Check"
         '
         'mMenToolsOptions
         '
         Me.mMenToolsOptions.Image = CType(resources.GetObject("mMenToolsOptions.Image"), System.Drawing.Image)
         Me.mMenToolsOptions.Name = "mMenToolsOptions"
-        Me.mMenToolsOptions.Size = New System.Drawing.Size(173, 22)
+        Me.mMenToolsOptions.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsOptions.Text = "Options"
         '
         'mMenInfo
         '
         Me.mMenInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenInfoHelp, Me.mMenInfoSep1, Me.mMenInfoWebsite, Me.mMenInfoDonate, Me.mMenInfoForum, Me.mMenInfoBugReport, Me.ToolStripSeparator2, Me.mMenInfoAnnouncements, Me.mMenToolsUpdate, Me.mMenInfoSep2, Me.mMenInfoAbout})
         Me.mMenInfo.Name = "mMenInfo"
-        Me.mMenInfo.Size = New System.Drawing.Size(41, 20)
+        Me.mMenInfo.Size = New System.Drawing.Size(44, 20)
         Me.mMenInfo.Text = "&Help"
         Me.mMenInfo.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal
         '
@@ -379,52 +381,70 @@ Partial Class frmMain
         Me.mMenInfoHelp.Image = CType(resources.GetObject("mMenInfoHelp.Image"), System.Drawing.Image)
         Me.mMenInfoHelp.Name = "mMenInfoHelp"
         Me.mMenInfoHelp.ShortcutKeys = System.Windows.Forms.Keys.F1
-        Me.mMenInfoHelp.Size = New System.Drawing.Size(179, 22)
+        Me.mMenInfoHelp.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoHelp.Text = "mRemoteNG Help"
         '
         'mMenInfoSep1
         '
         Me.mMenInfoSep1.Name = "mMenInfoSep1"
-        Me.mMenInfoSep1.Size = New System.Drawing.Size(176, 6)
-        '
-        'mMenInfoBugReport
-        '
-        Me.mMenInfoBugReport.Image = Global.mRemote.My.Resources.Resources.Bug
-        Me.mMenInfoBugReport.Name = "mMenInfoBugReport"
-        Me.mMenInfoBugReport.Size = New System.Drawing.Size(179, 22)
-        Me.mMenInfoBugReport.Text = "Report a Bug"
-        '
-        'mMenInfoDonate
-        '
-        Me.mMenInfoDonate.Image = Global.mRemote.My.Resources.Resources.Donate
-        Me.mMenInfoDonate.Name = "mMenInfoDonate"
-        Me.mMenInfoDonate.Size = New System.Drawing.Size(179, 22)
-        Me.mMenInfoDonate.Text = "Donate"
+        Me.mMenInfoSep1.Size = New System.Drawing.Size(187, 6)
         '
         'mMenInfoWebsite
         '
         Me.mMenInfoWebsite.Image = CType(resources.GetObject("mMenInfoWebsite.Image"), System.Drawing.Image)
         Me.mMenInfoWebsite.Name = "mMenInfoWebsite"
-        Me.mMenInfoWebsite.Size = New System.Drawing.Size(179, 22)
+        Me.mMenInfoWebsite.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoWebsite.Text = "Website"
         '
-        'mMenInfoSep2
+        'mMenInfoDonate
         '
-        Me.mMenInfoSep2.Name = "mMenInfoSep2"
-        Me.mMenInfoSep2.Size = New System.Drawing.Size(176, 6)
+        Me.mMenInfoDonate.Image = Global.mRemote.My.Resources.Resources.Donate
+        Me.mMenInfoDonate.Name = "mMenInfoDonate"
+        Me.mMenInfoDonate.Size = New System.Drawing.Size(190, 22)
+        Me.mMenInfoDonate.Text = "Donate"
+        '
+        'mMenInfoForum
+        '
+        Me.mMenInfoForum.Name = "mMenInfoForum"
+        Me.mMenInfoForum.Size = New System.Drawing.Size(190, 22)
+        Me.mMenInfoForum.Text = "Support Forum"
+        '
+        'mMenInfoBugReport
+        '
+        Me.mMenInfoBugReport.Image = Global.mRemote.My.Resources.Resources.Bug
+        Me.mMenInfoBugReport.Name = "mMenInfoBugReport"
+        Me.mMenInfoBugReport.Size = New System.Drawing.Size(190, 22)
+        Me.mMenInfoBugReport.Text = "Report a Bug"
+        '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(187, 6)
         '
         'mMenInfoAnnouncements
         '
         Me.mMenInfoAnnouncements.Image = Global.mRemote.My.Resources.Resources.News
         Me.mMenInfoAnnouncements.Name = "mMenInfoAnnouncements"
-        Me.mMenInfoAnnouncements.Size = New System.Drawing.Size(179, 22)
+        Me.mMenInfoAnnouncements.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoAnnouncements.Text = "Announcements"
         '
+        'mMenToolsUpdate
+        '
+        Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update
+        Me.mMenToolsUpdate.Name = "mMenToolsUpdate"
+        Me.mMenToolsUpdate.Size = New System.Drawing.Size(190, 22)
+        Me.mMenToolsUpdate.Text = "Check for Updates"
+        '
+        'mMenInfoSep2
+        '
+        Me.mMenInfoSep2.Name = "mMenInfoSep2"
+        Me.mMenInfoSep2.Size = New System.Drawing.Size(187, 6)
+        '
         'mMenInfoAbout
         '
         Me.mMenInfoAbout.Image = Global.mRemote.My.Resources.Resources.mRemote
         Me.mMenInfoAbout.Name = "mMenInfoAbout"
-        Me.mMenInfoAbout.Size = New System.Drawing.Size(179, 22)
+        Me.mMenInfoAbout.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoAbout.Text = "About mRemoteNG"
         '
         'mMenSep3
@@ -435,15 +455,15 @@ Partial Class frmMain
         'lblQuickConnect
         '
         Me.lblQuickConnect.Name = "lblQuickConnect"
-        Me.lblQuickConnect.Size = New System.Drawing.Size(43, 22)
-        Me.lblQuickConnect.Text = "&Quicky:"
+        Me.lblQuickConnect.Size = New System.Drawing.Size(55, 22)
+        Me.lblQuickConnect.Text = "&Connect:"
         '
         'cmbQuickConnect
         '
         Me.cmbQuickConnect.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
         Me.cmbQuickConnect.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
         Me.cmbQuickConnect.Name = "cmbQuickConnect"
-        Me.cmbQuickConnect.Size = New System.Drawing.Size(120, 21)
+        Me.cmbQuickConnect.Size = New System.Drawing.Size(120, 25)
         '
         'tsContainer
         '
@@ -455,7 +475,8 @@ Partial Class frmMain
         'tsContainer.ContentPanel
         '
         Me.tsContainer.ContentPanel.Controls.Add(Me.pnlDock)
-        Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 499)
+        Me.tsContainer.ContentPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
+        Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 474)
         Me.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill
         '
         'tsContainer.LeftToolStripPanel
@@ -474,16 +495,17 @@ Partial Class frmMain
         'tsContainer.TopToolStripPanel
         '
         Me.tsContainer.TopToolStripPanel.Controls.Add(Me.msMain)
+        Me.tsContainer.TopToolStripPanel.Controls.Add(Me.tsQuickConnect)
+        Me.tsContainer.TopToolStripPanel.Controls.Add(Me.tsExtAppsToolbar)
         Me.tsContainer.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
         '
         'tsQuickConnect
         '
         Me.tsQuickConnect.Dock = System.Windows.Forms.DockStyle.None
         Me.tsQuickConnect.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.lblQuickConnect, Me.cmbQuickConnect, Me.btnQuickyPlay, Me.mMenQuickyCon})
-        Me.tsQuickConnect.Location = New System.Drawing.Point(3, 0)
+        Me.tsQuickConnect.Location = New System.Drawing.Point(3, 24)
         Me.tsQuickConnect.Name = "tsQuickConnect"
-        Me.tsQuickConnect.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.tsQuickConnect.Size = New System.Drawing.Size(207, 25)
+        Me.tsQuickConnect.Size = New System.Drawing.Size(251, 25)
         Me.tsQuickConnect.TabIndex = 18
         '
         'btnQuickyPlay
@@ -492,8 +514,8 @@ Partial Class frmMain
         Me.btnQuickyPlay.Image = Global.mRemote.My.Resources.Resources.Play_Quick
         Me.btnQuickyPlay.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.btnQuickyPlay.Name = "btnQuickyPlay"
-        Me.btnQuickyPlay.Size = New System.Drawing.Size(32, 20)
-        Me.btnQuickyPlay.Text = "Play"
+        Me.btnQuickyPlay.Size = New System.Drawing.Size(32, 22)
+        Me.btnQuickyPlay.Text = "Connect"
         '
         'mMenQuickyCon
         '
@@ -510,25 +532,23 @@ Partial Class frmMain
         '
         Me.tsExtAppsToolbar.ContextMenuStrip = Me.cMenExtAppsToolbar
         Me.tsExtAppsToolbar.Dock = System.Windows.Forms.DockStyle.None
-        Me.tsExtAppsToolbar.Location = New System.Drawing.Point(300, 0)
+        Me.tsExtAppsToolbar.Location = New System.Drawing.Point(254, 24)
         Me.tsExtAppsToolbar.Name = "tsExtAppsToolbar"
-        Me.tsExtAppsToolbar.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.tsExtAppsToolbar.Size = New System.Drawing.Size(109, 25)
+        Me.tsExtAppsToolbar.Size = New System.Drawing.Size(111, 25)
         Me.tsExtAppsToolbar.TabIndex = 17
         '
         'cMenExtAppsToolbar
         '
         Me.cMenExtAppsToolbar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cMenToolbarShowText})
         Me.cMenExtAppsToolbar.Name = "cMenToolbar"
-        Me.cMenExtAppsToolbar.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.cMenExtAppsToolbar.Size = New System.Drawing.Size(126, 26)
+        Me.cMenExtAppsToolbar.Size = New System.Drawing.Size(129, 26)
         '
         'cMenToolbarShowText
         '
         Me.cMenToolbarShowText.Checked = True
         Me.cMenToolbarShowText.CheckState = System.Windows.Forms.CheckState.Checked
         Me.cMenToolbarShowText.Name = "cMenToolbarShowText"
-        Me.cMenToolbarShowText.Size = New System.Drawing.Size(125, 22)
+        Me.cMenToolbarShowText.Size = New System.Drawing.Size(128, 22)
         Me.cMenToolbarShowText.Text = "Show Text"
         '
         'tmrShowUpdate
@@ -540,24 +560,6 @@ Partial Class frmMain
         '
         Me.tmrAutoSave.Interval = 10000
         '
-        'mMenToolsUpdate
-        '
-        Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update
-        Me.mMenToolsUpdate.Name = "mMenToolsUpdate"
-        Me.mMenToolsUpdate.Size = New System.Drawing.Size(179, 22)
-        Me.mMenToolsUpdate.Text = "Check for Updates"
-        '
-        'mMenInfoForum
-        '
-        Me.mMenInfoForum.Name = "mMenInfoForum"
-        Me.mMenInfoForum.Size = New System.Drawing.Size(179, 22)
-        Me.mMenInfoForum.Text = "Support Forum"
-        '
-        'ToolStripSeparator2
-        '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(176, 6)
-        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -566,9 +568,8 @@ Partial Class frmMain
         Me.Controls.Add(Me.tsContainer)
         Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon
         Me.MainMenuStrip = Me.msMain
-        Me.MaximumSize = New System.Drawing.Size(20000, 10000)
         Me.Name = "frmMain"
-        Me.Text = "mRemote"
+        Me.Text = "mRemoteNG"
         Me.msMain.ResumeLayout(False)
         Me.msMain.PerformLayout()
         Me.tsContainer.ContentPanel.ResumeLayout(False)

mRemoteV1/Forms/frmMain.resx

@@ -118,14 +118,14 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="msMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>13, 8</value>
+    <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="mMenViewConfig.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBwAA
-        CwcBtnMLwAAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAwAA
+        CwMBSY6M0gAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
         pA1bmfODND+DpqUzt5Vfm7NtZx9n52xnui9zm/m5p9/vlINcHnjhnPf83ud5n/d9fhIAkv9FQ0NDrU6n
         29fr9cnS0tKqq87lFQ8MDNxqaWm5oVKpjPFEEql0Gp2dnYb29vbrGo3m9mWgHIDBYGh7PzmZ1en1gtE4
         kgoLEYTCAmLxOE5OTzExMXHw2mAQTCZT9vmLF8oLIBFAJpNde/N2iGP5EOKJhBh70SjYIAchEsHu3h4O
@@ -143,145 +143,145 @@
   <data name="mMenViewSessions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="mMenViewScreenshotManager.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="mMenViewExtAppsToolbar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmhJREFUOE+lU9tL
-        01EcP/0VvbqxiQ6dOp2b25xzzgspRrvpNkeMTBqiszSzGgrSKlIYtV9RZJl0UdOJjbSctFUrsKcxg3oo
-        /GF0ocCHpHrwoU87B04UBAke+Dx+vp8bZxcAsqN3/ebdK8vJ1Fby2QoST1cQf/wcC/EnuLf4CDOxJdye
-        XcD45Dwu35jBhat3MHJxAqHwGIJnhK3O3sFukiX/fLl3D95Fd8M8b8SrN+v/xeu36/j0ZQPdJ0ciJJl6
-        ga/LD/HjvYD7H2L4+HljW9j89h3+Y6cFQi2XlJRApVKhtLQUZWVlUKvVKC8vh0ajQUVFBfR6PQwGAyor
-        K1FVVYXq6mrU1NSgvWdIIEuJFCPl5ORAIpFAKpVCJpNBLpcjNzcXeXl5UCgUKCgoQGFhIYqKiphgXV0d
-        eofCAqGF8QPpdBpTU1PbPpDtQCCxBwlmkyuura2hr6/vn6o0Jo/Y2NiIQ/0hgczG4ixbfn4+MpkMotEo
-        lErlb6ucxDvRarXQ6XRobm7GgcCgQCbnFmE2mxmhuLiY5eNlUhIFJ9EyqRiF1WrF/s4BgUxMx1BfX/8X
-        ibdPlfgCRqORLWAymdgKDocDno5egYzdmgPNQ1VoF5T052R8NuqSwmKxoLa2Fi0tLXD6ugVyaXya5eHW
-        uBJVoQS6NyfR6SgaGhrgdrth8/oFci5ybZPmsdlssNvtzJrT6WQKFK2trXC5XIzg8XjQ1tbG4PV60eT0
-        jZLAwHAgGDq/GgxFxP7hsHhkcFTsOn5W9B89JR7sGRJ9XSdEr79fdLcfFrOWxayquM/dITY5fKuWJoeJ
-        0O+8E/wCTNYVG3agVjIAAAAASUVORK5CYII=
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmlJREFUOE+lVN1L
+        k1EcPv9Ft06mzOF0m27qdHOb040cRpubc3PEyKQhTktbVuJAWkUKUr5FkWXSh5pObKTmJK1WYFdjBnVR
+        7MXogwIvkurCi552DpwoCBK8eC6f3/PFOQQA2Q3IjVv3ri6vJrdXn61h5ekaEo+fYz7xBPcXHmE6voQ7
+        M/MYm5jDlZvTuHjtLgYvjSM6PIq+s8J2e3d/iGTJP1/u24t3sT0wzxnw6s3Gf/H67QY+fdlE6NTgCFlN
+        vsDX5Yf48V7Agw9xfPy8uSNsffuO4PEzAqGWVSoV1Go1SkpKUFpaCo1GA61Wi7KyMlRUVKCyshJVVVXQ
+        6/Worq6GyWRCTU0NWrsiAllaSTJSTk4OJBIJcnNzIZVKkZeXh/z8fMhkMsjlchQWFkKhUKC4uJgJ1tXV
+        oTsyLBBaGD+QSqUwOTm54wPZDgQSX1xhNrliJpNBT0/PP1VpTB6xvr4eh8NRgczEEyxbQUEB0uk0YrEY
+        ioqKflvlJN5JeXk5dDodGhoacLCzXyATswswm82MoFQqWT5eJiVRcBItk4pROBwOHGjvFcj4VBxWq/Uv
+        Em+fKvEFDAYDW8BoNLIVXC4XfG3dAhm9PQuah6rQLijpz8n4bNQlhcViQW1tLZqamuAOhARyeWyK5eHW
+        uBJVoQS6NyfR6ShsNhu8Xi+c/qBAzo9c36J5nE4nGhsbmTW3280UKDweD5qbmxnB5/OhpaWFwe/3w+4O
+        DJHO3oHOvuiF9b7oiBgeGBaP9g+JHSfOicFjp8VDXREx0HFS9AfDorf1iJi1LGZVxf3eNtHuCqxb7C7j
+        rp4y/QZ+AXhAQe1Sf9VzAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="mMenToolsExternalApps.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmhJREFUOE+lU9tL
-        01EcP/0VvbqxiQ6dOp2b25xzzgspRrvpNkeMTBqiszSzGgrSKlIYtV9RZJl0UdOJjbSctFUrsKcxg3oo
-        /GF0ocCHpHrwoU87B04UBAke+Dx+vp8bZxcAsqN3/ebdK8vJ1Fby2QoST1cQf/wcC/EnuLf4CDOxJdye
-        XcD45Dwu35jBhat3MHJxAqHwGIJnhK3O3sFukiX/fLl3D95Fd8M8b8SrN+v/xeu36/j0ZQPdJ0ciJJl6
-        ga/LD/HjvYD7H2L4+HljW9j89h3+Y6cFQi2XlJRApVKhtLQUZWVlUKvVKC8vh0ajQUVFBfR6PQwGAyor
-        K1FVVYXq6mrU1NSgvWdIIEuJFCPl5ORAIpFAKpVCJpNBLpcjNzcXeXl5UCgUKCgoQGFhIYqKiphgXV0d
-        eofCAqGF8QPpdBpTU1PbPpDtQCCxBwlmkyuura2hr6/vn6o0Jo/Y2NiIQ/0hgczG4ixbfn4+MpkMotEo
-        lErlb6ucxDvRarXQ6XRobm7GgcCgQCbnFmE2mxmhuLiY5eNlUhIFJ9EyqRiF1WrF/s4BgUxMx1BfX/8X
-        ibdPlfgCRqORLWAymdgKDocDno5egYzdmgPNQ1VoF5T052R8NuqSwmKxoLa2Fi0tLXD6ugVyaXya5eHW
-        uBJVoQS6NyfR6SgaGhrgdrth8/oFci5ybZPmsdlssNvtzJrT6WQKFK2trXC5XIzg8XjQ1tbG4PV60eT0
-        jZLAwHAgGDq/GgxFxP7hsHhkcFTsOn5W9B89JR7sGRJ9XSdEr79fdLcfFrOWxayquM/dITY5fKuWJoeJ
-        0O+8E/wCTNYVG3agVjIAAAAASUVORK5CYII=
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmlJREFUOE+lVN1L
+        k1EcPv9Ft06mzOF0m27qdHOb040cRpubc3PEyKQhTktbVuJAWkUKUr5FkWXSh5pObKTmJK1WYFdjBnVR
+        7MXogwIvkurCi552DpwoCBK8eC6f3/PFOQQA2Q3IjVv3ri6vJrdXn61h5ekaEo+fYz7xBPcXHmE6voQ7
+        M/MYm5jDlZvTuHjtLgYvjSM6PIq+s8J2e3d/iGTJP1/u24t3sT0wzxnw6s3Gf/H67QY+fdlE6NTgCFlN
+        vsDX5Yf48V7Agw9xfPy8uSNsffuO4PEzAqGWVSoV1Go1SkpKUFpaCo1GA61Wi7KyMlRUVKCyshJVVVXQ
+        6/Worq6GyWRCTU0NWrsiAllaSTJSTk4OJBIJcnNzIZVKkZeXh/z8fMhkMsjlchQWFkKhUKC4uJgJ1tXV
+        oTsyLBBaGD+QSqUwOTm54wPZDgQSX1xhNrliJpNBT0/PP1VpTB6xvr4eh8NRgczEEyxbQUEB0uk0YrEY
+        ioqKflvlJN5JeXk5dDodGhoacLCzXyATswswm82MoFQqWT5eJiVRcBItk4pROBwOHGjvFcj4VBxWq/Uv
+        Em+fKvEFDAYDW8BoNLIVXC4XfG3dAhm9PQuah6rQLijpz8n4bNQlhcViQW1tLZqamuAOhARyeWyK5eHW
+        uBJVoQS6NyfR6ShsNhu8Xi+c/qBAzo9c36J5nE4nGhsbmTW3280UKDweD5qbmxnB5/OhpaWFwe/3w+4O
+        DJHO3oHOvuiF9b7oiBgeGBaP9g+JHSfOicFjp8VDXREx0HFS9AfDorf1iJi1LGZVxf3eNtHuCqxb7C7j
+        rp4y/QZ+AXhAQe1Sf9VzAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="mMenToolsOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgVJREFUOE+Vk8tv
-        EmEUxXHhX2L8U4waY4wrVy5lK0YXkqZpYIBhkEccCk6dIgttsHZaYyi2jKgjb5NR0pGHL2iKFAQtrhoX
-        mDnemQWa2EKd5Mu3ub/znXvunWMALNO+eDxu03XdSrUn6bZYrdbjY8YQmHRisZhNFMX9TqeD4XCIaDRK
-        5X+YibBRSHC93W6j1+shnU4jHA7/n4AgCCPj9UqlAp7ns4ZoMBiE3++Hz+cbTXVAln81m00UCgWEQqFX
-        gUAgJ0kSGo0GWJadLBCJRM6QZb1araJcLiOTyUCWZWSzWeTzebjd7vqBDm6tfuG9iY8VsjwqlUpQVRXG
-        XSwWkcvloCgKXC7XvtPptP0jwC3v8IvpHoSnXfiX30PTNKRSKXAcpxuW6dURwzB1h8NhM1fg75GwBrzR
-        RabyA/LbIfxrbcyIGrxe70+Px3PioHGPBdyJHX6B4GcEJpQ+7j//imT5OxwPtnGZ014ftiumALO0zQvr
-        Xchvhlh62Ud0fRcxamOt+A32eAsXmdqjQwXmCJ5PdrGpEvyij/nkLkRyspof4Oa9Fi443kmTNtVijzex
-        oe6ZlvknHdyl8KTcADcWWzg/Nxk2Q7x65xP1ugdxk5KnNlYIvk7w2dmtx9P+E1Pgyu0PqhHUSnaAh8oA
-        1xY+4/TM0eDxGC+xtRoFhXOzWzhlPzpsCPwGZiza7bmUpcQAAAAASUVORK5CYII=
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAftJREFUOE+Vk81v
+        0mAcx/lf/FuMGmOMJ08ePYvRg2RZllKgFAvEMrDYwg664BybMQw3KmpteTOpklVefINlyEDQ1dPioWbf
+        PeUwNW50Hppe+vn8vr/v89QFwOX0pNNptyRJLVEUrWQyaf35vSOcSqXcBNzr9/swTROJRILwv4c6Cgjc
+        6vV6GA6HKBQKiMVi/ycQBMGyp9frdfA8r9rTI5EIOI5DKBSyHBOQyL86nQ7K5TKi0eircDisZbNZtNtt
+        MAwzXRCPx8+SyPuNRgO1Wg3FYhGyLENVVZRKJfj9/taRCW6vfOGDmY91EtmqVqvQdR32u1KpQNM0KIoC
+        n8+35/V63f8I2KVtXioMITwdgFt6D8MwkM/nwbLsvh2ZTLVomm5RFOW2+/hLwNjw+gDF+g/Ib01wqz3M
+        iAaCweDPQCBw6qj7cijwZ7b5JIGfETCjjHD/+Vfkat9BPdjCFdZ4fdxlmwjoxS1eWBtAfmNi8eUIibUd
+        pMgaq5Vv8Cx0cYluPjpWMEfg+dwAGzqBX4wwn9uBSJKslMa4le7iIvUuO+2quzwLHazru5PI/JM+7pHy
+        stoYN6UuLsxNhyclXrv7iey6C3GDNE/WWCbwDQKfm9187PSTTQRX73zQ7aKW1TEeKmNcT37GmZmTwYfH
+        eJlpNklROD+7idOek8O24AByavlRgSfdiAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="mMenInfoHelp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAArRJREFUOE+lk+1P
-        kmEUh+tf0T+htZqrVav1rbbGhz70wan5CjS1XC2D5Swd5jRLSs1Mp4KaOqeiwJOACKKJ8iYIPJjIm/Iy
-        EB541Gz7BSxBW2tt3dt1b/d2zrWdc59zFsCZ/zopwUlU5GGu0n7AUVj3SdkGTX0xxymJiSJnDVHOtG4v
-        9/f4U8lyK82YsyR8Dv8hNndp2L1UGsdOAhZPAqNLQd/wop9xUpIREOtxhtgYi28F9qH/FoZw3g3euBUN
-        oxvoJjahsQRh81H4JHPHu4ntjCQtEOmjOVNrEe+mn8aiNYS6ZFIX4YA7RMMVSmB8yYNaoRHSNR/Mrija
-        pkhvy4QtJ92/1DW2HOSuu+NYdUTAHTLjca8eiYOjJD9+cYS6IQNqB3RYMAegXA+gXmjkZgT98z7Slqy1
-        h9hCTa8O1T2rcAcTmF7xQG7aAZ2UyU1eMDtUaJu2wOgM40mPlswIOiVO2u6NgSswoOqjFqwuTTJYjRmt
-        C2HqALthGn1zNpS1K1H1QQ2Law8svprOCFonbLTNE8PTQQOYnWpUvFeh/J0KMfo7tgMU2HwliltluJ+E
-        zVfA7I6goFmeFbwQmkjTdgR8kQ2sDg3K+QsofTuPktfyNEWvCBQ1SVDYJEaDcAVaRwB368XZEpL1cCVa
-        D9SWAKo6NZnEUHQfgT0a+bzZNEU8EYg1FwTJcm7VTmabyOYv5lS8WfAuWwOQrrrBbFegsFmK9gldmlRy
-        QeMkRhR2KAwe3KwZ915/OJb9xlQz8nlzjHuNRFxl3oHc6MVLwTJKW8QobprB8z41pFonZHo3rlZ+jl9+
-        MHx6kI5H8w5XxLj9bMrXT2zgq90PgzOUZsm6i26RCXksoe9iheDPo3wsufFoLPda9SjnSuUIeYk9ROUx
-        hdSF8kHyfNkA51xJ/9+X6fdN+5f3T6xF2MGyA9nXAAAAAElFTkSuQmCC
+        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
 </value>
   </data>
   <data name="mMenInfoWebsite.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <metadata name="tsQuickConnect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>651, 5</value>
+    <value>521, 17</value>
   </metadata>
   <metadata name="tsExtAppsToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>348, 8</value>
+    <value>374, 17</value>
   </metadata>
   <metadata name="cMenExtAppsToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>482, 8</value>
+    <value>17, 56</value>
   </metadata>
   <metadata name="tmrShowUpdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>102, 8</value>
+    <value>112, 17</value>
   </metadata>
   <metadata name="tmrAutoSave.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>233, 8</value>
+    <value>252, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>37</value>
+    <value>155</value>
   </metadata>
 </root>

mRemoteV1/Forms/frmMain.vb

@@ -44,14 +44,16 @@ Public Class frmMain
         'LoadCredentials()
         LoadConnections()
 
-        If My.Settings.FirstStart Then
-            Windows.Show(UI.Window.Type.About)
-        End If
-
         If My.Settings.StartupComponentsCheck Then
             Windows.Show(UI.Window.Type.ComponentsCheck)
         End If
 
+        If Not My.Settings.CheckForUpdatesAsked Then
+            Windows.Show(UI.Window.Type.Options)
+            Windows.optionsForm.ShowUpdatesTab()
+            My.Settings.CheckForUpdatesAsked = True
+        End If
+
         Startup.UpdateCheck()
         Startup.AnnouncementCheck()
         Startup.CreateSQLUpdateHandlerAndStartTimer()
@@ -123,10 +125,8 @@ Public Class frmMain
         End If
 
         If App.Runtime.IsUpdateAvailable Then
-            If My.Settings.CheckForUpdatesOnStartup Then
-                App.Runtime.Windows.Show(UI.Window.Type.Update)
-                Me.tmrShowUpdate.Enabled = False
-            End If
+            App.Runtime.Windows.Show(UI.Window.Type.Update)
+            Me.tmrShowUpdate.Enabled = False
         End If
 
         If App.Runtime.IsAnnouncementAvailable Then
@@ -562,29 +562,33 @@ Public Class frmMain
     End Sub
 
 #Region "Window Overrides and DockPanel Stuff"
-    Private Msg13 As Boolean = False
-    Private Msg71 As Boolean = False
+    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
 
     Protected Overloads Overrides Sub WndProc(ByRef m As Message)
         Try
             'Debug.Print(m.Msg)
 
-            If m.Msg = 13 Then
-                Msg13 = True
-            ElseIf m.Msg = 71 Then
-                If Msg13 Then
+            If m.Msg = WM_GETTEXT Then
+                bWmGetTextFlag = True
+            ElseIf m.Msg = WM_WINDOWPOSCHANGED Then
+                If bWmGetTextFlag Then
                     ActivateConnection()
                 End If
 
-                Msg13 = False
-                Msg71 = True
-            ElseIf m.Msg = 28 Then
-                If Msg71 Then
+                bWmGetTextFlag = False
+                bWmWindowPosChangedFlag = True
+            ElseIf m.Msg = WM_ACTIVATEAPP Then
+                If bWmWindowPosChangedFlag Then
                     ActivateConnection()
                 End If
             Else
-                Msg13 = False
-                Msg71 = False
+                bWmGetTextFlag = False
+                bWmWindowPosChangedFlag = False
             End If
 
             If m.Msg = Tools.SystemMenu.Flags.WM_SYSCOMMAND Then

mRemoteV1/Language/Language.EN.vb

@@ -123,7 +123,7 @@
         Public Const Menu_OpenConnections As String = "Open Connections"
         Public Const Menu_Options As String = "Options"
         Public Const Menu_PortScan As String = "Port Scan"
-        Public Const Menu_QuickyToolbar As String = "Quicky Toolbar"
+        Public Const Menu_QuickyToolbar As String = "Quick Connect Toolbar"
         Public Const Menu_SaveConnections As String = "Save Connections"
         Public Const Menu_SaveConnectionsAs As String = "Save Connections As"
         Public Const Menu_ScreenshotManager As String = "Screenshot Manager"
@@ -135,8 +135,8 @@
         Public Const Menu_View As String = "&View"
         Public Const Menu_Website As String = "Website"
 
-        Public Const Toolbar_Play As String = "Play"
-        Public Const Toolbar_Quicky As String = "&Quicky:"
+        Public Const Toolbar_Play As String = "Connect"
+        Public Const Toolbar_Quicky As String = "&Connect:"
         Public Const Toolbar_ShowText As String = "Show Text"
 
         Public Const Password As String = "Password:"
@@ -226,8 +226,8 @@
         Public Const MaxPuttyWaitTime As String = "Max. PuTTY && Integrated Ext. Apps wait time"
         Public Const AutomaticallyTryToReconnect As String = "Automatically try to reconnect when disconnected from server (RDP && ICA only)"
         Public Const Address As String = "Address"
-        Public Const UseAuthentication As String = "Use Authentication"
-        Public Const UseProxyForAutomaticUpdates As String = "Use Proxy for automatic updates"
+        Public Const UseAuthentication As String = "This proxy server requires authentication"
+        Public Const UseProxyForAutomaticUpdates As String = "Use a proxy server to connect"
         Public Const ToConfigurePuttySessions As String = "To configure PuTTY sessions click this button:"
         Public Const LaunchPutty As String = "Launch PuTTY"
         Public Const UseCustomPuttyPath As String = "Use custom PuTTY path:"
@@ -236,7 +236,7 @@
         Public Const StartupExit As String = "Startup/Exit"
         Public Const AllowOnlySingleInstance As String = "Allow only a single instance of the application (mRemoteNG restart required)"
         Public Const ReconnectAtStartup As String = "Reconnect to previously opened sessions on startup"
-        Public Const CheckForUpdatesOnStartup As String = "Check for updates on startup"
+        Public Const CheckForUpdatesOnStartup As String = "Check for updates and announcements"
         Public Const ConfirmExit As String = "Confirm exit if there are open connections"
         Public Const SaveConsOnExit As String = "Save connections on exit"
         Public Const MinimizeToSysTray As String = "Minimize to System Tray"
@@ -320,13 +320,13 @@
         Public Const CollapseAllFolders As String = "Collapse all folders"
         Public Const NewConnection As String = "New Connection"
         Public Const NewFolder As String = "New Folder"
-        Public Const CheckForUpdate As String = "Check for update"
+        Public Const CheckForUpdate As String = "Check Again"
         Public Const DownloadAndInstall As String = "Download and Install"
-        Public Const AvailableVersion As String = "Available Version"
-        Public Const CurrentVersion As String = "Current Version"
+        Public Const AvailableVersion As String = "Current version"
+        Public Const CurrentVersion As String = "Installed version"
         Public Const Version As String = "Version"
-        Public Const UpdateAvailable As String = "Update available!"
-        Public Const NoUpdateAvailable As String = "No update available!"
+        Public Const UpdateAvailable As String = "mRemoteNG requires an update"
+        Public Const NoUpdateAvailable As String = "mRemoteNG is up to date"
         Public Const UpdateDownloadComplete As String = "Download complete!" & vbNewLine & "mRemoteNG will now quit and begin with the installation."
         Public Const SendTo As String = "Send to..."
         Public Const Screen As String = "Screen"
@@ -358,18 +358,21 @@
         Public Const CcNotInstalledProperly As String = "not installed properly"
         Public Const CcCheckSucceeded As String = "Check succeeded!"
         Public Const CcCheckFailed As String = "Check failed!"
-        Public Const CcRDPOK As String = "All RDP components were found and seem to be registered properly."
+        Public Const CcRDPOK As String = "All RDP components were found and seem to be registered properly." & vbNewLine & _
+                                    "Remote Desktop Connection Control Version {0}"
         Public Const CcRDPFailed As String = "For RDP to work properly you need to have at least Remote Desktop Connection (Terminal Services Client) 6.0 installed. You can get it here: http://support.microsoft.com/kb/925876" & vbNewLine & _
                                      "If you have RDP 6.0 installed and the check still fails, try to register mstscax.dll manually. To do this open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\windows\system32\mstscax.dll"" (Where c:\ is your system drive)." & vbNewLine & _
                                      "If you still have trouble getting RDP to work please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
-        Public Const CcVNCOK As String = "All VNC components were found and seem to be registered properly."
-        Public Const CcVNCFailed As String = "VNC requires the scvncctrl.dll library to be registered. If you are using one of the non-setup packages like the portable package, this must be done manually." & vbNewLine & _
-                                     "To do this open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\Program Files\mRemoteNG\scvncctrl.dll"" (Where c:\Program Files\mRemoteNG\ is the path to your mRemoteNG installation)." & vbNewLine & _
+        Public Const CcVNCOK As String = "All VNC components were found and seem to be registered properly." & vbNewLine & _
+                                    "VncSharpNG Control Version {0}"
+        Public Const CcVNCFailed As String = "VNC requires VncSharpNG.dll to be located in your mRemoteNG application folder." & vbNewLine & _
+                                     "Please make sure that you have the VncSharpNG.dll file in your mRemoteNG application folder (usually C:\Program Files\mRemoteNG\)." & vbNewLine & _
                                      "If you are still not able to pass this check or use VNC in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
         Public Const CcPuttyOK As String = "The PuTTY executable was found and should be ready to use."
         Public Const CcPuttyFailed As String = "The SSH, Telnet, Rlogin and RAW protocols need PuTTY to work. PuTTY comes with every mRemoteNG package and is located in the installation path." & vbNewLine & _
                                      "Please make sure that either you have the Putty.exe in your mRemoteNG directory (default: c:\Program Files\mRemoteNG\) or that you specified a valid path to your PuTTY executable in the Options (Tools - Options - Advanced - Custom PuTTY path)"
-        Public Const CcICAOK As String = "All ICA components were found and seem to be registered properly."
+        Public Const CcICAOK As String = "All ICA components were found and seem to be registered properly." & vbNewLine & _
+                                    "Citrix ICA Client Control Version {0}"
         Public Const CcICAFailed As String = "ICA requires that the Citrix Presentation Server Client is installed and that the wfica.ocx library is registered. You can download the client here: http://www.citrix.com/download/" & vbNewLine & _
                                      "If you have the Citrix Presentation Server Client installed and the check still fails, try to register wfica.ocx manually." & vbNewLine & _
                                      "To do this open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\Program Files\Citrix\ICA Client\wfica.ocx"" (Where c:\Program Files\Citrix\ICA Client\ is the path to your Citrix Presentation Server Client installation)." & vbNewLine & _

mRemoteV1/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.60")> 
-<Assembly: AssemblyFileVersion("1.60")> 
+<Assembly: AssemblyVersion("1.62")> 
+<Assembly: AssemblyFileVersion("1.62")> 

mRemoteV1/My Project/Resources.Designer.vb

@@ -760,6 +760,42 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Every {0} days.
+        '''</summary>
+        Friend ReadOnly Property strUpdateFrequencyCustom() As String
+            Get
+                Return ResourceManager.GetString("strUpdateFrequencyCustom", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Daily.
+        '''</summary>
+        Friend ReadOnly Property strUpdateFrequencyDaily() As String
+            Get
+                Return ResourceManager.GetString("strUpdateFrequencyDaily", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Monthly.
+        '''</summary>
+        Friend ReadOnly Property strUpdateFrequencyMonthly() As String
+            Get
+                Return ResourceManager.GetString("strUpdateFrequencyMonthly", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Weekly.
+        '''</summary>
+        Friend ReadOnly Property strUpdateFrequencyWeekly() As String
+            Get
+                Return ResourceManager.GetString("strUpdateFrequencyWeekly", resourceCulture)
+            End Get
+        End Property
+        
         Friend ReadOnly Property Tab_Icon() As System.Drawing.Icon
             Get
                 Dim obj As Object = ResourceManager.GetObject("Tab_Icon", resourceCulture)

mRemoteV1/My Project/Resources.resx

@@ -448,4 +448,16 @@
   <data name="News" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images_FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="strUpdateFrequencyCustom" xml:space="preserve">
+    <value>Every {0} days</value>
+  </data>
+  <data name="strUpdateFrequencyDaily" xml:space="preserve">
+    <value>Daily</value>
+  </data>
+  <data name="strUpdateFrequencyMonthly" xml:space="preserve">
+    <value>Monthly</value>
+  </data>
+  <data name="strUpdateFrequencyWeekly" xml:space="preserve">
+    <value>Weekly</value>
+  </data>
 </root>

mRemoteV1/My Project/Settings.Designer.vb

@@ -445,7 +445,6 @@ Namespace My
         End Property
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
         Public Property ResetPanels() As Boolean
@@ -952,10 +951,8 @@ Namespace My
         End Property
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False"),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
         Public Property ResetToolbars() As Boolean
             Get
                 Return CType(Me("ResetToolbars"),Boolean)
@@ -1926,6 +1923,58 @@ Namespace My
                 Me("LastAnnouncement") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property CheckForUpdatesAsked() As Boolean
+            Get
+                Return CType(Me("CheckForUpdatesAsked"),Boolean)
+            End Get
+            Set
+                Me("CheckForUpdatesAsked") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("7")>  _
+        Public Property CheckForUpdatesFrequencyDays() As Integer
+            Get
+                Return CType(Me("CheckForUpdatesFrequencyDays"),Integer)
+            End Get
+            Set
+                Me("CheckForUpdatesFrequencyDays") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("1980-01-01")>  _
+        Public Property CheckForUpdatesLastCheck() As Date
+            Get
+                Return CType(Me("CheckForUpdatesLastCheck"),Date)
+            End Get
+            Set
+                Me("CheckForUpdatesLastCheck") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property UpdatePending() As Boolean
+            Get
+                Return CType(Me("UpdatePending"),Boolean)
+            End Get
+            Set
+                Me("UpdatePending") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

mRemoteV1/My Project/Settings.settings

@@ -92,7 +92,7 @@
     <Setting Name="ShowProtocolOnTabs" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ResetPanels" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ResetPanels" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="UpdateUseProxy" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
@@ -209,7 +209,7 @@
     <Setting Name="QuickyTBParentDock" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">Top</Value>
     </Setting>
-    <Setting Name="ResetToolbars" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="ResetToolbars" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="UseSQLServer" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
@@ -434,5 +434,17 @@
     <Setting Name="LastAnnouncement" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="CheckForUpdatesAsked" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="CheckForUpdatesFrequencyDays" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">7</Value>
+    </Setting>
+    <Setting Name="CheckForUpdatesLastCheck" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.DateTime" Scope="User">
+      <Value Profile="(Default)">1980-01-01</Value>
+    </Setting>
+    <Setting Name="UpdatePending" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

mRemoteV1/UI/UI.Window.About.vb

@@ -17,7 +17,6 @@ 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 llblCopyright2 As System.Windows.Forms.LinkLabel
             Friend WithEvents llblCopyright3 As System.Windows.Forms.LinkLabel
             Friend WithEvents pnlTop As System.Windows.Forms.Panel
 
@@ -27,7 +26,6 @@ Namespace UI
                 Me.pbLogo = New System.Windows.Forms.PictureBox
                 Me.pnlBottom = New System.Windows.Forms.Panel
                 Me.llblCopyright3 = New System.Windows.Forms.LinkLabel
-                Me.llblCopyright2 = 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
@@ -82,7 +80,6 @@ Namespace UI
                             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.llblCopyright2)
                 Me.pnlBottom.Controls.Add(Me.txtChangeLog)
                 Me.pnlBottom.Controls.Add(Me.lblTitle)
                 Me.pnlBottom.Controls.Add(Me.lblVersion)
@@ -98,29 +95,16 @@ Namespace UI
                 'llblCopyright3
                 '
                 Me.llblCopyright3.AutoSize = True
-                Me.llblCopyright3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+                Me.llblCopyright3.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, 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(29, 111)
+                Me.llblCopyright3.Location = New System.Drawing.Point(16, 116)
                 Me.llblCopyright3.Name = "llblCopyright3"
-                Me.llblCopyright3.Size = New System.Drawing.Size(57, 13)
+                Me.llblCopyright3.Size = New System.Drawing.Size(79, 18)
                 Me.llblCopyright3.TabIndex = 4
                 Me.llblCopyright3.TabStop = True
                 Me.llblCopyright3.Text = "Copyright3"
                 '
-                'llblCopyright2
-                '
-                Me.llblCopyright2.AutoSize = True
-                Me.llblCopyright2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-                Me.llblCopyright2.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.llblCopyright2.LinkColor = System.Drawing.Color.Blue
-                Me.llblCopyright2.Location = New System.Drawing.Point(29, 93)
-                Me.llblCopyright2.Name = "llblCopyright2"
-                Me.llblCopyright2.Size = New System.Drawing.Size(57, 13)
-                Me.llblCopyright2.TabIndex = 3
-                Me.llblCopyright2.TabStop = True
-                Me.llblCopyright2.Text = "Copyright2"
-                '
                 'txtChangeLog
                 '
                 Me.txtChangeLog.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -129,14 +113,14 @@ Namespace UI
                 Me.txtChangeLog.BackColor = System.Drawing.SystemColors.Control
                 Me.txtChangeLog.BorderStyle = System.Windows.Forms.BorderStyle.None
                 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.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, 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(115, 158)
+                Me.txtChangeLog.Location = New System.Drawing.Point(24, 184)
                 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(670, 229)
+                Me.txtChangeLog.Size = New System.Drawing.Size(761, 203)
                 Me.txtChangeLog.TabIndex = 7
                 Me.txtChangeLog.TabStop = False
                 '
@@ -145,7 +129,7 @@ Namespace UI
                 Me.lblTitle.AutoSize = True
                 Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.lblTitle.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.lblTitle.Location = New System.Drawing.Point(13, 19)
+                Me.lblTitle.Location = New System.Drawing.Point(16, 16)
                 Me.lblTitle.Name = "lblTitle"
                 Me.lblTitle.Size = New System.Drawing.Size(120, 24)
                 Me.lblTitle.TabIndex = 0
@@ -156,7 +140,7 @@ Namespace UI
                 Me.lblVersion.AutoSize = True
                 Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.lblVersion.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.lblVersion.Location = New System.Drawing.Point(17, 50)
+                Me.lblVersion.Location = New System.Drawing.Point(16, 56)
                 Me.lblVersion.Name = "lblVersion"
                 Me.lblVersion.Size = New System.Drawing.Size(58, 18)
                 Me.lblVersion.TabIndex = 1
@@ -167,7 +151,7 @@ Namespace UI
                 Me.lblChangeLog.AutoSize = True
                 Me.lblChangeLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, 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, 155)
+                Me.lblChangeLog.Location = New System.Drawing.Point(16, 160)
                 Me.lblChangeLog.Name = "lblChangeLog"
                 Me.lblChangeLog.Size = New System.Drawing.Size(92, 18)
                 Me.lblChangeLog.TabIndex = 6
@@ -176,11 +160,11 @@ Namespace UI
                 'lblLicense
                 '
                 Me.lblLicense.AutoSize = True
-                Me.lblLicense.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+                Me.lblLicense.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.lblLicense.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.lblLicense.Location = New System.Drawing.Point(28, 129)
+                Me.lblLicense.Location = New System.Drawing.Point(16, 96)
                 Me.lblLicense.Name = "lblLicense"
-                Me.lblLicense.Size = New System.Drawing.Size(44, 13)
+                Me.lblLicense.Size = New System.Drawing.Size(59, 18)
                 Me.lblLicense.TabIndex = 5
                 Me.lblLicense.Text = "License"
                 '
@@ -189,7 +173,7 @@ Namespace UI
                 Me.lblCopyright.AutoSize = True
                 Me.lblCopyright.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.lblCopyright.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.lblCopyright.Location = New System.Drawing.Point(17, 68)
+                Me.lblCopyright.Location = New System.Drawing.Point(16, 76)
                 Me.lblCopyright.Name = "lblCopyright"
                 Me.lblCopyright.Size = New System.Drawing.Size(71, 18)
                 Me.lblCopyright.TabIndex = 2
@@ -237,14 +221,11 @@ Namespace UI
 
                     Me.lblCopyright.Text = My.Application.Info.Copyright
 
-                    Me.llblCopyright2.Text = "Contains VNC viewer software licensed from SmartCode Solutions"
-                    Me.llblCopyright2.Links.Add(43, 100, (App.Info.General.SmartCodeURL))
+                    Me.llblCopyright3.Text = "Includes icons by FAMFAMFAM"
+                    Me.llblCopyright3.Links.Add(18, 9, (App.Info.General.FamFamFamURL))
 
-                    Me.llblCopyright3.Text = "Some Icons by FAMFAMFAM"
-                    Me.llblCopyright3.Links.Add(14, 100, (App.Info.General.FamFamFamURL))
-
-                    If File.Exists(My.Application.Info.DirectoryPath & "\ChangeLog.txt") Then
-                        Dim sR As New StreamReader(My.Application.Info.DirectoryPath & "\ChangeLog.txt")
+                    If File.Exists(My.Application.Info.DirectoryPath & "\CHANGELOG.TXT") Then
+                        Dim sR As New StreamReader(My.Application.Info.DirectoryPath & "\CHANGELOG.TXT")
                         Me.txtChangeLog.Text = sR.ReadToEnd
                         sR.Close()
                     End If
@@ -267,10 +248,6 @@ Namespace UI
                 End If
             End Sub
 
-            Private Sub llblCopyright2_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles llblCopyright2.LinkClicked
-                App.Runtime.GoToURL(App.Info.General.SmartCodeURL)
-            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)
             End Sub

mRemoteV1/UI/UI.Window.ComponentsCheck.vb

@@ -503,7 +503,7 @@ Namespace UI
                     pbCheck1.Image = My.Resources.Good_Symbol
                     lblCheck1.ForeColor = Color.DarkOliveGreen
                     lblCheck1.Text = "RDP (Remote Desktop) " & Language.Base.CcCheckSucceeded
-                    txtCheck1.Text = Language.Base.CcRDPOK
+                    txtCheck1.Text = String.Format(Language.Base.CcRDPOK, RDP.Version)
                 Catch ex As Exception
                     pbCheck1.Image = My.Resources.Bad_Symbol
                     lblCheck1.ForeColor = Color.Firebrick
@@ -514,14 +514,13 @@ Namespace UI
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
                 End Try
 
-                RDP.Dispose()
+                If RDP IsNot Nothing Then RDP.Dispose()
 
 
-                Dim VNC As AxViewerX.AxCSC_ViewerXControl = Nothing
+                Dim VNC As VncSharp.RemoteDesktop = Nothing
 
                 Try
-                    VNC = New AxViewerX.AxCSC_ViewerXControl
-                    mRemote.Connection.Protocol.VNC.SetupLicense(VNC)
+                    VNC = New VncSharp.RemoteDesktop
                     VNC.CreateControl()
 
                     Do Until VNC.Created
@@ -532,7 +531,7 @@ Namespace UI
                     pbCheck2.Image = My.Resources.Good_Symbol
                     lblCheck2.ForeColor = Color.DarkOliveGreen
                     lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckSucceeded
-                    txtCheck2.Text = Language.Base.CcVNCOK
+                    txtCheck2.Text = String.Format(Language.Base.CcVNCOK, VNC.ProductVersion)
                 Catch ex As Exception
                     pbCheck2.Image = My.Resources.Bad_Symbol
                     lblCheck2.ForeColor = Color.Firebrick
@@ -540,10 +539,10 @@ Namespace UI
                     txtCheck2.Text = Language.Base.CcVNCFailed
 
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "VNC " & errorMsg, True)
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
+                    'mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
                 End Try
 
-                VNC.Dispose()
+                If VNC IsNot Nothing Then VNC.Dispose()
 
 
                 Dim pPath As String = ""
@@ -584,7 +583,7 @@ Namespace UI
                     pbCheck4.Image = My.Resources.Good_Symbol
                     lblCheck4.ForeColor = Color.DarkOliveGreen
                     lblCheck4.Text = "ICA (Citrix ICA) " & Language.Base.CcCheckSucceeded
-                    txtCheck4.Text = Language.Base.CcICAOK
+                    txtCheck4.Text = String.Format(Language.Base.CcICAOK, ICA.Version)
                 Catch ex As Exception
                     pbCheck4.Image = My.Resources.Bad_Symbol
                     lblCheck4.ForeColor = Color.Firebrick
@@ -595,7 +594,7 @@ Namespace UI
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
                 End Try
 
-                ICA.Dispose()
+                If ICA IsNot Nothing Then ICA.Dispose()
 
 
                 Dim GeckoBad As Boolean = False
@@ -628,7 +627,6 @@ Namespace UI
                 End If
 
 
-
                 Dim eol As EOLWTSCOM.WTSCOM = Nothing
 
                 Try

mRemoteV1/UI/UI.Window.Config.vb

@@ -395,34 +395,36 @@ Namespace UI
 #End Region
 
 #Region "Private Methods"
+            Private tsCustom As ToolStrip = Nothing
+
             Private Sub Config_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
                 ApplyLanguage()
 
                 Try
                     'Show PropertyGrid Toolbar buttons
-                    Dim nT As New ToolStrip
-                    nT.Items.Add(Me.btnShowProperties)
-                    nT.Items.Add(Me.btnShowInheritance)
-                    nT.Items.Add(Me.btnShowDefaultProperties)
-                    nT.Items.Add(Me.btnShowDefaultInheritance)
-                    nT.Items.Add(Me.btnHostStatus)
-                    nT.Items.Add(Me.btnIcon)
-                    nT.Show()
+                    tsCustom = New ToolStrip
+                    tsCustom.Items.Add(btnShowProperties)
+                    tsCustom.Items.Add(btnShowInheritance)
+                    tsCustom.Items.Add(btnShowDefaultProperties)
+                    tsCustom.Items.Add(btnShowDefaultInheritance)
+                    tsCustom.Items.Add(btnHostStatus)
+                    tsCustom.Items.Add(btnIcon)
+                    tsCustom.Show()
 
-                    Dim T As ToolStrip = New ToolStrip
+                    Dim tsDefault As ToolStrip = New ToolStrip
 
-                    For Each ctrl As System.Windows.Forms.Control In Me.pGrid.Controls
+                    For Each ctrl As System.Windows.Forms.Control In pGrid.Controls
                         Dim tStrip As ToolStrip = TryCast(ctrl, ToolStrip)
 
                         If tStrip IsNot Nothing Then
-                            T = tStrip
+                            tsDefault = tStrip
                             Exit For
                         End If
                     Next
 
-                    T.AllowMerge = True
-                    T.Items(T.Items.Count - 1).Visible = False
-                    ToolStripManager.Merge(nT, T)
+                    tsDefault.AllowMerge = True
+                    tsDefault.Items(tsDefault.Items.Count - 1).Visible = False
+                    ToolStripManager.Merge(tsCustom, tsDefault)
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "Load (UI.Window.Config) failed" & vbNewLine & ex.Message, True)
                 End Try

mRemoteV1/UI/UI.Window.Connection.resx

@@ -124,18 +124,18 @@
   <data name="cmenTabExternalApps.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmhJREFUOE+lU9tL
-        01EcP/0VvbqxiQ6dOp2b25xzzgspRrvpNkeMTBqiszSzGgrSKlIYtV9RZJl0UdOJjbSctFUrsKcxg3oo
-        /GF0ocCHpHrwoU87B04UBAke+Dx+vp8bZxcAsqN3/ebdK8vJ1Fby2QoST1cQf/wcC/EnuLf4CDOxJdye
-        XcD45Dwu35jBhat3MHJxAqHwGIJnhK3O3sFukiX/fLl3D95Fd8M8b8SrN+v/xeu36/j0ZQPdJ0ciJJl6
-        ga/LD/HjvYD7H2L4+HljW9j89h3+Y6cFQi2XlJRApVKhtLQUZWVlUKvVKC8vh0ajQUVFBfR6PQwGAyor
-        K1FVVYXq6mrU1NSgvWdIIEuJFCPl5ORAIpFAKpVCJpNBLpcjNzcXeXl5UCgUKCgoQGFhIYqKiphgXV0d
-        eofCAqGF8QPpdBpTU1PbPpDtQCCxBwlmkyuura2hr6/vn6o0Jo/Y2NiIQ/0hgczG4ixbfn4+MpkMotEo
-        lErlb6ucxDvRarXQ6XRobm7GgcCgQCbnFmE2mxmhuLiY5eNlUhIFJ9EyqRiF1WrF/s4BgUxMx1BfX/8X
-        ibdPlfgCRqORLWAymdgKDocDno5egYzdmgPNQ1VoF5T052R8NuqSwmKxoLa2Fi0tLXD6ugVyaXya5eHW
-        uBJVoQS6NyfR6SgaGhrgdrth8/oFci5ybZPmsdlssNvtzJrT6WQKFK2trXC5XIzg8XjQ1tbG4PV60eT0
-        jZLAwHAgGDq/GgxFxP7hsHhkcFTsOn5W9B89JR7sGRJ9XSdEr79fdLcfFrOWxayquM/dITY5fKuWJoeJ
-        0O+8E/wCTNYVG3agVjIAAAAASUVORK5CYII=
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmlJREFUOE+lVN1L
+        k1EcPv9Ft06mzOF0m27qdHOb040cRpubc3PEyKQhTktbVuJAWkUKUr5FkWXSh5pObKTmJK1WYFdjBnVR
+        7MXogwIvkurCi552DpwoCBK8eC6f3/PFOQQA2Q3IjVv3ri6vJrdXn61h5ekaEo+fYz7xBPcXHmE6voQ7
+        M/MYm5jDlZvTuHjtLgYvjSM6PIq+s8J2e3d/iGTJP1/u24t3sT0wzxnw6s3Gf/H67QY+fdlE6NTgCFlN
+        vsDX5Yf48V7Agw9xfPy8uSNsffuO4PEzAqGWVSoV1Go1SkpKUFpaCo1GA61Wi7KyMlRUVKCyshJVVVXQ
+        6/Worq6GyWRCTU0NWrsiAllaSTJSTk4OJBIJcnNzIZVKkZeXh/z8fMhkMsjlchQWFkKhUKC4uJgJ1tXV
+        oTsyLBBaGD+QSqUwOTm54wPZDgQSX1xhNrliJpNBT0/PP1VpTB6xvr4eh8NRgczEEyxbQUEB0uk0YrEY
+        ioqKflvlJN5JeXk5dDodGhoacLCzXyATswswm82MoFQqWT5eJiVRcBItk4pROBwOHGjvFcj4VBxWq/Uv
+        Em+fKvEFDAYDW8BoNLIVXC4XfG3dAhm9PQuah6rQLijpz8n4bNQlhcViQW1tLZqamuAOhARyeWyK5eHW
+        uBJVoQS6NyfR6ShsNhu8Xi+c/qBAzo9c36J5nE4nGhsbmTW3280UKDweD5qbmxnB5/OhpaWFwe/3w+4O
+        DJHO3oHOvuiF9b7oiBgeGBaP9g+JHSfOicFjp8VDXREx0HFS9AfDorf1iJi1LGZVxf3eNtHuCqxb7C7j
+        rp4y/QZ+AXhAQe1Sf9VzAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="cmenTabReconnect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

mRemoteV1/UI/UI.Window.Connection.vb

@@ -77,27 +77,27 @@ Namespace UI
                 Me.cmenTab.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmenTabFullscreen, Me.cmenTabSmartSize, Me.cmenTabViewOnly, Me.ToolStripSeparator1, Me.cmenTabScreenshot, Me.cmenTabStartChat, Me.cmenTabTransferFile, Me.cmenTabRefreshScreen, Me.cmenTabSendSpecialKeys, Me.cmenTabExternalApps, Me.cmenTabSep1, Me.cmenTabRenameTab, Me.cmenTabDuplicateTab, Me.cmenTabReconnect, Me.cmenTabDisconnect})
                 Me.cmenTab.Name = "cmenTab"
                 Me.cmenTab.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-                Me.cmenTab.Size = New System.Drawing.Size(202, 302)
+                Me.cmenTab.Size = New System.Drawing.Size(202, 324)
                 '
                 'cmenTabFullscreen
                 '
                 Me.cmenTabFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen
                 Me.cmenTabFullscreen.Name = "cmenTabFullscreen"
                 Me.cmenTabFullscreen.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabFullscreen.Text = Language.Base.Fullscreen & " (RDP)"
+                Me.cmenTabFullscreen.Text = "Fullscreen (RDP)"
                 '
                 'cmenTabSmartSize
                 '
                 Me.cmenTabSmartSize.Image = Global.mRemote.My.Resources.Resources.SmartSize
                 Me.cmenTabSmartSize.Name = "cmenTabSmartSize"
                 Me.cmenTabSmartSize.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabSmartSize.Text = Language.Base.SmartSize & " (RDP/VNC)"
+                Me.cmenTabSmartSize.Text = "SmartSize (RDP/VNC)"
                 '
                 'cmenTabViewOnly
                 '
                 Me.cmenTabViewOnly.Name = "cmenTabViewOnly"
                 Me.cmenTabViewOnly.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabViewOnly.Text = Language.Base.Props_ViewOnly & " (VNC)"
+                Me.cmenTabViewOnly.Text = "View Only (VNC)"
                 '
                 'ToolStripSeparator1
                 '
@@ -109,28 +109,29 @@ Namespace UI
                 Me.cmenTabScreenshot.Image = Global.mRemote.My.Resources.Resources.Screenshot_Add
                 Me.cmenTabScreenshot.Name = "cmenTabScreenshot"
                 Me.cmenTabScreenshot.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabScreenshot.Text = Language.Base.Screenshot
+                Me.cmenTabScreenshot.Text = "Screenshot"
                 '
                 'cmenTabStartChat
                 '
                 Me.cmenTabStartChat.Image = Global.mRemote.My.Resources.Resources.Chat
                 Me.cmenTabStartChat.Name = "cmenTabStartChat"
                 Me.cmenTabStartChat.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabStartChat.Text = Language.Base.StartChat & " (VNC)"
+                Me.cmenTabStartChat.Text = "Start Chat (VNC)"
+                Me.cmenTabStartChat.Visible = False
                 '
                 'cmenTabTransferFile
                 '
                 Me.cmenTabTransferFile.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
                 Me.cmenTabTransferFile.Name = "cmenTabTransferFile"
                 Me.cmenTabTransferFile.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabTransferFile.Text = Language.Base.TransferFile & " (SSH/VNC)"
+                Me.cmenTabTransferFile.Text = "Transfer File (SSH)"
                 '
                 'cmenTabRefreshScreen
                 '
                 Me.cmenTabRefreshScreen.Image = Global.mRemote.My.Resources.Resources.Refresh
                 Me.cmenTabRefreshScreen.Name = "cmenTabRefreshScreen"
                 Me.cmenTabRefreshScreen.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabRefreshScreen.Text = Language.Base.RefreshScreen & " (VNC)"
+                Me.cmenTabRefreshScreen.Text = "Refresh Screen (VNC)"
                 '
                 'cmenTabSendSpecialKeys
                 '
@@ -138,26 +139,26 @@ Namespace UI
                 Me.cmenTabSendSpecialKeys.Image = Global.mRemote.My.Resources.Resources.Keyboard
                 Me.cmenTabSendSpecialKeys.Name = "cmenTabSendSpecialKeys"
                 Me.cmenTabSendSpecialKeys.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabSendSpecialKeys.Text = Language.Base.SendSpecialKeys & " (VNC)"
+                Me.cmenTabSendSpecialKeys.Text = "Send special Keys (VNC)"
                 '
                 'cmenTabSendSpecialKeysCtrlAltDel
                 '
                 Me.cmenTabSendSpecialKeysCtrlAltDel.Name = "cmenTabSendSpecialKeysCtrlAltDel"
-                Me.cmenTabSendSpecialKeysCtrlAltDel.Size = New System.Drawing.Size(146, 22)
-                Me.cmenTabSendSpecialKeysCtrlAltDel.Text = Language.Base.Key_Control & "+" & Language.Base.Key_Alt & "+" & Language.Base.Key_Del
+                Me.cmenTabSendSpecialKeysCtrlAltDel.Size = New System.Drawing.Size(141, 22)
+                Me.cmenTabSendSpecialKeysCtrlAltDel.Text = "Ctrl+Alt+Del"
                 '
                 'cmenTabSendSpecialKeysCtrlEsc
                 '
                 Me.cmenTabSendSpecialKeysCtrlEsc.Name = "cmenTabSendSpecialKeysCtrlEsc"
-                Me.cmenTabSendSpecialKeysCtrlEsc.Size = New System.Drawing.Size(146, 22)
-                Me.cmenTabSendSpecialKeysCtrlEsc.Text = Language.Base.Key_Control & "+" & Language.Base.Key_Esc
+                Me.cmenTabSendSpecialKeysCtrlEsc.Size = New System.Drawing.Size(141, 22)
+                Me.cmenTabSendSpecialKeysCtrlEsc.Text = "Ctrl+Esc"
                 '
                 'cmenTabExternalApps
                 '
                 Me.cmenTabExternalApps.Image = CType(resources.GetObject("cmenTabExternalApps.Image"), System.Drawing.Image)
                 Me.cmenTabExternalApps.Name = "cmenTabExternalApps"
                 Me.cmenTabExternalApps.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabExternalApps.Text = Language.Base.Menu_ExternalApplications
+                Me.cmenTabExternalApps.Text = "External Applications"
                 '
                 'cmenTabSep1
                 '
@@ -169,27 +170,27 @@ Namespace UI
                 Me.cmenTabRenameTab.Image = Global.mRemote.My.Resources.Resources.Rename
                 Me.cmenTabRenameTab.Name = "cmenTabRenameTab"
                 Me.cmenTabRenameTab.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabRenameTab.Text = Language.Base.RenameTab
+                Me.cmenTabRenameTab.Text = "Rename Tab"
                 '
                 'cmenTabDuplicateTab
                 '
                 Me.cmenTabDuplicateTab.Name = "cmenTabDuplicateTab"
                 Me.cmenTabDuplicateTab.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabDuplicateTab.Text = Language.Base.DuplicateTab
+                Me.cmenTabDuplicateTab.Text = "Duplicate Tab"
                 '
                 'cmenTabReconnect
                 '
                 Me.cmenTabReconnect.Image = CType(resources.GetObject("cmenTabReconnect.Image"), System.Drawing.Image)
                 Me.cmenTabReconnect.Name = "cmenTabReconnect"
                 Me.cmenTabReconnect.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabReconnect.Text = Language.Base.Reconnect
+                Me.cmenTabReconnect.Text = "Reconnect"
                 '
                 'cmenTabDisconnect
                 '
                 Me.cmenTabDisconnect.Image = Global.mRemote.My.Resources.Resources.Pause
                 Me.cmenTabDisconnect.Name = "cmenTabDisconnect"
                 Me.cmenTabDisconnect.Size = New System.Drawing.Size(201, 22)
-                Me.cmenTabDisconnect.Text = Language.Base.Disconnect
+                Me.cmenTabDisconnect.Text = "Disconnect"
                 '
                 'Connection
                 '
@@ -278,7 +279,7 @@ Namespace UI
                 cmenTabViewOnly.Text = Language.Base.Props_ViewOnly & " (VNC)"
                 cmenTabScreenshot.Text = Language.Base.Screenshot
                 cmenTabStartChat.Text = Language.Base.StartChat & " (VNC)"
-                cmenTabTransferFile.Text = Language.Base.TransferFile & " (SSH/VNC)"
+                cmenTabTransferFile.Text = Language.Base.TransferFile & " (SSH)"
                 cmenTabRefreshScreen.Text = Language.Base.RefreshScreen & " (VNC)"
                 cmenTabSendSpecialKeys.Text = Language.Base.SendSpecialKeys & " (VNC)"
                 cmenTabSendSpecialKeysCtrlAltDel.Text = Language.Base.Key_Control & "+" & Language.Base.Key_Alt & "+" & Language.Base.Key_Del
@@ -398,7 +399,7 @@ Namespace UI
                         Me.cmenTabSmartSize.Enabled = True
                         Me.cmenTabStartChat.Enabled = True
                         Me.cmenTabRefreshScreen.Enabled = True
-                        Me.cmenTabTransferFile.Enabled = True
+                        Me.cmenTabTransferFile.Enabled = False
 
                         Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol
                         Me.cmenTabSmartSize.Checked = vnc.SmartSize

mRemoteV1/UI/UI.Window.UltraVNCSC.vb

@@ -1,6 +1,6 @@
 Imports WeifenLuo.WinFormsUI.Docking
 Imports mRemote.App.Runtime
-Imports AxViewerX
+'Imports AxViewerX
 
 Namespace UI
     Namespace Window
@@ -67,7 +67,7 @@ Namespace UI
 #End Region
 
 #Region "Declarations"
-            Private WithEvents vnc As AxCSC_ViewerXControl
+            'Private WithEvents vnc As AxCSC_ViewerXControl
 #End Region
 
 #Region "Public Methods"
@@ -91,22 +91,22 @@ Namespace UI
 
             Private Sub StartListening()
                 Try
-                    If vnc IsNot Nothing Then
-                        vnc.Dispose()
-                        vnc = Nothing
-                    End If
+                    'If vnc IsNot Nothing Then
+                    '    vnc.Dispose()
+                    '    vnc = Nothing
+                    'End If
 
-                    vnc = New AxCSC_ViewerXControl()
-                    SetupLicense()
+                    'vnc = New AxCSC_ViewerXControl()
+                    'SetupLicense()
 
-                    vnc.Parent = pnlContainer
-                    vnc.Dock = DockStyle.Fill
-                    vnc.Show()
+                    'vnc.Parent = pnlContainer
+                    'vnc.Dock = DockStyle.Fill
+                    'vnc.Show()
 
-                    vnc.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
-                    vnc.ListeningText = Language.Base.ListeningForIncomingVNCConnections & " " & My.Settings.UVNCSCPort
+                    'vnc.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
+                    'vnc.ListeningText = Language.Base.ListeningForIncomingVNCConnections & " " & My.Settings.UVNCSCPort
 
-                    vnc.ListenEx(My.Settings.UVNCSCPort)
+                    'vnc.ListenEx(My.Settings.UVNCSCPort)
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "StartListening (UI.Window.UltraVNCSC) failed" & vbNewLine & ex.Message, False)
                     Close()
@@ -115,24 +115,24 @@ Namespace UI
 
             Private Sub SetupLicense()
                 Try
-                    Dim f As System.Reflection.FieldInfo
-                    f = GetType(AxHost).GetField("licenseKey", Reflection.BindingFlags.NonPublic Or Reflection.BindingFlags.Instance)
-                    f.SetValue(vnc, "{072169039103041044176252035252117103057101225235137221179204110241121074}")
+                    'Dim f As System.Reflection.FieldInfo
+                    'f = GetType(AxHost).GetField("licenseKey", Reflection.BindingFlags.NonPublic Or Reflection.BindingFlags.Instance)
+                    'f.SetValue(vnc, "{072169039103041044176252035252117103057101225235137221179204110241121074}")
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetupLicense failed (UI.Window.UltraVNCSC)" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
-            Private Sub vnc_ConnectionAccepted(ByVal sender As Object, ByVal e As AxViewerX._ISmartCodeVNCViewerEvents_ConnectionAcceptedEvent) Handles vnc.ConnectionAccepted
-                mC.AddMessage(Messages.MessageClass.InformationMsg, e.bstrServerAddress & " is now connected to your UltraVNC SingleClick panel!")
-            End Sub
+            'Private Sub vnc_ConnectionAccepted(ByVal sender As Object, ByVal e As AxViewerX._ISmartCodeVNCViewerEvents_ConnectionAcceptedEvent) Handles vnc.ConnectionAccepted
+            '    mC.AddMessage(Messages.MessageClass.InformationMsg, e.bstrServerAddress & " is now connected to your UltraVNC SingleClick panel!")
+            'End Sub
 
-            Private Sub vnc_Disconnected(ByVal sender As Object, ByVal e As System.EventArgs) Handles vnc.Disconnected
-                StartListening()
-            End Sub
+            'Private Sub vnc_Disconnected(ByVal sender As Object, ByVal e As System.EventArgs) Handles vnc.Disconnected
+            '    StartListening()
+            'End Sub
 
             Private Sub btnDisconnect_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnDisconnect.Click
-                vnc.Dispose()
+                'vnc.Dispose()
                 Dispose()
                 App.Runtime.Windows.Show(Type.UltraVNCSC)
             End Sub

mRemoteV1/UI/UI.Window.Update.vb

@@ -11,30 +11,30 @@ Namespace UI
 #Region "Form Init"
             Friend WithEvents lblStatus As System.Windows.Forms.Label
             Friend WithEvents txtChangeLog As System.Windows.Forms.TextBox
-            Friend WithEvents lblCurrentVersion As System.Windows.Forms.Label
-            Friend WithEvents lblAvailableVersion As System.Windows.Forms.Label
             Friend WithEvents prgbDownload As System.Windows.Forms.ProgressBar
-            Friend WithEvents Label5 As System.Windows.Forms.Label
-            Friend WithEvents Label4 As System.Windows.Forms.Label
             Friend WithEvents btnDownload As System.Windows.Forms.Button
-            Friend WithEvents Label7 As System.Windows.Forms.Label
+            Friend WithEvents lblChangeLogLabel As System.Windows.Forms.Label
             Friend WithEvents pnlUp As System.Windows.Forms.Panel
+            Friend WithEvents lblCurrentVersionLabel As System.Windows.Forms.Label
+            Friend WithEvents lblInstalledVersionLabel As System.Windows.Forms.Label
+            Friend WithEvents lblAvailableVersion As System.Windows.Forms.Label
+            Friend WithEvents lblCurrentVersion As System.Windows.Forms.Label
             Friend WithEvents pbUpdateImage As System.Windows.Forms.PictureBox
             Friend WithEvents btnCheckForUpdate As System.Windows.Forms.Button
 
             Private Sub InitializeComponent()
                 Me.btnCheckForUpdate = New System.Windows.Forms.Button
                 Me.pnlUp = New System.Windows.Forms.Panel
-                Me.pbUpdateImage = New System.Windows.Forms.PictureBox
-                Me.Label7 = New System.Windows.Forms.Label
+                Me.lblChangeLogLabel = New System.Windows.Forms.Label
                 Me.btnDownload = New System.Windows.Forms.Button
-                Me.Label4 = New System.Windows.Forms.Label
-                Me.Label5 = New System.Windows.Forms.Label
                 Me.prgbDownload = New System.Windows.Forms.ProgressBar
-                Me.lblAvailableVersion = New System.Windows.Forms.Label
-                Me.lblCurrentVersion = New System.Windows.Forms.Label
                 Me.txtChangeLog = New System.Windows.Forms.TextBox
                 Me.lblStatus = New System.Windows.Forms.Label
+                Me.lblCurrentVersionLabel = New System.Windows.Forms.Label
+                Me.lblInstalledVersionLabel = New System.Windows.Forms.Label
+                Me.lblAvailableVersion = New System.Windows.Forms.Label
+                Me.lblCurrentVersion = New System.Windows.Forms.Label
+                Me.pbUpdateImage = New System.Windows.Forms.PictureBox
                 Me.pnlUp.SuspendLayout()
                 CType(Me.pbUpdateImage, System.ComponentModel.ISupportInitialize).BeginInit()
                 Me.SuspendLayout()
@@ -42,11 +42,11 @@ Namespace UI
                 'btnCheckForUpdate
                 '
                 Me.btnCheckForUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-                Me.btnCheckForUpdate.Location = New System.Drawing.Point(12, 12)
+                Me.btnCheckForUpdate.Location = New System.Drawing.Point(16, 104)
                 Me.btnCheckForUpdate.Name = "btnCheckForUpdate"
-                Me.btnCheckForUpdate.Size = New System.Drawing.Size(136, 23)
-                Me.btnCheckForUpdate.TabIndex = 10
-                Me.btnCheckForUpdate.Text = "Check for update"
+                Me.btnCheckForUpdate.Size = New System.Drawing.Size(80, 32)
+                Me.btnCheckForUpdate.TabIndex = 5
+                Me.btnCheckForUpdate.Text = "Check Again"
                 Me.btnCheckForUpdate.UseVisualStyleBackColor = True
                 '
                 'pnlUp
@@ -54,98 +54,45 @@ Namespace UI
                 Me.pnlUp.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
                             Or System.Windows.Forms.AnchorStyles.Left) _
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-                Me.pnlUp.Controls.Add(Me.pbUpdateImage)
-                Me.pnlUp.Controls.Add(Me.Label7)
+                Me.pnlUp.Controls.Add(Me.lblChangeLogLabel)
                 Me.pnlUp.Controls.Add(Me.btnDownload)
-                Me.pnlUp.Controls.Add(Me.Label4)
-                Me.pnlUp.Controls.Add(Me.Label5)
                 Me.pnlUp.Controls.Add(Me.prgbDownload)
-                Me.pnlUp.Controls.Add(Me.lblAvailableVersion)
-                Me.pnlUp.Controls.Add(Me.lblCurrentVersion)
                 Me.pnlUp.Controls.Add(Me.txtChangeLog)
-                Me.pnlUp.Location = New System.Drawing.Point(12, 41)
+                Me.pnlUp.Location = New System.Drawing.Point(16, 152)
                 Me.pnlUp.Name = "pnlUp"
-                Me.pnlUp.Size = New System.Drawing.Size(668, 370)
-                Me.pnlUp.TabIndex = 30
+                Me.pnlUp.Size = New System.Drawing.Size(672, 248)
+                Me.pnlUp.TabIndex = 6
                 Me.pnlUp.Visible = False
                 '
-                'pbUpdateImage
+                'lblChangeLogLabel
                 '
-                Me.pbUpdateImage.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-                Me.pbUpdateImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-                Me.pbUpdateImage.Cursor = System.Windows.Forms.Cursors.Hand
-                Me.pbUpdateImage.Location = New System.Drawing.Point(197, 3)
-                Me.pbUpdateImage.Name = "pbUpdateImage"
-                Me.pbUpdateImage.Size = New System.Drawing.Size(468, 60)
-                Me.pbUpdateImage.TabIndex = 31
-                Me.pbUpdateImage.TabStop = False
-                Me.pbUpdateImage.Visible = False
-                '
-                'Label7
-                '
-                Me.Label7.AutoSize = True
-                Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-                Me.Label7.Location = New System.Drawing.Point(3, 69)
-                Me.Label7.Name = "Label7"
-                Me.Label7.Size = New System.Drawing.Size(79, 13)
-                Me.Label7.TabIndex = 50
-                Me.Label7.Text = "Change Log:"
+                Me.lblChangeLogLabel.AutoSize = True
+                Me.lblChangeLogLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+                Me.lblChangeLogLabel.Location = New System.Drawing.Point(0, 0)
+                Me.lblChangeLogLabel.Name = "lblChangeLogLabel"
+                Me.lblChangeLogLabel.Size = New System.Drawing.Size(79, 13)
+                Me.lblChangeLogLabel.TabIndex = 0
+                Me.lblChangeLogLabel.Text = "Change Log:"
                 '
                 'btnDownload
                 '
                 Me.btnDownload.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
                 Me.btnDownload.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-                Me.btnDownload.Location = New System.Drawing.Point(6, 341)
+                Me.btnDownload.Location = New System.Drawing.Point(0, 216)
                 Me.btnDownload.Name = "btnDownload"
-                Me.btnDownload.Size = New System.Drawing.Size(145, 23)
-                Me.btnDownload.TabIndex = 70
+                Me.btnDownload.Size = New System.Drawing.Size(144, 32)
+                Me.btnDownload.TabIndex = 2
                 Me.btnDownload.Text = "Download and Install"
                 Me.btnDownload.UseVisualStyleBackColor = True
                 '
-                'Label4
-                '
-                Me.Label4.AutoSize = True
-                Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-                Me.Label4.Location = New System.Drawing.Point(3, 39)
-                Me.Label4.Name = "Label4"
-                Me.Label4.Size = New System.Drawing.Size(109, 13)
-                Me.Label4.TabIndex = 30
-                Me.Label4.Text = "Available Version:"
-                '
-                'Label5
-                '
-                Me.Label5.AutoSize = True
-                Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-                Me.Label5.Location = New System.Drawing.Point(3, 9)
-                Me.Label5.Name = "Label5"
-                Me.Label5.Size = New System.Drawing.Size(98, 13)
-                Me.Label5.TabIndex = 10
-                Me.Label5.Text = "Current Version:"
-                '
                 'prgbDownload
                 '
                 Me.prgbDownload.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-                Me.prgbDownload.Location = New System.Drawing.Point(157, 341)
+                Me.prgbDownload.Location = New System.Drawing.Point(160, 224)
                 Me.prgbDownload.Name = "prgbDownload"
-                Me.prgbDownload.Size = New System.Drawing.Size(508, 23)
-                Me.prgbDownload.TabIndex = 80
-                '
-                'lblAvailableVersion
-                '
-                Me.lblAvailableVersion.Location = New System.Drawing.Point(118, 39)
-                Me.lblAvailableVersion.Name = "lblAvailableVersion"
-                Me.lblAvailableVersion.Size = New System.Drawing.Size(67, 13)
-                Me.lblAvailableVersion.TabIndex = 40
-                Me.lblAvailableVersion.Text = "Version"
-                '
-                'lblCurrentVersion
-                '
-                Me.lblCurrentVersion.Location = New System.Drawing.Point(118, 9)
-                Me.lblCurrentVersion.Name = "lblCurrentVersion"
-                Me.lblCurrentVersion.Size = New System.Drawing.Size(67, 13)
-                Me.lblCurrentVersion.TabIndex = 20
-                Me.lblCurrentVersion.Text = "Version"
+                Me.prgbDownload.Size = New System.Drawing.Size(496, 23)
+                Me.prgbDownload.TabIndex = 3
                 '
                 'txtChangeLog
                 '
@@ -154,31 +101,85 @@ Namespace UI
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.txtChangeLog.BorderStyle = System.Windows.Forms.BorderStyle.None
                 Me.txtChangeLog.Cursor = System.Windows.Forms.Cursors.Arrow
-                Me.txtChangeLog.Location = New System.Drawing.Point(121, 69)
+                Me.txtChangeLog.Location = New System.Drawing.Point(16, 24)
                 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(544, 266)
-                Me.txtChangeLog.TabIndex = 60
+                Me.txtChangeLog.Size = New System.Drawing.Size(653, 181)
+                Me.txtChangeLog.TabIndex = 1
                 Me.txtChangeLog.TabStop = False
                 '
                 'lblStatus
                 '
-                Me.lblStatus.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.lblStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.lblStatus.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.lblStatus.Location = New System.Drawing.Point(342, 12)
+                Me.lblStatus.Location = New System.Drawing.Point(12, 16)
                 Me.lblStatus.Name = "lblStatus"
-                Me.lblStatus.Size = New System.Drawing.Size(338, 23)
-                Me.lblStatus.TabIndex = 20
+                Me.lblStatus.Size = New System.Drawing.Size(660, 23)
+                Me.lblStatus.TabIndex = 0
                 Me.lblStatus.Text = "Status"
-                Me.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+                Me.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+                '
+                'lblCurrentVersionLabel
+                '
+                Me.lblCurrentVersionLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+                Me.lblCurrentVersionLabel.Location = New System.Drawing.Point(16, 72)
+                Me.lblCurrentVersionLabel.Name = "lblCurrentVersionLabel"
+                Me.lblCurrentVersionLabel.Size = New System.Drawing.Size(120, 16)
+                Me.lblCurrentVersionLabel.TabIndex = 3
+                Me.lblCurrentVersionLabel.Text = "Current version:"
+                Me.lblCurrentVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+                '
+                'lblInstalledVersionLabel
+                '
+                Me.lblInstalledVersionLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+                Me.lblInstalledVersionLabel.Location = New System.Drawing.Point(16, 48)
+                Me.lblInstalledVersionLabel.Name = "lblInstalledVersionLabel"
+                Me.lblInstalledVersionLabel.Size = New System.Drawing.Size(120, 16)
+                Me.lblInstalledVersionLabel.TabIndex = 1
+                Me.lblInstalledVersionLabel.Text = "Installed version:"
+                Me.lblInstalledVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+                '
+                'lblAvailableVersion
+                '
+                Me.lblAvailableVersion.Location = New System.Drawing.Point(136, 72)
+                Me.lblAvailableVersion.Name = "lblAvailableVersion"
+                Me.lblAvailableVersion.Size = New System.Drawing.Size(64, 16)
+                Me.lblAvailableVersion.TabIndex = 4
+                Me.lblAvailableVersion.Text = "Version"
+                Me.lblAvailableVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+                '
+                'lblCurrentVersion
+                '
+                Me.lblCurrentVersion.Location = New System.Drawing.Point(136, 48)
+                Me.lblCurrentVersion.Name = "lblCurrentVersion"
+                Me.lblCurrentVersion.Size = New System.Drawing.Size(64, 16)
+                Me.lblCurrentVersion.TabIndex = 2
+                Me.lblCurrentVersion.Text = "Version"
+                Me.lblCurrentVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+                '
+                'pbUpdateImage
+                '
+                Me.pbUpdateImage.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+                Me.pbUpdateImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+                Me.pbUpdateImage.Cursor = System.Windows.Forms.Cursors.Hand
+                Me.pbUpdateImage.Location = New System.Drawing.Point(200, 48)
+                Me.pbUpdateImage.Name = "pbUpdateImage"
+                Me.pbUpdateImage.Size = New System.Drawing.Size(468, 60)
+                Me.pbUpdateImage.TabIndex = 45
+                Me.pbUpdateImage.TabStop = False
+                Me.pbUpdateImage.Visible = False
                 '
                 'Update
                 '
-                Me.ClientSize = New System.Drawing.Size(692, 423)
+                Me.ClientSize = New System.Drawing.Size(688, 418)
+                Me.Controls.Add(Me.pbUpdateImage)
+                Me.Controls.Add(Me.lblCurrentVersionLabel)
+                Me.Controls.Add(Me.lblInstalledVersionLabel)
+                Me.Controls.Add(Me.lblAvailableVersion)
                 Me.Controls.Add(Me.btnCheckForUpdate)
+                Me.Controls.Add(Me.lblCurrentVersion)
                 Me.Controls.Add(Me.pnlUp)
                 Me.Controls.Add(Me.lblStatus)
                 Me.Icon = Global.mRemote.My.Resources.Resources.Update_Icon
@@ -247,31 +248,41 @@ Namespace UI
 
             Private Sub UpdateCheckComplete(ByVal UpdateAvailable As Boolean)
                 Try
+                    My.Settings.CheckForUpdatesLastCheck = Date.Now
+
                     If UpdateAvailable = True Then
-                        Me.SetStatus(Color.ForestGreen, Language.Base.UpdateAvailable)
-                        Me.SetVisible(pnlUp, True)
+                        My.Settings.UpdatePending = True
+
+                        SetStatus(Color.OrangeRed, Language.Base.UpdateAvailable)
+                        SetVisible(pnlUp, True)
 
                         Dim uI As App.Update.Info = uD.GetUpdateInfo()
-                        Me.SetCurrentVersionText(My.Application.Info.Version.Major & "." & My.Application.Info.Version.Minor)
-                        Me.SetAvailableVersionText(uI.Version.ToString)
-                        Me.SetChangeLogText(uI.ChangeLog)
+                        SetCurrentVersionText(My.Application.Info.Version.Major & "." & My.Application.Info.Version.Minor)
+                        SetAvailableVersionText(uI.Version.ToString)
+                        SetChangeLogText(uI.ChangeLog)
 
                         If uI.ImageURL <> String.Empty Then
-                            Me.SetImageURL(uI.ImageURL)
+                            SetImageURL(uI.ImageURL)
 
                             If uI.ImageURLLink <> String.Empty Then
                                 pbUpdateImage.Tag = uI.ImageURLLink
                             End If
 
-                            Me.SetVisible(pbUpdateImage, True)
+                            SetVisible(pbUpdateImage, True)
                         Else
-                            Me.SetVisible(pbUpdateImage, False)
+                            SetVisible(pbUpdateImage, False)
                         End If
 
-                        Me.FocusDownloadButton()
+                        FocusDownloadButton()
                     Else
-                        Me.SetStatus(Color.OrangeRed, Language.Base.NoUpdateAvailable)
-                        Me.SetVisible(pnlUp, False)
+                        My.Settings.UpdatePending = False
+
+                        SetStatus(Color.ForestGreen, Language.Base.NoUpdateAvailable)
+                        SetVisible(pnlUp, False)
+
+                        Dim uI As App.Update.Info = uD.GetUpdateInfo()
+                        SetCurrentVersionText(My.Application.Info.Version.Major & "." & My.Application.Info.Version.Minor)
+                        SetAvailableVersionText(uI.Version.ToString)
                     End If
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "UpdateCheckComplete (UI.Window.Update) failed" & vbNewLine & ex.Message, True)
@@ -362,10 +373,10 @@ Namespace UI
 
             Private Sub ApplyLanguage()
                 btnCheckForUpdate.Text = Language.Base.CheckForUpdate
-                Label7.Text = Language.Base.ChangeLog
+                lblChangeLogLabel.Text = Language.Base.ChangeLog
                 btnDownload.Text = Language.Base.DownloadAndInstall
-                Label4.Text = Language.Base.AvailableVersion & ":"
-                Label5.Text = Language.Base.CurrentVersion & ":"
+                lblCurrentVersionLabel.Text = Language.Base.AvailableVersion & ":"
+                lblInstalledVersionLabel.Text = Language.Base.CurrentVersion & ":"
                 lblAvailableVersion.Text = Language.Base.Version
                 lblCurrentVersion.Text = Language.Base.Version
                 lblStatus.Text = Language.Base.Status
@@ -434,7 +445,7 @@ Namespace UI
             End Sub
 #End Region
 
-            Private Sub pbUpdateImage_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles pbUpdateImage.Click
+            Private Sub pbUpdateImage_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
                 If pbUpdateImage.Tag IsNot Nothing Then
                     Process.Start(pbUpdateImage.Tag)
                 End If

mRemoteV1/app.config

@@ -489,6 +489,18 @@
             <setting name="LastAnnouncement" serializeAs="String">
                 <value />
             </setting>
+            <setting name="CheckForUpdatesAsked" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="CheckForUpdatesFrequencyDays" serializeAs="String">
+                <value>7</value>
+            </setting>
+            <setting name="CheckForUpdatesLastCheck" serializeAs="String">
+                <value>1980-01-01</value>
+            </setting>
+            <setting name="UpdatePending" serializeAs="String">
+                <value>False</value>
+            </setting>
         </mRemote.My.MySettings>
     </userSettings>
 </configuration>

mRemoteV1/mRemoteV1.vbproj

@@ -77,10 +77,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\AxInterop.MSTSCLib.dll</HintPath>
     </Reference>
-    <Reference Include="AxInterop.ViewerX, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\AxInterop.ViewerX.dll</HintPath>
-    </Reference>
     <Reference Include="AxInterop.WFICALib, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\AxInterop.WFICALib.dll</HintPath>
@@ -101,10 +97,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\Interop.MSTSCLib.dll</HintPath>
     </Reference>
-    <Reference Include="Interop.ViewerX, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\Interop.ViewerX.dll</HintPath>
-    </Reference>
     <Reference Include="Interop.WFICALib, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\Interop.WFICALib.dll</HintPath>
@@ -149,6 +141,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\Tamir.SharpSSH.dll</HintPath>
     </Reference>
+    <Reference Include="VncSharpNG, Version=1.1.0.0, Culture=neutral, PublicKeyToken=61974755c7bfea7c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>References\VncSharpNG.dll</HintPath>
+    </Reference>
     <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.2.2864.18696, Culture=neutral, PublicKeyToken=d481317c817cec47, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
@@ -605,7 +601,7 @@
     <Content Include="Notes\Help.txt" />
     <Content Include="Notes\ICA.txt" />
     <Content Include="Notes\Misc.txt" />
-    <Content Include="ChangeLog.txt">
+    <Content Include="CHANGELOG.TXT">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="My Project\DataSources\mRemote.Language.Base.datasource" />