Added build configuration for portable edition.

Fixes for portable edition.
Added missing Icons directory.
New build script to make release ZIPs and installer EXE.

.gitignore

@@ -0,0 +1,10 @@
+Release
+mRemoteV1/bin
+mRemoteV1/obj
+mRemoteV1/publish
+*.pfx
+*.suo
+*.vbproj.user
+Thumbs.db
+_ReSharper.*
+*.resharper.user

BUILD.CMD

@@ -0,0 +1,32 @@
+@echo off
+
+SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+SET DEVENV="devenv.exe"
+SET MAKENSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
+SET RAR="%ProgramFiles%\WinRAR\Rar.exe"
+SET BINARYZIP="%~dp0\Release\mRemoteNG-1.63.zip"
+SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.63.zip"
+
+call %VCVARSALL% x86
+
+rmdir /s /q "%~dp0\mRemoteV1\bin"
+rmdir /s /q "%~dp0\mRemoteV1\obj"
+
+%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
+%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
+
+mkdir "%~dp0\Release"
+
+%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
+
+del /f /q %BINARYZIP%
+
+%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
+%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep %BINARYZIP% "%~dp0\*.TXT"
+
+del /f /q %PORTABLEZIP%
+
+%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
+%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep %PORTABLEZIP% "%~dp0\*.TXT"

CREDITS.TXT

@@ -0,0 +1,101 @@
+Contributors
+============
+
+Felix Deimel
+Riley McArdle
+David Vidmar
+
+
+Included Source Code
+====================
+
+Command Line Arguments Parser 1.0
+Copyright <20> 2002 Richard Lopes
+MIT License
+http://www.codeproject.com/KB/recipes/command_line.aspx
+
+
+Included Components
+===================
+
+ADTree 1.0
+Copyright <20> 2004 Marc Merritt
+Copyright <20> 2008 Felix Deimel
+http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
+
+DiffieHellman 1.0
+Copyright <20> 2003 The Mentalis.org Team
+Modified New BSD License
+http://www.mentalis.org/
+
+DockPanel Suite 2.3.1
+Copyright <20> 2007 Weifen Luo
+MIT License
+http://sourceforge.net/projects/dockpanelsuite/
+
+Emergent OnLine WTSCOM 2.0.6.0
+Copyright <20> 2001-2003 Emergent OnLine
+http://www.go-eol.com/
+
+FilteredPropertyGrid 1.0.0.0
+Copyright <20> 2006 Azuria
+http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
+
+GeckoFX 1.8.1.4
+Copyright <20> 2008 Skybound Software
+Mozilla Public License 1.1
+http://www.geckofx.org/
+
+IPTextBox 1.1
+Copyright <20> 2006 Matthew Kleinwaks
+Copyright <20> 2008 Felix Deimel
+http://www.vbforums.com/showthread.php?t=430169
+
+log4net 1.2.10.0
+Copyright <20> 2001-2006 The Apache Software Foundation
+Apache License Version 2.0
+http://logging.apache.org/log4net/
+
+Magic Library 1.7.4
+Copyright <20> 2002-2003 Crownwood Consulting, Ltd.
+Freely redistributable with attribution
+http://www.dotnetmagic.com/magic_download.html
+
+Mentalis.org Security Library 1.0.13.715
+Copyright <20> 2002-2005 The Mentalis.org Team
+Modified New BSD License
+http://www.mentalis.org/
+
+MiniGeckoBrowser 1.0
+Copyright <20> 2008 Felix Deimel
+http://www.appjuice.org/
+
+MiniTabControl 1.0
+Copyright <20> 2008 Felix Deimel
+http://www.appjuice.org/
+
+PuTTY 0.60
+Copyright <20> 1997-2007 Simon Tatham
+MIT License
+http://www.chiark.greenend.org.uk/~sgtatham/putty/
+
+SharpSSH 1.1.1.13
+Copyright <20> 2002-2008 Atsuhiko Yamanaka, JCraft, Inc.
+Copyright <20> 2007 Tamir Gal
+BSD Style License
+http://www.tamirgal.com/blog/page/SharpSSH.aspx
+
+Silk Icon Set
+Copyright <20> 2005-2008 FAMFAMFAM
+Creative Commons Attribution 2.5 License
+http://www.famfamfam.com/
+
+Vista TaskDialog Wrapper and Emulator 1.0
+Copyright <20> 2007-2009 Hedley Muscroft
+Code Project Open License (CPOL)
+http://www.codeproject.com/KB/vista/Vista_TaskDialog_Wrapper.aspx
+
+VncSharp 1.0
+Copyright <20> 2004-2009 David Humphrey
+GNU General Public License (GPL) Version 2
+http://cdot.senecac.on.ca/projects/vncsharp/

Installer/mRemote.nsi

@@ -0,0 +1,149 @@
+!include "MUI.nsh"
+!include "WordFunc.nsh"
+!insertmacro VersionCompare
+
+!DEFINE PRODUCT_VERSION_MAJOR 1
+!DEFINE PRODUCT_VERSION_MINOR 63
+
+!DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
+!DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0"
+
+; Global Variables
+Var InstallDotNET
+
+; Basic Config
+Name "mRemoteNG ${PRODUCT_VERSION}"
+OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION}.exe"
+SetCompressor /SOLID lzma
+InstallDir "$PROGRAMFILES\mRemoteNG"
+InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath"
+RequestExecutionLevel admin
+
+; Version Information
+VIProductVersion ${PRODUCT_VERSION_LONG}
+!DEFINE LANG_ENGLISH "1033-English"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "mRemoteNG"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" ${PRODUCT_VERSION_LONG}
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright <20> 2007-2010 Felix Deimel, Riley McArdle"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "mRemoteNG ${PRODUCT_VERSION} Installer"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" ${PRODUCT_VERSION_LONG}
+
+; Design
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "header.bmp" ; optional
+!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
+!define MUI_HEADERIMAGE_UNBITMAP "header.bmp" ; optional
+!define MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH
+!define MUI_HEADER_TRANSPARENT_TEXT
+!define MUI_WELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
+
+; Install Pages
+!insertmacro MUI_PAGE_LICENSE "..\COPYING.TXT"
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+
+; Finish Page
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_RUN_Text "Launch mRemoteNG Now"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\mRemoteNG.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstall Pages
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Set Language
+!insertmacro MUI_LANGUAGE "English"
+
+Function .onInit
+	; Check .NET version
+	StrCpy $InstallDotNET "No"
+	Call GetDotNETVersion
+	Pop $0
+
+	${If} $0 == "not found"
+		StrCpy $InstallDotNET "Yes"
+	${EndIf}
+
+	StrCpy $0 $0 "" 1 # skip "v"
+
+	${VersionCompare} $0 "2.0" $1
+	${If} $1 == 2
+		StrCpy $InstallDotNET "Yes"
+	${EndIf}
+
+	${If} $InstallDotNET == "Yes"
+		MessageBox MB_OK|MB_ICONEXCLAMATION "mRemoteNG requires Microsoft .NET Framework 2.0."
+		Quit
+	${EndIf}
+FunctionEnd
+
+Section "" ; Install
+	SetOutPath $INSTDIR
+
+	; AddFiles
+	File /r /x "mRemoteNG.vshost.*" "..\mRemoteV1\bin\Release\*.*"
+	File /r "Dependencies\*.*"
+	File "..\*.txt"
+
+	; Uninstaller
+	WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+	; Register ActiveX components
+	RegDLL "$INSTDIR\eolwtscom.dll"
+ 
+	; Start Menu
+	CreateDirectory "$SMPROGRAMS\mRemoteNG"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+
+	; 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"
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 6464
+
+	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"
+
+	; Delete Files
+	RMDIR /r $INSTDIR
+
+	; Start Menu
+	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
+	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
+	RMDir "$SMPROGRAMS\mRemoteNG"
+
+	; Registry
+	DeleteRegValue HKLM "Software\mRemoteNG" "InstallPath"
+	DeleteRegKey /ifempty HKLM "Software\mRemoteNG"
+	DeleteRegKey /ifempty HKCU "Software\mRemoteNG"
+	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG"
+SectionEnd
+
+Function GetDotNETVersion
+	Push $0
+	Push $1
+
+	System::Call "mscoree::GetCORVersion(w .r0, i ${NSIS_MAX_STRLEN}, *i) i .r1"
+	StrCmp $1 "error" 0 +2
+	StrCpy $0 "not found"
+
+	Pop $1
+	Exch $0
+FunctionEnd

README.txt

@@ -0,0 +1,14 @@
+mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
+
+It allows you to store all your remote connections in a simple yet powerful interface.
+
+Currently these protocols are supported:
+
+ * RDP (Remote Desktop)
+ * VNC (Virtual Network Computing)
+ * ICA (Independent Computing Architecture)
+ * SSH (Secure Shell)
+ * Telnet (TELecommunication NETwork)
+ * HTTP/S (Hypertext Transfer Protocol)
+ * Rlogin (Rlogin)
+ * RAW

mRemoteV1.sln

@@ -5,12 +5,18 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "mRemoteV1", "mRemoteV1\mRem
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug Portable|Any CPU = Debug Portable|Any CPU
 		Debug|Any CPU = Debug|Any CPU
+		Release Portable|Any CPU = Release Portable|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

mRemoteV1/App/App.Announcement.vb

@@ -3,7 +3,7 @@ Imports System.Net
 Imports mRemote.App.Runtime
 
 Namespace App
-    Public Class Announcment
+    Public Class Announcement
 #Region "Private Properties"
         Private wCl As WebClient
         Private wPr As WebProxy
@@ -16,47 +16,47 @@ Namespace App
             End Get
         End Property
 
-        Public Function IsAnnouncmentAvailable() As Boolean
+        Public Function IsAnnouncementAvailable() As Boolean
             Try
-                Dim aI As Info = GetAnnouncmentInfo()
+                Dim aI As Info = GetAnnouncementInfo()
 
                 If aI.InfoOk = False Then
                     Return False
                 End If
 
-                If aI.Name <> My.Settings.LastAnnouncment Then
+                If aI.Name <> My.Settings.LastAnnouncement Then
                     Return True
                 Else
                     Return False
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsAnnouncmentAvailable failed" & vbNewLine & ex.Message, True)
+                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsAnnouncementAvailable failed" & vbNewLine & ex.Message, True)
                 Return False
             End Try
         End Function
 
-        Public Function GetAnnouncmentInfo() As Info
+        Public Function GetAnnouncementInfo() As Info
             Try
-                Dim strAnnouncment As String = GetAnnouncmentFile()
+                Dim strAnnouncement As String = GetAnnouncementFile()
 
                 CreateWebClient()
 
                 Dim aI As New Info()
 
-                If strAnnouncment <> "" Then
+                If strAnnouncement <> "" Then
                     aI.InfoOk = True
 
                     Try
                         'get Name
-                        Dim strName As String = strAnnouncment.Substring(strAnnouncment.IndexOf("Name: ") + 6, strAnnouncment.IndexOf(vbNewLine) - 6)
+                        Dim strName As String = strAnnouncement.Substring(strAnnouncement.IndexOf("Name: ") + 6, strAnnouncement.IndexOf(vbNewLine) - 6)
                         aI.Name = strName
 
-                        strAnnouncment = strAnnouncment.Remove(0, strAnnouncment.IndexOf(vbNewLine) + 2)
+                        strAnnouncement = strAnnouncement.Remove(0, strAnnouncement.IndexOf(vbNewLine) + 2)
 
                         'get Download URL
                         Dim strU As String = ""
 
-                        strU = strAnnouncment.Substring(strAnnouncment.IndexOf("URL: ") + 5, strAnnouncment.IndexOf(vbNewLine) - 5)
+                        strU = strAnnouncement.Substring(strAnnouncement.IndexOf("URL: ") + 5, strAnnouncement.IndexOf(vbNewLine) - 5)
 
                         aI.URL = strU
                     Catch ex As Exception
@@ -69,26 +69,26 @@ Namespace App
                 _curAI = aI
                 Return aI
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting announcment info failed" & vbNewLine & ex.Message, True)
+                mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting Announcement info failed" & vbNewLine & ex.Message, True)
                 Return Nothing
             End Try
         End Function
 
-        Private Function GetAnnouncmentFile() As String
+        Private Function GetAnnouncementFile() As String
             Try
                 CreateWebClient()
 
                 Dim strTemp As String
 
                 Try
-                    strTemp = wCl.DownloadString(App.Info.General.URLAnnouncment)
+                    strTemp = wCl.DownloadString(App.Info.General.URLAnnouncement)
                 Catch ex As Exception
                     strTemp = ""
                 End Try
 
                 Return strTemp
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "GetAnnouncmentFile failed" & vbNewLine & ex.Message, True)
+                mC.AddMessage(Messages.MessageClass.WarningMsg, "GetAnnouncementFile failed" & vbNewLine & ex.Message, True)
                 Return ""
             End Try
         End Function

mRemoteV1/App/App.Info.vb

@@ -3,34 +3,32 @@ Imports System.Environment
 Namespace App
     Namespace Info
         Public Class General
-            Public Shared ReadOnly URLHome As String = "http://www.mRemote.org/"
-            Public Shared ReadOnly URLDonate As String = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=felix%2edeimel%40gmail%2ecom&item_name=mRemote%20Donations&buyer_credit_promo_code=&buyer_credit_product_category=&buyer_credit_shipping_method=&buyer_credit_user_address_change=&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8"
-            Public Shared ReadOnly URLBugs As String = "http://bugs.mremote.org/"
-            Public Shared ReadOnly URLAnnouncment As String = "http://update.mRemote.org/mRemote_Announcment.txt"
-            Public Shared ReadOnly URLvRD As String = "http://software.visionapp.com/vrd"
-            Public Shared ReadOnly LogFile As String = My.Application.Info.DirectoryPath & "\mRemote.log"
+            Public Shared ReadOnly URLHome As String = "http://www.mremoteng.org/"
+            Public Shared ReadOnly URLDonate As String = "http://donate.mremoteng.org/"
+            Public Shared ReadOnly URLForum As String = "http://forum.mremoteng.org/"
+            Public Shared ReadOnly URLBugs As String = "http://bugs.mremoteng.org/"
+            Public Shared ReadOnly URLAnnouncement As String = "http://update.mremoteng.org/announcement.txt"
             Public Shared ReadOnly HomePath As String = My.Application.Info.DirectoryPath
             Public Shared EncryptionKey As String = "mR3m"
             Public Shared ReportingFilePath As String = ""
-            Public Shared SmartCodeURL As String = "http://www.s-code.com/products/viewerx/"
-            Public Shared FamFamFamURL As String = "http://www.famfamfam.com/"
         End Class
 
         Public Class Settings
-            'Exchange to make portable/normal
-            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.CompanyName.Replace(" ", "_") & "\" & My.Application.Info.ProductName
-            'Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath
-
+#If Not PORTABLE Then
+            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName
+#Else
+            Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath
+#End If
             Public Shared ReadOnly LayoutFileName As String = "pnlLayout.xml"
             Public Shared ReadOnly ExtAppsFilesName As String = "extApps.xml"
         End Class
 
         Public Class Update
-            Public Shared ReadOnly URL As String = "http://update.mRemote.org/"
+            Public Shared ReadOnly URL As String = "http://update.mremoteng.org/"
 #If DEBUG Then
-            Public Shared ReadOnly File As String = "mRemote_Update_Debug.txt"
+            Public Shared ReadOnly File As String = "update-debug.txt"
 #Else
-            Public Shared ReadOnly File As String = "mRemote_Update.txt"
+            Public Shared ReadOnly File As String = "update.txt"
 #End If
         End Class
 
@@ -38,7 +36,7 @@ Namespace App
             Public Shared ReadOnly DefaultConnectionsPath As String = App.Info.Settings.SettingsPath
             Public Shared ReadOnly DefaultConnectionsFile As String = "confCons.xml"
             Public Shared ReadOnly DefaultConnectionsFileNew As String = "confConsNew.xml"
-            Public Shared ReadOnly ConnectionFileVersion As Double = 2.1
+            Public Shared ReadOnly ConnectionFileVersion As Double = 2.2
         End Class
 
         Public Class Credentials

mRemoteV1/App/App.Native.vb

@@ -20,7 +20,7 @@ Namespace App
         End Function
 
         <DllImport("user32.dll")> _
-        Public Shared Function SetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer, ByVal dwNewLong As Integer) As Integer
+        Public Shared Function SetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer, ByVal dwNewLong As Long) As Integer
         End Function
 
         <DllImport("user32.dll", SetLastError:=True)> _
@@ -117,6 +117,10 @@ Namespace App
         Public Const MF_BYPOSITION As Integer = &H400
         Public Const MF_POPUP As Integer = &H10
 
+        Public Const WM_GETTEXT As Integer = &HD
+        Public Const WM_ACTIVATEAPP As Integer = &H1C
+        Public Const WM_WINDOWPOSCHANGED As Integer = &H47
+
         Public Const WM_SYSCOMMAND As Integer = &H112
 
         Public Const WM_LBUTTONDOWN As Integer = &H201

mRemoteV1/App/App.Runtime.vb

@@ -25,7 +25,7 @@ Namespace App
         Public Shared log As log4net.ILog
 
         Public Shared IsUpdateAvailable As Boolean
-        Public Shared IsAnnouncmentAvailable As Boolean
+        Public Shared IsAnnouncementAvailable As Boolean
         Public Shared ConnectionsFileLoaded As Boolean
 
         Public Shared WithEvents tmrSqlWatcher As Timers.Timer
@@ -75,8 +75,8 @@ Namespace App
             Public Shared ultravncscPanel As New DockContent
             Public Shared componentscheckForm As UI.Window.ComponentsCheck
             Public Shared componentscheckPanel As New DockContent
-            Public Shared announcmentForm As UI.Window.Announcment
-            Public Shared announcmentPanel As New DockContent
+            Public Shared AnnouncementForm As UI.Window.Announcement
+            Public Shared AnnouncementPanel As New DockContent
 
             Public Shared Sub Show(ByVal WindowType As UI.Window.Type, Optional ByVal PortScanMode As Tools.PortScan.PortScanMode = Tools.PortScan.PortScanMode.Normal)
                 Try
@@ -136,11 +136,11 @@ Namespace App
                             Windows.componentscheckPanel = Windows.componentscheckForm
 
                             Windows.componentscheckForm.Show(frmMain.pnlDock)
-                        Case UI.Window.Type.Announcment
-                            Windows.announcmentForm = New UI.Window.Announcment(announcmentPanel)
-                            Windows.announcmentPanel = Windows.announcmentForm
+                        Case UI.Window.Type.Announcement
+                            Windows.AnnouncementForm = New UI.Window.Announcement(AnnouncementPanel)
+                            Windows.AnnouncementPanel = Windows.AnnouncementForm
 
-                            Windows.announcmentForm.Show(frmMain.pnlDock)
+                            Windows.AnnouncementForm.Show(frmMain.pnlDock)
                     End Select
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "Show (App.Runtime.Windows) failed" & vbNewLine & ex.Message, True)
@@ -172,60 +172,57 @@ Namespace App
         End Class
 
         Public Class Startup
-            Public Shared Sub CreatePanels(Optional ByVal ShowDefault As Boolean = False)
+            Public Shared Sub CreatePanels()
                 Windows.configForm = New UI.Window.Config(Windows.configPanel)
                 Windows.configPanel = Windows.configForm
 
-                If ShowDefault Then
-                    Windows.configPanel.Show(frmMain.pnlDock, DockState.DockLeft)
-                End If
-
                 Windows.treeForm = New UI.Window.Tree(Windows.treePanel)
                 Windows.treePanel = Windows.treeForm
                 Tree.Node.TreeView = Windows.treeForm.tvConnections
 
-                If ShowDefault Then
-                    Windows.treePanel.Show(frmMain.pnlDock, DockState.DockLeft)
-                    Windows.treePanel.DockTo(frmMain.pnlDock.Panes(frmMain.pnlDock.Panes.Count - 1), DockStyle.Top, 0)
-                End If
-
                 Windows.errorsForm = New UI.Window.ErrorsAndInfos(Windows.errorsPanel)
                 Windows.errorsPanel = Windows.errorsForm
 
-                If ShowDefault Then
-                    Windows.errorsPanel.AutoHidePortion = 150
-                    Windows.errorsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                End If
-
                 Windows.sessionsForm = New UI.Window.Sessions(Windows.sessionsPanel)
                 Windows.sessionsPanel = Windows.sessionsForm
 
-                If ShowDefault Then
-                    Windows.sessionsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.sessionsPanel.DockTo(frmMain.pnlDock.Panes(frmMain.pnlDock.Panes.Count - 1), DockStyle.Bottom, 0)
-                End If
-
                 Windows.screenshotForm = New UI.Window.ScreenshotManager(Windows.screenshotPanel)
                 Windows.screenshotPanel = Windows.screenshotForm
 
-                If ShowDefault Then
-                    Windows.screenshotPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.screenshotForm.Hide()
-                End If
-
                 Windows.quickyForm = New UI.Window.QuickConnect(Windows.quickyPanel)
                 Windows.quickyPanel = Windows.quickyForm
 
-                If ShowDefault Then
-                    Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.quickyForm.Hide()
-                End If
-
                 Windows.updateForm = New UI.Window.Update(Windows.updatePanel)
                 Windows.updatePanel = Windows.updateForm
 
-                Windows.announcmentForm = New UI.Window.Announcment(Windows.announcmentPanel)
-                Windows.announcmentPanel = Windows.announcmentForm
+                Windows.AnnouncementForm = New UI.Window.Announcement(Windows.AnnouncementPanel)
+                Windows.AnnouncementPanel = Windows.AnnouncementForm
+            End Sub
+
+            Public Shared Sub SetDefaultLayout()
+                frmMain.pnlDock.Visible = False
+
+                Windows.configPanel.Show(frmMain.pnlDock, DockState.DockLeft)
+
+                Windows.treePanel.Show(frmMain.pnlDock, DockState.DockLeft)
+                For Each pane As DockPane In frmMain.pnlDock.Panes
+                    If pane.DockState = DockState.DockLeft Then
+                        Windows.treePanel.DockTo(pane, DockStyle.Top, 0)
+                        Exit For
+                    End If
+                Next
+
+                Windows.errorsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
+
+                Windows.sessionsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
+
+                Windows.screenshotPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
+                Windows.screenshotForm.Hide()
+
+                Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
+                Windows.quickyForm.Hide()
+
+                frmMain.pnlDock.Visible = True
             End Sub
 
             Public Shared Sub GetConnectionIcons()
@@ -250,31 +247,38 @@ Namespace App
             Public Shared Sub CreateLogger()
                 log4net.Config.XmlConfigurator.Configure(New FileInfo("mRemote.exe.config"))
 
-                log = log4net.LogManager.GetLogger("mRemote.Log")
+                log = log4net.LogManager.GetLogger("mRemoteNG.Log")
             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 AnnouncmentCheck()
-                If App.Editions.Spanlink.Enabled = False Then
-                    frmMain.tmrShowUpdate.Enabled = True
-                    Windows.announcmentForm.CheckForAnnouncment()
-                    AddHandler Windows.announcmentForm.AnnouncmentCheckCompleted, AddressOf AnnouncmentCheckComplete
+            Public Shared Sub AnnouncementCheck()
+                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 AnnouncmentCheckComplete(ByVal AnnouncmentAvailable As Boolean)
-                IsAnnouncmentAvailable = AnnouncmentAvailable
+            Private Shared Sub AnnouncementCheckComplete(ByVal AnnouncementAvailable As Boolean)
+                My.Settings.CheckForUpdatesLastCheck = Date.Now
+                IsAnnouncementAvailable = AnnouncementAvailable
             End Sub
 
             Public Shared Sub ParseCommandLineArgs()
@@ -1184,7 +1188,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 +1206,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
@@ -1424,10 +1428,16 @@ Namespace App
                 mC.AddMessage(Messages.MessageClass.InformationMsg, "Protocol Event Disconnected" & vbNewLine & "Message: " & DisconnectedMessage, True)
 
                 Dim Prot As Connection.Protocol.Base = sender
-
                 If Prot.InterfaceControl.Info.Protocol = Connection.Protocol.Protocols.RDP Then
-                    If DisconnectedMessage > 3 Then
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & "Error Code: " & DisconnectedMessage & vbNewLine & "Error Description: " & Connection.Protocol.RDP.DisconnectionErrors.GetError(DisconnectedMessage))
+                    Dim Reason As String() = DisconnectedMessage.Split(vbCrLf)
+                    Dim ReasonCode As String = Reason(0)
+                    Dim ReasonDescription As String = Reason(1)
+                    If ReasonCode > 3 Then
+                        If ReasonDescription <> "" Then
+                            mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & ReasonDescription & vbNewLine & "Error code " & ReasonCode & ".")
+                        Else
+                            mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & "Error code " & ReasonCode & ".")
+                        End If
                     End If
                 End If
             Catch ex As Exception
@@ -1517,16 +1527,36 @@ Namespace App
 #End Region
 
 #Region "Misc"
+        Public Shared Sub GoToURL(ByVal URL As String)
+            Dim cI As New mRemote.Connection.Info
+
+            cI.Name = ""
+            cI.Hostname = URL
+            If URL.StartsWith("https:") Then
+                cI.Protocol = Connection.Protocol.Protocols.HTTPS
+            Else
+                cI.Protocol = Connection.Protocol.Protocols.HTTP
+            End If
+            cI.SetDefaultPort()
+            cI.IsQuicky = True
+
+            App.Runtime.OpenConnection(cI, mRemote.Connection.Info.Force.DoNotJump)
+        End Sub
+
         Public Shared Sub GoToWebsite()
-            Process.Start(App.Info.General.URLHome)
+            GoToURL(App.Info.General.URLHome)
         End Sub
 
         Public Shared Sub GoToDonate()
-            Process.Start(App.Info.General.URLDonate)
+            GoToURL(App.Info.General.URLDonate)
+        End Sub
+
+        Public Shared Sub GoToForum()
+            GoToURL(App.Info.General.URLForum)
         End Sub
 
         Public Shared Sub GoToBugs()
-            Process.Start(App.Info.General.URLBugs)
+            GoToURL(App.Info.General.URLBugs)
         End Sub
 
         Public Shared Sub Report(ByVal Text As String)
@@ -1558,16 +1588,16 @@ Namespace App
 
         Public Shared Sub SetMainFormText(Optional ByVal ConnectionFileName As String = "")
             Try
-                Dim txt As String = "mRemote"
+                Dim txt As String = "mRemoteNG"
 
                 If App.Editions.Spanlink.Enabled Then
                     txt &= " | Spanlink Communications"
                 Else
                     If ConnectionFileName <> "" And ConnectionsFileLoaded = True Then
                         If My.Settings.ShowCompleteConsPathInTitle Then
-                            txt &= " | " & ConnectionFileName
+                            txt &= " - " & ConnectionFileName
                         Else
