Merge Branch_1.60 back into master.

This commit is contained in:
Riley McArdle
2010-01-17 00:23:51 -06:00
16 changed files with 202 additions and 222 deletions

Binary file not shown.

View File

@@ -95,7 +95,6 @@ Section "" ; Install
; Register ActiveX components
RegDLL "$INSTDIR\eolwtscom.dll"
RegDLL "$INSTDIR\scvncctrl.dll"
; Start Menu
CreateDirectory "$SMPROGRAMS\mRemoteNG"
@@ -121,7 +120,6 @@ SectionEnd
Section "un.Uninstall"
; Unregister ActiveX components
UnregDLL "$INSTDIR\eolwtscom.dll"
UnregDLL "$INSTDIR\scvncctrl.dll"
; Delete Files
RMDIR /r $INSTDIR

View File

@@ -1,9 +1,19 @@
1.61:
1.62:
Switched to VncSharp, an open source VNC component
VNC is supported again except for the following features:
Windows authentication
Toggling view only mode while connected (must be set before connecting)
Setting the compression, encoding and color settings
Connecting through a proxy server
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
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

View File

@@ -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))> _

View File

@@ -1,5 +1,5 @@
Imports mRemote.App.Runtime
Imports AxViewerX
Imports VncSharp
Imports System.ComponentModel
Namespace Connection
@@ -10,44 +10,33 @@ 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 Not VNC.AutoScroll
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.SetScalingMode(value)
VNC.AutoScroll = Not value
End Set
End Property
Public Property ViewOnly() As Boolean
Get
Return VNC.ViewOnly
'Return VNC.ViewOnly ' TODO: Fix this
Return False
End Get
Set(ByVal value As Boolean)
VNC.ViewOnly = value
VNC.SetInputMode(value)
End Set
End Property
#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 +47,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 +123,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 +144,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 +173,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 +185,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 +197,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 +207,29 @@ 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
VNC.GetPassword = AddressOf VNCEvent_Authenticate
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"

View File

@@ -363,9 +363,10 @@
"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 & _
"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 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 & _
' "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 CcVNCFailed As String = "Due to licensing issues, this version of mRemoteNG does not support VNC."
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)"

View File

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

Binary file not shown.

View File

@@ -237,8 +237,10 @@ 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.llblCopyright2.Text = "Contains VNC viewer software licensed from SmartCode Solutions"
'Me.llblCopyright2.Links.Add(43, 100, (App.Info.General.SmartCodeURL))
Me.llblCopyright2.Text = "This version of mRemoteNG does not support VNC"
Me.llblCopyright2.Links.Clear()
Me.llblCopyright3.Text = "Some Icons by FAMFAMFAM"
Me.llblCopyright3.Links.Add(14, 100, (App.Info.General.FamFamFamURL))

View File

@@ -517,33 +517,33 @@ Namespace UI
RDP.Dispose()
Dim VNC As AxViewerX.AxCSC_ViewerXControl = Nothing
'Dim VNC As AxViewerX.AxCSC_ViewerXControl = Nothing
Try
VNC = New AxViewerX.AxCSC_ViewerXControl
mRemote.Connection.Protocol.VNC.SetupLicense(VNC)
VNC.CreateControl()
'Try
' VNC = New AxViewerX.AxCSC_ViewerXControl
' mRemote.Connection.Protocol.VNC.SetupLicense(VNC)
' VNC.CreateControl()
Do Until VNC.Created
Thread.Sleep(10)
System.Windows.Forms.Application.DoEvents()
Loop
' Do Until VNC.Created
' Thread.Sleep(10)
' System.Windows.Forms.Application.DoEvents()
' Loop
pbCheck2.Image = My.Resources.Good_Symbol
lblCheck2.ForeColor = Color.DarkOliveGreen
lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckSucceeded
txtCheck2.Text = Language.Base.CcVNCOK
Catch ex As Exception
pbCheck2.Image = My.Resources.Bad_Symbol
lblCheck2.ForeColor = Color.Firebrick
lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckFailed
txtCheck2.Text = Language.Base.CcVNCFailed
' pbCheck2.Image = My.Resources.Good_Symbol
' lblCheck2.ForeColor = Color.DarkOliveGreen
' lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckSucceeded
' txtCheck2.Text = Language.Base.CcVNCOK
'Catch ex As Exception
pbCheck2.Image = My.Resources.Bad_Symbol
lblCheck2.ForeColor = Color.Firebrick
lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckFailed
txtCheck2.Text = Language.Base.CcVNCFailed
mC.AddMessage(Messages.MessageClass.WarningMsg, "VNC " & errorMsg, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
End Try
mC.AddMessage(Messages.MessageClass.WarningMsg, "VNC " & errorMsg, True)
'mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
'End Try
VNC.Dispose()
'VNC.Dispose()
Dim pPath As String = ""

View File

@@ -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">

View File

@@ -77,27 +77,28 @@ 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)"
Me.cmenTabViewOnly.Visible = False
'
'ToolStripSeparator1
'
@@ -109,28 +110,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 +140,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 +171,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 +280,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 +400,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

View File

@@ -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

View File

@@ -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="VncSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=61974755c7bfea7c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>References\VncSharp.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>