-                            txt &= " | " & ConnectionFileName.Substring(ConnectionFileName.LastIndexOf("\") + 1)
+                            txt &= " - " & ConnectionFileName.Substring(ConnectionFileName.LastIndexOf("\") + 1)
                         End If
                     End If
                 End If
@@ -1612,6 +1642,17 @@ Namespace App
 
             Return Nothing
         End Function
+
+        ' Override the font of all controls in a container with the default font based on the OS version
+        Public Shared Sub FontOverride(ByRef ctlParent As Control)
+            Dim ctlChild As Control
+            For Each ctlChild In ctlParent.Controls
+                ctlChild.Font = New System.Drawing.Font(SystemFonts.MessageBoxFont.Name, ctlChild.Font.Size, ctlChild.Font.Style, ctlChild.Font.Unit, ctlChild.Font.GdiCharSet)
+                If ctlChild.Controls.Count > 0 Then
+                    FontOverride(ctlChild)
+                End If
+            Next
+        End Sub
 #End Region
 
 #Region "SQL Watcher"

mRemoteV1/App/App.Update.vb

@@ -75,7 +75,7 @@ Namespace App
                         'get Download URL
                         Dim strU As String = ""
 
-                        strU = strUpdate.Substring(strUpdate.IndexOf("dURL: ") + 6, strUpdate.IndexOf(vbNewLine) - 6).Replace(".exe", "_" & Language.Base.CurrentLanguage.ToString & ".exe")
+                        strU = strUpdate.Substring(strUpdate.IndexOf("dURL: ") + 6, strUpdate.IndexOf(vbNewLine) - 6)
 
                         uI.DownloadUrl = strU
 
@@ -125,7 +125,7 @@ Namespace App
 
                 _curUI.UpdateLocation = My.Computer.FileSystem.SpecialDirectories.Temp & "\mRemote_Update.exe"
                 wCl.DownloadFileAsync(New Uri(dURL), _curUI.UpdateLocation)
-
+                
                 Return True
             Catch ex As Exception
                 mC.AddMessage(Messages.MessageClass.WarningMsg, "Update download failed" & vbNewLine & ex.Message, True)

mRemoteV1/CHANGELOG.TXT

@@ -1,4 +1,51 @@
-1.50:
+1.63:
+  New icon and logo
+  Fixed problems moving or resizing the main window while PuTTY (SSH/telnet/rlogin/raw) connections are open
+  Fixed PuTTY processes not closing on Vista and 7 with UAC enabled
+  Updated DockPanel Suite from 2.2.0 to 2.3.1
+  Fixed error if the mouse is clicked outside of the remote screen area of a VNC connection
+  Fixed flashing and red lines at bottom of the window on first run
+  Added View->Reset Layout menu item
+  Added F11 shortcut key to View->Full Screen
+  Improved RDP error reporting
+  Added support for Credential Security Support Provider (CredSSP) which is required for Network Level Authentication (NLA)
+  Added support for connecting through Remote Desktop Gateway servers
+  Popups can now be allowed in Internet Explorer by holding Ctrl+Alt when clicking a link
+  Added PuTTY Settings item to tab context menu
+
+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
+  Removed references to visionapp Remote Desktop
+  Changed filename delimiter in title bar from pipe to dash
+  Changed default format for saving screenshot images to PNG
+  Changed website addresses
+  Added Report a Bug and Support Forum links to the Help menu
+  Moved Check for Updates to the Help menu
+  Changed website links in Help menu and About page to load within mRemoteNG instead of launching an external browser
+
+1.50:
   Added the following formats to the "Save Connections As" function:
     mRemote CSV (standard CSV file with all properties)
     vRD 2008 CSV (standard CSV file with properties relevant for importing connections in vRD 2008)
@@ -7,9 +54,9 @@
 1.49:
   mRemote and visionapp Remote Desktop 2008 merge!
     Read more here: http://www.mremote.org/wiki/visionappMerge.ashx
-    or in the announcment panel.
+    or in the Announcement panel.
   Added features to the update function
-  Added Announcment feature
+  Added Announcement feature
   Changed copyright notice in about screen and text when connecting via VNC
   Fixed some SQL-related problems
 

mRemoteV1/ChangeLog.txt

@@ -1,485 +0,0 @@
-1.50:
-  Added the following formats to the "Save Connections As" function:
-    mRemote CSV (standard CSV file with all properties)
-    vRD 2008 CSV (standard CSV file with properties relevant for importing connections in vRD 2008)
-  Fixed bug in inheritance code (SmartSize Mode and View Only properies were always shown when using VNC)
-
-1.49:
-  mRemote and visionapp Remote Desktop 2008 merge!
-    Read more here: http://www.mremote.org/wiki/visionappMerge.ashx
-    or in the announcment panel.
-  Added features to the update function
-  Added Announcment feature
-  Changed copyright notice in about screen and text when connecting via VNC
-  Fixed some SQL-related problems
-
-V1.48:
-  ATTENTION! There is a bug in the automatic update code in 1.45 so you will have to download the new version manually from http://www.mremote.org/wiki/Downloads.ashx
-  
-  Added startup components check with directions to fix component installation (also available in Tools - Components Check)
-  Added "Try to integrate" option to Ext. Apps. If enabled mRemote will try to integrate the app into a tab container like any other connection protocol.
-  Added Ext. App as protocol. Any Ext. App can be launched just like a normal connection.
-    Example (DameWare Mini Remote Control):
-    Create a new Ext. App with the following properties:
-      Display Name: DameWare
-      Filename: c:\PathToYourDameWareInstallDir\DWRCC.exe
-      Arguments: -c: -h: -m:%hostname% -u:%username% -p:"%password%" -d:%domain%
-      Options: Try to integrate
-    Create a new connection and select Ext. App as protocol
-    Then choose DameWare in the Ext. App field
-    If you have problems with a particular app that takes a long time to start up consider setting a higher PuTTY/Ext. Apps wait time in Tools - Options - Advanced
-  Added option to completely encrypt connection files (tools - options - advancecd)
-  Added Rendering Engine option for HTTP/S protocols
-    You can now use the Gecko (Firefox) rendering engine
-    For this to work you need to download xulrunner (get it here: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/)
-    It must be the 1.8.1.3 release, 1.9.0.0 does NOT work!
-    Extract the contents to a path of your choice and set the correct path in Tools - Options - Advanced - XULrunner path
-    The interface is tab enabled and usage is generally very firefox-like. So you can open new tabs with Ctrl+T, jump to the location bar with Ctrl+L and so on...
-  Added "MAC Address", "User Field" fields and %MacAddress%, %UserField% variables to use in Ext. Apps
-  Added descriptions for all fields in the config editor
-  Fixed bug in connections loading code when using SQL storage
-  Fixed bug in reconnect code
-  Fixed VNC sessions not refreshing screen automatically when switching between tabs or panels
-
-  WARNING! There have been changes to the connections file/SQL tables
-    Please always backup your whole config before updating to a new mRemote beta release, especially when there have been changes to the config files/SQL tables
-    To get SQL working with the new version please update your tables like in the provided script (Info - Help - SQL Configuration)
-    These are the added lines:
-      [RenderingEngine] [varchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-      [MacAddress] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-      [UserField] [varchar] (256) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-      [ExtApp] [varchar] (256) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
-      [InheritRenderingEngine] [bit] NOT NULL ,
-      [InheritMacAddress] [bit] NOT NULL ,
-      [InheritUserField] [bit] NOT NULL ,
-      [InheritExtApp] [bit] NOT NULL ,
-
-V1.45:
-  New german language build available
-  Added support for RDP 6.1 (XP SP3/Vista SP1) features (Server Authentication, Console Session, TS Gateway not yet...)
-  Added basic support for UltraVNC SingleClick (Tools - UltraVNC SingleClick); the listening port is configurable in the options
-  Fixed VNC connections not working on x64
-  Fixed screenshots save all feature overwriting files with the same name (not actually a bug, but rather a new feature ;)
-  Fixed ICA Encryption Strength not inheriting properly
-  
-  WARNING! There have been changes to the connections file/SQL tables
-    Please always backup your whole config before updating to a new mRemote beta release, especially when there have been changes to the config files/SQL tables
-    To get SQL working with the new version please update your tables like in the provided script (Info - Help - SQL Configuration)
-    These are the added lines:
-      [RDPAuthenticationLevel] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
-      [InheritRDPAuthenticationLevel] [bit] NOT NULL ,
-
-V1.43:
-  Added function to send either the main form or a connection panel to another screen
-    To send the form to another screen, right click the titlebar or the taskbar button and select "Send to..."
-    If you want to send a panel to another screen, right click the panel's tab and do the same
-  Fixed PuTTY connections not supporting credentials with spaces
-  Fixed form not opening on last position when using multiple screens
-  Fixed kiosk mode not working on secondary screen
-
-V1.42:
-  IMPORTANT NEWS: Please read the page that opens when you first start this release or go to:
-    http://www.mRemote.org/wiki/MainPage.ashx#Commercial
-  Added minimize to tray option
-  Added option to enable switching to open connections with a single click on the corresponding connection in the tree
-  Added button to test proxy settings
-  Fixed: If the active connection tab is a PuTTY connection, Alt+Tab to mRemote now focuses the PuTTY window
-  Fixed encoding problem with PuTTY sessions that included spaces
-  Fixed problem that made mRemote inaccesible when closing it on a second monitor and then disabling this monitor
-  Fixed: Inheritance defaults of some new VNC properties were not saved in the portable package
-
-V1.41:
-  Added complete support for SmartCode's ViewerX and removed VncSharp
-    Many thx to everyone who donated to make this happen!!! I didn't think that it wouldn't even take a week! =)
-    I hope everyone will be satisfied by the functions and possibilities this new control provides
-    If you use one of the non-setup packages you must register the control yourself
-      Open a cmd and change to the directory you installed mRemote to
-      Type regsvr32 scvncctrl.dll and click ok
-  Changed shortcuts and added buttons for them to the view menu under "Jump To" because they were causing several problems
-
-  WARNING! There have been changes to the connections file/SQL tables and the Ext. Apps XML file
-    Please always backup your whole config before updating to a new mRemote beta release, especially when there have been changes to the config files/SQL tables
-    To get SQL working with the new version please update your tables like in the provided script (Info - Help - SQL Configuration)
-
-V1.40:
-  Added (limited) support for the trial version of SmartCode's VNC ActiveX
-    To enable it go to Options - Advanced and check "Try SmartCode VNC ActiveX"
-    When connecting a pop up will open, wait about 10 seconds, then click on "Trial" to continue
-    I will integrate this control fully into mRemote if I get enough Donations to buy the single developer license ($375,-)
-    So if you want to see better VNC support (All UltraVNC, TightVNC and RealVNC functions) in mRemote, please help me and donate some bucks
-    For donations either go to the mRemote Wiki (Info - Website) or click on Info - Donate to directly go to PayPal
-    I will announce the current donation amount every day (or as often as I can) on the Wiki main page
-    If you want to know more about the control go here: http://www.s-code.com/products/viewerx/
-  Added feature to choose the panel a connection will open in when...
-    a. no panel name was assigned in the properties
-    b. you opened a connection with the option to choose the panel before connecting
-    c. you checked "Always show panel selection dialog when opening connectins" in Options - Tabs & Panels
-  Added Shortcuts to focus the standard panels
-    Alt+C: Switch between Connections & Config panel
-    Alt+S: Switch between Sessions & Screenshots panel
-    Alt+E: Switch to Errors & Infos panel
-  Added some new icons
-
-V1.39:
-  Added MagicLibrary.dll to the release again (forgot it in the 1.38 packages, sorry)
-  Added auto-reconnect for ICA
-  Added feature that automatically clears whitespaces in the Quicky Textfield
-  Added special feature: Go to the set password dialog and type "ijustwannaplay" (without the quotes) in the password field... ;)
-
-V1.38:
-  Added automatic reconnect feature for RDP (Options - Advanced)
-  Added connections drop-down to the quicky toolbar (same as the tray icon menu)
-  Added setting in the options to enable/disable that double clicking on a connection tab closes it
-  Added option to automatically set the hostname like the display name when creating new connections
-  Fixed bug that caused the properties of a folder to be filled with "Object reference not set to an instance of an object." when adding a folder to the root with Default Inheritance enabled
-  Fixed bug that made the properties of a newly added Connection to the root unavailable when Default Inheritance was enabled
-  Fixed bug that the default settings for Pre/Post Ext. App, and their inheritance settings were not being saved
-  Fixed bug in settings loading methods that caused the application to hang when an error occured
-  Fixed bug in Ext. Apps panel that copied the properties of the previously selected Ext. App when "Wait for exit" was checked
-  Fixed bug in the SQL Query that creates the tables needed by mRemote
-  Attempt to fix the "Drop-Down on Screenshot" bug on some machines
-
-V1.35:
-  Added single instance mode (look in Options - Startup/Exit) - No cmd arguments supported yet!
-  Added possibilty to start a Ext. App before connecting and on disconnect (e.g. for VPN/RAS)
-  Added option to the Ext. Apps to tell mRemote to wait for the exit of the Ext. App
-  Added encryption setting for ICA
-  
-  WARNING! There have been changes to the connections file/SQL tables and the Ext. Apps XML file
-    Please always backup your whole config before updating to a new mRemote beta release, especially when there have been changes to the config files/SQL tables
-    Here's a list of new columns that need to be created before saving connections to an SQL server:
-      Name: ICAEncryptionStrength, Data-Type: varchar, Length: 64, Allow Nulls: No
-      Name: InheritICAEncryptionStrength, Data-Type: bit, Length: 1, Allow Nulls: No
-      Name: PreExtApp, Date-Type: varchar, Length: 512, Allow Nulls: Yes
-      Name: PostExtApp, Date-Type: varchar, Length: 512, Allow Nulls: Yes
-      Name: InheritPreExtApp, Date-Type: bit, Length: 1, Allow Nulls: No
-      Name: InheritPostExtApp, Date-Type: bit, Length: 1, Allow Nulls: No
-
-V1.33:
-  Fixed problem that caused RDP connections not to initialize properly when using XP SP3
-  Fixed bug in Port Scan that prevented hosts with no hostname from being imported
-
-V1.32:
-  Added: Inheritance defaults can now be customized (look in the root properties of your connections tree)
-  Fixed bug that made password-secured connection files not load properly because the return value from the password screen was always null
-  Fixed a lot of outdated code in the import functions (Import from XML, Import from AD, Import from RDP files)
-  Fixed bug that caused properties with a ' character not to be saved properly when using SQL Server
-  Changed Target CPU to AnyCPU again as I think the x86 setting caused problems on x64 machines (although it shouldn't)
-
-V1.31:
-  Small speed improvement to the port scanner
-  Fixed bug that caused SQL live-update to not work when not using AD Authentication
-  Fixed bug that caused Save As not to work
-
-V1.30:
-  Added experimental SQL Server with live-update (multi-user) support (see Help - Getting started - SQL Configuration)
-  Added bunch of new icons to the UI, most of them by famfamfam.com
-  Added dropdown button to Quicky Toolbar to choose protocol
-  Many smaller changes and additions
-  Fixed: Wrong default PuTTY session name
-  Fixed bug in Port Scanner that caused an error when no DNS name could be resolved
-
-V1.25:
-  Added inheritance for folders
-  Added port scan feature and possibility to import from a scan
-  Added toolbar for Ext. Apps (see View - External Applications Toolbar)
-  Added quick connect as toolbar
-  Added code that creates a backup of the current connections file every time it is loaded (It's named YourConsFile.xml_BAK)
-  Added description variable to Ext. Apps
-  Fixed bug that allowed inheriting from root node
-  Fixed bug that caused Ext. Apps launched from a connection tab to use the selected tree node instead of the current tab
-  Fixed bug that caused mRemote not to save panel layout and Ext. Apps on exit
-
-V1.24:
-  Fixed a bug in connections loading mechanism that caused a corrupted connections file when upgrading from a previous version
-
-V1.23:
-  Added feature to remember which connections were opened on last runtime and reconnect to them on the next start (see Tools - Options - Startup/Exit)
-    A command line switch is also available to cancel reconnecting (/noreconnect or /norc)
-  Added Auto Save feature (Tools - Options - Connections - Auto Save every...)
-  Added Ext. Apps to connection tab context menu
-  Added better error handling for RDP connection creation
-  Fixed problem with Sessions feature on 64bit systems
-  Fixed Sessions feature not working when using global credentials
-  Fixed several problems with the Active Directory OU picker control
-  Fixed bug in Connection duplicate code that caused duplicated connection to still have previous tree node assigned
-
-V1.20:
-  Added External Applications feature (check the help section for more info)
-  Added duplicate feature to Connections tree
-  Fixed: MagicLibrary.dll was not included in the setup package
-
-V1.16:
-  New Domain: www.mRemote.org
-  Fixed PuTTY connections appearing in a new window
-    There's a new setting in the options to fine tune the time to wait until the window has been created
-  Fixed export not working
-  Added reconnect feature in tab menu
-
-V1.15:
-  Added: New portable package
-  Added: Defaults for new connections can now be customized
-    Click the root item and then the new Properties-like button with a small yellow star to get to the settings
-  Fixed Import from Active Directory not working
-  Fixed problem with single click connect not focusing correctly
-  Fixed root node not being renamed after changing name in property grid
-
-V1.10:
-  Added support for setting a password to protect the connections file with (look in the root of your connections tree)
-  Added RDP file import feature
-  Added new command-line switch to reset panel's positions
-  Added HTTPS as protocol
-  Added HTTP/S basic authentication
-  Added support for setting a Proxy server for automatic updates
-  Some changes in help section
-  Fixed the bug that passwords stored in the options weren't decrypted when a connection was opened
-  Fixed "bug" that prevented "Connect to console session" from working in RDC6.1 (Vista SP1 RC1/XP SP3 RC1)
-
-V1.00:
-  Merry Christmas! =)
-  
-  V1.00 is a (almost) complete rewrite of the whole application
-  The code base is now much cleaner and more (easily) extendable
-  New features include (but are not limited to):
-    Every part of the application is now integrated into panels which can be moved, docked and undocked, hidden, moved to another monitor, etc.
-      This makes many new and exciting ways to manage connection and application windows possible
-      You can for example open up 4 PuTTY sessions in 4 different panels and align them in the main application so you can use all 4 side by side - 2 on the upper side and 2 on the bottom for example
-      This can be done for EVERY part of the application, it's completely modular and customizable
-    Connection and folder (previously called containers) properties have moved to a new property grid control
-    Every setting (with the exclusion of the hostname, which wouldn't make any sense) can now be inherited from the parent folder
-    Connection file saving/loading is now handled a bit different (more in the help section)
-    Application restart is no longer nececary after changing options, they are active with a click of the OK button
-    Smart size can now be activated also if a connection is already open (in the right click menu of the active tab)
-    A panel name can be stored with every connection (or folder, if inherting) to always open the connection in the specified panel
-  And last but not least, many bugs have been fixed, though there are probably many new bugs aswell - Did I already mention this is a rewrite? ;)
-  I hope you like my work and if you do please consider donating on the mRemote website to support me a little. Any amount will do! Thx!
-
-V0.50:
-  Removed old Terminal (SSH, Telnet) control and embedded PuTTY instead
-    This decision brings mostly good but also some bad news
-    The good news is that now everything that works in putty also works in mRemote
-      This means X11 forwarding, SSH port forwarding, session logging, appearance customization, etc. should be working fine now
-      It also brings some new protocols (Rlogin, RAW)
-    The bad news is that I cannot fully integrate Putty into mRemote because it is a standalone application and thus has it's own window handle
-      This means that you won't be able to use Ctrl+Tab to switch between tabs, catching errors or infos through the new Errors and Infos tab isn't possible, etc.
-  Added possibility to change resolution or display mode (Fit to window, Fullscreen, Smart size)
-  Added new setting in options to show logon info on tab titles
-  Added new feature that catches popup dialogs and puts them in a managed interface. This is another step to make mRemote a single window application.
-    Pressing escape switches back to the connection list
-    There is a context menu that allows you to copy selected errors/warnings/infos to the clipboard (text only) or to delete them
-    There also are settings in the option to change when to switch to the tab and to switch back to the normal behaviour of displaying message popups
-  Added QuickConnect history and auto-complete functions
-  Added a few new Icons (Linux, Windows, ESX, Log, Finance)
-  Improved options tab
-  Connections file version is now 1.2
-  Fixed some form drawing bugs
-
-V0.35:
-  Added tab switching/closing hotkeys
-    Switch to next tab: Ctrl+Tab
-    Switch to previous tab: Ctrl+Shift+Tab
-    Close active tab: Ctrl+W
-    This does not and will probably never work with RDP connections!
-  Fixed bug in updating code that still displayed the current version in the old format (x.x.x.x instead of x.xx)
-  Fixed bug where the colors setting was not correctly read after saving and reloading a connections file (only with 256 colors setting)
-  Fixed bug that made connect to console session and fullscreen options not work
-  Fixed bug that when opening options, update or about tab caused weird paddings next to the tab or other strange behaviour
-  Changed shortcuts to menu items in main menu as they interfered with some terminal key bindings
-
-V0.30:
-  Added HTTP as protocol to allow for basic web-based administration
-  Added new connections menu to the toolbar
-    Left click on a connection connects
-    Right click on a container or connection opens the config tab for the selected item
-  Added two new connection context menu entries for quickly connecting to console session or connecting in fullscreen
-  Improved tray icon menu (just like the main connections menu)
-  The connections tree can now be hidden
-    To hide it right click on the splitter (the divider between the connections tree and the tabbing interface)
-  Removed overlay (RDP locking) feature in favor of simply grabbing input when clicking inside the control area
-    I hope nobody is too sad that the nice looking overlay feature had to go, but..., well, it had to! ;-)
-  Changed "Redirect Key combinations (like in fullscreen)" to be disabled when in kiosk mode as it has no effect then anyway
-  Several small bugfixes and code improvements
-
-V0.20:
-  Added Drag and Drop support for tabs
-  Added tab context menu
-    Switch to/from fullscreen
-    Take a screenshot
-    Transfer files via SCP/SFTP (SSH)
-    Send special keys (VNC)
-    Rename tabs
-    Duplicate tabs (Create another instance of the connection)
-    Show config
-    Close tab (disconnect)
-  Removed Fullscreen and Send special keys buttons from the main toolbar as they are now in the tab context menu
-  Added middle click support for tabs (close/disconnect)
-  Added SSH file transfer (SCP/SFTP) support
-  Added Tools menu to the tree context menu
-    Transfer files via SCP/SFTP (SSH)
-    Import/Export features
-    Sorting
-  Changed version format
-  Fixed the problem that caused mRemote to crash when dragging a parent node of the connections tree onto one of it's child nodes
-  Fixed problem in importing mechanism that allowed importing connections including the root which resulted in multiple root items that couldn't be deleted
-  Fixed problem with quick connect
-
-V0.0.9.0:
-  Added support for redirecting key combinations (Alt+Tab, Winkey, ...)
-  Added Import/Export features
-  Added Quick Connect Port support, just type the host you want to connect to followed by a ":" and then the port
-  Added Connect/Disconnect buttons to connections context menu
-  Added two new icons (Test Server | TST; Build Server | BS)
-  Many changes to the connections loading/saving mechanisms
-  confCons version is now 1.0
-  Some code cleanup
-  Fixed auto session info to only try to get session information when a RDP connection is selected
-  Fixed AD Import feature (didn't care if imported items were computers, groups, users, ... ;)
-  Fixed settings and connections not saving when installing updates from the auto-updater
-  Fixed form size and location not saving properly when closing the application in minimized state or in maximized state on a secondary monitor
-
-V0.0.8.2:
-  Added SSH1 to Quick Connect GUI
-  Changed buffer size of terminal control, it's now 500 lines
-  Fixed terminal connections not getting focus when changing tabs
-  Fixed bug in terminal code that caused hitting "home" to show "~" instead of jumping to the start of the line
-  Fixed bug that caused that hitting enter in mRemote wouldn't do anything when options was opened before
-
-V0.0.8.0:
-  Added code to check if the msrdp com control is registered
-  Many Improvements to the terminal control (ssh1(!), ssh2, telnet)
-  Fixed bug that caused mRemote to crash when moving connection into root node (only with inheritance enabled)
-  Fixed bug: Pressing delete when editing a node's name caused delete messagebox to show
-
-V0.0.7.5:
-  Added inheritance feature to inherit connection settings from parent container
-  Expanded/Collapsed state of tree nodes will now be saved
-  Reduced auto session info delay to 700ms
-  Some code maintainance
-  Some corrections to connections tree and quick search behaviour
-  Fixed bug in TerminalControl that caused the error message "error loading string"
-  Fixed: Settings saving on exit was broken in V0.0.7.0, this is fixed now
-  Changed connections file version to 0.9
-  Fixed connections context menu bug that made import from ad option inaccessible
-  Fixed session info filling up with infos about hosts previously selected
-
-V0.0.7.0:
-  Massive GUI redesign and changes, hope you like it! =)
-  Fixed bug that made session info to query immediately after selecting a connection (when enabled), there is now a one second delay to prevent collecting session info for more than one host
-  
-V0.0.6.8:
-  Added connection import feature for Active Directory
-  Tidied up project references
-  Multiple changes to setup routine
-  Improved error handling for auto-update
-  Improved download handling for auto-update
-  Fixed bug that made download finished/failed message box appear multiple times when update was canceled and re-downloaded
-  Fixed bug where double-clicking a container opened all connections inside this container
-
-V0.0.6.6:
-  Changed port textbox control to only allow digits
-  Small changes to connection code for SSH
-  Fixed port setting not saving (or always displaying default port for selected protocol)
-
-V0.0.6.5:
-  Added auto update feature
-  Changed: Multiple UI Changes (added shortcuts, rearranged menu items, ...)
-  Fixed the problem where the connections file version was saved either with a dot or a comma, depending on system language
-  Fixed not being able to connect to SSH2 hosts without specifying username and password
-  Fixed several problems with Quick Connect
-  Improved saving of config changes
-  Fixed connections tab not closing when using SSH
-
-V0.0.6.0:
-  Added new protocols: SSH2 and Telnet
-  Added first command line switch/parameter "/consfile"
-    Ex.: mRemote.exe /consfile "%PathToYourConnectionsFile%"
-  Added button to screenshots to delete a screenshot
-  Added Host Status (Ping) feature
-  Many code rewrites and changes in almost every area
-  Changed the way connections get loaded
-    The default path for the connection file is no longer in the application directory but in the local application data folder. 
-    Ex.: c:\Documents and Settings\felix\Local Settings\Application Data\Felix_Deimel\mRemote\
-    If opening a connection file from a custom location (click on open link) saving will also occur in this file and not like in previous versions to the default connections file
-    To import your old connection file please use the following procedure: start mRemote, click on "Open" and find your old connection file. Then click on "Save As" and save it with the default file name to the default location
-  Changed the font and style of context menus
-  Changed Quick Connect UI
-  Fixed connection settings in config tab not saving when clicking another connection before jumping to another config field
-  Fixed a bug where renaming a container caused the first connection in the same container to be renamed too
-
-V0.0.5.0 R2:
-  Fixed a bug that prevented connections from opening when icon files were assigned in a previous version of mRemote
-
-V0.0.5.0:
-  Added (Global) fullscreen / kiosk feature
-  Added redirection settings for disk drives, printers, ports, smart cards and sound
-  Added option to write a log file
-  Added option to open new tabs on the right side of the currently selected tab
-  Added possibility to connect to all nodes in a container
-  Changed session functions to work in background
-  Changed icon choosing mechanism and added a bunch of default icons
-  Changed: Containers with connection can now be deleted just like empty containers
-  Changed screenshot functions to now collect all screenshots in one tab
-  Changed: More settings can now be changed on container basis
-  Changed config file version to 0.6
-  Changed: Small internal changes to the connection saving/creating and opening mechanisms
-  Fixed "Display Wallpapers" and "Display Themes" settings, they are working now
-
-V0.0.3.6:
-  Added Feature to display an overlay when RDP connection tab has lost the focus, clicking on this gives the focus back to the control
-  Added standard handlers for F2 (rename) and DEL (delete) keys in the treeview
-  Added icon preview for connections in config tab
-  Changed the way new connections and containers are being created in the treeview. The pop up window will not be displayed any longer, instead everything is handled inplace by the treeview.
-  Changed some minor UI related stuff
-  Fixed bug in tab closing mechanism that caused icons (play/pause) to not be set on the correct tree nodes
-
-V0.0.3.5:
-  Added Feature to query and log off sessions on a remote machine and option to do this automatically
-  Added Option to show icon in system tray with connection menu
-  Changed controls to flat style as I think this fits the whole application more than the old 3D look
-  Multiple UI changes to eliminate annoying behaviour
-
-V0.0.3.3:
-  Added Feature to specify which login information to use when no info is provided in the config of a remote machine
-  Fixed bug in Quick Find where trying to open a connection when no node was found caused an error
-  Fixed bug where the main form was not rendered correctly when hiding top bar and using XP Themes
-  Fixed bug in drag-drop routine that caused application to hang when trying to drop a node on one of it's child nodes
-  Fixed bug where taskbar buttons for fullscreen rdp windows did not disappear after disconnecting
-  
-V0.0.3.2:
-  Added new Save As Dialog with feature to only save specific connection settings
-  Added Option to display Tooltips when hovering over host entries in the connection tree
-  Added Option to ask at exit when there are open connections
-  Fixed bug where saving connections file with spaces in the root node caused an error -> updated Connection File Version to 0.5
-  Fixed bug in options tab where the browse button for a custom connection file didn't do anything
-
-V0.0.3.0:
-  Added Options Tab
-    Load connections file from different location
-    Save/Don’t Save connections file on exit
-    Show current tab name in window title
-  Added drag and drop functionality to the connections tree
-  Added feature to hide top bar
-  Added feature to send special keys (VNC)
-  Updated VncSharp Library to V0.88 (still pretty buggy)
-
-V0.0.2.7:
-  Added feature to save connection settings to all connections in the selected container
-  Icon choosing bug fixed
-  Taskbar button had no text when in fullscreen – fixed
-  Fixed bug in Quick Connect GUI
-  Disabled "Display Wallpaper" and "Display Themes" checkboxes as these features are not implemented
-
-V0.0.2.5:
-  Quick connect button bug fixed
-  Search field resize bug fixed
-  Splitter position is now saved on exit
-  Added new connections toolstrip (same functions as context menu)
-
-V0.0.2.4:
-  Changed default color depth to 16bit
-  Added Keep Alive Interval (1 Minute)
-  Added Options to choose between RDP & VNC
-  Added Port Setting for RDP
-  Added Option to connect to console
-  Added Menu Entries to move Connections & Containers up & down
-  Some small code improvements

mRemoteV1/Config/Config.Connections.Load.vb

@@ -536,6 +536,20 @@ Namespace Config
                             conI.Inherit.ExtApp = .Item("InheritExtApp")
                         End If
 
+                        If Me.confVersion >= 2.2 Then
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
+                            conI.RDGatewayHostname = .Item("RDGatewayHostname")
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials"))
+                            conI.RDGatewayUsername = .Item("RDGatewayUsername")
+                            conI.RDGatewayPassword = Security.Crypt.Decrypt(.Item("RDGatewayPassword"), pW)
+                            conI.RDGatewayDomain = .Item("RDGatewayDomain")
+                            conI.Inherit.RDGatewayUsageMethod = .Item("InheritRDGatewayUsageMethod")
+                            conI.Inherit.RDGatewayHostname = .Item("InheritRDGatewayHostname")
+                            conI.Inherit.RDGatewayUsername = .Item("InheritRDGatewayUsername")
+                            conI.Inherit.RDGatewayPassword = .Item("InheritRDGatewayPassword")
+                            conI.Inherit.RDGatewayDomain = .Item("InheritRDGatewayDomain")
+                        End If
+
                         If SQLUpdate = True Then
                             conI.PleaseConnect = .Item("Connected")
                         End If
@@ -973,6 +987,20 @@ Namespace Config
                             conI.ExtApp = .Attributes("ExtApp").Value
                             conI.Inherit.ExtApp = .Attributes("InheritExtApp").Value
                         End If
+
+                        If Me.confVersion > 2.1 Then '2.2
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value)
+                            conI.RDGatewayHostname = .Attributes("RDGatewayHostname").Value
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Attributes("RDGatewayUseConnectionCredentials").Value)
+                            conI.RDGatewayUsername = .Attributes("RDGatewayUsername").Value
+                            conI.RDGatewayPassword = Security.Crypt.Decrypt(.Attributes("RDGatewayPassword").Value, pW)
+                            conI.RDGatewayDomain = .Attributes("RDGatewayDomain").Value
+                            conI.Inherit.RDGatewayUsageMethod = .Attributes("InheritRDGatewayUsageMethod").Value
+                            conI.Inherit.RDGatewayHostname = .Attributes("InheritRDGatewayHostname").Value
+                            conI.Inherit.RDGatewayUsername = .Attributes("InheritRDGatewayUsername").Value
+                            conI.Inherit.RDGatewayPassword = .Attributes("InheritRDGatewayPassword").Value
+                            conI.Inherit.RDGatewayDomain = .Attributes("InheritRDGatewayDomain").Value
+                        End If
                     End With
 
                     Return conI

mRemoteV1/Config/Config.Connections.Save.vb

@@ -227,7 +227,9 @@ Namespace Config
                                                "RedirectPrinters, RedirectSmartCards, RedirectSound, RedirectKeys, " & _
                                                "Connected, PreExtApp, PostExtApp, MacAddress, UserField, ExtApp, VNCCompression, VNCEncoding, VNCAuthMode, " & _
                                                "VNCProxyType, VNCProxyIP, VNCProxyPort, VNCProxyUsername, VNCProxyPassword, " & _
-                                               "VNCColors, VNCSmartSizeMode, VNCViewOnly, InheritCacheBitmaps, InheritColors, " & _
+                                               "VNCColors, VNCSmartSizeMode, VNCViewOnly, " & _
+                                               "RDGatewayUsageMethod, RDGatewayHostname, RDGatewayUseConnectionCredentials, RDGatewayUsername, RDGatewayPassword, RDGatewayDomain, " & _
+                                               "InheritCacheBitmaps, InheritColors, " & _
                                                "InheritDescription, InheritDisplayThemes, InheritDisplayWallpaper, InheritDomain, " & _
                                                "InheritIcon, InheritPanel, InheritPassword, InheritPort, " & _
                                                "InheritProtocol, InheritPuttySession, InheritRedirectDiskDrives, " & _
@@ -238,6 +240,7 @@ Namespace Config
                                                "InheritVNCAuthMode, InheritVNCProxyType, InheritVNCProxyIP, InheritVNCProxyPort, " & _
                                                "InheritVNCProxyUsername, InheritVNCProxyPassword, InheritVNCColors, " & _
                                                "InheritVNCSmartSizeMode, InheritVNCViewOnly, " & _
+                                               "InheritRDGatewayUsageMethod, InheritRDGatewayHostname, InheritRDGatewayUseConnectionCredentials, InheritRDGatewayUsername, InheritRDGatewayPassword, InheritRDGatewayDomain, " & _
                                                "PositionID, ParentID, ConstantID, LastChange)" & _
                                                "VALUES (", sqlCon)
 
@@ -340,6 +343,28 @@ Namespace Config
                     sqlQuery.CommandText &= "'" & .VNCSmartSizeMode.ToString & "',"
                     sqlQuery.CommandText &= "'" & .VNCViewOnly & "',"
 
+                    sqlQuery.CommandText &= "'" & .RDGatewayUsageMethod.ToString & "',"
+                    sqlQuery.CommandText &= "'" & .RDGatewayHostname & "',"
+                    sqlQuery.CommandText &= "'" & .RDGatewayUseConnectionCredentials.ToString & "',"
+
+                    If Me._SaveSecurity.Username = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayUsername & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
+                    If Me._SaveSecurity.Password = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayPassword & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
+                    If Me._SaveSecurity.Domain = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayDomain & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
                     With .Inherit
                         If Me._SaveSecurity.Inheritance = True Then
                             sqlQuery.CommandText &= "'" & .CacheBitmaps & "',"
@@ -383,6 +408,13 @@ Namespace Config
                             sqlQuery.CommandText &= "'" & .VNCColors & "',"
                             sqlQuery.CommandText &= "'" & .VNCSmartSizeMode & "',"
                             sqlQuery.CommandText &= "'" & .VNCViewOnly & "',"
+
+                            sqlQuery.CommandText &= "'" & .RDGatewayUsageMethod & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayHostname & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayUseConnectionCredentials & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayUsername & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayPassword & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayDomain & "',"
                         Else
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
@@ -425,6 +457,13 @@ Namespace Config
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
+
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUsageMethod
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayHostname
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUseConnectionCredentials
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUsername
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayPassword
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayDomain
                         End If
                     End With
 
@@ -638,6 +677,29 @@ Namespace Config
                     xW.WriteAttributeString("VNCSmartSizeMode", "", curConI.VNCSmartSizeMode.ToString)
                     xW.WriteAttributeString("VNCViewOnly", "", curConI.VNCViewOnly)
 
+                    xW.WriteAttributeString("RDGatewayUsageMethod", "", curConI.RDGatewayUsageMethod.ToString)
+                    xW.WriteAttributeString("RDGatewayHostname", "", curConI.RDGatewayHostname)
+
+                    xW.WriteAttributeString("RDGatewayUseConnectionCredentials", "", curConI.RDGatewayUseConnectionCredentials.ToString)
+
+                    If Me._SaveSecurity.Username = True Then
+                        xW.WriteAttributeString("RDGatewayUsername", "", curConI.RDGatewayUsername)
+                    Else
+                        xW.WriteAttributeString("RDGatewayUsername", "", "")
+                    End If
+
+                    If Me._SaveSecurity.Password = True Then
+                        xW.WriteAttributeString("RDGatewayPassword", "", curConI.RDGatewayPassword)
+                    Else
+                        xW.WriteAttributeString("RDGatewayPassword", "", "")
+                    End If
+
+                    If Me._SaveSecurity.Domain = True Then
+                        xW.WriteAttributeString("RDGatewayDomain", "", curConI.RDGatewayDomain)
+                    Else
+                        xW.WriteAttributeString("RDGatewayDomain", "", "")
+                    End If
+
                     If Me._SaveSecurity.Inheritance = True Then
                         xW.WriteAttributeString("InheritCacheBitmaps", "", curConI.Inherit.CacheBitmaps)
                         xW.WriteAttributeString("InheritColors", "", curConI.Inherit.Colors)
@@ -679,6 +741,12 @@ Namespace Config
                         xW.WriteAttributeString("InheritVNCColors", "", curConI.Inherit.VNCColors)
                         xW.WriteAttributeString("InheritVNCSmartSizeMode", "", curConI.Inherit.VNCSmartSizeMode)
                         xW.WriteAttributeString("InheritVNCViewOnly", "", curConI.Inherit.VNCViewOnly)
+                        xW.WriteAttributeString("InheritRDGatewayUsageMethod", "", curConI.Inherit.RDGatewayUsageMethod)
+                        xW.WriteAttributeString("InheritRDGatewayHostname", "", curConI.Inherit.RDGatewayHostname)
+                        xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", curConI.Inherit.RDGatewayUseConnectionCredentials)
+                        xW.WriteAttributeString("InheritRDGatewayUsername", "", curConI.Inherit.RDGatewayUsername)
+                        xW.WriteAttributeString("InheritRDGatewayPassword", "", curConI.Inherit.RDGatewayPassword)
+                        xW.WriteAttributeString("InheritRDGatewayDomain", "", curConI.Inherit.RDGatewayDomain)
                     Else
                         xW.WriteAttributeString("InheritCacheBitmaps", "", False)
                         xW.WriteAttributeString("InheritColors", "", False)
@@ -720,6 +788,11 @@ Namespace Config
                         xW.WriteAttributeString("InheritVNCColors", "", False)
                         xW.WriteAttributeString("InheritVNCSmartSizeMode", "", False)
                         xW.WriteAttributeString("InheritVNCViewOnly", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayHostname", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayUsername", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayPassword", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayDomain", "", False)
                     End If
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveConnectionFields failed" & vbNewLine & ex.Message, True)
@@ -727,8 +800,9 @@ Namespace Config
             End Sub
 #End Region
 
-            Private csvWr As StreamWriter
 #Region "CSV"
+            Private csvWr As StreamWriter
+
             Private Sub SaveTomRCSV()
                 If App.Runtime.ConnectionsFileLoaded = False Then
                     Exit Sub
@@ -759,13 +833,12 @@ Namespace Config
                     csvLn += "Domain;"
                 End If
 
-                csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;"
+                csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
 
                 If SaveSecurity.Inheritance Then
-                    csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly"
+                    csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain"
                 End If
 
-
                 csvWr.WriteLine(csvLn)
 
                 SaveNodemRCSV(tNC)

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
@@ -152,16 +158,12 @@ Namespace Config
                             dc.Close()
                         Loop
 
-                        .pnlDock.SuspendLayout(True)
-
+                        Startup.CreatePanels()
                         If File.Exists(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName) And My.Settings.ResetPanels = False Then
-                            Startup.CreatePanels()
                             .pnlDock.LoadFromXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName, AddressOf GetContentFromPersistString)
                         Else
-                            Startup.CreatePanels(True)
+                            Startup.SetDefaultLayout()
                         End If
-
-                        .pnlDock.ResumeLayout(True, True)
                     End With
                 Catch ex As Exception
                     App.Runtime.log.Error("LoadPanelsFromXML failed" & vbNewLine & ex.Message)

mRemoteV1/Config/Config.Settings.Providers.vb

@@ -6,15 +6,13 @@ Namespace Config
     Namespace Settings
         Namespace Providers
             Public Class ChooseProvider
-                'Exchange to make portable/normal
+#If Not PORTABLE Then
                 Inherits LocalFileSettingsProvider
-                'Inherits PortableSettingsProvider
+#Else
+                Inherits PortableSettingsProvider
+#End If
             End Class
 
-
-
-
-
             Public Class PortableSettingsProvider
                 Inherits SettingsProvider
 
@@ -145,13 +143,17 @@ Namespace Config
                     End Try
 
                     'Check to see if the node exists, if so then set its new value
-                    If Not SettingNode Is Nothing Then
-                        SettingNode.InnerText = propVal.SerializedValue.ToString
+                    If SettingNode IsNot Nothing Then
+                        If propVal.SerializedValue IsNot Nothing Then
+                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                        End If
                     Else
                         If IsRoaming(propVal.Property) Then
                             'Store the value as an element of the Settings Root Node
                             SettingNode = SettingsXML.CreateElement(propVal.Name)
-                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                            If propVal.SerializedValue IsNot Nothing Then
+                                SettingNode.InnerText = propVal.SerializedValue.ToString
+                            End If
                             SettingsXML.SelectSingleNode(SETTINGSROOT).AppendChild(SettingNode)
                         Else
                             'Its machine specific, store as an element of the machine name node,
@@ -169,10 +171,14 @@ Namespace Config
                             End If
 
                             SettingNode = SettingsXML.CreateElement(propVal.Name)
-                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                            If propVal.SerializedValue IsNot Nothing Then
+                                SettingNode.InnerText = propVal.SerializedValue.ToString
+                            End If
                             MachineNode.AppendChild(SettingNode)
                         End If
                     End If
+
+
                 End Sub
 
                 Private Function IsRoaming(ByVal prop As SettingsProperty) As Boolean

mRemoteV1/Connection/Connection.Info.vb

@@ -1,9 +1,6 @@
 Imports System.Windows.Forms
-Imports System.Threading
 Imports System.ComponentModel
-Imports mRemote.Tools.Controls
 Imports mRemote.Tools.Misc.PropertyGridCategory
-Imports mRemote.Tools.Misc.PropertyGridValue
 Imports mRemote.App.Runtime
 
 Namespace Connection
@@ -414,9 +411,169 @@ Namespace Connection
             End Set
         End Property
 #End Region
-#Region "4 Appearance"
+#Region "4 RD Gateway"
+        Private _RDGatewayUsageMethod As mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDGatewayUsageMethod), My.Settings.ConDefaultRDGatewayUsageMethod)
+        <Category(Category4 & Language.Base.Category_RDGateway), _
+            Browsable(True), _
+            DisplayName(Language.Base.Props_RDGatewayUsageMethod), _
+            Description(Language.Base.Descr_RDGatewayUsageMethod), _
+            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
+        Public Property RDGatewayUsageMethod() As mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod
+            Get
+                If Me._Inherit.RDGatewayUsageMethod And Me._Parent IsNot Nothing Then
+                    Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
+
+                    If Me._IsContainer Then
+                        Dim curCont As Container.Info = Me._Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.RDGatewayUsageMethod
+                Else
+                    Return _RDGatewayUsageMethod
+                End If
+            End Get
+            Set(ByVal value As mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod)
+                _RDGatewayUsageMethod = value
+            End Set
+        End Property
+
+        Private _RDGatewayHostname As String
+        <Category(Category4 & Language.Base.Category_RDGateway), _
+            Browsable(True), _
+            DisplayName(Language.Base.Props_RDGatewayHostname), _
+            Description(Language.Base.Descr_RDGatewayHostname)> _
+        Public Property RDGatewayHostname() As String
+            Get
+                If Me._Inherit.RDGatewayHostname And Me._Parent IsNot Nothing Then
+                    Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
+
+                    If Me._IsContainer = True Then
+                        Dim curCont As Container.Info = Me._Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.RDGatewayHostname
+                Else
+                    Return Me._RDGatewayHostname
+                End If
+            End Get
+            Set(ByVal value As String)
+                Me._RDGatewayHostname = value
+            End Set
+        End Property
+
+        Private _RDGatewayUseConnectionCredentials As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), My.Settings.ConDefaultRDGatewayUseConnectionCredentials)
+        <Category(Category4 & Language.Base.Category_RDGateway), _
+            Browsable(True), _
+            DisplayName(Language.Base.Props_RDGatewayUseConnectionCredentials), _
+            Description(Language.Base.Descr_RDGatewayUseConnectionCredentials), _
+            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
+        Public Property RDGatewayUseConnectionCredentials() As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials
+            Get
+                If Me._Inherit.RDGatewayUseConnectionCredentials And Me._Parent IsNot Nothing Then
+                    Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
+
+                    If Me._IsContainer Then
+                        Dim curCont As Container.Info = Me._Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.RDGatewayUseConnectionCredentials
+                Else
+                    Return _RDGatewayUseConnectionCredentials
+                End If
+            End Get
+            Set(ByVal value As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials)
+                _RDGatewayUseConnectionCredentials = value
+            End Set
+        End Property
+
+        Private _RDGatewayUsername As String
+        <Category(Category4 & Language.Base.Category_RDGateway), _
+            Browsable(True), _
+            DisplayName(Language.Base.Props_RDGatewayUsername), _
+            Description(Language.Base.Descr_RDGatewayUsername)> _
+        Public Property RDGatewayUsername() As String
+            Get
+                If Me._Inherit.RDGatewayUsername And Me._Parent IsNot Nothing Then
+                    Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
+
+                    If Me._IsContainer = True Then
+                        Dim curCont As Container.Info = Me._Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.RDGatewayUsername
+                Else
+                    Return Me._RDGatewayUsername
+                End If
+            End Get
+            Set(ByVal value As String)
+                Me._RDGatewayUsername = value
+            End Set
+        End Property
+
+        Private _RDGatewayPassword As String
+        <Category(Category4 & Language.Base.Category_RDGateway), _
+            Browsable(True), _
+            DisplayName(Language.Base.Props_RDGatewayPassword), _
+            Description(Language.Base.Descr_RDGatewayPassword), _
+            PasswordPropertyText(True)> _
+        Public Property RDGatewayPassword() As String
+            Get
+                If Me._Inherit.RDGatewayPassword And Me._Parent IsNot Nothing Then
+                    Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
+
+                    If Me._IsContainer = True Then
+                        Dim curCont As Container.Info = Me._Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.RDGatewayPassword
+                Else
+                    Return Me._RDGatewayPassword
+                End If
+            End Get
+            Set(ByVal value As String)
+                Me._RDGatewayPassword = value
+            End Set
+        End Property
+
+        Private _RDGatewayDomain As String
+        <Category(Category4 & Language.Base.Category_RDGateway), _
+            Browsable(True), _
+            DisplayName(Language.Base.Props_RDGatewayDomain), _
+            Description(Language.Base.Descr_RDGatewayDomain)> _
+        Public Property RDGatewayDomain() As String
+            Get
+                If Me._Inherit.RDGatewayDomain And Me._Parent IsNot Nothing Then
+                    Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
+
+                    If Me._IsContainer = True Then
+                        Dim curCont As Container.Info = Me._Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.RDGatewayDomain
+                Else
+                    Return Me._RDGatewayDomain
+                End If
+            End Get
+            Set(ByVal value As String)
+                Me._RDGatewayDomain = value
+            End Set
+        End Property
+#End Region
+#Region "5 Appearance"
         Private _Resolution As Connection.Protocol.RDP.RDPResolutions = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPResolutions), My.Settings.ConDefaultResolution)
-        <Category(Category4 & Language.Base.Props_Appearance), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
             Browsable(True), _
             DisplayName(Language.Base.Props_Resolution), _
             Description(Language.Base.Descr_Resolution), _
@@ -443,7 +600,7 @@ Namespace Connection
         End Property
 
         Private _Colors As Connection.Protocol.RDP.RDPColors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPColors), My.Settings.ConDefaultColors)
-        <Category(Category4 & Language.Base.Props_Appearance), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
             Browsable(True), _
             DisplayName(Language.Base.Props_Colors), _
             Description(Language.Base.Descr_Colors), _
@@ -470,7 +627,7 @@ Namespace Connection
         End Property
 
         Private _CacheBitmaps As Boolean = My.Settings.ConDefaultCacheBitmaps
-        <Category(Category4 & Language.Base.Props_Appearance), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
             Browsable(True), _
             DisplayName(Language.Base.Props_CacheBitmaps), _
             Description(Language.Base.Descr_CacheBitmaps), _
@@ -497,7 +654,7 @@ Namespace Connection
         End Property
 
         Private _DisplayWallpaper As Boolean = My.Settings.ConDefaultDisplayWallpaper
-        <Category(Category4 & Language.Base.Props_Appearance), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
             Browsable(True), _
             DisplayName(Language.Base.Props_DisplayWallpaper), _
             Description(Language.Base.Descr_DisplayWallpaper), _
@@ -524,7 +681,7 @@ Namespace Connection
         End Property
 
         Private _DisplayThemes As Boolean = My.Settings.ConDefaultDisplayThemes
-        <Category(Category4 & Language.Base.Props_Appearance), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
             Browsable(True), _
             DisplayName(Language.Base.Props_DisplayThemes), _
             Description(Language.Base.Descr_DisplayThemes), _
@@ -550,9 +707,9 @@ Namespace Connection
             End Set
         End Property
 #End Region
-#Region "5 Redirect"
+#Region "6 Redirect"
         Private _RedirectKeys As Boolean = My.Settings.ConDefaultRedirectKeys
-        <Category(Category5 & Language.Base.Props_Redirect), _
+        <Category(Category6 & Language.Base.Props_Redirect), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedKeyCombinations), _
             Description(Language.Base.Descr_RedKeyCombinations), _
@@ -579,7 +736,7 @@ Namespace Connection
         End Property
 
         Private _RedirectDiskDrives As Boolean = My.Settings.ConDefaultRedirectDiskDrives
-        <Category(Category5 & Language.Base.Props_Redirect), _
+        <Category(Category6 & Language.Base.Props_Redirect), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedDiskDrives), _
             Description(Language.Base.Descr_RedDiskDrives), _
@@ -606,7 +763,7 @@ Namespace Connection
         End Property
 
         Private _RedirectPrinters As Boolean = My.Settings.ConDefaultRedirectPrinters
-        <Category(Category5 & Language.Base.Props_Redirect), _
+        <Category(Category6 & Language.Base.Props_Redirect), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedPrinters), _
             Description(Language.Base.Descr_RedPrinters), _
@@ -633,7 +790,7 @@ Namespace Connection
         End Property
 
         Private _RedirectPorts As Boolean = My.Settings.ConDefaultRedirectPorts
-        <Category(Category5 & Language.Base.Props_Redirect), _
+        <Category(Category6 & Language.Base.Props_Redirect), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedPorts), _
             Description(Language.Base.Descr_RedPorts), _
@@ -660,7 +817,7 @@ Namespace Connection
         End Property
 
         Private _RedirectSmartCards As Boolean = My.Settings.ConDefaultRedirectSmartCards
-        <Category(Category5 & Language.Base.Props_Redirect), _
+        <Category(Category6 & Language.Base.Props_Redirect), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedSmartCards), _
             Description(Language.Base.Descr_RedSmartCards), _
@@ -687,7 +844,7 @@ Namespace Connection
         End Property
 
         Private _RedirectSound As Connection.Protocol.RDP.RDPSounds = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPSounds), My.Settings.ConDefaultRedirectSound)
-        <Category(Category5 & Language.Base.Props_Redirect), _
+        <Category(Category6 & Language.Base.Props_Redirect), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedSounds), _
             Description(Language.Base.Descr_RedSound), _
@@ -713,9 +870,9 @@ Namespace Connection
             End Set
         End Property
 #End Region
-#Region "6 Misc"
+#Region "7 Misc"
         Private _PreExtApp As String = My.Settings.ConDefaultPreExtApp
-        <Category(Category6 & Language.Base.Props_Misc), _
+        <Category(Category7 & Language.Base.Props_Misc), _
             Browsable(True), _
             DisplayName(Language.Base.Props_PreExtApp), _
             Description(Language.Base.Descr_PreExtApp), _
@@ -742,7 +899,7 @@ Namespace Connection
         End Property
 
         Private _PostExtApp As String = My.Settings.ConDefaultPostExtApp
-        <Category(Category6 & Language.Base.Props_Misc), _
+        <Category(Category7 & Language.Base.Props_Misc), _
             Browsable(True), _
             DisplayName(Language.Base.Props_PostExtApp), _
             Description(Language.Base.Descr_PostExtApp), _
@@ -768,8 +925,8 @@ Namespace Connection
             End Set
         End Property
 
-        Private _MacAddress As String = My.Settings.conDefaultMacAddress
-        <Category(Category6 & Language.Base.Props_Misc), _
+        Private _MacAddress As String = My.Settings.ConDefaultMacAddress
+        <Category(Category7 & Language.Base.Props_Misc), _
             Browsable(True), _
             DisplayName(Language.Base.Props_MacAddress), _
             Description(Language.Base.Descr_MacAddress)> _
@@ -795,7 +952,7 @@ Namespace Connection
         End Property
 
         Private _UserField As String = My.Settings.ConDefaultUserField
-        <Category(Category6 & Language.Base.Props_Misc), _
+        <Category(Category7 & Language.Base.Props_Misc), _
             Browsable(True), _
             DisplayName(Language.Base.Props_UserField), _
             Description(Language.Base.Descr_UserField)> _
@@ -822,8 +979,8 @@ Namespace Connection
 #End Region
 #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), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
+           Browsable(False), _
            DisplayName(Language.Base.Props_Compression), _
            Description(Language.Base.Descr_Compression), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
@@ -849,8 +1006,8 @@ Namespace Connection
         End Property
 
         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), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
+           Browsable(False), _
            DisplayName(Language.Base.Props_Encoding), _
            Description(Language.Base.Descr_Encoding), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
@@ -878,7 +1035,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))> _
@@ -904,8 +1061,8 @@ Namespace Connection
         End Property
 
         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), _
+        <Category(Category7 & Language.Base.Props_Misc), _
+           Browsable(False), _
            DisplayName(Language.Base.Props_ProxyType), _
            Description(Language.Base.Descr_ProxyType), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
@@ -931,8 +1088,8 @@ Namespace Connection
         End Property
 
         Private _VNCProxyIP As String = My.Settings.ConDefaultVNCProxyIP
-        <Category(Category6 & Language.Base.Props_Misc), _
-            Browsable(True), _
+        <Category(Category7 & Language.Base.Props_Misc), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_ProxyIP), _
             Description(Language.Base.Descr_ProxyIP)> _
         Public Property VNCProxyIP() As String
@@ -957,8 +1114,8 @@ Namespace Connection
         End Property
 
         Private _VNCProxyPort As Integer = My.Settings.ConDefaultVNCProxyPort
-        <Category(Category6 & Language.Base.Props_Misc), _
-            Browsable(True), _
+        <Category(Category7 & Language.Base.Props_Misc), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_ProxyPort), _
             Description(Language.Base.Descr_ProxyPort)> _
         Public Property VNCProxyPort() As Integer
@@ -983,8 +1140,8 @@ Namespace Connection
         End Property
 
         Private _VNCProxyUsername As String = My.Settings.ConDefaultVNCProxyUsername
-        <Category(Category6 & Language.Base.Props_Misc), _
-            Browsable(True), _
+        <Category(Category7 & Language.Base.Props_Misc), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_ProxyUsername), _
             Description(Language.Base.Props_ProxyUsername)> _
         Public Property VNCProxyUsername() As String
@@ -1009,8 +1166,8 @@ Namespace Connection
         End Property
 
         Private _VNCProxyPassword As String = My.Settings.ConDefaultVNCProxyPassword
-        <Category(Category6 & Language.Base.Props_Misc), _
-            Browsable(True), _
+        <Category(Category7 & Language.Base.Props_Misc), _
+            Browsable(False), _
             DisplayName(Language.Base.Props_ProxyPassword), _
             Description(Language.Base.Descr_ProxyPassword), _
             PasswordPropertyText(True)> _
@@ -1036,8 +1193,8 @@ Namespace Connection
         End Property
 
         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), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
+           Browsable(False), _
            DisplayName(Language.Base.Props_Colors), _
            Description(Language.Base.Descr_Colors), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
@@ -1063,7 +1220,7 @@ Namespace Connection
         End Property
 
         Private _VNCSmartSizeMode As mRemote.Connection.Protocol.VNC.SmartSizeMode = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.SmartSizeMode), My.Settings.ConDefaultVNCSmartSizeMode)
-        <Category(Category4 & Language.Base.Props_Appearance), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
            Browsable(True), _
            DisplayName(Language.Base.Props_SmartSizeMode), _
            Description(Language.Base.Descr_SmartSizeMode), _
@@ -1090,7 +1247,7 @@ Namespace Connection
         End Property
 
         Private _VNCViewOnly As Boolean = My.Settings.ConDefaultVNCViewOnly
-        <Category(Category4 & Language.Base.Props_Appearance), _
+        <Category(Category5 & Language.Base.Props_Appearance), _
            Browsable(True), _
            DisplayName(Language.Base.Props_ViewOnly), _
            Description(Language.Base.Descr_ViewOnly), _
@@ -1118,8 +1275,6 @@ Namespace Connection
 #End Region
 
 
-
-
         Private _Inherit As Inheritance = New Inheritance(Me)
         <Category(""), _
             Browsable(False)> _
@@ -1614,9 +1769,94 @@ Namespace Connection
                 End Set
             End Property
 #End Region
-#Region "5 Appearance"
+#Region "5 RD Gateway"
+            Private _RDGatewayUsageMethod As Boolean = False
+            <Category(Category5 & Language.Base.Category_RDGateway), _
+                Browsable(True), _
+                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayUsageMethod), _
+                TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayUsageMethod() As Boolean
+                Get
+                    Return Me._RDGatewayUsageMethod
+                End Get
+                Set(ByVal value As Boolean)
+                    Me._RDGatewayUsageMethod = value
+                End Set
+            End Property
+
+            Private _RDGatewayHostname As Boolean = False
+            <Category(Category5 & Language.Base.Category_RDGateway), _
+                Browsable(True), _
+                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayHostname), _
+                TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayHostname() As Boolean
+                Get
+                    Return Me._RDGatewayHostname
+                End Get
+                Set(ByVal value As Boolean)
+                    Me._RDGatewayHostname = value
+                End Set
+            End Property
+
+            Private _RDGatewayUseConnectionCredentials As Boolean = False
+            <Category(Category5 & Language.Base.Category_RDGateway), _
+                Browsable(True), _
+                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayUseConnectionCredentials), _
+                TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayUseConnectionCredentials() As Boolean
+                Get
+                    Return Me._RDGatewayUseConnectionCredentials
+                End Get
+                Set(ByVal value As Boolean)
+                    Me._RDGatewayUseConnectionCredentials = value
+                End Set
+            End Property
+
+            Private _RDGatewayUsername As Boolean = False
+            <Category(Category5 & Language.Base.Category_RDGateway), _
+                Browsable(True), _
+                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayUsername), _
+                TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayUsername() As Boolean
+                Get
+                    Return Me._RDGatewayUsername
+                End Get
+                Set(ByVal value As Boolean)
+                    Me._RDGatewayUsername = value
+                End Set
+            End Property
+
+            Private _RDGatewayPassword As Boolean = False
+            <Category(Category5 & Language.Base.Category_RDGateway), _
+                Browsable(True), _
+                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayPassword), _
+                TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayPassword() As Boolean
+                Get
+                    Return Me._RDGatewayPassword
+                End Get
+                Set(ByVal value As Boolean)
+                    Me._RDGatewayPassword = value
+                End Set
+            End Property
+
+            Private _RDGatewayDomain As Boolean = False
+            <Category(Category5 & Language.Base.Category_RDGateway), _
+                Browsable(True), _
+                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayDomain), _
+                TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayDomain() As Boolean
+                Get
+                    Return Me._RDGatewayDomain
+                End Get
+                Set(ByVal value As Boolean)
+                    Me._RDGatewayDomain = value
+                End Set
+            End Property
+#End Region
+#Region "6 Appearance"
             Private _Resolution As Boolean = My.Settings.InhDefaultResolution
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Resolution), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1630,7 +1870,7 @@ Namespace Connection
             End Property
 
             Private _Colors As Boolean = My.Settings.InhDefaultColors
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Colors), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1644,7 +1884,7 @@ Namespace Connection
             End Property
 
             Private _CacheBitmaps As Boolean = My.Settings.InhDefaultCacheBitmaps
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_CacheBitmaps), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1658,7 +1898,7 @@ Namespace Connection
             End Property
 
             Private _DisplayWallpaper As Boolean = My.Settings.InhDefaultDisplayWallpaper
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_DisplayWallpaper), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1672,7 +1912,7 @@ Namespace Connection
             End Property
 
             Private _DisplayThemes As Boolean = My.Settings.InhDefaultDisplayThemes
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_DisplayThemes), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1687,7 +1927,7 @@ Namespace Connection
 #End Region
 #Region "6 Redirect"
             Private _RedirectKeys As Boolean = My.Settings.InhDefaultRedirectKeys
-            <Category(Category6 & Language.Base.Props_Redirect), _
+            <Category(Category7 & Language.Base.Props_Redirect), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedKeyCombinations), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1701,7 +1941,7 @@ Namespace Connection
             End Property
 
             Private _RedirectDiskDrives As Boolean = My.Settings.InhDefaultRedirectDiskDrives
-            <Category(Category6 & Language.Base.Props_Redirect), _
+            <Category(Category7 & Language.Base.Props_Redirect), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedDiskDrives), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1715,7 +1955,7 @@ Namespace Connection
             End Property
 
             Private _RedirectPrinters As Boolean = My.Settings.InhDefaultRedirectPrinters
-            <Category(Category6 & Language.Base.Props_Redirect), _
+            <Category(Category7 & Language.Base.Props_Redirect), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedPrinters), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1729,7 +1969,7 @@ Namespace Connection
             End Property
 
             Private _RedirectPorts As Boolean = My.Settings.InhDefaultRedirectPorts
-            <Category(Category6 & Language.Base.Props_Redirect), _
+            <Category(Category7 & Language.Base.Props_Redirect), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedPorts), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1743,7 +1983,7 @@ Namespace Connection
             End Property
 
             Private _RedirectSmartCards As Boolean = My.Settings.InhDefaultRedirectSmartCards
-            <Category(Category6 & Language.Base.Props_Redirect), _
+            <Category(Category7 & Language.Base.Props_Redirect), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedSmartCards), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1757,7 +1997,7 @@ Namespace Connection
             End Property
 
             Private _RedirectSound As Boolean = My.Settings.InhDefaultRedirectSound
-            <Category(Category6 & Language.Base.Props_Redirect), _
+            <Category(Category7 & Language.Base.Props_Redirect), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedSounds), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1772,7 +2012,7 @@ Namespace Connection
 #End Region
 #Region "7 Misc"
             Private _PreExtApp As Boolean = My.Settings.InhDefaultPreExtApp
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_PreExtApp), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1786,7 +2026,7 @@ Namespace Connection
             End Property
 
             Private _PostExtApp As Boolean = My.Settings.InhDefaultPostExtApp
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_PostExtApp), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1800,7 +2040,7 @@ Namespace Connection
             End Property
 
             Private _MacAddress As Boolean = My.Settings.InhDefaultMacAddress
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_MacAddress), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1814,7 +2054,7 @@ Namespace Connection
             End Property
 
             Private _UserField As Boolean = My.Settings.InhDefaultUserField
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_UserField), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1829,7 +2069,7 @@ Namespace Connection
 #End Region
 #Region "VNC"
             Private _VNCCompression As Boolean = My.Settings.InhDefaultVNCCompression
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Compression), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1843,7 +2083,7 @@ Namespace Connection
             End Property
 
             Private _VNCEncoding As Boolean = My.Settings.InhDefaultVNCEncoding
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Encoding), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1871,7 +2111,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyType As Boolean = My.Settings.InhDefaultVNCProxyType
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyType), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1885,7 +2125,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyIP As Boolean = My.Settings.InhDefaultVNCProxyIP
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyIP), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1899,7 +2139,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyPort As Boolean = My.Settings.InhDefaultVNCProxyPort
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyPort), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1913,7 +2153,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyUsername As Boolean = My.Settings.InhDefaultVNCProxyUsername
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyUsername), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1927,7 +2167,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyPassword As Boolean = My.Settings.InhDefaultVNCProxyPassword
-            <Category(Category7 & Language.Base.Props_Misc), _
+            <Category(Category8 & Language.Base.Props_Misc), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyPassword), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1941,7 +2181,7 @@ Namespace Connection
             End Property
 
             Private _VNCColors As Boolean = My.Settings.InhDefaultVNCColors
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Colors), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1955,7 +2195,7 @@ Namespace Connection
             End Property
 
             Private _VNCSmartSizeMode As Boolean = My.Settings.InhDefaultVNCSmartSizeMode
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_SmartSizeMode), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1969,7 +2209,7 @@ Namespace Connection
             End Property
 
             Private _VNCViewOnly As Boolean = My.Settings.InhDefaultVNCViewOnly
-            <Category(Category5 & Language.Base.Props_Appearance), _
+            <Category(Category6 & Language.Base.Props_Appearance), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ViewOnly), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1982,6 +2222,7 @@ Namespace Connection
                 End Set
             End Property
 #End Region
+
         End Class
 
         <Flags()> _

mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb

@@ -1,6 +1,5 @@
 Imports System.Windows.Forms
 Imports mRemote.App.Runtime
-Imports Skybound.Gecko
 Imports System.ComponentModel
 
 Namespace Connection
@@ -19,7 +18,6 @@ Namespace Connection
             Public Sub New(ByVal RenderingEngine As RenderingEngine)
                 Try
                     If RenderingEngine = RenderingEngine.Gecko Then
-                        'Skybound.Gecko.Xpcom.Initialize(My.Settings.XULRunnerPath)
                         Me.Control = New MiniGeckoBrowser.MiniGeckoBrowser
                         TryCast(Me.Control, MiniGeckoBrowser.MiniGeckoBrowser).XULrunnerPath = My.Settings.XULRunnerPath
                     Else
@@ -39,19 +37,29 @@ Namespace Connection
                 MyBase.SetProps()
 
                 Try
-                    wBrowser = Me.Control
+                    Dim objTabPage As Crownwood.Magic.Controls.TabPage = TryCast(Me.InterfaceControl.Parent, Crownwood.Magic.Controls.TabPage)
+                    Me.tabTitle = objTabPage.Title
+                Catch ex As Exception
+                    Me.tabTitle = ""
+                End Try
+
+                Try
+                    Me.wBrowser = Me.Control
 
                     If InterfaceControl.Info.RenderingEngine = RenderingEngine.Gecko Then
-                        'AddHandler TryCast(wBrowser, GeckoWebBrowser).CreateWindow, AddressOf gex_CreateWindow
-                        AddHandler TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser).TitleChanged, AddressOf wBrowser_DocumentTitleChanged
-                        AddHandler TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser).LastTabRemoved, AddressOf wBrowser_LastTabRemoved
-                        'wBrowser.Width = wBrowser.Width
-                    Else
-                        TryCast(wBrowser, WebBrowser).AllowWebBrowserDrop = False
-                        TryCast(wBrowser, WebBrowser).ScrollBarsEnabled = True
+                        Dim objMiniGeckoBrowser As MiniGeckoBrowser.MiniGeckoBrowser = TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser)
 
-                        AddHandler TryCast(wBrowser, WebBrowser).DocumentTitleChanged, AddressOf wBrowser_DocumentTitleChanged
-                        AddHandler TryCast(wBrowser, WebBrowser).NewWindow, AddressOf wBrowser_NewWindow
+                        AddHandler objMiniGeckoBrowser.TitleChanged, AddressOf wBrowser_DocumentTitleChanged
+                        AddHandler objMiniGeckoBrowser.LastTabRemoved, AddressOf wBrowser_LastTabRemoved
+                    Else
+                        Dim objWebBrowser As WebBrowser = TryCast(wBrowser, WebBrowser)
+                        Dim objAxWebBrowser As SHDocVw.WebBrowser = DirectCast(objWebBrowser.ActiveXInstance, SHDocVw.WebBrowser)
+
+                        objWebBrowser.AllowWebBrowserDrop = False
+                        objWebBrowser.ScrollBarsEnabled = True
+
+                        AddHandler objWebBrowser.DocumentTitleChanged, AddressOf wBrowser_DocumentTitleChanged
+                        AddHandler objAxWebBrowser.NewWindow3, AddressOf wBrowser_NewWindow3
                     End If
 
                     Return True
@@ -111,14 +119,15 @@ Namespace Connection
 
 #Region "Events"
             Private Sub gex_CreateWindow(ByVal sender As Object, ByVal e As Skybound.Gecko.GeckoCreateWindowEventArgs)
-                'Dim tP As TabPage = AddTab()
-                'e.WebBrowser = tP.Controls(0)
                 e.WebBrowser = Me.wBrowser
             End Sub
 
-            Private Sub wBrowser_NewWindow(ByVal sender As Object, ByVal e As CancelEventArgs)
-                e.Cancel = True
-                TryCast(wBrowser, WebBrowser).Navigate(TryCast(wBrowser, WebBrowser).StatusText)
+            Private Sub wBrowser_NewWindow3(ByRef ppDisp As Object, ByRef Cancel As Boolean, ByVal dwFlags As Long, ByVal bstrUrlContext As String, ByVal bstrUrl As String)
+                If (dwFlags And NWMF.NWMF_OVERRIDEKEY) Then
+                    Cancel = False
+                Else
+                    Cancel = True
+                End If
             End Sub
 
             Private Sub wBrowser_LastTabRemoved(ByVal sender As Object)
@@ -131,10 +140,6 @@ Namespace Connection
                     tabP = TryCast(InterfaceControl.Parent, Crownwood.Magic.Controls.TabPage)
 
                     If tabP IsNot Nothing Then
-                        If tabTitle = "" Then
-                            tabTitle = tabP.Title
-                        End If
-
                         Dim shortTitle As String = ""
 
                         If Me.InterfaceControl.Info.RenderingEngine = RenderingEngine.Gecko Then
@@ -151,7 +156,11 @@ Namespace Connection
                             End If
                         End If
 
-                        tabP.Title = tabTitle & " - " & shortTitle
+                        If Me.tabTitle <> "" Then
+                            tabP.Title = tabTitle & " - " & shortTitle
+                        Else
+                            tabP.Title = shortTitle
+                        End If
                     End If
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "wBrowser_DocumentTitleChanged (Connection.Protocol.HTTPBase) failed" & vbNewLine & ex.Message, True)
@@ -159,12 +168,31 @@ Namespace Connection
             End Sub
 #End Region
 
+#Region "Enums"
             Public Enum RenderingEngine
                 <Description("Internet Explorer")> _
                 IE = 1
                 <Description("Gecko (Firefox)")> _
                 Gecko = 2
             End Enum
+
+            Private Enum NWMF
+                NWMF_UNLOADING = &H1
+                NWMF_USERINITED = &H2
+                NWMF_FIRST = &H4
+                NWMF_OVERRIDEKEY = &H8
+                NWMF_SHOWHELP = &H10
+                NWMF_HTMLDIALOG = &H20
+                NWMF_FROMDIALOGCHILD = &H40
+                NWMF_USERREQUESTED = &H80
+                NWMF_USERALLOWED = &H100
+                NWMF_FORCEWINDOW = &H10000
+                NWMF_FORCETAB = &H20000
+                NWMF_SUGGESTWINDOW = &H40000
+                NWMF_SUGGESTTAB = &H80000
+                NWMF_INACTIVETAB = &H100000
+            End Enum
+#End Region
         End Class
     End Namespace
 End Namespace

mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb

@@ -9,9 +9,11 @@ Namespace Connection
         Public Class PuttyBase
             Inherits Connection.Protocol.Base
 
+#Region "Constants"
+            Private Const IDM_RECONF As Int32 = &H50 ' PuTTY Settings Menu ID
+#End Region
+
 #Region "Private Properties"
-            Private PuttyProcessStartInfo As New ProcessStartInfo()
-            Private Arguments As String
 #End Region
 
 #Region "Public Properties"
@@ -101,50 +103,52 @@ Namespace Connection
 
             Public Overrides Function Connect() As Boolean
                 Try
-                    PuttyProcessStartInfo.FileName = _PuttyPath
+                    PuttyProcess = New Process
 
-                    Select Case Me._PuttyProtocol
-                        Case Putty_Protocol.raw
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.rlogin
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.ssh
-                            Dim UserArg As String = ""
-                            Dim PassArg As String = ""
+                    With PuttyProcess.StartInfo
+                        .FileName = _PuttyPath
 
-                            If My.Settings.EmptyCredentials = "windows" Then
-                                UserArg = " -l """ & Environment.UserName & """"
-                            ElseIf My.Settings.EmptyCredentials = "custom" Then
-                                UserArg = " -l """ & My.Settings.DefaultUsername & """"
-                                PassArg = " -pw """ & Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) & """"
-                            End If
+                        Select Case Me._PuttyProtocol
+                            Case Putty_Protocol.raw
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.rlogin
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.ssh
+                                Dim UserArg As String = ""
+                                Dim PassArg As String = ""
 
-                            If Me.InterfaceControl.Info.Username <> "" Then
-                                UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
-                            End If
+                                If My.Settings.EmptyCredentials = "windows" Then
+                                    UserArg = " -l """ & Environment.UserName & """"
+                                ElseIf My.Settings.EmptyCredentials = "custom" Then
+                                    UserArg = " -l """ & My.Settings.DefaultUsername & """"
+                                    PassArg = " -pw """ & Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) & """"
+                                End If
 
-                            If Me.InterfaceControl.Info.Password <> "" Then
-                                PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
-                            End If
+                                If Me.InterfaceControl.Info.Username <> "" Then
+                                    UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
+                                End If
 
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -" & Me._PuttySSHVersion & UserArg & PassArg & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.telnet
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.serial
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                    End Select
+                                If Me.InterfaceControl.Info.Password <> "" Then
+                                    PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
+                                End If
 
-                    'REMOVE IN RELEASE!
-                    'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & Arguments, True)
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -" & Me._PuttySSHVersion & UserArg & PassArg & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.telnet
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.serial
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                        End Select
 
-                    PuttyProcessStartInfo.Arguments = Arguments
+                        'REMOVE IN RELEASE!
+                        'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & .Arguments, True)
+                    End With
 
-                    PuttyProcess = Process.Start(PuttyProcessStartInfo)
                     PuttyProcess.EnableRaisingEvents = True
-                    PuttyProcess.WaitForInputIdle()
-
                     AddHandler PuttyProcess.Exited, AddressOf ProcessExited
 
+                    PuttyProcess.Start()
+                    PuttyProcess.WaitForInputIdle()
+
                     Dim TryCount As Integer = 0
                     Do Until PuttyProcess.MainWindowHandle <> IntPtr.Zero And Me.InterfaceControl.Handle <> IntPtr.Zero And Me.PuttyProcess.MainWindowTitle <> "Default IME"
                         If TryCount >= My.Settings.MaxPuttyWaitTime * 2 Then
@@ -167,9 +171,8 @@ Namespace Connection
                     mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Title: " & PuttyProcess.MainWindowTitle, True)
                     mC.AddMessage(Messages.MessageClass.InformationMsg, "Panel Handle: " & Me.InterfaceControl.Parent.Handle.ToString, True)
 
-                    SetParent(Me.PuttyHandle, Me.InterfaceControl.Parent.Handle)
-                    SetWindowLong(Me.PuttyHandle, 0, WS_VISIBLE)
-                    ShowWindow(Me.PuttyHandle, SW_SHOWMAXIMIZED)
+                    SetParent(PuttyHandle, InterfaceControl.Parent.Handle)
+                    ShowWindow(PuttyHandle, SW_SHOWMAXIMIZED)
                     Resize()
 
                     MyBase.Connect()
@@ -180,10 +183,9 @@ Namespace Connection
                 End Try
             End Function
 
-
             Public Overrides Sub Focus()
                 Try
-                    SetForegroundWindow(PuttyHandle)
+                    'SetForegroundWindow(PuttyHandle)
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Focus (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
                 End Try
@@ -214,6 +216,15 @@ Namespace Connection
 
                 MyBase.Close()
             End Sub
+
+            Public Sub ShowSettingsDialog()
+                Try
+                    PostMessage(Me.PuttyHandle, WM_SYSCOMMAND, IDM_RECONF, 0)
+                    SetForegroundWindow(Me.PuttyHandle)
+                Catch ex As Exception
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ShowSettingsDialog failed (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                End Try
+            End Sub
 #End Region
 
 #Region "Public Shared Methods"

mRemoteV1/Connection/Connection.Protocol.RDP.vb

@@ -33,15 +33,14 @@ Namespace Connection
 #End Region
 
 #Region "Private Declarations"
-            Private rd As MSTSCLib.IMsRdpClient5
-            Private RDP As AxMsRdpClient5
+            Private RDP As AxMsRdpClient6NotSafeForScripting
             Private Info As Connection.Info
             Private RDPVersion As Version
 #End Region
 
 #Region "Public Methods"
             Public Sub New()
-                Me.Control = New AxMsRdpClient5
+                Me.Control = New AxMsRdpClient6NotSafeForScripting
             End Sub
 
             Public Overrides Function SetProps() As Boolean
@@ -80,6 +79,7 @@ Namespace Connection
                     RDP.AdvancedSettings2.keepAliveInterval = 60000 'in milliseconds (10.000 = 10 seconds)
                     RDP.AdvancedSettings5.AuthenticationLevel = 0
                     RDP.AdvancedSettings.EncryptionEnabled = 1
+                    RDP.AdvancedSettings7.EnableCredSspSupport = True
 
                     RDP.AdvancedSettings2.overallConnectionTimeout = 20
 
@@ -90,7 +90,7 @@ Namespace Connection
                     Me.SetRedirectKeys()
                     Me.SetRedirection()
                     Me.SetAuthenticationLevel()
-                    Me.SetTSGateway()
+                    Me.SetRDGateway()
 
                     RDP.ColorDepth = Int(Me.Info.Colors)
 
@@ -156,15 +156,29 @@ Namespace Connection
 #End Region
 
 #Region "Private Methods"
-            Private Sub SetTSGateway()
+            Private Sub SetRDGateway()
                 Try
-                    'If RDP.TransportSettings.GatewayIsSupported = 1 Then
-                    '    MsgBox("TS Gateway supported")
-                    'Else
-                    '    MsgBox("TS Gateway unsupported")
-                    'End If
+                    If RDP.TransportSettings.GatewayIsSupported = 1 Then
+                        mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is supported", True)
+                        If Me.Info.RDGatewayUsageMethod <> RDGatewayUsageMethod.Never Then
+                            RDP.TransportSettings2.GatewayProfileUsageMethod = 1
+                            RDP.TransportSettings.GatewayUsageMethod = Me.Info.RDGatewayUsageMethod
+                            RDP.TransportSettings.GatewayHostname = Me.Info.RDGatewayHostname
+                            If Me.Info.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.Yes Then
+                                RDP.TransportSettings.GatewayUsername = Me.Info.Username
+                                RDP.TransportSettings.GatewayPassword = Me.Info.Password
+                                RDP.TransportSettings.GatewayDomain = Me.Info.Domain
+                            Else
+                                RDP.TransportSettings.GatewayUsername = Me.Info.RDGatewayUsername
+                                RDP.TransportSettings.GatewayPassword = Me.Info.RDGatewayPassword
+                                RDP.TransportSettings.GatewayDomain = Me.Info.RDGatewayDomain
+                            End If
+                        End If
+                    Else
+                        mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is not supported", True)
+                    End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetTSGateway failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetRDGateway failed" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -353,7 +367,8 @@ Namespace Connection
             End Sub
 
             Private Sub RDPEvent_OnDisconnected(ByVal sender As Object, ByVal e As AxMSTSCLib.IMsTscAxEvents_OnDisconnectedEvent)
-                MyBase.Event_Disconnected(Me, e.discReason)
+                Dim Reason As String = RDP.GetErrorDescription(e.discReason, RDP.ExtendedDisconnectReason)
+                MyBase.Event_Disconnected(Me, e.discReason & vbCrLf & Reason)
 
                 If My.Settings.ReconnectOnDisconnect Then
                     ReconnectGroup = New ReconnectGroup
@@ -480,6 +495,22 @@ Namespace Connection
                 <Description(Language.Base.WarnIfAuthFails)> _
                 WarnOnFailedAuth = 2
             End Enum
+
+            Public Enum RDGatewayUsageMethod
+                <Description("Never")> _
+                Never = 0 ' TSC_PROXY_MODE_NONE_DIRECT
+                <Description("Always")> _
+                Always = 1 ' TSC_PROXY_MODE_DIRECT
+                <Description("Detect")> _
+                Detect = 2 ' TSC_PROXY_MODE_DETECT
+            End Enum
+
+            Public Enum RDGatewayUseConnectionCredentials
+                <Description("Use a different username and password")> _
+                No = 0
+                <Description("Use the same username and password")> _
+                Yes = 1
+            End Enum
 #End Region
 
 #Region "Resolution"
@@ -717,71 +748,27 @@ Namespace Connection
             End Class
 #End Region
 
-#Region "Disconnection Errors"
-            Public Class DisconnectionErrors
-                Public Shared Code(3080) As String
-
-                Public Shared Function GetError(ByVal id As Integer) As String
-                    Try
-                        Code(1) = "Local Disconnection (not an error)"
-                        Code(2) = "Remote Disconnection by user (not an error)"
-                        Code(3) = "Remote Disconnection by server (not an error)"
-                        Code(260) = "DNS Lookup Failed"
-                        Code(262) = "Out of memory condition"
-                        Code(264) = "Connection Timed Out"
-                        Code(516) = "WinSock socket connect failed"
-                        Code(518) = "Out of memory condition"
-                        Code(520) = "Host Not Found error (GetHostByName failed)."
-                        Code(772) = "WinSock send call failed"
-                        Code(774) = "Out of memory condition"
-                        Code(776) = "Invalid IP address specified"
-                        Code(1028) = "WinSock recv call failed"
-                        Code(1030) = "Invalid Security Data"
-                        Code(1032) = "Internal error (code 1032)"
-                        Code(1286) = "Invalid Encryption Method"
-                        Code(1288) = "DNS Lookup failed"
-                        Code(1540) = "GetHostByName call failed"
-                        Code(1542) = "Invalid server security data"
-                        Code(1544) = "Internal Error (timer error)"
-                        Code(1796) = "Timeout occurred"
-                        Code(1798) = "Failed to unpack server certificate"
-                        Code(2052) = "Bad IP address specified"
-                        Code(2054) = "Internal Security Error"
-                        Code(2308) = "Socket closed"
-                        Code(2310) = "Internal Security Error"
-                        Code(2566) = "Internal Security Error"
-                        Code(2822) = "Encryption error"
-                        Code(2824) = "Your session was taken by someone else"
-                        Code(3078) = "Decryption error"
-
-                        Return (Code(id))
-                    Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetError failed (DisconnectionErrors)" & vbNewLine & ex.Message, True)
-                    End Try
-
-                    Return ""
-                End Function
-            End Class
-
+#Region "Fatal Errors"
             Public Class FatalErrors
-                Public Shared Code(110) As String
+                Protected Shared _description() As String = { _
+                    0 = "An unknown error has occurred.", _
+                    1 = "Internal error code 1.", _
+                    2 = "An out-of-memory error has occurred.", _
+                    3 = "A window-creation error has occurred.", _
+                    4 = "Internal error code 2.", _
+                    5 = "Internal error code 3. This is not a valid state.", _
+                    6 = "Internal error code 4.", _
+                    7 = "An unrecoverable error has occurred during client connection.", _
+                    100 = "Winsock initialization error." _
+                }
 
                 Public Shared Function GetError(ByVal id As String) As String
                     Try
-                        Code(0) = "An unknown error has occurred"
-                        Code(1) = "Internal error code 1"
-                        Code(2) = "Out of memory error"
-                        Code(3) = "Window creation error"
-                        Code(4) = "Internal error code 2"
-                        Code(5) = "Internal error code 3 (Invalid state)"
-                        Code(100) = "Winsock initialization error"
-
-                        Return (Code(id))
+                        Return (_description(id))
                     Catch ex As Exception
                         mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetError failed (FatalErrors)" & vbNewLine & ex.Message, True)
+                        Return String.Format("An unknown fatal RDP error has occurred.  Error code {0}.", id)
                     End Try
-
-                    Return ""
                 End Function
             End Class
 #End Region

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/Easter/Easter.Snake.vb

@@ -1,601 +0,0 @@
-Imports System.Threading.Thread
-Imports System.IO
-
-Namespace Easter
-    Public Class Snake
-        Public Class Game
-            Private Shared _Mode As GameMode
-            Public Shared Property Mode() As GameMode
-                Get
-                    Return _Mode
-                End Get
-                Set(ByVal value As GameMode)
-                    Dim prevMode As GameMode = _Mode
-                    _Mode = value
-                    GameModeChanged(value, prevMode)
-                End Set
-            End Property
-
-            Public Shared Player As Snake
-            Public Shared Apple As Food
-            Public Shared HighScores() As String
-            Public Shared Difficulty As Integer = 3
-            Public Shared GridLength As Long
-            Public Shared GridHeight As Long
-            Public Shared TileWidth As Long
-            Public Shared TileHeight As Long
-            Public Shared WithEvents imgField As PictureBox
-
-            Public Shared Sub CreatePicBox(ByVal Parent As Control)
-                'setup the picture box
-                Game.imgField = New PictureBox
-                Game.imgField.Parent = Parent
-                Game.imgField.Size = New Size(100, 100)
-                Game.imgField.Location = New Point((Parent.Width / 2) - (imgField.Width / 2), (Parent.Height / 2) - (imgField.Height / 2))
-                Game.imgField.BackColor = Color.Black
-            End Sub
-
-            Public Shared Sub SetupGame()
-                'setup the gamefield
-                GridLength = 20
-                GridHeight = 20
-
-                'setup the tiles
-                TileWidth = 5
-                TileHeight = 5
-
-                'create the player (snake)
-                Player = New Snake
-                Player.CreateSnake(3, 7, 10, Direction.Up)
-
-                'place some food to begin with
-                Apple = Food.PlaceFood()
-            End Sub
-
-            Private Shared Sub GameModeChanged(ByVal NewMode As GameMode, ByVal PreviousMode As GameMode)
-                Select Case NewMode
-                    Case GameMode.Welcome
-                        SetupGame()
-                        RefreshGraphics()
-                    Case GameMode.Playing
-                        If PreviousMode = GameMode.Pause Or PreviousMode = GameMode.Welcome Then
-                            MainLoop()
-                        End If
-                    Case GameMode.Pause
-                        RefreshGraphics()
-                    Case GameMode.GameOver
-                        RefreshGraphics()
-                    Case GameMode.Highscore
-                        Highscore.CreateScoreFile()
-                        HighScores = Highscore.GetScores()
-                        Dim fsc() As String = Highscore.PutPlayerInHighScore(HighScores)
-                        HighScores = fsc
-                        RefreshGraphics()
-                End Select
-            End Sub
-
-            Public Shared Sub MainLoop()
-                Do While Mode = GameMode.Playing
-                    CheckEat()
-                    RefreshGraphics()
-                    CheckLoose()
-
-                    Select Case Game.Difficulty
-                        Case 1
-                            Sleep(200)
-                        Case 2
-                            Sleep(140)
-                        Case 3
-                            Sleep(80)
-                        Case 4
-                            Sleep(70)
-                        Case 5
-                            Sleep(60)
-                        Case 6
-                            Sleep(50)
-                    End Select
-
-                    Application.DoEvents()
-
-                    If Mode = GameMode.Playing Then
-                        Player.ChangeDirection()
-                        Player.Move()
-                    End If
-                Loop
-            End Sub
-
-            Public Shared Sub CheckEat()
-                If Player.Tiles(0).PosX = Apple.PosX And Player.Tiles(0).PosY = Apple.PosY Then
-                    Player.AddTile()
-                    Apple = Food.PlaceFood()
-
-                    Player.Score += Difficulty + 10
-                End If
-            End Sub
-
-            Public Shared Sub CheckLoose()
-                'check edges
-                If Player.Tiles(0).PosX > GridLength - 1 _
-                Or Player.Tiles(0).PosX < 0 _
-                Or Player.Tiles(0).PosY > GridHeight - 1 _
-                Or Player.Tiles(0).PosY < 0 Then
-                    Mode = GameMode.GameOver
-                End If
-
-                'check eat itself
-                For Each ti As Tile In Player.Tiles
-                    If ti.PosX = Player.Tiles(0).PosX And ti.PosY = Player.Tiles(0).PosY And ti IsNot Player.Tiles(0) Then
-                        Mode = GameMode.GameOver
-                    End If
-                Next
-            End Sub
-
-            Public Shared Sub CheckKeyPress(ByVal Key As KeyEventArgs)
-                Select Case Key.KeyCode
-                    Case Keys.Enter
-                        If Mode = GameMode.Welcome Then
-                            Mode = GameMode.Playing
-                        ElseIf Mode = GameMode.Playing Then
-                            Mode = GameMode.Pause
-                        ElseIf Mode = GameMode.Pause Then
-                            Mode = GameMode.Playing
-                        ElseIf Mode = GameMode.GameOver Then
-                            Mode = GameMode.Highscore
-                        ElseIf Mode = GameMode.Highscore Then
-                            Mode = GameMode.Welcome
-                        End If
-
-
-
-                    Case Keys.Escape
-                        Game.Quit()
-
-
-
-                    Case Keys.Up
-                        If Mode = GameMode.Welcome Then
-                            HigherDifficulty()
-                            RefreshGraphics()
-                        ElseIf Mode = GameMode.Playing Then
-                            Player.ChangeDirectionRequest(Direction.Up)
-                        End If
-                    Case Keys.Right
-                        If Mode = GameMode.Welcome Then
-                            HigherDifficulty()
-                            RefreshGraphics()
-                        ElseIf Mode = GameMode.Playing Then
-                            Player.ChangeDirectionRequest(Direction.Right)
-                        End If
-                    Case Keys.Down
-                        If Mode = GameMode.Welcome Then
-                            LowerDifficulty()
-                            RefreshGraphics()
-                        ElseIf Mode = GameMode.Playing Then
-                            Player.ChangeDirectionRequest(Direction.Down)
-                        End If
-                    Case Keys.Left
-                        If Mode = GameMode.Welcome Then
-                            LowerDifficulty()
-                            RefreshGraphics()
-                        ElseIf Mode = GameMode.Playing Then
-                            Player.ChangeDirectionRequest(Direction.Left)
-                        End If
-                End Select
-            End Sub
-
-            Public Shared Sub HigherDifficulty()
-                If Difficulty < 6 Then
-                    Difficulty += 1
-                End If
-            End Sub
-
-            Public Shared Sub LowerDifficulty()
-                If Difficulty > 1 Then
-                    Difficulty -= 1
-                End If
-            End Sub
-
-            Public Shared Sub RefreshGraphics()
-                imgField.Refresh()
-            End Sub
-
-            Public Shared Sub SetBackgroundImage(ByVal Image As Image)
-                imgField.Image = Image
-            End Sub
-
-            Public Shared Sub Quit()
-                Mode = GameMode.Pause
-                imgField.FindForm.Close()
-            End Sub
-
-
-            Public Class Highscore
-                Public Shared Function PutPlayerInHighScore(ByVal scores() As String) As Array
-                    Dim nSc(10) As String
-                    Dim newScore As Boolean = False
-
-                    For i As Integer = 0 To scores.Length - 1
-                        Dim numSc As Integer = scores(i).Substring(scores(i).IndexOf("=") + 1)
-                        If Player.Score > numSc Then
-                            newScore = True
-                            Player.Name = InputBox("Your name:", , Player.Name)
-
-                            For j As Integer = 0 To 4
-                                If j < i Then
-                                    nSc(j) = scores(j)
-                                ElseIf j = i Then
-                                    nSc(j) = Player.Name & "=" & Player.Score
-                                    nSc(j + 1) = scores(j)
-                                ElseIf j > i Then
-                                    nSc(j + 1) = scores(j)
-                                End If
-                            Next
-                            Exit For
-                        End If
-                    Next
-
-                    If newScore Then
-                        Array.Resize(nSc, 5)
-
-                        SaveScores(nSc)
-
-                        Return nSc
-                    Else
-                        Return scores
-                    End If
-                End Function
-
-                Public Shared Sub SaveScores(ByVal scores() As String)
-                    Dim tW As TextWriter = New StreamWriter(My.Application.Info.DirectoryPath & "\Scores.fx")
-                    Dim strSc As String = ""
-
-                    For Each sc As String In scores
-                        strSc &= sc & ";"
-                    Next
-
-                    tW.WriteLine(strSc)
-
-                    tW.Close()
-                End Sub
-
-                Public Shared Function GetScores() As Array
-                    Dim sc() As String
-
-                    Dim tR As TextReader = New StreamReader(My.Application.Info.DirectoryPath & "\Scores.fx")
-                    Dim strsc As String = tR.ReadLine
-                    tR.Close()
-
-                    sc = strsc.Split(";")
-
-                    Array.Resize(sc, 5)
-
-                    Return sc
-                End Function
-
-                Public Shared Sub CreateScoreFile()
-                    If File.Exists(My.Application.Info.DirectoryPath & "\Scores.fx") = False Then
-                        Dim tW As TextWriter = New StreamWriter(My.Application.Info.DirectoryPath & "\Scores.fx")
-                        tW.WriteLine("FX=0;FX=0;FX=0;FX=0;FX=0")
-                        tW.Close()
-                    End If
-                End Sub
-            End Class
-
-            Public Class Paint
-                Private Shared g As Graphics
-                Private Shared w As Long
-                Private Shared h As Long
-                Public Shared m As Decimal = 1.0
-
-                Private Shared SmallFont As New Font("Verdana", 7 * m)
-                Private Shared BigFont As New Font("Verdana", 8 * m, FontStyle.Bold)
-                Private Shared CenterAlign As New StringFormat()
-
-                Public Shared Sub Draw(ByVal graphics As Graphics, ByVal width As Long, ByVal height As Long)
-                    CenterAlign.LineAlignment = StringAlignment.Center
-                    CenterAlign.Alignment = StringAlignment.Center
-
-                    g = graphics
-                    w = width
-                    h = height
-
-                    Select Case Game.Mode
-                        Case GameMode.Welcome
-                            DrawWelcome()
-                        Case GameMode.Playing
-                            DrawPlaying()
-                        Case GameMode.Pause
-                            DrawPlaying()
-                            DrawPause()
-                        Case GameMode.GameOver
-                            DrawPlaying()
-                            DrawGameOver()
-                        Case GameMode.Highscore
-                            DrawHighscore()
-                    End Select
-
-                    g.DrawRectangle(Pens.White, New Rectangle(0, 0, w - 1, h - 1))
-                End Sub
-
-                Private Shared Sub DrawWelcome()
-                    g.DrawString("SnakeFX Lite", BigFont, Brushes.White, w / 2, (h / 2) - 10, CenterAlign)
-
-                    Dim stars As String = ""
-                    For i As Integer = 0 To Difficulty - 1
-                        stars &= Chr(149)
-                    Next
-
-                    g.DrawString("Difficulty: " & stars, SmallFont, Brushes.LightGray, w / 2, (h / 2) + 10, CenterAlign)
-                End Sub
-
-                Private Shared Sub DrawPlaying()
-                    g.DrawString("Score: " & Game.Player.Score, SmallFont, Brushes.DarkGray, 5 * m, 5 * m)
-
-                    g.FillRectangle(Brushes.DarkGoldenrod, New Rectangle(Game.Apple.PosX * TileWidth * m, _
-                                                                         Game.Apple.PosY * TileHeight * m, _
-                                                                         TileWidth * m, _
-                                                                         TileHeight * m))
-
-                    For Each ti As Tile In Game.Player.Tiles
-                        g.FillRectangle(Brushes.GreenYellow, New Rectangle(ti.PosX * TileWidth * m, _
-                                                                              ti.PosY * TileHeight * m, _
-                                                                              TileWidth * m, _
-                                                                              TileHeight * m))
-                    Next
-                End Sub
-
-                Private Shared Sub DrawPause()
-                    g.DrawString("Pause", BigFont, Brushes.White, w / 2, h / 2, CenterAlign)
-                End Sub
-
-                Private Shared Sub DrawGameOver()
-                    g.DrawString("Game Over", BigFont, Brushes.White, w / 2, h / 2, CenterAlign)
-
-                    g.DrawString("Score: " & Game.Player.Score, SmallFont, Brushes.DarkGray, 5 * m, 5 * m)
-                End Sub
-
-                Private Shared Sub DrawHighscore()
-                    g.DrawString("High Score", BigFont, Brushes.White, w / 2, 25, CenterAlign)
-
-                    For i As Integer = 0 To Game.HighScores.Length - 1
-                        g.DrawString(Game.HighScores(i).Replace("=", ": "), SmallFont, Brushes.LightGray, w / 2, (10 * i + 40) * m, CenterAlign)
-                    Next
-                End Sub
-            End Class
-
-
-            Public Enum GameMode
-                Welcome = 1
-                Playing = 2
-                Pause = 3
-                GameOver = 4
-                Highscore = 5
-            End Enum
-
-            Private Shared Sub imgField_Paint(ByVal sender As Object, ByVal e As System.Windows.Forms.PaintEventArgs) Handles imgField.Paint
-                Game.Paint.Draw(e.Graphics, imgField.Width, imgField.Height)
-            End Sub
-        End Class
-
-        Public Class Snake
-            Public Tiles(-1) As Tile
-            Public Score As Long = 0
-            Public Name As String = ""
-
-            Public Sub CreateSnake(ByVal Length As Long, ByVal PosX As Integer, ByVal PosY As Integer, ByVal Direction As Direction)
-                Dim headTile As New Tile(PosX, PosY, Direction)
-
-                Array.Resize(Tiles, Tiles.Length + 1)
-                Tiles(Tiles.Length - 1) = headTile
-
-                For i As Integer = 0 To Length - 2
-                    AddTile()
-                Next
-            End Sub
-
-            Public Sub DestroySnake()
-                Tiles = Nothing
-            End Sub
-
-            Public Sub AddTile()
-                Dim nTi As New Tile
-
-                nTi.Direction = Tiles(Tiles.Length - 1).Direction
-
-                Select Case Tiles(Tiles.Length - 1).Direction
-                    Case Direction.Up
-                        nTi.PosX = Tiles(Tiles.Length - 1).PosX
-                        nTi.PosY = Tiles(Tiles.Length - 1).PosY + 1
-                    Case Direction.Right
-                        nTi.PosX = Tiles(Tiles.Length - 1).PosX - 1
-                        nTi.PosY = Tiles(Tiles.Length - 1).PosY
-                    Case Direction.Down
-                        nTi.PosX = Tiles(Tiles.Length - 1).PosX
-                        nTi.PosY = Tiles(Tiles.Length - 1).PosY - 1
-                    Case Direction.Left
-                        nTi.PosX = Tiles(Tiles.Length - 1).PosX + 1
-                        nTi.PosY = Tiles(Tiles.Length - 1).PosY
-                End Select
-
-                Array.Resize(Tiles, Tiles.Length + 1)
-
-                Tiles(Tiles.Length - 1) = nTi
-            End Sub
-
-            Private DirectionRequest As Direction
-            Public Sub ChangeDirectionRequest(ByVal Direction As Direction)
-                DirectionRequest = Direction
-            End Sub
-
-            Public Sub ChangeDirection()
-                Dim direction As Direction = DirectionRequest
-
-                Dim ok As Boolean = True
-
-                Select Case Tiles(0).Direction
-                    Case Easter.Snake.Direction.Up
-                        If direction = Easter.Snake.Direction.Down Then
-                            ok = False
-                        End If
-                    Case Easter.Snake.Direction.Right
-                        If direction = Easter.Snake.Direction.Left Then
-                            ok = False
-                        End If
-                    Case Easter.Snake.Direction.Down
-                        If direction = Easter.Snake.Direction.Up Then
-                            ok = False
-                        End If
-                    Case Easter.Snake.Direction.Left
-                        If direction = Easter.Snake.Direction.Right Then
-                            ok = False
-                        End If
-                End Select
-
-                If ok Then
-                    If direction <> 0 Then
-                        Me.Tiles(0).Direction = direction
-                    End If
-                End If
-
-                DirectionRequest = 0
-            End Sub
-
-            Public Sub Move()
-                For i As Integer = Tiles.Length - 1 To 1 Step -1
-                    Tiles(i).PosX = Tiles(i - 1).PosX
-                    Tiles(i).PosY = Tiles(i - 1).PosY
-                    Tiles(i).Direction = Tiles(i - 1).Direction
-                Next
-
-                Select Case Tiles(0).Direction
-                    Case Direction.Up
-                        Tiles(0).PosY -= 1
-                    Case Direction.Right
-                        Tiles(0).PosX += 1
-                    Case Direction.Down
-                        Tiles(0).PosY += 1
-                    Case Direction.Left
-                        Tiles(0).PosX -= 1
-                End Select
-            End Sub
-        End Class
-
-        Public Enum Direction
-            Up = 1
-            Right = 2
-            Down = 3
-            Left = 4
-        End Enum
-
-        Public Class Tile
-            Public Sub New(Optional ByVal posx As Integer = 0, Optional ByVal posy As Integer = 0, Optional ByVal direction As Direction = Easter.Snake.Direction.Up)
-                _PosX = posx
-                _PosY = posy
-                _Direction = direction
-            End Sub
-
-            Private _PosX As Integer
-            Public Property PosX() As Integer
-                Get
-                    Return _PosX
-                End Get
-                Set(ByVal value As Integer)
-                    _PosX = value
-                End Set
-            End Property
-
-            Private _PosY As Integer
-            Public Property PosY() As Integer
-                Get
-                    Return _PosY
-                End Get
-                Set(ByVal value As Integer)
-                    _PosY = value
-                End Set
-            End Property
-
-            Private _Direction As Direction
-            Public Property Direction() As Direction
-                Get
-                    Return _Direction
-                End Get
-                Set(ByVal value As Direction)
-                    _Direction = value
-                End Set
-            End Property
-        End Class
-
-        Public Class Food
-            Public Sub New(ByVal posx As Integer, ByVal posy As Integer)
-                _PosX = posx
-                _PosY = posy
-            End Sub
-
-            Private _PosX As Integer
-            Public Property PosX() As Integer
-                Get
-                    Return _PosX
-                End Get
-                Set(ByVal value As Integer)
-                    _PosX = value
-                End Set
-            End Property
-
-            Private _PosY As Integer
-            Public Property PosY() As Integer
-                Get
-                    Return _PosY
-                End Get
-                Set(ByVal value As Integer)
-                    _PosY = value
-                End Set
-            End Property
-
-
-            Public Shared Function PlaceFood() As Food
-                Dim ok As Boolean = False
-
-                Dim PosX As Integer
-                Dim PosY As Integer
-
-                Do Until ok
-                    PosX = Tools.RandomNumber(Game.GridLength, 0)
-                    PosY = Tools.RandomNumber(Game.GridHeight, 0, Now.Millisecond + Now.Second)
-
-                    Dim problem As Boolean = False
-
-                    For Each ti As Tile In Game.Player.Tiles
-                        If ti.PosX = PosX And ti.PosY = PosY Then
-                            problem = True
-                        End If
-                    Next
-
-                    If problem = False Then
-                        ok = True
-                    End If
-                Loop
-
-                Return New Food(PosX, PosY)
-            End Function
-        End Class
-
-        Public Class Tools
-            Public Shared Function RandomNumber(ByVal MaxNumber As Integer, Optional ByVal MinNumber As Integer = 0, Optional ByVal Seed As Long = 0) As Integer
-                Dim r As New Random
-
-                If Seed <> 0 Then
-                    r = New Random(Seed)
-                End If
-
-                If MinNumber > MaxNumber Then
-                    Dim t As Integer = MinNumber
-                    MinNumber = MaxNumber
-                    MaxNumber = t
-                End If
-
-                Return r.Next(MinNumber, MaxNumber)
-            End Function
-        End Class
-    End Class
-End Namespace
-

mRemoteV1/Forms/Backup/frmChoosePanel.Designer.vb

@@ -1,112 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmChoosePanel
-    Inherits System.Windows.Forms.Form
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.cbPanels = New System.Windows.Forms.ComboBox
-        Me.btnOK = New System.Windows.Forms.Button
-        Me.lblDescription = New System.Windows.Forms.Label
-        Me.btnNew = New System.Windows.Forms.Button
-        Me.btnCancel = New System.Windows.Forms.Button
-        Me.SuspendLayout()
-        '
-        'cbPanels
-        '
-        Me.cbPanels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cbPanels.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.cbPanels.FormattingEnabled = True
-        Me.cbPanels.Location = New System.Drawing.Point(79, 45)
-        Me.cbPanels.Name = "cbPanels"
-        Me.cbPanels.Size = New System.Drawing.Size(157, 21)
-        Me.cbPanels.TabIndex = 10
-        '
-        'btnOK
-        '
-        Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnOK.Location = New System.Drawing.Point(167, 74)
-        Me.btnOK.Name = "btnOK"
-        Me.btnOK.Size = New System.Drawing.Size(69, 23)
-        Me.btnOK.TabIndex = 20
-        Me.btnOK.Text = Language.Base.Button_OK
-        Me.btnOK.UseVisualStyleBackColor = True
-        '
-        'lblDescription
-        '
-        Me.lblDescription.Location = New System.Drawing.Point(7, 8)
-        Me.lblDescription.Name = "lblDescription"
-        Me.lblDescription.Size = New System.Drawing.Size(229, 29)
-        Me.lblDescription.TabIndex = 0
-        Me.lblDescription.Text = Language.Base.SelectAPanel
-        '
-        'btnNew
-        '
-        Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnNew.Image = Global.mRemote.My.Resources.Resources.Panel_Add
-        Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnNew.Location = New System.Drawing.Point(10, 44)
-        Me.btnNew.Name = "btnNew"
-        Me.btnNew.Size = New System.Drawing.Size(57, 23)
-        Me.btnNew.TabIndex = 40
-        Me.btnNew.Text = Language.Base.Button_New
-        Me.btnNew.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnNew.UseVisualStyleBackColor = True
-        '
-        'btnCancel
-        '
-        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnCancel.Location = New System.Drawing.Point(92, 74)
-        Me.btnCancel.Name = "btnCancel"
-        Me.btnCancel.Size = New System.Drawing.Size(69, 23)
-        Me.btnCancel.TabIndex = 30
-        Me.btnCancel.Text = Language.Base.Button_Cancel
-        Me.btnCancel.UseVisualStyleBackColor = True
-        '
-        'frmChoosePanel
-        '
-        Me.AcceptButton = Me.btnOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.btnCancel
-        Me.ClientSize = New System.Drawing.Size(245, 107)
-        Me.Controls.Add(Me.lblDescription)
-        Me.Controls.Add(Me.btnNew)
-        Me.Controls.Add(Me.btnCancel)
-        Me.Controls.Add(Me.btnOK)
-        Me.Controls.Add(Me.cbPanels)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "frmChoosePanel"
-        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = Language.Base.SelectPanel
-        Me.Icon = Global.mRemote.My.Resources.Panels_Icon
-        Me.ResumeLayout(False)
-
-    End Sub
-    Friend WithEvents cbPanels As System.Windows.Forms.ComboBox
-    Friend WithEvents btnOK As System.Windows.Forms.Button
-    Friend WithEvents lblDescription As System.Windows.Forms.Label
-    Friend WithEvents btnNew As System.Windows.Forms.Button
-    Friend WithEvents btnCancel As System.Windows.Forms.Button
-End Class

mRemoteV1/Forms/Backup/frmChoosePanel.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

mRemoteV1/Forms/Backup/frmChoosePanel.vb

@@ -1,52 +0,0 @@
-Imports mRemote.App.Runtime
-
-Public Class frmChoosePanel
-    Public Property Panel() As String
-        Get
-            Return cbPanels.SelectedItem.ToString
-        End Get
-        Set(ByVal value As String)
-            cbPanels.SelectedItem = value
-        End Set
-    End Property
-
-    Private Sub frmChoosePanel_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
-        AddAvailablePanels()
-    End Sub
-
-    Private Sub AddAvailablePanels()
-        cbPanels.Items.Clear()
-
-        For i As Integer = 0 To wL.Count - 1
-            cbPanels.Items.Add(wL(i).Text.Replace("&&", "&"))
-        Next
-
-        If cbPanels.Items.Count > 0 Then
-            cbPanels.SelectedItem = cbPanels.Items(0)
-            cbPanels.Enabled = True
-            btnOK.Enabled = True
-        Else
-            cbPanels.Enabled = False
-            btnOK.Enabled = False
-        End If
-    End Sub
-
-    Private Sub btnNew_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnNew.Click
-        Dim pnlName As String = InputBox("Panel name:", "New Panel", "New Panel")
-
-        If pnlName <> "" Then
-            AddPanel(pnlName)
-            AddAvailablePanels()
-            cbPanels.SelectedItem = pnlName
-            cbPanels.Focus()
-        End If
-    End Sub
-
-    Private Sub btnOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOK.Click
-        Me.DialogResult = System.Windows.Forms.DialogResult.OK
-    End Sub
-
-    Private Sub btnCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnCancel.Click
-        Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
-    End Sub
-End Class

mRemoteV1/Forms/Backup/frmMain.Designer.vb

@@ -1,611 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmMain
-    Inherits System.Windows.Forms.Form
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
-        Me.pnlDock = New WeifenLuo.WinFormsUI.Docking.DockPanel
-        Me.msMain = New System.Windows.Forms.MenuStrip
-        Me.mMenFile = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileNew = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileLoad = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenFileSave = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSaveAs = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSep2 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenFileExit = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenView = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewAddConnectionPanel = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewConnectionPanels = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenViewConnections = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewConfig = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSessions = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewErrorsAndInfos = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewScreenshotManager = New System.Windows.Forms.ToolStripMenuItem
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenViewJumpTo = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewJumpToConnectionsConfig = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewJumpToSessionsScreenshots = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewJumpToErrorsInfos = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSep2 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenViewQuickConnectToolbar = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewExtAppsToolbar = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSep3 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenViewFullscreen = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenTools = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsSSHTransfer = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsExternalApps = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsPortScan = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsUltraVNCSC = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenToolsUpdate = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsOptions = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfo = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoHelp = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoBugReport = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenInfoDonate = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoWebsite = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoAbout = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenSep3 = New System.Windows.Forms.ToolStripSeparator
-        Me.lblQuickConnect = New System.Windows.Forms.ToolStripLabel
-        Me.cmbQuickConnect = New System.Windows.Forms.ToolStripComboBox
-        Me.tsContainer = New System.Windows.Forms.ToolStripContainer
-        Me.tsQuickConnect = New System.Windows.Forms.ToolStrip
-        Me.btnQuickyPlay = New System.Windows.Forms.ToolStripSplitButton
-        Me.mMenQuickyCon = New System.Windows.Forms.ToolStripMenuItem
-        Me.tsExtAppsToolbar = New System.Windows.Forms.ToolStrip
-        Me.cMenExtAppsToolbar = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        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.msMain.SuspendLayout()
-        Me.tsContainer.ContentPanel.SuspendLayout()
-        Me.tsContainer.TopToolStripPanel.SuspendLayout()
-        Me.tsContainer.SuspendLayout()
-        Me.tsQuickConnect.SuspendLayout()
-        Me.cMenExtAppsToolbar.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'pnlDock
-        '
-        Me.pnlDock.ActiveAutoHideContent = Nothing
-        Me.pnlDock.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlDock.DockLeftPortion = 230
-        Me.pnlDock.DockRightPortion = 230
-        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.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.Location = New System.Drawing.Point(3, 0)
-        Me.msMain.Name = "msMain"
-        Me.msMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.msMain.Size = New System.Drawing.Size(231, 24)
-        Me.msMain.Stretch = False
-        Me.msMain.TabIndex = 16
-        Me.msMain.Text = "Main Toolbar"
-        '
-        'mMenFile
-        '
-        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.Image = CType(resources.GetObject("mMenFile.Image"), System.Drawing.Image)
-        Me.mMenFile.Name = "mMenFile"
-        Me.mMenFile.Size = New System.Drawing.Size(51, 20)
-        Me.mMenFile.Text = "&File"
-        '
-        'mMenFileNew
-        '
-        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(241, 22)
-        Me.mMenFileNew.Text = "New Connections"
-        '
-        'mMenFileLoad
-        '
-        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(241, 22)
-        Me.mMenFileLoad.Text = "Open Connections"
-        '
-        'mMenFileSep1
-        '
-        Me.mMenFileSep1.Name = "mMenFileSep1"
-        Me.mMenFileSep1.Size = New System.Drawing.Size(238, 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(241, 22)
-        Me.mMenFileSave.Text = "Save Connections"
-        '
-        'mMenFileSaveAs
-        '
-        Me.mMenFileSaveAs.Image = Global.mRemote.My.Resources.Resources.Connections_SaveAs
-        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(241, 22)
-        Me.mMenFileSaveAs.Text = "Save Connections As"
-        '
-        'mMenFileSep2
-        '
-        Me.mMenFileSep2.Name = "mMenFileSep2"
-        Me.mMenFileSep2.Size = New System.Drawing.Size(238, 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(241, 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.Image = CType(resources.GetObject("mMenView.Image"), System.Drawing.Image)
-        Me.mMenView.Name = "mMenView"
-        Me.mMenView.Size = New System.Drawing.Size(58, 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(214, 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(214, 22)
-        Me.mMenViewConnectionPanels.Text = "Connection Panels"
-        '
-        'mMenViewSep1
-        '
-        Me.mMenViewSep1.Name = "mMenViewSep1"
-        Me.mMenViewSep1.Size = New System.Drawing.Size(211, 6)
-        '
-        'mMenViewConnections
-        '
-        Me.mMenViewConnections.Checked = True
-        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(214, 22)
-        Me.mMenViewConnections.Text = "Connections"
-        '
-        'mMenViewConfig
-        '
-        Me.mMenViewConfig.Checked = True
-        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(214, 22)
-        Me.mMenViewConfig.Text = "Config"
-        '
-        'mMenViewSessions
-        '
-        Me.mMenViewSessions.Checked = True
-        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(214, 22)
-        Me.mMenViewSessions.Text = "Sessions"
-        '
-        'mMenViewErrorsAndInfos
-        '
-        Me.mMenViewErrorsAndInfos.Checked = True
-        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(214, 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(214, 22)
-        Me.mMenViewScreenshotManager.Text = "Screenshot Manager"
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(211, 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(214, 22)
-        Me.mMenViewJumpTo.Text = "Jump To"
-        '
-        'mMenViewJumpToConnectionsConfig
-        '
-        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(243, 22)
-        Me.mMenViewJumpToConnectionsConfig.Text = "Connections && Config"
-        '
-        'mMenViewJumpToSessionsScreenshots
-        '
-        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(243, 22)
-        Me.mMenViewJumpToSessionsScreenshots.Text = "Sessions && Screenshots"
-        '
-        'mMenViewJumpToErrorsInfos
-        '
-        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(243, 22)
-        Me.mMenViewJumpToErrorsInfos.Text = "Errors && Infos"
-        '
-        'mMenViewSep2
-        '
-        Me.mMenViewSep2.Name = "mMenViewSep2"
-        Me.mMenViewSep2.Size = New System.Drawing.Size(211, 6)
-        '
-        'mMenViewQuickConnectToolbar
-        '
-        Me.mMenViewQuickConnectToolbar.Image = Global.mRemote.My.Resources.Resources.Play_Quick
-        Me.mMenViewQuickConnectToolbar.Name = "mMenViewQuickConnectToolbar"
-        Me.mMenViewQuickConnectToolbar.Size = New System.Drawing.Size(214, 22)
-        Me.mMenViewQuickConnectToolbar.Text = "Quicky Toolbar"
-        '
-        'mMenViewExtAppsToolbar
-        '
-        Me.mMenViewExtAppsToolbar.Image = CType(resources.GetObject("mMenViewExtAppsToolbar.Image"), System.Drawing.Image)
-        Me.mMenViewExtAppsToolbar.Name = "mMenViewExtAppsToolbar"
-        Me.mMenViewExtAppsToolbar.Size = New System.Drawing.Size(214, 22)
-        Me.mMenViewExtAppsToolbar.Text = "External Applications Toolbar"
-        '
-        'mMenViewSep3
-        '
-        Me.mMenViewSep3.Name = "mMenViewSep3"
-        Me.mMenViewSep3.Size = New System.Drawing.Size(211, 6)
-        '
-        'mMenViewFullscreen
-        '
-        Me.mMenViewFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen
-        Me.mMenViewFullscreen.Name = "mMenViewFullscreen"
-        Me.mMenViewFullscreen.Size = New System.Drawing.Size(214, 22)
-        Me.mMenViewFullscreen.Text = "Fullscreen (Kiosk Mode)"
-        '
-        'mMenTools
-        '
-        Me.mMenTools.Image = CType(resources.GetObject("mMenTools.Image"), System.Drawing.Image)
-        Me.mMenTools.Name = "mMenTools"
-        Me.mMenTools.Size = New System.Drawing.Size(61, 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(179, 22)
-        Me.mMenToolsSSHTransfer.Text = "SSH File Transfer"
-        '
-        'mMenToolsExternalApps
-        '
-        Me.mMenToolsExternalApps.Image = CType(resources.GetObject("mMenToolsExternalApps.Image"), System.Drawing.Image)
-        Me.mMenToolsExternalApps.Name = "mMenToolsExternalApps"
-        Me.mMenToolsExternalApps.Size = New System.Drawing.Size(179, 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(179, 22)
-        Me.mMenToolsPortScan.Text = "Port Scan"
-        '
-        'mMenToolsUltraVNCSC
-        '
-        Me.mMenToolsUltraVNCSC.Image = Global.mRemote.My.Resources.Resources.UVNC_SC
-        Me.mMenToolsUltraVNCSC.Name = "mMenToolsUltraVNCSC"
-        Me.mMenToolsUltraVNCSC.Size = New System.Drawing.Size(179, 22)
-        Me.mMenToolsUltraVNCSC.Text = "Ultra VNC SingleClick"
-        '
-        'mMenToolsSep1
-        '
-        Me.mMenToolsSep1.Name = "mMenToolsSep1"
-        Me.mMenToolsSep1.Size = New System.Drawing.Size(176, 6)
-        '
-        '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 = "Update"
-        '
-        'mMenToolsOptions
-        '
-        Me.mMenToolsOptions.Image = CType(resources.GetObject("mMenToolsOptions.Image"), System.Drawing.Image)
-        Me.mMenToolsOptions.Name = "mMenToolsOptions"
-        Me.mMenToolsOptions.Size = New System.Drawing.Size(179, 22)
-        Me.mMenToolsOptions.Text = "Options"
-        '
-        'mMenInfo
-        '
-        Me.mMenInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenInfoHelp, Me.mMenInfoBugReport, Me.mMenInfoSep1, Me.mMenInfoDonate, Me.mMenInfoWebsite, Me.mMenInfoAbout})
-        Me.mMenInfo.Image = CType(resources.GetObject("mMenInfo.Image"), System.Drawing.Image)
-        Me.mMenInfo.Name = "mMenInfo"
-        Me.mMenInfo.Size = New System.Drawing.Size(53, 20)
-        Me.mMenInfo.Text = "&Info"
-        Me.mMenInfo.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal
-        '
-        'mMenInfoHelp
-        '
-        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(131, 22)
-        Me.mMenInfoHelp.Text = "Help"
-        '
-        'mMenInfoBugReport
-        '
-        Me.mMenInfoBugReport.Image = Global.mRemote.My.Resources.Resources.Bug
-        Me.mMenInfoBugReport.Name = "mMenInfoBugReport"
-        Me.mMenInfoBugReport.Size = New System.Drawing.Size(131, 22)
-        Me.mMenInfoBugReport.Text = "Bug Report"
-        '
-        'mMenInfoSep1
-        '
-        Me.mMenInfoSep1.Name = "mMenInfoSep1"
-        Me.mMenInfoSep1.Size = New System.Drawing.Size(128, 6)
-        '
-        'mMenInfoDonate
-        '
-        Me.mMenInfoDonate.Image = Global.mRemote.My.Resources.Resources.Donate
-        Me.mMenInfoDonate.Name = "mMenInfoDonate"
-        Me.mMenInfoDonate.Size = New System.Drawing.Size(131, 22)
-        Me.mMenInfoDonate.Text = "Donate"
-        '
-        'mMenInfoWebsite
-        '
-        Me.mMenInfoWebsite.Image = CType(resources.GetObject("mMenInfoWebsite.Image"), System.Drawing.Image)
-        Me.mMenInfoWebsite.Name = "mMenInfoWebsite"
-        Me.mMenInfoWebsite.Size = New System.Drawing.Size(131, 22)
-        Me.mMenInfoWebsite.Text = "Website"
-        '
-        'mMenInfoAbout
-        '
-        Me.mMenInfoAbout.Image = Global.mRemote.My.Resources.Resources.mRemote
-        Me.mMenInfoAbout.Name = "mMenInfoAbout"
-        Me.mMenInfoAbout.Size = New System.Drawing.Size(131, 22)
-        Me.mMenInfoAbout.Text = "About"
-        '
-        'mMenSep3
-        '
-        Me.mMenSep3.Name = "mMenSep3"
-        Me.mMenSep3.Size = New System.Drawing.Size(211, 6)
-        '
-        'lblQuickConnect
-        '
-        Me.lblQuickConnect.Name = "lblQuickConnect"
-        Me.lblQuickConnect.Size = New System.Drawing.Size(43, 22)
-        Me.lblQuickConnect.Text = "&Quicky:"
-        '
-        '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)
-        '
-        'tsContainer
-        '
-        '
-        'tsContainer.BottomToolStripPanel
-        '
-        Me.tsContainer.BottomToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        '
-        'tsContainer.ContentPanel
-        '
-        Me.tsContainer.ContentPanel.Controls.Add(Me.pnlDock)
-        Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 499)
-        Me.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill
-        '
-        'tsContainer.LeftToolStripPanel
-        '
-        Me.tsContainer.LeftToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.tsContainer.Location = New System.Drawing.Point(0, 0)
-        Me.tsContainer.Name = "tsContainer"
-        '
-        'tsContainer.RightToolStripPanel
-        '
-        Me.tsContainer.RightToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.tsContainer.Size = New System.Drawing.Size(842, 523)
-        Me.tsContainer.TabIndex = 17
-        Me.tsContainer.Text = "ToolStripContainer1"
-        '
-        'tsContainer.TopToolStripPanel
-        '
-        Me.tsContainer.TopToolStripPanel.Controls.Add(Me.msMain)
-        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.Name = "tsQuickConnect"
-        Me.tsQuickConnect.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.tsQuickConnect.Size = New System.Drawing.Size(207, 25)
-        Me.tsQuickConnect.TabIndex = 18
-        '
-        'btnQuickyPlay
-        '
-        Me.btnQuickyPlay.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        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"
-        '
-        'mMenQuickyCon
-        '
-        Me.mMenQuickyCon.AutoSize = False
-        Me.mMenQuickyCon.AutoToolTip = True
-        Me.mMenQuickyCon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.mMenQuickyCon.Image = Global.mRemote.My.Resources.Resources.Root
-        Me.mMenQuickyCon.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.mMenQuickyCon.Name = "mMenQuickyCon"
-        Me.mMenQuickyCon.Size = New System.Drawing.Size(30, 22)
-        Me.mMenQuickyCon.Text = "Connections"
-        '
-        'tsExtAppsToolbar
-        '
-        Me.tsExtAppsToolbar.ContextMenuStrip = Me.cMenExtAppsToolbar
-        Me.tsExtAppsToolbar.Dock = System.Windows.Forms.DockStyle.None
-        Me.tsExtAppsToolbar.Location = New System.Drawing.Point(300, 0)
-        Me.tsExtAppsToolbar.Name = "tsExtAppsToolbar"
-        Me.tsExtAppsToolbar.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.tsExtAppsToolbar.Size = New System.Drawing.Size(109, 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(137, 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(136, 22)
-        Me.cMenToolbarShowText.Text = "Show Text"
-        '
-        'tmrShowUpdate
-        '
-        Me.tmrShowUpdate.Enabled = True
-        Me.tmrShowUpdate.Interval = 5000
-        '
-        'tmrAutoSave
-        '
-        Me.tmrAutoSave.Interval = 10000
-        '
-        'frmMain
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(842, 523)
-        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.msMain.ResumeLayout(False)
-        Me.msMain.PerformLayout()
-        Me.tsContainer.ContentPanel.ResumeLayout(False)
-        Me.tsContainer.TopToolStripPanel.ResumeLayout(False)
-        Me.tsContainer.TopToolStripPanel.PerformLayout()
-        Me.tsContainer.ResumeLayout(False)
-        Me.tsContainer.PerformLayout()
-        Me.tsQuickConnect.ResumeLayout(False)
-        Me.tsQuickConnect.PerformLayout()
-        Me.cMenExtAppsToolbar.ResumeLayout(False)
-        Me.ResumeLayout(False)
-
-    End Sub
-    Friend WithEvents pnlDock As WeifenLuo.WinFormsUI.Docking.DockPanel
-    Friend WithEvents msMain As System.Windows.Forms.MenuStrip
-    Friend WithEvents mMenFile As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenView As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenTools As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents lblQuickConnect As System.Windows.Forms.ToolStripLabel
-    Friend WithEvents mMenInfo As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileNew As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileLoad As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenFileSave As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSaveAs As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSep2 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenFileExit As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsUpdate As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenToolsOptions As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoHelp As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoWebsite As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenInfoAbout As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConnectionPanels As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenViewSessions As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConnections As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConfig As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewErrorsAndInfos As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewScreenshotManager As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewAddConnectionPanel As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents cmbQuickConnect As System.Windows.Forms.ToolStripComboBox
-    Friend WithEvents mMenViewSep2 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenViewFullscreen As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsSSHTransfer As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents tsContainer As System.Windows.Forms.ToolStripContainer
-    Friend WithEvents tmrShowUpdate As System.Windows.Forms.Timer
-    Friend WithEvents mMenToolsExternalApps As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents tmrAutoSave As System.Windows.Forms.Timer
-    Friend WithEvents tsExtAppsToolbar As System.Windows.Forms.ToolStrip
-    Friend WithEvents mMenViewExtAppsToolbar As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents cMenExtAppsToolbar As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents cMenToolbarShowText As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsPortScan As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents tsQuickConnect As System.Windows.Forms.ToolStrip
-    Friend WithEvents mMenViewQuickConnectToolbar As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenSep3 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenInfoDonate As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoBugReport As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewSep3 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents btnQuickyPlay As System.Windows.Forms.ToolStripSplitButton
-    Friend WithEvents mMenQuickyCon As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewJumpTo As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewJumpToConnectionsConfig As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewJumpToSessionsScreenshots As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewJumpToErrorsInfos As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenToolsUltraVNCSC As System.Windows.Forms.ToolStripMenuItem
-
-End Class

mRemoteV1/Forms/Backup/frmMain.Designer.vb~RF25758897.TMP

@@ -1,363 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmMain
-    Inherits System.Windows.Forms.Form
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.pnlDock = New WeifenLuo.WinFormsUI.Docking.DockPanel
-        Me.msMain = New System.Windows.Forms.MenuStrip
-        Me.mMenFile = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileNew = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileLoad = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenFileSave = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSaveAs = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSep2 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenFileExit = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenView = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewAddConnectionPanel = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewConnectionPanels = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenViewConnections = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewConfig = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewErrorsAndInfos = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSessions = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewScreenshotManager = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSep2 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenViewFullscreen = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenTools = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsUpdate = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsSSHTransfer = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenToolsOptions = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenQuickConnect = New System.Windows.Forms.ToolStripLabel
-        Me.cmbQuickConnect = New System.Windows.Forms.ToolStripComboBox
-        Me.mMenPlay = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfo = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoHelp = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoWebsite = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenInfoAbout = New System.Windows.Forms.ToolStripMenuItem
-        Me.msMain.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'pnlDock
-        '
-        Me.pnlDock.ActiveAutoHideContent = Nothing
-        Me.pnlDock.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlDock.DockLeftPortion = 230
-        Me.pnlDock.DockRightPortion = 230
-        Me.pnlDock.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow
-        Me.pnlDock.Location = New System.Drawing.Point(0, 27)
-        Me.pnlDock.Name = "pnlDock"
-        Me.pnlDock.Size = New System.Drawing.Size(842, 496)
-        Me.pnlDock.TabIndex = 13
-        '
-        'msMain
-        '
-        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.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFile, Me.mMenView, Me.mMenTools, Me.mMenSep1, Me.mMenQuickConnect, Me.cmbQuickConnect, Me.mMenPlay, Me.mMenInfo})
-        Me.msMain.Location = New System.Drawing.Point(0, 0)
-        Me.msMain.Name = "msMain"
-        Me.msMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.msMain.Size = New System.Drawing.Size(842, 27)
-        Me.msMain.TabIndex = 16
-        Me.msMain.Text = "Main Toolbar"
-        '
-        'mMenFile
-        '
-        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.Image = Global.mRemote.My.Resources.Resources.File
-        Me.mMenFile.Name = "mMenFile"
-        Me.mMenFile.Size = New System.Drawing.Size(51, 23)
-        Me.mMenFile.Text = "&File"
-        '
-        'mMenFileNew
-        '
-        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(241, 22)
-        Me.mMenFileNew.Text = "New Connections"
-        '
-        'mMenFileLoad
-        '
-        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(241, 22)
-        Me.mMenFileLoad.Text = "Open Connections"
-        '
-        'mMenFileSep1
-        '
-        Me.mMenFileSep1.Name = "mMenFileSep1"
-        Me.mMenFileSep1.Size = New System.Drawing.Size(238, 6)
-        '
-        'mMenFileSave
-        '
-        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(241, 22)
-        Me.mMenFileSave.Text = "Save Connections"
-        '
-        'mMenFileSaveAs
-        '
-        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(241, 22)
-        Me.mMenFileSaveAs.Text = "Save Connections As"
-        '
-        'mMenFileSep2
-        '
-        Me.mMenFileSep2.Name = "mMenFileSep2"
-        Me.mMenFileSep2.Size = New System.Drawing.Size(238, 6)
-        '
-        'mMenFileExit
-        '
-        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(241, 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.mMenViewErrorsAndInfos, Me.mMenViewSessions, Me.mMenViewScreenshotManager, Me.mMenViewSep2, Me.mMenViewFullscreen})
-        Me.mMenView.Image = Global.mRemote.My.Resources.Resources.View
-        Me.mMenView.Name = "mMenView"
-        Me.mMenView.Size = New System.Drawing.Size(58, 23)
-        Me.mMenView.Text = "&View"
-        '
-        'mMenViewAddConnectionPanel
-        '
-        Me.mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel"
-        Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewAddConnectionPanel.Text = "Add Connection Panel"
-        '
-        'mMenViewConnectionPanels
-        '
-        Me.mMenViewConnectionPanels.Name = "mMenViewConnectionPanels"
-        Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewConnectionPanels.Text = "Connection Panels"
-        '
-        'mMenViewSep1
-        '
-        Me.mMenViewSep1.Name = "mMenViewSep1"
-        Me.mMenViewSep1.Size = New System.Drawing.Size(187, 6)
-        '
-        'mMenViewConnections
-        '
-        Me.mMenViewConnections.Checked = True
-        Me.mMenViewConnections.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewConnections.Name = "mMenViewConnections"
-        Me.mMenViewConnections.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewConnections.Text = "Connections"
-        '
-        'mMenViewConfig
-        '
-        Me.mMenViewConfig.Checked = True
-        Me.mMenViewConfig.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewConfig.Name = "mMenViewConfig"
-        Me.mMenViewConfig.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewConfig.Text = "Config"
-        '
-        'mMenViewErrorsAndInfos
-        '
-        Me.mMenViewErrorsAndInfos.Checked = True
-        Me.mMenViewErrorsAndInfos.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos"
-        Me.mMenViewErrorsAndInfos.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewErrorsAndInfos.Text = "Errors and Infos"
-        '
-        'mMenViewSessions
-        '
-        Me.mMenViewSessions.Checked = True
-        Me.mMenViewSessions.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewSessions.Name = "mMenViewSessions"
-        Me.mMenViewSessions.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewSessions.Text = "Sessions"
-        '
-        'mMenViewScreenshotManager
-        '
-        Me.mMenViewScreenshotManager.Name = "mMenViewScreenshotManager"
-        Me.mMenViewScreenshotManager.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewScreenshotManager.Text = "Screenshot Manager"
-        '
-        'mMenViewSep2
-        '
-        Me.mMenViewSep2.Name = "mMenViewSep2"
-        Me.mMenViewSep2.Size = New System.Drawing.Size(187, 6)
-        '
-        'mMenViewFullscreen
-        '
-        Me.mMenViewFullscreen.Name = "mMenViewFullscreen"
-        Me.mMenViewFullscreen.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewFullscreen.Text = "Fullscreen (Kiosk Mode)"
-        '
-        'mMenTools
-        '
-        Me.mMenTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenToolsUpdate, Me.mMenToolsSSHTransfer, Me.mMenToolsSep1, Me.mMenToolsOptions})
-        Me.mMenTools.Image = Global.mRemote.My.Resources.Resources.Tools
-        Me.mMenTools.Name = "mMenTools"
-        Me.mMenTools.Size = New System.Drawing.Size(61, 23)
-        Me.mMenTools.Text = "&Tools"
-        '
-        'mMenToolsUpdate
-        '
-        Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update
-        Me.mMenToolsUpdate.Name = "mMenToolsUpdate"
-        Me.mMenToolsUpdate.Size = New System.Drawing.Size(160, 22)
-        Me.mMenToolsUpdate.Text = "Update"
-        '
-        'mMenToolsSSHTransfer
-        '
-        Me.mMenToolsSSHTransfer.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
-        Me.mMenToolsSSHTransfer.Name = "mMenToolsSSHTransfer"
-        Me.mMenToolsSSHTransfer.Size = New System.Drawing.Size(160, 22)
-        Me.mMenToolsSSHTransfer.Text = "SSH File Transfer"
-        '
-        'mMenToolsSep1
-        '
-        Me.mMenToolsSep1.Name = "mMenToolsSep1"
-        Me.mMenToolsSep1.Size = New System.Drawing.Size(157, 6)
-        '
-        'mMenToolsOptions
-        '
-        Me.mMenToolsOptions.Image = Global.mRemote.My.Resources.Resources.Options
-        Me.mMenToolsOptions.Name = "mMenToolsOptions"
-        Me.mMenToolsOptions.Size = New System.Drawing.Size(160, 22)
-        Me.mMenToolsOptions.Text = "Options"
-        '
-        'mMenSep1
-        '
-        Me.mMenSep1.Name = "mMenSep1"
-        Me.mMenSep1.Size = New System.Drawing.Size(6, 23)
-        '
-        'mMenQuickConnect
-        '
-        Me.mMenQuickConnect.Name = "mMenQuickConnect"
-        Me.mMenQuickConnect.Size = New System.Drawing.Size(87, 20)
-        Me.mMenQuickConnect.Text = "  &Quick 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, 23)
-        '
-        'mMenPlay
-        '
-        Me.mMenPlay.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.mMenPlay.Image = Global.mRemote.My.Resources.Resources.Play_Quick
-        Me.mMenPlay.Name = "mMenPlay"
-        Me.mMenPlay.Size = New System.Drawing.Size(28, 23)
-        Me.mMenPlay.Text = "Play"
-        '
-        'mMenInfo
-        '
-        Me.mMenInfo.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.mMenInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenInfoHelp, Me.mMenInfoWebsite, Me.mMenInfoSep1, Me.mMenInfoAbout})
-        Me.mMenInfo.Image = Global.mRemote.My.Resources.Resources.Info
-        Me.mMenInfo.Name = "mMenInfo"
-        Me.mMenInfo.Size = New System.Drawing.Size(53, 23)
-        Me.mMenInfo.Text = "&Info"
-        '
-        'mMenInfoHelp
-        '
-        Me.mMenInfoHelp.Image = Global.mRemote.My.Resources.Resources.Help
-        Me.mMenInfoHelp.Name = "mMenInfoHelp"
-        Me.mMenInfoHelp.Size = New System.Drawing.Size(116, 22)
-        Me.mMenInfoHelp.Text = "Help"
-        '
-        'mMenInfoWebsite
-        '
-        Me.mMenInfoWebsite.Image = Global.mRemote.My.Resources.Resources.Website
-        Me.mMenInfoWebsite.Name = "mMenInfoWebsite"
-        Me.mMenInfoWebsite.Size = New System.Drawing.Size(116, 22)
-        Me.mMenInfoWebsite.Text = "Website"
-        '
-        'mMenInfoSep1
-        '
-        Me.mMenInfoSep1.Name = "mMenInfoSep1"
-        Me.mMenInfoSep1.Size = New System.Drawing.Size(113, 6)
-        '
-        'mMenInfoAbout
-        '
-        Me.mMenInfoAbout.Image = Global.mRemote.My.Resources.Resources.mRemote
-        Me.mMenInfoAbout.Name = "mMenInfoAbout"
-        Me.mMenInfoAbout.Size = New System.Drawing.Size(116, 22)
-        Me.mMenInfoAbout.Text = "About"
-        '
-        'frmMain
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(842, 523)
-        Me.Controls.Add(Me.pnlDock)
-        Me.Controls.Add(Me.msMain)
-        Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon
-        Me.MainMenuStrip = Me.msMain
-        'Me.MaximumSize = New System.Drawing.Size(20000, 4000)
-        Me.Name = "frmMain"
-        Me.Text = "mRemote"
-        Me.msMain.ResumeLayout(False)
-        Me.msMain.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents pnlDock As WeifenLuo.WinFormsUI.Docking.DockPanel
-    Friend WithEvents msMain As System.Windows.Forms.MenuStrip
-    Friend WithEvents mMenFile As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenView As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenTools As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenQuickConnect As System.Windows.Forms.ToolStripLabel
-    Friend WithEvents mMenPlay As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfo As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileNew As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileLoad As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenFileSave As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSaveAs As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSep2 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenFileExit As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsUpdate As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenToolsOptions As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoHelp As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoWebsite As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenInfoAbout As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConnectionPanels As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenViewSessions As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConnections As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConfig As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewErrorsAndInfos As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewScreenshotManager As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewAddConnectionPanel As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents cmbQuickConnect As System.Windows.Forms.ToolStripComboBox
-    Friend WithEvents mMenViewSep2 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenViewFullscreen As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsSSHTransfer As System.Windows.Forms.ToolStripMenuItem
-
-End Class

mRemoteV1/Forms/Backup/frmMain.resx

@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <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>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="mMenFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAsFJREFUOE9Nk0tP
-        E1EYhls36MYfYhQhGGOCUUMCBiUxirpxg9ACSqJxodEEDEFMYKt4SUyMK9cGikgvNEBbqNwUekG5FAoU
-        6MW208uZzqWv35lCyyTPOTOZOc+83zdn9AB0tS8nmk6cLLt3TK+r0ul0xwk9URhBA/I6JZ9fS8Rg0wvx
-        p5MfGiTtPj+4oP61YzIqsOi/tKjE0iJiqRJRQQTdgz8koGswCOPASqa6faiMr+Now/U+Z1jISsrUhgT3
-        pgx3UMb0hgxnIIfxFRE/fGmIMmBazqLr2yYMb1aylzpMmkQTNPS7sslMDnNbCua3ZJplzGiSHCZWRZh9
-        GRKomAspcO9I6P0eRM0L+9dSgn4X44IFEvzalrGwrWiyn5sSHGs5WP9kEdhPa6WkmIz9eAbUN8p0WAIJ
-        EukclugNHmJpV8VvTcJTSFoKC6UY9qQwtJhEgvpU1+NgRcG1PheLk8C/m4ePFnsJT0jFIslmqSdTgYLE
-        9jcLC/UhnpZQ98pVEtSTIEaC5b28hp/wkWxpp5BEk1CSSSqHi2IkqO05Irja62LRVA6+4mK1mIRLeF9m
-        qRyexEWEBQk13UcEtT1OFqHvzd/KSzjES2UcppgLKpjhn5gQqJGXO52lEmq6nWwvKcK7U4hdgJpJ8BLm
-        afEs4aa9MU0CJqmofjZeElzpdLBQguGOScRdE8PtYYZGOm8cFHFriGncHGS4cUAmp+D8Y3tJcPH5ONuK
-        MTyaUPFlGfjsBz75gI80v6f5HTHgBd56AOOYjDSVUNlmKQkuPLFnApFMvt2uos2maA8ZxhSNZrpuscm4
-        b5XRxK+tCt+V6hnDaKq4D6oeWNfDSVEIRJm6HsliPZzF6gGRlAQO73yKKaD/TVXz+cSpphHKdLATzz20
-        dFQYzdbKVkusotXMihjN7CxRbhwtYNCIn24esZU3j7RwwX/Yvio5QNtWmQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="mMenView.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAvBJREFUOE+lk1lP
-        E1EYhuvdqNF4bYKBACKgFpU6QCnQlmmhdKd0h0IXKEV2jYQE0EGDokFQEEGs0EIBa6hlExDZjJCIiRhC
-        RRZpUa/8EcevF4qICRdOci4mM+97nuebMwcQQpT/ui4vmPHyeTNe+saEF03rccsrHZ47qsX1L5R45rN0
-        XNktwtOtPFzYysFTm5i4f8M/F6V8Po8omTNhhVN6LH88CzMNa7AclwLT9ksxhU2ISTtSMX4LgXHvJWGs
-        W3RiT0HxrJG49DrnIJCQQEKWzpnIoik9aZnQkaYRLZnjUpLa/nRSYReRglZOJ5BUA0n1ryJKwWQ2kfcy
-        8xCQ2AqnDTTLRHZc7og20eBWsXTODI7aIeZldPL54naumHWbUQkkPCCx/i4AXwJ8DxfNGOygwICi1bK3
-        eZ9LZo1rQLZuHs/cMA6rN7MH5Jsqh/i73CbYgLIfQLIIJIsU8CXA9wgMz24cUidDAQKCSuOgqj57QPEw
-        0ylzqHslgxCcFLdxP0JwntuQtAUkbiBBFE2vhJB3CY6aRjR23XM5D2aCTMPqDijuz3LKRtUOyYy8i78g
-        eZz6nveAvc5tTFpi1tG3mXVxQ/RrNESRPeUTojbuMUDsVvaIpTATBEpjEJ5TOSTvwH9J3J6ynNbM9hB3
-        GF4IrtBraNtxNdFuWkUUogASAS6E0i4cE7QQVTATpOmTehR24Zr0CW9T0Ep4UxqZXnZ9vC+hFvdB+BOt
-        guqLvkp1UUsjdg4FkFiBRAroSNUj+iCzpi0LH3FWUppYHnY9YzXhRsxqbNUFDwRXqCXh3rPF4c4IS+hO
-        AZBYgcQKM0Hg+zWtOfkbpyERXOnb8dcv+vDKc97zV874g1vh+aFfYDlCjUG7j6X/2wIJApIh3n3WIHGX
-        4U68GesC3wHwdUaVRfadLgzrOWUOsYUYAruCdAF7C4AEAQkCZ5RQG4MAGwE28vtGFpxEYbnBKFgfiAKz
-        AtAJzfG9BX+f9f3ud/1Z+738r+c/ASsl+hh77k39AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="mMenViewConfig.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
-        CxMBAJqcGAAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
-        pA1bmfODND+DpqUzt5Vfm7NtZx9n52xnui9zm/m5p9/vlINcHnjhnPf83ud5n/d9fhIAkv9FQ0NDrU6n
-        29fr9cnS0tKqq87lFQ8MDNxqaWm5oVKpjPFEEql0Gp2dnYb29vbrGo3m9mWgHIDBYGh7PzmZ1en1gtE4
-        kgoLEYTCAmLxOE5OTzExMXHw2mAQTCZT9vmLF8oLIBFAJpNde/N2iGP5EOKJhBh70SjYIAchEsHu3h4O
-        UimkMxkcHZ9geHjY/w8A/airq9MGSAHj88EfYGGzfcOXpWWsra/DS3LJ/X0xMoeHqK6ufpoHoO3tXfOR
-        QueOC7OzcyKI3e44D3L8OS1aWFxEZPdPJ5qeHksOQKlU1mq12qjL7T5jvD5YrTaEQmEQvaxUKpUXFhbe
-        m5ufj8aILNoVnYuHYc76+vqi5eXlVZLKyruqSDSGHZcbm3YHls0rYBgf6uvlTy5YHigU/R7GC/PKKplL
-        EH6WJcNNoKLiTpukrKzsEcfz2Hb+wMbmFpaWzYjG4lCr1R8vAF7pdN/pVqamZ2DfdiLAEpBAACUlJQoJ
-        eaRNTU3TZHUC0Yv1jU1xWOPj4xgaevfTaDQejIyOituw2mzw+gPQDw7ytIbW5nxAnPcsnTkET/R/Mi2I
-        a9wikhyEkSWMH6am4HDukPaDqKmpUedtobu7W/h1fIxEMgm3xwOLxYqVVQu+/g0LYafgQeKVrq6uUB6A
-        qqPDTJLURFnivmxYEES9lJX6gzBnibHOw5FdtLa2fs4DoHoaGxvHioqK7hcXFz8mXRzRdqkfGK83RfIP
-        SV4hl8vH6Nk8gMuX5GV/v4sn2+E4Ds3NzTnGKy/T5R8FBQUyMukZGuT95lXX+Tf6O+vwZDVeqgAAAABJ
-        RU5ErkJggg==
-</value>
-  </data>
-  <data name="mMenViewSessions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
-        CxMBAJqcGAAAA4RJREFUOE9lk3tMk1cchg8a562VKXGZUxMNy8a8zM3bNIW1Omi/Xj5LKa2UYgvSyxDa
-        CrSFUq4lghTKrMMKBQ0mRggiMrIJjuDGNk2WbfES4oIgGqNRZ5TpGqmG9t0H/qNykifnknOe8+aXcyIA
-        kNebfmPU9HRqdVZExMfL3yX+99jhrcHJMHnyfNazkaezy8dfhJoRDk++2sgIXqcwdjGZws5ZEunaEXnJ
-        R78Dj2QuvLJI1EgWw7iNHUjZvlyaRcUQI/+jmQJvPItMcWjH/FW+xGX4rlSCs0UUHPFRMHNYSNswF+XK
-        T6s6K5TklDNxpqApOYpM0SBZuKLDQYeej13E45+86K3X4UKTFd8fsaIzb6PryjE9+bMxnZCvdRmv0O+N
-        MKarVUWC1bfLuKx/7LGsRxbxuhdD/a0IXO3Ay6FOBId7caenOJwhV+hiZMfJetlhQrIz90yTpdu7uUAZ
-        N+JRRMNNL4U7eRX2cRahJFOIe321+PeXBoz/WAG3STWxYMtBw6Kdx8gCbiMhVtH6afKFG4rL6WiU8JfC
-        KV6JHOZwbsIHkMTMQ5XLgtp6F3wtfrT+FsJnioGbc7Y1f8XiMYJcDpvkcRaS7C1znBVpseg/mo8zVVq4
-        M7aiyZoIQ0I08s9dhvpnIKkHqBwEDv0QxIfirrFI7mEO0Yo2EwUVR3QJ6wxDHeUIjvYjeK0DTy76MTHc
-        h4F6LfStI0htD0N+PAT+EUDfPI6+E3605fJvEL5QTLYL1GQTL0X8bU5C4L9LPoSGmavGzuPBgAd2oxxy
-        /32knASUbUBaO5Ok6DIGWypxp3bTJBGJREQoEsfEcuMvlDgLQ06bGaerM9FQqEahLRcmkxnCrBokt9zF
-        7lOPwTtwCxz66L3eEsEfw63pNiKgk1bsM1kGpbt2wWq1Qac3oLu7Gz6fD3s0Wlj278dupRJfCPMCn4hP
-        3l3J77oep/Rn/9qge3+0LWc+cWp3dvk9ZXBVHoBKpUJqaiq8Xi9qatyQSCSQyWSw2QvwTWk27Cruibef
-        Pnno+Rx/tZchr6AYdXV1TGQTaJoGRVEwGo2w2ZhUBiMe9ZZirGLtyxmCkUb52R4nH0mqdDgcDlRXV0/3
-        Go0GbrcbZrMZAkqI3w/y8XdjClPGNz8fGW03sfvq1Gu/jBe6mILeVigU41KpdIIZT8jl8gCPx7tJUSLd
-        Vb9mzY02C/ttwf8MViWur2j6ngAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="mMenViewScreenshotManager.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjxJREFUOE+lk+9P
-        EnEcx+uP6lnrx9aj1mqz5uxBtkbMRa3WcukwE9F5JvFDTwFBusgChZISRZOwglEy5VduOZu1msWPAd4B
-        J+ej3n2PBwTCaqvbXrfv/Xp93vt8P3cQwIH/OkSB1R1RMy+iqTFnmNPYG2Aj96qgHWHO7Apry8XFEzMb
-        TWey2Z9Fnge/K/yRbFFAmi3A8CzCVgRi5UKRx9jcNtRzMSjmp2Fdo+GI98MWU2LUr8KVBybcsgTQYfmI
-        TEHAqDPKVQRaElusbJjfBrWwCOsqjakP7TCvtsGwIoExJIPK2wfZ+BPImQ2kuQaCAhGML3yHwjMJO6lq
-        DEkx/O4CVP7zoN62QOO/iYsj99H9aBMprkQSRGoTcERgXvyBHrcVD8Pd0AVbQb1pRu9yE+6+agLlu4ZW
-        3T30Pv6EJLtbL2B5AZaXCVBuD2j/ILRBCRTLZyFfOoMeXwvuPO+ETD+JfvsWkjsNEuyQ7jLeJGhPHJ0O
-        BtTsDQz5pKC8l9DlvIrL9DCJH8Tg9Od6gbj3OdJZqy9Vloy4Y7itbMWA5gQo1XEo+pqhtL2HZuYrVE+/
-        ILE/gSjI5gXIHafRMXUK7baTMHUdwjpzDnGCa+Ao2kzHIDUegUR/uF6gtq1xOSLwb72uEFx3IbQygbjr
-        OgKbSzXPErkSaEfVLmjKglLNS9Wy/etETqgV6J3hbzk2jzxpZJ7fA1dGAEeu2Tr2kCmPcvT3KE+4IkOm
-        mWhAHA4x2t8g/wFHvtFVRllc/Cu/AAZ/6ElKbpVOAAAAAElFTkSuQmCC
-</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=
-</value>
-  </data>
-  <data name="mMenTools.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
-        CxMBAJqcGAAAAtpJREFUOE91Ud1P0mEYfbvor8itudZFV/0JXbXmWmuurS66aF7YbbRqydAMkTENUH4Q
-        gnzYhvgxSUpA5EMlQHCTNFCwZup0KmFJV16RnJ4Hw7W2ftvZ+9vzvOc85znvud7eXvHXVzk5ORHVanWD
-        zkGq93OvoaFBRrWHAC7TKUql0vkzjtVqFVqttg6sr68jmUyiu7v7WKlUyhwOh8xmsx3v7e2hXC7DbDaD
-        6qIOwQJUFHq9ngGPx4N4PI5YLAaVSlUgcmF3dxfFYhGhUAhGo5Hrog4WqLAqN3Q6nSAkwuEwEokE1Gp1
-        xWKxVHj6ysoKJEmKU602iFyD1q8ImlBha6zOF/r6+j5Eo1GkUiloNBoW/7W5uYmFhQVwjwewS16V+8Ju
-        txd4AlvkKXxxcXER6XQaPT09VYPBUF1bW6vVWJjd8YqcE7kpCKfTWQuJ92QhnsaETCaDQCDANvFsIIu2
-        wU81V7wa58Mhd3V1yQSlzGCRAu87YDZXOQ92kMvloLDloBzehnxoCy2qSJVz4XD5hW4rV0VdgLMQGG2V
-        EHyBnTkXTEYJ2vHP0E7uwrf4A5Op72hzbuFW56qHIOo4E4C7RcJ0O7A8Bsz3wzmxBMv0AcLLZbhmv8ER
-        KuJt8hBP7Vto6sh6CYJRE4D7gQS/AsiMAHN6wNeO2akI7ESKrvzEaKwEs38ftuABPIlDPCGRG4qslyAE
-        XPcl+OREdgOzOmCK/qdVQMKKiGsEdiJFyIV7vgSTbx+D5GqCRB5bv+K6POsVcNwBloaB6Cvg3XMg8JLI
-        FsB+F+i45NGM70hWEgl/JJG5EqT3e7D4DzAWO8TNjiwEXjcB6TdAkKb6O4H4AGAlUUWjVz26I/5AYtJM
-        5jQP20wRE/FDNKvyJGC4lsFwyykxZgIszYD8olfl3hb/QDL5DhDMHNGrHNWe9p4mnz8NUX01D+UVstxI
-        5AveTiL/B5J8aBOPBjbQaviSIYjfmuK35PAW5YUAAAAASUVORK5CYII=
-</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=
-</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=
-</value>
-  </data>
-  <data name="mMenInfo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAArBJREFUOE+lk+1P
-        UmEYxutf0T+hc/rS2vRDc202SNI+ZNYwTdRWugqzwSrFRHwDFLAhGGq+UL5BSYqQwJGMkJfQ1JMDM2hr
-        qy+QtSyvHmiittbaOtt1trPzXL/7ue7nfg4COPBfTxKwV3ma5cwTqpAoVxFkjzV749kyTzxLNs9mydyi
-        o3eZzN/X7zNz1Eu84/JArLzHjx57BCPMRkp6axh89XPQopkYLbby9kLSAFKVl9PiSzRPrMDijaF7KgKJ
-        8TXuDC1BblqB0bGOhpEQ6IrxBH15PA1JAXKVwYyc1oVo0mx6EYOImG70BzDoeotB5zquG/wQ9gVgmFmD
-        5KEfdKkxSpcMZaT6l3zlyBfEZVovzJ73qO0PQUgiXNX58PnrVkpVOg+quj0Q3vei/1kYZ5qegirsE6cB
-        2a0eVm+NQGlica3Hh2qdF1VaD3rtazAQVXQxv6RxkVgBqKeWQRfo2DTgiITZHJt/h9peP6n0EpX33GQx
-        Q/4D20QClRNlHbNEDlzSOGFkwqB4nZtpAC22b466N1JZk5XK1S5iciEU+YTEly2UtttR0mbDBSKBwobh
-        OQLgKvYCrKzWykL6aBGVGjcEnU5cVM7iVfgjAXxDsWwaxSQ3v8mCmm4GSksQ9Mn23Qh0jUVcJLdj0BFB
-        pYqBQO6AxbOO7z+2UxH8bz6gSGImMqHrcQgFN0cIoG23ifSV0QxaYIzeHvbBYF1FqdwGfvMUzkknUVRv
-        wtm6cRTWjaFl2EuOd45sXxqludLdY0w2g+IP8A7l6xOiAQ/008sQap1ky09wvsGMapUNalMAwl4GNKc+
-        Qcz7B2lnNKkCPY/K74qdvjUB5eQiHjhZolW0m4PIqzWC4jTEaG7jn0d5B0KfUmdSvA4RladgKW5TnOI0
-        xklFlkh0mFv/98v0+037l++fDRyfGvO8afwAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="mMenInfoHelp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
-</value>
-  </data>
-  <data name="mMenInfoWebsite.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAA3FJREFUOE9Vkt9P
-        W3UYxmucdy5e+S9wPWO4wMAayuxGoTLEDFnkp7QNtIemNBbKYjcPNVSwSJs5lCnbYIUVKIWtZb9aoF1Z
-        V6GnrW1poVAmmwpV7JwCxhkev+fEGT3JJ3nOm/N+3nPxvACA999HudBQQN4pQi7hVcIhwq+EAA5wwVxw
-        6db/FlgBS4uv/hDhKuGPu99ZsJS5g9mHC3CsLmAq4cZEYgRNs9XPpHdOzzTMVL78fO/58ktk0TeU/BRb
-        u0Gs7sQQ3WFg3wjBmV7GUCyGK2EGY2EfTIEuVNsrIlVjZa9wf//PdcvlRBfST+ex/NSPeDaO0HYYI6k4
-        xtNr6Aum0PMggV5PAPa4GyZ/ByqGRTOcgFzOJ/y5+ds8HFknJp44cXPHg5uPYvgquYLPo6ugnEFQN/zQ
-        LzoxsHEewR/tEF8U/lV8QVDGCmzO9BdY+smJ0ew0rL8EEMhEYAzF0bO4AqkjCJnLBdXyANRpGqq1DgyH
-        Tbj6wICizwpus4LNb3++gaHNizBmvibXY/Bnwmi5HYJ0egkfBBYhS2kgXpFCnJCgOqqA7q4a3pQFRw15
-        P7CC3bUns+hMfgQq1YaB7+cwurGE6mvfQOH2omf1FuqSI+BH2iAMN+OkqwqK8ffBPL6OPDp3j0fdq9tb
-        z87iw4gaikgfBh+6UDPqR81UFBVf3keL6z46InZQPgdqrXZUWs9ANnwazKNp5Ope2+c1z9U8Dm1PoS/W
-        ie61OZxdcKPWcAm0oQeDg4PQnPsYpedsOE5PkaznZvquTvSPGPB625FtHinGdXvCDEf6MpT3aDR+ooHJ
-        ZMLW1hbW19fh8XjQoe+G8mw34okkN/P5SB/IN4Kawk1eveOUkBTjWTTjRJ3pXajb1GCiUVRR7SgpFUMi
-        kcBsNkOr1XK5pLQEGl0LJ2lVt+5yRaq89ta0cV4DSlcPWk9zgiaLB4XHhHC73WAYBl6vFzabDUVvCqC1
-        SDkBTdP7nODtK8WHSTEi9bp3QCnlnKCWaoWg6BiEQiHKy8s52CwoEkD0XvEuK5DJZFlOwHL8fOHhAm2e
-        t+SU6KDX1AvrxDgmJyfR398PlUqF9vZ2LrMz65g1azQas2KxOPGvgJXk5OS8mC97o/VE2Ym9BknDQZO8
-        Cc3yZhQq+NmjynyG5H25XL7f2Nj4u0gk2uDz+Uf+BlXgloy7HfxbAAAAAElFTkSuQmCC
-</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>
-  </metadata>
-  <metadata name="tsExtAppsToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>348, 8</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>
-  </metadata>
-  <metadata name="tmrShowUpdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>102, 8</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>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>37</value>
-  </metadata>
-</root>

mRemoteV1/Forms/Backup/frmMain.vb

@@ -1,609 +0,0 @@
-Imports mRemote.App.Runtime
-Imports System.Reflection
-Imports Crownwood
-
-Public Class frmMain
-    Public prevWindowsState As FormWindowState
-
-#Region "Startup & Shutdown"
-    Private Sub frmMain_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-        ApplyLanguage()
-
-        Debug.Print("---------------------------" & vbNewLine & "[START] - " & Now)
-
-        Startup.ParseCommandLineArgs()
-
-
-        sL = New Config.Settings.Load(Me)
-        sS = New Config.Settings.Save(Me)
-
-        Startup.CreateLogger()
-
-        sL.Load()
-
-        mC = New Messages.Collector(Windows.errorsForm)
-
-        Connection.Protocol.RDP.Resolutions.AddResolutions()
-        Connection.Protocol.PuttyBase.BorderSize = New Size(SystemInformation.FrameBorderSize.Width, SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height) 'Size.Subtract(Me.Size, Me.ClientSize)
-
-        wL = New UI.Window.List
-
-        Startup.GetConnectionIcons()
-        Startup.GetPuttySessions()
-        App.Runtime.GetExtApps()
-        Windows.treePanel.Focus()
-
-        Tree.Node.TreeView = Windows.treeForm.tvConnections
-
-        'LoadCredentials()
-        LoadConnections()
-
-        If My.Settings.FirstStart Then
-            Windows.Show(UI.Window.Type.About)
-        End If
-
-        Startup.UpdateCheck()
-        Startup.CreateSQLUpdateHandlerAndStartTimer()
-
-        AddSysMenuItems()
-        AddHandler Microsoft.Win32.SystemEvents.DisplaySettingsChanged, AddressOf DisplayChanged
-    End Sub
-
-    Private Sub ApplyLanguage()
-        mMenFile.Text = Language.Base.Menu_File
-        mMenFileNew.Text = Language.Base.Menu_NewConnections
-        mMenFileLoad.Text = Language.Base.Menu_OpenConnections
-        mMenFileSave.Text = Language.Base.Menu_SaveConnections
-        mMenFileSaveAs.Text = Language.Base.Menu_SaveConnectionsAs
-        mMenFileExit.Text = Language.Base.Menu_Exit
-        mMenView.Text = Language.Base.Menu_View
-        mMenViewAddConnectionPanel.Text = Language.Base.Menu_AddConnectionPanel
-        mMenViewConnectionPanels.Text = Language.Base.Menu_ConnectionPanels
-        mMenViewConnections.Text = Language.Base.Menu_Connections
-        mMenViewConfig.Text = Language.Base.Menu_Config
-        mMenViewSessions.Text = Language.Base.Menu_Sessions
-        mMenViewErrorsAndInfos.Text = Language.Base.Menu_ErrorsAndInfos
-        mMenViewScreenshotManager.Text = Language.Base.Menu_ScreenshotManager
-        mMenViewJumpTo.Text = Language.Base.Menu_JumpTo
-        mMenViewJumpToConnectionsConfig.Text = Language.Base.Menu_ConnectionsConfig
-        mMenViewJumpToSessionsScreenshots.Text = Language.Base.Menu_SessionsScreenshots
-        mMenViewJumpToErrorsInfos.Text = Language.Base.Menu_ErrorsInfos
-        mMenViewQuickConnectToolbar.Text = Language.Base.Menu_QuickyToolbar
-        mMenViewExtAppsToolbar.Text = Language.Base.Menu_ExternalApplicationsToolbar
-        mMenViewFullscreen.Text = Language.Base.Menu_FullScreenKioskMode
-        mMenTools.Text = Language.Base.Menu_Tools
-        mMenToolsSSHTransfer.Text = Language.Base.Menu_SSHFileTransfer
-        mMenToolsExternalApps.Text = Language.Base.Menu_ExternalApplications
-        mMenToolsPortScan.Text = Language.Base.Menu_PortScan
-        mMenToolsUpdate.Text = Language.Base.Menu_Update
-        mMenToolsOptions.Text = Language.Base.Menu_Options
-        mMenInfo.Text = Language.Base.Menu_Info
-        mMenInfoHelp.Text = Language.Base.Menu_Help
-        mMenInfoBugReport.Text = Language.Base.Menu_BugReport
-        mMenInfoDonate.Text = Language.Base.Menu_Donate
-        mMenInfoWebsite.Text = Language.Base.Menu_Website
-        mMenInfoAbout.Text = Language.Base.Menu_About
-        lblQuickConnect.Text = Language.Base.Toolbar_Quicky
-        btnQuickyPlay.Text = Language.Base.Toolbar_Play
-        mMenQuickyCon.Text = Language.Base.Menu_Connections
-        cMenToolbarShowText.Text = Language.Base.Toolbar_ShowText
-    End Sub
-
-    Private Sub frmMain_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
-        If My.Settings.ConfirmExit And wL.Count > 0 Then
-            If MsgBox(Language.Base.UnclosedConnectionPanels, MsgBoxStyle.YesNo Or MsgBoxStyle.Question) = MsgBoxResult.No Then
-                e.Cancel = True
-                Exit Sub
-            End If
-        End If
-
-        App.Runtime.Shutdown.BeforeQuit()
-
-        Debug.Print("[END] - " & Now)
-        End
-    End Sub
-#End Region
-
-    Private tmrRuns As Integer = 0
-    Private Sub tmrShowUpdate_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tmrShowUpdate.Tick
-        If tmrRuns = 5 Then
-            Me.tmrShowUpdate.Enabled = False
-        End If
-
-        If App.Runtime.IsUpdateAvailable Then
-            App.Runtime.Windows.Show(UI.Window.Type.Update)
-            Me.tmrShowUpdate.Enabled = False
-        End If
-
-        tmrRuns += 1
-    End Sub
-
-    Private Sub tmrAutoSave_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tmrAutoSave.Tick
-        mC.AddMessage(Messages.MessageClass.InformationMsg, "Doing AutoSave", True)
-        App.Runtime.SaveConnections()
-    End Sub
-
-
-#Region "Ext Apps Toolbar"
-    Private Sub cMenToolbarShowText_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenToolbarShowText.Click
-        SwitchToolbarText(Not cMenToolbarShowText.Checked)
-    End Sub
-
-    Public Sub AddExtAppsToToolbar()
-        Try
-            'clean up
-            tsExtAppsToolbar.Items.Clear()
-
-            'add ext apps
-            For Each extA As Tools.ExternalApp In ExtApps
-                Dim nItem As New ToolStripButton
-                nItem.Text = extA.DisplayName
-                nItem.Image = extA.Image
-
-                If cMenToolbarShowText.Checked = True Then
-                    nItem.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
-                Else
-                    If nItem.Image IsNot Nothing Then
-                        nItem.DisplayStyle = ToolStripItemDisplayStyle.Image
-                    Else
-                        nItem.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
-                    End If
-                End If
-
-                nItem.Tag = extA
-
-                AddHandler nItem.Click, AddressOf tsExtAppEntry_Click
-
-                tsExtAppsToolbar.Items.Add(nItem)
-            Next
-        Catch ex As Exception
-            mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddExtAppsToToolbar failed (frmMain)" & vbNewLine & ex.Message, True)
-        End Try
-    End Sub
-
-    Private Sub tsExtAppEntry_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
-        Dim extA As Tools.ExternalApp = sender.Tag
-
-        If Tree.Node.GetNodeType(Tree.Node.SelectedNode) = Tree.Node.Type.Connection Then
-            extA.Start(Tree.Node.SelectedNode.Tag)
-        Else
-            extA.Start()
-        End If
-    End Sub
-
-    Public Sub SwitchToolbarText(ByVal Show As Boolean)
-        For Each tItem As ToolStripButton In tsExtAppsToolbar.Items
-            If Show = True Then
-                tItem.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
-            Else
-                If tItem.Image IsNot Nothing Then
-                    tItem.DisplayStyle = ToolStripItemDisplayStyle.Image
-                Else
-                    tItem.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
-                End If
-            End If
-        Next
-
-        cMenToolbarShowText.Checked = Show
-    End Sub
-#End Region
-
-#Region "Menu"
-#Region "File"
-    Private Sub mMenFileNew_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileNew.Click
-        NewConnections()
-    End Sub
-
-    Private Sub mMenFileLoad_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileLoad.Click
-        If App.Runtime.ConnectionsFileLoaded Then
-            Select Case MsgBox(Language.Base.SaveConnectionsFileBeforeOpeningAnother, MsgBoxStyle.YesNoCancel Or MsgBoxStyle.Question)
-                Case MsgBoxResult.Yes
-                    App.Runtime.SaveConnections()
-                Case MsgBoxResult.Cancel
-                    Exit Sub
-            End Select
-        End If
-
-        LoadConnections(True)
-    End Sub
-
-    Private Sub mMenFileSave_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileSave.Click
-        SaveConnections()
-    End Sub
-
-    Private Sub mMenFileSaveAs_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileSaveAs.Click
-        App.Runtime.Windows.Show(UI.Window.Type.SaveAs)
-    End Sub
-
-    Private Sub mMenFileExit_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileExit.Click
-        App.Runtime.Shutdown.Quit()
-    End Sub
-#End Region
-
-#Region "View"
-    Private Sub mMenView_DropDownOpening(ByVal sender As Object, ByVal e As System.EventArgs) Handles mMenView.DropDownOpening
-        Me.mMenViewConnections.Checked = Not Windows.treeForm.IsHidden
-        Me.mMenViewConfig.Checked = Not Windows.configForm.IsHidden
-        Me.mMenViewErrorsAndInfos.Checked = Not Windows.errorsForm.IsHidden
-        Me.mMenViewSessions.Checked = Not Windows.sessionsForm.IsHidden
-        Me.mMenViewScreenshotManager.Checked = Not Windows.screenshotForm.IsHidden
-
-        Me.mMenViewExtAppsToolbar.Checked = tsExtAppsToolbar.Visible
-        Me.mMenViewQuickConnectToolbar.Checked = tsQuickConnect.Visible
-
-        Me.mMenViewConnectionPanels.DropDownItems.Clear()
-
-        For i As Integer = 0 To wL.Count - 1
-            Dim tItem As New ToolStripMenuItem(wL(i).Text, wL(i).Icon.ToBitmap, AddressOf ConnectionPanelMenuItem_Click)
-            tItem.Tag = wL(i)
-
-            Me.mMenViewConnectionPanels.DropDownItems.Add(tItem)
-        Next
-    End Sub
-
-    Private Sub ConnectionPanelMenuItem_Click(ByVal sender As Object, ByVal e As System.EventArgs)
-        TryCast(sender.Tag, UI.Window.Base).Show(Me.pnlDock)
-        TryCast(sender.Tag, UI.Window.Base).Focus()
-    End Sub
-
-    Private Sub mMenViewSessions_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles mMenViewSessions.Click
-        If Me.mMenViewSessions.Checked = False Then
-            Windows.sessionsPanel.Show(Me.pnlDock)
-            Me.mMenViewSessions.Checked = True
-        Else
-            Windows.sessionsPanel.Hide()
-            Me.mMenViewSessions.Checked = False
-        End If
-    End Sub
-
-    Private Sub mMenViewConnections_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewConnections.Click
-        If Me.mMenViewConnections.Checked = False Then
-            Windows.treePanel.Show(Me.pnlDock)
-            Me.mMenViewConnections.Checked = True
-        Else
-            Windows.treePanel.Hide()
-            Me.mMenViewConnections.Checked = False
-        End If
-    End Sub
-
-    Private Sub mMenViewConfig_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewConfig.Click
-        If Me.mMenViewConfig.Checked = False Then
-            Windows.configPanel.Show(Me.pnlDock)
-            Me.mMenViewConfig.Checked = True
-        Else
-            Windows.configPanel.Hide()
-            Me.mMenViewConfig.Checked = False
-        End If
-    End Sub
-
-    Private Sub mMenViewErrorsAndInfos_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewErrorsAndInfos.Click
-        If Me.mMenViewErrorsAndInfos.Checked = False Then
-            Windows.errorsPanel.Show(Me.pnlDock)
-            Me.mMenViewErrorsAndInfos.Checked = True
-        Else
-            Windows.errorsPanel.Hide()
-            Me.mMenViewErrorsAndInfos.Checked = False
-        End If
-    End Sub
-
-    Private Sub mMenViewScreenshotManager_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewScreenshotManager.Click
-        If Me.mMenViewScreenshotManager.Checked = False Then
-            Windows.screenshotPanel.Show(Me.pnlDock)
-            Me.mMenViewScreenshotManager.Checked = True
-        Else
-            Windows.screenshotPanel.Hide()
-            Me.mMenViewScreenshotManager.Checked = False
-        End If
-    End Sub
-
-    Private Sub mMenViewJumpToConnectionsConfig_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles mMenViewJumpToConnectionsConfig.Click
-        If pnlDock.ActiveContent Is Windows.treePanel Then
-            Windows.configForm.Activate()
-        Else
-            Windows.treeForm.Activate()
-        End If
-    End Sub
-
-    Private Sub mMenViewJumpToSessionsScreenshots_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles mMenViewJumpToSessionsScreenshots.Click
-        If pnlDock.ActiveContent Is Windows.sessionsPanel Then
-            Windows.screenshotForm.Activate()
-        Else
-            Windows.sessionsForm.Activate()
-        End If
-    End Sub
-
-    Private Sub mMenViewJumpToErrorsInfos_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles mMenViewJumpToErrorsInfos.Click
-        Windows.errorsForm.Activate()
-    End Sub
-
-    Private Sub mMenViewAddConnectionPanel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewAddConnectionPanel.Click
-        AddPanel()
-    End Sub
-
-    Private Sub mMenViewExtAppsToolbar_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewExtAppsToolbar.Click
-        If mMenViewExtAppsToolbar.Checked = False Then
-            tsExtAppsToolbar.Visible = True
-            mMenViewExtAppsToolbar.Checked = True
-        Else
-            tsExtAppsToolbar.Visible = False
-            mMenViewExtAppsToolbar.Checked = False
-        End If
-    End Sub
-
-    Private Sub mMenViewQuickConnectToolbar_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewQuickConnectToolbar.Click
-        If mMenViewQuickConnectToolbar.Checked = False Then
-            tsQuickConnect.Visible = True
-            mMenViewQuickConnectToolbar.Checked = True
-        Else
-            tsQuickConnect.Visible = False
-            mMenViewQuickConnectToolbar.Checked = False
-        End If
-    End Sub
-
-    Private Sub mMenViewFullscreen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewFullscreen.Click
-        If Tools.Misc.Fullscreen.FullscreenActive Then
-            Tools.Misc.Fullscreen.ExitFullscreen()
-            Me.mMenViewFullscreen.Checked = False
-        Else
-            Tools.Misc.Fullscreen.EnterFullscreen()
-            Me.mMenViewFullscreen.Checked = True
-        End If
-    End Sub
-#End Region
-
-#Region "Tools"
-    Private Sub mMenToolsUpdate_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenToolsUpdate.Click
-        App.Runtime.Windows.Show(UI.Window.Type.Update)
-    End Sub
-
-    Private Sub mMenToolsSSHTransfer_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenToolsSSHTransfer.Click
-        App.Runtime.Windows.Show(UI.Window.Type.SSHTransfer)
-    End Sub
-
-    Private Sub mMenToolsExternalApps_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenToolsExternalApps.Click
-        App.Runtime.Windows.Show(UI.Window.Type.ExternalApps)
-    End Sub
-
-    Private Sub mMenToolsPortScan_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenToolsPortScan.Click
-        App.Runtime.Windows.Show(UI.Window.Type.PortScan, Tools.PortScan.PortScanMode.Normal)
-    End Sub
-
-    Private Sub mMenToolsUltraVNCSC_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenToolsUltraVNCSC.Click
-        App.Runtime.Windows.Show(UI.Window.Type.UltraVNCSC)
-    End Sub
-
-    Private Sub mMenToolsOptions_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenToolsOptions.Click
-        App.Runtime.Windows.Show(UI.Window.Type.Options)
-    End Sub
-#End Region
-
-#Region "Quick Connect"
-    Private Sub btnQuickyPlay_ButtonClick(ByVal sender As Object, ByVal e As System.EventArgs) Handles btnQuickyPlay.ButtonClick
-        CreateQuicky(QuickyText)
-    End Sub
-
-    Private Sub btnQuickyPlay_DropDownOpening(ByVal sender As Object, ByVal e As System.EventArgs) Handles btnQuickyPlay.DropDownOpening
-        CreateQuickyButtons()
-    End Sub
-
-    Private Sub CreateQuickyButtons()
-        Try
-            btnQuickyPlay.DropDownItems.Clear()
-
-            For Each fI As FieldInfo In GetType(mRemote.Connection.Protocol.Protocols).GetFields
-                If fI.Name <> "value__" And fI.Name <> "NONE" Then
-                    Dim nBtn As New ToolStripMenuItem
-                    nBtn.Text = fI.Name
-                    btnQuickyPlay.DropDownItems.Add(nBtn)
-                    AddHandler nBtn.Click, AddressOf QuickyProtocolButton_Click
-                End If
-            Next
-        Catch ex As Exception
-            mC.AddMessage(Messages.MessageClass.ErrorMsg, "CreateButtons (frmMain) failed" & vbNewLine & ex.Message, True)
-        End Try
-    End Sub
-
-    Private Sub QuickyProtocolButton_Click(ByVal sender As Object, ByVal e As System.EventArgs)
-        Try
-            Dim conI As Connection.Info = CreateQuicky(QuickyText, Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.Protocols), sender.Text))
-
-            If conI.Port = 0 Then
-                conI.SetDefaultPort()
-
-                If mRemote.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then
-                    mRemote.Connection.QuickConnect.History.Add(conI.Hostname)
-                End If
-            Else
-                If mRemote.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then
-                    mRemote.Connection.QuickConnect.History.Add(conI.Hostname & ":" & conI.Port)
-                End If
-            End If
-
-            App.Runtime.OpenConnection(conI, mRemote.Connection.Info.Force.DoNotJump)
-        Catch ex As Exception
-            mC.AddMessage(Messages.MessageClass.ErrorMsg, "QuickyProtocolButton_Click (frmMain) failed" & vbNewLine & ex.Message, True)
-        End Try
-    End Sub
-
-    Private Sub cmbQuickConnect_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles cmbQuickConnect.KeyDown
-        If e.KeyCode = Keys.Enter Then
-            CreateQuicky(QuickyText)
-        End If
-    End Sub
-
-    Private Sub lblQuickConnect_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles lblQuickConnect.Click
-        Me.cmbQuickConnect.Focus()
-    End Sub
-
-    Private Function QuickyText() As String
-        Dim txt As String
-
-        txt = cmbQuickConnect.Text
-
-        If txt.StartsWith(" ") Or txt.EndsWith(" ") Then
-            txt = txt.Replace(" ", "")
-            cmbQuickConnect.Text = txt
-        End If
-
-        Return txt
-    End Function
-#End Region
-
-#Region "Info"
-    Private Sub mMenInfoHelp_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoHelp.Click
-        App.Runtime.Windows.Show(UI.Window.Type.Help)
-    End Sub
-
-    Private Sub mMenInfoBugReport_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoBugReport.Click
-        App.Runtime.GoToBugs()
-    End Sub
-
-    Private Sub mMenInfoWebsite_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoWebsite.Click
-        App.Runtime.GoToWebsite()
-    End Sub
-
-    Private Sub mMenInfoDonate_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoDonate.Click
-        App.Runtime.GoToDonate()
-    End Sub
-
-    Private Sub mMenInfoAbout_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoAbout.Click
-        App.Runtime.Windows.Show(UI.Window.Type.About)
-    End Sub
-#End Region
-#End Region
-
-#Region "Connections DropDown"
-    Private Sub mMenQuickyCon_DropDownOpening(ByVal sender As Object, ByVal e As System.EventArgs) Handles mMenQuickyCon.DropDownOpening
-        mMenQuickyCon.DropDownItems.Clear()
-
-        For Each tNode As TreeNode In App.Runtime.Windows.treeForm.tvConnections.Nodes
-            AddNodeToMenu(tNode.Nodes, mMenQuickyCon)
-        Next
-    End Sub
-
-    Private Sub AddNodeToMenu(ByVal tnc As TreeNodeCollection, ByVal menToolStrip As ToolStripMenuItem)
-        Try
-            For Each tNode As TreeNode In tnc
-                Dim tMenItem As New ToolStripMenuItem()
-                tMenItem.Text = tNode.Text
-                tMenItem.Tag = tNode
-
-                If Tree.Node.GetNodeType(tNode) = Tree.Node.Type.Container Then
-                    tMenItem.Image = My.Resources.Folder
-                    tMenItem.Tag = tNode.Tag
-
-                    menToolStrip.DropDownItems.Add(tMenItem)
-                    AddNodeToMenu(tNode.Nodes, tMenItem)
-                ElseIf Tree.Node.GetNodeType(tNode) = Tree.Node.Type.Connection Then
-                    tMenItem.Image = Windows.treeForm.imgListTree.Images(tNode.ImageIndex)
-                    tMenItem.Tag = tNode.Tag
-
-                    menToolStrip.DropDownItems.Add(tMenItem)
-                End If
-
-                AddHandler tMenItem.MouseDown, AddressOf ConMenItem_MouseDown
-            Next
-        Catch ex As Exception
-            mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" & vbNewLine & ex.Message, True)
-        End Try
-    End Sub
-
-    Private Sub ConMenItem_MouseDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs)
-        If e.Button = MouseButtons.Left Then
-            If TypeOf sender.Tag Is mRemote.Connection.Info Then
-                App.Runtime.OpenConnection(sender.Tag)
-            End If
-        End If
-    End Sub
-#End Region
-
-    Private Sub frmMain_Resize(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Resize
-        If Me.WindowState = FormWindowState.Minimized Then
-            If My.Settings.MinimizeToTray Then
-                If App.Runtime.SysTrayIcon Is Nothing Then
-                    App.Runtime.SysTrayIcon = New Tools.Controls.SysTrayIcon()
-                End If
-                Me.Hide()
-            End If
-        Else
-            prevWindowsState = Me.WindowState
-        End If
-    End Sub
-
-#Region "Window Overrides"
-    Private Msg13 As Boolean = False
-    Private Msg71 As Boolean = False
-
-    Protected Overloads Overrides Sub WndProc(ByRef m As Message)
-        Try
-            'Debug.Print(WndMsg.Msg)
-
-            If m.Msg = 13 Then
-                Msg13 = True
-            ElseIf m.Msg = 71 Then
-                If Msg13 Then
-                    ActivateConnection()
-                End If
-
-                Msg13 = False
-                Msg71 = True
-            ElseIf m.Msg = 28 Then
-                If Msg71 Then
-                    ActivateConnection()
-                End If
-            Else
-                Msg13 = False
-                Msg71 = False
-            End If
-
-            If m.Msg = Tools.SystemMenu.Flags.WM_SYSCOMMAND Then
-                For i As Integer = 0 To SysMenSubItems.Length - 1
-                    If SysMenSubItems(i) = m.WParam Then
-                        Screens.SendFormToScreen(Screen.AllScreens(i))
-                        Exit For
-                    End If
-                Next
-            End If
-        Catch ex As Exception
-        End Try
-
-        MyBase.WndProc(m)
-    End Sub
-
-    Private Sub ActivateConnection()
-        If TypeOf pnlDock.ActiveDocument Is UI.Window.Connection Then
-            Dim cW As UI.Window.Connection = pnlDock.ActiveDocument
-            If cW.TabController.SelectedTab IsNot Nothing Then
-                Dim tab As Magic.Controls.TabPage = cW.TabController.SelectedTab
-                TryCast(tab.Tag, Connection.InterfaceControl).Protocol.Focus()
-            End If
-        End If
-    End Sub
-#End Region
-
-#Region "Screen Stuff"
-    Private Sub DisplayChanged(ByVal sender As Object, ByVal e As System.EventArgs)
-        ResetSysMenuItems()
-        AddSysMenuItems()
-    End Sub
-
-    Private SysMenSubItems(50) As Integer
-    Private Sub ResetSysMenuItems()
-        SysMenu.Reset()
-    End Sub
-
-    Private Sub AddSysMenuItems()
-        SysMenu = New Tools.SystemMenu(Me.Handle)
-        Dim popMen As IntPtr = SysMenu.CreatePopupMenuItem()
-
-        For i As Integer = 0 To Screen.AllScreens.Length - 1
-            SysMenSubItems(i) = 200 + i
-            SysMenu.AppendMenuItem(popMen, Tools.SystemMenu.Flags.MF_STRING, SysMenSubItems(i), Language.Base.Screen & " " & i + 1)
-        Next
-
-        SysMenu.InsertMenuItem(SysMenu.SystemMenuHandle, 0, Tools.SystemMenu.Flags.MF_POPUP Or Tools.SystemMenu.Flags.MF_BYPOSITION, popMen, Language.Base.SendTo)
-        SysMenu.InsertMenuItem(SysMenu.SystemMenuHandle, 1, Tools.SystemMenu.Flags.MF_BYPOSITION Or Tools.SystemMenu.Flags.MF_SEPARATOR, IntPtr.Zero, Nothing)
-    End Sub
-#End Region
-
-End Class

mRemoteV1/Forms/Backup/frmPassword.Designer.vb

@@ -1,201 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmPassword
-    Inherits System.Windows.Forms.Form
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.txtPassword = New System.Windows.Forms.TextBox
-        Me.txtVerify = New System.Windows.Forms.TextBox
-        Me.lblPassword = New System.Windows.Forms.Label
-        Me.lblVerify = New System.Windows.Forms.Label
-        Me.btnOK = New System.Windows.Forms.Button
-        Me.btnCancel = New System.Windows.Forms.Button
-        Me.lblStatus = New System.Windows.Forms.Label
-        Me.pbLock = New System.Windows.Forms.PictureBox
-        Me.pnlImage = New System.Windows.Forms.Panel
-        Me.txtSnake = New System.Windows.Forms.TextBox
-        Me.lblTips = New System.Windows.Forms.Label
-        CType(Me.pbLock, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.pnlImage.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'txtPassword
-        '
-        Me.txtPassword.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtPassword.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.txtPassword.Location = New System.Drawing.Point(95, 22)
-        Me.txtPassword.Name = "txtPassword"
-        Me.txtPassword.Size = New System.Drawing.Size(184, 20)
-        Me.txtPassword.TabIndex = 0
-        Me.txtPassword.UseSystemPasswordChar = True
-        '
-        'txtVerify
-        '
-        Me.txtVerify.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtVerify.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.txtVerify.Location = New System.Drawing.Point(95, 61)
-        Me.txtVerify.Name = "txtVerify"
-        Me.txtVerify.Size = New System.Drawing.Size(184, 20)
-        Me.txtVerify.TabIndex = 1
-        Me.txtVerify.UseSystemPasswordChar = True
-        '
-        'lblPassword
-        '
-        Me.lblPassword.AutoSize = True
-        Me.lblPassword.Location = New System.Drawing.Point(87, 6)
-        Me.lblPassword.Name = "lblPassword"
-        Me.lblPassword.Size = New System.Drawing.Size(56, 13)
-        Me.lblPassword.TabIndex = 2
-        Me.lblPassword.Text = Language.Base.Password
-        '
-        'lblVerify
-        '
-        Me.lblVerify.AutoSize = True
-        Me.lblVerify.Location = New System.Drawing.Point(87, 45)
-        Me.lblVerify.Name = "lblVerify"
-        Me.lblVerify.Size = New System.Drawing.Size(36, 13)
-        Me.lblVerify.TabIndex = 3
-        Me.lblVerify.Text = Language.Base.Verify
-        '
-        'btnOK
-        '
-        Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnOK.Location = New System.Drawing.Point(210, 101)
-        Me.btnOK.Name = "btnOK"
-        Me.btnOK.Size = New System.Drawing.Size(69, 23)
-        Me.btnOK.TabIndex = 4
-        Me.btnOK.Text = Language.Base.Button_OK
-        Me.btnOK.UseVisualStyleBackColor = True
-        '
-        'btnCancel
-        '
-        Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnCancel.Location = New System.Drawing.Point(135, 101)
-        Me.btnCancel.Name = "btnCancel"
-        Me.btnCancel.Size = New System.Drawing.Size(69, 23)
-        Me.btnCancel.TabIndex = 5
-        Me.btnCancel.Text = Language.Base.Button_Cancel
-        Me.btnCancel.UseVisualStyleBackColor = True
-        '
-        'lblStatus
-        '
-        Me.lblStatus.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
-                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.lblStatus.ForeColor = System.Drawing.Color.OrangeRed
-        Me.lblStatus.Location = New System.Drawing.Point(90, 84)
-        Me.lblStatus.Name = "lblStatus"
-        Me.lblStatus.Size = New System.Drawing.Size(189, 14)
-        Me.lblStatus.TabIndex = 6
-        Me.lblStatus.Text = Language.Base.Status
-        Me.lblStatus.TextAlign = System.Drawing.ContentAlignment.TopRight
-        Me.lblStatus.Visible = False
-        '
-        'pbLock
-        '
-        Me.pbLock.Image = Global.mRemote.My.Resources.Resources.Lock
-        Me.pbLock.Location = New System.Drawing.Point(7, 8)
-        Me.pbLock.Name = "pbLock"
-        Me.pbLock.Size = New System.Drawing.Size(64, 64)
-        Me.pbLock.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
-        Me.pbLock.TabIndex = 7
-        Me.pbLock.TabStop = False
-        '
-        'pnlImage
-        '
-        Me.pnlImage.Controls.Add(Me.pbLock)
-        Me.pnlImage.Location = New System.Drawing.Point(9, 6)
-        Me.pnlImage.Name = "pnlImage"
-        Me.pnlImage.Size = New System.Drawing.Size(100, 100)
-        Me.pnlImage.TabIndex = 8
-        '
-        'txtSnake
-        '
-        Me.txtSnake.BackColor = System.Drawing.SystemColors.Control
-        Me.txtSnake.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.txtSnake.Location = New System.Drawing.Point(9, 143)
-        Me.txtSnake.Name = "txtSnake"
-        Me.txtSnake.ReadOnly = True
-        Me.txtSnake.Size = New System.Drawing.Size(100, 13)
-        Me.txtSnake.TabIndex = 9
-        Me.txtSnake.TabStop = False
-        '
-        'lblTips
-        '
-        Me.lblTips.ForeColor = System.Drawing.Color.White
-        Me.lblTips.Location = New System.Drawing.Point(129, 6)
-        Me.lblTips.Name = "lblTips"
-        Me.lblTips.Size = New System.Drawing.Size(150, 118)
-        Me.lblTips.TabIndex = 10
-        Me.lblTips.Text = "Enter: Start/Pause" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Up/Down: Change difficulty" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Arrow Keys: Steer the snake" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Esc:" & _
-            " Quit (at any time)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Have Fun! =)"
-        Me.lblTips.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.lblTips.Visible = False
-        '
-        'frmPassword
-        '
-        Me.AcceptButton = Me.btnOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.btnCancel
-        Me.ClientSize = New System.Drawing.Size(289, 133)
-        Me.ControlBox = False
-        Me.Controls.Add(Me.txtVerify)
-        Me.Controls.Add(Me.txtPassword)
-        Me.Controls.Add(Me.lblStatus)
-        Me.Controls.Add(Me.txtSnake)
-        Me.Controls.Add(Me.lblVerify)
-        Me.Controls.Add(Me.lblPassword)
-        Me.Controls.Add(Me.pnlImage)
-        Me.Controls.Add(Me.btnCancel)
-        Me.Controls.Add(Me.btnOK)
-        Me.Controls.Add(Me.lblTips)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "frmPassword"
-        Me.ShowIcon = False
-        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = Language.Base.Security
-        CType(Me.pbLock, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.pnlImage.ResumeLayout(False)
-        Me.pnlImage.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents txtPassword As System.Windows.Forms.TextBox
-    Friend WithEvents txtVerify As System.Windows.Forms.TextBox
-    Friend WithEvents lblPassword As System.Windows.Forms.Label
-    Friend WithEvents lblVerify As System.Windows.Forms.Label
-    Friend WithEvents btnOK As System.Windows.Forms.Button
-    Friend WithEvents btnCancel As System.Windows.Forms.Button
-    Friend WithEvents lblStatus As System.Windows.Forms.Label
-    Friend WithEvents pbLock As System.Windows.Forms.PictureBox
-    Friend WithEvents pnlImage As System.Windows.Forms.Panel
-    Friend WithEvents txtSnake As System.Windows.Forms.TextBox
-    Friend WithEvents lblTips As System.Windows.Forms.Label
-End Class

mRemoteV1/Forms/Backup/frmPassword.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

mRemoteV1/Forms/Backup/frmPassword.vb

@@ -1,128 +0,0 @@
-Public Class frmPassword
-    Public ReadOnly Property Username() As String
-        Get
-            Return txtPassword.Text
-        End Get
-    End Property
-
-    Public ReadOnly Property Password() As String
-        Get
-            If _Verify = True Then
-                Return txtVerify.Text
-            Else
-                Return txtPassword.Text
-            End If
-        End Get
-    End Property
-
-    Private _Verify As Boolean = True
-    Public Property Verify() As Boolean
-        Get
-            Return _Verify
-        End Get
-        Set(ByVal value As Boolean)
-            _Verify = value
-        End Set
-    End Property
-
-    Private _UserAndPass As Boolean = False
-
-
-
-    Public Sub New(Optional ByVal UserAndPass As Boolean = False, Optional ByVal Title As String = "Security")
-        ' This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        ' Add any initialization after the InitializeComponent() call.
-        Me.Text = Title
-
-        If UserAndPass = True Then
-            _UserAndPass = True
-            lblPassword.Text = "Username:"
-            lblVerify.Text = "Password:"
-            txtPassword.UseSystemPasswordChar = False
-            txtVerify.UseSystemPasswordChar = True
-        End If
-    End Sub
-
-    Private Sub btnCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnCancel.Click
-        Me.DialogResult = Windows.Forms.DialogResult.Cancel
-    End Sub
-
-    Private Sub btnOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOK.Click
-        If Verify = True And _UserAndPass = False Then
-            If VerifyOK() Then
-                Me.DialogResult = Windows.Forms.DialogResult.OK
-            End If
-        Else
-            Me.DialogResult = Windows.Forms.DialogResult.OK
-        End If
-    End Sub
-
-    Private Function VerifyOK() As Boolean
-        If txtPassword.Text.Length >= 3 Then
-            If txtPassword.Text = txtVerify.Text Then
-                Return True
-            Else
-                lblStatus.Visible = True
-                lblStatus.Text = "Passwords don't match!"
-                Return False
-            End If
-        Else
-            lblStatus.Visible = True
-            lblStatus.Text = "3 characters is minimum!"
-            Return False
-        End If
-    End Function
-
-    Private Sub frmPassword_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-        If Verify = False Then
-            Me.Height = 124
-            Me.lblVerify.Visible = False
-            Me.txtVerify.Visible = False
-        End If
-    End Sub
-
-    Private Sub txtPassword_GotFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPassword.GotFocus
-        If Me.txtPassword.TextLength > 0 Then
-            Me.txtPassword.SelectionStart = 0
-            Me.txtPassword.SelectionLength = Me.txtPassword.TextLength
-        End If
-    End Sub
-
-    Private Sub txtVerify_GotFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtVerify.GotFocus
-        If Me.txtVerify.TextLength > 0 Then
-            Me.txtVerify.SelectionStart = 0
-            Me.txtVerify.SelectionLength = Me.txtVerify.TextLength
-        End If
-    End Sub
-
-
-    Private Sub txtPassword_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtPassword.TextChanged
-        If txtPassword.Text = "ijustwannaplay" Then
-            pbLock.Visible = False
-            btnOK.Visible = False
-            btnCancel.Visible = False
-            txtPassword.Visible = False
-            txtVerify.Visible = False
-            lblPassword.Visible = False
-            lblStatus.Visible = False
-            lblVerify.Visible = False
-            AcceptButton = Nothing
-            CancelButton = Nothing
-            BackColor = Color.DimGray
-            Me.Text = "SnakeFX Lite"
-            pnlImage.Top = (Me.ClientSize.Height / 2) - (Me.pnlImage.Height / 2)
-            lblTips.Visible = True
-
-            Easter.Snake.Game.CreatePicBox(pnlImage)
-            Easter.Snake.Game.Mode = Easter.Snake.Game.GameMode.Welcome
-            Easter.Snake.Game.SetupGame()
-            txtSnake.Focus()
-        End If
-    End Sub
-
-    Private Sub txtSnake_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles txtSnake.KeyDown
-        Easter.Snake.Game.CheckKeyPress(e)
-    End Sub
-End Class

mRemoteV1/Forms/frmMain.Designer.vb

@@ -23,6 +23,21 @@ Partial Class frmMain
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container
+        Dim DockPanelSkin3 As WeifenLuo.WinFormsUI.Docking.DockPanelSkin = New WeifenLuo.WinFormsUI.Docking.DockPanelSkin
+        Dim AutoHideStripSkin3 As WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin = New WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin
+        Dim DockPanelGradient7 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient15 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPaneStripSkin3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin = New WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin
+        Dim DockPaneStripGradient3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient
+        Dim TabGradient16 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPanelGradient8 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient17 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPaneStripToolWindowGradient3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient
+        Dim TabGradient18 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim TabGradient19 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPanelGradient9 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient20 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim TabGradient21 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
         Me.pnlDock = New WeifenLuo.WinFormsUI.Docking.DockPanel
         Me.msMain = New System.Windows.Forms.MenuStrip
@@ -59,17 +74,19 @@ Partial Class frmMain
         Me.mMenToolsExternalApps = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenToolsPortScan = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenToolsSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenToolsUpdate = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenToolsComponentsCheck = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenToolsOptions = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenInfo = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenInfoHelp = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenInfoSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenInfoDonate = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenInfoWebsite = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfovRD08 = New System.Windows.Forms.ToolStripMenuItem
+        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.mMenInfoAnnouncments = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenInfoAbout = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenSep3 = New System.Windows.Forms.ToolStripSeparator
         Me.lblQuickConnect = New System.Windows.Forms.ToolStripLabel
@@ -83,6 +100,7 @@ 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.mMenViewResetLayout = New System.Windows.Forms.ToolStripMenuItem
         Me.msMain.SuspendLayout()
         Me.tsContainer.ContentPanel.SuspendLayout()
         Me.tsContainer.TopToolStripPanel.SuspendLayout()
@@ -95,24 +113,69 @@ Partial Class frmMain
         '
         Me.pnlDock.ActiveAutoHideContent = Nothing
         Me.pnlDock.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pnlDock.DockBackColor = System.Drawing.SystemColors.Control
         Me.pnlDock.DockLeftPortion = 230
         Me.pnlDock.DockRightPortion = 230
         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, 449)
+        DockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight
+        DockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight
+        AutoHideStripSkin3.DockStripGradient = DockPanelGradient7
+        TabGradient15.EndColor = System.Drawing.SystemColors.Control
+        TabGradient15.StartColor = System.Drawing.SystemColors.Control
+        TabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark
+        AutoHideStripSkin3.TabGradient = TabGradient15
+        DockPanelSkin3.AutoHideStripSkin = AutoHideStripSkin3
+        TabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight
+        TabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight
+        TabGradient16.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripGradient3.ActiveTabGradient = TabGradient16
+        DockPanelGradient8.EndColor = System.Drawing.SystemColors.Control
+        DockPanelGradient8.StartColor = System.Drawing.SystemColors.Control
+        DockPaneStripGradient3.DockStripGradient = DockPanelGradient8
+        TabGradient17.EndColor = System.Drawing.SystemColors.ControlLight
+        TabGradient17.StartColor = System.Drawing.SystemColors.ControlLight
+        TabGradient17.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripGradient3.InactiveTabGradient = TabGradient17
+        DockPaneStripSkin3.DocumentGradient = DockPaneStripGradient3
+        TabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption
+        TabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
+        TabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption
+        TabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText
+        DockPaneStripToolWindowGradient3.ActiveCaptionGradient = TabGradient18
+        TabGradient19.EndColor = System.Drawing.SystemColors.Control
+        TabGradient19.StartColor = System.Drawing.SystemColors.Control
+        TabGradient19.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripToolWindowGradient3.ActiveTabGradient = TabGradient19
+        DockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight
+        DockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight
+        DockPaneStripToolWindowGradient3.DockStripGradient = DockPanelGradient9
+        TabGradient20.EndColor = System.Drawing.SystemColors.GradientInactiveCaption
+        TabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
+        TabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption
+        TabGradient20.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripToolWindowGradient3.InactiveCaptionGradient = TabGradient20
+        TabGradient21.EndColor = System.Drawing.Color.Transparent
+        TabGradient21.StartColor = System.Drawing.Color.Transparent
+        TabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark
+        DockPaneStripToolWindowGradient3.InactiveTabGradient = TabGradient21
+        DockPaneStripSkin3.ToolWindowGradient = DockPaneStripToolWindowGradient3
+        DockPanelSkin3.DockPaneStripSkin = DockPaneStripSkin3
+        Me.pnlDock.Skin = DockPanelSkin3
         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(3, 0)
         Me.msMain.Name = "msMain"
-        Me.msMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.msMain.Size = New System.Drawing.Size(323, 24)
+        Me.msMain.Padding = New System.Windows.Forms.Padding(2, 2, 0, 2)
+        Me.msMain.Size = New System.Drawing.Size(274, 24)
         Me.msMain.Stretch = False
         Me.msMain.TabIndex = 16
         Me.msMain.Text = "Main Toolbar"
@@ -120,9 +183,8 @@ Partial Class frmMain
         'mMenFile
         '
         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.Image = CType(resources.GetObject("mMenFile.Image"), System.Drawing.Image)
         Me.mMenFile.Name = "mMenFile"
-        Me.mMenFile.Size = New System.Drawing.Size(51, 20)
+        Me.mMenFile.Size = New System.Drawing.Size(37, 20)
         Me.mMenFile.Text = "&File"
         '
         'mMenFileNew
@@ -130,7 +192,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
@@ -138,20 +200,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
@@ -160,48 +222,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.Image = CType(resources.GetObject("mMenView.Image"), System.Drawing.Image)
+        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.mMenViewResetLayout, Me.mMenViewSep2, Me.mMenViewQuickConnectToolbar, Me.mMenViewExtAppsToolbar, Me.mMenViewSep3, Me.mMenViewFullscreen})
         Me.mMenView.Name = "mMenView"
-        Me.mMenView.Size = New System.Drawing.Size(58, 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
         '
@@ -209,7 +270,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
@@ -218,7 +279,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
@@ -227,7 +288,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
@@ -236,27 +297,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
@@ -264,7 +325,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
@@ -272,7 +333,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
@@ -280,109 +341,101 @@ 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.Text = "Fullscreen (Kiosk Mode)"
+        Me.mMenViewFullscreen.ShortcutKeys = System.Windows.Forms.Keys.F11
+        Me.mMenViewFullscreen.Size = New System.Drawing.Size(228, 22)
+        Me.mMenViewFullscreen.Text = "Full Screen"
         '
         'mMenTools
         '
-        Me.mMenTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenToolsSSHTransfer, Me.mMenToolsUVNCSC, Me.mMenToolsExternalApps, Me.mMenToolsPortScan, Me.mMenToolsSep1, Me.mMenToolsUpdate, Me.mMenToolsComponentsCheck, Me.mMenToolsOptions})
-        Me.mMenTools.Image = CType(resources.GetObject("mMenTools.Image"), System.Drawing.Image)
+        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(61, 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)
-        '
-        'mMenToolsUpdate
-        '
-        Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update
-        Me.mMenToolsUpdate.Name = "mMenToolsUpdate"
-        Me.mMenToolsUpdate.Size = New System.Drawing.Size(173, 22)
-        Me.mMenToolsUpdate.Text = "Update"
+        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.mMenInfoDonate, Me.mMenInfoWebsite, Me.mMenInfovRD08, Me.mMenInfoSep2, Me.mMenInfoAnnouncments, Me.mMenInfoAbout})
-        Me.mMenInfo.Image = CType(resources.GetObject("mMenInfo.Image"), System.Drawing.Image)
+        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(53, 20)
-        Me.mMenInfo.Text = "&Info"
+        Me.mMenInfo.Size = New System.Drawing.Size(44, 20)
+        Me.mMenInfo.Text = "&Help"
         Me.mMenInfo.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal
         '
         'mMenInfoHelp
@@ -390,53 +443,71 @@ 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(202, 22)
-        Me.mMenInfoHelp.Text = "Help"
+        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(199, 6)
-        '
-        'mMenInfoDonate
-        '
-        Me.mMenInfoDonate.Image = Global.mRemote.My.Resources.Resources.Donate
-        Me.mMenInfoDonate.Name = "mMenInfoDonate"
-        Me.mMenInfoDonate.Size = New System.Drawing.Size(202, 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(202, 22)
+        Me.mMenInfoWebsite.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoWebsite.Text = "Website"
         '
-        'mMenInfovRD08
+        'mMenInfoDonate
         '
-        Me.mMenInfovRD08.Image = Global.mRemote.My.Resources.Resources.vRD08R1
-        Me.mMenInfovRD08.Name = "mMenInfovRD08"
-        Me.mMenInfovRD08.Size = New System.Drawing.Size(202, 22)
-        Me.mMenInfovRD08.Text = "visionapp Remote Desktop"
+        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(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(199, 6)
-        '
-        'mMenInfoAnnouncments
-        '
-        Me.mMenInfoAnnouncments.Image = Global.mRemote.My.Resources.Resources.News
-        Me.mMenInfoAnnouncments.Name = "mMenInfoAnnouncments"
-        Me.mMenInfoAnnouncments.Size = New System.Drawing.Size(202, 22)
-        Me.mMenInfoAnnouncments.Text = "Announcments"
+        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(202, 22)
-        Me.mMenInfoAbout.Text = "About"
+        Me.mMenInfoAbout.Size = New System.Drawing.Size(190, 22)
+        Me.mMenInfoAbout.Text = "About mRemoteNG"
         '
         'mMenSep3
         '
@@ -446,15 +517,15 @@ Partial Class frmMain
         'lblQuickConnect
         '
         Me.lblQuickConnect.Name = "lblQuickConnect"
-        Me.lblQuickConnect.Size = New System.Drawing.Size(47, 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, 23)
+        Me.cmbQuickConnect.Size = New System.Drawing.Size(120, 25)
         '
         'tsContainer
         '
@@ -466,7 +537,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, 449)
         Me.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill
         '
         'tsContainer.LeftToolStripPanel
@@ -485,16 +557,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
@@ -503,8 +576,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
         '
@@ -521,17 +594,15 @@ 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(39, 49)
         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(129, 26)
         '
         'cMenToolbarShowText
@@ -551,6 +622,12 @@ Partial Class frmMain
         '
         Me.tmrAutoSave.Interval = 10000
         '
+        'mMenViewResetLayout
+        '
+        Me.mMenViewResetLayout.Name = "mMenViewResetLayout"
+        Me.mMenViewResetLayout.Size = New System.Drawing.Size(228, 22)
+        Me.mMenViewResetLayout.Text = "Reset Layout"
+        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -559,9 +636,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)
@@ -589,7 +665,6 @@ Partial Class frmMain
     Friend WithEvents mMenFileSaveAs As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenFileSep2 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents mMenFileExit As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsUpdate As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenToolsSep1 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents mMenToolsOptions As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenInfoHelp As System.Windows.Forms.ToolStripMenuItem
@@ -631,8 +706,12 @@ Partial Class frmMain
     Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents mMenToolsUVNCSC As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenToolsComponentsCheck As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoAnnouncments As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfovRD08 As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenInfoAnnouncements As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenInfoSep2 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents mMenInfoBugReport As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents mMenInfoForum As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenToolsUpdate As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenViewResetLayout As System.Windows.Forms.ToolStripMenuItem
 
 End Class

mRemoteV1/Forms/frmMain.Designer.vb~RF25758897.TMP

@@ -1,363 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmMain
-    Inherits System.Windows.Forms.Form
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.pnlDock = New WeifenLuo.WinFormsUI.Docking.DockPanel
-        Me.msMain = New System.Windows.Forms.MenuStrip
-        Me.mMenFile = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileNew = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileLoad = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenFileSave = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSaveAs = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSep2 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenFileExit = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenView = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewAddConnectionPanel = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewConnectionPanels = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenViewConnections = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewConfig = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewErrorsAndInfos = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSessions = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewScreenshotManager = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenViewSep2 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenViewFullscreen = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenTools = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsUpdate = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsSSHTransfer = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenToolsSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenToolsOptions = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenQuickConnect = New System.Windows.Forms.ToolStripLabel
-        Me.cmbQuickConnect = New System.Windows.Forms.ToolStripComboBox
-        Me.mMenPlay = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfo = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoHelp = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoWebsite = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenInfoSep1 = New System.Windows.Forms.ToolStripSeparator
-        Me.mMenInfoAbout = New System.Windows.Forms.ToolStripMenuItem
-        Me.msMain.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'pnlDock
-        '
-        Me.pnlDock.ActiveAutoHideContent = Nothing
-        Me.pnlDock.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlDock.DockLeftPortion = 230
-        Me.pnlDock.DockRightPortion = 230
-        Me.pnlDock.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow
-        Me.pnlDock.Location = New System.Drawing.Point(0, 27)
-        Me.pnlDock.Name = "pnlDock"
-        Me.pnlDock.Size = New System.Drawing.Size(842, 496)
-        Me.pnlDock.TabIndex = 13
-        '
-        'msMain
-        '
-        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.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFile, Me.mMenView, Me.mMenTools, Me.mMenSep1, Me.mMenQuickConnect, Me.cmbQuickConnect, Me.mMenPlay, Me.mMenInfo})
-        Me.msMain.Location = New System.Drawing.Point(0, 0)
-        Me.msMain.Name = "msMain"
-        Me.msMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.msMain.Size = New System.Drawing.Size(842, 27)
-        Me.msMain.TabIndex = 16
-        Me.msMain.Text = "Main Toolbar"
-        '
-        'mMenFile
-        '
-        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.Image = Global.mRemote.My.Resources.Resources.File
-        Me.mMenFile.Name = "mMenFile"
-        Me.mMenFile.Size = New System.Drawing.Size(51, 23)
-        Me.mMenFile.Text = "&File"
-        '
-        'mMenFileNew
-        '
-        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(241, 22)
-        Me.mMenFileNew.Text = "New Connections"
-        '
-        'mMenFileLoad
-        '
-        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(241, 22)
-        Me.mMenFileLoad.Text = "Open Connections"
-        '
-        'mMenFileSep1
-        '
-        Me.mMenFileSep1.Name = "mMenFileSep1"
-        Me.mMenFileSep1.Size = New System.Drawing.Size(238, 6)
-        '
-        'mMenFileSave
-        '
-        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(241, 22)
-        Me.mMenFileSave.Text = "Save Connections"
-        '
-        'mMenFileSaveAs
-        '
-        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(241, 22)
-        Me.mMenFileSaveAs.Text = "Save Connections As"
-        '
-        'mMenFileSep2
-        '
-        Me.mMenFileSep2.Name = "mMenFileSep2"
-        Me.mMenFileSep2.Size = New System.Drawing.Size(238, 6)
-        '
-        'mMenFileExit
-        '
-        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(241, 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.mMenViewErrorsAndInfos, Me.mMenViewSessions, Me.mMenViewScreenshotManager, Me.mMenViewSep2, Me.mMenViewFullscreen})
-        Me.mMenView.Image = Global.mRemote.My.Resources.Resources.View
-        Me.mMenView.Name = "mMenView"
-        Me.mMenView.Size = New System.Drawing.Size(58, 23)
-        Me.mMenView.Text = "&View"
-        '
-        'mMenViewAddConnectionPanel
-        '
-        Me.mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel"
-        Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewAddConnectionPanel.Text = "Add Connection Panel"
-        '
-        'mMenViewConnectionPanels
-        '
-        Me.mMenViewConnectionPanels.Name = "mMenViewConnectionPanels"
-        Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewConnectionPanels.Text = "Connection Panels"
-        '
-        'mMenViewSep1
-        '
-        Me.mMenViewSep1.Name = "mMenViewSep1"
-        Me.mMenViewSep1.Size = New System.Drawing.Size(187, 6)
-        '
-        'mMenViewConnections
-        '
-        Me.mMenViewConnections.Checked = True
-        Me.mMenViewConnections.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewConnections.Name = "mMenViewConnections"
-        Me.mMenViewConnections.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewConnections.Text = "Connections"
-        '
-        'mMenViewConfig
-        '
-        Me.mMenViewConfig.Checked = True
-        Me.mMenViewConfig.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewConfig.Name = "mMenViewConfig"
-        Me.mMenViewConfig.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewConfig.Text = "Config"
-        '
-        'mMenViewErrorsAndInfos
-        '
-        Me.mMenViewErrorsAndInfos.Checked = True
-        Me.mMenViewErrorsAndInfos.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos"
-        Me.mMenViewErrorsAndInfos.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewErrorsAndInfos.Text = "Errors and Infos"
-        '
-        'mMenViewSessions
-        '
-        Me.mMenViewSessions.Checked = True
-        Me.mMenViewSessions.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewSessions.Name = "mMenViewSessions"
-        Me.mMenViewSessions.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewSessions.Text = "Sessions"
-        '
-        'mMenViewScreenshotManager
-        '
-        Me.mMenViewScreenshotManager.Name = "mMenViewScreenshotManager"
-        Me.mMenViewScreenshotManager.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewScreenshotManager.Text = "Screenshot Manager"
-        '
-        'mMenViewSep2
-        '
-        Me.mMenViewSep2.Name = "mMenViewSep2"
-        Me.mMenViewSep2.Size = New System.Drawing.Size(187, 6)
-        '
-        'mMenViewFullscreen
-        '
-        Me.mMenViewFullscreen.Name = "mMenViewFullscreen"
-        Me.mMenViewFullscreen.Size = New System.Drawing.Size(190, 22)
-        Me.mMenViewFullscreen.Text = "Fullscreen (Kiosk Mode)"
-        '
-        'mMenTools
-        '
-        Me.mMenTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenToolsUpdate, Me.mMenToolsSSHTransfer, Me.mMenToolsSep1, Me.mMenToolsOptions})
-        Me.mMenTools.Image = Global.mRemote.My.Resources.Resources.Tools
-        Me.mMenTools.Name = "mMenTools"
-        Me.mMenTools.Size = New System.Drawing.Size(61, 23)
-        Me.mMenTools.Text = "&Tools"
-        '
-        'mMenToolsUpdate
-        '
-        Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update
-        Me.mMenToolsUpdate.Name = "mMenToolsUpdate"
-        Me.mMenToolsUpdate.Size = New System.Drawing.Size(160, 22)
-        Me.mMenToolsUpdate.Text = "Update"
-        '
-        'mMenToolsSSHTransfer
-        '
-        Me.mMenToolsSSHTransfer.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
-        Me.mMenToolsSSHTransfer.Name = "mMenToolsSSHTransfer"
-        Me.mMenToolsSSHTransfer.Size = New System.Drawing.Size(160, 22)
-        Me.mMenToolsSSHTransfer.Text = "SSH File Transfer"
-        '
-        'mMenToolsSep1
-        '
-        Me.mMenToolsSep1.Name = "mMenToolsSep1"
-        Me.mMenToolsSep1.Size = New System.Drawing.Size(157, 6)
-        '
-        'mMenToolsOptions
-        '
-        Me.mMenToolsOptions.Image = Global.mRemote.My.Resources.Resources.Options
-        Me.mMenToolsOptions.Name = "mMenToolsOptions"
-        Me.mMenToolsOptions.Size = New System.Drawing.Size(160, 22)
-        Me.mMenToolsOptions.Text = "Options"
-        '
-        'mMenSep1
-        '
-        Me.mMenSep1.Name = "mMenSep1"
-        Me.mMenSep1.Size = New System.Drawing.Size(6, 23)
-        '
-        'mMenQuickConnect
-        '
-        Me.mMenQuickConnect.Name = "mMenQuickConnect"
-        Me.mMenQuickConnect.Size = New System.Drawing.Size(87, 20)
-        Me.mMenQuickConnect.Text = "  &Quick 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, 23)
-        '
-        'mMenPlay
-        '
-        Me.mMenPlay.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.mMenPlay.Image = Global.mRemote.My.Resources.Resources.Play_Quick
-        Me.mMenPlay.Name = "mMenPlay"
-        Me.mMenPlay.Size = New System.Drawing.Size(28, 23)
-        Me.mMenPlay.Text = "Play"
-        '
-        'mMenInfo
-        '
-        Me.mMenInfo.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.mMenInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenInfoHelp, Me.mMenInfoWebsite, Me.mMenInfoSep1, Me.mMenInfoAbout})
-        Me.mMenInfo.Image = Global.mRemote.My.Resources.Resources.Info
-        Me.mMenInfo.Name = "mMenInfo"
-        Me.mMenInfo.Size = New System.Drawing.Size(53, 23)
-        Me.mMenInfo.Text = "&Info"
-        '
-        'mMenInfoHelp
-        '
-        Me.mMenInfoHelp.Image = Global.mRemote.My.Resources.Resources.Help
-        Me.mMenInfoHelp.Name = "mMenInfoHelp"
-        Me.mMenInfoHelp.Size = New System.Drawing.Size(116, 22)
-        Me.mMenInfoHelp.Text = "Help"
-        '
-        'mMenInfoWebsite
-        '
-        Me.mMenInfoWebsite.Image = Global.mRemote.My.Resources.Resources.Website
-        Me.mMenInfoWebsite.Name = "mMenInfoWebsite"
-        Me.mMenInfoWebsite.Size = New System.Drawing.Size(116, 22)
-        Me.mMenInfoWebsite.Text = "Website"
-        '
-        'mMenInfoSep1
-        '
-        Me.mMenInfoSep1.Name = "mMenInfoSep1"
-        Me.mMenInfoSep1.Size = New System.Drawing.Size(113, 6)
-        '
-        'mMenInfoAbout
-        '
-        Me.mMenInfoAbout.Image = Global.mRemote.My.Resources.Resources.mRemote
-        Me.mMenInfoAbout.Name = "mMenInfoAbout"
-        Me.mMenInfoAbout.Size = New System.Drawing.Size(116, 22)
-        Me.mMenInfoAbout.Text = "About"
-        '
-        'frmMain
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(842, 523)
-        Me.Controls.Add(Me.pnlDock)
-        Me.Controls.Add(Me.msMain)
-        Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon
-        Me.MainMenuStrip = Me.msMain
-        'Me.MaximumSize = New System.Drawing.Size(20000, 4000)
-        Me.Name = "frmMain"
-        Me.Text = "mRemote"
-        Me.msMain.ResumeLayout(False)
-        Me.msMain.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents pnlDock As WeifenLuo.WinFormsUI.Docking.DockPanel
-    Friend WithEvents msMain As System.Windows.Forms.MenuStrip
-    Friend WithEvents mMenFile As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenView As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenTools As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenQuickConnect As System.Windows.Forms.ToolStripLabel
-    Friend WithEvents mMenPlay As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfo As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileNew As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileLoad As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenFileSave As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSaveAs As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSep2 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenFileExit As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsUpdate As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenToolsOptions As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoHelp As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoWebsite As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenInfoSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenInfoAbout As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConnectionPanels As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewSep1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenViewSessions As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConnections As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewConfig As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewErrorsAndInfos As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewScreenshotManager As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenViewAddConnectionPanel As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents cmbQuickConnect As System.Windows.Forms.ToolStripComboBox
-    Friend WithEvents mMenViewSep2 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents mMenViewFullscreen As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenToolsSSHTransfer As System.Windows.Forms.ToolStripMenuItem
-
-End Class

mRemoteV1/Forms/frmMain.resx

@@ -118,32 +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="mMenFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAsFJREFUOE9Nk0tP
-        E1EYhls36MYfYhQhGGOCUUMCBiUxirpxg9ACSqJxodEEDEFMYKt4SUyMK9cGikgvNEBbqNwUekG5FAoU
-        6MW208uZzqWv35lCyyTPOTOZOc+83zdn9AB0tS8nmk6cLLt3TK+r0ul0xwk9URhBA/I6JZ9fS8Rg0wvx
-        p5MfGiTtPj+4oP61YzIqsOi/tKjE0iJiqRJRQQTdgz8koGswCOPASqa6faiMr+Now/U+Z1jISsrUhgT3
-        pgx3UMb0hgxnIIfxFRE/fGmIMmBazqLr2yYMb1aylzpMmkQTNPS7sslMDnNbCua3ZJplzGiSHCZWRZh9
-        GRKomAspcO9I6P0eRM0L+9dSgn4X44IFEvzalrGwrWiyn5sSHGs5WP9kEdhPa6WkmIz9eAbUN8p0WAIJ
-        EukclugNHmJpV8VvTcJTSFoKC6UY9qQwtJhEgvpU1+NgRcG1PheLk8C/m4ePFnsJT0jFIslmqSdTgYLE
-        9jcLC/UhnpZQ98pVEtSTIEaC5b28hp/wkWxpp5BEk1CSSSqHi2IkqO05Irja62LRVA6+4mK1mIRLeF9m
-        qRyexEWEBQk13UcEtT1OFqHvzd/KSzjES2UcppgLKpjhn5gQqJGXO52lEmq6nWwvKcK7U4hdgJpJ8BLm
-        afEs4aa9MU0CJqmofjZeElzpdLBQguGOScRdE8PtYYZGOm8cFHFriGncHGS4cUAmp+D8Y3tJcPH5ONuK
-        MTyaUPFlGfjsBz75gI80v6f5HTHgBd56AOOYjDSVUNlmKQkuPLFnApFMvt2uos2maA8ZxhSNZrpuscm4
-        b5XRxK+tCt+V6hnDaKq4D6oeWNfDSVEIRJm6HsliPZzF6gGRlAQO73yKKaD/TVXz+cSpphHKdLATzz20
-        dFQYzdbKVkusotXMihjN7CxRbhwtYNCIn24esZU3j7RwwX/Yvio5QNtWmQAAAABJRU5ErkJggg==
-</value>
-  </data>
   <data name="mMenViewConfig.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
-        Cw0B7QfALAAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAgAA
+        CwIBm8luNgAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
         pA1bmfODND+DpqUzt5Vfm7NtZx9n52xnui9zm/m5p9/vlINcHnjhnPf83ud5n/d9fhIAkv9FQ0NDrU6n
         29fr9cnS0tKqq87lFQ8MDNxqaWm5oVKpjPFEEql0Gp2dnYb29vbrGo3m9mWgHIDBYGh7PzmZ1en1gtE4
         kgoLEYTCAmLxOE5OTzExMXHw2mAQTCZT9vmLF8oLIBFAJpNde/N2iGP5EOKJhBh70SjYIAchEsHu3h4O
@@ -161,201 +143,145 @@
   <data name="mMenViewSessions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
-        Cw0B7QfALAAAA4RJREFUOE9lk3tMk1cchg8a562VKXGZUxMNy8a8zM3bNIW1Omi/Xj5LKa2UYgvSyxDa
-        CrSFUq4lghTKrMMKBQ0mRggiMrIJjuDGNk2WbfES4oIgGqNRZ5TpGqmG9t0H/qNykifnknOe8+aXcyIA
-        kNebfmPU9HRqdVZExMfL3yX+99jhrcHJMHnyfNazkaezy8dfhJoRDk++2sgIXqcwdjGZws5ZEunaEXnJ
-        R78Dj2QuvLJI1EgWw7iNHUjZvlyaRcUQI/+jmQJvPItMcWjH/FW+xGX4rlSCs0UUHPFRMHNYSNswF+XK
-        T6s6K5TklDNxpqApOYpM0SBZuKLDQYeej13E45+86K3X4UKTFd8fsaIzb6PryjE9+bMxnZCvdRmv0O+N
-        MKarVUWC1bfLuKx/7LGsRxbxuhdD/a0IXO3Ay6FOBId7caenOJwhV+hiZMfJetlhQrIz90yTpdu7uUAZ
-        N+JRRMNNL4U7eRX2cRahJFOIe321+PeXBoz/WAG3STWxYMtBw6Kdx8gCbiMhVtH6afKFG4rL6WiU8JfC
-        KV6JHOZwbsIHkMTMQ5XLgtp6F3wtfrT+FsJnioGbc7Y1f8XiMYJcDpvkcRaS7C1znBVpseg/mo8zVVq4
-        M7aiyZoIQ0I08s9dhvpnIKkHqBwEDv0QxIfirrFI7mEO0Yo2EwUVR3QJ6wxDHeUIjvYjeK0DTy76MTHc
-        h4F6LfStI0htD0N+PAT+EUDfPI6+E3605fJvEL5QTLYL1GQTL0X8bU5C4L9LPoSGmavGzuPBgAd2oxxy
-        /32knASUbUBaO5Ok6DIGWypxp3bTJBGJREQoEsfEcuMvlDgLQ06bGaerM9FQqEahLRcmkxnCrBokt9zF
-        7lOPwTtwCxz66L3eEsEfw63pNiKgk1bsM1kGpbt2wWq1Qac3oLu7Gz6fD3s0Wlj278dupRJfCPMCn4hP
-        3l3J77oep/Rn/9qge3+0LWc+cWp3dvk9ZXBVHoBKpUJqaiq8Xi9qatyQSCSQyWSw2QvwTWk27Cruibef
-        Pnno+Rx/tZchr6AYdXV1TGQTaJoGRVEwGo2w2ZhUBiMe9ZZirGLtyxmCkUb52R4nH0mqdDgcDlRXV0/3
-        Go0GbrcbZrMZAkqI3w/y8XdjClPGNz8fGW03sfvq1Gu/jBe6mILeVigU41KpdIIZT8jl8gCPx7tJUSLd
-        Vb9mzY02C/ttwf8MViWur2j6ngAAAABJRU5ErkJggg==
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAgAA
+        CwIBm8luNgAAA4RJREFUOE9lk21MU3cUh/9L5pxabCoz2YsmLiwbDp0TddMU1sLo7e3LtZTSQim2ILft
+        ENoKtIVSXksEKRStwwoVDSZGCGPIyDbYCG5s02TZFudCtiDIjNFszjiWrFmZWf3tln2Z8uHJOV/Oc345
+        ySEAyP9hd24gcUo4zKmJrzRlJk6HVIJol4IfrcsQ3M1LfaaUShE8KdnKJ3EeGY6LatIEy7iFG/i+DP6V
+        EPMUAsrVCKr5aFcKYN2bEMnf94KqlE4mVurllYJgFo/EOZ6xZkso+zl80KDExVoanqxE2IU8FO5YjSbd
+        a63DzTpywZu9UtCbm0jidCvXbRryMLG/Fi7j/mdBjHexuNTrxIcnnRiuTPV9f8ZMvu0pIuQdtvg/zAef
+        sBYZ9LXSF282ini/udN49xyKbX/PTPYjcm0ID2aGsTQ7jltjdQ+LNVo2WX2WbFefIKSs5MAypezB3dW6
+        9LmANgl+ZiP8uVtwSLge9SUy3JnowB9fdGPx02b4bfro2j1HLeszz5C1oh5CnPLty1TJdtQ1MUmopzbC
+        q9iMcm64QvI8lMlPo9XnQEeXD6G+MPq/iuF17dSNVXtPv80Tc4IKYQKpFK4jZXtWeZsL0zB5qgrvt5rg
+        L34Dvc5sWCRJqPr4KgyfAzljQMs0cPyjJbykGFngi04IiUm+m2jpdMJKtllmhpqwND+JpR+G8PvlMKKz
+        E5jqMsHcP4eCwYfQnI2BOgmYTy9i4lwYAxXUdULJFGSf1EB2ifMV75ZLIn9eCSE2y61a+AS/TgXgtmqg
+        Cf+C/POAbgAoHOSS1F7FdF8LbnXs+ofI5XIikyuS00RZl+q9NTGvy4732krQXWNAjasCNpsdstJ25Pbd
+        Rt6F+xAf+RlC5tSd8XrpN7P9RS4iZXI2HbI5plX798PpdIE1WzA6OopQKIQDRhMchw8jT6fDm7LKyFbF
+        +dubqZEf03Xhsi+72WfnB8rXEK8pcyQcaISv5Qj0ej0KCgoQDAbR3u6HUqmEWq2Gy12NYw1lcOtF5x7/
+        HXI3sBPfDTaisroOnZ2dXGQbGIYBTdOwWq1wubhUFivujTdgoTnlwQrBXI/m4piXQo6+CB6PB21tbcvV
+        aDTC7/fDbrdDSsvw9VEKP/Xkc2d89HvJ/KAtYaLTkPJWlszHHfSmVqtdVKlUUa6PajSaiFgsvkHTcvZa
+        2Pjq9QFHwuOCfwHdFSeIQMKMzwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="mMenViewScreenshotManager.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjxJREFUOE+lk+9P
-        EnEcx+uP6lnrx9aj1mqz5uxBtkbMRa3WcukwE9F5JvFDTwFBusgChZISRZOwglEy5VduOZu1msWPAd4B
-        J+ej3n2PBwTCaqvbXrfv/Xp93vt8P3cQwIH/OkSB1R1RMy+iqTFnmNPYG2Aj96qgHWHO7Apry8XFEzMb
-        TWey2Z9Fnge/K/yRbFFAmi3A8CzCVgRi5UKRx9jcNtRzMSjmp2Fdo+GI98MWU2LUr8KVBybcsgTQYfmI
-        TEHAqDPKVQRaElusbJjfBrWwCOsqjakP7TCvtsGwIoExJIPK2wfZ+BPImQ2kuQaCAhGML3yHwjMJO6lq
-        DEkx/O4CVP7zoN62QOO/iYsj99H9aBMprkQSRGoTcERgXvyBHrcVD8Pd0AVbQb1pRu9yE+6+agLlu4ZW
-        3T30Pv6EJLtbL2B5AZaXCVBuD2j/ILRBCRTLZyFfOoMeXwvuPO+ETD+JfvsWkjsNEuyQ7jLeJGhPHJ0O
-        BtTsDQz5pKC8l9DlvIrL9DCJH8Tg9Od6gbj3OdJZqy9Vloy4Y7itbMWA5gQo1XEo+pqhtL2HZuYrVE+/
-        ILE/gSjI5gXIHafRMXUK7baTMHUdwjpzDnGCa+Ao2kzHIDUegUR/uF6gtq1xOSLwb72uEFx3IbQygbjr
-        OgKbSzXPErkSaEfVLmjKglLNS9Wy/etETqgV6J3hbzk2jzxpZJ7fA1dGAEeu2Tr2kCmPcvT3KE+4IkOm
-        mWhAHA4x2t8g/wFHvtFVRllc/Cu/AAZ/6ElKbpVOAAAAAElFTkSuQmCC
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjpJREFUOE+lk91P
+        UnEYx/2numu9bF21Vps1ZxfRGjEXtVrLpcNMROcxiRc9CgoSkQUKJSWKJmEFo2TKW241nbWaxcsAzwGO
+        HK/69jvngkBYXXjx3X5vz+f57nmeXxOApsNIDLZ5ohrrq1h6zBVhtY4GspOzKtHOCGt2R3RCrAiwzsUy
+        2Vzud4njwO3x/1SuxCPDFGF8EWUqACFzscRhbH4Hmvk4lAszsK3TcCb6YY+rMBpQ49ojE+5YguiwfEa2
+        yGPUFWMrAB2xLWQ2LuyAWlyCbY3G9Kd2mNfaYFyVYjwsh9rXB/nEMyisX5BhGwCKBDCx+BNK7xQcJOt4
+        WIbhD5egDlwE9b4V2sBtXB55iO4nm0izZeIgWuuAJQDz0i/0eGx4HOmGPiQB9a4FvSvNuP+mGZT/BiT6
+        B+h9uoUUs1cPYDgeltdJUB4v6MAgdCEplCvnoVg+hx5/K+697ITcMIV+xzZSuw0c7JLqWn0p0N4EOp1W
+        UHO3MOSXgfJdQZfrOq7Sw8R+CIMzX+sBQu/zpLI2f1qEjHjiuKuSYEB7CpT6JJR9LVDZP0I7+x3q59+Q
+        POhAAOQKPBTOs+iYPoN2+2mYuo5gw3oBCSL3wHG0mU5ANn4MUsPReoDGvs7mCSCw/bai0IYb4dVJJNw3
+        EdxcrrlL5sugnVVd0IqAcs2jatjBdTLP1wIMrsiPPFNAgRSywO2DFcWDJXumTvvIiqMc+zvKk+7okGk2
+        FhSGQ7D2P5F/wJIYfWWUD/Od/wAx6RUqGJsn2QAAAABJRU5ErkJggg==
 </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=
-</value>
-  </data>
-  <data name="mMenView.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAvBJREFUOE+lk1lP
-        E1EYhuvdqNF4bYKBACKgFpU6QCnQlmmhdKd0h0IXKEV2jYQE0EGDokFQEEGs0EIBa6hlExDZjJCIiRhC
-        RRZpUa/8EcevF4qICRdOci4mM+97nuebMwcQQpT/ui4vmPHyeTNe+saEF03rccsrHZ47qsX1L5R45rN0
-        XNktwtOtPFzYysFTm5i4f8M/F6V8Po8omTNhhVN6LH88CzMNa7AclwLT9ksxhU2ISTtSMX4LgXHvJWGs
-        W3RiT0HxrJG49DrnIJCQQEKWzpnIoik9aZnQkaYRLZnjUpLa/nRSYReRglZOJ5BUA0n1ryJKwWQ2kfcy
-        8xCQ2AqnDTTLRHZc7og20eBWsXTODI7aIeZldPL54naumHWbUQkkPCCx/i4AXwJ8DxfNGOygwICi1bK3
-        eZ9LZo1rQLZuHs/cMA6rN7MH5Jsqh/i73CbYgLIfQLIIJIsU8CXA9wgMz24cUidDAQKCSuOgqj57QPEw
-        0ylzqHslgxCcFLdxP0JwntuQtAUkbiBBFE2vhJB3CY6aRjR23XM5D2aCTMPqDijuz3LKRtUOyYy8i78g
-        eZz6nveAvc5tTFpi1tG3mXVxQ/RrNESRPeUTojbuMUDsVvaIpTATBEpjEJ5TOSTvwH9J3J6ynNbM9hB3
-        GF4IrtBraNtxNdFuWkUUogASAS6E0i4cE7QQVTATpOmTehR24Zr0CW9T0Ep4UxqZXnZ9vC+hFvdB+BOt
-        guqLvkp1UUsjdg4FkFiBRAroSNUj+iCzpi0LH3FWUppYHnY9YzXhRsxqbNUFDwRXqCXh3rPF4c4IS+hO
-        AZBYgcQKM0Hg+zWtOfkbpyERXOnb8dcv+vDKc97zV874g1vh+aFfYDlCjUG7j6X/2wIJApIh3n3WIHGX
-        4U68GesC3wHwdUaVRfadLgzrOWUOsYUYAruCdAF7C4AEAQkCZ5RQG4MAGwE28vtGFpxEYbnBKFgfiAKz
-        AtAJzfG9BX+f9f3ud/1Z+738r+c/ASsl+hh77k39AAAAAElFTkSuQmCC
+        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=
-</value>
-  </data>
-  <data name="mMenTools.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
-        Cw0B7QfALAAAAtpJREFUOE91Ud1P0mEYfbvor8itudZFV/0JXbXmWmuurS66aF7YbbRqydAMkTENUH4Q
-        gnzYhvgxSUpA5EMlQHCTNFCwZup0KmFJV16RnJ4Hw7W2ftvZ+9vzvOc85znvud7eXvHXVzk5ORHVanWD
-        zkGq93OvoaFBRrWHAC7TKUql0vkzjtVqFVqttg6sr68jmUyiu7v7WKlUyhwOh8xmsx3v7e2hXC7DbDaD
-        6qIOwQJUFHq9ngGPx4N4PI5YLAaVSlUgcmF3dxfFYhGhUAhGo5Hrog4WqLAqN3Q6nSAkwuEwEokE1Gp1
-        xWKxVHj6ysoKJEmKU602iFyD1q8ImlBha6zOF/r6+j5Eo1GkUiloNBoW/7W5uYmFhQVwjwewS16V+8Ju
-        txd4AlvkKXxxcXER6XQaPT09VYPBUF1bW6vVWJjd8YqcE7kpCKfTWQuJ92QhnsaETCaDQCDANvFsIIu2
-        wU81V7wa58Mhd3V1yQSlzGCRAu87YDZXOQ92kMvloLDloBzehnxoCy2qSJVz4XD5hW4rV0VdgLMQGG2V
-        EHyBnTkXTEYJ2vHP0E7uwrf4A5Op72hzbuFW56qHIOo4E4C7RcJ0O7A8Bsz3wzmxBMv0AcLLZbhmv8ER
-        KuJt8hBP7Vto6sh6CYJRE4D7gQS/AsiMAHN6wNeO2akI7ESKrvzEaKwEs38ftuABPIlDPCGRG4qslyAE
-        XPcl+OREdgOzOmCK/qdVQMKKiGsEdiJFyIV7vgSTbx+D5GqCRB5bv+K6POsVcNwBloaB6Cvg3XMg8JLI
-        FsB+F+i45NGM70hWEgl/JJG5EqT3e7D4DzAWO8TNjiwEXjcB6TdAkKb6O4H4AGAlUUWjVz26I/5AYtJM
-        5jQP20wRE/FDNKvyJGC4lsFwyykxZgIszYD8olfl3hb/QDL5DhDMHNGrHNWe9p4mnz8NUX01D+UVstxI
-        5AveTiL/B5J8aBOPBjbQaviSIYjfmuK35PAW5YUAAAAASUVORK5CYII=
+        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>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAq5JREFUOE+lk99P
+        UmEcxv1b9E9oreZq1Wrd1da46KILp+ZPoKnlahksZ+kwp1lSamY6FdTUORUFTgIiiCaKgCBwMJFfyoGB
+        cOCo2faELCGrdVEXn7v3+bx73vf7zQKQ9T/8FtaQhzlqxwFPZdsnFRsM/ckSp2VmmpwxRnlThr2cXy87
+        JVDaGNasNeF3Bg6xucvA4aNTOHcSsHoTGFkM+ocWAqyfJWkBsR5nSU2x+Ba1j7UvYYjnPBCM2VA/soEu
+        YhM6axB2P40PCk+8i9hOS1ICyVo0e3I14tsMMFiwhVCbDHUSTnhCDNyhBMYWvagRmyBf9cPijqJ1kvQ1
+        j9uzj7MpwehSkL/uiWPFGQF/0IKHPWtIHBwl+faDI9QOGlHTb8C8hYJ6nUKd2MRPC/rm/KQ92bWb2EJ1
+        jwFV3SvwBBOYWvZCad4Bk5QpzT6w2zVonbLC5ArjUbeeTAs6ZC7G4YuBLzKi8r0enE5d8rAW03o3wvQB
+        dsMMemftKG1To/KdFlb3HjhCLZMWtIzbGbs3hscDRrA7tCh/q0HZGw1izFdsUzS4QjWKWhS4m4QrVMHi
+        iSC/SZkRPBObSfN2BEKJHZx2HcqE8yh5PYfil8oUhS8IFDbKUNAoRb14GXonhdt10kyFZB++TO+F1kqh
+        skOXDoai+6D2GOQJZlIUCiQgVt0QJevcqJnIPCJXuJBd/mret2SjIF/xgN2mQkGTHG3jhhTH4fyGCQyr
+        HFAZvbhePea7en80843Hj5EnmGXdaSDiGssOlCYfnouWUNIsRVHjNJ72aiHXu6BY8+Byxcf4xXtDpwfp
+        ZDRv8SWsm08m/X3EBj47AjC6QikWbbvokpiRyxH7z5eL/jzKJ5JrD0ZzrlSN8C5VDJMXuIN0LltMnysb
+        IM+W9vPOFPf9fZn+Za2/A9evBaJ0QokTAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="mMenInfoWebsite.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAA3FJREFUOE9Vkt9P
-        W3UYxmucdy5e+S9wPWO4wMAayuxGoTLEDFnkp7QNtIemNBbKYjcPNVSwSJs5lCnbYIUVKIWtZb9aoF1Z
-        V6GnrW1poVAmmwpV7JwCxhkev+fEGT3JJ3nOm/N+3nPxvACA999HudBQQN4pQi7hVcIhwq+EAA5wwVxw
-        6db/FlgBS4uv/hDhKuGPu99ZsJS5g9mHC3CsLmAq4cZEYgRNs9XPpHdOzzTMVL78fO/58ktk0TeU/BRb
-        u0Gs7sQQ3WFg3wjBmV7GUCyGK2EGY2EfTIEuVNsrIlVjZa9wf//PdcvlRBfST+ex/NSPeDaO0HYYI6k4
-        xtNr6Aum0PMggV5PAPa4GyZ/ByqGRTOcgFzOJ/y5+ds8HFknJp44cXPHg5uPYvgquYLPo6ugnEFQN/zQ
-        LzoxsHEewR/tEF8U/lV8QVDGCmzO9BdY+smJ0ew0rL8EEMhEYAzF0bO4AqkjCJnLBdXyANRpGqq1DgyH
-        Tbj6wICizwpus4LNb3++gaHNizBmvibXY/Bnwmi5HYJ0egkfBBYhS2kgXpFCnJCgOqqA7q4a3pQFRw15
-        P7CC3bUns+hMfgQq1YaB7+cwurGE6mvfQOH2omf1FuqSI+BH2iAMN+OkqwqK8ffBPL6OPDp3j0fdq9tb
-        z87iw4gaikgfBh+6UDPqR81UFBVf3keL6z46InZQPgdqrXZUWs9ANnwazKNp5Ope2+c1z9U8Dm1PoS/W
-        ie61OZxdcKPWcAm0oQeDg4PQnPsYpedsOE5PkaznZvquTvSPGPB625FtHinGdXvCDEf6MpT3aDR+ooHJ
-        ZMLW1hbW19fh8XjQoe+G8mw34okkN/P5SB/IN4Kawk1eveOUkBTjWTTjRJ3pXajb1GCiUVRR7SgpFUMi
-        kcBsNkOr1XK5pLQEGl0LJ2lVt+5yRaq89ta0cV4DSlcPWk9zgiaLB4XHhHC73WAYBl6vFzabDUVvCqC1
-        SDkBTdP7nODtK8WHSTEi9bp3QCnlnKCWaoWg6BiEQiHKy8s52CwoEkD0XvEuK5DJZFlOwHL8fOHhAm2e
-        t+SU6KDX1AvrxDgmJyfR398PlUqF9vZ2LrMz65g1azQas2KxOPGvgJXk5OS8mC97o/VE2Ym9BknDQZO8
-        Cc3yZhQq+NmjynyG5H25XL7f2Nj4u0gk2uDz+Uf+BlXgloy7HfxbAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="mMenInfo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAArBJREFUOE+lk+1P
-        UmEYxutf0T+hc/rS2vRDc202SNI+ZNYwTdRWugqzwSrFRHwDFLAhGGq+UL5BSYqQwJGMkJfQ1JMDM2hr
-        qy+QtSyvHmiittbaOtt1trPzXL/7ue7nfg4COPBfTxKwV3ma5cwTqpAoVxFkjzV749kyTzxLNs9mydyi
-        o3eZzN/X7zNz1Eu84/JArLzHjx57BCPMRkp6axh89XPQopkYLbby9kLSAFKVl9PiSzRPrMDijaF7KgKJ
-        8TXuDC1BblqB0bGOhpEQ6IrxBH15PA1JAXKVwYyc1oVo0mx6EYOImG70BzDoeotB5zquG/wQ9gVgmFmD
-        5KEfdKkxSpcMZaT6l3zlyBfEZVovzJ73qO0PQUgiXNX58PnrVkpVOg+quj0Q3vei/1kYZ5qegirsE6cB
-        2a0eVm+NQGlica3Hh2qdF1VaD3rtazAQVXQxv6RxkVgBqKeWQRfo2DTgiITZHJt/h9peP6n0EpX33GQx
-        Q/4D20QClRNlHbNEDlzSOGFkwqB4nZtpAC22b466N1JZk5XK1S5iciEU+YTEly2UtttR0mbDBSKBwobh
-        OQLgKvYCrKzWykL6aBGVGjcEnU5cVM7iVfgjAXxDsWwaxSQ3v8mCmm4GSksQ9Mn23Qh0jUVcJLdj0BFB
-        pYqBQO6AxbOO7z+2UxH8bz6gSGImMqHrcQgFN0cIoG23ifSV0QxaYIzeHvbBYF1FqdwGfvMUzkknUVRv
-        wtm6cRTWjaFl2EuOd45sXxqludLdY0w2g+IP8A7l6xOiAQ/008sQap1ky09wvsGMapUNalMAwl4GNKc+
-        Qcz7B2lnNKkCPY/K74qdvjUB5eQiHjhZolW0m4PIqzWC4jTEaG7jn0d5B0KfUmdSvA4RladgKW5TnOI0
-        xklFlkh0mFv/98v0+037l++fDRyfGvO8afwAAAAASUVORK5CYII=
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAA2ZJREFUOE9dk91P
+        k2cYxptsO5vZf8GxZvEAAzYUV6HQMcSImPEpbQPtCynNCmWx6ksXKlhGiRsTJypYsEApYItfLdBarBX6
+        trUtLRRah26DbqzGCSxz8fLpm2imB7/kyp37/j0n18MBwPk/Da7qbMIIIUF4SfiHsEmYopxVeR/uvzsm
+        Cx8TrqcP7v1iwGLyLmaezMOyMo+JiB1jkSHUzZS/Et89MV0zXfrpWxErIEefEFwD0fPY2PZiZSuE4BYD
+        c8IHa3wJA6EQrvkZjPhd0HvaUW4uCZSNFH2Wvn0rMFyNtCP+Yg5LL9wIp8LwbfoxFAtjNL6Kbm8MnQ8j
+        6HJ4YA7boXe3omRQMM0KyMtZhH/X/56DJWXF2HMrbm05cOtpCD9Hl/FDcAWU1QvqphuaBSv6Ehfg/d0M
+        4SX+f/k/8orSApM1/hMW/7BiODUJ418eeJIB6HxhdC4sQ2zxQmKzQb7UB0Wchny1FYN+Pa4/1CL3++w7
+        acH64z9vYmD9EnTJy+T1ENxJPxru+CCeXMQ3ngVIYkoIl8UQRkQoD8qgvqeAM2bAQW3mb2nB9urzGbRF
+        z4KKNaPv11kMJxZRfuMRZHYnOlduoyo6BG6gGXx/Pb6ylUE2ehLMsylk0vt3ONT9qp211AxOBRSQBbrR
+        /8SGimE3KiaCKLn4AA22B2gNmEG5LKg0mlFq/BaSwRNgnk5iv3rfLqd+tuKZb3MC3aE2dKzO4vS8HZXa
+        K6C1nejv74fyzHcoPGPCYXqCZA0707S3oXdIi8+b925ySDGmzJEeWOJX0XifRu05JfR6PTY2NrC2tgaH
+        w4FWTQcaT3cgHImyM5eL9IHs8Cpy1jnVlmN8UoxXwaQVVfrjUDQrwASDKKNaUFAohEgkQk9PD1QqFZsL
+        CgugVDewkiZF0zZbpNIbX07q5pSg1NWgNTQrqDM4kHOID7vdDoZh4HQ6YTKZkPsFDyqDmBXQNL3LCo5c
+        y99DihGoVh8F1ShlBZVUE3i5h8Dn81FcXMySzrxcHgRf52+nBRKJJPXuMx2+kLMnW5XpLDgmeN2l74Jx
+        bBTj4+Po7e2FXC5HS0sLm9Mz44gxpdPpUkKhMPLeV87IyPgoS3KgKa8ob6dGVPO6TlqHemk9cmTc1MHG
+        LIbkXalUultbW/tSIBAkuFzu3jfA3LOfi8khbAAAAABJRU5ErkJggg==
 </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

@@ -1,6 +1,8 @@
 Imports mRemote.App.Runtime
 Imports System.Reflection
 Imports Crownwood
+Imports mRemote.App.Native
+Imports PSTaskDialog
 
 Public Class frmMain
     Public prevWindowsState As FormWindowState
@@ -8,7 +10,7 @@ Public Class frmMain
 #Region "Startup & Shutdown"
     Private Sub frmMain_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
         'insert enable edition code here
-        App.Editions.Spanlink.Enabled = True
+        App.Editions.Spanlink.Enabled = False
 
         ApplyLanguage()
 
@@ -44,16 +46,18 @@ 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.AnnouncmentCheck()
+        Startup.AnnouncementCheck()
         Startup.CreateSQLUpdateHandlerAndStartTimer()
 
         AddSysMenuItems()
@@ -90,6 +94,8 @@ Public Class frmMain
         mMenToolsOptions.Text = Language.Base.Menu_Options
         mMenInfo.Text = Language.Base.Menu_Info
         mMenInfoHelp.Text = Language.Base.Menu_Help
+        mMenInfoForum.Text = Language.Base.Menu_Forum
+        mMenInfoBugReport.Text = Language.Base.Menu_BugReport
         mMenInfoDonate.Text = Language.Base.Menu_Donate
         mMenInfoWebsite.Text = Language.Base.Menu_Website
         mMenInfoAbout.Text = Language.Base.Menu_About
@@ -101,19 +107,27 @@ Public Class frmMain
 
     Private Sub frmMain_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
         If My.Settings.ConfirmExit And wL.Count > 0 Then
-            If MsgBox(Language.Base.UnclosedConnectionPanels, MsgBoxStyle.YesNo Or MsgBoxStyle.Question) = MsgBoxResult.No Then
+            Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.AssemblyName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
+            If cTaskDialog.VerificationChecked Then
+                My.Settings.ConfirmExit = False
+            End If
+            If Result = DialogResult.No Then
                 e.Cancel = True
                 Exit Sub
             End If
         End If
 
+        For Each Window As UI.Window.Base In wL
+            Window.Close()
+        Next
+
         App.Runtime.Shutdown.BeforeQuit()
 
         Debug.Print("[END] - " & Now)
-        End
     End Sub
 #End Region
 
+#Region "Timer"
     Private tmrRuns As Integer = 0
     Private Sub tmrShowUpdate_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tmrShowUpdate.Tick
         If tmrRuns = 5 Then
@@ -121,14 +135,12 @@ 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.IsAnnouncmentAvailable Then
-            App.Runtime.Windows.Show(UI.Window.Type.Announcment)
+        If App.Runtime.IsAnnouncementAvailable Then
+            App.Runtime.Windows.Show(UI.Window.Type.Announcement)
             Me.tmrShowUpdate.Enabled = False
         End If
 
@@ -139,7 +151,7 @@ Public Class frmMain
         mC.AddMessage(Messages.MessageClass.InformationMsg, "Doing AutoSave", True)
         App.Runtime.SaveConnections()
     End Sub
-
+#End Region
 
 #Region "Ext Apps Toolbar"
     Private Sub cMenToolbarShowText_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenToolbarShowText.Click
@@ -333,6 +345,12 @@ Public Class frmMain
         Windows.errorsForm.Activate()
     End Sub
 
+    Private Sub mMenViewResetLayout_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewResetLayout.Click
+        If MsgBox(My.Resources.strConfirmResetLayout, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+            App.Runtime.Startup.SetDefaultLayout()
+        End If
+    End Sub
+
     Private Sub mMenViewAddConnectionPanel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewAddConnectionPanel.Click
         AddPanel()
     End Sub
@@ -475,7 +493,11 @@ Public Class frmMain
         App.Runtime.Windows.Show(UI.Window.Type.Help)
     End Sub
 
-    Private Sub mMenInfoBugReport_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
+    Private Sub mMenInfoForum_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoForum.Click
+        App.Runtime.GoToForum()
+    End Sub
+
+    Private Sub mMenInfoBugReport_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoBugReport.Click
         App.Runtime.GoToBugs()
     End Sub
 
@@ -487,8 +509,8 @@ Public Class frmMain
         App.Runtime.GoToDonate()
     End Sub
 
-    Private Sub mMenInfoAnnouncments_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoAnnouncments.Click
-        App.Runtime.Windows.Show(UI.Window.Type.Announcment)
+    Private Sub mMenInfoAnnouncements_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoAnnouncements.Click
+        App.Runtime.Windows.Show(UI.Window.Type.Announcement)
     End Sub
 
     Private Sub mMenInfoAbout_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfoAbout.Click
@@ -542,6 +564,7 @@ Public Class frmMain
     End Sub
 #End Region
 
+#Region "Window Overrides and DockPanel Stuff"
     Private Sub frmMain_Resize(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Resize
         If Me.WindowState = FormWindowState.Minimized Then
             If My.Settings.MinimizeToTray Then
@@ -555,40 +578,38 @@ Public Class frmMain
         End If
     End Sub
 
-#Region "Window Overrides and DockPanel Stuff"
-    Private Msg13 As Boolean = False
-    Private Msg71 As Boolean = False
+    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
-                    ActivateConnection()
-                End If
-
-                Msg13 = False
-                Msg71 = True
-            ElseIf m.Msg = 28 Then
-                If Msg71 Then
-                    ActivateConnection()
-                End If
-            Else
-                Msg13 = False
-                Msg71 = False
-            End If
-
-            If m.Msg = Tools.SystemMenu.Flags.WM_SYSCOMMAND Then
-                For i As Integer = 0 To SysMenSubItems.Length - 1
-                    If SysMenSubItems(i) = m.WParam Then
-                        Screens.SendFormToScreen(Screen.AllScreens(i))
-                        Exit For
+            Select m.Msg
+                Case WM_GETTEXT
+                    bWmGetTextFlag = True
+                Case WM_WINDOWPOSCHANGED
+                    If bWmGetTextFlag Then
+                        ActivateConnection()
                     End If
-                Next
-            End If
+
+                    bWmGetTextFlag = False
+                    bWmWindowPosChangedFlag = True
+                Case WM_ACTIVATEAPP
+                    If bWmWindowPosChangedFlag Then
+                        ActivateConnection()
+                    End If
+                Case WM_SYSCOMMAND
+                    For i As Integer = 0 To SysMenSubItems.Length - 1
+                        If SysMenSubItems(i) = m.WParam Then
+                            Screens.SendFormToScreen(Screen.AllScreens(i))
+                            Exit For
+                        End If
+                    Next
+                Case Else
+                    bWmGetTextFlag = False
+                    bWmWindowPosChangedFlag = False
+            End Select
         Catch ex As Exception
         End Try
 
@@ -636,8 +657,4 @@ Public Class frmMain
         SysMenu.InsertMenuItem(SysMenu.SystemMenuHandle, 1, Tools.SystemMenu.Flags.MF_BYPOSITION Or Tools.SystemMenu.Flags.MF_SEPARATOR, IntPtr.Zero, Nothing)
     End Sub
 #End Region
-
-    Private Sub mMenInfovRD08_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenInfovRD08.Click
-        Process.Start("http://software.visionapp.com/vrd")
-    End Sub
 End Class

mRemoteV1/Forms/frmPassword.Designer.vb

@@ -31,8 +31,6 @@ Partial Class frmPassword
         Me.lblStatus = New System.Windows.Forms.Label
         Me.pbLock = New System.Windows.Forms.PictureBox
         Me.pnlImage = New System.Windows.Forms.Panel
-        Me.txtSnake = New System.Windows.Forms.TextBox
-        Me.lblTips = New System.Windows.Forms.Label
         CType(Me.pbLock, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlImage.SuspendLayout()
         Me.SuspendLayout()
@@ -131,29 +129,6 @@ Partial Class frmPassword
         Me.pnlImage.Size = New System.Drawing.Size(100, 100)
         Me.pnlImage.TabIndex = 8
         '
-        'txtSnake
-        '
-        Me.txtSnake.BackColor = System.Drawing.SystemColors.Control
-        Me.txtSnake.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.txtSnake.Location = New System.Drawing.Point(9, 143)
-        Me.txtSnake.Name = "txtSnake"
-        Me.txtSnake.ReadOnly = True
-        Me.txtSnake.Size = New System.Drawing.Size(100, 13)
-        Me.txtSnake.TabIndex = 9
-        Me.txtSnake.TabStop = False
-        '
-        'lblTips
-        '
-        Me.lblTips.ForeColor = System.Drawing.Color.White
-        Me.lblTips.Location = New System.Drawing.Point(129, 6)
-        Me.lblTips.Name = "lblTips"
-        Me.lblTips.Size = New System.Drawing.Size(150, 118)
-        Me.lblTips.TabIndex = 10
-        Me.lblTips.Text = "Enter: Start/Pause" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Up/Down: Change difficulty" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Arrow Keys: Steer the snake" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Esc:" & _
-            " Quit (at any time)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Have Fun! =)"
-        Me.lblTips.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.lblTips.Visible = False
-        '
         'frmPassword
         '
         Me.AcceptButton = Me.btnOK
@@ -165,13 +140,11 @@ Partial Class frmPassword
         Me.Controls.Add(Me.txtVerify)
         Me.Controls.Add(Me.txtPassword)
         Me.Controls.Add(Me.lblStatus)
-        Me.Controls.Add(Me.txtSnake)
         Me.Controls.Add(Me.lblVerify)
         Me.Controls.Add(Me.lblPassword)
         Me.Controls.Add(Me.pnlImage)
         Me.Controls.Add(Me.btnCancel)
         Me.Controls.Add(Me.btnOK)
-        Me.Controls.Add(Me.lblTips)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
         Me.MaximizeBox = False
         Me.MinimizeBox = False
@@ -196,6 +169,4 @@ Partial Class frmPassword
     Friend WithEvents lblStatus As System.Windows.Forms.Label
     Friend WithEvents pbLock As System.Windows.Forms.PictureBox
     Friend WithEvents pnlImage As System.Windows.Forms.Panel
-    Friend WithEvents txtSnake As System.Windows.Forms.TextBox
-    Friend WithEvents lblTips As System.Windows.Forms.Label
 End Class

mRemoteV1/Forms/frmPassword.vb

@@ -107,33 +107,4 @@
             Me.txtVerify.SelectionLength = Me.txtVerify.TextLength
         End If
     End Sub
-
-
-    Private Sub txtPassword_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtPassword.TextChanged
-        If txtPassword.Text = "ijustwannaplay" Then
-            pbLock.Visible = False
-            btnOK.Visible = False
-            btnCancel.Visible = False
-            txtPassword.Visible = False
-            txtVerify.Visible = False
-            lblPassword.Visible = False
-            lblStatus.Visible = False
-            lblVerify.Visible = False
-            AcceptButton = Nothing
-            CancelButton = Nothing
-            BackColor = Color.DimGray
-            Me.Text = "SnakeFX Lite"
-            pnlImage.Top = (Me.ClientSize.Height / 2) - (Me.pnlImage.Height / 2)
-            lblTips.Visible = True
-
-            Easter.Snake.Game.CreatePicBox(pnlImage)
-            Easter.Snake.Game.Mode = Easter.Snake.Game.GameMode.Welcome
-            Easter.Snake.Game.SetupGame()
-            txtSnake.Focus()
-        End If
-    End Sub
-
-    Private Sub txtSnake_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles txtSnake.KeyDown
-        Easter.Snake.Game.CheckKeyPress(e)
-    End Sub
 End Class

mRemoteV1/Help/SQLScript.txt

@@ -61,6 +61,12 @@ CREATE TABLE [dbo].[tblCons] (
 	[VNCColors] [varchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[VNCSmartSizeMode] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[VNCViewOnly] [bit] NOT NULL ,
+	[RDGatewayUsageMethod] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+	[RDGatewayHostname] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayUseConnectionCredentials] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+	[RDGatewayUsername] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayPassword] [varchar] (1024) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayDomain] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[InheritCacheBitmaps] [bit] NOT NULL ,
 	[InheritColors] [bit] NOT NULL ,
 	[InheritDescription] [bit] NOT NULL ,
@@ -100,7 +106,13 @@ CREATE TABLE [dbo].[tblCons] (
 	[InheritVNCProxyPassword] [bit] NOT NULL ,
 	[InheritVNCColors] [bit] NOT NULL ,
 	[InheritVNCSmartSizeMode] [bit] NOT NULL ,
-	[InheritVNCViewOnly] [bit] NOT NULL
+	[InheritVNCViewOnly] [bit] NOT NULL ,
+	[InheritRDGatewayUsageMethod] [bit] NOT NULL ,
+	[InheritRDGatewayHostname] [bit] NOT NULL ,
+	[InheritRDGatewayUseConnectionCredentials] [bit] NOT NULL ,
+	[InheritRDGatewayUsername] [bit] NOT NULL ,
+	[InheritRDGatewayPassword] [bit] NOT NULL ,
+	[InheritRDGatewayDomain] [bit] NOT NULL
 ) ON [PRIMARY]
 GO
  

mRemoteV1/Language/Language.DE.vb

@@ -102,7 +102,8 @@
 
         Public Const Menu_About As String = "Über"
         Public Const Menu_AddConnectionPanel As String = "Verbindungs Panel hinzufügen"
-        Public Const Menu_BugReport As String = "Bug Report"
+        Public Const Menu_Forum As String = "Support Forum" ' TODO: Translate
+        Public Const Menu_BugReport As String = "Bug Report" ' TODO: Translate
         Public Const Menu_Config As String = "Konfiguration"
         Public Const Menu_ConnectionPanels As String = "Verbindungs Panels"
         Public Const Menu_Connections As String = "Verbindungen"
@@ -230,7 +231,7 @@
         Public Const LaunchPutty As String = "Starte PuTTY"
         Public Const UseCustomPuttyPath As String = "Eigener PuTTY Pfad:"
         Public Const AutomaticallyGetSessionInfo As String = "Automatisch Session Informationen einholen"
-        Public Const WriteLogFile As String = "Log File schreiben (Installationspfad\mRemote.log)"
+        Public Const WriteLogFile As String = "Log File schreiben (mRemoteNG.log)"
         Public Const StartupExit As String = "Start/Ende"
         Public Const AllowOnlySingleInstance As String = "Nur eine Instanz zulassen (mRemote Neustart benötigt)"
         Public Const ReconnectAtStartup As String = "Offene Verbindungen speichern und beim nächsten Start wiederverbinden"
@@ -282,7 +283,7 @@
         Public Const SaveAll As String = "Alle speichern"
         Public Const RemoveAll As String = "Alle entfernen"
         Public Const Save As String = "Speichern"
-        Public Const File As String = "Datei"
+        Public Const SaveImageFilter As String = "Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png" ' TODO: Translate
         Public Const Screenshots As String = "Screenshots"
         Public Const Activity As String = "Aktivität"
         Public Const Type As String = "Type"
@@ -360,11 +361,11 @@
         Public Const CcRDPOK As String = "Alle RDP Komponenten wurden gefunden und scheinen korrekt registriert zu sein."
         Public Const CcRDPFailed As String = "Um RDP korrekt betreiben können muss mindestens Remote Desktop Connection (Terminal Services Client) 6.0 installiert sein. Hier können sie die Software herunterladen: http://support.microsoft.com/kb/925876" & vbNewLine & _
                                             "Wenn sie RDP 6.0 bereits installiert haben und der Check noch immer fehlschlägt, versuchen sie die Datei mstscax.dll manuell zu registrieren. Öffnen sie hierzu den Ausführen Dialog (Start - Ausführen) und geben sie Folgendes ein: regsvr32 ""c:\windows\system32\mstscax.dll"" (Wobei c:\ ihr System-Laufwerk ist)." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit RDP haben, konsultieren sie bitte das mRemote Forum: http://sourceforge.net/forum/forum.php?forum_id=677204"
+                                            "Wenn sie noch immer Probleme mit RDP haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
         Public Const CcVNCOK As String = "Alle VNC Komponenten wurden gefunden und scheinen korrekt registriert zu sein."
         Public Const CcVNCFailed As String = "VNC benötigt die Datei scvncctrl.dll (wird mitgeliefert). Diese muss registriert sein. Wenn sie eines der nicht-Setup Pakete verwenden muss dies manuell durchgeführt werden." & vbNewLine & _
                                             "Öffnen sie hierzu den Ausführen Dialog (Start - Ausführen) und geben sie Folgendes ein: regsvr32 ""c:\Programme\mRemote\scvncctrl.dll"" (Wobei c:\Programme\mRemote\ ihr mRemote Installations-Pfad ist)." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit VNC haben, konsultieren sie bitte das mRemote Forum: http://sourceforge.net/forum/forum.php?forum_id=677204"
+                                            "Wenn sie noch immer Probleme mit VNC haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
         Public Const CcPuttyOK As String = "PuTTY wurde gefunden und scheint betriebsbereit zu sein."
         Public Const CcPuttyFailed As String = "Die Protokolle, SSH, Telnet, Rlogin und RAW benötigen PuTTY. PuTTY wird in allen mRemote Paketen mitgeliefert und befindet sich im Installations-Pfad." & vbNewLine & _
                                             "Bitte versichern sie sich dass sich die Datei Putty.exe in ihrem mRemote Installations-Pfad befindet (Standard: c:\Programme\mRemote\) oder dass sie einen korrekten Pfad in den Optionen (Extras - Optionen - Erweitert - Eigener PuTTY Pfad) angegeben haben."
@@ -372,17 +373,17 @@
         Public Const CcICAFailed As String = "ICA benötigt eine funktionierende Citrix Presentation Server Client Installation und dass die Datei wfica.ocx korrekt registriert ist. Hier können sie den Client herunterladen: http://www.citrix.com/download/" & vbNewLine & _
                                             "Wenn sie Citrix Presentation Server Client installiert haben und noch immer Probleme haben diesen Check erfolgreich abzuschließen, versuchen sie die Datei wfica.ocx manuell zu registrieren." & vbNewLine & _
                                             "Öffnen sie hierzu den Ausführen Dialog (Start - Ausführen) und geben sie Folgendes ein: regsvr32 ""c:\Programme\Citrix\ICA Client\wfica.ocx"" (Wobei c:\Programme\Citrix\ICA Client\ ihr Citrix Presentation Server Client Installations-Pfad ist)." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit ICA haben, konsultieren sie bitte das mRemote Forum: http://sourceforge.net/forum/forum.php?forum_id=677204"
+                                            "Wenn sie noch immer Probleme mit ICA haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
         Public Const CcGeckoOK As String = "XULrunner wurde gefunden und scheint korrekt installiert zu sein."
         Public Const CcGeckoFailed As String = "Um die Gecko Rendering Engine benutzen zu können benötigen sie XULrunner 1.8.1.x und einen korrekt eingetragenen Pfad in den Optionen." & vbNewLine & _
                                             "Hier können sie XULrunner 1.8.1.3 herunterladen: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/" & vbNewLine & _
                                             "Wenn der Download abgeschlossen ist entpacken sie das Paket (Der Speicherort ist dabei ihnen überlassen). Als nächstes öffnen sie (in mRemote) Extras - Optionen - Erweitert und geben sie den korrekten Pfad im XULrunner Feld an." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit der Gecko Engine in mRemote haben, konsultieren sie bitte das mRemote Forum: http://sourceforge.net/forum/forum.php?forum_id=677204"
+                                            "Wenn sie noch immer Probleme mit der Gecko Engine in mRemote haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
         Public Const CcEOLOK As String = "EOLWTSCOM wurde gefunden und scheint korrekt registriert zu sein."
         Public Const CcEOLFailed As String = "Das (RDP) Sessions feature benötigt die Datei eolwtscom.dll. Diese muss korrekt registriert sein." & vbNewLine & _
                                             "Alle mRemote Pakete beinhalten diese Datei, jedoch muss sie, wenn sie eines der nicht-Setup Pakete verwenden manuell registriert werden." & vbNewLine & _
                                             "Öffnen sie hierzu den Ausführen Dialog (Start - Ausführen) und geben sie Folgendes ein: regsvr32 ""c:\Programme\mRemote\eolwtscom.dll"" (Wobei c:\Programme\mRemote\ ihr mRemote Installations-Pfad ist)." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit dem (RDP) Sessions Feature in mRemote haben, konsultieren sie bitte das mRemote Forum: http://sourceforge.net/forum/forum.php?forum_id=677204"
+                                            "Wenn sie noch immer Probleme mit dem (RDP) Sessions Feature in mRemote haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
 
         Public Const PropertiesWillOnlyBeSavedMRemoteXML As String = "(Diese Einstellungen werden nur gespeichert wenn sie mRemote XML als Dateiformat auswählen!)"
     End Class

mRemoteV1/Language/Language.EN.vb

@@ -25,7 +25,7 @@
         Public Const Props_Domain As String = "Domain"
         Public Const Descr_Domain As String = "Enter your domain."
         Public Const Props_Protocol As String = "Protocol"
-        Public Const Descr_Protocol As String = "Choose the protocol mRemote should use to connect to the host."
+        Public Const Descr_Protocol As String = "Choose the protocol mRemoteNG should use to connect to the host."
         Public Const Props_Port As String = "Port"
         Public Const Descr_Port As String = "Enter the port the selected protocol is listening on."
         Public Const Props_PuttySession As String = "Putty Session"
@@ -88,10 +88,23 @@
         Public Const Descr_MacAddress As String = "Enter the MAC Address of the remote host if you wish to use it in Ext. Apps."
         Public Const Props_UserField As String = "User Field"
         Public Const Descr_UserField As String = "Feel free to enter any information you need here."
+        Public Const Props_RDGatewayUsageMethod As String = "Use Gateway"
+        Public Const Descr_RDGatewayUsageMethod As String = "Specifies when to use a Remote Desktop Gateway (RD Gateway) server."
+        Public Const Props_RDGatewayHostname As String = "Gateway Hostname"
+        Public Const Descr_RDGatewayHostname As String = "Specifies the host name of the Remote Desktop Gateway server."
+        Public Const Props_RDGatewayUseConnectionCredentials As String = "Gateway Credentials"
+        Public Const Descr_RDGatewayUseConnectionCredentials As String = "Specifies whether or not to log on to the gateway using the same username and password as the connection."
+        Public Const Props_RDGatewayUsername As String = "Gateway Username"
+        Public Const Descr_RDGatewayUsername As String = "Specifies the user name that a user provides to connect to the RD Gateway server."
+        Public Const Props_RDGatewayPassword As String = "Gateway Password"
+        Public Const Descr_RDGatewayPassword As String = "Specifies the password that a user provides to connect to the RD Gateway server."
+        Public Const Props_RDGatewayDomain As String = "Gateway Domain"
+        Public Const Descr_RDGatewayDomain As String = "Specifies the domain name that a user provides to connect to the RD Gateway server."
 
         Public Const Props_General As String = "General"
         Public Const Props_Display As String = "Display"
         Public Const Props_Connection As String = "Connection"
+        Public Const Category_RDGateway As String = "Gateway"
         Public Const Props_Appearance As String = "Appearance"
         Public Const Props_Redirect As String = "Redirect"
         Public Const Props_Misc As String = "Misc"
@@ -102,27 +115,28 @@
 
         Public Const Menu_About As String = "About"
         Public Const Menu_AddConnectionPanel As String = "Add Connection Panel"
-        Public Const Menu_BugReport As String = "Bug Report"
+        Public Const Menu_Forum As String = "Support Forum"
+        Public Const Menu_BugReport As String = "Report a Bug"
         Public Const Menu_Config As String = "Config"
         Public Const Menu_ConnectionPanels As String = "Connection Panels"
         Public Const Menu_Connections As String = "Connections"
         Public Const Menu_ConnectionsConfig As String = "Connections && Config"
         Public Const Menu_Donate As String = "Donate"
-        Public Const Menu_ErrorsAndInfos As String = "Errors and Infos"
-        Public Const Menu_ErrorsInfos As String = "Errors && Infos"
+        Public Const Menu_ErrorsAndInfos As String = "Notifications"
+        Public Const Menu_ErrorsInfos As String = "Notifications"
         Public Const Menu_Exit As String = "Exit"
         Public Const Menu_ExternalApplications As String = "External Applications"
         Public Const Menu_ExternalApplicationsToolbar As String = "External Applications Toolbar"
         Public Const Menu_File As String = "&File"
-        Public Const Menu_FullScreenKioskMode As String = "Fullscreen (Kiosk Mode)"
-        Public Const Menu_Help As String = "Help"
-        Public Const Menu_Info As String = "&Info"
+        Public Const Menu_FullScreenKioskMode As String = "Full Screen"
+        Public Const Menu_Help As String = "mRemoteNG Help"
+        Public Const Menu_Info As String = "&Help"
         Public Const Menu_JumpTo As String = "Jump To"
         Public Const Menu_NewConnections As String = "New Connections"
         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"
@@ -130,12 +144,12 @@
         Public Const Menu_SessionsScreenshots As String = "Sessions && Screenshots"
         Public Const Menu_SSHFileTransfer As String = "SSH File Transfer"
         Public Const Menu_Tools As String = "&Tools"
-        Public Const Menu_Update As String = "Update"
+        Public Const Menu_Update As String = "Check for Updates"
         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:"
@@ -179,10 +193,6 @@
         Public Const Root As String = "Root"
         Public Const SureToDeleteItem As String = "Are you sure you want to delete this Item?"
         Public Const License As String = "License"
-        Public Const About As String = "About"
-        Public Const ChangeLog As String = "Change Log:"
-        Public Const ReleasedUnderGPL As String = "Released under the GNU General Public License (GPL)"
-        Public Const SomeIconsBy As String = "Some Icons by"
         Public Const Change As String = "Change"
         Public Const Inheritance As String = "Inheritance"
         Public Const Default_ As String = "Default"
@@ -225,17 +235,17 @@
         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:"
         Public Const AutomaticallyGetSessionInfo As String = "Automatically get session information"
-        Public Const WriteLogFile As String = "Write log file (application directory\mRemote.log)"
+        Public Const WriteLogFile As String = "Write log file (mRemoteNG.log)"
         Public Const StartupExit As String = "Startup/Exit"
-        Public Const AllowOnlySingleInstance As String = "Allow only a single instance of the application (mRemote restart required)"
+        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"
@@ -261,11 +271,11 @@
         Public Const EmptyUsernamePasswordDomainFields As String = "For empty Username, Password or Domain fields use:"
         Public Const SingleClickOnOpenConnectionSwitchesToIt As String = "Single click on opened connection switches to it"
         Public Const SingleClickOnConnectionOpensIt As String = "Single click on connection opens it"
-        Public Const SwitchToErrorsAndInfos As String = "Switch to Errors && Infos panel on"
+        Public Const SwitchToErrorsAndInfos As String = "Switch to Notifications panel on"
         Public Const Errors As String = "Errors"
         Public Const Warnings As String = "Warnings"
         Public Const Informations As String = "Informations"
-        Public Const UseOnlyErrorsAndInfosPanel As String = "Use only Errors && Infos panel (no messagebox popups)"
+        Public Const UseOnlyErrorsAndInfosPanel As String = "Use only Notifications panel (no messagebox popups)"
         Public Const Applications As String = "Applications"
         Public Const ProxyTestSucceeded As String = "Proxy test succeeded!"
         Public Const ProxyTestFailed As String = "Proxy test failed!"
@@ -283,7 +293,7 @@
         Public Const SaveAll As String = "Save All"
         Public Const RemoveAll As String = "Remove All"
         Public Const Save As String = "Save"
-        Public Const File As String = "File"
+        Public Const SaveImageFilter As String = "Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png"
         Public Const Screenshots As String = "Screenshots"
         Public Const Activity As String = "Activity"
         Public Const Type As String = "Type"
@@ -303,8 +313,8 @@
         Public Const ChoosePanelBeforeConnecting As String = "Choose panel before connecting"
         Public Const Tools As String = "Tools"
         Public Const ImportExport As String = "Import/Export"
-        Public Const ExportmRemoteXML As String = "Export mRemote XML"
-        Public Const ImportmRemoteXML As String = "Import mRemote XML"
+        Public Const ExportmRemoteXML As String = "Export mRemote/mRemoteNG XML"
+        Public Const ImportmRemoteXML As String = "Import mRemote/mRemoteNG XML"
         Public Const ImportAD As String = "Import from Active Directory"
         Public Const ImportRDPFiles As String = "Import from .RDP file(s)"
         Public Const ImportPortScan As String = "Import from Port Scan"
@@ -319,18 +329,17 @@
         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 UpdateDownloadComplete As String = "Download complete!" & vbNewLine & "mRemote will now quit and begin with the installation."
+        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"
 
-        Public Const UnclosedConnectionPanels As String = "There are unclosed connection panels, are you sure you want to quit?"
         Public Const SaveConnectionsFileBeforeOpeningAnother As String = "Do you want to save the current connections file before loading another?"
         Public Const NewPanel As String = "New Panel"
         Public Const PanelName As String = "Panel name"
@@ -357,33 +366,36 @@
         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 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 mRemote forums at http://sourceforge.net/forum/forum.php?forum_id=677204"
-        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 none-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\mRemote\scvncctrl.dll"" (Where c:\Program Files\mRemote\ is the path to your mRemote installation)." & vbNewLine & _
-                                     "If you are still not able to pass this check or use VNC in mRemote please consult the forums at http://sourceforge.net/forum/forum.php?forum_id=677204"
+        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.1 installed. You can get it here: http://support.microsoft.com/kb/951616" & vbNewLine & _
+                                     "If you have RDP 6.1 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." & 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 mRemote package and is located in the installation path." & vbNewLine & _
-                                     "Please make sure that either you have the Putty.exe in your mRemote directory (default: c:\Program Files\mRemote\) 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 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." & 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 & _
-                                     "If you are still not able to pass this check or use ICA in mRemote please consult the forums at http://sourceforge.net/forum/forum.php?forum_id=677204"
+                                     "If you are still not able to pass this check or use ICA in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
         Public Const CcGeckoOK As String = "XULrunner was found and seems to be installed properly."
         Public Const CcGeckoFailed As String = "To use the Gecko Rendering Engine you need to have XULrunner 1.8.1.x and the path to the installation set in your Options." & vbNewLine & _
                                      "You can download XULrunner 1.8.1.3 here: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/" & vbNewLine & _
-                                     "When you are finished downloading extract the package to a path of your choice. Then in mRemote go to Tools - Options - Advanced and enter the correct path in the XULrunner path field." & vbNewLine & _
-                                     "If you are still not able to pass this check or use the Gecko Engine in mRemote please consult the forums at http://sourceforge.net/forum/forum.php?forum_id=677204"
+                                     "When you are finished downloading extract the package to a path of your choice. Then in mRemoteNG go to Tools - Options - Advanced and enter the correct path in the XULrunner path field." & vbNewLine & _
+                                     "If you are still not able to pass this check or use the Gecko Engine in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
         Public Const CcEOLOK As String = "EOLWTSCOM was found and seems to be registered properly."
         Public Const CcEOLFailed As String = "The (RDP) Sessions feature requires that you have a registered copy of eolwtscom.dll on your system." & vbNewLine & _
-                                     "mRemote ships with this component but will not register it automatically unless you run the setup package." & vbNewLine & _
-                                     "To do register it manually do this: Open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\Program Files\mRemote\eolwtscom.dll"" (Where c:\Program Files\mRemote\ is the path to your mRemote installation)." & vbNewLine & _
-                                     "If you are still not able to pass this check or use the (RDP) Sessions feature in mRemote please consult the forums at http://sourceforge.net/forum/forum.php?forum_id=677204"
+                                     "mRemoteNG ships with this component but will not register it automatically unless you run the setup package." & vbNewLine & _
+                                     "To do register it manually do this: Open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\Program Files\mRemoteNG\eolwtscom.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 the (RDP) Sessions feature in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
 
-        Public Const PropertiesWillOnlyBeSavedMRemoteXML As String = "(These properties will only be saved if you select mRemote XML as output file format!)"
+        Public Const PropertiesWillOnlyBeSavedMRemoteXML As String = "(These properties will only be saved if you select mRemote/mRemoteNG XML as output file format!)"
     End Class
 End Namespace

mRemoteV1/My Project/AssemblyInfo.vb

@@ -8,17 +8,17 @@ Imports System.Runtime.InteropServices
 
 ' Review the values of the assembly attributes
 
-<Assembly: AssemblyTitle("mRemote")> 
+<Assembly: AssemblyTitle("mRemoteNG")> 
 <Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyCompany("Felix Deimel")> 
-<Assembly: AssemblyProduct("mRemote")> 
-<Assembly: AssemblyCopyright("Copyright © Felix Deimel 2007 - 2008")> 
+<Assembly: AssemblyCompany("")> 
+<Assembly: AssemblyProduct("mRemoteNG")> 
+<Assembly: AssemblyCopyright("Copyright © 2007-2010 Felix Deimel, Riley McArdle")> 
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
 
 'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("397830ab-3bbe-4d82-95d0-dfbf02e70174")> 
+<Assembly: Guid("A99669B2-FAEB-11DE-995A-826C56D89593")> 
 
 ' Version information for an assembly consists of the following four values:
 '
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.50")> 
-<Assembly: AssemblyFileVersion("1.50")> 
+<Assembly: AssemblyVersion("1.63")> 
+<Assembly: AssemblyFileVersion("1.63")> 

mRemoteV1/My Project/Resources.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.3053
+'     Runtime Version:2.0.50727.4927
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -459,13 +459,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        Friend ReadOnly Property mRemote_Tray_Icon() As System.Drawing.Icon
-            Get
-                Dim obj As Object = ResourceManager.GetObject("mRemote_Tray_Icon", resourceCulture)
-                Return CType(obj,System.Drawing.Icon)
-            End Get
-        End Property
-        
         Friend ReadOnly Property News() As System.Drawing.Bitmap
             Get
                 Dim obj As Object = ResourceManager.GetObject("News", resourceCulture)
@@ -760,6 +753,141 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to About.
+        '''</summary>
+        Friend ReadOnly Property strAbout() As String
+            Get
+                Return ResourceManager.GetString("strAbout", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Change Log:.
+        '''</summary>
+        Friend ReadOnly Property strChangeLogLabel() As String
+            Get
+                Return ResourceManager.GetString("strChangeLogLabel", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Do you want to close all open connections?.
+        '''</summary>
+        Friend ReadOnly Property strConfirmExitMainInstruction() As String
+            Get
+                Return ResourceManager.GetString("strConfirmExitMainInstruction", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Are you sure you want to reset the panels to their default layout?.
+        '''</summary>
+        Friend ReadOnly Property strConfirmResetLayout() As String
+            Get
+                Return ResourceManager.GetString("strConfirmResetLayout", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Do not show this message again..
+        '''</summary>
+        Friend ReadOnly Property strDoNotShowThisMessageAgain() As String
+            Get
+                Return ResourceManager.GetString("strDoNotShowThisMessageAgain", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Includes icons by [FAMFAMFAM].
+        '''</summary>
+        Friend ReadOnly Property strFAMFAMFAMAttribution() As String
+            Get
+                Return ResourceManager.GetString("strFAMFAMFAMAttribution", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to http://www.famfamfam.com/.
+        '''</summary>
+        Friend ReadOnly Property strFAMFAMFAMAttributionURL() As String
+            Get
+                Return ResourceManager.GetString("strFAMFAMFAMAttributionURL", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Uses the Magic library by [Crownwood Software].
+        '''</summary>
+        Friend ReadOnly Property strMagicLibraryAttribution() As String
+            Get
+                Return ResourceManager.GetString("strMagicLibraryAttribution", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to http://www.dotnetmagic.com/.
+        '''</summary>
+        Friend ReadOnly Property strMagicLibraryAttributionURL() As String
+            Get
+                Return ResourceManager.GetString("strMagicLibraryAttributionURL", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Portable Edition.
+        '''</summary>
+        Friend ReadOnly Property strPortableEdition() As String
+            Get
+                Return ResourceManager.GetString("strPortableEdition", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Released under the GNU General Public License (GPL).
+        '''</summary>
+        Friend ReadOnly Property strReleasedUnderGPL() As String
+            Get
+                Return ResourceManager.GetString("strReleasedUnderGPL", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Every {0} days.
+        '''</summary>
+        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)
@@ -809,13 +937,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        Friend ReadOnly Property vRD08R1() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("vRD08R1", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
         Friend ReadOnly Property Warning() As System.Drawing.Bitmap
             Get
                 Dim obj As Object = ResourceManager.GetObject("Warning", resourceCulture)

mRemoteV1/My Project/Resources.resx

@@ -169,9 +169,6 @@
   <data name="mRemote_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Icons\mRemote_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="mRemote_Tray_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icons\mRemote_Tray_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="PuttyConfig" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\PuttyConfig.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -448,7 +445,49 @@
   <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="vRD08R1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Images\vRD08R1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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>
+  <data name="strFAMFAMFAMAttribution" xml:space="preserve">
+    <value>Includes icons by [FAMFAMFAM]</value>
+  </data>
+  <data name="strFAMFAMFAMAttributionURL" xml:space="preserve">
+    <value>http://www.famfamfam.com/</value>
+  </data>
+  <data name="strMagicLibraryAttribution" xml:space="preserve">
+    <value>Uses the Magic library by [Crownwood Software]</value>
+  </data>
+  <data name="strMagicLibraryAttributionURL" xml:space="preserve">
+    <value>http://www.dotnetmagic.com/</value>
+  </data>
+  <data name="strAbout" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="strChangeLogLabel" xml:space="preserve">
+    <value>Change Log:</value>
+  </data>
+  <data name="strReleasedUnderGPL" xml:space="preserve">
+    <value>Released under the GNU General Public License (GPL)</value>
+  </data>
+  <data name="strConfirmResetLayout" xml:space="preserve">
+    <value>Are you sure you want to reset the panels to their default layout?</value>
+  </data>
+  <data name="strConfirmExitMainInstruction" xml:space="preserve">
+    <value>Do you want to close all open connections?</value>
+  </data>
+  <data name="strDoNotShowThisMessageAgain" xml:space="preserve">
+    <value>Do not show this message again.</value>
+  </data>
+  <data name="strPortableEdition" xml:space="preserve">
+    <value>Portable Edition</value>
   </data>
 </root>

mRemoteV1/My Project/Settings.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.3053
+'     Runtime Version:2.0.50727.4927
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -239,7 +239,7 @@ Namespace My
         <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.DefaultSettingValueAttribute("True")>  _
         Public Property ConfirmExit() As Boolean
             Get
                 Return CType(Me("ConfirmExit"),Boolean)
@@ -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
@@ -928,7 +927,7 @@ Namespace My
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("300, 0")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("3, 24")>  _
         Public Property QuickyTBLocation() As Global.System.Drawing.Point
             Get
                 Return CType(Me("QuickyTBLocation"),Global.System.Drawing.Point)
@@ -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)
@@ -1918,14 +1915,84 @@ Namespace My
          Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("")>  _
-        Public Property LastAnnouncment() As String
+        Public Property LastAnnouncement() As String
             Get
-                Return CType(Me("LastAnnouncment"),String)
+                Return CType(Me("LastAnnouncement"),String)
             End Get
             Set
-                Me("LastAnnouncment") = value
+                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
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Never")>  _
+        Public ReadOnly Property ConDefaultRDGatewayUsageMethod() As String
+            Get
+                Return CType(Me("ConDefaultRDGatewayUsageMethod"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Yes")>  _
+        Public ReadOnly Property ConDefaultRDGatewayUseConnectionCredentials() As String
+            Get
+                Return CType(Me("ConDefaultRDGatewayUseConnectionCredentials"),String)
+            End Get
+        End Property
     End Class
 End Namespace
 

mRemoteV1/My Project/Settings.settings

@@ -45,7 +45,7 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="ConfirmExit" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
+      <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="CheckForUpdatesOnStartup" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
@@ -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">
@@ -204,12 +204,12 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="QuickyTBLocation" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
-      <Value Profile="(Default)">300, 0</Value>
+      <Value Profile="(Default)">3, 24</Value>
     </Setting>
     <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">
@@ -431,8 +431,26 @@
     <Setting Name="InhDefaultExtApp" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="LastAnnouncment" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <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>
+    <Setting Name="ConDefaultRDGatewayUsageMethod" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">Never</Value>
+    </Setting>
+    <Setting Name="ConDefaultRDGatewayUseConnectionCredentials" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">Yes</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

mRemoteV1/Notes/Misc.txt

@@ -52,6 +52,9 @@ How to add a new protocol:
 		Connection.Info.SetDefaultPort
 		UI.Window.Config.ShowHideGridItems
 		
+Remote Desktop ActiveX Control Reference
+	http://msdn.microsoft.com/en-us/library/aa383022%28VS.85%29.aspx
+
 RDP 6.0 NLA:
 	AdvancedSettings5.AuthenticationLevel
 	0 = No authentication of the server.