Revert "Merge pull request #101 from ozkanpakdil/develop"

This reverts commit 7350e94662, reversing
changes made to 14d1f6cde2.

.gitignore

@@ -0,0 +1,26 @@
+Release/
+mRemoteV1/bin/
+mRemoteV1/obj/
+mRemoteV1/publish/
+*.pfx
+*.suo
+*.vbproj.user
+Thumbs.db
+[Dd]ebug/
+_Re[Ss]harper.*
+*.resharper
+*.resharper.user
+*.suo
+*.cache
+*~
+*.swp
+*.user*
+*.pidb
+*.gpState
+_UpgradeReport_Files/
+Backup/
+UpgradeLog.XML
+*.orig
+*.sdf
+*.opensdf
+*.ipch

BUILD.CMD

@@ -0,0 +1,149 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+set VERSIONTAG=
+
+set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+set DEVENV="devenv.exe"
+set MAKENSIS="%ProgramFiles(x86)%\NSIS\Unicode\makensis.exe"
+set RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+set SIGNCMD=signtool.exe sign /n "Astrospark Technologies, LLC" /sha1 "1cbd910dbd6e77f26506e7f600736972f700673f" /tr http://timestamp.comodoca.com/rfc3161
+
+rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+set SIGCHECK="%ProgramFiles(x86)%\Sigcheck\sigcheck.exe"
+
+call %VCVARSALL% x86
+
+rmdir /s /q "%~dp0\mRemoteV1\bin" > nul 2>&1
+rmdir /s /q "%~dp0\mRemoteV1\obj" > nul 2>&1
+
+if exist "%~dp0\mRemoteV1\bin" goto ERROR_RMDIR
+if exist "%~dp0\mRemoteV1\obj" goto ERROR_RMDIR
+goto NOERROR_RMDIR
+
+:ERROR_RMDIR
+echo.
+echo Could not clean output directories.
+echo.
+echo Build process failed.
+echo.
+goto END
+
+:NOERROR_RMDIR
+
+echo Building release version...
+%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
+
+echo Building portable version...
+%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
+
+echo Signing binaries...
+%SIGNCMD% ^
+	"%~dp0\mRemoteV1\bin\Release\de\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\el\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\en-US\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\es\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\es-AR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\fr\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\hu\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\it\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\nb-NO\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\nl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pt\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pt-BR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\ru\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\uk\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\zh-CN\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\zh-TW\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\AxInterop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\AxInterop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.ShDocVw.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\de\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\el\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\en-US\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\es\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\es-AR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\fr\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\hu\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\it\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\nb-NO\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\nl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pt\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pt-BR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\ru\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\uk\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\zh-CN\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\zh-TW\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\AxInterop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\AxInterop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.ShDocVw.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\mRemoteNG.exe" ^
+
+
+rem Do not remove the two blank lines above this line.
+
+mkdir "%~dp0\Release" > nul 2>&1
+
+echo Getting product version...
+set VERSIONNSH="%~dp0\Release\Version.nsh"
+set SIGCHECK=!SIGCHECK:"=^"!
+set SIGCHECK=!SIGCHECK: =^^ !
+set SIGCHECK=!SIGCHECK:(=^^(!
+set SIGCHECK=!SIGCHECK:)=^^)!
+for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe"`) do (
+   set PRODUCT_VERSION_SHORT=%%i.%%j
+   echo ^^!define PRODUCT_VERSION "%%i.%%j.%%k.%%l" > %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_SHORT "%%i.%%j" >> %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_MAJOR "%%i" >> %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_MINOR "%%j" >> %VERSIONNSH%
+)
+echo Version is %PRODUCT_VERSION_SHORT%
+
+echo Creating installer package...
+if defined VERSIONTAG (
+	%MAKENSIS% /DPRODUCT_VERSION_TAG=%VERSIONTAG% "%~dp0\Installer\mRemote.nsi"
+
+	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.exe"
+	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
+	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
+) else (
+	%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
+
+	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%.exe"
+	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%.zip"
+	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%.zip"
+)
+
+del %VERSIONNSH%
+
+echo Signing installer package...
+%SIGNCMD% %INSTALLEREXE%
+
+echo Creating release ZIP file...
+del /f /q %BINARYZIP% > nul 2>&1
+%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
+%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep -afzip -inul %BINARYZIP% "%~dp0\*.TXT"
+
+echo Creating portable ZIP file...
+del /f /q %PORTABLEZIP% > nul 2>&1
+%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
+%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep -afzip -inul %PORTABLEZIP% "%~dp0\*.TXT"
+
+echo.
+echo Build process complete.
+echo.
+
+:END
+pause

CHANGELOG.TXT

@@ -1,4 +1,363 @@
-1.50:
+1.73 Beta 2 ():
+  Fixed issue MR-619 - Keyboard shortcuts stop working after locking the screen with Win+L
+  Added support for importing files from PuTTY Connection Manager.
+  Improved the import and export functionality.
+
+1.73 Beta 1 (2013-11-19):
+  Added feature MR-16 - Add keyboard shortcuts to switch between tabs
+  Added feature MR-141 - Add a default protocol option
+  Added feature MR-212 - Add option to connect without credentials
+  Added feature MR-512 - Add support for importing files from Remote Desktop Connection Manager
+  Added feature MR-547 - Add support for Xming Portable PuTTY
+  Made improvement MR-250 - Show the name of the selected connection tab in the title of the window
+  Made improvement MR-367 - Make the 'Connect' button on the 'Quick Connect' toolbar a forced dropdown
+  Made improvement MR-419 - Password prompt dialog should have a meaningful window title
+  Made improvement MR-486 - Allow escaping of variable names for external tools
+  Made improvement MR-590 - Make panels docked to the edge of the window keep their size
+  Fixed issue MR-187 - F7 keyboard shortcut for New Folder conflicts with remote connections
+  Fixed issue MR-523 - Changes to external tools are not saved until exiting the program
+  Fixed issue MR-556 - Export fails when overwriting an existing file
+  Fixed issue MR-594 - Crash on startup if write access is denied to the IE browser emulation registry key
+  Fixed issue MR-603 - Some configuration options are still shown even when inheritance is enabled
+  Added "Reset" to config panel context menu to allow resetting some config settings to their default value.
+  Added and improved menu icons.
+  Removed misleading log messages about RD Gateway support.
+  Removed invalid "Site" configuration option from PuTTY Saved Sessions.
+  Fixed PuTTY Saved Sessions still showing if all saved sessions are removed.
+  Fixed config panel showing settings from previously loaded connection file after loading a new one.
+  Improved handling of variables in external tool arguments.
+
+1.72 (2013-11-13):
+  Fixed issue MR-592 - Unable to run VBS script as an external tool
+  Fixed issue MR-596 - Incorrect escaping of quotation marks in external tool arguments
+
+1.71 (2013-10-29):
+  Fixed issue MR-574 - Crash when retrieving RDP session list if eolwtscom.dll is not registered
+  Fixed issue MR-578 - Connections file is reset
+  Fixed log file not showing operating system version on Windows XP and Windows Server 2003.
+  Fixed the wrong connections file opening on startup under certain conditions.
+  Fixed checking for updates even when disabled.
+  Improved error reporting when loading connections files.
+  Removed warning message when mRemoteNG is started for the first time about new connections file being created.
+
+1.71 Release Candidate 2 (2013-10-16):
+  Fixed issue MR-560 - Cannot Auto-Update With Open Connections: Unable to find an entry point named 'TaskDialogIndirect' in DLL 'ComCtl32'
+  Fixed issue MR-565 - Double Folder keep heritage on the initial Folder
+  Fixed issue MR-566 - Typo in German UI Automatic Update Settings
+  Fixed duplicated folders possibly being named "New Connection" instead of the original folder's name.
+
+1.71 Release Candidate 1 (2013-10-01):
+  Fixed issue MR-495 - Having a negative range in port scan creates memory exhaustion.
+  Fixed issue MR-514 - Window Proxy test failed without close button
+  Fixed issue MR-521 - Right-Clicking in "Sessions" panel crashes mRemoteNG
+  Fixed issue MR-525 - Could not start on windows 7 64bit
+  Fixed issue MR-535 - SQL error saving Connections
+  Fixed issue MR-538 - RDP loses connection when hiding config or connections pane
+  Fixed issue MR-542 - Wrapped putty has security flaw
+  Made minor improvements to the port scan functionality.
+  Fixed possible cross-thread operation exception when loading connections from SQL.
+  Fixed PuTTY Saved Sessions not showing after loading a new connections file.
+  Updated PuTTY to version 0.63.
+  Updated translations.
+  Added Chinese (Traditional) translation.
+  Added partial Greek and Hungarian translations.
+
+1.71 Beta 5 (2013-06-09):
+  Fixed issue MR-491 - Could not start RDP Connection
+  Fixed issue MR-499 - TS Gateway is not working in latest release 1.71
+  Fixed typo in SQL queries.
+
+1.71 Beta 4 (2013-05-28):
+  Added feature MR-435 - Add digital signature check to updater
+  Fixed issue MR-255 - The version of the RDP AX client should be updated to 7
+  Fixed issue MR-392 - Sessions Panel - context menu entries need to be context aware
+  Fixed issue MR-422 - Gives error Object reference not set to an instance of an object.
+  Fixed issue MR-424 - Import of a few Linux SSH2 hosts discovered via the port scan tool results in a UE
+  Fixed issue MR-439 - MRemoteNG 1.70 does not start
+  Fixed issue MR-440 - RDP import with non-standard port
+  Fixed issue MR-443 - Instructions for eolwtscom.dll registration for Portable version are inaccurate
+  Fixed issue MR-446 - Putty saved sessions show in connection panel
+  Fixed issue MR-459 - Maximized -> Minimized -> Restored results in mangled active display
+  Fixed issue MR-463 - Add support for LoadBalanceInfo to RDP
+  Fixed issue MR-470 - Quick Connect to Linux server uses invalid credentials
+  Fixed issue MR-471 - PuTTY Saved Sessions disappears from connection list
+  Fixed issue MR-487 - Initiate connections on MouseUp event
+  Added PuTTY Session Settings command to the Config panel for PuTTY Saved Sessions.
+  Updated translations.
+  Added Norwegian (Bokmal) and Portuguese (Brazil) translations.
+  Added Spanish translation to the installer.
+  Fixed an exception or crash when choosing unnamed colors for themes.
+  Fixed possible error "Control does not support transparent background colors" when modifying themes.
+  Fixed changes to the active theme not being saved reliably.
+  Fixed handling of the plus (+) character in PuTTY session names.
+  Changed Internet Explorer to no longer force IE7 compatibility mode.
+  Changed the "Launch PuTTY" button in the "Options" dialog to open PuTTY from the path the user has currently set, instead of what was previously saved.
+  Improved update and announcement checking.
+  Improved the PuTTY Saved Sessions list to update automatically when any changes are made.
+  Improved loading time of large connection files.
+  Lowered required version of RDC from 6.1 to 6.0.
+  Updated VncSharpNG to 1.3.4896.25007.
+
+1.71 Beta 3 (2013-03-20):
+  Fixed issue MR-397 - Putty disappears from the screen
+  Fixed issue MR-398 - Full Screen mode doesn't correctly make use of available space
+  Fixed issue MR-402 - scrollbar touch moves putty window
+  Fixed issue MR-406 - Items disappear from External Tools toolbar when accessing External Tools panel
+  Fixed issue MR-410 - Unhandled exception when clicking New button under Theme
+  Fixed issue MR-413 - Can't use aplication
+  Fixed new connections having a globe icon.
+  Fixed the category names in the themes tab of the options dialog on Windows XP not showing correctly.
+  Fixed PuTTY saved sessions with spaces or special characters not being listed.
+
+1.71 Beta 2 (2013-03-19):
+  Added feature MR-336 - Customizable background color for the windows/panels
+  Added feature MR-345 - Two separate options for confirming closure of Tabs and Connection Panels
+  Added feature MR-346 - Option to show/hide the description box at the bottom of the Config panel
+  Added feature MR-351 - Import connections from PuTTY
+  Fixed issue MR-354 - Re-ordering tabs doesn't give good, reliable visual feedback
+  Fixed issue MR-375 - Changing a connection's icon using the picture button should immediately update Icon field
+  Fixed issue MR-377 - Several redundant panels can be opened
+  Fixed issue MR-379 - Connection variables not working with external tools
+  Fixed issue MR-381 - Notifications panel - whitespace context menu allows Copy and Delete on nothing
+  Fixed issue MR-401 - Checkbox misaligned
+  The username and domain settings are now hidden for VNC connections since they are not supported.
+  Changed "Automatically get session information" to be disabled by default.
+  RDP connections can now be switched to full screen mode when redirect key combinations is enabled.
+
+1.71 Beta 1 (2013-03-04):
+  Added feature MR-329 - Create Option to disable the "Quick: " prefix
+  Fixed issue MR-67 - Sort does not recursively sort
+  Fixed issue MR-117 - Remote Session Info Window / Tab does not populate
+  Fixed issue MR-121 - Config pane not sorting properties correctly when switching between alphabetical and categorized view
+  Fixed issue MR-130 - Issues duplicating folders
+  Fixed issue MR-142 - Start of mRemoteNG takes about one minute and consumes excessive CPU
+  Fixed issue MR-158 - Password field not accepting Pipe
+  Fixed issue MR-330 - Portable version saves log to user's profile folder
+  Fixed issue MR-333 - Unnecessary prompt for 'close all open connections?'
+  Fixed issue MR-342 - Incorrect view in config pane of new connection after viewing default inheritance
+  Fixed issue MR-352 - Passwords with " (quotation mark) and # (hash key) characters make mRemoteNG to open PuttyNG dialog
+  Fixed issue MR-362 - Rename 'Screenshot Manager' to 'Screenshots' on the View menu to match Panel name
+  Added detection of newer versions of connection files and database schemata. mRemoteNG will now refuse to open them to avoid data loss.
+  Improved appearance and discoverability of the connection search box.
+  If RDC 7.0 or higher is installed, the connection bar is no longer briefly shown when connecting to an RDP connection with redirect key combinations enabled.
+  If RDC 8.0 or higher is installed, RDP connections automatically adjust their size when the window is resized or when toggling full screen mode.
+
+1.70 (2013-03-07):  
+  Fixed issue MR-339 - Connection group collapses with just one click
+  Fixed issue MR-340 - Object reference not set to an instance of an object.
+  Fixed issue MR-344 - Move "Always show panel tabs" option
+  Fixed issue MR-350 - VerifyDatabaseVersion (Config.Connections.Save) failed. Version string portion was too short or too long.
+  Fixed issue MR-355 - Moving sub folders to top level causes property loss
+  Fixed tabs not closing on double-click when the active tab is a PuTTY connection.
+
+1.70 Release Candidate 2 (2013-02-25):
+  Fixed issue MR-332 - Can't select different tab with one click after disconnecting existing tab
+  Fixed issue MR-338 - PuTTYNG crashing on fresh install of mRemoteNG
+  Re-enabled PuTTYNG integration enhancements on Windows 8
+
+1.70 Release Candidate 1 (2013-02-22):
+  Fixed issue MR-183 - Error trying to save connections when using SQL - Invalid column name _parentConstantId
+  Fixed issue MR-225 - Tabs do not open in a panel until multiple panels are displayed.
+  Fixed issue MR-229 - Integrated PuTTY doesn't work in Windows 8 RP
+  Fixed issue MR-264 - Windows 8 support
+  Fixed issue MR-317 - Difficulty right-clicking on Tab
+  Fixed issue MR-318 - Wrong tab gets selected when tab names overflow on the tab bar
+  Fixed issue MR-321 - New connection panel doesn't get panel header if its the only one or is moved
+  Fixed issue MR-322 - Connection Button not listing servers
+  Added option to always show panel tabs.
+  Fixed "Decryption failed. Padding is invalid and cannot be removed." notification.
+  Fixed KiTTY opening in a separate window when using a saved session.
+
+1.70 Beta 2 (2013-02-18):
+  Fixed issue MR-47 - Silent Installation Prompts for Language
+  Fixed issue MR-54 - Error When disconnecting from SSL channel RDP
+  Fixed issue MR-58 - Bug when duplicating connection in connection view 
+  Fixed issue MR-68 - Config Window Loses Options
+  Fixed issue MR-71 - Minimizing mRemoteNG causes temporary re-size of Putty sessions (windows)
+  Fixed issue MR-80 - Reconnect previous sessions
+  Fixed issue MR-81 - Problem Duplicating Folder w/ Sub-Folders
+  Fixed issue MR-85 - Microsoft .NET Framework warning
+  Fixed issue MR-86 - Citrix GDI+ Error when screen is locked
+  Fixed issue MR-96 - When pressing SHIFT+F4 to create a new connection inside a folder, the new connections doesn't inherit any properties from its parent
+  Fixed issue MR-101 - Collapse all folders causes a NullReferenceException
+  Fixed issue MR-165 - Can't close About window if it is the last tab
+  Fixed issue MR-166 - Inheritance button is disabled on some connections
+  Fixed issue MR-167 - Name and description of properties not show in inheritance list
+  Fixed issue MR-171 - Inherit configuration not showing friendly names for each inherit component
+  Fixed issue MR-172 - RDGatewayPassword is unencrypted in confCons.xml file
+  Fixed issue MR-174 - Trailing Space on a Hostname/IP will cause the connection not to happen.
+  Fixed issue MR-175 - Problem with focus when 2 or more PuTTY sessions opened
+  Fixed issue MR-176 - Del key while editing connection name triggers 'Delete Connection'
+  Fixed issue MR-178 - 3 different panels crashes all connections
+  Fixed issue MR-181 - Sessions on startup
+  Fixed issue MR-190 - Can't click on tab/session
+  Fixed issue MR-196 - Cannot export list without usernames and passwords
+  Fixed issue MR-199 - when using screen inside putty, screen becomes dead when reduce mremoteNG
+  Fixed issue MR-202 - The Connection "Tab" show Ampersands as underscores.
+  Fixed issue MR-214 - Hostname/IP reset
+  Fixed issue MR-224 - Session tabs become un-clickable after duplicating a tab or opening a new one in the same panel
+  Fixed issue MR-233 - Backslash at end of password prevents success of putty invocation and corresponding auto-logon
+  Fixed issue MR-235 - Config file gets corrupted when leaving the password entry box with ESC
+  Fixed issue MR-264 - Windows 8 support
+  Fixed issue MR-277 - Inheritance configuration button not appear in configuration tab
+  Fixed issue MR-284 - SSH: Text not showing properly
+  Fixed issue MR-299 - mRemoteNG crashes while using remotely (Windows XP remote desktop)
+  Fixed issue MR-306 - Fatal .NET exception on program start
+  Fixed issue MR-313 - PuTTY window not maximized when loading from saved session
+  mRemoteNG now requires .NET Framework 3.0 instead of 2.0.
+  Updated translations.
+  Added translations for Spanish (Argentina), Italian, Polish, Portuguese, Chinese (Simplified).
+  Improved the use of Tab and Shift-Tab to cycle through entries in the Config grid.
+  Improved loading of XML files from older versions of mRemote/mRemoteNG.
+
+1.70 Beta 1 (2012-02-27):
+  Fixed issue MR-77 - VerifyDatabaseVersion (Config.Connections.Save) failed. Version string portion was too short or too long.
+  Fixed issue MR-78 - Renaming Connections
+  Fixed issue MR-79 - MoveUp/Down item doesn't work + Sort button broken
+  Fixed issue MR-93 - Regional settings problem when using SQL connection in mRemoteNG
+  Fixed issue MR-97 - Integrate Dutch translation
+  Fixed issue MR-98 - Integrate Russian and Ukranian translations
+  Fixed issue MR-99 - Integrate Spanish translation
+  Fixed issue MR-131 - RD Gateway does not respect setting for use different credentials
+  Added compatibility check for "Use FIPS compliant algorithms" security setting.
+  Improved reporting of errors when encrypting and decrypting connection files.
+  Added partial Polish translation.
+  The panel tabs are now hidden if only one panel is open.
+  Fix focus issue with RDP connections when changing tabs.
+  Show changes live as connection tabs are being dragged around to change their order.
+  Updated PuTTY to version 0.62.
+  Improved error handling when loading connection files.
+  Fixed bugs with creating a new connection file.
+  A backup of the connection file is saved when it is loaded. The most recent ten backup copies are kept.
+  Added the option to use a smart card for RD Gateway credentials.
+  Made the use of CredSSP for RDP connections optional.
+  Updated VncSharpNG to version 1.2.4440.36644.
+  Added debugging symbols for VncSharpNG.
+
+1.69 (2011-12-09):
+  Fixed issue #66 - Fresh Install Fails to Create Config
+  Fixed issue #69 - Connection file gets erased
+  Fixed issue #72 - scrollbars added to RDP window after minimize/restore of mRemoteNG
+  Disabled automatic updates in the portable edition
+  Fixed file name in window title changing when exporting an XML file.
+  Fixed Use only Notifications panel checkbox.
+  Updated PuTTY to version 0.61
+  Binaries are now digitally signed
+  Added Credits, License, and Version History items to the Start Menu and made Start Menu item names localizable.
+
+1.68 (2011-07-07):
+  Fixed issue #48 - VerifyDatabaseVersion fails with new (empty) database tables.
+  Fixed issue #60 - Can't save connections file
+  Fixed issue #62 - Connection file error upon launch.
+
+1.67 (2011-06-05):
+  Fixed migration of external tools configuration and panel layout from Local to Roaming folder.
+  Disable ICA Hotkeys for Citrix connections.  Fixes issue with international users.
+  Added a language selection option so users can override the language if they don't want it automatically detected.
+  Added partial French translation to the application.
+  Addded Thai translation to the installer.
+  Updated graphics in the installer to mRemoteNG logo.
+  Fixed RD Gateway default properties and RDP reconnection count setting not being saved.
+  Fixed bug 33 - IPv6 doesn't work in quick Connect box.
+  Moved the items under Tools in the Connections panel context menu up to the top level.
+  Added buttons for Add Connection, Add Folder, and Sort Ascending (A-Z) to the Connections panel toolbar.
+  Fixed rename edit control staying open when collapsing all folders.
+  Changed sorting to sort all subfolders below the selected folder.
+  Allow sorting of connections if a connection entry is selected.
+  Fixed adding a connection entry if nothing is selected in the tree.
+  Added 15-bit Color RDP setting.
+  Fixed loading of RDP Colors setting from SQL.
+  Added Font Smoothing and Desktop Composition RDP settings.
+  Improved error handling when loading XML connection files.
+  Added the mRemoteNG icon to the list of selectable icons for connection entries.
+  Added confirmation before closing connection tabs.
+  Fixed bug 42 - Maximized location not remembered with multiple monitors.
+  Improved loading and saving of window location.
+  Removed flickering on start up.
+  Changed the Options page into a normal dialog.
+  Improved Reset Layout function.
+  Changed to use full four part version numbers with major, minor, build, and revision.
+  Changed hard coded SQL database name into a user configurable setting.
+  Fixed tab order of controls in Options dialog.
+  Fixed bug 45 - Changing some settings in the config file may not save.
+
+1.66 (2011-05-02):
+  Fixed connections not working
+
+1.65 (2011-05-02):
+  Fixed Ctrl-Tab and Ctrl-Shift-Tab not working in any other applications while mRemoteNG is running
+  Ctrl-Tab and Ctrl-Shift-Tab no longer work to switch tabs within mRemoteNG
+  Fixed bug 36 - Install creates shortcuts only for the installing user
+  Fixed bug 38 - Application uses the wrong Application Data settings folder (in Local Settings)
+  Added code to the installer to check that the user is in the 'Power Users' or 'Administrators' group
+
+1.64 (2011-04-27):
+  Fixed bug 6 - VNC CTRL+key & keyboard combo mappings are broken
+  Fixed bug 12 - Tab switch is not working in config panel
+  Fixed bug 14 - RDP Connection authentication problem
+  Fixed bug 22 - External App parameter macro expansion doesn't work with "try to integrate"
+  Fixed bug 25 - Unhandled exception when mRemoteNG opens
+  Added multilanguage support and German translation to the application
+  Added Czech, Dutch, French, German, Polish, and Spanish translations to the installer
+  Added Ctrl-Tab hotkey to switch to the next tab and Ctrl-Shift-Tab to switch to the previous tab
+  Added Tab key to cycle through entries in the Config grid and Shift-Tab to cycle in reverse
+  Added ability to configure external tools to run before or after a connection is established
+  Fixed missing parameters in macro expansion for external tools
+  Fixed RD Gateway and other inheritance bugs
+  Changed how new connection files are created
+  Changed the internal namespace of the application to mRemoteNG instead of mRemote
+  Added credit for the DockPanel Suite to the About page
+  Updated DockPanel Suite to version 2.5 RC1
+  Updated VNCSharpNG to correct Ctrl and Alt key pass-through behavior
+
+1.63 (2010-02-02):
+  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 (2010-01-19):
+  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 (2010-01-14):
+  Removed unlicensed SmartCode Solutions ViewerX VNC Viewer ActiveX
+  This version of mRemoteNG does not support VNC
+
+1.60 (2010-01-09):
+  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 +366,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
 
@@ -455,7 +814,7 @@ V0.0.3.2:
 V0.0.3.0:
   Added Options Tab
     Load connections file from different location
-    Save/Don’t Save connections file on exit
+    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
@@ -465,7 +824,7 @@ V0.0.3.0:
 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
+  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
 

CREDITS.TXT

@@ -0,0 +1,127 @@
+Contributors
+============
+
+Jason Barbier
+Wiktor Beryt
+Lionel Caignec
+Ruben d'Arco
+Felix Deimel
+Holger Henke
+Tom Hiller
+Riley McArdle
+Apisitt Rattana
+Andreas Rehm
+David Vidmar
+
+
+Translators
+===========
+
+Eugenio "Ryo567" Mart<72>nez
+Mathieu Pape
+Emanuel Silva
+Robert Siwiec
+
+
+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
+
+DotNetVer
+Copyright <20> 2010 David Grinberg
+Copyright <20> 2010-2011 Brandon Hansen
+http://nsis.sourceforge.net/DotNetVer
+
+Hotkey Selection Control for .NET
+Copyright <20> 2006 Thomas Backman
+http://www.codeproject.com/Articles/15085/A-simple-hotkey-selection-control-for-NET
+
+
+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.62
+Copyright <20> 1997-2011 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/DotNetVer.nsh

@@ -0,0 +1,296 @@
+; ---------------------
+;      DotNetVer.nsh
+;      Written by: David Grinberg
+;      Homepage: http://ontheperiphery.veraida.com/
+;      Updated By: Brandon Hansen (http://www.remotehams.com/)
+; ---------------------
+;
+; LogicLib extensions for checking Microsoft .NET Framework versions and service packs.
+;
+; Latests Updates by Brandon Hansen, KG6YPI (RemoteHams.com)
+; Dec 26, 2011 - .NET Framework 4.0 detection fixes - client profile not being found
+; Dec 07, 2010 - .NET Framework 4.0 detection added by Brandon Hansen (KG6YPI)
+;
+; Usage examples:
+;
+; ${If} ${HasDotNet4.0}
+;    DetailPrint "Microsoft .NET Framework 4.0 installed."
+;    ${If} ${DOTNETVER_4_0} AtLeastDotNetServicePack 1
+;        DetailPrint "Microsoft .NET Framework 4.0 is at least SP1."
+;    ${Else}
+;        DetailPrint "Microsoft .NET Framework 4.0 SP1 not installed."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetClientProfile 1
+;        DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) available."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 1
+;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) available."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 0
+;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) not available."
+;    ${EndIf}
+; ${EndIf}
+ 
+ 
+!verbose push
+!verbose 3
+ 
+!ifndef ___DOTNETVER__NSH___
+!define ___DOTNETVER__NSH___
+ 
+!include LogicLib.nsh
+!include Util.nsh
+ 
+# constants
+ 
+!define DOTNETVER_1_0  "1.0"
+!define DOTNETVER_1_1  "1.1"
+!define DOTNETVER_2_0  "2.0"
+!define DOTNETVER_3_0  "3.0"
+!define DOTNETVER_3_5  "3.5"
+!define DOTNETVER_4_0  "4.0"
+ 
+# variable declaration
+ 
+Var /GLOBAL __DONTNET_FOUNDVER
+ 
+!macro __DotNetVer_DeclareVars
+    !ifndef __DOTNETVER_VARS_DECLARED
+        !define __DOTNETVER_VARS_DECLARED
+        Var /GLOBAL __DOTNET_1.0
+        Var /GLOBAL __DOTNET_1.1
+        Var /GLOBAL __DOTNET_2.0
+        Var /GLOBAL __DOTNET_3.0
+        Var /GLOBAL __DOTNET_3.5
+        Var /GLOBAL __DOTNET_4.0
+ 
+        Var /GLOBAL __DOTNETVER_1.0_SP
+        Var /GLOBAL __DOTNETVER_1.1_SP
+        Var /GLOBAL __DOTNETVER_2.0_SP
+        Var /GLOBAL __DOTNETVER_3.0_SP
+        Var /GLOBAL __DOTNETVER_3.5_SP
+        Var /GLOBAL __DOTNETVER_4.0_SP
+ 
+        Var /GLOBAL __DOTNET_1.0_CLIENT
+        Var /GLOBAL __DOTNET_1.1_CLIENT
+        Var /GLOBAL __DOTNET_2.0_CLIENT
+        Var /GLOBAL __DOTNET_3.0_CLIENT
+        Var /GLOBAL __DOTNET_3.5_CLIENT
+        Var /GLOBAL __DOTNET_4.0_CLIENT
+ 
+        Var /GLOBAL __DOTNET_1.0_FULL
+        Var /GLOBAL __DOTNET_1.1_FULL
+        Var /GLOBAL __DOTNET_2.0_FULL
+        Var /GLOBAL __DOTNET_3.0_FULL
+        Var /GLOBAL __DOTNET_3.5_FULL
+        Var /GLOBAL __DOTNET_4.0_FULL
+ 
+        StrCpy $__DOTNET_1.0 0
+        StrCpy $__DOTNET_1.1 0
+        StrCpy $__DOTNET_2.0 0
+        StrCpy $__DOTNET_3.0 0
+        StrCpy $__DOTNET_3.5 0
+        StrCpy $__DOTNET_4.0 0
+ 
+        StrCpy $__DOTNETVER_1.0_SP 0
+        StrCpy $__DOTNETVER_1.1_SP 0
+        StrCpy $__DOTNETVER_2.0_SP 0
+        StrCpy $__DOTNETVER_3.0_SP 0
+        StrCpy $__DOTNETVER_3.5_SP 0
+        StrCpy $__DOTNETVER_4.0_SP 0
+ 
+        StrCpy $__DOTNET_1.0_CLIENT 0
+        StrCpy $__DOTNET_1.1_CLIENT 0
+        StrCpy $__DOTNET_2.0_CLIENT 0
+        StrCpy $__DOTNET_3.0_CLIENT 0
+        StrCpy $__DOTNET_3.5_CLIENT 0
+        StrCpy $__DOTNET_4.0_CLIENT 0
+ 
+        StrCpy $__DOTNET_1.0_FULL 0
+        StrCpy $__DOTNET_1.1_FULL 0
+        StrCpy $__DOTNET_2.0_FULL 0
+        StrCpy $__DOTNET_3.0_FULL 0
+        StrCpy $__DOTNET_3.5_FULL 0
+        StrCpy $__DOTNET_4.0_FULL 0
+ 
+  !endif
+!macroend
+ 
+ 
+# lazy initialization macro
+ 
+!macro __DotNetVer_InitVars
+    # only calculate version once
+    StrCmp $__DONTNET_FOUNDVER "" dotnetver.noveryet
+        Return
+ 
+    dotnetver.noveryet:
+    !insertmacro __DotNetVer_DeclareVars
+ 
+    Push $0    ;registry count
+    Push $1    ;registry key
+    Push $2    ;version number
+    Push $3    ;installed
+    Push $4    ;service pack number
+    Push $8    ;strLen helper var
+ 
+    StrCpy $0 0
+ 
+    dotnetver.startenum:
+ 
+    EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
+    StrCmp $1 "" dotnetver.done
+ 
+    IntOp $0 $0 + 1
+ 
+    StrCpy $2 $1 1 0
+    StrCmp $2 "v" +1 dotnetver.startenum
+    StrCpy $2 $1 3 1
+ 
+    ; Check for .NET 1.0 to 3.5
+    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "Install"
+    ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "SP"
+    IntCmp $3 1 dotnetcheck.skipalt
+    ; Alternate check for versions that don't set the Install key
+    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1\Setup" "InstallSuccess"
+    dotnetcheck.skipalt:
+    ; This is a sanity check that works on .NET 1.0 to 3.5
+    ; if it fails check for dotnet 4
+    IntCmp $3 0 dotnetcheck.40
+    StrCmp $2 ${DOTNETVER_1_0} dotnetver.10
+    StrCmp $2 ${DOTNETVER_1_1} dotnetver.11
+    StrCmp $2 ${DOTNETVER_2_0} dotnetver.20
+    StrCmp $2 ${DOTNETVER_3_0} dotnetver.30
+    StrCmp $2 ${DOTNETVER_3_5} dotnetver.35
+    dotnetcheck.40:
+    StrCmp $2 ${DOTNETVER_4_0} dotnetver.40
+    StrCmp $2 "4" dotnetver.40
+ 
+    Goto dotnetver.startenum
+ 
+    dotnetver.10:
+        StrCpy $__DOTNET_1.0 1
+        StrCpy $__DOTNETVER_1.0_SP $4
+        StrCpy $__DOTNET_1.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.11:
+        StrCpy $__DOTNET_1.1 1
+        StrCpy $__DOTNETVER_1.1_SP $4
+        StrCpy $__DOTNET_1.1_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.20:
+        StrCpy $__DOTNET_2.0 1
+        StrCpy $__DOTNETVER_2.0_SP $4
+        StrCpy $__DOTNET_2.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.30:
+        StrCpy $__DOTNET_3.0 1
+        StrCpy $__DOTNETVER_3.0_SP $4
+        StrCpy $__DOTNET_3.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.35:
+        StrCpy $__DOTNET_3.5 1
+        StrCpy $__DOTNETVER_3.5_SP $4
+        StrCpy $__DOTNET_3.5_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.40:
+        ; Check for .NET 4.0 (Full Profile)
+        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Install"
+        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "SP"
+	StrLen $8 $3
+        IntCmp $8 0 dotnetcheck.40c
+        IntCmp $3 0 dotnetcheck.40c
+        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Full
+        StrCmp $2 "4" dotnetver.40_Full
+        dotnetcheck.40c:
+        ; Check for .NET 4.0 (Client Profile)
+        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "Install"
+        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "SP"
+	StrLen $8 $3
+        IntCmp $8 0 dotnetver.startenum
+        IntCmp $3 0 dotnetver.startenum
+        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Client
+        StrCmp $2 "4" dotnetver.40_Client
+        Goto dotnetver.startenum
+    dotnetver.40_Full:
+        StrCpy $__DOTNET_4.0 1
+        StrCpy $__DOTNETVER_4.0_SP $4
+        StrCpy $__DOTNET_4.0_FULL 1
+        Goto dotnetcheck.40c ; continue looking for other profiles
+    dotnetver.40_Client:
+        StrCpy $__DOTNET_4.0 1
+        StrCpy $__DOTNETVER_4.0_SP $4
+        StrCpy $__DOTNET_4.0_CLIENT 1
+        Goto dotnetver.startenum
+ 
+    dotnetver.done:
+ 
+    StrCpy $__DONTNET_FOUNDVER "1"
+ 
+    Pop $8
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+!macroend
+ 
+!macro _HasDotNet _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+   !insertmacro _= `$__DOTNET_${_b}` `1` `${_t}` `${_f}`
+!macroend
+ 
+!macro __DotNetVer_DefineTest Ver
+  !define HasDotNet${Ver} `"" HasDotNet ${Ver}`
+!macroend
+ 
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_1}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_2_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_5}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_4_0}
+ 
+!macro _AtLeastDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _>= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define AtLeastDotNetServicePack `AtLeastDotNetServicePack`
+ 
+ 
+!macro _AtMostDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _<= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define AtMostDotNetServicePack `AtMostDotNetServicePack`
+ 
+ 
+!macro _IsDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define IsDotNetServicePack `IsDotNetServicePack`
+ 
+!macro _HasDotNetClientProfile _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNET_${_a}_CLIENT` `${_b}` `${_t}` `${_f}`
+!macroend
+!define HasDotNetClientProfile `HasDotNetClientProfile`
+ 
+!macro _HasDotNetFullProfile _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNET_${_a}_FULL` `${_b}` `${_t}` `${_f}`
+!macroend
+!define HasDotNetFullProfile `HasDotNetFullProfile`
+ 
+# done
+ 
+!endif # !___DOTNETVER__NSH___
+ 
+!verbose pop

Installer/Language/czech.nsi

@@ -0,0 +1,22 @@
+; Czech installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_CZECH} "mRemoteNG run CZECH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_CZECH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_CZECH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 3.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_CZECH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_CZECH} "Credits"
+LangString CopyingLinkName ${LANG_CZECH} "License"
+LangString UninstallLinkName ${LANG_CZECH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_CZECH} "Version History"

Installer/Language/dutch.nsi

@@ -0,0 +1,22 @@
+; Dutch installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_DUTCH} "mRemoteNG run DUTCH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_DUTCH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_DUTCH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 3.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_DUTCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_DUTCH} "Credits"
+LangString CopyingLinkName ${LANG_DUTCH} "License"
+LangString UninstallLinkName ${LANG_DUTCH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_DUTCH} "Version History"

Installer/Language/english.nsi

@@ -0,0 +1,22 @@
+; English installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_ENGLISH} "Launch mRemoteNG Now"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_ENGLISH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_ENGLISH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 3.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_ENGLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_ENGLISH} "Credits"
+LangString CopyingLinkName ${LANG_ENGLISH} "License"
+LangString UninstallLinkName ${LANG_ENGLISH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_ENGLISH} "Version History"

Installer/Language/french.nsi

@@ -0,0 +1,22 @@
+; French installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_FRENCH} "mRemoteNG run FRENCH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_FRENCH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_FRENCH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 3.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_FRENCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_FRENCH} "Credits"
+LangString CopyingLinkName ${LANG_FRENCH} "License"
+LangString UninstallLinkName ${LANG_FRENCH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_FRENCH} "Version History"

Installer/Language/german.nsi

@@ -0,0 +1,22 @@
+; German installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_GERMAN} "mRemoteNG jetzt Starten"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_GERMAN} "Installationsprogamm Sprache"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_GERMAN} "Bitte w<>hlen Sie die Sprache f<>r das Installationsprogramm"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG ben<65>tigt das Microsoft .NET Framework 3.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_GERMAN} "Sie m<>ssen Mitglied der Grupper 'Power Users' or 'Administratoren' sein, damit Sie mRemoteNG installieren k<>nnen."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_GERMAN} "Credits"
+LangString CopyingLinkName ${LANG_GERMAN} "License"
+LangString UninstallLinkName ${LANG_GERMAN} "Uninstall"
+LangString ChangeLogLinkName ${LANG_GERMAN} "Version History"

Installer/Language/languages.nsi

@@ -0,0 +1,31 @@
+!define LanguageNameEnglish "English"
+!insertmacro MUI_LANGUAGE "English"
+!include "Language\english.nsi"
+
+!define LanguageNameCzech "Čeština"
+!insertmacro MUI_LANGUAGE "Czech"
+!include "Language\czech.nsi"
+
+!define LanguageNameGerman "Deutsch"
+!insertmacro MUI_LANGUAGE "German"
+!include "Language\german.nsi"
+
+!define LanguageNameSpanish "Español"
+!insertmacro MUI_LANGUAGE "Spanish"
+!include "Language\spanish.nsi"
+
+!define LanguageNameFrench "Français"
+!insertmacro MUI_LANGUAGE "French"
+!include "Language\french.nsi"
+
+!define LanguageNameDutch "Nederlands"
+!insertmacro MUI_LANGUAGE "Dutch"
+!include "Language\dutch.nsi"
+
+!define LanguageNamePolish "Polski"
+!insertmacro MUI_LANGUAGE "Polish"
+!include "Language\polish.nsi"
+
+!define LanguageNameThai "ภาษาไทย"
+!insertmacro MUI_LANGUAGE "Thai"
+!include "Language\thai.nsi"

Installer/Language/polish.nsi

@@ -0,0 +1,22 @@
+; Polish installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_POLISH} "mRemoteNG run POLISH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_POLISH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_POLISH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 3.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_POLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_POLISH} "Credits"
+LangString CopyingLinkName ${LANG_POLISH} "License"
+LangString UninstallLinkName ${LANG_POLISH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_POLISH} "Version History"

Installer/Language/spanish.nsi

@@ -0,0 +1,22 @@
+; Spanish installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_SPANISH} "Iniciando de mRemoteNG"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_SPANISH} "Lenguaje de Instalación"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_SPANISH} "Seleccione el lenguaje de instalación"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requiere Microsoft .NET Framework 3.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_SPANISH} "Debe ser miembro del grupo 'Administradores' para poder instalar mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_SPANISH} "Créditos"
+LangString CopyingLinkName ${LANG_SPANISH} "Licencia"
+LangString UninstallLinkName ${LANG_SPANISH} "Desinstalar"
+LangString ChangeLogLinkName ${LANG_SPANISH} "Historial de Versiones"

Installer/Language/thai.nsi

@@ -0,0 +1,23 @@
+; Thai installer translation
+; Contributed by Apisitt Rattana
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_THAI} "ขณะนี้กำลังติดตั้ง mRemoteNG"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_THAI} "ภาษาสำหรับการติดตั้ง"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_THAI} "กรุณาเลือกภาษาสำหรับการติดตั้ง"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_THAI} "mRemoteNG มีความต้องการ  Microsoft .NET Framework 3.0. เป็นพื้นฐาน"
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_THAI} "คุณต้องเป็นสมาชิกในกลุ่มของ 'Power Users' หรือ 'Administrators' เพื่อการติดตั้ง mRemoteNG"
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_THAI} "Credits"
+LangString CopyingLinkName ${LANG_THAI} "License"
+LangString UninstallLinkName ${LANG_THAI} "Uninstall"
+LangString ChangeLogLinkName ${LANG_THAI} "Version History"

Installer/mRemote.nsi

@@ -0,0 +1,197 @@
+!include "MUI.nsh"
+!include "WordFunc.nsh"
+!insertmacro VersionCompare
+
+!include "DotNetVer.nsh"
+!include "..\Release\Version.nsh"
+
+; This will be passed in using the /D switch by BUILD.CMD
+!ifdef PRODUCT_VERSION_TAG
+	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
+	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}-${PRODUCT_VERSION_TAG}"
+!else
+	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
+	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}"
+!endif
+
+; Basic Config
+Name "mRemoteNG ${PRODUCT_VERSION_FRIENDLY}"
+OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION_TAGGED}.exe"
+SetCompressor /SOLID lzma
+InstallDir "$PROGRAMFILES\mRemoteNG"
+InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath"
+RequestExecutionLevel admin
+
+; Version Information
+VIProductVersion ${PRODUCT_VERSION}
+VIAddVersionKey "CompanyName" "Next Generation Software"
+VIAddVersionKey "ProductName" "mRemoteNG"
+VIAddVersionKey "ProductVersion" ${PRODUCT_VERSION}
+VIAddVersionKey "LegalCopyright" "Copyright © 2007-2009 Felix Deimel, 2010-2013 Riley McArdle"
+VIAddVersionKey "FileDescription" "mRemoteNG ${PRODUCT_VERSION_FRIENDLY} Installer"
+VIAddVersionKey "FileVersion" ${PRODUCT_VERSION}
+
+; Design
+!define MUI_ICON "Setup_Install.ico"
+!define MUI_UNICON "RecycleBin.ico"
+!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 "$INSTDIR\mRemoteNG.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstall Pages
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Get Languages
+!include "Language\languages.nsi"
+
+; Set finish page text
+!define MUI_FINISHPAGE_RUN_Text "$(LaunchMremoteNow)"
+
+Function .onInit
+	ClearErrors
+	UserInfo::GetName
+	IfErrors Win9x
+	Pop $0
+	UserInfo::GetAccountType
+	Pop $1
+	# GetOriginalAccountType will check the tokens of the original user of the
+	# current thread/process. If the user tokens were elevated or limited for
+	# this process, GetOriginalAccountType will return the non-restricted
+	# account type.
+	# On Vista with UAC, for example, this is not the same value when running
+	# with `RequestExecutionLevel user`. GetOriginalAccountType will return
+	# "admin" while GetAccountType will return "user".
+	StrCmp $1 "Admin" 0 +3
+		Goto doit
+	StrCmp $1 "Power" 0 +3
+		Goto doit
+	StrCmp $1 "User" 0 +3
+		Goto noop
+	StrCmp $1 "Guest" 0 +3
+		Goto noop
+	MessageBox MB_OK "Unknown error"
+	Goto doit
+
+	Win9x:
+	doit:
+		# We can install
+		IfSilent +2
+			Call SelectLanguage
+		Goto end
+	noop:
+		MessageBox MB_OK "$(RequiresAdminUser)"
+		Quit
+	end:
+FunctionEnd
+
+Function SelectLanguage
+	;Language selection dialog
+	Push ""
+	Push ${LANG_ENGLISH}
+	Push ${LanguageNameEnglish}
+	Push ${LANG_GERMAN}
+	Push ${LanguageNameGerman}
+	Push ${LANG_DUTCH}
+	Push ${LanguageNameDutch}
+	Push ${LANG_FRENCH}
+	Push ${LanguageNameFrench}
+	Push ${LANG_POLISH}
+	Push ${LanguageNamePolish}
+	Push ${LANG_SPANISH}
+	Push ${LanguageNameSpanish}
+	Push ${LANG_CZECH}
+	Push ${LanguageNameCzech}
+	Push ${LANG_THAI}
+	Push ${LanguageNameThai}
+	Push A ; A means auto count languages
+	       ; for the auto count to work the first empty push (Push "") must remain
+	LangDLL::LangDialog  "$(InstallerLanguage)" "$(SelectInstallerLanguage)"
+
+	Pop $LANGUAGE
+	StrCmp $LANGUAGE "cancel" 0 +2
+		Abort
+
+	; Check .NET version
+	${IfNot} ${HasDotNet3.0}
+		MessageBox MB_OK|MB_ICONEXCLAMATION "$(RequiresNetFramework)"
+		Quit
+	${EndIf}
+FunctionEnd
+
+Section "" ; Install
+	SetOutPath $INSTDIR
+	SetShellVarContext all
+	
+	; 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\$(CreditsLinkName).lnk" "$INSTDIR\CREDITS.TXT"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CopyingLinkName).lnk" "$INSTDIR\COPYING.TXT"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(UninstallLinkName).lnk" "$INSTDIR\Uninstall.exe"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(ChangeLogLinkName).lnk" "$INSTDIR\CHANGELOG.TXT"
+
+	; 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" "Next Generation Software"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 7080
+
+	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
+	SetShellVarContext all
+	RMDir /r "$SMPROGRAMS\mRemoteNG"
+	SetShellVarContext current
+	RMDir /r "$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

Local.testsettings

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="Local" id="2a25bb82-f5ff-4a67-b5e9-c6aaa54d1e80" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>These are default test settings for a local test run.</Description>
+  <Deployment enabled="false" />
+  <Execution>
+    <TestTypeSpecific />
+    <AgentRule name="Execution Agents">
+    </AgentRule>
+  </Execution>
+</TestSettings>

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

SharedLibraryNG/HotkeyControl.cs

@@ -0,0 +1,331 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+//
+// Hotkey selection control, written by serenity@exscape.org, 2006-08-03
+// Please mail me if you find a bug.
+//
+
+namespace SharedLibraryNG
+{
+    /// <summary>
+    /// A simple control that allows the user to select pretty much any valid hotkey combination
+    /// </summary>
+    public class HotkeyControl : TextBox
+    {
+	    private const string KeySeparator = " + ";
+
+        // These variables store the current hotkey and modifier(s)
+        private Keys _keyCode = Keys.None;
+        private Keys _modifiers = Keys.None;
+
+        // ArrayLists used to enforce the use of proper modifiers.
+        // Shift+A isn't a valid hotkey, for instance, as it would screw up when the user is typing.
+        private readonly ArrayList _needNonShiftModifier;
+        private readonly ArrayList _needNonAltGrModifier;
+
+        private readonly ContextMenu _emptyContextMenu = new ContextMenu();
+
+        /// <summary>
+        /// Used to make sure that there is no right-click menu available
+        /// </summary>
+        public override ContextMenu ContextMenu
+        {
+            get
+            {
+                return _emptyContextMenu;
+            }
+			// ReSharper disable once ValueParameterNotUsed
+			set
+            {
+                base.ContextMenu = _emptyContextMenu;
+            }
+        }
+
+        /// <summary>
+        /// Forces the control to be non-multiline
+        /// </summary>
+        public override bool Multiline
+        {
+            get
+            {
+                return base.Multiline;
+            }
+			// ReSharper disable once ValueParameterNotUsed
+            set
+            {
+                // Ignore what the user wants; force Multiline to false
+                base.Multiline = false;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new HotkeyControl
+        /// </summary>
+        public HotkeyControl()
+        {
+            // Handle events that occurs when keys are pressed
+            KeyUp += HotkeyControl_KeyUp;
+
+            // Fill the ArrayLists that contain all invalid hotkey combinations
+            _needNonShiftModifier = new ArrayList();
+            _needNonAltGrModifier = new ArrayList();
+            PopulateModifierLists();
+        }
+
+		protected override void OnCreateControl()
+		{
+			base.OnCreateControl();
+
+			ContextMenu = _emptyContextMenu; // Disable right-clicking
+			Multiline = false;
+			Text = "None";
+		}
+
+        /// <summary>
+        /// Populates the ArrayLists specifying disallowed hotkeys
+        /// such as Shift+A, Ctrl+Alt+4 (would produce a dollar sign) etc
+        /// </summary>
+        private void PopulateModifierLists()
+        {
+            // Shift + 0 - 9, A - Z
+            for (var k = Keys.D0; k <= Keys.Z; k++)
+                _needNonShiftModifier.Add((int)k);
+
+            // Shift + Numpad keys
+            for (var k = Keys.NumPad0; k <= Keys.NumPad9; k++)
+                _needNonShiftModifier.Add((int)k);
+
+            // Shift + Misc (,;<./ etc)
+            for (var k = Keys.Oem1; k <= Keys.OemBackslash; k++)
+                _needNonShiftModifier.Add((int)k);
+
+            // Misc keys that we can't loop through
+            _needNonShiftModifier.Add((int)Keys.Insert);
+            _needNonShiftModifier.Add((int)Keys.Help);
+            _needNonShiftModifier.Add((int)Keys.Multiply);
+            _needNonShiftModifier.Add((int)Keys.Add);
+            _needNonShiftModifier.Add((int)Keys.Subtract);
+            _needNonShiftModifier.Add((int)Keys.Divide);
+            _needNonShiftModifier.Add((int)Keys.Decimal);
+            _needNonShiftModifier.Add((int)Keys.Return);
+            _needNonShiftModifier.Add((int)Keys.Escape);
+            _needNonShiftModifier.Add((int)Keys.NumLock);
+            _needNonShiftModifier.Add((int)Keys.Scroll);
+            _needNonShiftModifier.Add((int)Keys.Pause);
+
+            // Ctrl+Alt + 0 - 9
+            for (var k = Keys.D0; k <= Keys.D9; k++)
+                _needNonAltGrModifier.Add((int)k);
+        }
+
+        /// <summary>
+        /// Fires when all keys are released. If the current hotkey isn't valid, reset it.
+        /// Otherwise, do nothing and keep the text and hotkey as it was.
+        /// </summary>
+        void HotkeyControl_KeyUp(object sender, KeyEventArgs e)
+        {
+			if (_keyCode == Keys.None && ModifierKeys == Keys.None) ResetHotkey();
+        }
+
+        /// <summary>
+        /// Handles some misc keys, such as Ctrl+Delete and Shift+Insert
+        /// </summary>
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+			var keyCode = keyData & Keys.KeyCode;
+			var modifiers = keyData & Keys.Modifiers;
+
+			if (keyData == Keys.Back || keyData == Keys.Delete)
+            {
+                ResetHotkey();
+                return true;
+            }
+
+			_keyCode = keyCode;
+			_modifiers = modifiers;
+			Redraw();
+
+			return true;
+        }
+
+        /// <summary>
+        /// Clears the current hotkey and resets the TextBox
+        /// </summary>
+        public void ResetHotkey()
+        {
+            _keyCode = Keys.None;
+            _modifiers = Keys.None;
+			Text = "None";
+        }
+
+        /// <summary>
+        /// Used to get/set the hotkey (e.g. Keys.A)
+        /// </summary>
+        public Keys KeyCode
+        {
+            get
+            {
+                return _keyCode;
+            }
+            set
+            {
+                _keyCode = value;
+                Redraw(false);
+            }
+        }
+
+        /// <summary>
+        /// Used to get/set the modifier keys (e.g. Keys.Alt | Keys.Control)
+        /// </summary>
+        public Keys HotkeyModifiers
+        {
+            get
+            {
+                return _modifiers;
+            }
+            set
+            {
+                _modifiers = value;
+                Redraw(false);
+            }
+        }
+
+	    /// <summary>
+        /// Redraws the TextBox when necessary.
+        /// </summary>
+        /// <param name="validate">Specifies whether this function was called by the Hotkey/HotkeyModifiers properties or by the user.</param>
+        private void Redraw(bool validate = true)
+        {
+            // Only validate input if it comes from the user
+            if (validate)
+            {
+                // No modifier or shift only, AND a hotkey that needs another modifier
+	            if ((_modifiers == Keys.Shift || _modifiers == Keys.None) &&
+	                _needNonShiftModifier.Contains((int) _keyCode))
+	            {
+		            if (_modifiers == Keys.None)
+		            {
+			            // Set Ctrl+Alt as the modifier unless Ctrl+Alt+<key> won't work...
+			            if (_needNonAltGrModifier.Contains((int) _keyCode) == false)
+				            _modifiers = Keys.Alt | Keys.Control;
+			            else // ... in that case, use Shift+Alt instead.
+				            _modifiers = Keys.Alt | Keys.Shift;
+		            }
+		            else
+		            {
+			            // User pressed Shift and an invalid key (e.g. a letter or a number),
+			            // that needs another set of modifier keys
+			            _keyCode = Keys.None;
+			            Text = _modifiers + " + Invalid Key";
+			            return;
+		            }
+	            }
+	            // Check all Ctrl+Alt keys
+	            if ((_modifiers == (Keys.Alt | Keys.Control)) &&
+	                _needNonAltGrModifier.Contains((int) _keyCode))
+	            {
+		            // Ctrl+Alt+4 etc won't work; reset hotkey and tell the user
+		            _keyCode = Keys.None;
+		            Text = _modifiers + " + Invalid Key";
+		            return;
+	            }
+            }
+
+			// Don't allow modifiers keys for _keyCode
+			if (_keyCode == Keys.ShiftKey ||
+				_keyCode == Keys.LShiftKey ||
+				_keyCode == Keys.RShiftKey ||
+				_keyCode == Keys.ControlKey ||
+				_keyCode == Keys.LControlKey ||
+				_keyCode == Keys.RControlKey ||
+				_keyCode == Keys.Menu ||
+				_keyCode == Keys.LMenu ||
+				_keyCode == Keys.RMenu ||
+				_keyCode == Keys.LWin ||
+				_keyCode == Keys.RWin)
+				_keyCode = Keys.None;
+
+			if (_modifiers == Keys.None)
+            {
+                if (_keyCode == Keys.None)
+                {
+                    ResetHotkey();
+                    return;
+                }
+
+                // We get here if we've got a hotkey that is valid without a modifier,
+                // like F1-F12, Media-keys etc.
+                Text = _keyCode.ToString();
+                return;
+            }
+
+			Text = string.Join(KeySeparator, new[] { KeysToString(_modifiers), KeysToString(_keyCode) });
+        }
+
+	    public static string KeysToString(Keys keys)
+	    {
+			if (keys == Keys.None) return "None";
+
+		    var modifiers = (keys & Keys.Modifiers);
+		    var keyCode = (keys & Keys.KeyCode);
+
+		    var strings = new List<string>();
+
+			if (modifiers != 0)
+			{
+				var modifierStrings = new List<string>(modifiers.ToString().Replace(", ", ",").Split(','));
+				modifierStrings.Sort(new KeyModifierComparer());
+				strings.AddRange(modifierStrings);
+			}
+
+			if (keyCode != 0)
+			{
+				var keyString = keyCode.ToString();
+				var keyHashtable = new Dictionary<string, string>
+					{
+						{"Next", "PageDown"},
+						{"Oemcomma", ","},
+						{"OemMinus", "-"},
+						{"OemOpenBrackets", "["},
+						{"OemPeriod", "."},
+						{"Oemplus", "="},
+						{"OemQuestion", "/"},
+						{"Oemtilde", "`"},
+						{"D0", "0"},
+						{"D1", "1"},
+						{"D2", "2"},
+						{"D3", "3"},
+						{"D4", "4"},
+						{"D5", "5"},
+						{"D6", "6"},
+						{"D7", "7"},
+						{"D8", "8"},
+						{"D9", "9"},
+					};
+				if (keyHashtable.ContainsKey(keyString)) keyString = keyHashtable[keyString];
+				strings.Add(keyString);
+			}
+
+			return string.Join(KeySeparator, strings.ToArray());
+	    }
+
+	    private class KeyModifierComparer : IComparer<string>
+	    {
+		    private static readonly List<string> ModifierOrder = new List<string>
+			    {
+				    "control",
+				    "alt",
+				    "shift",
+			    };
+
+			public int Compare(string x, string y)
+			{
+				var xIndex = ModifierOrder.IndexOf(x.ToLowerInvariant());
+				var yIndex = ModifierOrder.IndexOf(y.ToLowerInvariant());
+				return xIndex - yIndex;
+			}
+		}
+    }
+}

SharedLibraryNG/KeyboardHook.cs

@@ -0,0 +1,258 @@
+//
+// Based on code from Stephen Toub's MSDN blog at
+// http://blogs.msdn.com/b/toub/archive/2006/05/03/589423.aspx
+//
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+
+namespace SharedLibraryNG
+{
+    public class KeyboardHook
+    {
+        // ReSharper disable InconsistentNaming
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool PostMessage(IntPtr hWnd, Int32 Msg, IntPtr wParam, HookKeyMsgData lParam);
+        // ReSharper restore InconsistentNaming
+
+        [Flags]
+        public enum ModifierKeys
+        {
+            None = 0x0000,
+            Shift = 0x0001,
+            LeftShift = 0x002,
+            RightShift = 0x004,
+            Control = 0x0008,
+            LeftControl = 0x010,
+            RightControl = 0x20,
+            Alt = 0x0040,
+            LeftAlt = 0x0080,
+            RightAlt = 0x0100,
+            Win = 0x0200,
+            LeftWin = 0x0400,
+            RightWin = 0x0800,
+        }
+
+        protected class KeyNotificationEntry
+			: IEquatable<KeyNotificationEntry>
+        {
+            public IntPtr WindowHandle;
+            public Int32 KeyCode;
+            public ModifierKeys ModifierKeys;
+            public Boolean Block;
+
+            public bool Equals(KeyNotificationEntry obj)
+            {
+                return (WindowHandle == obj.WindowHandle &&
+                        KeyCode == obj.KeyCode &&
+                        ModifierKeys == obj.ModifierKeys &&
+                        Block == obj.Block);
+            }
+        }
+
+        public const string HookKeyMsgName = "HOOKKEYMSG-{56BE0940-34DA-11E1-B308-C6714824019B}";
+	    private static Int32 _hookKeyMsg;
+        public static Int32 HookKeyMsg
+        {
+            get
+            {
+	            if (_hookKeyMsg == 0)
+	            {
+					_hookKeyMsg = Win32.RegisterWindowMessage(HookKeyMsgName).ToInt32();
+					if (_hookKeyMsg == 0)
+						throw new Win32Exception(Marshal.GetLastWin32Error());
+				}
+	            return _hookKeyMsg;
+            }
+        }
+
+        // this is a custom structure that will be passed to
+        // the requested hWnd via a WM_APP_HOOKKEYMSG message
+        [StructLayout(LayoutKind.Sequential)]
+        public class HookKeyMsgData
+        {
+            public Int32 KeyCode;
+            public ModifierKeys ModifierKeys;
+            public Boolean WasBlocked;
+        }
+
+        private static int _referenceCount;
+        private static IntPtr _hook;
+        private static readonly Win32.LowLevelKeyboardProcDelegate LowLevelKeyboardProcStaticDelegate = LowLevelKeyboardProc;
+        private static readonly List<KeyNotificationEntry> NotificationEntries = new List<KeyNotificationEntry>();
+        
+        public KeyboardHook()
+        {
+            _referenceCount++;
+            SetHook();
+        }
+
+        ~KeyboardHook()
+        {
+            _referenceCount--;
+            if (_referenceCount < 1) UnsetHook();
+        }
+
+        private static void SetHook()
+        {
+            if (_hook != IntPtr.Zero) return;
+
+            var curProcess = Process.GetCurrentProcess();
+            var curModule = curProcess.MainModule;
+
+            var hook = Win32.SetWindowsHookEx(Win32.WH_KEYBOARD_LL, LowLevelKeyboardProcStaticDelegate, Win32.GetModuleHandle(curModule.ModuleName), 0);
+            if (hook == IntPtr.Zero)
+                throw new Win32Exception(Marshal.GetLastWin32Error());
+
+            _hook = hook;
+        }
+
+        private static void UnsetHook()
+        {
+            if (_hook == IntPtr.Zero) return;
+
+            Win32.UnhookWindowsHookEx(_hook);
+            _hook = IntPtr.Zero;
+        }
+
+        private static IntPtr LowLevelKeyboardProc(Int32 nCode, IntPtr wParam, Win32.KBDLLHOOKSTRUCT lParam)
+        {
+            var wParamInt = wParam.ToInt32();
+            var result = 0;
+
+            if (nCode == Win32.HC_ACTION)
+            {
+                switch (wParamInt)
+                {
+                    case Win32.WM_KEYDOWN:
+                    case Win32.WM_SYSKEYDOWN:
+                    case Win32.WM_KEYUP:
+                    case Win32.WM_SYSKEYUP:
+                        result = OnKey(wParamInt, lParam);
+                        break;
+                }
+            }
+
+            if (result != 0) return new IntPtr(result);
+
+            return Win32.CallNextHookEx(_hook, nCode, wParam, lParam);
+        }
+
+        private static int OnKey(Int32 msg, Win32.KBDLLHOOKSTRUCT key)
+        {
+            var result = 0;
+
+            foreach (var notificationEntry in NotificationEntries)
+                if (GetFocusWindow() == notificationEntry.WindowHandle && notificationEntry.KeyCode == key.vkCode)
+                {
+                    var modifierKeys = GetModifierKeyState();
+					if (!ModifierKeysMatch(notificationEntry.ModifierKeys, modifierKeys)) continue;
+
+                    var wParam = new IntPtr(msg);
+                    var lParam = new HookKeyMsgData
+                    {
+                        KeyCode = key.vkCode,
+                        ModifierKeys = modifierKeys,
+                        WasBlocked = notificationEntry.Block,
+                    };
+
+                    if (!PostMessage(notificationEntry.WindowHandle, HookKeyMsg, wParam, lParam))
+                        throw new Win32Exception(Marshal.GetLastWin32Error());
+
+                    if (notificationEntry.Block) result = 1;
+                }
+
+            return result;
+        }
+
+        private static IntPtr GetFocusWindow()
+        {
+            var guiThreadInfo = new Win32.GUITHREADINFO();
+            if (!Win32.GetGUIThreadInfo(0, guiThreadInfo))
+                throw new Win32Exception(Marshal.GetLastWin32Error());
+			return Win32.GetAncestor(guiThreadInfo.hwndFocus, Win32.GA_ROOT);
+        }
+
+        protected static Dictionary<Int32, ModifierKeys> ModifierKeyTable = new Dictionary<Int32, ModifierKeys>
+        {
+            { Win32.VK_SHIFT, ModifierKeys.Shift },
+            { Win32.VK_LSHIFT, ModifierKeys.LeftShift },
+            { Win32.VK_RSHIFT, ModifierKeys.RightShift },
+            { Win32.VK_CONTROL, ModifierKeys.Control },
+            { Win32.VK_LCONTROL, ModifierKeys.LeftControl },
+            { Win32.VK_RCONTROL, ModifierKeys.RightControl },
+            { Win32.VK_MENU, ModifierKeys.Alt },
+            { Win32.VK_LMENU, ModifierKeys.LeftAlt },
+            { Win32.VK_RMENU, ModifierKeys.RightAlt },
+            { Win32.VK_LWIN, ModifierKeys.LeftWin },
+            { Win32.VK_RWIN, ModifierKeys.RightWin },
+        };
+
+        public static ModifierKeys GetModifierKeyState()
+        {
+            var modifierKeyState = ModifierKeys.None;
+
+            foreach (KeyValuePair<Int32, ModifierKeys> pair in ModifierKeyTable)
+            {
+                if ((Win32.GetAsyncKeyState(pair.Key) & Win32.KEYSTATE_PRESSED) != 0) modifierKeyState |= pair.Value;
+            }
+
+	        if ((modifierKeyState & ModifierKeys.LeftWin) != 0) modifierKeyState |= ModifierKeys.Win;
+			if ((modifierKeyState & ModifierKeys.RightWin) != 0) modifierKeyState |= ModifierKeys.Win;
+
+            return modifierKeyState;
+        }
+
+		public static Boolean ModifierKeysMatch(ModifierKeys requestedKeys, ModifierKeys pressedKeys)
+		{
+			if ((requestedKeys & ModifierKeys.Shift) != 0) pressedKeys &= ~(ModifierKeys.LeftShift | ModifierKeys.RightShift);
+			if ((requestedKeys & ModifierKeys.Control) != 0) pressedKeys &= ~(ModifierKeys.LeftControl | ModifierKeys.RightControl);
+			if ((requestedKeys & ModifierKeys.Alt) != 0) pressedKeys &= ~(ModifierKeys.LeftAlt | ModifierKeys.RightAlt);
+			if ((requestedKeys & ModifierKeys.Win) != 0) pressedKeys &= ~(ModifierKeys.LeftWin | ModifierKeys.RightWin);
+			return requestedKeys == pressedKeys;
+		}
+
+        public static void RequestKeyNotification(IntPtr windowHandle, Int32 keyCode, Boolean block)
+        {
+            RequestKeyNotification(windowHandle, keyCode, ModifierKeys.None, block);
+        }
+
+        public static void RequestKeyNotification(IntPtr windowHandle, Int32 keyCode, ModifierKeys modifierKeys = ModifierKeys.None, Boolean block = false)
+        {
+            var newNotificationEntry = new KeyNotificationEntry
+            {
+                WindowHandle = windowHandle,
+                KeyCode = keyCode,
+                ModifierKeys = modifierKeys,
+                Block = block,
+            };
+
+            foreach (var notificationEntry in NotificationEntries)
+                if (notificationEntry == newNotificationEntry) return;
+
+            NotificationEntries.Add(newNotificationEntry);
+        }
+
+		public static void CancelKeyNotification(IntPtr windowHandle, Int32 keyCode, Boolean block)
+		{
+			CancelKeyNotification(windowHandle, keyCode, ModifierKeys.None, block);
+		}
+
+		public static void CancelKeyNotification(IntPtr windowHandle, Int32 keyCode, ModifierKeys modifierKeys = ModifierKeys.None, Boolean block = false)
+		{
+			var notificationEntry = new KeyNotificationEntry
+			{
+				WindowHandle = windowHandle,
+				KeyCode = keyCode,
+				ModifierKeys = modifierKeys,
+				Block = block,
+			};
+
+			NotificationEntries.Remove(notificationEntry);
+		}
+    }
+}

SharedLibraryNG/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SharedLibraryNG")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SharedLibraryNG")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f4470853-f933-4203-9d2a-b3c731e225c7")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

SharedLibraryNG/SharedLibraryNG.csproj

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0F615504-5F30-4CF2-8341-1DE7FEC95A23}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SharedLibraryNG</RootNamespace>
+    <AssemblyName>SharedLibraryNG</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="HotkeyControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="KeyboardHook.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Win32.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

SharedLibraryNG/Win32.cs

@@ -0,0 +1,171 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace SharedLibraryNG
+{
+    // ReSharper disable InconsistentNaming
+    public static class Win32
+    {
+        #region Functions
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr SetWindowsHookEx(int idHook, LowLevelKeyboardProcDelegate lpfn, IntPtr hMod, Int32 dwThreadId);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool UnhookWindowsHookEx(IntPtr hhk);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, KBDLLHOOKSTRUCT lParam);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr GetModuleHandle(string lpModuleName);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr RegisterWindowMessage(string lpString);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetGUIThreadInfo(Int32 idThread, GUITHREADINFO lpgui);
+
+		[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+		public static extern IntPtr GetAncestor(IntPtr hwnd, UInt32 gaFlags);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern Int16 GetAsyncKeyState(Int32 vKey);
+
+        #endregion
+
+        #region Delegates
+
+        public delegate IntPtr LowLevelKeyboardProcDelegate(Int32 nCode, IntPtr wParam, KBDLLHOOKSTRUCT lParam);
+
+        #endregion
+
+        #region Structures
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class KBDLLHOOKSTRUCT
+        {
+            public Int32 vkCode;
+            public Int32 scanCode;
+            public Int32 flags;
+            public Int32 time;
+            public IntPtr dwExtraInfo;
+        };
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int left;
+            public int top;
+            public int right;
+            public int bottom;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class GUITHREADINFO
+        {
+            public GUITHREADINFO()
+            {
+                cbSize = Convert.ToInt32(Marshal.SizeOf(this));
+            }
+
+            public Int32 cbSize;
+            public Int32 flags;
+            public IntPtr hwndActive;
+            public IntPtr hwndFocus;
+            public IntPtr hwndCapture;
+            public IntPtr hwndMenuOwner;
+            public IntPtr hwndMoveSize;
+            public IntPtr hwndCaret;
+            public RECT rcCaret;
+        }
+
+        #endregion
+
+        #region Constants
+
+		// GetAncestor
+	    public const int GA_ROOT = 2;
+
+        // SetWindowsHookEx
+        public const int WH_KEYBOARD_LL = 13;
+
+        // LowLevelKeyboardProcDelegate
+        public const int HC_ACTION = 0;
+
+        // SendMessage
+        public const int WM_KEYDOWN = 0x0100;
+        public const int WM_KEYUP = 0x0101;
+        public const int WM_SYSKEYDOWN = 0x0104;
+        public const int WM_SYSKEYUP = 0x0105;
+
+        // GetAsyncKeyState
+        public const int KEYSTATE_PRESSED = 0x8000;
+
+        #region Virtual Keys
+        public const int VK_CANCEL = 0x0003;
+        public const int VK_BACK = 0x0008;
+        public const int VK_TAB = 0x0009;
+        public const int VK_CLEAR = 0x000C;
+        public const int VK_RETURN = 0x000D;
+        public const int VK_PAUSE = 0x0013;
+        public const int VK_ESCAPE = 0x001B;
+        public const int VK_SNAPSHOT = 0x002C;
+        public const int VK_INSERT = 0x002D;
+        public const int VK_DELETE = 0x002E;
+        public const int VK_HOME = 0x0024;
+        public const int VK_END = 0x0023;
+        public const int VK_PRIOR = 0x0021;
+        public const int VK_NEXT = 0x0022;
+        public const int VK_LEFT = 0x0025;
+        public const int VK_UP = 0x0026;
+        public const int VK_RIGHT = 0x0027;
+        public const int VK_DOWN = 0x0028;
+        public const int VK_SELECT = 0x0029;
+        public const int VK_PRINT = 0x002A;
+        public const int VK_EXECUTE = 0x002B;
+        public const int VK_HELP = 0x002F;
+        public const int VK_LWIN = 0x005B;
+        public const int VK_RWIN = 0x005C;
+        public const int VK_APPS = 0x005D;
+        public const int VK_F1 = 0x0070;
+        public const int VK_F2 = 0x0071;
+        public const int VK_F3 = 0x0072;
+        public const int VK_F4 = 0x0073;
+        public const int VK_F5 = 0x0074;
+        public const int VK_F6 = 0x0075;
+        public const int VK_F7 = 0x0076;
+        public const int VK_F8 = 0x0077;
+        public const int VK_F9 = 0x0078;
+        public const int VK_F10 = 0x0079;
+        public const int VK_F11 = 0x007A;
+        public const int VK_F12 = 0x007B;
+        public const int VK_SHIFT = 0x0010;
+        public const int VK_LSHIFT = 0x00A0;
+        public const int VK_RSHIFT = 0x00A1;
+        public const int VK_CONTROL = 0x0011;
+        public const int VK_LCONTROL = 0x00A2;
+        public const int VK_RCONTROL = 0x00A3;
+        public const int VK_MENU = 0x0012;
+        public const int VK_LMENU = 0x00A4;
+        public const int VK_RMENU = 0x00A5;
+
+        public const int VK_OEM_1 = 0x00BA;
+        public const int VK_OEM_2 = 0x00BF;
+        public const int VK_OEM_3 = 0x00C0;
+        public const int VK_OEM_4 = 0x00DB;
+        public const int VK_OEM_5 = 0x00DC;
+        public const int VK_OEM_6 = 0x00DD;
+        public const int VK_OEM_7 = 0x00DE;
+        public const int VK_OEM_8 = 0x00DF;
+        public const int VK_OEM_102 = 0x00E2;
+
+        #endregion
+
+        #endregion
+
+        // ReSharper restore InconsistentNaming
+    }
+}

Sort Language Files.cmd

@@ -0,0 +1,26 @@
+@echo off
+
+set TEMP_FOLDER="%TEMP%\Translations.tmp"
+set SORTRESX="%~dp0\Tools\SortRESX.exe"
+
+echo.
+echo This script sorts the language files
+echo.
+
+choice /m "Would you like to continue?"
+
+echo.
+
+rmdir /s /q %TEMP_FOLDER%
+mkdir %TEMP_FOLDER%
+copy "%~dp0\mRemoteV1\Language\*.resx" %TEMP_FOLDER%
+
+pushd %TEMP_FOLDER%
+for %%f in (*) do %SORTRESX% %TEMP_FOLDER%\%%f "%~dp0\mRemoteV1\Language\%%f"
+popd
+
+rmdir /s /q %TEMP_FOLDER%
+
+echo Done.
+echo.
+pause

TestProject/ExternalToolTest.vb

@@ -0,0 +1,145 @@
+Imports Microsoft.VisualStudio.TestTools.UnitTesting
+
+Imports mRemoteNG.Tools
+Imports mRemoteNG.Connection.PuttySession
+
+
+'''<summary>
+'''This is a test class for ExternalToolTest and is intended
+'''to contain all ExternalToolTest Unit Tests
+'''</summary>
+<TestClass()> _
+Public Class ExternalToolTest
+    '''<summary>
+    '''Gets or sets the test context which provides
+    '''information about and functionality for the current test run.
+    '''</summary>
+    Public Property TestContext() As TestContext
+
+#Region "Additional test attributes"
+    '
+    'You can use the following additional attributes as you write your tests:
+    '
+    'Use ClassInitialize to run code before running the first test in the class
+    '<ClassInitialize()>  _
+    'Public Shared Sub MyClassInitialize(ByVal testContext As TestContext)
+    'End Sub
+    '
+    'Use ClassCleanup to run code after all tests in a class have run
+    '<ClassCleanup()>  _
+    'Public Shared Sub MyClassCleanup()
+    'End Sub
+    '
+    'Use TestInitialize to run code before running each test
+    '<TestInitialize()>  _
+    'Public Sub MyTestInitialize()
+    'End Sub
+    '
+    'Use TestCleanup to run code after each test has run
+    '<TestCleanup()>  _
+    'Public Sub MyTestCleanup()
+    'End Sub
+    '
+#End Region
+
+
+    '''<summary>
+    '''A test for ParseArguments
+    '''</summary>
+    <TestMethod(), _
+     DeploymentItem("mRemoteNG.exe")> _
+    Public Sub ParseArgumentsTest()
+        Dim externalTool As New ExternalTool
+
+        ' ReSharper disable StringLiteralTypo
+        externalTool.ConnectionInfo = New Info()
+        With externalTool.ConnectionInfo
+            .Name = "EMAN"
+            .Hostname = "EMANTSOH"
+            .Port = 9876
+            .Username = "EMANRESU"
+            .Password = "DROWSSAP"
+            .Domain = "NIAMOD"
+            .Description = "NOITPIRCSED"
+            .MacAddress = "SSERDDACAM"
+            .UserField = "DLEIFRESU"
+        End With
+
+        Assert.AreEqual("EMAN, EMANTSOH, 9876, EMANRESU, DROWSSAP, NIAMOD, NOITPIRCSED, SSERDDACAM, DLEIFRESU", externalTool.ParseArguments("%NAME%, %HOSTNAME%, %PORT%, %USERNAME%, %PASSWORD%, %DOMAIN%, %DESCRIPTION%, %MACADDRESS%, %USERFIELD%"))
+        ' ReSharper restore StringLiteralTypo
+
+        Assert.AreEqual(Environment.ExpandEnvironmentVariables("%PATH%"), externalTool.ParseArguments("%!PATH%"))
+
+        externalTool.ConnectionInfo.Name = "()%!^""<>&|\""\\"
+
+        Assert.AreEqual("%%", externalTool.ParseArguments("%%"))
+        Assert.AreEqual("% %", externalTool.ParseArguments("% %"))
+        Assert.AreEqual("%-%", externalTool.ParseArguments("%-%"))
+        Assert.AreEqual("%!%", externalTool.ParseArguments("%!%"))
+        Assert.AreEqual("%^%", externalTool.ParseArguments("%^%"))
+        Assert.AreEqual("%%%", externalTool.ParseArguments("%%%"))
+        Assert.AreEqual("%foobar%", externalTool.ParseArguments("%foobar%"))
+        Assert.AreEqual("%-foobar%", externalTool.ParseArguments("%-foobar%"))
+        Assert.AreEqual("%!foobar%", externalTool.ParseArguments("%!foobar%"))
+        Assert.AreEqual("%-!^\", externalTool.ParseArguments("%-!^\"))
+
+        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%NAME%"))
+        Assert.AreEqual("^(^)^%^!^^^""^<^>^&^|\^""\\", externalTool.ParseArguments("%-NAME%"))
+        Assert.AreEqual("()%!^""<>&|\""\\", externalTool.ParseArguments("%!NAME%"))
+
+        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%name%"))
+        Assert.AreEqual("%^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%%name%"))
+        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\%", externalTool.ParseArguments("%name%%"))
+        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\ ^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%name% %name%"))
+
+        Assert.AreEqual("%-^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%-%name%"))
+        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\-%", externalTool.ParseArguments("%name%-%"))
+        Assert.AreEqual("%!^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%!%name%"))
+        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\!%", externalTool.ParseArguments("%name%!%"))
+
+        Assert.AreEqual("\^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("\%NAME%"))
+        Assert.AreEqual("\^(^)^%^!^^\^""^<^>^&^|\\\^""\\NAME%", externalTool.ParseArguments("\%NAME%NAME%"))
+        Assert.AreEqual("%NAME\%", externalTool.ParseArguments("%NAME\%"))
+
+        Assert.AreEqual("""^(^)^%^!^^\^""^<^>^&^|\\\^""\\\\""", externalTool.ParseArguments("""%NAME%"""))
+        Assert.AreEqual("""^(^)^%^!^^^""^<^>^&^|\^""\\""", externalTool.ParseArguments("""%-NAME%"""))
+        Assert.AreEqual("""()%!^""<>&|\""\\""", externalTool.ParseArguments("""%!NAME%"""))
+
+        Assert.AreEqual("""^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("""%NAME%"))
+        Assert.AreEqual("""^(^)^%^!^^^""^<^>^&^|\^""\\", externalTool.ParseArguments("""%-NAME%"))
+        Assert.AreEqual("""()%!^""<>&|\""\\", externalTool.ParseArguments("""%!NAME%"))
+
+        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\\\""", externalTool.ParseArguments("%NAME%"""))
+        Assert.AreEqual("^(^)^%^!^^^""^<^>^&^|\^""\\""", externalTool.ParseArguments("%-NAME%"""))
+        Assert.AreEqual("()%!^""<>&|\""\\""", externalTool.ParseArguments("%!NAME%"""))
+
+        Assert.AreEqual(Environment.ExpandEnvironmentVariables("%USERNAME%"), externalTool.ParseArguments("\%USERNAME\%"))
+        Assert.AreEqual(Environment.ExpandEnvironmentVariables("%USERNAME%"), externalTool.ParseArguments("\%-USERNAME\%"))
+        Assert.AreEqual(Environment.ExpandEnvironmentVariables("%USERNAME%"), externalTool.ParseArguments("\%!USERNAME\%"))
+
+        Assert.AreEqual("\^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("\%NAME%"))
+        Assert.AreEqual("%NAME\%", externalTool.ParseArguments("%NAME\%"))
+        Assert.AreEqual("\\%NAME\\%", externalTool.ParseArguments("\\%NAME\\%"))
+        Assert.AreEqual("\\\%NAME\\\%", externalTool.ParseArguments("\\\%NAME\\\%"))
+        Assert.AreEqual("\\\\%NAME\\\\%", externalTool.ParseArguments("\\\\%NAME\\\\%"))
+        Assert.AreEqual("\\\\\%NAME\\\\\%", externalTool.ParseArguments("\\\\\%NAME\\\\\%"))
+
+        Assert.AreEqual("%NAME%", externalTool.ParseArguments("^%NAME^%"))
+        Assert.AreEqual("%-NAME%", externalTool.ParseArguments("^%-NAME^%"))
+        Assert.AreEqual("\%NAME\%", externalTool.ParseArguments("\^%NAME\^%"))
+        Assert.AreEqual("\%-NAME\%", externalTool.ParseArguments("\^%-NAME\^%"))
+
+        Assert.AreEqual("^%NAME^%", externalTool.ParseArguments("^^%NAME^^%"))
+        Assert.AreEqual("^%-NAME^%", externalTool.ParseArguments("^^%-NAME^^%"))
+        Assert.AreEqual("^^^^%NAME^^^^%", externalTool.ParseArguments("^^^^^%NAME^^^^^%"))
+        Assert.AreEqual("^^^^%-NAME^^^^%", externalTool.ParseArguments("^^^^^%-NAME^^^^^%"))
+        Assert.AreEqual("^^^^%!NAME^^^^%", externalTool.ParseArguments("^^^^^%!NAME^^^^^%"))
+
+        Assert.AreEqual("blah%blah", externalTool.ParseArguments("blah%blah"))
+        Assert.AreEqual("blah^%blah", externalTool.ParseArguments("blah^%blah"))
+        Assert.AreEqual("blah^^%blah", externalTool.ParseArguments("blah^^%blah"))
+        Assert.AreEqual("blah^^^%blah", externalTool.ParseArguments("blah^^^%blah"))
+
+        Assert.AreEqual("^^^^%-NAME^^^^% ^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("^^^^^%-NAME^^^^^% %NAME%"))
+    End Sub
+End Class

TestProject/My Project/AssemblyInfo.vb

@@ -0,0 +1,37 @@
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+' General Information about an assembly is controlled through the following 
+' set of attributes. Change these attribute values to modify the information
+' associated with an assembly.
+
+' Review the values of the assembly attributes
+
+<Assembly: AssemblyTitle("TestProject")> 
+<Assembly: AssemblyDescription("")> 
+<Assembly: AssemblyCompany("")> 
+<Assembly: AssemblyProduct("TestProject")> 
+<Assembly: AssemblyCopyright("Copyright ©  2013")> 
+<Assembly: AssemblyTrademark("")> 
+
+<Assembly: CLSCompliant(True)> 
+
+<Assembly: ComVisible(False)>
+
+'The following GUID is for the ID of the typelib if this project is exposed to COM
+<Assembly: Guid("8918ad54-4841-44e9-abda-e1b787b02c7c")> 
+
+' Version information for an assembly consists of the following four values:
+'
+'      Major Version
+'      Minor Version 
+'      Build Number
+'      Revision
+'
+' You can specify all the values or you can default the Build and Revision Numbers 
+' by using the '*' as shown below:
+' <Assembly: AssemblyVersion("1.0.*")> 
+
+<Assembly: AssemblyVersion("1.0.0.0")> 
+<Assembly: AssemblyFileVersion("1.0.0.0")> 

TestProject/Test References/mRemoteNG.accessor

@@ -0,0 +1,2 @@
+mRemoteNG.exe
+Desktop

TestProject/TestProject.vbproj

@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>
+    </SchemaVersion>
+    <ProjectGuid>{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>TestProject</RootNamespace>
+    <AssemblyName>TestProject</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
+    <ReferencePath>$(DevEnvDir)PublicAssemblies\</ReferencePath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>TestProject.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>TestProject.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ADTree">
+      <HintPath>..\mRemoteV1\References\ADTree.dll</HintPath>
+    </Reference>
+    <Reference Include="AxInterop.MSTSCLib">
+      <HintPath>..\mRemoteV1\obj\Debug\AxInterop.MSTSCLib.dll</HintPath>
+    </Reference>
+    <Reference Include="AxInterop.WFICALib">
+      <HintPath>..\mRemoteV1\obj\Debug\AxInterop.WFICALib.dll</HintPath>
+    </Reference>
+    <Reference Include="DiffieHellman">
+      <HintPath>..\mRemoteV1\References\DiffieHellman.dll</HintPath>
+    </Reference>
+    <Reference Include="FilteredPropertyGrid">
+      <HintPath>..\mRemoteV1\References\FilteredPropertyGrid.dll</HintPath>
+    </Reference>
+    <Reference Include="Interop.EOLWTSCOM">
+      <HintPath>..\mRemoteV1\obj\Debug\Interop.EOLWTSCOM.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Interop.MSTSCLib">
+      <HintPath>..\mRemoteV1\obj\Debug\Interop.MSTSCLib.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Interop.SHDocVw">
+      <HintPath>..\mRemoteV1\obj\Debug\Interop.SHDocVw.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Interop.WFICALib">
+      <HintPath>..\mRemoteV1\obj\Debug\Interop.WFICALib.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="IPTextBox">
+      <HintPath>..\mRemoteV1\References\IPTextBox.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\mRemoteV1\References\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="MagicLibrary, Version=1.7.4.0, Culture=neutral, PublicKeyToken=3a6eb82f876a49bc">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="MiniGeckoBrowser">
+      <HintPath>..\mRemoteV1\References\MiniGeckoBrowser.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniTabControl">
+      <HintPath>..\mRemoteV1\References\MiniTabControl.dll</HintPath>
+    </Reference>
+    <Reference Include="Org.Mentalis.Security">
+      <HintPath>..\mRemoteV1\References\Org.Mentalis.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="PSTaskDialog">
+      <HintPath>..\mRemoteV1\References\PSTaskDialog.dll</HintPath>
+    </Reference>
+    <Reference Include="Skybound.Gecko">
+      <HintPath>..\mRemoteV1\References\Skybound.Gecko.dll</HintPath>
+    </Reference>
+    <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Tamir.SharpSSH">
+      <HintPath>..\mRemoteV1\References\Tamir.SharpSSH.dll</HintPath>
+    </Reference>
+    <Reference Include="VncSharpNG">
+      <HintPath>..\mRemoteV1\References\VncSharpNG.dll</HintPath>
+    </Reference>
+    <Reference Include="WeifenLuo.WinFormsUI.Docking">
+      <HintPath>..\mRemoteV1\References\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+  </ItemGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ExternalToolTest.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <Shadow Include="Test References\mRemoteNG.accessor" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mRemoteV1\mRemoteV1.vbproj">
+      <Project>{4934A491-40BC-4E5B-9166-EA1169A220F6}</Project>
+      <Name>mRemoteV1</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

TraceAndTestImpact.testsettings

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="Trace and Test Impact" id="e062ce86-3357-43c9-b5c3-6b38a0dc3776" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>These are test settings for Trace and Test Impact.</Description>
+  <Execution>
+    <TestTypeSpecific />
+    <AgentRule name="Execution Agents">
+      <DataCollectors>
+        <DataCollector uri="datacollector://microsoft/SystemInfo/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.SystemInfoDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="System Information">
+        </DataCollector>
+        <DataCollector uri="datacollector://microsoft/HttpProxy/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.HttpProxyCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="ASP.NET Client Proxy for IntelliTrace and Test Impact">
+        </DataCollector>
+        <DataCollector uri="datacollector://microsoft/TestImpact/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TestImpactDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Test Impact">
+        </DataCollector>
+        <DataCollector uri="datacollector://microsoft/TraceDebugger/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TraceDebuggerDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="IntelliTrace">
+        </DataCollector>
+      </DataCollectors>
+    </AgentRule>
+  </Execution>
+</TestSettings>

Update Languages.cmd

@@ -0,0 +1,55 @@
+@echo off
+
+set ZIP_FILE="%~dp0\..\mremoteng.zip"
+set TEMP_FOLDER="%TEMP%\Translations.tmp"
+set SORTRESX="%~dp0\Tools\SortRESX.exe"
+set RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+
+call :expand %ZIP_FILE%
+goto :skip
+:expand
+set ZIP_FILE="%~f1"
+exit /b
+:skip
+
+echo.
+echo This script updates the language files with new translations from Crowdin
+echo.
+echo Download the latest translation file from Crowdin and place it here:
+echo.
+echo %ZIP_FILE%
+echo.
+
+choice /m "Would you like to continue?"
+
+echo.
+
+mkdir %TEMP_FOLDER%
+%RAR% x -o+ %ZIP_FILE% *.* %TEMP_FOLDER%
+
+%SORTRESX% %TEMP_FOLDER%\ar\Language.ar.resx "%~dp0\mRemoteV1\Language\Language.ar.resx"
+%SORTRESX% %TEMP_FOLDER%\bg\Language.bg.resx "%~dp0\mRemoteV1\Language\Language.bg.resx"
+%SORTRESX% %TEMP_FOLDER%\de\Language.de.resx "%~dp0\mRemoteV1\Language\Language.de.resx"
+%SORTRESX% %TEMP_FOLDER%\el\Language.el.resx "%~dp0\mRemoteV1\Language\Language.el.resx"
+%SORTRESX% %TEMP_FOLDER%\en-US\Language.en.resx "%~dp0\mRemoteV1\Language\Language.en-US.resx"
+%SORTRESX% %TEMP_FOLDER%\es-AR\Language.es.resx "%~dp0\mRemoteV1\Language\Language.es-AR.resx"
+%SORTRESX% %TEMP_FOLDER%\es-ES\Language.es.resx "%~dp0\mRemoteV1\Language\Language.es.resx"
+%SORTRESX% %TEMP_FOLDER%\fr\Language.fr.resx "%~dp0\mRemoteV1\Language\Language.fr.resx"
+%SORTRESX% %TEMP_FOLDER%\he\Language.he.resx "%~dp0\mRemoteV1\Language\Language.he.resx"
+%SORTRESX% %TEMP_FOLDER%\hu\Language.hu.resx "%~dp0\mRemoteV1\Language\Language.hu.resx"
+%SORTRESX% %TEMP_FOLDER%\it\Language.it.resx "%~dp0\mRemoteV1\Language\Language.it.resx"
+%SORTRESX% %TEMP_FOLDER%\nb\Language.nb.resx "%~dp0\mRemoteV1\Language\Language.nb-NO.resx"
+%SORTRESX% %TEMP_FOLDER%\nl\Language.nl.resx "%~dp0\mRemoteV1\Language\Language.nl.resx"
+%SORTRESX% %TEMP_FOLDER%\pl\Language.pl.resx "%~dp0\mRemoteV1\Language\Language.pl.resx"
+%SORTRESX% %TEMP_FOLDER%\pt-BR\Language.pt.resx "%~dp0\mRemoteV1\Language\Language.pt-BR.resx"
+%SORTRESX% %TEMP_FOLDER%\pt-PT\Language.pt.resx "%~dp0\mRemoteV1\Language\Language.pt.resx"
+%SORTRESX% %TEMP_FOLDER%\ru\Language.ru.resx "%~dp0\mRemoteV1\Language\Language.ru.resx"
+%SORTRESX% %TEMP_FOLDER%\uk\Language.uk.resx "%~dp0\mRemoteV1\Language\Language.uk.resx"
+%SORTRESX% %TEMP_FOLDER%\zh-CN\Language.zh.resx "%~dp0\mRemoteV1\Language\Language.zh-CN.resx"
+%SORTRESX% %TEMP_FOLDER%\zh-TW\Language.zh.resx "%~dp0\mRemoteV1\Language\Language.zh-TW.resx"
+
+rmdir /s /q %TEMP_FOLDER%
+
+echo Done.
+echo.
+pause

mRemoteV1.sln

@@ -1,18 +1,54 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "mRemoteV1", "mRemoteV1\mRemoteV1.vbproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestProject", "TestProject\TestProject.vbproj", "{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{38EB1EFD-C8C8-49A2-BCA7-63F7A02B3153}"
+	ProjectSection(SolutionItems) = preProject
+		Local.testsettings = Local.testsettings
+		mRemoteV1.vsmdi = mRemoteV1.vsmdi
+		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedLibraryNG", "SharedLibraryNG\SharedLibraryNG.csproj", "{0F615504-5F30-4CF2-8341-1DE7FEC95A23}"
+EndProject
 Global
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = mRemoteV1.vsmdi
+	EndGlobalSection
 	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
+		{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}.Debug Portable|Any CPU.ActiveCfg = Debug|Any CPU
+		{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}.Debug Portable|Any CPU.Build.0 = Debug|Any CPU
+		{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU
+		{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}.Release Portable|Any CPU.Build.0 = Release|Any CPU
+		{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug Portable|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug Portable|Any CPU.Build.0 = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Portable|Any CPU.Build.0 = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

mRemoteV1.sln.DotSettings

@@ -0,0 +1,7 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/Abbreviations/=ICA/@EntryIndexedValue">ICA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/Abbreviations/=RDP/@EntryIndexedValue">RDP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/Abbreviations/=VNC/@EntryIndexedValue">VNC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/Abbreviations/=XML/@EntryIndexedValue">XML</s:String></wpf:ResourceDictionary>

mRemoteV1.vsmdi

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
+    <RunConfiguration id="2a25bb82-f5ff-4a67-b5e9-c6aaa54d1e80" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  </TestList>
+</TestLists>

mRemoteV1/App/App.Announcment.vb

@@ -1,149 +0,0 @@
-Imports System.IO
-Imports System.Net
-Imports mRemote.App.Runtime
-
-Namespace App
-    Public Class Announcment
-#Region "Private Properties"
-        Private wCl As WebClient
-        Private wPr As WebProxy
-#End Region
-
-        Private _curAI As Info
-        Public ReadOnly Property curAI() As Info
-            Get
-                Return _curAI
-            End Get
-        End Property
-
-        Public Function IsAnnouncmentAvailable() As Boolean
-            Try
-                Dim aI As Info = GetAnnouncmentInfo()
-
-                If aI.InfoOk = False Then
-                    Return False
-                End If
-
-                If aI.Name <> My.Settings.LastAnnouncment Then
-                    Return True
-                Else
-                    Return False
-                End If
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsAnnouncmentAvailable failed" & vbNewLine & ex.Message, True)
-                Return False
-            End Try
-        End Function
-
-        Public Function GetAnnouncmentInfo() As Info
-            Try
-                Dim strAnnouncment As String = GetAnnouncmentFile()
-
-                CreateWebClient()
-
-                Dim aI As New Info()
-
-                If strAnnouncment <> "" Then
-                    aI.InfoOk = True
-
-                    Try
-                        'get Name
-                        Dim strName As String = strAnnouncment.Substring(strAnnouncment.IndexOf("Name: ") + 6, strAnnouncment.IndexOf(vbNewLine) - 6)
-                        aI.Name = strName
-
-                        strAnnouncment = strAnnouncment.Remove(0, strAnnouncment.IndexOf(vbNewLine) + 2)
-
-                        'get Download URL
-                        Dim strU As String = ""
-
-                        strU = strAnnouncment.Substring(strAnnouncment.IndexOf("URL: ") + 5, strAnnouncment.IndexOf(vbNewLine) - 5)
-
-                        aI.URL = strU
-                    Catch ex As Exception
-                        aI.InfoOk = False
-                    End Try
-                Else
-                    aI.InfoOk = False
-                End If
-
-                _curAI = aI
-                Return aI
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting announcment info failed" & vbNewLine & ex.Message, True)
-                Return Nothing
-            End Try
-        End Function
-
-        Private Function GetAnnouncmentFile() As String
-            Try
-                CreateWebClient()
-
-                Dim strTemp As String
-
-                Try
-                    strTemp = wCl.DownloadString(App.Info.General.URLAnnouncment)
-                Catch ex As Exception
-                    strTemp = ""
-                End Try
-
-                Return strTemp
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "GetAnnouncmentFile failed" & vbNewLine & ex.Message, True)
-                Return ""
-            End Try
-        End Function
-
-        Private Sub CreateWebClient()
-            wCl = New WebClient()
-
-            If My.Settings.UpdateUseProxy Then
-                wPr = New WebProxy(My.Settings.UpdateProxyAddress, My.Settings.UpdateProxyPort)
-
-                If My.Settings.UpdateProxyUseAuthentication Then
-                    Dim cred As ICredentials
-                    cred = New NetworkCredential(My.Settings.UpdateProxyAuthUser, Security.Crypt.Decrypt(My.Settings.UpdateProxyAuthPass, App.Info.General.EncryptionKey))
-
-                    wPr.Credentials = cred
-                End If
-
-                wCl.Proxy = wPr
-            End If
-        End Sub
-
-
-
-
-        Public Class Info
-            Private _Name As String
-            Public Property Name() As String
-                Get
-                    Return _Name
-                End Get
-                Set(ByVal value As String)
-                    _Name = value
-                End Set
-            End Property
-
-            Private _URL As String
-            Public Property URL() As String
-                Get
-                    Return _URL
-                End Get
-                Set(ByVal value As String)
-                    _URL = value
-                End Set
-            End Property
-
-
-            Private _InfoOk As Boolean
-            Public Property InfoOk() As Boolean
-                Get
-                    Return _InfoOk
-                End Get
-                Set(ByVal value As Boolean)
-                    _InfoOk = value
-                End Set
-            End Property
-        End Class
-    End Class
-End Namespace

mRemoteV1/App/App.Editions.vb

@@ -1,10 +0,0 @@
-Imports System.IO
-
-Namespace App
-    Namespace Editions
-        Public Class Spanlink
-            Public Shared Enabled As Boolean = True
-
-        End Class
-    End Namespace
-End Namespace

mRemoteV1/App/App.Info.vb

@@ -1,44 +1,70 @@
 Imports System.Environment
+Imports System.Threading
 
 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 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/"
+            Public Shared ReadOnly PuttyPath As String = My.Application.Info.DirectoryPath & "\PuTTYNG.exe"
+            Public Shared ReadOnly Property UserAgent As String
+                Get
+                    Dim details As New List(Of String)
+                    details.Add("compatible")
+                    If OSVersion.Platform = PlatformID.Win32NT Then
+                        details.Add(String.Format("Windows NT {0}.{1}", OSVersion.Version.Major, OSVersion.Version.Minor))
+                    Else
+                        details.Add(OSVersion.VersionString)
+                    End If
+                    If Tools.EnvironmentInfo.IsWow64 Then details.Add("WOW64")
+                    details.Add(Thread.CurrentThread.CurrentUICulture.Name)
+                    details.Add(String.Format(".NET CLR {0}", Version.ToString()))
+                    Dim detailsString As String = String.Join("; ", details.ToArray())
+
+                    Return String.Format("Mozilla/4.0 ({0}) {1}/{2}", detailsString, Application.ProductName, Application.ProductVersion)
+                End Get
+            End Property
         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.ApplicationData) & "\" & 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"
+            Public Const ThemesFileName As String = "Themes.xml"
         End Class
 
         Public Class Update
-            Public Shared ReadOnly URL As String = "http://update.mRemote.org/"
+            Public Shared ReadOnly Property FileName As String
+                Get
 #If DEBUG Then
-            Public Shared ReadOnly File As String = "mRemote_Update_Debug.txt"
-#Else
-            Public Shared ReadOnly File As String = "mRemote_Update.txt"
+                    Return "update-debug.txt"
 #End If
+                    Select Case My.Settings.UpdateChannel.ToLowerInvariant()
+                        Case "beta"
+                            Return "update-beta.txt"
+                        Case "debug"
+                            Return "update-debug.txt"
+                        Case Else
+                            Return "update.txt"
+                    End Select
+                End Get
+            End Property
         End Class
 
         Public Class Connections
             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.5
         End Class
 
         Public Class Credentials

mRemoteV1/App/App.Native.vb

@@ -2,131 +2,196 @@
 
 Namespace App
     Public Class Native
-#Region "Dll Imports"
-        <DllImport("user32.dll", EntryPoint:="GetWindowThreadProcessId", SetLastError:=True, CharSet:=CharSet.Unicode, ExactSpelling:=True, CallingConvention:=CallingConvention.StdCall)> _
-        Public Shared Function GetWindowThreadProcessId(ByVal hWnd As Long, ByVal lpdwProcessId As Long) As Long
-        End Function
+        Private Sub New()
+            ' Fix Warning 292 CA1053 : Microsoft.Design : Because type 'Native' contains only 'static' ('Shared' in Visual Basic) members, add a default private constructor to prevent the compiler from adding a default public constructor.
+        End Sub
 
-        <DllImport("user32.dll", SetLastError:=True)> _
-        Public Shared Function FindWindow(ByVal lpClassName As String, ByVal lpWindowName As String) As IntPtr
-        End Function
-
-        <DllImport("user32.dll", SetLastError:=True)> _
-        Public Shared Function SetParent(ByVal hWndChild As IntPtr, ByVal hWndNewParent As IntPtr) As Long
-        End Function
-
-        <DllImport("user32.dll", EntryPoint:="GetWindowLongA", SetLastError:=True)> _
-        Public Shared Function GetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer) As Long
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function SetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer, ByVal dwNewLong As Integer) As Integer
-        End Function
-
-        <DllImport("user32.dll", SetLastError:=True)> _
-        Public Shared Function SetWindowPos(ByVal hWnd As IntPtr, ByVal hWndInsertAfter As Long, ByVal x As Long, ByVal y As Long, ByVal cx As Long, ByVal cy As Long, ByVal wFlags As Long) As Long
-        End Function
-
-        <DllImport("user32.dll", SetLastError:=True)> _
-        Public Shared Function MoveWindow(ByVal hWnd As IntPtr, ByVal x As Integer, ByVal y As Integer, ByVal cx As Integer, ByVal cy As Integer, ByVal repaint As Boolean) As Boolean
-        End Function
-
-        <DllImport("user32.dll", EntryPoint:="PostMessageA", SetLastError:=True)> _
-        Public Shared Function PostMessage(ByVal hWnd As IntPtr, ByVal Msg As UInteger, ByVal wParam As Integer, ByVal lParam As Integer) As Boolean
-        End Function
-
-        <DllImport("user32")> _
-        Public Shared Function ShowWindow(ByVal hWnd As IntPtr, ByVal nCmdShow As Integer) As Integer
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function BringWindowToTop(ByVal hWnd As IntPtr) As Boolean
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function SetForegroundWindow(ByVal hWnd As IntPtr) As Boolean
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function GetForegroundWindow() As IntPtr
-        End Function
-
-        <DllImport("user32.dll", EntryPoint:="GetWindowTextLengthA")> _
-        Public Shared Function GetWindowTextLength(ByVal hWnd As IntPtr) As Long
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function IsIconic(ByVal hWnd As IntPtr) As Integer
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function GetSystemMenu(ByVal hWnd As IntPtr, ByVal bRevert As Boolean) As IntPtr
-        End Function
-
-        <DllImport("user32.dll")> _
+#Region "Functions"
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
         Public Shared Function AppendMenu(ByVal hMenu As IntPtr, ByVal uFlags As Int32, ByVal uIDNewItem As IntPtr, ByVal lpNewItem As String) As Boolean
         End Function
 
-        <DllImport("user32")> _
-        Public Shared Function InsertMenu(ByVal hMenu As IntPtr, ByVal uPosition As Integer, ByVal uFlags As Integer, ByVal uIDNewItem As IntPtr, ByVal lpNewItem As String) As Boolean
-        End Function
-
-        <DllImport("user32")> _
-        Public Shared Function SetMenuItemBitmaps(ByVal hMenu As IntPtr, ByVal uPosition As Integer, ByVal uFlags As Integer, ByVal hBitmapUnchecked As IntPtr, ByVal hBitmapChecked As IntPtr) As Boolean
-        End Function
-
-        <DllImport("user32")> _
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
         Public Shared Function CreatePopupMenu() As IntPtr
         End Function
 
-        <DllImport("user32")> _
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function FindWindowEx(ByVal parentHandle As IntPtr, ByVal childAfter As IntPtr, ByVal lclassName As String, ByVal windowTitle As String) As IntPtr
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function GetForegroundWindow() As IntPtr
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function GetSystemMenu(ByVal hWnd As IntPtr, ByVal bRevert As Boolean) As IntPtr
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function InsertMenu(ByVal hMenu As IntPtr, ByVal uPosition As Integer, ByVal uFlags As Integer, ByVal uIDNewItem As IntPtr, ByVal lpNewItem As String) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function IsIconic(ByVal hWnd As IntPtr) As Integer
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function MoveWindow(ByVal hWnd As IntPtr, ByVal x As Integer, ByVal y As Integer, ByVal cx As Integer, ByVal cy As Integer, ByVal repaint As Boolean) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function PostMessage(ByVal hWnd As IntPtr, ByVal Msg As UInteger, ByVal wParam As Integer, ByVal lParam As Integer) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
         Public Shared Function SendMessage(ByVal hWnd As IntPtr, ByVal msg As Integer, ByVal wparam As Integer, ByVal lparam As Integer) As Integer
         End Function
 
-        <DllImport("user32")> _
-        Public Shared Function MapVirtualKey(ByVal wCode As Integer, ByVal wMapType As Integer) As Integer
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetClipboardViewer(ByVal hWndNewViewer As IntPtr) As IntPtr
         End Function
 
-        <DllImport("user32")> _
-        Public Shared Function PostMessage(ByVal hWnd As IntPtr, ByVal wMsg As Integer, ByVal wParam As Integer, ByVal lParam As Integer) As Long
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetForegroundWindow(ByVal hWnd As IntPtr) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetMenuItemBitmaps(ByVal hMenu As IntPtr, ByVal uPosition As Integer, ByVal uFlags As Integer, ByVal hBitmapUnchecked As IntPtr, ByVal hBitmapChecked As IntPtr) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetParent(ByVal hWndChild As IntPtr, ByVal hWndNewParent As IntPtr) As Long
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        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, CharSet:=CharSet.Auto)> _
+        Public Shared Function ShowWindow(ByVal hWnd As IntPtr, ByVal nCmdShow As Integer) As Integer
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function WindowFromPoint(ByVal point As Point) As IntPtr
         End Function
 #End Region
 
+#Region "Structures"
+        <StructLayout(LayoutKind.Sequential)> _
+        Public Structure WINDOWPOS
+            Public hwnd As IntPtr
+            Public hwndInsertAfter As IntPtr
+            Public x As Integer
+            Public y As Integer
+            Public cx As Integer
+            Public cy As Integer
+            Public flags As Integer
+        End Structure
+#End Region
+
+#Region "Helpers"
+        Public Shared Function MAKELONG(ByRef wLow As Int32, ByRef wHigh As Int32) As Int32
+            Return wLow Or wHigh << 16
+        End Function
+
+        Public Shared Function MAKELPARAM(ByRef wLow As Int32, ByRef wHigh As Int32) As Int32
+            Return MAKELONG(wLow, wHigh)
+        End Function
+
+        Public Shared Function LOWORD(ByRef value As Int32) As Int32
+            Return value And &HFFFF
+        End Function
+
+        Public Shared Function LOWORD(ByRef value As IntPtr) As Int32
+            Return LOWORD(value.ToInt32)
+        End Function
+
+        Public Shared Function HIWORD(ByRef value As Int32) As Int32
+            Return value >> 16
+        End Function
+
+        Public Shared Function HIWORD(ByRef value As IntPtr) As Int32
+            Return HIWORD(value.ToInt32)
+        End Function
+
+#End Region
+
 #Region "Constants"
-        Public Const SWP_NOOWNERZORDER As Integer = 512
-        Public Const SWP_NOREDRAW As Integer = 8
-        Public Const SWP_NOZORDER As Integer = 4
-        Public Const SWP_SHOWWINDOW As Integer = 64
-        Public Const WS_EX_MDICHILD As Integer = 64
-        Public Const SWP_FRAMECHANGED As Integer = 32
-        Public Const SWP_NOACTIVATE As Integer = 16
-        Public Const SWP_ASYNCWINDOWPOS As Integer = 16384
-        Public Const SWP_NOMOVE As Integer = 2
-        Public Const SWP_NOSIZE As Integer = 1
+        ' GetWindowLong
         Public Const GWL_STYLE As Integer = (-16)
-        Public Const WS_VISIBLE As Integer = 268435456
-        Public Const WM_CLOSE As Integer = 16
-        Public Const WS_CHILD As Integer = 1073741824
-        Public Const WS_MAXIMIZE As Integer = 16777216
+
+        ' AppendMenu / ModifyMenu / DeleteMenu / RemoveMenu
+        Public Const MF_BYCOMMAND As Integer = &H0
+        Public Const MF_BYPOSITION As Integer = &H400
+        Public Const MF_STRING As Integer = &H0
+        Public Const MF_POPUP As Integer = &H10
+        Public Const MF_SEPARATOR As Integer = &H800
+
+        ' WM_LBUTTONDOWN / WM_LBUTTONUP
+        Public Const MK_LBUTTON As Integer = &H1
+
+        ' ShowWindow
         Public Const SW_SHOWMAXIMIZED As Integer = 3
         Public Const SW_RESTORE As Integer = 9
 
-        Public Const MF_STRING As Integer = &H0
-        Public Const MF_SEPARATOR As Integer = &H800&
-        Public Const MF_BYCOMMAND As Integer = &H0
-        Public Const MF_BYPOSITION As Integer = &H400
-        Public Const MF_POPUP As Integer = &H10
+        ' SetWindowPos / WM_WINDOWPOSCHANGING / WM_WINDOWPOSCHANGED
+        Public Const SWP_NOSIZE As Integer = &H1
+        Public Const SWP_NOMOVE As Integer = &H2
+        Public Const SWP_NOZORDER As Integer = &H4
+        Public Const SWP_NOREDRAW As Integer = &H8
+        Public Const SWP_NOACTIVATE As Integer = &H10
+        Public Const SWP_DRAWFRAME As Integer = &H20
+        Public Const SWP_FRAMECHANGED As Integer = &H20
+        Public Const SWP_SHOWWINDOW As Integer = &H40
+        Public Const SWP_HIDEWINDOW As Integer = &H80
+        Public Const SWP_NOCOPYBITS As Integer = &H100
+        Public Const SWP_NOOWNERZORDER As Integer = &H200
+        Public Const SWP_NOSENDCHANGING As Integer = &H400
+        Public Const SWP_NOCLIENTSIZE As Integer = &H800
+        Public Const SWP_NOCLIENTMOVE As Integer = &H1000
+        Public Const SWP_DEFERERASE As Integer = &H2000
+        Public Const SWP_ASYNCWINDOWPOS As Integer = &H4000
+        Public Const SWP_STATECHANGED As Integer = &H8000
 
+        ' WM_ACTIVATE
+        Public Const WA_INACTIVE As Integer = &H0
+        Public Const WA_ACTIVE As Integer = &H1
+        Public Const WA_CLICKACTIVE As Integer = &H2
+
+        ' Window Messages
+        Public Const WM_CREATE As Integer = &H1
+        Public Const WM_DESTROY As Integer = &H2
+        Public Const WM_ACTIVATE As Integer = &H6
+        Public Const WM_GETTEXT As Integer = &HD
+        Public Const WM_CLOSE As Integer = &H10
+        Public Const WM_ACTIVATEAPP As Integer = &H1C
+        Public Const WM_MOUSEACTIVATE As Integer = &H21
+        Public Const WM_WINDOWPOSCHANGED As Integer = &H47
+        Public Const WM_KEYDOWN As Integer = &H100
+        Public Const WM_KEYUP As Integer = &H101
         Public Const WM_SYSCOMMAND As Integer = &H112
-
+        Public Const WM_MOUSEMOVE As Integer = &H200
         Public Const WM_LBUTTONDOWN As Integer = &H201
         Public Const WM_LBUTTONUP As Integer = &H202
         Public Const WM_RBUTTONDOWN As Integer = &H204
         Public Const WM_RBUTTONUP As Integer = &H205
+        Public Const WM_MBUTTONDOWN As Integer = &H207
+        Public Const WM_MBUTTONUP As Integer = &H208
+        Public Const WM_XBUTTONDOWN As Integer = &H20B
+        Public Const WM_XBUTTONUP As Integer = &H20C
+        Public Const WM_PARENTNOTIFY As Integer = &H210
+        Public Const WM_ENTERSIZEMOVE As Integer = &H231
+        Public Const WM_EXITSIZEMOVE As Integer = &H232
+        Public Const WM_DRAWCLIPBOARD As Integer = &H308
+        Public Const WM_CHANGECBCHAIN As Integer = &H30D
 
-        Public Const WM_KEYDOWN As Integer = &H100
-        Public Const WM_KEYUP As Integer = &H101
+        ' Window Styles
+        Public Const WS_MAXIMIZE As Integer = &H1000000
+        Public Const WS_VISIBLE As Integer = &H10000000
+        Public Const WS_CHILD As Integer = &H40000000
+        Public Const WS_EX_MDICHILD As Integer = &H40
 
+        ' Virtual Key Codes
         Public Const VK_CONTROL As Integer = &H11
         Public Const VK_C As Integer = &H67
 #End Region

mRemoteV1/App/App.SupportedCultures.vb

@@ -0,0 +1,66 @@
+Namespace App
+    Public Class SupportedCultures
+        Inherits Dictionary(Of String, String)
+
+        Private Sub New()
+            Dim CultureInfo As Globalization.CultureInfo
+            For Each CultureName As String In My.Settings.SupportedUICultures.Split(",")
+                Try
+                    CultureInfo = New Globalization.CultureInfo(CultureName.Trim)
+                    Add(CultureInfo.Name, CultureInfo.TextInfo.ToTitleCase(CultureInfo.NativeName))
+                Catch ex As Exception
+                    Debug.Print(String.Format("An exception occurred while adding the culture '{0}' to the list of supported cultures. {1}", CultureName, ex.ToString))
+                End Try
+            Next
+        End Sub
+
+        Private Shared _Instance As SupportedCultures = Nothing
+        Public Shared Sub InstantiateSingleton()
+            If _Instance Is Nothing Then
+                _Instance = New SupportedCultures
+            End If
+        End Sub
+
+        Public Shared Function IsNameSupported(ByVal CultureName As String) As Boolean
+            Return _Instance.ContainsKey(CultureName)
+        End Function
+
+        Public Shared Function IsNativeNameSupported(ByVal CultureNativeName As String) As Boolean
+            Return _Instance.ContainsValue(CultureNativeName)
+        End Function
+
+        Public Shared ReadOnly Property CultureName(ByVal CultureNativeName As String) As String
+            Get
+                Dim Names(_Instance.Count) As String
+                Dim NativeNames(_Instance.Count) As String
+
+                _Instance.Keys.CopyTo(Names, 0)
+                _Instance.Values.CopyTo(NativeNames, 0)
+
+                For Index As Integer = 0 To _Instance.Count
+                    If NativeNames(Index) = CultureNativeName Then
+                        Return Names(Index)
+                    End If
+                Next
+
+                Throw New System.Collections.Generic.KeyNotFoundException()
+            End Get
+        End Property
+
+        Public Shared ReadOnly Property CultureNativeName(ByVal CultureName As String) As String
+            Get
+                Return _Instance.Item(CultureName)
+            End Get
+        End Property
+
+        Public Shared ReadOnly Property CultureNativeNames() As List(Of String)
+            Get
+                Dim ValueList As New List(Of String)
+                For Each Value As String In _Instance.Values
+                    ValueList.Add(Value)
+                Next
+                Return ValueList
+            End Get
+        End Property
+    End Class
+End Namespace

mRemoteV1/App/App.Update.vb

@@ -1,269 +1,431 @@
 Imports System.IO
 Imports System.Net
-Imports mRemote.App.Runtime
+Imports System.ComponentModel
+Imports System.Threading
+Imports mRemoteNG.Tools
+Imports System.Reflection
 
 Namespace App
     Public Class Update
-        Public Event DownloadProgressChanged(ByVal sender As Object, ByVal e As System.Net.DownloadProgressChangedEventArgs)
-        Public Event DownloadCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.AsyncCompletedEventArgs, ByVal Success As Boolean)
+#Region "Events"
+        Public Event GetUpdateInfoCompletedEvent As AsyncCompletedEventHandler
+        Public Event GetChangeLogCompletedEvent As AsyncCompletedEventHandler
+        Public Event GetAnnouncementInfoCompletedEvent As AsyncCompletedEventHandler
+        Public Event DownloadUpdateProgressChangedEvent As DownloadProgressChangedEventHandler
+        Public Event DownloadUpdateCompletedEvent As AsyncCompletedEventHandler
+#End Region
 
 #Region "Public Properties"
-        Private _curUI As Info
-        Public ReadOnly Property curUI() As Info
+        Private _currentUpdateInfo As UpdateInfo
+        Public ReadOnly Property CurrentUpdateInfo() As UpdateInfo
             Get
-                Return _curUI
+                Return _currentUpdateInfo
+            End Get
+        End Property
+
+        Private _changeLog As String
+        Public ReadOnly Property ChangeLog() As String
+            Get
+                Return _changeLog
+            End Get
+        End Property
+
+        Private _currentAnnouncementInfo As AnnouncementInfo
+        Public ReadOnly Property CurrentAnnouncementInfo() As AnnouncementInfo
+            Get
+                Return _currentAnnouncementInfo
+            End Get
+        End Property
+
+        Public ReadOnly Property IsGetUpdateInfoRunning() As Boolean
+            Get
+                If _getUpdateInfoThread IsNot Nothing Then
+                    If _getUpdateInfoThread.IsAlive Then Return True
+                End If
+                Return False
+            End Get
+        End Property
+
+        Public ReadOnly Property IsGetChangeLogRunning() As Boolean
+            Get
+                If _getChangeLogThread IsNot Nothing Then
+                    If _getChangeLogThread.IsAlive Then Return True
+                End If
+                Return False
+            End Get
+        End Property
+
+        Public ReadOnly Property IsGetAnnouncementInfoRunning() As Boolean
+            Get
+                If _getAnnouncementInfoThread IsNot Nothing Then
+                    If _getAnnouncementInfoThread.IsAlive Then Return True
+                End If
+                Return False
+            End Get
+        End Property
+
+        Public ReadOnly Property IsDownloadUpdateRunning() As Boolean
+            Get
+                Return (_downloadUpdateWebClient IsNot Nothing)
             End Get
         End Property
 #End Region
 
-#Region "Private Properties"
-        Private wCl As WebClient
-        Private wPr As WebProxy
-#End Region
-
 #Region "Public Methods"
-        Public Function IsProxyOK() As Boolean
-            Try
-                Dim uI As Info = GetUpdateInfo()
+        Public Sub New()
+            SetProxySettings()
+        End Sub
 
-                Return uI.InfoOk
+        Public Sub SetProxySettings()
+            SetProxySettings(My.Settings.UpdateUseProxy, My.Settings.UpdateProxyAddress, My.Settings.UpdateProxyPort, My.Settings.UpdateProxyUseAuthentication, My.Settings.UpdateProxyAuthUser, Security.Crypt.Decrypt(My.Settings.UpdateProxyAuthPass, Info.General.EncryptionKey))
+        End Sub
 
-                uI = Nothing
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsProxyOK (App.Update) failed" & vbNewLine & ex.Message, False)
-                Return False
-            End Try
-        End Function
-
-        Public Function IsUpdateAvailable() As Boolean
-            Try
-                Dim uI As Info = GetUpdateInfo()
-
-                If uI.InfoOk = False Then
-                    Return False
-                End If
-
-                If uI.Version > My.Application.Info.Version Then
-                    Return True
+        Public Sub SetProxySettings(ByVal useProxy As Boolean, ByVal address As String, ByVal port As Integer, ByVal useAuthentication As Boolean, ByVal username As String, ByVal password As String)
+            If useProxy And Not String.IsNullOrEmpty(address) Then
+                If Not port = 0 Then
+                    _webProxy = New WebProxy(address, port)
                 Else
-                    Return False
+                    _webProxy = New WebProxy(address)
                 End If
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsUpdateAvailable failed" & vbNewLine & ex.Message, True)
-                Return False
-            End Try
-        End Function
 
-        Public Function GetUpdateInfo() As Info
-            Try
-                Dim strUpdate As String = GetUpdateFile()
-
-                CreateWebClient()
-
-                Dim uI As New Info()
-
-                If strUpdate <> "" Then
-                    uI.InfoOk = True
-
-                    Try
-                        'get Version
-                        Dim strV As String = strUpdate.Substring(strUpdate.IndexOf("Version: ") + 9, strUpdate.IndexOf(vbNewLine) - 9)
-                        uI.Version = New Version(strV)
-
-                        strUpdate = strUpdate.Remove(0, strUpdate.IndexOf(vbNewLine) + 2)
-
-                        '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")
-
-                        uI.DownloadUrl = strU
-
-                        strUpdate = strUpdate.Remove(0, strUpdate.IndexOf(vbNewLine) + 2)
-
-                        'get Change Log
-                        Dim strClURL As String = strUpdate.Substring(strUpdate.IndexOf("clURL: ") + 7, strUpdate.IndexOf(vbNewLine) - 7)
-                        Dim strCl As String = wCl.DownloadString(strClURL)
-                        uI.ChangeLog = strCl
-
-                        strUpdate = strUpdate.Remove(0, strUpdate.IndexOf(vbNewLine) + 2)
-
-                        Try
-                            'get Image
-                            Dim strImgURL As String = strUpdate.Substring(strUpdate.IndexOf("imgURL: ") + 8, strUpdate.IndexOf(vbNewLine) - 8)
-                            uI.ImageURL = strImgURL
-
-                            strUpdate = strUpdate.Remove(0, strUpdate.IndexOf(vbNewLine) + 2)
-
-                            'get Image Link
-                            Dim strImgURLLink As String = strUpdate.Substring(strUpdate.IndexOf("imgURLLink: ") + 12, strUpdate.IndexOf(vbNewLine) - 12)
-                            uI.ImageURLLink = strImgURLLink
-                        Catch ex As Exception
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "Update Image Info could not be read." & vbNewLine & ex.Message, True)
-                        End Try
-                    Catch ex As Exception
-                        uI.InfoOk = False
-                    End Try
+                If useAuthentication Then
+                    _webProxy.Credentials = New NetworkCredential(username, password)
                 Else
-                    uI.InfoOk = False
+                    _webProxy.Credentials = Nothing
                 End If
-
-                _curUI = uI
-                Return uI
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting update info failed" & vbNewLine & ex.Message, True)
-                Return Nothing
-            End Try
-        End Function
-
-        Public Function DownloadUpdate(ByVal dURL As String) As Boolean
-            Try
-                CreateWebClient()
-
-                AddHandler wCl.DownloadProgressChanged, AddressOf DLProgressChanged
-                AddHandler wCl.DownloadFileCompleted, AddressOf DLCompleted
-
-                _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)
-                Return False
-            End Try
-        End Function
-#End Region
-
-#Region "Private Methods"
-        Private Sub CreateWebClient()
-            wCl = New WebClient()
-
-            If My.Settings.UpdateUseProxy Then
-                wPr = New WebProxy(My.Settings.UpdateProxyAddress, My.Settings.UpdateProxyPort)
-
-                If My.Settings.UpdateProxyUseAuthentication Then
-                    Dim cred As ICredentials
-                    cred = New NetworkCredential(My.Settings.UpdateProxyAuthUser, Security.Crypt.Decrypt(My.Settings.UpdateProxyAuthPass, App.Info.General.EncryptionKey))
-
-                    wPr.Credentials = cred
-                End If
-
-                wCl.Proxy = wPr
+            Else
+                _webProxy = Nothing
             End If
         End Sub
 
-        Private Function GetUpdateFile() As String
-            Try
-                CreateWebClient()
+        Public Function IsUpdateAvailable() As Boolean
+            If _currentUpdateInfo Is Nothing OrElse Not _currentUpdateInfo.IsValid Then Return False
 
-                Dim strTemp As String
-
-                Try
-                    strTemp = wCl.DownloadString(App.Info.Update.URL & App.Info.Update.File)
-                Catch ex As Exception
-                    strTemp = ""
-                End Try
-
-                Return strTemp
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "GetUpdateFile failed" & vbNewLine & ex.Message, True)
-                Return ""
-            End Try
+            Return _currentUpdateInfo.Version > My.Application.Info.Version
         End Function
 
-        Private Sub DLProgressChanged(ByVal sender As Object, ByVal e As System.Net.DownloadProgressChangedEventArgs)
-            RaiseEvent DownloadProgressChanged(sender, e)
+        Public Function IsAnnouncementAvailable() As Boolean
+            If _currentAnnouncementInfo Is Nothing OrElse _
+                (Not _currentAnnouncementInfo.IsValid Or _
+                 String.IsNullOrEmpty(_currentAnnouncementInfo.Name)) Then Return False
+
+            Return (Not _currentAnnouncementInfo.Name = My.Settings.LastAnnouncement)
+        End Function
+
+        Public Sub GetUpdateInfoAsync()
+            If IsGetUpdateInfoRunning Then _getUpdateInfoThread.Abort()
+
+            _getUpdateInfoThread = New Thread(AddressOf GetUpdateInfo)
+            With _getUpdateInfoThread
+                .SetApartmentState(ApartmentState.STA)
+                .IsBackground = True
+                .Start()
+            End With
         End Sub
 
-        Private Sub DLCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.AsyncCompletedEventArgs)
-            Try
-                Dim fInfo As New FileInfo(_curUI.UpdateLocation)
+        Public Sub GetChangeLogAsync()
+            If _currentUpdateInfo Is Nothing OrElse Not _currentUpdateInfo.IsValid Then
+                Throw New InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling GetChangeLogAsync().")
+            End If
 
-                If fInfo.Length > 0 Then
-                    RaiseEvent DownloadCompleted(sender, e, True)
-                Else
-                    fInfo.Delete()
-                    RaiseEvent DownloadCompleted(sender, e, False)
-                End If
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "DLCompleted failed" & vbNewLine & ex.Message, True)
-            End Try
+            If IsGetChangeLogRunning Then _getChangeLogThread.Abort()
+
+            _getChangeLogThread = New Thread(AddressOf GetChangeLog)
+            With _getChangeLogThread
+                .SetApartmentState(ApartmentState.STA)
+                .IsBackground = True
+                .Start()
+            End With
+        End Sub
+
+        Public Sub GetAnnouncementInfoAsync()
+            If IsGetAnnouncementInfoRunning Then _getAnnouncementInfoThread.Abort()
+
+            _getAnnouncementInfoThread = New Thread(AddressOf GetAnnouncementInfo)
+            With _getAnnouncementInfoThread
+                .SetApartmentState(ApartmentState.STA)
+                .IsBackground = True
+                .Start()
+            End With
+        End Sub
+
+        Public Sub DownloadUpdateAsync()
+            If _downloadUpdateWebClient IsNot Nothing Then
+                Throw New InvalidOperationException("A previous call to DownloadUpdateAsync() is still in progress.")
+            End If
+
+            If _currentUpdateInfo Is Nothing OrElse Not _currentUpdateInfo.IsValid Then
+                Throw New InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync().")
+            End If
+
+            _currentUpdateInfo.UpdateFilePath = Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName, "exe"))
+            DownloadUpdateWebClient.DownloadFileAsync(CurrentUpdateInfo.DownloadAddress, _currentUpdateInfo.UpdateFilePath)
         End Sub
 #End Region
 
+#Region "Private Properties"
+        Private _downloadUpdateWebClient As WebClient
+        Private ReadOnly Property DownloadUpdateWebClient() As WebClient
+            Get
+                If _downloadUpdateWebClient IsNot Nothing Then Return _downloadUpdateWebClient
 
+                _downloadUpdateWebClient = CreateWebClient()
 
+                AddHandler _downloadUpdateWebClient.DownloadProgressChanged, AddressOf DownloadUpdateProgressChanged
+                AddHandler _downloadUpdateWebClient.DownloadFileCompleted, AddressOf DownloadUpdateCompleted
 
-        Public Class Info
-            Private _Version As Version
-            Public Property Version() As Version
-                Get
-                    Return _Version
-                End Get
-                Set(ByVal value As Version)
-                    _Version = value
-                End Set
-            End Property
+                Return _downloadUpdateWebClient
+            End Get
+        End Property
+#End Region
 
-            Private _DownloadUrl As String
-            Public Property DownloadUrl() As String
-                Get
-                    Return _DownloadUrl
-                End Get
-                Set(ByVal value As String)
-                    _DownloadUrl = value
-                End Set
-            End Property
+#Region "Private Fields"
+        Private _webProxy As WebProxy
+        Private _getUpdateInfoThread As Thread
+        Private _getChangeLogThread As Thread
+        Private _getAnnouncementInfoThread As Thread
+#End Region
 
-            Private _UpdateLocation As String
-            Public Property UpdateLocation() As String
-                Get
-                    Return _UpdateLocation
-                End Get
-                Set(ByVal value As String)
-                    _UpdateLocation = value
-                End Set
-            End Property
+#Region "Private Methods"
+        Private Function CreateWebClient() As WebClient
+            Dim webClient As New WebClient
+            webClient.Headers.Add("user-agent", Info.General.UserAgent)
+            webClient.Proxy = _webProxy
+            Return webClient
+        End Function
 
-            Private _ChangeLog As String
-            Public Property ChangeLog() As String
-                Get
-                    Return _ChangeLog
-                End Get
-                Set(ByVal value As String)
-                    _ChangeLog = value
-                End Set
-            End Property
+        Private Shared Function NewDownloadStringCompletedEventArgs(ByVal result As String, ByVal exception As Exception, ByVal cancelled As Boolean, ByVal userToken As Object) As DownloadStringCompletedEventArgs
+            Dim type As Type = GetType(DownloadStringCompletedEventArgs)
+            Const bindingFlags As BindingFlags = bindingFlags.NonPublic Or bindingFlags.Instance
+            Dim argumentTypes() As Type = {GetType(String), GetType(Exception), GetType(Boolean), GetType(Object)}
+            Dim constructor As ConstructorInfo = type.GetConstructor(bindingFlags, Nothing, argumentTypes, Nothing)
+            Dim arguments() As Object = {result, exception, cancelled, userToken}
 
-            Private _ImageURL As String
-            Public Property ImageURL() As String
-                Get
-                    Return _ImageURL
-                End Get
-                Set(ByVal value As String)
-                    _ImageURL = value
-                End Set
-            End Property
+            Return constructor.Invoke(arguments)
+        End Function
 
-            Private _ImageURLLink As String
-            Public Property ImageURLLink() As String
-                Get
-                    Return _ImageURLLink
-                End Get
-                Set(ByVal value As String)
-                    _ImageURLLink = value
-                End Set
-            End Property
+        Private Function DownloadString(ByVal address As Uri) As DownloadStringCompletedEventArgs
+            Dim webClient As WebClient = CreateWebClient()
+            Dim result As String = String.Empty
+            Dim exception As Exception = Nothing
+            Dim cancelled As Boolean = False
 
-            Private _InfoOk As Boolean
-            Public Property InfoOk() As Boolean
-                Get
-                    Return _InfoOk
-                End Get
-                Set(ByVal value As Boolean)
-                    _InfoOk = value
-                End Set
-            End Property
+            Try
+                result = webClient.DownloadString(address)
+            Catch ex As ThreadAbortException
+                cancelled = True
+            Catch ex As Exception
+                exception = ex
+            End Try
+
+            Return NewDownloadStringCompletedEventArgs(result, exception, cancelled, Nothing)
+        End Function
+
+        Private Sub GetUpdateInfo()
+            Dim updateFileUri As New Uri(New Uri(My.Settings.UpdateAddress), New Uri(Info.Update.FileName, UriKind.Relative))
+            Dim e As DownloadStringCompletedEventArgs = DownloadString(updateFileUri)
+
+            If Not e.Cancelled And e.Error Is Nothing Then
+                _currentUpdateInfo = UpdateInfo.FromString(e.Result)
+
+                My.Settings.CheckForUpdatesLastCheck = Date.UtcNow
+                If Not My.Settings.UpdatePending Then
+                    My.Settings.UpdatePending = IsUpdateAvailable()
+                End If
+            End If
+
+            RaiseEvent GetUpdateInfoCompletedEvent(Me, e)
+        End Sub
+
+        Private Sub GetChangeLog()
+            Dim e As DownloadStringCompletedEventArgs = DownloadString(_currentUpdateInfo.ChangeLogAddress)
+
+            If Not e.Cancelled And e.Error Is Nothing Then _changeLog = e.Result
+
+            RaiseEvent GetChangeLogCompletedEvent(Me, e)
+        End Sub
+
+        Private Sub GetAnnouncementInfo()
+            Dim announcementFileUri As New Uri(My.Settings.AnnouncementAddress)
+            Dim e As DownloadStringCompletedEventArgs = DownloadString(announcementFileUri)
+
+            If Not e.Cancelled And e.Error Is Nothing Then
+                _currentAnnouncementInfo = AnnouncementInfo.FromString(e.Result)
+
+                If Not String.IsNullOrEmpty(_currentAnnouncementInfo.Name) Then
+                    My.Settings.LastAnnouncement = _currentAnnouncementInfo.Name
+                End If
+            End If
+
+            RaiseEvent GetAnnouncementInfoCompletedEvent(Me, e)
+        End Sub
+
+        Private Sub DownloadUpdateProgressChanged(ByVal sender As Object, ByVal e As DownloadProgressChangedEventArgs)
+            RaiseEvent DownloadUpdateProgressChangedEvent(sender, e)
+        End Sub
+
+        Private Sub DownloadUpdateCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.AsyncCompletedEventArgs)
+            Dim raiseEventArgs As AsyncCompletedEventArgs = e
+
+            If Not e.Cancelled And e.Error Is Nothing Then
+                Try
+                    Dim updateAuthenticode As New Authenticode(_currentUpdateInfo.UpdateFilePath)
+                    With updateAuthenticode
+                        .RequireThumbprintMatch = True
+                        .ThumbprintToMatch = _currentUpdateInfo.CertificateThumbprint
+
+                        If Not .Verify() = Authenticode.StatusValue.Verified Then
+                            If .Status = Authenticode.StatusValue.UnhandledException Then
+                                Throw .Exception
+                            Else
+                                Throw New Exception(.StatusMessage)
+                            End If
+                        End If
+                    End With
+                Catch ex As Exception
+                    raiseEventArgs = New AsyncCompletedEventArgs(ex, False, Nothing)
+                End Try
+            End If
+
+            If raiseEventArgs.Cancelled Or raiseEventArgs.Error IsNot Nothing Then
+                File.Delete(_currentUpdateInfo.UpdateFilePath)
+            End If
+
+            RaiseEvent DownloadUpdateCompletedEvent(Me, raiseEventArgs)
+
+            _downloadUpdateWebClient.Dispose()
+            _downloadUpdateWebClient = Nothing
+        End Sub
+#End Region
+
+#Region "Public Classes"
+        Public Class UpdateInfo
+#Region "Public Properties"
+            Public Property IsValid As Boolean
+            Public Property Version As Version
+            Public Property DownloadAddress As Uri
+            Public Property UpdateFilePath As String
+            Public Property ChangeLogAddress As Uri
+            Public Property ImageAddress As Uri
+            Public Property ImageLinkAddress As Uri
+            Public Property CertificateThumbprint As String
+#End Region
+
+#Region "Public Methods"
+            Public Shared Function FromString(ByVal input As String) As UpdateInfo
+                Dim newInfo As New UpdateInfo
+                With newInfo
+                    If String.IsNullOrEmpty(input) Then
+                        .IsValid = False
+                    Else
+                        Dim updateFile As New UpdateFile(input)
+                        .Version = updateFile.GetVersion("Version")
+                        .DownloadAddress = updateFile.GetUri("dURL")
+                        .ChangeLogAddress = updateFile.GetUri("clURL")
+                        .ImageAddress = updateFile.GetUri("imgURL")
+                        .ImageLinkAddress = updateFile.GetUri("imgURLLink")
+                        .CertificateThumbprint = updateFile.GetThumbprint("CertificateThumbprint")
+                        .IsValid = True
+                    End If
+                End With
+                Return newInfo
+            End Function
+#End Region
         End Class
+
+        Public Class AnnouncementInfo
+#Region "Public Properties"
+            Public Property IsValid As Boolean
+            Public Property Name As String
+            Public Property Address As Uri
+#End Region
+
+#Region "Public Methods"
+            Public Shared Function FromString(ByVal input As String) As AnnouncementInfo
+                Dim newInfo As New AnnouncementInfo
+                With newInfo
+                    If String.IsNullOrEmpty(input) Then
+                        .IsValid = False
+                    Else
+                        Dim updateFile As New UpdateFile(input)
+                        .Name = updateFile.GetString("Name")
+                        .Address = updateFile.GetUri("URL")
+                        .IsValid = True
+                    End If
+                End With
+                Return newInfo
+            End Function
+#End Region
+        End Class
+#End Region
+
+#Region "Private Classes"
+        Private Class UpdateFile
+#Region "Public Properties"
+            Private ReadOnly _items As New Dictionary(Of String, String)(StringComparer.InvariantCultureIgnoreCase)
+            ' ReSharper disable MemberCanBePrivate.Local
+            Public ReadOnly Property Items() As Dictionary(Of String, String)
+                ' ReSharper restore MemberCanBePrivate.Local
+                Get
+                    Return _items
+                End Get
+            End Property
+#End Region
+
+#Region "Public Methods"
+            Public Sub New(ByVal content As String)
+                FromString(content)
+            End Sub
+
+            ' ReSharper disable MemberCanBePrivate.Local
+            Public Sub FromString(ByVal content As String)
+                ' ReSharper restore MemberCanBePrivate.Local
+                If String.IsNullOrEmpty(content) Then
+                Else
+                    Dim lineSeparators() As Char = New Char() {Chr(&HA), Chr(&HD)}
+                    Dim keyValueSeparators() As Char = New Char() {":", "="}
+                    Dim commentCharacters() As Char = New Char() {"#", ";", "'"}
+
+                    Dim lines() As String = content.Split(lineSeparators, StringSplitOptions.RemoveEmptyEntries)
+                    For Each line As String In lines
+                        line = line.Trim()
+                        If line.Length = 0 Then Continue For
+                        If Not line.Substring(0, 1).IndexOfAny(commentCharacters) = -1 Then Continue For
+
+                        Dim parts() As String = line.Split(keyValueSeparators, 2)
+                        If Not parts.Length = 2 Then Continue For
+                        Dim key As String = parts(0).Trim()
+                        Dim value As String = parts(1).Trim()
+
+                        _items.Add(key, value)
+                    Next
+                End If
+            End Sub
+
+            ' ReSharper disable MemberCanBePrivate.Local
+            Public Function GetString(ByVal key As String) As String
+                ' ReSharper restore MemberCanBePrivate.Local
+                If Not Items.ContainsKey(key) Then Return String.Empty
+                Return Items(key)
+            End Function
+
+            Public Function GetVersion(ByVal key As String) As Version
+                Dim value As String = GetString(key)
+                If String.IsNullOrEmpty(value) Then Return Nothing
+                Return New Version(value)
+            End Function
+
+            Public Function GetUri(ByVal key As String) As Uri
+                Dim value As String = GetString(key)
+                If String.IsNullOrEmpty(value) Then Return Nothing
+                Return New Uri(value)
+            End Function
+
+            Public Function GetThumbprint(ByVal key As String) As String
+                Return GetString(key).Replace(" ", "").ToUpperInvariant()
+            End Function
+#End Region
+        End Class
+#End Region
     End Class
 End Namespace

mRemoteV1/App/Export.vb

@@ -0,0 +1,79 @@
+Imports mRemoteNG.Forms
+Imports mRemoteNG.App.Runtime
+
+Namespace App
+    Public Class Export
+        Public Shared Sub ExportToFile(ByVal rootTreeNode As TreeNode, ByVal selectedTreeNode As TreeNode)
+            Try
+                Dim exportTreeNode As TreeNode
+                Dim saveSecurity As New Security.Save()
+
+                Using exportForm As New ExportForm()
+                    With exportForm
+                        Select Case Tree.Node.GetNodeType(selectedTreeNode)
+                            Case Tree.Node.Type.Container
+                                .SelectedFolder = selectedTreeNode
+                            Case Tree.Node.Type.Connection
+                                If Tree.Node.GetNodeType(selectedTreeNode.Parent) = Tree.Node.Type.Container Then
+                                    .SelectedFolder = selectedTreeNode.Parent
+                                End If
+                                .SelectedConnection = selectedTreeNode
+                        End Select
+
+                        If Not exportForm.ShowDialog(frmMain) = DialogResult.OK Then Return
+
+                        Select Case .Scope
+                            Case exportForm.ExportScope.SelectedFolder
+                                exportTreeNode = .SelectedFolder
+                            Case exportForm.ExportScope.SelectedConnection
+                                exportTreeNode = .SelectedConnection
+                            Case Else
+                                exportTreeNode = rootTreeNode
+                        End Select
+
+                        saveSecurity.Username = .IncludeUsername
+                        saveSecurity.Password = .IncludePassword
+                        saveSecurity.Domain = .IncludeDomain
+                        saveSecurity.Inheritance = .IncludeInheritance
+                    End With
+
+                    SaveExportFile(exportForm.FileName, exportForm.SaveFormat, exportTreeNode, saveSecurity)
+                End Using
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage("App.Export.ExportToFile() failed.", ex, , True)
+            End Try
+        End Sub
+
+        Private Shared Sub SaveExportFile(ByVal fileName As String, ByVal saveFormat As Config.Connections.Save.Format, ByVal rootNode As TreeNode, ByVal saveSecurity As Security.Save)
+            Dim previousTimerEnabled As Boolean = False
+
+            Try
+                If TimerSqlWatcher IsNot Nothing Then
+                    previousTimerEnabled = TimerSqlWatcher.Enabled
+                    TimerSqlWatcher.Enabled = False
+                End If
+
+                Dim connectionsSave As New Config.Connections.Save
+                With connectionsSave
+                    .Export = True
+                    .ConnectionFileName = fileName
+                    .SaveFormat = saveFormat
+
+                    .ConnectionList = ConnectionList
+                    .ContainerList = ContainerList
+                    .RootTreeNode = rootNode
+
+                    .SaveSecurity = saveSecurity
+                End With
+
+                connectionsSave.Save()
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage(String.Format("Export.SaveExportFile(""{0}"") failed.", fileName), ex)
+            Finally
+                If TimerSqlWatcher IsNot Nothing Then
+                    TimerSqlWatcher.Enabled = previousTimerEnabled
+                End If
+            End Try
+        End Sub
+    End Class
+End Namespace

mRemoteV1/App/Import.vb

@@ -0,0 +1,171 @@
+Imports System.Windows.Forms
+Imports System.IO
+Imports mRemoteNG.My
+Imports mRemoteNG.App.Runtime
+Imports PSTaskDialog
+
+Namespace App
+    Public Class Import
+#Region "Public Methods"
+        Public Shared Sub ImportFromFile(ByVal rootTreeNode As TreeNode, ByVal selectedTreeNode As TreeNode, Optional ByVal alwaysUseSelectedTreeNode As Boolean = False)
+            Try
+                Using openFileDialog As New OpenFileDialog()
+                    With openFileDialog
+                        .CheckFileExists = True
+                        .InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal)
+                        .Multiselect = True
+
+                        Dim fileTypes As New List(Of String)
+                        fileTypes.AddRange({Language.strFilterAllImportable, "*.xml;*.rdp;*.rdg;*.dat"})
+                        fileTypes.AddRange({Language.strFiltermRemoteXML, "*.xml"})
+                        fileTypes.AddRange({Language.strFilterRDP, "*.rdp"})
+                        fileTypes.AddRange({Language.strFilterRdgFiles, "*.rdg"})
+                        fileTypes.AddRange({Language.strFilterPuttyConnectionManager, "*.dat"})
+                        fileTypes.AddRange({Language.strFilterAll, "*.*"})
+
+                        .Filter = String.Join("|", fileTypes.ToArray())
+                    End With
+
+                    If Not openFileDialog.ShowDialog = DialogResult.OK Then Return
+
+                    Dim parentTreeNode As TreeNode = GetParentTreeNode(rootTreeNode, selectedTreeNode, alwaysUseSelectedTreeNode)
+                    If parentTreeNode Is Nothing Then Return
+
+                    For Each fileName As String In openFileDialog.FileNames
+                        Try
+                            Select Case DetermineFileType(fileName)
+                                Case FileType.mRemoteXml
+                                    Config.Import.mRemoteNG.Import(fileName, parentTreeNode)
+                                Case FileType.RemoteDesktopConnection
+                                    Config.Import.RemoteDesktopConnection.Import(fileName, parentTreeNode)
+                                Case FileType.RemoteDesktopConnectionManager
+                                    Config.Import.RemoteDesktopConnectionManager.Import(fileName, parentTreeNode)
+                                Case FileType.PuttyConnectionManager
+                                    Config.Import.PuttyConnectionManager.Import(fileName, parentTreeNode)
+                                Case Else
+                                    Throw New FileFormatException("Unrecognized file format.")
+                            End Select
+                        Catch ex As Exception
+                            cTaskDialog.ShowTaskDialogBox(Application.ProductName, Language.strImportFileFailedMainInstruction, String.Format(Language.strImportFileFailedContent, fileName), Tools.Misc.GetExceptionMessageRecursive(ex), "", "", "", "", eTaskDialogButtons.OK, eSysIcons.Error, Nothing)
+                        End Try
+                    Next
+
+                    parentTreeNode.Expand()
+                    Dim parentContainer As Container.Info = TryCast(parentTreeNode.Tag, Container.Info)
+                    If parentContainer IsNot Nothing Then parentContainer.IsExpanded = True
+
+                    SaveConnectionsBG()
+                End Using
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage("App.Import.ImportFromFile() failed.", ex, , True)
+            End Try
+        End Sub
+
+        Public Shared Sub ImportFromActiveDirectory(ByVal ldapPath As String)
+            Try
+                Dim rootTreeNode As TreeNode = Tree.Node.TreeView.Nodes(0)
+                Dim selectedTreeNode As TreeNode = Tree.Node.TreeView.SelectedNode
+
+                Dim parentTreeNode As TreeNode = GetParentTreeNode(rootTreeNode, selectedTreeNode)
+                If parentTreeNode Is Nothing Then Return
+
+                Config.Import.ActiveDirectory.Import(ldapPath, parentTreeNode)
+
+                parentTreeNode.Expand()
+                Dim parentContainer As Container.Info = TryCast(parentTreeNode.Tag, Container.Info)
+                If parentContainer IsNot Nothing Then parentContainer.IsExpanded = True
+
+                SaveConnectionsBG()
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage("App.Import.ImportFromActiveDirectory() failed.", ex, , True)
+            End Try
+        End Sub
+
+        Public Shared Sub ImportFromPortScan(ByVal hosts As IEnumerable, ByVal protocol As Connection.Protocol.Protocols)
+            Try
+                Dim rootTreeNode As TreeNode = Tree.Node.TreeView.Nodes(0)
+                Dim selectedTreeNode As TreeNode = Tree.Node.TreeView.SelectedNode
+
+                Dim parentTreeNode As TreeNode = GetParentTreeNode(rootTreeNode, selectedTreeNode)
+                If parentTreeNode Is Nothing Then Return
+
+                Config.Import.PortScan.Import(hosts, protocol, parentTreeNode)
+
+                parentTreeNode.Expand()
+                Dim parentContainer As Container.Info = TryCast(parentTreeNode.Tag, Container.Info)
+                If parentContainer IsNot Nothing Then parentContainer.IsExpanded = True
+
+                SaveConnectionsBG()
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage("App.Import.ImportFromPortScan() failed.", ex, , True)
+            End Try
+        End Sub
+#End Region
+
+#Region "Private Methods"
+        Private Shared Function GetParentTreeNode(ByVal rootTreeNode As TreeNode, ByVal selectedTreeNode As TreeNode, Optional ByVal alwaysUseSelectedTreeNode As Boolean = False) As TreeNode
+            Dim parentTreeNode As TreeNode
+
+            selectedTreeNode = GetContainerTreeNode(selectedTreeNode)
+            If selectedTreeNode Is Nothing OrElse selectedTreeNode Is rootTreeNode Then
+                parentTreeNode = rootTreeNode
+            Else
+                If alwaysUseSelectedTreeNode Then
+                    parentTreeNode = GetContainerTreeNode(selectedTreeNode)
+                Else
+                    cTaskDialog.ShowCommandBox(Application.ProductName, Language.strImportLocationMainInstruction, Language.strImportLocationContent, "", "", "", String.Format(Language.strImportLocationCommandButtons, vbLf, rootTreeNode.Text, selectedTreeNode.Text), True, eSysIcons.Question, 0)
+                    Select Case cTaskDialog.CommandButtonResult
+                        Case 0 ' Root
+                            parentTreeNode = rootTreeNode
+                        Case 1 ' Selected Folder
+                            parentTreeNode = GetContainerTreeNode(selectedTreeNode)
+                        Case Else ' Cancel
+                            parentTreeNode = Nothing
+                    End Select
+                End If
+            End If
+
+            Return parentTreeNode
+        End Function
+
+        Private Shared Function GetContainerTreeNode(ByVal treeNode As TreeNode) As TreeNode
+            Select Case Tree.Node.GetNodeType(treeNode)
+                Case Tree.Node.Type.Root, Tree.Node.Type.Container
+                    Return treeNode
+                Case Tree.Node.Type.Connection
+                    Return treeNode.Parent
+                Case Else
+                    Return Nothing
+            End Select
+        End Function
+
+        Private Shared Function DetermineFileType(ByVal fileName As String) As FileType
+            ' TODO: Use the file contents to determine the file type instead of trusting the extension
+            Dim fileExtension As String = Path.GetExtension(fileName).ToLowerInvariant()
+            Select Case fileExtension
+                Case ".xml"
+                    Return FileType.mRemoteXml
+                Case ".rdp"
+                    Return FileType.RemoteDesktopConnection
+                Case ".rdg"
+                    Return FileType.RemoteDesktopConnectionManager
+                Case ".dat"
+                    Return FileType.PuttyConnectionManager
+                Case Else
+                    Return FileType.Unknown
+            End Select
+        End Function
+#End Region
+
+#Region "Private Enumerations"
+        Private Enum FileType As Integer
+            Unknown = 0
+            ' ReSharper disable once InconsistentNaming
+            mRemoteXml
+            RemoteDesktopConnection
+            RemoteDesktopConnectionManager
+            PuttyConnectionManager
+        End Enum
+#End Region
+    End Class
+End Namespace

mRemoteV1/ApplicationEvents.vb

@@ -11,7 +11,7 @@
 
         Private Sub MyApplication_Startup(ByVal sender As Object, ByVal e As Microsoft.VisualBasic.ApplicationServices.StartupEventArgs) Handles Me.Startup
             If My.Settings.SingleInstance Then
-                Dim mutexID As String = "mRemote_SingleInstanceMutex"
+                Dim mutexID As String = "mRemoteNG_SingleInstanceMutex"
 
                 mutex = New System.Threading.Mutex(False, mutexID)
 
@@ -63,6 +63,5 @@
             End If
         End Sub
     End Class
-
 End Namespace
 

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

@@ -1,9 +1,12 @@
 Imports System.Windows.Forms
 Imports System.Xml
-Imports mRemote.App.Runtime
+Imports System.Globalization
+Imports mRemoteNG.App.Runtime
 Imports System.Data
 Imports System.Data.SqlClient
 Imports System.IO
+Imports mRemoteNG.My
+Imports PSTaskDialog
 
 Namespace Config
     Namespace Connections
@@ -17,9 +20,7 @@ Namespace Config
             Private sqlQuery As SqlCommand
             Private sqlRd As SqlDataReader
 
-            Private sqlDB As String = "mRemote"
-
-            Private selNode As TreeNode
+            Private _selectedTreeNode As TreeNode
 #End Region
 
 #Region "Public Properties"
@@ -43,6 +44,16 @@ Namespace Config
                 End Set
             End Property
 
+            Private _SQLDatabaseName As String
+            Public Property SQLDatabaseName() As String
+                Get
+                    Return _SQLDatabaseName
+                End Get
+                Set(ByVal value As String)
+                    _SQLDatabaseName = value
+                End Set
+            End Property
+
             Private _SQLUsername As String
             Public Property SQLUsername() As String
                 Get
@@ -83,10 +94,6 @@ Namespace Config
                 End Set
             End Property
 
-
-
-
-
             Private _ConnectionFileName As String
             Public Property ConnectionFileName() As String
                 Get
@@ -97,35 +104,9 @@ Namespace Config
                 End Set
             End Property
 
-            Private _RootTreeNode As TreeNode
             Public Property RootTreeNode() As TreeNode
-                Get
-                    Return Me._RootTreeNode
-                End Get
-                Set(ByVal value As TreeNode)
-                    Me._RootTreeNode = value
-                End Set
-            End Property
 
-            Private _Import As Boolean
-            Public Property Import() As Boolean
-                Get
-                    Return Me._Import
-                End Get
-                Set(ByVal value As Boolean)
-                    Me._Import = value
-                End Set
-            End Property
-
-            Private _ConnectionList As Connection.List
             Public Property ConnectionList() As Connection.List
-                Get
-                    Return Me._ConnectionList
-                End Get
-                Set(ByVal value As Connection.List)
-                    Me._ConnectionList = value
-                End Set
-            End Property
 
             Private _ContainerList As Container.List
             Public Property ContainerList() As Container.List
@@ -159,30 +140,37 @@ Namespace Config
 #End Region
 
 #Region "Public Methods"
-            Public Sub Load()
-                If _UseSQL = True Then
+            Public Sub Load(ByVal import As Boolean)
+                If UseSQL Then
                     LoadFromSQL()
-                    SetMainFormText("SQL Server")
                 Else
-                    Dim strCons As String = DecryptCompleteFile()
-                    LoadFromXML(strCons)
+                    Dim connections As String = DecryptCompleteFile()
+                    LoadFromXML(connections, import)
                 End If
 
-                If Import = False Then
-                    SetMainFormText(ConnectionFileName)
-                End If
+                frmMain.UsingSqlServer = UseSQL
+                frmMain.ConnectionsFileName = ConnectionFileName
+
+                If Not import Then Putty.Sessions.AddSessionsToTree()
             End Sub
 #End Region
 
 #Region "SQL"
+            Private Delegate Sub LoadFromSqlDelegate()
             Private Sub LoadFromSQL()
+                If Windows.treeForm Is Nothing OrElse Windows.treeForm.tvConnections Is Nothing Then Return
+                If Windows.treeForm.tvConnections.InvokeRequired Then
+                    Windows.treeForm.tvConnections.Invoke(New LoadFromSqlDelegate(AddressOf LoadFromSQL))
+                    Return
+                End If
+
                 Try
-                    App.Runtime.ConnectionsFileLoaded = False
+                    IsConnectionsFileLoaded = False
 
                     If _SQLUsername <> "" Then
-                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
+                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
                     Else
-                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";Integrated Security=True")
+                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";Integrated Security=True")
                     End If
 
                     sqlCon.Open()
@@ -193,7 +181,7 @@ Namespace Config
                     sqlRd.Read()
 
                     If sqlRd.HasRows = False Then
-                        App.Runtime.SaveConnections()
+                        SaveConnections()
 
                         sqlQuery = New SqlCommand("SELECT * FROM tblRoot", sqlCon)
                         sqlRd = sqlQuery.ExecuteReader(CommandBehavior.CloseConnection)
@@ -201,43 +189,40 @@ Namespace Config
                         sqlRd.Read()
                     End If
 
-                    Dim originalCulture As System.Globalization.CultureInfo = My.Application.Culture
-                    My.Application.ChangeCulture("en-US")
-                    Me.confVersion = Convert.ToDouble(sqlRd.Item("confVersion"))
-                    My.Application.ChangeCulture(originalCulture.ToString)
+                    confVersion = Convert.ToDouble(sqlRd.Item("confVersion"), CultureInfo.InvariantCulture)
+                    Const maxSupportedSchemaVersion As Double = 2.5
+                    If confVersion > maxSupportedSchemaVersion Then
+                        cTaskDialog.ShowTaskDialogBox(frmMain, Application.ProductName, "Incompatible database schema", String.Format("The database schema on the server is not supported. Please upgrade to a newer version of {0}.", Application.ProductName), String.Format("Schema Version: {1}{0}Highest Supported Version: {2}", vbNewLine, confVersion.ToString(), maxSupportedSchemaVersion.ToString()), "", "", "", "", eTaskDialogButtons.OK, eSysIcons.Error, Nothing)
+                        Throw New Exception(String.Format("Incompatible database schema (schema version {0}).", confVersion))
+                    End If
 
-                    Dim rootNode As TreeNode
-                    rootNode = New TreeNode(sqlRd.Item("Name"))
+                    RootTreeNode.Name = sqlRd.Item("Name")
 
-                    Dim rInfo As New Root.Info(Root.Info.RootType.Connection)
-                    rInfo.Name = rootNode.Text
-                    rInfo.TreeNode = rootNode
+                    Dim rootInfo As New Root.Info(Root.Info.RootType.Connection)
+                    rootInfo.Name = RootTreeNode.Name
+                    rootInfo.TreeNode = RootTreeNode
 
-                    rootNode.Tag = rInfo
-                    rootNode.ImageIndex = Images.Enums.TreeImage.Root
-                    rootNode.SelectedImageIndex = Images.Enums.TreeImage.Root
+                    RootTreeNode.Tag = rootInfo
+                    RootTreeNode.ImageIndex = Images.Enums.TreeImage.Root
+                    RootTreeNode.SelectedImageIndex = Images.Enums.TreeImage.Root
 
                     If Security.Crypt.Decrypt(sqlRd.Item("Protected"), pW) <> "ThisIsNotProtected" Then
-                        If Authenticate(sqlRd.Item("Protected"), False, rInfo) = False Then
+                        If Authenticate(sqlRd.Item("Protected"), False, rootInfo) = False Then
                             My.Settings.LoadConsFromCustomLocation = False
                             My.Settings.CustomConsPath = ""
-                            rootNode.Remove()
+                            RootTreeNode.Remove()
                             Exit Sub
                         End If
                     End If
 
-                    'Me._RootTreeNode.Text = rootNode.Text
-                    'Me._RootTreeNode.Tag = rootNode.Tag
-                    'Me._RootTreeNode.ImageIndex = Images.Enums.TreeImage.Root
-                    'Me._RootTreeNode.SelectedImageIndex = Images.Enums.TreeImage.Root
-
                     sqlRd.Close()
 
-                    ' SECTION 3. Populate the TreeView with the DOM nodes.
-                    AddNodesFromSQL(rootNode)
-                    'AddNodeFromXML(xDom.DocumentElement, Me._RootTreeNode)
+                    Windows.treeForm.tvConnections.BeginUpdate()
 
-                    rootNode.Expand()
+                    ' SECTION 3. Populate the TreeView with the DOM nodes.
+                    AddNodesFromSQL(RootTreeNode)
+
+                    RootTreeNode.Expand()
 
                     'expand containers
                     For Each contI As Container.Info In Me._ContainerList
@@ -246,53 +231,38 @@ Namespace Config
                         End If
                     Next
 
+                    Windows.treeForm.tvConnections.EndUpdate()
+
                     'open connections from last mremote session
                     If My.Settings.OpenConsFromLastSession = True And My.Settings.NoReconnect = False Then
-                        For Each conI As Connection.Info In Me._ConnectionList
+                        For Each conI As Connection.Info In ConnectionList
                             If conI.PleaseConnect = True Then
-                                App.Runtime.OpenConnection(conI)
+                                OpenConnection(conI)
                             End If
                         Next
                     End If
 
-                    'Tree.Node.TreeView.Nodes.Clear()
-                    'Tree.Node.TreeView.Nodes.Add(rootNode)
-
-                    AddNodeToTree(rootNode)
-                    SetSelectedNode(selNode)
-
-                    App.Runtime.ConnectionsFileLoaded = True
-                    'App.Runtime.Windows.treeForm.InitialRefresh()
-
-                    sqlCon.Close()
+                    IsConnectionsFileLoaded = True
+                    Windows.treeForm.InitialRefresh()
+                    SetSelectedNode(_selectedTreeNode)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadFromSQL failed (Config.Connections.Load)" & vbNewLine & ex.Message, True)
+                    Throw
+                Finally
+                    If sqlCon IsNot Nothing Then
+                        sqlCon.Close()
+                    End If
                 End Try
             End Sub
 
-            Private Delegate Sub AddNodeToTreeCB(ByVal TreeNode As TreeNode)
-            Private Sub AddNodeToTree(ByVal TreeNode As TreeNode)
-                If Tree.Node.TreeView.InvokeRequired Then
-                    Dim d As New AddNodeToTreeCB(AddressOf AddNodeToTree)
-                    App.Runtime.Windows.treeForm.Invoke(d, New Object() {TreeNode})
-                Else
-                    App.Runtime.Windows.treeForm.tvConnections.Nodes.Clear()
-                    App.Runtime.Windows.treeForm.tvConnections.Nodes.Add(TreeNode)
-                    App.Runtime.Windows.treeForm.InitialRefresh()
+            Private Delegate Sub SetSelectedNodeDelegate(ByVal treeNode As TreeNode)
+            Private Shared Sub SetSelectedNode(ByVal treeNode As TreeNode)
+                If Tree.Node.TreeView IsNot Nothing AndAlso Tree.Node.TreeView.InvokeRequired Then
+                    Windows.treeForm.Invoke(New SetSelectedNodeDelegate(AddressOf SetSelectedNode), New Object() {treeNode})
+                    Return
                 End If
+                Windows.treeForm.tvConnections.SelectedNode = treeNode
             End Sub
 
-            Private Delegate Sub SetSelectedNodeCB(ByVal TreeNode As TreeNode)
-            Private Sub SetSelectedNode(ByVal TreeNode As TreeNode)
-                If Tree.Node.TreeView.InvokeRequired Then
-                    Dim d As New SetSelectedNodeCB(AddressOf SetSelectedNode)
-                    App.Runtime.Windows.treeForm.Invoke(d, New Object() {TreeNode})
-                Else
-                    App.Runtime.Windows.treeForm.tvConnections.SelectedNode = TreeNode
-                End If
-            End Sub
-
-
             Private Sub AddNodesFromSQL(ByVal baseNode As TreeNode)
                 Try
                     sqlCon.Open()
@@ -312,7 +282,7 @@ Namespace Config
                         If Tree.Node.GetNodeTypeFromString(sqlRd.Item("Type")) = Tree.Node.Type.Connection Then
                             Dim conI As Connection.Info = GetConnectionInfoFromSQL()
                             conI.TreeNode = tNode
-                            'conI.Parent = prevCont 'NEW
+                            'conI.Parent = _previousContainer 'NEW
 
                             Me._ConnectionList.Add(conI)
 
@@ -340,7 +310,7 @@ Namespace Config
                                 End If
 
                                 If conI.ConstantID = _PreviousSelected Then
-                                    selNode = tNode
+                                    _selectedTreeNode = tNode
                                 End If
                             Else
                                 tNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
@@ -353,7 +323,7 @@ Namespace Config
                             '        contI.Parent = tNode.Parent.Tag
                             '    End If
                             'End If
-                            'prevCont = contI 'NEW
+                            '_previousContainer = contI 'NEW
                             contI.TreeNode = tNode
 
                             contI.Name = sqlRd.Item("Name")
@@ -373,7 +343,7 @@ Namespace Config
                                 End If
 
                                 If conI.ConstantID = _PreviousSelected Then
-                                    selNode = tNode
+                                    _selectedTreeNode = tNode
                                 End If
                             Else
                                 If sqlRd.Item("Expanded") = True Then
@@ -391,7 +361,10 @@ Namespace Config
                             tNode.SelectedImageIndex = Images.Enums.TreeImage.Container
                         End If
 
-                        If sqlRd.Item("ParentID") <> 0 Then
+                        Dim parentId As String = sqlRd.Item("ParentID").ToString().Trim()
+                        If String.IsNullOrEmpty(parentId) Or parentId = "0" Then
+                            baseNode.Nodes.Add(tNode)
+                        Else
                             Dim pNode As TreeNode = Tree.Node.GetNodeFromConstantID(sqlRd.Item("ParentID"))
 
                             If pNode IsNot Nothing Then
@@ -405,14 +378,12 @@ Namespace Config
                             Else
                                 baseNode.Nodes.Add(tNode)
                             End If
-                        Else
-                            baseNode.Nodes.Add(tNode)
                         End If
 
                         'AddNodesFromSQL(tNode)
                     End While
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodesFromSQL failed (Config.Connections.Load)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strAddNodesFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -536,6 +507,39 @@ Namespace Config
                             conI.Inherit.ExtApp = .Item("InheritExtApp")
                         End If
 
+                        If Me.confVersion >= 2.2 Then
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
+                            conI.RDGatewayHostname = .Item("RDGatewayHostname")
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemoteNG.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 Me.confVersion >= 2.3 Then
+                            conI.EnableFontSmoothing = .Item("EnableFontSmoothing")
+                            conI.EnableDesktopComposition = .Item("EnableDesktopComposition")
+                            conI.Inherit.EnableFontSmoothing = .Item("InheritEnableFontSmoothing")
+                            conI.Inherit.EnableDesktopComposition = .Item("InheritEnableDesktopComposition")
+                        End If
+
+                        If confVersion >= 2.4 Then
+                            conI.UseCredSsp = .Item("UseCredSsp")
+                            conI.Inherit.UseCredSsp = .Item("InheritUseCredSsp")
+                        End If
+
+                        If confVersion >= 2.5 Then
+                            conI.LoadBalanceInfo = .Item("LoadBalanceInfo")
+                            conI.AutomaticResize = .Item("AutomaticResize")
+                            conI.Inherit.LoadBalanceInfo = .Item("InheritLoadBalanceInfo")
+                            conI.Inherit.AutomaticResize = .Item("InheritAutomaticResize")
+                        End If
+
                         If SQLUpdate = True Then
                             conI.PleaseConnect = .Item("Connected")
                         End If
@@ -543,7 +547,7 @@ Namespace Config
 
                     Return conI
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetConnectionInfoFromSQL failed (Config.Connections.Load)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strGetConnectionInfoFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Return Nothing
@@ -598,9 +602,9 @@ Namespace Config
                 Return ""
             End Function
 
-            Private Sub LoadFromXML(Optional ByVal cons As String = "")
+            Private Sub LoadFromXML(ByVal cons As String, ByVal import As Boolean)
                 Try
-                    App.Runtime.ConnectionsFileLoaded = False
+                    If Not import Then IsConnectionsFileLoaded = False
 
                     ' SECTION 1. Create a DOM Document and load the XML data into it.
                     Me.xDom = New XmlDocument()
@@ -611,65 +615,72 @@ Namespace Config
                     End If
 
                     If xDom.DocumentElement.HasAttribute("ConfVersion") Then
-                        Dim originalCulture As System.Globalization.CultureInfo = My.Application.Culture
-                        My.Application.ChangeCulture("en-US")
-                        Me.confVersion = Convert.ToDouble(xDom.DocumentElement.Attributes("ConfVersion").Value)
-                        My.Application.ChangeCulture(originalCulture.ToString)
+                        Me.confVersion = Convert.ToDouble(xDom.DocumentElement.Attributes("ConfVersion").Value.Replace(",", "."), CultureInfo.InvariantCulture)
                     Else
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, "You are trying to load a connection file that was created using an very early version of mRemote, this could result in an runtime error." & vbNewLine & "If you run into such an error, please create a new connection file!")
+                        MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strOldConffile)
+                    End If
+
+                    Const maxSupportedConfVersion As Double = 2.5
+                    If confVersion > maxSupportedConfVersion Then
+                        cTaskDialog.ShowTaskDialogBox(frmMain, Application.ProductName, "Incompatible connection file format", String.Format("The format of this connection file is not supported. Please upgrade to a newer version of {0}.", Application.ProductName), String.Format("{1}{0}File Format Version: {2}{0}Highest Supported Version: {3}", vbNewLine, ConnectionFileName, confVersion.ToString(), maxSupportedConfVersion.ToString()), "", "", "", "", eTaskDialogButtons.OK, eSysIcons.Error, Nothing)
+                        Throw New Exception(String.Format("Incompatible connection file format (file format version {0}).", confVersion))
                     End If
 
                     ' SECTION 2. Initialize the treeview control.
-                    Dim rootNode As TreeNode
+                    Dim rootInfo As Root.Info
+                    If import Then
+                        rootInfo = Nothing
+                    Else
+                        Dim rootNodeName As String = ""
+                        If xDom.DocumentElement.HasAttribute("Name") Then rootNodeName = xDom.DocumentElement.Attributes("Name").Value.Trim()
+                        If Not String.IsNullOrEmpty(rootNodeName) Then
+                            RootTreeNode.Name = rootNodeName
+                        Else
+                            RootTreeNode.Name = xDom.DocumentElement.Name
+                        End If
+                        RootTreeNode.Text = RootTreeNode.Name
 
-                    Try
-                        rootNode = New TreeNode(xDom.DocumentElement.Attributes("Name").Value)
-                    Catch ex As Exception
-                        rootNode = New TreeNode(xDom.DocumentElement.Name)
-                    End Try
+                        rootInfo = New Root.Info(Root.Info.RootType.Connection)
+                        rootInfo.Name = RootTreeNode.Name
+                        rootInfo.TreeNode = RootTreeNode
 
-                    Dim rInfo As New Root.Info(Root.Info.RootType.Connection)
-                    rInfo.Name = rootNode.Text
-                    rInfo.TreeNode = rootNode
-
-                    rootNode.Tag = rInfo
+                        RootTreeNode.Tag = rootInfo
+                    End If
 
                     If Me.confVersion > 1.3 Then '1.4
                         If Security.Crypt.Decrypt(xDom.DocumentElement.Attributes("Protected").Value, pW) <> "ThisIsNotProtected" Then
-                            If Authenticate(xDom.DocumentElement.Attributes("Protected").Value, False, rInfo) = False Then
+                            If Authenticate(xDom.DocumentElement.Attributes("Protected").Value, False, rootInfo) = False Then
                                 My.Settings.LoadConsFromCustomLocation = False
                                 My.Settings.CustomConsPath = ""
-                                rootNode.Remove()
+                                RootTreeNode.Remove()
                                 Exit Sub
                             End If
                         End If
                     End If
 
-                    Dim imp As Boolean = False
-
-                    If Me.confVersion > 0.9 Then '1.0
+                    Dim isExportFile As Boolean = False
+                    If confVersion >= 1.0 Then
                         If xDom.DocumentElement.Attributes("Export").Value = True Then
-                            imp = True
+                            isExportFile = True
                         End If
                     End If
 
-                    If Me._Import = True And imp = False Then
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, "You cannot import a normal connection file." & vbNewLine & "Please use File - Load Connections for normal connection files!")
-
-                        Exit Sub
+                    If import And Not isExportFile Then
+                        MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strCannotImportNormalSessionFile)
+                        Return
                     End If
 
-                    If imp = False Then
-                        Me._RootTreeNode.Text = rootNode.Text
-                        Me._RootTreeNode.Tag = rootNode.Tag
-                        Me._RootTreeNode.ImageIndex = Images.Enums.TreeImage.Root
-                        Me._RootTreeNode.SelectedImageIndex = Images.Enums.TreeImage.Root
+                    If Not isExportFile Then
+                        RootTreeNode.ImageIndex = Images.Enums.TreeImage.Root
+                        RootTreeNode.SelectedImageIndex = Images.Enums.TreeImage.Root
                     End If
 
+                    Windows.treeForm.tvConnections.BeginUpdate()
+
                     ' SECTION 3. Populate the TreeView with the DOM nodes.
-                    AddNodeFromXML(xDom.DocumentElement, Me._RootTreeNode)
+                    AddNodeFromXml(xDom.DocumentElement, RootTreeNode)
 
-                    Me._RootTreeNode.Expand()
+                    RootTreeNode.Expand()
 
                     'expand containers
                     For Each contI As Container.Info In Me._ContainerList
@@ -678,105 +689,109 @@ Namespace Config
                         End If
                     Next
 
+                    Windows.treeForm.tvConnections.EndUpdate()
+
                     'open connections from last mremote session
                     If My.Settings.OpenConsFromLastSession = True And My.Settings.NoReconnect = False Then
-                        For Each conI As Connection.Info In Me._ConnectionList
+                        For Each conI As Connection.Info In _ConnectionList
                             If conI.PleaseConnect = True Then
-                                App.Runtime.OpenConnection(conI)
+                                OpenConnection(conI)
                             End If
                         Next
                     End If
 
-                    Me._RootTreeNode.EnsureVisible()
+                    RootTreeNode.EnsureVisible()
 
-                    App.Runtime.ConnectionsFileLoaded = True
-                    App.Runtime.Windows.treeForm.InitialRefresh()
+                    If Not import Then IsConnectionsFileLoaded = True
+                    Windows.treeForm.InitialRefresh()
+                    SetSelectedNode(RootTreeNode)
                 Catch ex As Exception
-                    App.Runtime.ConnectionsFileLoaded = False
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadFromXML failed" & vbNewLine & ex.Message, True)
+                    App.Runtime.IsConnectionsFileLoaded = False
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLoadFromXmlFailed & vbNewLine & ex.Message & vbNewLine & ex.StackTrace, True)
+                    Throw
                 End Try
             End Sub
 
-            Private prevCont As Container.Info
-            Private Sub AddNodeFromXML(ByRef inXmlNode As XmlNode, ByRef inTreeNode As TreeNode)
+            Private _previousContainer As Container.Info
+            Private Sub AddNodeFromXml(ByRef parentXmlNode As XmlNode, ByRef parentTreeNode As TreeNode)
                 Try
-                    Dim i As Integer
-
-                    Dim xNode As XmlNode
-                    Dim xNodeList As XmlNodeList
-                    Dim tNode As TreeNode
-
                     ' Loop through the XML nodes until the leaf is reached.
                     ' Add the nodes to the TreeView during the looping process.
-                    If inXmlNode.HasChildNodes() Then
-                        xNodeList = inXmlNode.ChildNodes
-                        For i = 0 To xNodeList.Count - 1
-                            xNode = xNodeList(i)
-                            inTreeNode.Nodes.Add(New TreeNode(xNode.Attributes("Name").Value))
-                            tNode = inTreeNode.Nodes(i)
+                    If parentXmlNode.HasChildNodes() Then
+                        For Each xmlNode As XmlNode In parentXmlNode.ChildNodes
+                            Dim treeNode As TreeNode = New TreeNode(xmlNode.Attributes("Name").Value)
+                            parentTreeNode.Nodes.Add(treeNode)
 
-                            If Tree.Node.GetNodeTypeFromString(xNode.Attributes("Type").Value) = Tree.Node.Type.Connection Then 'connection info
-                                Dim conI As Connection.Info = GetConnectionInfoFromXml(xNode)
-                                conI.TreeNode = tNode
-                                conI.Parent = prevCont 'NEW
+                            If Tree.Node.GetNodeTypeFromString(xmlNode.Attributes("Type").Value) = Tree.Node.Type.Connection Then 'connection info
+                                Dim connectionInfo As Connection.Info = GetConnectionInfoFromXml(xmlNode)
+                                connectionInfo.TreeNode = treeNode
+                                connectionInfo.Parent = _previousContainer 'NEW
 
-                                Me._ConnectionList.Add(conI)
+                                ConnectionList.Add(connectionInfo)
 
-                                tNode.Tag = conI
-                                tNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
-                                tNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
-                            ElseIf Tree.Node.GetNodeTypeFromString(xNode.Attributes("Type").Value) = Tree.Node.Type.Container Then  'container info
-                                Dim contI As New Container.Info
-                                If tNode.Parent IsNot Nothing Then
-                                    If Tree.Node.GetNodeType(tNode.Parent) = Tree.Node.Type.Container Then
-                                        contI.Parent = tNode.Parent.Tag
+                                treeNode.Tag = connectionInfo
+                                treeNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                                treeNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                            ElseIf Tree.Node.GetNodeTypeFromString(xmlNode.Attributes("Type").Value) = Tree.Node.Type.Container Then  'container info
+                                Dim containerInfo As New Container.Info
+                                If treeNode.Parent IsNot Nothing Then
+                                    If Tree.Node.GetNodeType(treeNode.Parent) = Tree.Node.Type.Container Then
+                                        containerInfo.Parent = treeNode.Parent.Tag
                                     End If
                                 End If
-                                prevCont = contI 'NEW
-                                contI.TreeNode = tNode
+                                _previousContainer = containerInfo 'NEW
+                                containerInfo.TreeNode = treeNode
 
-                                contI.Name = xNode.Attributes("Name").Value
+                                containerInfo.Name = xmlNode.Attributes("Name").Value
 
-                                If Me.confVersion > 0.7 Then '0.8
-                                    If xNode.Attributes("Expanded").Value = "True" Then
-                                        contI.IsExpanded = True
+                                If confVersion >= 0.8 Then
+                                    If xmlNode.Attributes("Expanded").Value = "True" Then
+                                        containerInfo.IsExpanded = True
                                     Else
-                                        contI.IsExpanded = False
+                                        containerInfo.IsExpanded = False
                                     End If
                                 End If
 
-                                Dim conI As Connection.Info
-                                If Me.confVersion > 0.8 Then '0.9
-                                    conI = GetConnectionInfoFromXml(xNode)
+                                Dim connectionInfo As Connection.Info
+                                If confVersion >= 0.9 Then
+                                    connectionInfo = GetConnectionInfoFromXml(xmlNode)
                                 Else
-                                    conI = New Connection.Info
+                                    connectionInfo = New Connection.Info
                                 End If
 
-                                conI.Parent = contI
-                                conI.IsContainer = True
-                                contI.ConnectionInfo = conI
+                                connectionInfo.Parent = containerInfo
+                                connectionInfo.IsContainer = True
+                                containerInfo.ConnectionInfo = connectionInfo
 
-                                Me._ContainerList.Add(contI)
+                                ContainerList.Add(containerInfo)
 
-                                tNode.Tag = contI
-                                tNode.ImageIndex = Images.Enums.TreeImage.Container
-                                tNode.SelectedImageIndex = Images.Enums.TreeImage.Container
+                                treeNode.Tag = containerInfo
+                                treeNode.ImageIndex = Images.Enums.TreeImage.Container
+                                treeNode.SelectedImageIndex = Images.Enums.TreeImage.Container
                             End If
 
-                            AddNodeFromXML(xNode, tNode)
+                            AddNodeFromXml(xmlNode, treeNode)
                         Next
                     Else
-                        inTreeNode.Text = inXmlNode.Attributes("Name").Value.Trim
+                        Dim nodeName As String = ""
+                        Dim nameAttribute As XmlAttribute = parentXmlNode.Attributes("Name")
+                        If Not IsNothing(nameAttribute) Then nodeName = nameAttribute.Value.Trim()
+                        If Not String.IsNullOrEmpty(nodeName) Then
+                            parentTreeNode.Text = nodeName
+                        Else
+                            parentTreeNode.Text = parentXmlNode.Name
+                        End If
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeFromXML failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strAddNodeFromXmlFailed & vbNewLine & ex.Message & ex.StackTrace, True)
+                    Throw
                 End Try
             End Sub
 
             Private Function GetConnectionInfoFromXml(ByVal xxNode As XmlNode) As Connection.Info
-                Try
-                    Dim conI As New Connection.Info
+                Dim conI As New Connection.Info
 
+                Try
                     With xxNode
                         If Me.confVersion > 0.1 Then '0.2
                             conI.Name = .Attributes("Name").Value
@@ -872,6 +887,8 @@ Namespace Config
                                     conI.Colors = Connection.Protocol.RDP.RDPColors.Colors24Bit
                                 Case 3
                                     conI.Colors = Connection.Protocol.RDP.RDPColors.Colors32Bit
+                                Case 4
+                                    conI.Colors = Connection.Protocol.RDP.RDPColors.Colors15Bit
                             End Select
 
                             conI.RedirectSound = .Attributes("RedirectSound").Value
@@ -907,7 +924,7 @@ Namespace Config
                             conI.Inherit = New Connection.Info.Inheritance(conI, .Attributes("Inherit").Value)
 
                             conI.Icon = .Attributes("Icon").Value.Replace(".ico", "")
-                            conI.Panel = "General"
+                            conI.Panel = My.Language.strGeneral
                         End If
 
                         If Me.confVersion > 1.4 Then '1.5
@@ -915,7 +932,7 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.5 Then '1.6
-                            conI.ICAEncryption = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.ICA.EncryptionStrength), .Attributes("ICAEncryptionStrength").Value)
+                            conI.ICAEncryption = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.ICA.EncryptionStrength), .Attributes("ICAEncryptionStrength").Value)
                             conI.Inherit.ICAEncryption = .Attributes("InheritICAEncryptionStrength").Value
 
                             conI.PreExtApp = .Attributes("PreExtApp").Value
@@ -925,16 +942,16 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.6 Then '1.7
-                            conI.VNCCompression = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Compression), .Attributes("VNCCompression").Value)
-                            conI.VNCEncoding = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Encoding), .Attributes("VNCEncoding").Value)
-                            conI.VNCAuthMode = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.AuthMode), .Attributes("VNCAuthMode").Value)
-                            conI.VNCProxyType = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.ProxyType), .Attributes("VNCProxyType").Value)
+                            conI.VNCCompression = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Compression), .Attributes("VNCCompression").Value)
+                            conI.VNCEncoding = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Encoding), .Attributes("VNCEncoding").Value)
+                            conI.VNCAuthMode = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.AuthMode), .Attributes("VNCAuthMode").Value)
+                            conI.VNCProxyType = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.ProxyType), .Attributes("VNCProxyType").Value)
                             conI.VNCProxyIP = .Attributes("VNCProxyIP").Value
                             conI.VNCProxyPort = .Attributes("VNCProxyPort").Value
                             conI.VNCProxyUsername = .Attributes("VNCProxyUsername").Value
                             conI.VNCProxyPassword = Security.Crypt.Decrypt(.Attributes("VNCProxyPassword").Value, pW)
-                            conI.VNCColors = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Colors), .Attributes("VNCColors").Value)
-                            conI.VNCSmartSizeMode = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.SmartSizeMode), .Attributes("VNCSmartSizeMode").Value)
+                            conI.VNCColors = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Colors), .Attributes("VNCColors").Value)
+                            conI.VNCSmartSizeMode = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.SmartSizeMode), .Attributes("VNCSmartSizeMode").Value)
                             conI.VNCViewOnly = .Attributes("VNCViewOnly").Value
 
                             conI.Inherit.VNCCompression = .Attributes("InheritVNCCompression").Value
@@ -951,13 +968,13 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.7 Then '1.8
-                            conI.RDPAuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.AuthenticationLevel), .Attributes("RDPAuthenticationLevel").Value)
+                            conI.RDPAuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.AuthenticationLevel), .Attributes("RDPAuthenticationLevel").Value)
 
                             conI.Inherit.RDPAuthenticationLevel = .Attributes("InheritRDPAuthenticationLevel").Value
                         End If
 
                         If Me.confVersion > 1.8 Then '1.9
-                            conI.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.HTTPBase.RenderingEngine), .Attributes("RenderingEngine").Value)
+                            conI.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.HTTPBase.RenderingEngine), .Attributes("RenderingEngine").Value)
                             conI.MacAddress = .Attributes("MacAddress").Value
 
                             conI.Inherit.RenderingEngine = .Attributes("InheritRenderingEngine").Value
@@ -973,19 +990,64 @@ Namespace Config
                             conI.ExtApp = .Attributes("ExtApp").Value
                             conI.Inherit.ExtApp = .Attributes("InheritExtApp").Value
                         End If
-                    End With
 
-                    Return conI
+                        If Me.confVersion > 2.1 Then '2.2
+                            ' Get settings
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value)
+                            conI.RDGatewayHostname = .Attributes("RDGatewayHostname").Value
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemoteNG.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
+
+                            ' Get inheritance settings
+                            conI.Inherit.RDGatewayUsageMethod = .Attributes("InheritRDGatewayUsageMethod").Value
+                            conI.Inherit.RDGatewayHostname = .Attributes("InheritRDGatewayHostname").Value
+                            conI.Inherit.RDGatewayUseConnectionCredentials = .Attributes("InheritRDGatewayUseConnectionCredentials").Value
+                            conI.Inherit.RDGatewayUsername = .Attributes("InheritRDGatewayUsername").Value
+                            conI.Inherit.RDGatewayPassword = .Attributes("InheritRDGatewayPassword").Value
+                            conI.Inherit.RDGatewayDomain = .Attributes("InheritRDGatewayDomain").Value
+                        End If
+
+                        If Me.confVersion > 2.2 Then '2.3
+                            ' Get settings
+                            conI.EnableFontSmoothing = .Attributes("EnableFontSmoothing").Value
+                            conI.EnableDesktopComposition = .Attributes("EnableDesktopComposition").Value
+
+                            ' Get inheritance settings
+                            conI.Inherit.EnableFontSmoothing = .Attributes("InheritEnableFontSmoothing").Value
+                            conI.Inherit.EnableDesktopComposition = .Attributes("InheritEnableDesktopComposition").Value
+                        End If
+
+                        If confVersion >= 2.4 Then
+                            conI.UseCredSsp = .Attributes("UseCredSsp").Value
+                            conI.Inherit.UseCredSsp = .Attributes("InheritUseCredSsp").Value
+                        End If
+
+                        If confVersion >= 2.5 Then
+                            conI.LoadBalanceInfo = .Attributes("LoadBalanceInfo").Value
+                            conI.AutomaticResize = .Attributes("AutomaticResize").Value
+                            conI.Inherit.LoadBalanceInfo = .Attributes("InheritLoadBalanceInfo").Value
+                            conI.Inherit.AutomaticResize = .Attributes("InheritAutomaticResize").Value
+                        End If
+                    End With
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetConnectionInfoFromXml failed" & vbNewLine & ex.Message, True)
-                    Return Nothing
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Language.strGetConnectionInfoFromXmlFailed, conI.Name, Me.ConnectionFileName, ex.Message), False)
                 End Try
+                Return conI
             End Function
 
-            Private Function Authenticate(ByVal Value As String, ByVal CompareToOriginalValue As Boolean, Optional ByVal RootInfo As mRemote.Root.Info = Nothing) As Boolean
+            Private Function Authenticate(ByVal Value As String, ByVal CompareToOriginalValue As Boolean, Optional ByVal rootInfo As Root.Info = Nothing) As Boolean
+                Dim passwordName As String
+                If UseSQL Then
+                    passwordName = Language.strSQLServer.TrimEnd(":")
+                Else
+                    passwordName = Path.GetFileName(ConnectionFileName)
+                End If
+
                 If CompareToOriginalValue Then
                     Do Until Security.Crypt.Decrypt(Value, pW) <> Value
-                        pW = Tools.Misc.PasswordDialog(False)
+                        pW = Tools.Misc.PasswordDialog(passwordName, False)
 
                         If pW = "" Then
                             Return False
@@ -993,15 +1055,17 @@ Namespace Config
                     Loop
                 Else
                     Do Until Security.Crypt.Decrypt(Value, pW) = "ThisIsProtected"
-                        pW = Tools.Misc.PasswordDialog(False)
+                        pW = Tools.Misc.PasswordDialog(passwordName, False)
 
                         If pW = "" Then
                             Return False
                         End If
                     Loop
 
-                    RootInfo.Password = True
-                    RootInfo.PasswordString = pW
+                    If rootInfo IsNot Nothing Then
+                        rootInfo.Password = True
+                        rootInfo.PasswordString = pW
+                    End If
                 End If
 
                 Return True

mRemoteV1/Config/Config.Settings.Load.vb

@@ -1,7 +1,8 @@
 Imports System.IO
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Xml
+Imports System.Environment
 
 Namespace Config
     Namespace Settings
@@ -26,46 +27,75 @@ Namespace Config
             Public Sub Load()
                 Try
                     With Me._MainForm
+                        ' Migrate settings from previous version
                         If My.Settings.DoUpgrade Then
-                            My.Settings.Upgrade()
+                            Try
+                                My.Settings.Upgrade()
+                            Catch ex As Exception
+                                Log.Error("My.Settings.Upgrade() failed" & vbNewLine & ex.Message)
+                            End Try
                             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
-                            .Location = My.Settings.MainFormLocation
+                        App.SupportedCultures.InstantiateSingleton()
+                        If Not My.Settings.OverrideUICulture = "" And App.SupportedCultures.IsNameSupported(My.Settings.OverrideUICulture) Then
+                            Threading.Thread.CurrentThread.CurrentUICulture = New Globalization.CultureInfo(My.Settings.OverrideUICulture)
+                            log.InfoFormat("Override Culture: {0}/{1}", Threading.Thread.CurrentThread.CurrentUICulture.Name, Threading.Thread.CurrentThread.CurrentUICulture.NativeName)
                         End If
 
-                        If My.Settings.MainFormSize <> Nothing Then
-                            .Size = My.Settings.MainFormSize
-                        End If
+                        Themes.ThemeManager.LoadTheme(My.Settings.ThemeName)
 
-                        'check if form is visible
-                        Dim curScreen As Screen = Screen.FromHandle(.Handle)
-
-                        If .Right < curScreen.Bounds.Left Or .Left > curScreen.Bounds.Right _
-                            Or .Top * -1 > curScreen.Bounds.Top * -1 Or .Bottom > curScreen.Bounds.Bottom Then
-                            .Location = curScreen.Bounds.Location
-                        End If
-
-
-                        If My.Settings.MainFormState = Nothing Or My.Settings.MainFormState = FormWindowState.Minimized Then
-                            .WindowState = FormWindowState.Normal
+                        .WindowState = FormWindowState.Normal
+                        If My.Settings.MainFormState = FormWindowState.Normal Then
+                            If Not My.Settings.MainFormLocation.IsEmpty Then .Location = My.Settings.MainFormLocation
+                            If Not My.Settings.MainFormSize.IsEmpty Then .Size = My.Settings.MainFormSize
                         Else
-                            .WindowState = My.Settings.MainFormState
+                            If Not My.Settings.MainFormRestoreLocation.IsEmpty Then .Location = My.Settings.MainFormRestoreLocation
+                            If Not My.Settings.MainFormRestoreSize.IsEmpty Then .Size = My.Settings.MainFormRestoreSize
                         End If
+                        If My.Settings.MainFormState = FormWindowState.Maximized Then
+                            .WindowState = FormWindowState.Maximized
+                        End If
+
+                        ' Make sure the form is visible on the screen
+                        Const minHorizontal As Integer = 300
+                        Const minVertical As Integer = 150
+                        Dim screenBounds As Drawing.Rectangle = Screen.FromHandle(.Handle).Bounds
+                        Dim newBounds As Drawing.Rectangle = .Bounds
+
+                        If newBounds.Right < screenBounds.Left + minHorizontal Then
+                            newBounds.X = screenBounds.Left + minHorizontal - newBounds.Width
+                        End If
+                        If newBounds.Left > screenBounds.Right - minHorizontal Then
+                            newBounds.X = screenBounds.Right - minHorizontal
+                        End If
+                        If newBounds.Bottom < screenBounds.Top + minVertical Then
+                            newBounds.Y = screenBounds.Top + minVertical - newBounds.Height
+                        End If
+                        If newBounds.Top > screenBounds.Bottom - minVertical Then
+                            newBounds.Y = screenBounds.Bottom - minVertical
+                        End If
+
+                        .Location = newBounds.Location
 
                         If My.Settings.MainFormKiosk = True Then
-                            Tools.Misc.Fullscreen.EnterFullscreen()
+                            .Fullscreen.Value = True
+                            .mMenViewFullscreen.Checked = True
                         End If
 
                         If My.Settings.UseCustomPuttyPath Then
                             Connection.Protocol.PuttyBase.PuttyPath = My.Settings.CustomPuttyPath
                         Else
-                            Connection.Protocol.PuttyBase.PuttyPath = My.Application.Info.DirectoryPath & "\Putty.exe"
+                            Connection.Protocol.PuttyBase.PuttyPath = App.Info.General.PuttyPath
                         End If
 
                         If My.Settings.ShowSystemTrayIcon Then
-                            App.Runtime.SysTrayIcon = New Tools.Controls.SysTrayIcon()
+                            App.Runtime.NotificationAreaIcon = New Tools.Controls.NotificationAreaIcon()
                         End If
 
                         If My.Settings.AutoSaveEveryMinutes > 0 Then
@@ -78,15 +108,18 @@ Namespace Config
                         Me.LoadPanelsFromXML()
                         Me.LoadExternalAppsFromXML()
 
+                        If My.Settings.AlwaysShowPanelTabs Then
+                            frmMain.pnlDock.DocumentStyle = DocumentStyle.DockingWindow
+                        End If
+
                         If My.Settings.ResetToolbars = False Then
-                            Me.LoadToolbarsFromSettings()
+                            LoadToolbarsFromSettings()
                         Else
-                            Me.SetToolbarsDefault()
+                            SetToolbarsDefault()
                         End If
                     End With
                 Catch ex As Exception
-                    App.Runtime.log.Error("Loading settings failed" & vbNewLine & ex.Message)
-                    'mC.AddMessage(Messages.MessageClass.ErrorMsg, "Loading settings failed" & vbNewLine & ex.Message, True)
+                    Log.Error("Loading settings failed" & vbNewLine & ex.Message)
                 End Try
             End Sub
 
@@ -94,8 +127,8 @@ Namespace Config
                 With MainForm
                     ToolStripPanelFromString("top").Join(.tsQuickConnect, New Point(300, 0))
                     .tsQuickConnect.Visible = True
-                    ToolStripPanelFromString("bottom").Join(.tsExtAppsToolbar, New Point(3, 0))
-                    .tsExtAppsToolbar.Visible = False
+                    ToolStripPanelFromString("bottom").Join(.tsExternalTools, New Point(3, 0))
+                    .tsExternalTools.Visible = False
                 End With
             End Sub
 
@@ -120,8 +153,8 @@ Namespace Config
 
             Private Sub AddDynamicPanels()
                 With MainForm
-                    ToolStripPanelFromString(My.Settings.ExtAppsTBParentDock).Join(.tsExtAppsToolbar, My.Settings.ExtAppsTBLocation)
-                    .tsExtAppsToolbar.Visible = My.Settings.ExtAppsTBVisible
+                    ToolStripPanelFromString(My.Settings.ExtAppsTBParentDock).Join(.tsExternalTools, My.Settings.ExtAppsTBLocation)
+                    .tsExternalTools.Visible = My.Settings.ExtAppsTBVisible
                 End With
             End Sub
 
@@ -152,33 +185,41 @@ 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)
+                        Dim oldPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName & "\" & App.Info.Settings.LayoutFileName
+                        Dim newPath As String = App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName
+                        If File.Exists(newPath) Then
+                            .pnlDock.LoadFromXml(newPath, AddressOf GetContentFromPersistString)
+#If Not PORTABLE Then
+                        ElseIf File.Exists(oldPath) Then
+                            .pnlDock.LoadFromXml(oldPath, AddressOf GetContentFromPersistString)
+#End If
                         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)
-                    'mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadPanelsFromXML failed" & vbNewLine & ex.Message, True)
+                    Log.Error("LoadPanelsFromXML failed" & vbNewLine & ex.Message)
                 End Try
             End Sub
 
             Public Sub LoadExternalAppsFromXML()
-                If File.Exists(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName) = False Then
+                Dim oldPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName & "\" & App.Info.Settings.ExtAppsFilesName
+                Dim newPath As String = App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName
+                Dim xDom As New XmlDocument()
+                If File.Exists(newPath) Then
+                    xDom.Load(newPath)
+#If Not PORTABLE Then
+                ElseIf File.Exists(oldPath) Then
+                    xDom.Load(oldPath)
+#End If
+                Else
                     Exit Sub
                 End If
 
-                Dim xDom As New XmlDocument()
-                xDom.Load(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName)
-
                 For Each xEl As XmlElement In xDom.DocumentElement.ChildNodes
-                    Dim extA As New Tools.ExternalApp
+                    Dim extA As New Tools.ExternalTool
                     extA.DisplayName = xEl.Attributes("DisplayName").Value
                     extA.FileName = xEl.Attributes("FileName").Value
                     extA.Arguments = xEl.Attributes("Arguments").Value
@@ -191,19 +232,24 @@ Namespace Config
                         extA.TryIntegrate = xEl.Attributes("TryToIntegrate").Value
                     End If
 
-                    ExtApps.Add(extA)
+                    ExternalTools.Add(extA)
                 Next
 
-                MainForm.SwitchToolbarText(My.Settings.ExtAppsTBShowText)
+                MainForm.SwitchToolBarText(My.Settings.ExtAppsTBShowText)
 
                 xDom = Nothing
 
-                frmMain.AddExtAppsToToolbar()
+                frmMain.AddExternalToolsToToolBar()
             End Sub
 #End Region
 
 #Region "Private Methods"
             Private Function GetContentFromPersistString(ByVal persistString As String) As IDockContent
+                ' pnlLayout.xml persistence XML fix for refactoring to mRemoteNG
+                If (persistString.StartsWith("mRemote.")) Then
+                    persistString = persistString.Replace("mRemote.", "mRemoteNG.")
+                End If
+
                 Try
                     If persistString = GetType(UI.Window.Config).ToString Then
                         Return Windows.configPanel
@@ -225,8 +271,7 @@ Namespace Config
                         Return Windows.screenshotPanel
                     End If
                 Catch ex As Exception
-                    App.Runtime.log.Error("GetContentFromPersistString failed" & vbNewLine & ex.Message)
-                    'mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetContentFromPersistString failed" & vbNewLine & ex.Message, True)
+                    Log.Error("GetContentFromPersistString failed" & vbNewLine & ex.Message)
                 End Try
 
                 Return Nothing

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
 
@@ -65,12 +63,12 @@ Namespace Config
 
                 Public Overrides Function GetPropertyValues(ByVal context As SettingsContext, ByVal props As SettingsPropertyCollection) As SettingsPropertyValueCollection
                     'Create new collection of values
-                    Dim values As SettingsPropertyValueCollection = New SettingsPropertyValueCollection()
+                    Dim values As New SettingsPropertyValueCollection()
 
                     'Iterate through the settings to be retrieved
                     For Each setting As SettingsProperty In props
 
-                        Dim value As SettingsPropertyValue = New SettingsPropertyValue(setting)
+                        Dim value As New SettingsPropertyValue(setting)
                         value.IsDirty = False
                         value.SerializedValue = GetValue(setting)
                         values.Add(value)
@@ -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/Config/Config.Settings.Save.vb

@@ -1,52 +1,42 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Xml
 Imports System.IO
 
 Namespace Config
     Namespace Settings
         Public Class Save
-#Region "Public Properties"
-            Private _MainForm As frmMain
-            Public Property MainForm() As frmMain
-                Get
-                    Return Me._MainForm
-                End Get
-                Set(ByVal value As frmMain)
-                    Me._MainForm = value
-                End Set
-            End Property
-#End Region
-
 #Region "Public Methods"
-            Public Sub New(ByVal MainForm As frmMain)
-                Me._MainForm = MainForm
-            End Sub
-
-            Public Sub Save()
+            Public Shared Sub Save()
                 Try
-                    With Me._MainForm
-                        If .WindowState = FormWindowState.Normal Then
-                            My.Settings.MainFormLocation = .Location
-                            My.Settings.MainFormSize = .Size
-                        Else
-                            My.Settings.MainFormLocation = .RestoreBounds.Location
-                            My.Settings.MainFormSize = .RestoreBounds.Size
+                    With frmMain
+                        Dim windowPlacement As New Tools.WindowPlacement(frmMain)
+                        If .WindowState = FormWindowState.Minimized And windowPlacement.RestoreToMaximized Then
+                            .Opacity = 0
+                            .WindowState = FormWindowState.Maximized
+                        End If
+
+                        My.Settings.MainFormLocation = .Location
+                        My.Settings.MainFormSize = .Size
+
+                        If Not .WindowState = FormWindowState.Normal Then
+                            My.Settings.MainFormRestoreLocation = .RestoreBounds.Location
+                            My.Settings.MainFormRestoreSize = .RestoreBounds.Size
                         End If
 
                         My.Settings.MainFormState = .WindowState
 
-                        My.Settings.MainFormKiosk = Tools.Misc.Fullscreen.FullscreenActive
+                        My.Settings.MainFormKiosk = .Fullscreen.Value
 
                         My.Settings.FirstStart = False
                         My.Settings.ResetPanels = False
                         My.Settings.ResetToolbars = False
                         My.Settings.NoReconnect = False
 
-                        My.Settings.ExtAppsTBLocation = .tsExtAppsToolbar.Location
-                        If .tsExtAppsToolbar.Parent IsNot Nothing Then
-                            My.Settings.ExtAppsTBParentDock = .tsExtAppsToolbar.Parent.Dock.ToString
+                        My.Settings.ExtAppsTBLocation = .tsExternalTools.Location
+                        If .tsExternalTools.Parent IsNot Nothing Then
+                            My.Settings.ExtAppsTBParentDock = .tsExternalTools.Parent.Dock.ToString
                         End If
-                        My.Settings.ExtAppsTBVisible = .tsExtAppsToolbar.Visible
+                        My.Settings.ExtAppsTBVisible = .tsExternalTools.Visible
                         My.Settings.ExtAppsTBShowText = .cMenToolbarShowText.Checked
 
                         My.Settings.QuickyTBLocation = .tsQuickConnect.Location
@@ -55,64 +45,59 @@ Namespace Config
                         End If
                         My.Settings.QuickyTBVisible = .tsQuickConnect.Visible
 
-                        If App.Editions.Spanlink.Enabled = False Then
-                            My.Settings.ConDefaultPassword = Security.Crypt.Encrypt(My.Settings.ConDefaultPassword, App.Info.General.EncryptionKey)
-                        Else
-                            My.Settings.LoadConsFromCustomLocation = False
-                            My.Settings.CustomConsPath = ""
-                        End If
+                        My.Settings.ConDefaultPassword = Security.Crypt.Encrypt(My.Settings.ConDefaultPassword, App.Info.General.EncryptionKey)
 
                         My.Settings.Save()
                     End With
 
-                    Me.SavePanelsToXML()
-                    Me.SaveExternalAppsToXML()
+                    SavePanelsToXML()
+                    SaveExternalAppsToXML()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" & vbNewLine & vbNewLine & ex.Message, False)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" & vbNewLine & vbNewLine & ex.Message, False)
                 End Try
             End Sub
 
-            Public Sub SavePanelsToXML()
+            Public Shared Sub SavePanelsToXML()
                 Try
                     If Directory.Exists(App.Info.Settings.SettingsPath) = False Then
                         Directory.CreateDirectory(App.Info.Settings.SettingsPath)
                     End If
 
-                    MainForm.pnlDock.SaveAsXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName)
+                    frmMain.pnlDock.SaveAsXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "SavePanelsToXML failed" & vbNewLine & vbNewLine & ex.Message, False)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SavePanelsToXML failed" & vbNewLine & vbNewLine & ex.Message, False)
                 End Try
             End Sub
 
-            Public Sub SaveExternalAppsToXML()
+            Public Shared Sub SaveExternalAppsToXML()
                 Try
                     If Directory.Exists(App.Info.Settings.SettingsPath) = False Then
                         Directory.CreateDirectory(App.Info.Settings.SettingsPath)
                     End If
 
-                    Dim xW As New XmlTextWriter(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName, System.Text.Encoding.UTF8)
-                    xW.Formatting = Formatting.Indented
-                    xW.Indentation = 4
+                    Dim xmlTextWriter As New XmlTextWriter(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName, System.Text.Encoding.UTF8)
+                    xmlTextWriter.Formatting = Formatting.Indented
+                    xmlTextWriter.Indentation = 4
 
-                    xW.WriteStartDocument()
-                    xW.WriteStartElement("Apps")
+                    xmlTextWriter.WriteStartDocument()
+                    xmlTextWriter.WriteStartElement("Apps")
 
-                    For Each extA As Tools.ExternalApp In ExtApps
-                        xW.WriteStartElement("App")
-                        xW.WriteAttributeString("DisplayName", "", extA.DisplayName)
-                        xW.WriteAttributeString("FileName", "", extA.FileName)
-                        xW.WriteAttributeString("Arguments", "", extA.Arguments)
-                        xW.WriteAttributeString("WaitForExit", "", extA.WaitForExit)
-                        xW.WriteAttributeString("TryToIntegrate", "", extA.TryIntegrate)
-                        xW.WriteEndElement()
+                    For Each extA As Tools.ExternalTool In ExternalTools
+                        xmlTextWriter.WriteStartElement("App")
+                        xmlTextWriter.WriteAttributeString("DisplayName", "", extA.DisplayName)
+                        xmlTextWriter.WriteAttributeString("FileName", "", extA.FileName)
+                        xmlTextWriter.WriteAttributeString("Arguments", "", extA.Arguments)
+                        xmlTextWriter.WriteAttributeString("WaitForExit", "", extA.WaitForExit)
+                        xmlTextWriter.WriteAttributeString("TryToIntegrate", "", extA.TryIntegrate)
+                        xmlTextWriter.WriteEndElement()
                     Next
 
-                    xW.WriteEndElement()
-                    xW.WriteEndDocument()
+                    xmlTextWriter.WriteEndElement()
+                    xmlTextWriter.WriteEndDocument()
 
-                    xW.Close()
+                    xmlTextWriter.Close()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveExternalAppsToXML failed" & vbNewLine & vbNewLine & ex.Message, False)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveExternalAppsToXML failed" & vbNewLine & vbNewLine & ex.Message, False)
                 End Try
             End Sub
 #End Region

mRemoteV1/Config/ConfirmClose.vb

@@ -0,0 +1,9 @@
+Namespace Config
+    Public Enum ConfirmClose
+        Unspecified = 0
+        Never = 1
+        [Exit] = 2
+        Multiple = 3
+        All = 4
+    End Enum
+End Namespace

mRemoteV1/Config/Import/ActiveDirectory.vb

@@ -0,0 +1,97 @@
+Imports System.DirectoryServices
+Imports mRemoteNG.App.Runtime
+Imports System.Text.RegularExpressions
+Imports mRemoteNG.My
+
+Namespace Config.Import
+    Public Class ActiveDirectory
+        Public Shared Sub Import(ByVal ldapPath As String, ByVal parentTreeNode As TreeNode)
+            Try
+                Dim treeNode As TreeNode = Tree.Node.AddNode(Tree.Node.Type.Container)
+
+                Dim containerInfo As New Container.Info()
+                containerInfo.TreeNode = treeNode
+                containerInfo.ConnectionInfo = New Connection.Info(containerInfo)
+
+                Dim name As String
+                Dim match As Match = Regex.Match(ldapPath, "ou=([^,]*)", RegexOptions.IgnoreCase)
+                If match.Success Then
+                    name = match.Groups(1).Captures(0).Value
+                Else
+                    name = Language.strActiveDirectory
+                End If
+
+                containerInfo.Name = name
+
+                ' We can only inherit from a container node, not the root node or connection nodes
+                If Tree.Node.GetNodeType(parentTreeNode) = Tree.Node.Type.Container Then
+                    containerInfo.Parent = parentTreeNode.Tag
+                Else
+                    containerInfo.ConnectionInfo.Inherit.TurnOffInheritanceCompletely()
+                End If
+
+                treeNode.Text = name
+                treeNode.Name = name
+                treeNode.Tag = containerInfo
+                ContainerList.Add(containerInfo)
+
+                ImportComputers(ldapPath, treeNode)
+
+                parentTreeNode.Nodes.Add(treeNode)
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage("Config.Import.ActiveDirectory.Import() failed.", ex, , True)
+            End Try
+        End Sub
+
+        Private Shared Sub ImportComputers(ByVal ldapPath As String, ByVal parentTreeNode As TreeNode)
+            Try
+                Dim strDisplayName, strDescription, strHostName As String
+
+                Const ldapFilter As String = "(objectClass=computer)"
+
+                Dim ldapSearcher As New DirectorySearcher
+                Dim ldapResults As SearchResultCollection
+                Dim ldapResult As SearchResult
+
+                With ldapSearcher
+                    .SearchRoot = New DirectoryEntry(ldapPath)
+                    .PropertiesToLoad.AddRange({"securityEquals", "cn"})
+                    .Filter = ldapFilter
+                    .SearchScope = SearchScope.OneLevel
+                End With
+
+                ldapResults = ldapSearcher.FindAll()
+
+                For Each ldapResult In ldapResults
+                    With ldapResult.GetDirectoryEntry()
+                        strDisplayName = .Properties("cn").Value
+                        strDescription = .Properties("Description").Value
+                        strHostName = .Properties("dNSHostName").Value
+                    End With
+
+                    Dim treeNode As TreeNode = Tree.Node.AddNode(Tree.Node.Type.Connection, strDisplayName)
+
+                    Dim connectionInfo As New Connection.Info()
+                    Dim inheritanceInfo As New Connection.Info.Inheritance(connectionInfo, True)
+                    inheritanceInfo.Description = False
+                    If TypeOf parentTreeNode.Tag Is Container.Info Then
+                        connectionInfo.Parent = parentTreeNode.Tag
+                    End If
+                    connectionInfo.Inherit = inheritanceInfo
+                    connectionInfo.Name = strDisplayName
+                    connectionInfo.Hostname = strHostName
+                    connectionInfo.Description = strDescription
+                    connectionInfo.TreeNode = treeNode
+                    treeNode.Name = strDisplayName
+                    treeNode.Tag = connectionInfo 'set the nodes tag to the conI
+                    'add connection to connections
+                    ConnectionList.Add(connectionInfo)
+
+                    parentTreeNode.Nodes.Add(treeNode)
+                Next
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage("Config.Import.ActiveDirectory.ImportComputers() failed.", ex, , True)
+            End Try
+        End Sub
+    End Class
+End Namespace

mRemoteV1/Config/Import/PortScan.vb

@@ -0,0 +1,72 @@
+Imports mRemoteNG.App.Runtime
+
+Namespace Config.Import
+    Public Class PortScan
+        Public Shared Sub Import(ByVal hosts As IEnumerable, ByVal protocol As Connection.Protocol.Protocols, ByVal parentTreeNode As TreeNode)
+            For Each host As Tools.PortScan.ScanHost In hosts
+                Dim finalProtocol As Connection.Protocol.Protocols
+                Dim protocolValid As Boolean = False
+
+                Dim treeNode As TreeNode = Tree.Node.AddNode(Tree.Node.Type.Connection, host.HostNameWithoutDomain)
+
+                Dim connectionInfo As New Connection.Info()
+                connectionInfo.Inherit = New Connection.Info.Inheritance(connectionInfo)
+
+                connectionInfo.Name = host.HostNameWithoutDomain
+                connectionInfo.Hostname = host.HostName
+
+                Select Case protocol
+                    Case Connection.Protocol.Protocols.SSH2
+                        If host.SSH Then
+                            finalProtocol = Connection.Protocol.Protocols.SSH2
+                            protocolValid = True
+                        End If
+                    Case Connection.Protocol.Protocols.Telnet
+                        If host.Telnet Then
+                            finalProtocol = Connection.Protocol.Protocols.Telnet
+                            protocolValid = True
+                        End If
+                    Case Connection.Protocol.Protocols.HTTP
+                        If host.HTTP Then
+                            finalProtocol = Connection.Protocol.Protocols.HTTP
+                            protocolValid = True
+                        End If
+                    Case Connection.Protocol.Protocols.HTTPS
+                        If host.HTTPS Then
+                            finalProtocol = Connection.Protocol.Protocols.HTTPS
+                            protocolValid = True
+                        End If
+                    Case Connection.Protocol.Protocols.Rlogin
+                        If host.Rlogin Then
+                            finalProtocol = Connection.Protocol.Protocols.Rlogin
+                            protocolValid = True
+                        End If
+                    Case Connection.Protocol.Protocols.RDP
+                        If host.RDP Then
+                            finalProtocol = Connection.Protocol.Protocols.RDP
+                            protocolValid = True
+                        End If
+                    Case Connection.Protocol.Protocols.VNC
+                        If host.VNC Then
+                            finalProtocol = Connection.Protocol.Protocols.VNC
+                            protocolValid = True
+                        End If
+                End Select
+
+                If protocolValid Then
+                    connectionInfo.Protocol = finalProtocol
+                    connectionInfo.SetDefaultPort()
+
+                    treeNode.Tag = connectionInfo
+                    parentTreeNode.Nodes.Add(treeNode)
+
+                    If TypeOf parentTreeNode.Tag Is Container.Info Then
+                        connectionInfo.Parent = parentTreeNode.Tag
+                    End If
+
+                    ConnectionList.Add(connectionInfo)
+                End If
+            Next
+        End Sub
+    End Class
+End Namespace

mRemoteV1/Config/Import/PuttyConnectionManager.vb

@@ -0,0 +1,160 @@
+Imports System.Xml
+Imports System.IO
+Imports mRemoteNG.App.Runtime
+Imports mRemoteNG.Connection.Protocol
+
+Namespace Config.Import
+    Public Class PuttyConnectionManager
+        Public Shared Sub Import(ByVal fileName As String, ByVal parentTreeNode As TreeNode)
+            Dim xmlDocument As New XmlDocument()
+            xmlDocument.Load(fileName)
+
+            Dim configurationNode As XmlNode = xmlDocument.SelectSingleNode("/configuration")
+            'Dim version As New Version(configurationNode.Attributes("version").Value)
+            'If Not version = New Version(0, 7, 1, 136) Then
+            '    Throw New FileFormatException(String.Format("Unsupported file version ({0}).", version))
+            'End If
+
+            For Each rootNode As XmlNode In configurationNode.SelectNodes("./root")
+                ImportRootOrContainer(rootNode, parentTreeNode)
+            Next
+        End Sub
+
+        Private Shared Sub ImportRootOrContainer(ByVal xmlNode As XmlNode, ByVal parentTreeNode As TreeNode)
+            Dim xmlNodeType As String = xmlNode.Attributes("type").Value
+            Select Case xmlNode.Name
+                Case "root"
+                    If Not String.Compare(xmlNodeType, "database", ignoreCase:=True) = 0 Then
+                        Throw New FileFormatException(String.Format("Unrecognized root node type ({0}).", xmlNodeType))
+                    End If
+                Case "container"
+                    If Not String.Compare(xmlNodeType, "folder", ignoreCase:=True) = 0 Then
+                        Throw New FileFormatException(String.Format("Unrecognized root node type ({0}).", xmlNodeType))
+                    End If
+                Case Else
+                    ' ReSharper disable once LocalizableElement
+                    Throw New ArgumentException("Argument must be either a root or a container node.", "xmlNode")
+            End Select
+
+            If parentTreeNode Is Nothing Then
+                Throw New InvalidOperationException("parentInfo.TreeNode must not be null.")
+            End If
+
+            Dim name As String = xmlNode.Attributes("name").Value
+
+            Dim treeNode As New TreeNode(name)
+            parentTreeNode.Nodes.Add(treeNode)
+
+            Dim containerInfo As New Container.Info
+            containerInfo.TreeNode = treeNode
+            containerInfo.Name = name
+
+            Dim connectionInfo As Connection.Info = CreateConnectionInfo(name)
+            connectionInfo.Parent = containerInfo
+            connectionInfo.IsContainer = True
+            containerInfo.ConnectionInfo = connectionInfo
+
+            ' We can only inherit from a container node, not the root node or connection nodes
+            If Tree.Node.GetNodeType(parentTreeNode) = Tree.Node.Type.Container Then
+                containerInfo.Parent = parentTreeNode.Tag
+            Else
+                connectionInfo.Inherit.TurnOffInheritanceCompletely()
+            End If
+
+            treeNode.Name = name
+            treeNode.Tag = containerInfo
+            treeNode.ImageIndex = Images.Enums.TreeImage.Container
+            treeNode.SelectedImageIndex = Images.Enums.TreeImage.Container
+
+            For Each childNode As XmlNode In xmlNode.SelectNodes("./*")
+                Select Case childNode.Name
+                    Case "container"
+                        ImportRootOrContainer(childNode, treeNode)
+                    Case "connection"
+                        ImportConnection(childNode, treeNode)
+                    Case Else
+                        Throw New FileFormatException(String.Format("Unrecognized child node ({0}).", childNode.Name))
+                End Select
+            Next
+
+            containerInfo.IsExpanded = xmlNode.Attributes("expanded").InnerText
+            If containerInfo.IsExpanded Then treeNode.Expand()
+
+            ContainerList.Add(containerInfo)
+        End Sub
+
+        Private Shared Sub ImportConnection(ByVal connectionNode As XmlNode, ByVal parentTreeNode As TreeNode)
+            Dim connectionNodeType As String = connectionNode.Attributes("type").Value
+            If Not String.Compare(connectionNodeType, "PuTTY", ignoreCase:=True) = 0 Then
+                Throw New FileFormatException(String.Format("Unrecognized connection node type ({0}).", connectionNodeType))
+            End If
+
+            Dim name As String = connectionNode.Attributes("name").Value
+            Dim treeNode As New TreeNode(name)
+            parentTreeNode.Nodes.Add(treeNode)
+
+            Dim connectionInfo As Connection.Info = ConnectionInfoFromXml(connectionNode)
+            connectionInfo.TreeNode = treeNode
+            connectionInfo.Parent = parentTreeNode.Tag
+
+            treeNode.Name = name
+            treeNode.Tag = connectionInfo
+            treeNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
+            treeNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
+
+            ConnectionList.Add(connectionInfo)
+        End Sub
+
+        Private Shared Function CreateConnectionInfo(ByVal name As String) As Connection.Info
+            Dim connectionInfo As New Connection.Info
+            connectionInfo.Inherit = New Connection.Info.Inheritance(connectionInfo)
+            connectionInfo.Name = name
+            Return connectionInfo
+        End Function
+
+        Private Shared Function ConnectionInfoFromXml(ByVal xmlNode As XmlNode) As Connection.Info
+            Dim connectionInfoNode As XmlNode = xmlNode.SelectSingleNode("./connection_info")
+
+            Dim name As String = connectionInfoNode.SelectSingleNode("./name").InnerText
+            Dim connectionInfo As Connection.Info = CreateConnectionInfo(name)
+
+            Dim protocol As String = connectionInfoNode.SelectSingleNode("./protocol").InnerText
+            Select Case protocol.ToLowerInvariant()
+                Case "telnet"
+                    connectionInfo.Protocol = Protocols.Telnet
+                Case "ssh"
+                    connectionInfo.Protocol = Protocols.SSH2
+                Case Else
+                    Throw New FileFormatException(String.Format("Unrecognized protocol ({0}).", protocol))
+            End Select
+
+            connectionInfo.Hostname = connectionInfoNode.SelectSingleNode("./host").InnerText
+            connectionInfo.Port = connectionInfoNode.SelectSingleNode("./port").InnerText
+            connectionInfo.PuttySession = connectionInfoNode.SelectSingleNode("./session").InnerText
+            ' ./commandline
+            connectionInfo.Description = connectionInfoNode.SelectSingleNode("./description").InnerText
+
+            Dim loginNode As XmlNode = xmlNode.SelectSingleNode("./login")
+            connectionInfo.Username = loginNode.SelectSingleNode("login").InnerText
+            connectionInfo.Password = loginNode.SelectSingleNode("password").InnerText
+            ' ./prompt
+
+            ' ./timeout/connectiontimeout
+            ' ./timeout/logintimeout
+            ' ./timeout/passwordtimeout
+            ' ./timeout/commandtimeout
+
+            ' ./command/command1
+            ' ./command/command2
+            ' ./command/command3
+            ' ./command/command4
+            ' ./command/command5
+
+            ' ./options/loginmacro
+            ' ./options/postcommands
+            ' ./options/endlinechar
+
+            Return connectionInfo
+        End Function
+    End Class
+End Namespace

mRemoteV1/Config/Import/RemoteDesktopConnection.vb

@@ -0,0 +1,141 @@
+Imports System.IO
+Imports mRemoteNG.App.Runtime
+
+Namespace Config.Import
+    Public Class RemoteDesktopConnection
+        Public Shared Sub Import(ByVal fileName As String, ByVal parentTreeNode As TreeNode)
+            Dim lines As String() = File.ReadAllLines(fileName)
+
+            Dim name As String = Path.GetFileNameWithoutExtension(fileName)
+            Dim treeNode As TreeNode = New TreeNode(name)
+            parentTreeNode.Nodes.Add(treeNode)
+
+            Dim connectionInfo As New Connection.Info
+            connectionInfo.Inherit = New Connection.Info.Inheritance(connectionInfo)
+            connectionInfo.Name = name
+            connectionInfo.TreeNode = treeNode
+
+            If TypeOf treeNode.Parent.Tag Is Container.Info Then
+                connectionInfo.Parent = treeNode.Parent.Tag
+            End If
+
+            treeNode.Name = name
+            treeNode.Tag = connectionInfo
+            treeNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
+            treeNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
+
+            For Each line As String In lines
+                Dim parts() As String = line.Split(New Char() {":"}, 3)
+                If parts.Length < 3 Then Continue For
+
+                Dim key As String = parts(0)
+                Dim value As String = parts(2)
+
+                SetConnectionInfoParameter(connectionInfo, key, value)
+            Next
+
+            ConnectionList.Add(connectionInfo)
+        End Sub
+
+        Private Shared Sub SetConnectionInfoParameter(ByRef connectionInfo As Connection.Info, ByVal key As String, ByVal value As String)
+            Select Case LCase(key)
+                Case "full address"
+                    Dim uri As New Uri("dummyscheme" + uri.SchemeDelimiter + value)
+                    If Not String.IsNullOrEmpty(uri.Host) Then connectionInfo.Hostname = uri.Host
+                    If Not uri.Port = -1 Then connectionInfo.Port = uri.Port
+                Case "server port"
+                    connectionInfo.Port = value
+                Case "username"
+                    connectionInfo.Username = value
+                Case "domain"
+                    connectionInfo.Domain = value
+                Case "session bpp"
+                    Select Case value
+                        Case 8
+                            connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors256
+                        Case 15
+                            connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors15Bit
+                        Case 16
+                            connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors16Bit
+                        Case 24
+                            connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors24Bit
+                        Case 32
+                            connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors32Bit
+                    End Select
+                Case "bitmapcachepersistenable"
+                    If value = 1 Then
+                        connectionInfo.CacheBitmaps = True
+                    Else
+                        connectionInfo.CacheBitmaps = False
+                    End If
+                Case "screen mode id"
+                    If value = 2 Then
+                        connectionInfo.Resolution = Connection.Protocol.RDP.RDPResolutions.Fullscreen
+                    Else
+                        connectionInfo.Resolution = Connection.Protocol.RDP.RDPResolutions.FitToWindow
+                    End If
+                Case "connect to console"
+                    If value = 1 Then
+                        connectionInfo.UseConsoleSession = True
+                    End If
+                Case "disable wallpaper"
+                    If value = 1 Then
+                        connectionInfo.DisplayWallpaper = True
+                    Else
+                        connectionInfo.DisplayWallpaper = False
+                    End If
+                Case "disable themes"
+                    If value = 1 Then
+                        connectionInfo.DisplayThemes = True
+                    Else
+                        connectionInfo.DisplayThemes = False
+                    End If
+                Case "allow font smoothing"
+                    If value = 1 Then
+                        connectionInfo.EnableFontSmoothing = True
+                    Else
+                        connectionInfo.EnableFontSmoothing = False
+                    End If
+                Case "allow desktop composition"
+                    If value = 1 Then
+                        connectionInfo.EnableDesktopComposition = True
+                    Else
+                        connectionInfo.EnableDesktopComposition = False
+                    End If
+                Case "redirectsmartcards"
+                    If value = 1 Then
+                        connectionInfo.RedirectSmartCards = True
+                    Else
+                        connectionInfo.RedirectSmartCards = False
+                    End If
+                Case "redirectdrives"
+                    If value = 1 Then
+                        connectionInfo.RedirectDiskDrives = True
+                    Else
+                        connectionInfo.RedirectDiskDrives = False
+                    End If
+                Case "redirectcomports"
+                    If value = 1 Then
+                        connectionInfo.RedirectPorts = True
+                    Else
+                        connectionInfo.RedirectPorts = False
+                    End If
+                Case "redirectprinters"
+                    If value = 1 Then
+                        connectionInfo.RedirectPrinters = True
+                    Else
+                        connectionInfo.RedirectPrinters = False
+                    End If
+                Case "audiomode"
+                    Select Case value
+                        Case 0
+                            connectionInfo.RedirectSound = Connection.Protocol.RDP.RDPSounds.BringToThisComputer
+                        Case 1
+                            connectionInfo.RedirectSound = Connection.Protocol.RDP.RDPSounds.LeaveAtRemoteComputer
+                        Case 2
+                            connectionInfo.RedirectSound = Connection.Protocol.RDP.RDPSounds.DoNotPlay
+                    End Select
+            End Select
+        End Sub
+    End Class
+End Namespace

mRemoteV1/Config/Import/RemoteDesktopConnectionManager.vb

@@ -0,0 +1,298 @@
+Imports System.Xml
+Imports System.IO
+Imports System.Runtime.InteropServices
+Imports mRemoteNG.Connection.Protocol
+Imports mRemoteNG.App.Runtime
+
+Namespace Config.Import
+    Public Class RemoteDesktopConnectionManager
+        Public Shared Sub Import(ByVal fileName As String, ByVal parentTreeNode As TreeNode)
+            Dim xmlDocument As New XmlDocument()
+            xmlDocument.Load(fileName)
+
+            Dim rdcManNode As XmlNode = xmlDocument.SelectSingleNode("/RDCMan")
+            Dim schemaVersion As Integer = rdcManNode.Attributes("schemaVersion").Value
+            If Not schemaVersion = 1 Then
+                Throw New FileFormatException(String.Format("Unsupported schema version ({0}).", schemaVersion))
+            End If
+
+            Dim versionNode As XmlNode = rdcManNode.SelectSingleNode("./version")
+            Dim version As New Version(versionNode.InnerText)
+            If Not version = New Version(2, 2) Then
+                Throw New FileFormatException(String.Format("Unsupported file version ({0}).", version))
+            End If
+
+            Dim fileNode As XmlNode = rdcManNode.SelectSingleNode("./file")
+            ImportFileOrGroup(fileNode, parentTreeNode)
+        End Sub
+
+        Private Shared Sub ImportFileOrGroup(ByVal xmlNode As XmlNode, ByVal parentTreeNode As TreeNode)
+            Dim propertiesNode As XmlNode = xmlNode.SelectSingleNode("./properties")
+            Dim name As String = propertiesNode.SelectSingleNode("./name").InnerText
+
+            Dim treeNode As New TreeNode(name)
+            parentTreeNode.Nodes.Add(treeNode)
+
+            Dim containerInfo As New Container.Info
+            containerInfo.TreeNode = treeNode
+            containerInfo.Name = name
+
+            Dim connectionInfo As Connection.Info = ConnectionInfoFromXml(propertiesNode)
+            connectionInfo.Parent = containerInfo
+            connectionInfo.IsContainer = True
+            containerInfo.ConnectionInfo = connectionInfo
+
+            ' We can only inherit from a container node, not the root node or connection nodes
+            If Tree.Node.GetNodeType(parentTreeNode) = Tree.Node.Type.Container Then
+                containerInfo.Parent = parentTreeNode.Tag
+            Else
+                connectionInfo.Inherit.TurnOffInheritanceCompletely()
+            End If
+
+            treeNode.Name = name
+            treeNode.Tag = containerInfo
+            treeNode.ImageIndex = Images.Enums.TreeImage.Container
+            treeNode.SelectedImageIndex = Images.Enums.TreeImage.Container
+
+            For Each childNode As XmlNode In xmlNode.SelectNodes("./group|./server")
+                Select Case childNode.Name
+                    Case "group"
+                        ImportFileOrGroup(childNode, treeNode)
+                    Case "server"
+                        ImportServer(childNode, treeNode)
+                End Select
+            Next
+
+            containerInfo.IsExpanded = propertiesNode.SelectSingleNode("./expanded").InnerText
+            If containerInfo.IsExpanded Then treeNode.Expand()
+
+            ContainerList.Add(containerInfo)
+        End Sub
+
+        Private Shared Sub ImportServer(ByVal serverNode As XmlNode, ByVal parentTreeNode As TreeNode)
+            Dim name As String = serverNode.SelectSingleNode("./displayName").InnerText
+            Dim treeNode As New TreeNode(name)
+            parentTreeNode.Nodes.Add(treeNode)
+
+            Dim connectionInfo As Connection.Info = ConnectionInfoFromXml(serverNode)
+            connectionInfo.TreeNode = treeNode
+            connectionInfo.Parent = parentTreeNode.Tag
+
+            treeNode.Name = name
+            treeNode.Tag = connectionInfo
+            treeNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
+            treeNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
+
+            ConnectionList.Add(connectionInfo)
+        End Sub
+
+        Private Shared Function ConnectionInfoFromXml(ByVal xmlNode As XmlNode) As Connection.Info
+            Dim connectionInfo As New Connection.Info
+            connectionInfo.Inherit = New Connection.Info.Inheritance(connectionInfo)
+
+            Dim name As String = xmlNode.SelectSingleNode("./name").InnerText
+
+            Dim displayName As String
+            Dim displayNameNode As XmlNode = xmlNode.SelectSingleNode("./displayName")
+            If displayNameNode Is Nothing Then
+                displayName = name
+            Else
+                displayName = displayNameNode.InnerText
+            End If
+
+            connectionInfo.Name = displayName
+            connectionInfo.Description = xmlNode.SelectSingleNode("./comment").InnerText
+            connectionInfo.Hostname = name
+
+            Dim logonCredentialsNode As XmlNode = xmlNode.SelectSingleNode("./logonCredentials")
+            If logonCredentialsNode.Attributes("inherit").Value = "None" Then
+                connectionInfo.Username = logonCredentialsNode.SelectSingleNode("userName").InnerText
+
+                Dim passwordNode As XmlNode = logonCredentialsNode.SelectSingleNode("./password")
+                If passwordNode.Attributes("storeAsClearText").Value = "True" Then
+                    connectionInfo.Password = passwordNode.InnerText
+                Else
+                    connectionInfo.Password = DecryptPassword(passwordNode.InnerText)
+                End If
+
+                connectionInfo.Domain = logonCredentialsNode.SelectSingleNode("./domain").InnerText
+            Else
+                connectionInfo.Inherit.Username = True
+                connectionInfo.Inherit.Password = True
+                connectionInfo.Inherit.Domain = True
+            End If
+
+            Dim connectionSettingsNode As XmlNode = xmlNode.SelectSingleNode("./connectionSettings")
+            If connectionSettingsNode.Attributes("inherit").Value = "None" Then
+                connectionInfo.UseConsoleSession = connectionSettingsNode.SelectSingleNode("./connectToConsole").InnerText
+                ' ./startProgram
+                ' ./workingDir
+                connectionInfo.Port = connectionSettingsNode.SelectSingleNode("./port").InnerText
+            Else
+                connectionInfo.Inherit.UseConsoleSession = True
+                connectionInfo.Inherit.Port = True
+            End If
+
+            Dim gatewaySettingsNode As XmlNode = xmlNode.SelectSingleNode("./gatewaySettings")
+            If gatewaySettingsNode.Attributes("inherit").Value = "None" Then
+                If gatewaySettingsNode.SelectSingleNode("./enabled").InnerText = "True" Then
+                    connectionInfo.RDGatewayUsageMethod = RDP.RDGatewayUsageMethod.Always
+                Else
+                    connectionInfo.RDGatewayUsageMethod = RDP.RDGatewayUsageMethod.Never
+                End If
+
+                connectionInfo.RDGatewayHostname = gatewaySettingsNode.SelectSingleNode("./hostName").InnerText
+                connectionInfo.RDGatewayUsername = gatewaySettingsNode.SelectSingleNode("./userName").InnerText
+
+                Dim passwordNode As XmlNode = logonCredentialsNode.SelectSingleNode("./password")
+                If passwordNode.Attributes("storeAsClearText").Value = "True" Then
+                    connectionInfo.RDGatewayPassword = passwordNode.InnerText
+                Else
+                    connectionInfo.Password = DecryptPassword(passwordNode.InnerText)
+                End If
+
+                connectionInfo.RDGatewayDomain = gatewaySettingsNode.SelectSingleNode("./domain").InnerText
+                ' ./logonMethod
+                ' ./localBypass
+                ' ./credSharing
+            Else
+                connectionInfo.Inherit.RDGatewayUsageMethod = True
+                connectionInfo.Inherit.RDGatewayHostname = True
+                connectionInfo.Inherit.RDGatewayUsername = True
+                connectionInfo.Inherit.RDGatewayPassword = True
+                connectionInfo.Inherit.RDGatewayDomain = True
+            End If
+
+            Dim remoteDesktopNode As XmlNode = xmlNode.SelectSingleNode("./remoteDesktop")
+            If remoteDesktopNode.Attributes("inherit").Value = "None" Then
+                Dim resolutionString As String = remoteDesktopNode.SelectSingleNode("./size").InnerText.Replace(" ", "")
+                Try
+                    connectionInfo.Resolution = "Res" & Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPResolutions), resolutionString)
+                Catch ex As ArgumentException
+                    connectionInfo.Resolution = RDP.RDPResolutions.FitToWindow
+                End Try
+
+                If remoteDesktopNode.SelectSingleNode("./sameSizeAsClientArea").InnerText = "True" Then
+                    connectionInfo.Resolution = RDP.RDPResolutions.FitToWindow
+                End If
+
+                If remoteDesktopNode.SelectSingleNode("./fullScreen").InnerText = "True" Then
+                    connectionInfo.Resolution = RDP.RDPResolutions.Fullscreen
+                End If
+
+                connectionInfo.Colors = remoteDesktopNode.SelectSingleNode("./colorDepth").InnerText
+            Else
+                connectionInfo.Inherit.Resolution = True
+                connectionInfo.Inherit.Colors = True
+            End If
+
+            Dim localResourcesNode As XmlNode = xmlNode.SelectSingleNode("./localResources")
+            If localResourcesNode.Attributes("inherit").Value = "None" Then
+                Select Case localResourcesNode.SelectSingleNode("./audioRedirection").InnerText
+                    Case 0 ' Bring to this computer
+                        connectionInfo.RedirectSound = RDP.RDPSounds.BringToThisComputer
+                    Case 1 ' Leave at remote computer
+                        connectionInfo.RedirectSound = RDP.RDPSounds.LeaveAtRemoteComputer
+                    Case 2 ' Do not play
+                        connectionInfo.RedirectSound = RDP.RDPSounds.DoNotPlay
+                End Select
+
+                ' ./audioRedirectionQuality
+                ' ./audioCaptureRedirection
+
+                Select Case localResourcesNode.SelectSingleNode("./keyboardHook").InnerText
+                    Case 0 ' On the local computer
+                        connectionInfo.RedirectKeys = False
+                    Case 1 ' On the remote computer
+                        connectionInfo.RedirectKeys = True
+                    Case 2 ' In full screen mode only
+                        connectionInfo.RedirectKeys = False
+                End Select
+
+                ' ./redirectClipboard
+                connectionInfo.RedirectDiskDrives = localResourcesNode.SelectSingleNode("./redirectDrives").InnerText
+                connectionInfo.RedirectPorts = localResourcesNode.SelectSingleNode("./redirectPorts").InnerText
+                connectionInfo.RedirectPrinters = localResourcesNode.SelectSingleNode("./redirectPrinters").InnerText
+                connectionInfo.RedirectSmartCards = localResourcesNode.SelectSingleNode("./redirectSmartCards").InnerText
+            Else
+                connectionInfo.Inherit.RedirectSound = True
+                connectionInfo.Inherit.RedirectKeys = True
+                connectionInfo.Inherit.RedirectDiskDrives = True
+                connectionInfo.Inherit.RedirectPorts = True
+                connectionInfo.Inherit.RedirectPrinters = True
+                connectionInfo.Inherit.RedirectSmartCards = True
+            End If
+
+            Dim securitySettingsNode As XmlNode = xmlNode.SelectSingleNode("./securitySettings")
+            If securitySettingsNode.Attributes("inherit").Value = "None" Then
+                Select Case securitySettingsNode.SelectSingleNode("./authentication").InnerText
+                    Case 0 ' No authentication
+                        connectionInfo.RDPAuthenticationLevel = RDP.AuthenticationLevel.NoAuth
+                    Case 1 ' Do not connect if authentication fails
+                        connectionInfo.RDPAuthenticationLevel = RDP.AuthenticationLevel.AuthRequired
+                    Case 2 ' Warn if authentication fails
+                        connectionInfo.RDPAuthenticationLevel = RDP.AuthenticationLevel.WarnOnFailedAuth
+                End Select
+            Else
+                connectionInfo.Inherit.RDPAuthenticationLevel = True
+            End If
+
+            ' ./displaySettings/thumbnailScale
+            ' ./displaySettings/liveThumbnailUpdates
+            ' ./displaySettings/showDisconnectedThumbnails
+
+            Return connectionInfo
+        End Function
+
+        Private Shared Function DecryptPassword(ByVal ciphertext As String) As String
+            If String.IsNullOrEmpty(ciphertext) Then Return Nothing
+
+            Dim gcHandle As GCHandle
+            Dim plaintextData As Win32.DATA_BLOB
+            Try
+                Dim ciphertextArray As Byte() = Convert.FromBase64String(ciphertext)
+                gcHandle = Runtime.InteropServices.GCHandle.Alloc(ciphertextArray, GCHandleType.Pinned)
+
+                Dim ciphertextData As Win32.DATA_BLOB
+                ciphertextData.cbData = ciphertextArray.Length
+                ciphertextData.pbData = gcHandle.AddrOfPinnedObject()
+
+                If Not Win32.CryptUnprotectData(ciphertextData, Nothing, Nothing, Nothing, Nothing, 0, plaintextData) Then Return Nothing
+
+                Dim plaintextLength As Integer = plaintextData.cbData / 2 ' Char = 2 bytes
+                Dim plaintextArray(plaintextLength - 1) As Char
+                Marshal.Copy(plaintextData.pbData, plaintextArray, 0, plaintextLength)
+
+                Return New String(plaintextArray)
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage("RemoteDesktopConnectionManager.DecryptPassword() failed.", ex, , True)
+                Return Nothing
+            Finally
+                If gcHandle.IsAllocated Then gcHandle.Free()
+                If Not plaintextData.pbData = IntPtr.Zero Then Win32.LocalFree(plaintextData.pbData)
+            End Try
+        End Function
+
+        ' ReSharper disable once ClassNeverInstantiated.Local
+        Private Class Win32
+            ' ReSharper disable InconsistentNaming
+            ' ReSharper disable IdentifierTypo
+            ' ReSharper disable StringLiteralTypo
+            <DllImport("crypt32.dll", CharSet:=CharSet.Unicode)> _
+            Public Shared Function CryptUnprotectData(ByRef dataIn As DATA_BLOB, ByVal description As String, ByRef optionalEntropy As DATA_BLOB, ByVal reserved As IntPtr, ByRef promptStruct As IntPtr, ByVal flags As Integer, ByRef dataOut As DATA_BLOB) As Boolean
+            End Function
+
+            <DllImport("kernel32.dll", CharSet:=CharSet.Unicode)> _
+            Public Shared Sub LocalFree(ByVal ptr As IntPtr)
+            End Sub
+
+            Public Structure DATA_BLOB
+                Public cbData As Integer
+                Public pbData As IntPtr
+            End Structure
+            ' ReSharper restore StringLiteralTypo
+            ' ReSharper restore IdentifierTypo
+            ' ReSharper restore InconsistentNaming
+        End Class
+    End Class
+End Namespace

mRemoteV1/Config/Import/mRemoteNG.vb

@@ -0,0 +1,49 @@
+Imports System.IO
+Imports mRemoteNG.App.Runtime
+
+Namespace Config.Import
+    ' ReSharper disable once InconsistentNaming
+    Public Class mRemoteNG
+        Public Shared Sub Import(ByVal fileName As String, ByVal parentTreeNode As TreeNode)
+            Dim name As String = Path.GetFileNameWithoutExtension(fileName)
+            Dim treeNode As New TreeNode(name)
+            parentTreeNode.Nodes.Add(treeNode)
+
+            Dim containerInfo As New Container.Info
+            containerInfo.TreeNode = treeNode
+            containerInfo.Name = name
+
+            Dim connectionInfo As New Connection.Info
+            connectionInfo.Inherit = New Connection.Info.Inheritance(connectionInfo)
+            connectionInfo.Name = name
+            connectionInfo.TreeNode = treeNode
+            connectionInfo.Parent = containerInfo
+            connectionInfo.IsContainer = True
+            containerInfo.ConnectionInfo = connectionInfo
+
+            ' We can only inherit from a container node, not the root node or connection nodes
+            If Tree.Node.GetNodeType(parentTreeNode) = Tree.Node.Type.Container Then
+                containerInfo.Parent = parentTreeNode.Tag
+            Else
+                connectionInfo.Inherit.TurnOffInheritanceCompletely()
+            End If
+
+            treeNode.Name = name
+            treeNode.Tag = containerInfo
+            treeNode.ImageIndex = Images.Enums.TreeImage.Container
+            treeNode.SelectedImageIndex = Images.Enums.TreeImage.Container
+
+            Dim connectionsLoad As New Connections.Load
+            With connectionsLoad
+                .ConnectionFileName = fileName
+                .RootTreeNode = treeNode
+                .ConnectionList = ConnectionList
+                .ContainerList = ContainerList
+            End With
+
+            connectionsLoad.Load(True)
+
+            ContainerList.Add(containerInfo)
+        End Sub
+    End Class
+End Namespace

mRemoteV1/Config/KeyboardShortcuts.vb

@@ -0,0 +1,324 @@
+Imports System.Runtime.InteropServices
+Imports System.ComponentModel
+Imports mRemoteNG.App.Runtime
+Imports SharedLibraryNG
+
+Namespace Config
+    Public Class KeyboardShortcuts
+#Region "Public Properties"
+        Private Shared _defaultMap As KeyboardShortcutMap = Nothing
+        Public Shared ReadOnly Property DefaultMap() As KeyboardShortcutMap
+            Get
+                LoadDefaultMap()
+                Return _defaultMap
+            End Get
+        End Property
+
+        Private Shared _map As KeyboardShortcutMap
+        Public Shared Property Map() As KeyboardShortcutMap
+            Get
+                Load()
+                Return _map
+            End Get
+            Set(value As KeyboardShortcutMap)
+                CancelKeyNotifications()
+                _map = value
+                Save()
+                RequestKeyNotifications(_handle)
+            End Set
+        End Property
+#End Region
+
+#Region "Public Methods"
+        Public Shared Sub RequestKeyNotifications(ByVal handle As IntPtr)
+            ' ReSharper disable LocalizableElement
+            If handle = IntPtr.Zero Then Throw New ArgumentException("The handle cannot be null.", "handle")
+            If Not _handle = IntPtr.Zero And Not _handle = handle Then Throw New ArgumentException("The handle must match the handle that was specified the first time this function was called.", "handle")
+            ' ReSharper restore LocalizableElement
+            _handle = handle
+            For Each shortcutMapping As ShortcutMapping In Map.Mappings
+                KeyboardHook.RequestKeyNotification(handle, shortcutMapping.Key.KeyCode, shortcutMapping.Key.ModifierKeys, False)
+            Next
+        End Sub
+
+        Public Shared Function CommandFromHookKeyMessage(ByVal m As Message) As ShortcutCommand
+            Dim msgData As KeyboardHook.HookKeyMsgData = Marshal.PtrToStructure(m.LParam, GetType(KeyboardHook.HookKeyMsgData))
+            Return Map.GetCommand(msgData.KeyCode, msgData.ModifierKeys)
+        End Function
+#End Region
+
+#Region "Private Fields"
+        ' ReSharper disable once UnusedMember.Local
+        Private Shared _keyboardHook As New KeyboardHook
+        Private Shared _mapLoaded As Boolean = False
+        Private Shared _handle As IntPtr = IntPtr.Zero
+#End Region
+
+#Region "Private Methods"
+        Private Shared Sub LoadDefaultMap()
+            If _defaultMap IsNot Nothing Then Return
+            _defaultMap = New KeyboardShortcutMap()
+            _defaultMap.AddFromConfigString(ShortcutCommand.PreviousTab, My.Settings.Properties("KeysPreviousTab").DefaultValue)
+            _defaultMap.AddFromConfigString(ShortcutCommand.NextTab, My.Settings.Properties("KeysNextTab").DefaultValue)
+        End Sub
+
+        Private Shared Sub Load()
+            If _mapLoaded Then Return
+            _map = New KeyboardShortcutMap()
+            _map.AddFromConfigString(ShortcutCommand.PreviousTab, My.Settings.KeysPreviousTab)
+            _map.AddFromConfigString(ShortcutCommand.NextTab, My.Settings.KeysNextTab)
+            _mapLoaded = True
+        End Sub
+
+        Private Shared Sub Save()
+            If _map Is Nothing Then Return
+            My.Settings.KeysPreviousTab = _map.GetConfigString(ShortcutCommand.PreviousTab)
+            My.Settings.KeysNextTab = _map.GetConfigString(ShortcutCommand.NextTab)
+        End Sub
+
+        Private Shared Sub CancelKeyNotifications()
+            If _handle = IntPtr.Zero Then Return
+            For Each shortcutMapping As ShortcutMapping In Map.Mappings
+                KeyboardHook.CancelKeyNotification(_handle, shortcutMapping.Key.KeyCode, shortcutMapping.Key.ModifierKeys, False)
+            Next
+        End Sub
+#End Region
+    End Class
+
+    Public Class KeyboardShortcutMap
+        Implements ICloneable
+
+#Region "Public Properties"
+        Private ReadOnly _mappings As List(Of ShortcutMapping)
+        Public ReadOnly Property Mappings As List(Of ShortcutMapping)
+            Get
+                Return _mappings
+            End Get
+        End Property
+#End Region
+
+#Region "Constructors"
+        Public Sub New()
+            _mappings = New List(Of ShortcutMapping)()
+        End Sub
+
+        Public Sub New(ByVal mappings As List(Of ShortcutMapping))
+            _mappings = mappings
+        End Sub
+#End Region
+
+#Region "Public Methods"
+        Public Sub Add(ByVal command As ShortcutCommand, ByVal shortcutKey As ShortcutKey)
+            If Mappings.Contains(New ShortcutMapping(command, shortcutKey)) Then Return
+            Mappings.Add(New ShortcutMapping(command, shortcutKey))
+        End Sub
+
+        Public Sub AddRange(ByVal command As ShortcutCommand, ByVal shortcutKeys As IEnumerable(Of ShortcutKey))
+            For Each shortcutKey As ShortcutKey In shortcutKeys
+                Add(command, shortcutKey)
+            Next
+        End Sub
+
+        Public Sub Remove(ByVal command As ShortcutCommand, ByVal shortcutKey As ShortcutKey)
+            Mappings.Remove(New ShortcutMapping(command, shortcutKey))
+        End Sub
+
+        Public Sub AddFromConfigString(ByVal command As ShortcutCommand, ByVal configString As String)
+            For Each shortcutKey As ShortcutKey In ParseConfigString(configString)
+                Add(command, shortcutKey)
+            Next
+        End Sub
+
+        Public Function GetConfigString(ByVal command As ShortcutCommand) As String
+            Dim parts As New List(Of String)
+            For Each shortcutKey As ShortcutKey In GetShortcutKeys(command)
+                parts.Add(shortcutKey.ToConfigString())
+            Next
+            Return String.Join(", ", parts.ToArray())
+        End Function
+
+        Public Function GetShortcutKeys(ByVal command As ShortcutCommand) As ShortcutKey()
+            Dim shortcutKeys As New List(Of ShortcutKey)
+            For Each shortcutMapping As ShortcutMapping In Mappings
+                If shortcutMapping.Command = command Then shortcutKeys.Add(shortcutMapping.Key)
+            Next
+            Return shortcutKeys.ToArray()
+        End Function
+
+        Public Sub SetShortcutKeys(ByVal command As ShortcutCommand, ByVal shortcutKeys As IEnumerable(Of ShortcutKey))
+            ClearShortcutKeys(command)
+            AddRange(command, shortcutKeys)
+        End Sub
+
+        Public Function GetCommand(ByVal keyCode As Int32, ByVal modifierKeys As KeyboardHook.ModifierKeys) As ShortcutCommand
+            Return GetCommand(New ShortcutKey(keyCode, modifierKeys))
+        End Function
+
+        Public Function Clone() As Object Implements ICloneable.Clone
+            Dim newMappings As New List(Of ShortcutMapping)()
+            newMappings.AddRange(Mappings)
+            Return New KeyboardShortcutMap(newMappings)
+        End Function
+#End Region
+
+#Region "Private Methods"
+        Private Shared Function ParseConfigString(ByVal shortcutKeysString As String) As ShortcutKey()
+            Dim shortcutKeys As New List(Of ShortcutKey)
+            For Each shortcutKeyString As String In shortcutKeysString.Split(New Char() {","}, StringSplitOptions.RemoveEmptyEntries)
+                Try
+                    shortcutKeys.Add(ShortcutKey.FromConfigString(shortcutKeyString.Trim))
+                Catch ex As Exception
+                    MessageCollector.AddExceptionMessage(String.Format("KeyboardShortcuts.ParseShortcutKeysString({0}) failed at {1}.", shortcutKeysString, shortcutKeyString), ex, , True)
+                    Continue For
+                End Try
+            Next
+            Return shortcutKeys.ToArray()
+        End Function
+
+        Private Function GetCommand(ByVal shortcutKey As ShortcutKey) As ShortcutCommand
+            For Each shortcutMapping As ShortcutMapping In Mappings
+                If ShortcutKeysMatch(shortcutMapping.Key, shortcutKey) Then Return shortcutMapping.Command
+            Next
+            Return ShortcutCommand.None
+        End Function
+
+        Private Shared Function ShortcutKeysMatch(ByVal wanted As ShortcutKey, ByVal pressed As ShortcutKey) As Boolean
+            If Not wanted.KeyCode = pressed.KeyCode Then Return False
+            Return KeyboardHook.ModifierKeysMatch(wanted.ModifierKeys, pressed.ModifierKeys)
+        End Function
+
+        Private Sub ClearShortcutKeys(ByVal command As ShortcutCommand)
+            Dim mappingsToRemove As New List(Of ShortcutMapping)
+            For Each mapping As ShortcutMapping In Mappings
+                If mapping.Command = command Then mappingsToRemove.Add(mapping)
+            Next
+
+            For Each mapping As ShortcutMapping In mappingsToRemove
+                Mappings.Remove(mapping)
+            Next
+        End Sub
+#End Region
+    End Class
+
+    <ImmutableObject(True)> _
+    Public Class ShortcutMapping
+        Implements IEquatable(Of ShortcutMapping)
+
+#Region "Public Properties"
+        Private ReadOnly _command As ShortcutCommand
+        Public ReadOnly Property Command As ShortcutCommand
+            Get
+                Return _command
+            End Get
+        End Property
+
+        Private ReadOnly _key As ShortcutKey
+        Public ReadOnly Property Key As ShortcutKey
+            Get
+                Return _key
+            End Get
+        End Property
+#End Region
+
+#Region "Constructors"
+        Public Sub New(ByVal command As ShortcutCommand, ByVal key As ShortcutKey)
+            _command = command
+            _key = Key
+        End Sub
+#End Region
+
+#Region "Public Methods"
+        Public Overloads Function Equals(other As ShortcutMapping) As Boolean Implements IEquatable(Of ShortcutMapping).Equals
+            If Not Command = other.Command Then Return False
+            If Not Key = other.Key Then Return False
+            Return True
+        End Function
+#End Region
+    End Class
+
+    <ImmutableObject(True)> _
+    Public Class ShortcutKey
+        Implements IEquatable(Of ShortcutKey)
+
+#Region "Public Properties"
+        Private ReadOnly _keyCode As Int32
+        Public ReadOnly Property KeyCode As Int32
+            Get
+                Return _keyCode
+            End Get
+        End Property
+
+        Private ReadOnly _modifierKeys As KeyboardHook.ModifierKeys
+        Public ReadOnly Property ModifierKeys As KeyboardHook.ModifierKeys
+            Get
+                Return _modifierKeys
+            End Get
+        End Property
+#End Region
+
+#Region "Constructors"
+        Public Sub New(ByVal keyCode As Int32, ByVal modifierKeys As KeyboardHook.ModifierKeys)
+            _keyCode = keyCode
+            _modifierKeys = modifierKeys
+        End Sub
+
+        Public Sub New(ByVal keysValue As Keys)
+            _keyCode = keysValue And Keys.KeyCode
+            If Not (keysValue And Keys.Shift) = 0 Then _modifierKeys = _modifierKeys Or KeyboardHook.ModifierKeys.Shift
+            If Not (keysValue And Keys.Control) = 0 Then _modifierKeys = _modifierKeys Or KeyboardHook.ModifierKeys.Control
+            If Not (keysValue And Keys.Alt) = 0 Then _modifierKeys = _modifierKeys Or KeyboardHook.ModifierKeys.Alt
+        End Sub
+#End Region
+
+#Region "Public Methods"
+        Public Function ToConfigString() As String
+            Return String.Join("/", New String() {KeyCode, Convert.ToInt32(ModifierKeys)})
+        End Function
+
+        Public Shared Function FromConfigString(ByVal shortcutKeyString As String) As ShortcutKey
+            Dim parts As String() = shortcutKeyString.Split(New Char() {"/"}, 2)
+            If Not parts.Length = 2 Then Throw New ArgumentException(String.Format("ShortcutKey.FromString({0}) failed. parts.Length != 2", shortcutKeyString), shortcutKeyString)
+            Return New ShortcutKey(Convert.ToInt32(parts(0)), Convert.ToInt32(parts(1)))
+        End Function
+
+        Public Overrides Function ToString() As String
+            Return HotkeyControl.KeysToString(Me)
+        End Function
+
+        Public Overloads Function Equals(other As ShortcutKey) As Boolean Implements IEquatable(Of ShortcutKey).Equals
+            If Not KeyCode = other.KeyCode Then Return False
+            If Not ModifierKeys = other.ModifierKeys Then Return False
+            Return True
+        End Function
+#End Region
+
+#Region "Operators"
+        Public Shared Operator =(ByVal shortcutKey1 As ShortcutKey, ByVal shortcutKey2 As ShortcutKey) As Boolean
+            Return shortcutKey1.Equals(shortcutKey2)
+        End Operator
+
+        Public Shared Operator <>(ByVal shortcutKey1 As ShortcutKey, ByVal shortcutKey2 As ShortcutKey) As Boolean
+            Return Not shortcutKey1.Equals(shortcutKey2)
+        End Operator
+
+        ' This is a narrowing conversion because (Keys Or Keys.Modifiers) cannot hold all possible values of KeyboardHook.ModifierKeys
+        Public Shared Narrowing Operator CType(ByVal shortcutKey As ShortcutKey) As Keys
+            Dim keysValue As Keys = shortcutKey.KeyCode And Keys.KeyCode
+            If Not (shortcutKey.ModifierKeys And KeyboardHook.ModifierKeys.Shift) = 0 Then keysValue = keysValue Or Keys.Shift
+            If Not (shortcutKey.ModifierKeys And KeyboardHook.ModifierKeys.Control) = 0 Then keysValue = keysValue Or Keys.Control
+            If Not (shortcutKey.ModifierKeys And KeyboardHook.ModifierKeys.Alt) = 0 Then keysValue = keysValue Or Keys.Alt
+            Return keysValue
+        End Operator
+
+        Public Shared Widening Operator CType(ByVal keys As Keys) As ShortcutKey
+            Return New ShortcutKey(keys)
+        End Operator
+#End Region
+    End Class
+
+    Public Enum ShortcutCommand As Integer
+        None = 0
+        PreviousTab
+        NextTab
+    End Enum
+End Namespace

mRemoteV1/Config/Putty/Provider.vb

@@ -0,0 +1,99 @@
+Imports mRemoteNG.My
+
+Namespace Config.Putty
+    Public MustInherit Class Provider
+#Region "Public Methods"
+        Private _rootTreeNode As TreeNode
+        Public ReadOnly Property RootTreeNode As TreeNode
+            Get
+                If _rootTreeNode Is Nothing Then _rootTreeNode = CreateRootTreeNode()
+                Return _rootTreeNode
+            End Get
+        End Property
+
+        Private _rootInfo As Root.PuttySessions.Info
+        Public ReadOnly Property RootInfo() As Root.PuttySessions.Info
+            Get
+                If _rootInfo Is Nothing Then _rootInfo = CreateRootInfo()
+                Return _rootInfo
+            End Get
+        End Property
+
+        Public MustOverride Function GetSessionNames(Optional ByVal raw As Boolean = False) As String()
+        Public MustOverride Function GetSession(ByVal sessionName As String) As Connection.PuttySession.Info
+
+        Public Overridable Function GetSessions() As Connection.PuttySession.Info()
+            Dim sessionList As New List(Of Connection.PuttySession.Info)
+            Dim sessionInfo As Connection.Info
+            For Each sessionName As String In GetSessionNames(True)
+                sessionInfo = GetSession(sessionName)
+                If sessionInfo Is Nothing OrElse String.IsNullOrEmpty(sessionInfo.Hostname) Then Continue For
+                sessionList.Add(sessionInfo)
+            Next
+            Return sessionList.ToArray()
+        End Function
+
+        Public Overridable Sub StartWatcher()
+
+        End Sub
+
+        Public Overridable Sub StopWatcher()
+
+        End Sub
+#End Region
+
+#Region "Public Events"
+        Public Event SessionChanged(ByVal sender As Object, ByVal e As SessionChangedEventArgs)
+#End Region
+
+#Region "Public Classes"
+        Public Class SessionChangedEventArgs
+            Inherits EventArgs
+        End Class
+#End Region
+
+#Region "Protected Methods"
+        Private Delegate Function CreateRootTreeNodeDelegate() As TreeNode
+        Protected Overridable Function CreateRootTreeNode() As TreeNode
+            Dim treeView As TreeView = Tree.Node.TreeView
+            If treeView Is Nothing Then Return Nothing
+            If treeView.InvokeRequired Then
+                Return treeView.Invoke(New CreateRootTreeNodeDelegate(AddressOf CreateRootTreeNode))
+            End If
+
+            Dim newTreeNode As New TreeNode
+            RootInfo.TreeNode = newTreeNode
+
+            newTreeNode.Name = _rootInfo.Name
+            newTreeNode.Text = _rootInfo.Name
+            newTreeNode.Tag = _rootInfo
+            newTreeNode.ImageIndex = Images.Enums.TreeImage.PuttySessions
+            newTreeNode.SelectedImageIndex = Images.Enums.TreeImage.PuttySessions
+
+            Return newTreeNode
+        End Function
+
+        Protected Overridable Function CreateRootInfo() As Root.PuttySessions.Info
+            Dim newRootInfo As New Root.PuttySessions.Info
+
+            If String.IsNullOrEmpty(My.Settings.PuttySavedSessionsName) Then
+                newRootInfo.Name = Language.strPuttySavedSessionsRootName
+            Else
+                newRootInfo.Name = My.Settings.PuttySavedSessionsName
+            End If
+
+            If String.IsNullOrEmpty(My.Settings.PuttySavedSessionsPanel) Then
+                newRootInfo.Panel = Language.strGeneral
+            Else
+                newRootInfo.Panel = My.Settings.PuttySavedSessionsPanel
+            End If
+
+            Return newRootInfo
+        End Function
+
+        Protected Overridable Sub OnSessionChanged(ByVal e As SessionChangedEventArgs)
+            RaiseEvent SessionChanged(Me, New SessionChangedEventArgs())
+        End Sub
+#End Region
+    End Class
+End Namespace

mRemoteV1/Config/Putty/RegistryProvider.vb

@@ -0,0 +1,121 @@
+Imports System.Management
+Imports mRemoteNG.App
+Imports mRemoteNG.Messages
+Imports Microsoft.Win32
+Imports mRemoteNG.Connection.Protocol
+Imports System.Security.Principal
+
+Namespace Config.Putty
+    Public Class RegistryProvider
+        Inherits Provider
+
+#Region "Public Methods"
+        Public Overrides Function GetSessionNames(Optional ByVal raw As Boolean = False) As String()
+            Dim sessionsKey As RegistryKey = Registry.CurrentUser.OpenSubKey(PuttySessionsKey)
+            If sessionsKey Is Nothing Then Return New String() {}
+
+            Dim sessionNames As New List(Of String)
+            For Each sessionName As String In sessionsKey.GetSubKeyNames()
+                If raw Then
+                    sessionNames.Add(sessionName)
+                Else
+                    sessionNames.Add(Web.HttpUtility.UrlDecode(sessionName.Replace("+", "%2B")))
+                End If
+            Next
+
+            If raw Then
+                If Not sessionNames.Contains("Default%20Settings") Then ' Do not localize
+                    sessionNames.Insert(0, "Default%20Settings")
+                End If
+            Else
+                If Not sessionNames.Contains("Default Settings") Then
+                    sessionNames.Insert(0, "Default Settings")
+                End If
+            End If
+
+            Return sessionNames.ToArray()
+        End Function
+
+        Public Overrides Function GetSession(ByVal sessionName As String) As Connection.PuttySession.Info
+            Dim sessionsKey As RegistryKey = Registry.CurrentUser.OpenSubKey(PuttySessionsKey)
+            If sessionsKey Is Nothing Then Return Nothing
+
+            Dim sessionKey As RegistryKey = sessionsKey.OpenSubKey(sessionName)
+            If sessionKey Is Nothing Then Return Nothing
+
+            sessionName = Web.HttpUtility.UrlDecode(sessionName.Replace("+", "%2B"))
+
+            Dim sessionInfo As New Connection.PuttySession.Info
+            With sessionInfo
+                .PuttySession = sessionName
+                .Name = sessionName
+                .Hostname = sessionKey.GetValue("HostName")
+                .Username = sessionKey.GetValue("UserName")
+                Dim protocol As String = sessionKey.GetValue("Protocol")
+                If protocol Is Nothing Then protocol = "ssh"
+                Select Case protocol.ToLowerInvariant()
+                    Case "raw"
+                        .Protocol = Protocols.RAW
+                    Case "rlogin"
+                        .Protocol = Protocols.Rlogin
+                    Case "serial"
+                        Return Nothing
+                    Case "ssh"
+                        Dim sshVersionObject As Object = sessionKey.GetValue("SshProt")
+                        If sshVersionObject IsNot Nothing Then
+                            Dim sshVersion As Integer = CType(sshVersionObject, Integer)
+                            If sshVersion >= 2 Then
+                                .Protocol = Protocols.SSH2
+                            Else
+                                .Protocol = Protocols.SSH1
+                            End If
+                        Else
+                            .Protocol = Protocols.SSH2
+                        End If
+                    Case "telnet"
+                        .Protocol = Protocols.Telnet
+                    Case Else
+                        Return Nothing
+                End Select
+                .Port = sessionKey.GetValue("PortNumber")
+            End With
+
+            Return sessionInfo
+        End Function
+
+        Public Overrides Sub StartWatcher()
+            If _eventWatcher IsNot Nothing Then Return
+
+            Try
+                Dim currentUserSid As String = WindowsIdentity.GetCurrent().User.Value
+                Dim key As String = String.Join("\", {currentUserSid, PuttySessionsKey}).Replace("\", "\\")
+                Dim query As New WqlEventQuery(String.Format("SELECT * FROM RegistryTreeChangeEvent WHERE Hive = 'HKEY_USERS' AND RootPath = '{0}'", key))
+                _eventWatcher = New ManagementEventWatcher(query)
+                AddHandler _eventWatcher.EventArrived, AddressOf OnManagementEventArrived
+                _eventWatcher.Start()
+            Catch ex As Exception
+                Runtime.MessageCollector.AddExceptionMessage("PuttySessions.Watcher.StartWatching() failed.", ex, MessageClass.WarningMsg, True)
+            End Try
+        End Sub
+
+        Public Overrides Sub StopWatcher()
+            If _eventWatcher Is Nothing Then Return
+            _eventWatcher.Stop()
+            _eventWatcher.Dispose()
+            _eventWatcher = Nothing
+        End Sub
+#End Region
+
+#Region "Private Fields"
+        Private Const PuttySessionsKey As String = "Software\SimonTatham\PuTTY\Sessions"
+        Private Shared _eventWatcher As ManagementEventWatcher
+#End Region
+
+#Region "Private Methods"
+        Private Sub OnManagementEventArrived(ByVal sender As Object, ByVal e As EventArrivedEventArgs)
+            OnSessionChanged(New SessionChangedEventArgs())
+        End Sub
+#End Region
+    End Class
+End Namespace
+

mRemoteV1/Config/Putty/Sessions.vb

@@ -0,0 +1,168 @@
+Imports System.ComponentModel
+Imports mRemoteNG.Tools
+
+Namespace Config.Putty
+    Public Class Sessions
+#Region "Public Methods"
+        Private Delegate Sub AddSessionsToTreeDelegate()
+        Public Shared Sub AddSessionsToTree()
+            Dim treeView As TreeView = Tree.Node.TreeView
+            If treeView Is Nothing Then Return
+            If treeView.InvokeRequired Then
+                treeView.Invoke(New AddSessionsToTreeDelegate(AddressOf AddSessionsToTree))
+                Return
+            End If
+
+            For Each provider As Provider In Providers
+                Dim rootTreeNode As TreeNode = provider.RootTreeNode
+                Dim inUpdate As Boolean = False
+
+                Dim savedSessions As New List(Of Connection.Info)(provider.GetSessions())
+                If Not IsProviderEnabled(provider) Or savedSessions Is Nothing OrElse savedSessions.Count = 0 Then
+                    If rootTreeNode IsNot Nothing AndAlso treeView.Nodes.Contains(rootTreeNode) Then
+                        treeView.BeginUpdate()
+                        treeView.Nodes.Remove(rootTreeNode)
+                        treeView.EndUpdate()
+                    End If
+                    Continue For
+                End If
+
+                If Not treeView.Nodes.Contains(rootTreeNode) Then
+                    If Not inUpdate Then
+                        treeView.BeginUpdate()
+                        inUpdate = True
+                    End If
+                    treeView.Nodes.Add(rootTreeNode)
+                End If
+
+                Dim newTreeNodes As New List(Of TreeNode)
+                For Each sessionInfo As Connection.PuttySession.Info In savedSessions
+                    Dim treeNode As TreeNode
+                    Dim isNewNode As Boolean
+                    If rootTreeNode.Nodes.ContainsKey(sessionInfo.Name) Then
+                        treeNode = rootTreeNode.Nodes.Item(sessionInfo.Name)
+                        isNewNode = False
+                    Else
+                        treeNode = Tree.Node.AddNode(Tree.Node.Type.PuttySession, sessionInfo.Name)
+                        If treeNode Is Nothing Then Continue For
+                        treeNode.Name = treeNode.Text
+                        treeNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                        treeNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                        isNewNode = True
+                    End If
+
+                    sessionInfo.RootPuttySessionsInfo = provider.RootInfo
+                    sessionInfo.TreeNode = treeNode
+                    sessionInfo.Inherit.TurnOffInheritanceCompletely()
+
+                    treeNode.Tag = sessionInfo
+
+                    If isNewNode Then newTreeNodes.Add(treeNode)
+                Next
+
+                For Each treeNode As TreeNode In rootTreeNode.Nodes
+                    If Not savedSessions.Contains(treeNode.Tag) Then
+                        If Not inUpdate Then
+                            treeView.BeginUpdate()
+                            inUpdate = True
+                        End If
+                        rootTreeNode.Nodes.Remove(treeNode)
+                    End If
+                Next
+
+                If Not newTreeNodes.Count = 0 Then
+                    If Not inUpdate Then
+                        treeView.BeginUpdate()
+                        inUpdate = True
+                    End If
+                    rootTreeNode.Nodes.AddRange(newTreeNodes.ToArray())
+                End If
+
+                If inUpdate Then
+                    Tree.Node.Sort(rootTreeNode, SortOrder.Ascending)
+                    rootTreeNode.Expand()
+                    treeView.EndUpdate()
+                End If
+            Next
+        End Sub
+
+        Public Shared Sub StartWatcher()
+            For Each provider As Provider In Providers
+                provider.StartWatcher()
+                AddHandler provider.SessionChanged, AddressOf SessionChanged
+            Next
+        End Sub
+
+        Public Shared Sub StopWatcher()
+            For Each provider As Provider In Providers
+                provider.StopWatcher()
+                RemoveHandler provider.SessionChanged, AddressOf SessionChanged
+            Next
+        End Sub
+
+        Public Shared Sub SessionChanged(ByVal sender As Object, ByVal e As Provider.SessionChangedEventArgs)
+            AddSessionsToTree()
+        End Sub
+#End Region
+
+#Region "Private Methods"
+        Private Shared _providers As List(Of Provider)
+        Private Shared ReadOnly Property Providers() As List(Of Provider)
+            Get
+                If _providers Is Nothing OrElse _providers.Count = 0 Then AddProviders()
+                Return _providers
+            End Get
+        End Property
+
+        Private Shared Sub AddProviders()
+            _providers = New List(Of Provider)()
+            _providers.Add(New RegistryProvider())
+            _providers.Add(New XmingProvider())
+        End Sub
+
+        Private Shared Function GetSessionNames(Optional ByVal raw As Boolean = False) As String()
+            Dim sessionNames As New List(Of String)
+            For Each provider As Provider In Providers
+                If Not IsProviderEnabled(provider) Then Continue For
+                sessionNames.AddRange(provider.GetSessionNames(raw))
+            Next
+            Return sessionNames.ToArray()
+        End Function
+
+        Private Shared Function IsProviderEnabled(ByVal provider As Provider) As Boolean
+            Dim enabled As Boolean = True
+            Select Case PuttyTypeDetector.GetPuttyType()
+                Case PuttyTypeDetector.PuttyType.Xming
+                    If TypeOf (provider) Is RegistryProvider Then enabled = False
+                Case Else
+                    If TypeOf (provider) Is XmingProvider Then enabled = False
+            End Select
+            Return enabled
+        End Function
+#End Region
+
+#Region "Public Classes"
+        Public Class SessionList
+            Inherits StringConverter
+
+            Public Shared ReadOnly Property Names() As String()
+                Get
+                    Return GetSessionNames()
+                End Get
+            End Property
+
+            Public Overloads Overrides Function GetStandardValues(ByVal context As System.ComponentModel.ITypeDescriptorContext) As System.ComponentModel.TypeConverter.StandardValuesCollection
+                Return New StandardValuesCollection(Names)
+            End Function
+
+            Public Overloads Overrides Function GetStandardValuesExclusive(ByVal context As System.ComponentModel.ITypeDescriptorContext) As Boolean
+                Return True
+            End Function
+
+            Public Overloads Overrides Function GetStandardValuesSupported(ByVal context As ITypeDescriptorContext) As Boolean
+                Return True
+            End Function
+        End Class
+#End Region
+    End Class
+End Namespace

mRemoteV1/Config/Putty/XmingProvider.vb

@@ -0,0 +1,259 @@
+Imports System.IO
+Imports mRemoteNG.App
+Imports mRemoteNG.Messages
+Imports mRemoteNG.Connection.Protocol
+Imports System.Text.RegularExpressions
+
+Namespace Config.Putty
+    Public Class XmingProvider
+        Inherits Provider
+
+#Region "Public Methods"
+        Public Overrides Function GetSessionNames(Optional ByVal raw As Boolean = False) As String()
+            Dim sessionsFolderPath As String = GetSessionsFolderPath()
+            If Not Directory.Exists(sessionsFolderPath) Then Return New String() {}
+
+            Dim sessionNames As New List(Of String)
+            For Each sessionName As String In Directory.GetFiles(sessionsFolderPath)
+                sessionName = Path.GetFileName(sessionName)
+                If raw Then
+                    sessionNames.Add(sessionName)
+                Else
+                    sessionNames.Add(Web.HttpUtility.UrlDecode(sessionName.Replace("+", "%2B")))
+                End If
+            Next
+
+            If raw Then
+                If Not sessionNames.Contains("Default%20Settings") Then ' Do not localize
+                    sessionNames.Insert(0, "Default%20Settings")
+                End If
+            Else
+                If Not sessionNames.Contains("Default Settings") Then
+                    sessionNames.Insert(0, "Default Settings")
+                End If
+            End If
+
+            Dim registrySessionNames As New List(Of String)
+            For Each sessionName As String In RegistryProvider.GetSessionNames(raw)
+                registrySessionNames.Add(String.Format(RegistrySessionNameFormat, sessionName))
+            Next
+
+            sessionNames.AddRange(registrySessionNames)
+            sessionNames.Sort()
+
+            Return sessionNames.ToArray()
+        End Function
+
+        Public Overrides Function GetSession(ByVal sessionName As String) As Connection.PuttySession.Info
+            Dim registrySessionName As String = GetRegistrySessionName(sessionName)
+            If Not String.IsNullOrEmpty(registrySessionName) Then
+                Return ModifyRegistrySessionInfo(RegistryProvider.GetSession(registrySessionName))
+            End If
+
+            Dim sessionsFolderPath As String = GetSessionsFolderPath()
+            If Not Directory.Exists(sessionsFolderPath) Then Return Nothing
+
+            Dim sessionFile As String = Path.Combine(sessionsFolderPath, sessionName)
+            If Not File.Exists(sessionFile) Then Return Nothing
+
+            sessionName = Web.HttpUtility.UrlDecode(sessionName.Replace("+", "%2B"))
+
+            Dim sessionFileReader As New SessionFileReader(sessionFile)
+            Dim sessionInfo As New Connection.PuttySession.Info
+            With sessionInfo
+                .PuttySession = sessionName
+                .Name = sessionName
+                .Hostname = sessionFileReader.GetValue("HostName")
+                .Username = sessionFileReader.GetValue("UserName")
+                Dim protocol As String = sessionFileReader.GetValue("Protocol")
+                If protocol Is Nothing Then protocol = "ssh"
+                Select Case protocol.ToLowerInvariant()
+                    Case "raw"
+                        .Protocol = Protocols.RAW
+                    Case "rlogin"
+                        .Protocol = Protocols.Rlogin
+                    Case "serial"
+                        Return Nothing
+                    Case "ssh"
+                        Dim sshVersionObject As Object = sessionFileReader.GetValue("SshProt")
+                        If sshVersionObject IsNot Nothing Then
+                            Dim sshVersion As Integer = CType(sshVersionObject, Integer)
+                            If sshVersion >= 2 Then
+                                .Protocol = Protocols.SSH2
+                            Else
+                                .Protocol = Protocols.SSH1
+                            End If
+                        Else
+                            .Protocol = Protocols.SSH2
+                        End If
+                    Case "telnet"
+                        .Protocol = Protocols.Telnet
+                    Case Else
+                        Return Nothing
+                End Select
+                .Port = sessionFileReader.GetValue("PortNumber")
+            End With
+
+            Return sessionInfo
+        End Function
+
+        Public Overrides Sub StartWatcher()
+            RegistryProvider.StartWatcher()
+            AddHandler RegistryProvider.SessionChanged, AddressOf OnRegistrySessionChanged
+
+            If _eventWatcher IsNot Nothing Then Return
+
+            Try
+                _eventWatcher = New FileSystemWatcher(GetSessionsFolderPath())
+                _eventWatcher.NotifyFilter = (NotifyFilters.FileName Or NotifyFilters.LastWrite)
+                AddHandler _eventWatcher.Changed, AddressOf OnFileSystemEventArrived
+                AddHandler _eventWatcher.Created, AddressOf OnFileSystemEventArrived
+                AddHandler _eventWatcher.Deleted, AddressOf OnFileSystemEventArrived
+                AddHandler _eventWatcher.Renamed, AddressOf OnFileSystemEventArrived
+                _eventWatcher.EnableRaisingEvents = True
+            Catch ex As Exception
+                Runtime.MessageCollector.AddExceptionMessage("XmingPortablePuttySessions.Watcher.StartWatching() failed.", ex, MessageClass.WarningMsg, True)
+            End Try
+        End Sub
+
+        Public Overrides Sub StopWatcher()
+            RegistryProvider.StopWatcher()
+            RemoveHandler RegistryProvider.SessionChanged, AddressOf OnRegistrySessionChanged
+
+            If _eventWatcher Is Nothing Then Return
+            _eventWatcher.EnableRaisingEvents = False
+            _eventWatcher.Dispose()
+            _eventWatcher = Nothing
+        End Sub
+#End Region
+
+#Region "Private Fields"
+        Private Const RegistrySessionNameFormat As String = "{0} [registry]"
+        Private Const RegistrySessionNamePattern As String = "(.*)\ \[registry\]"
+
+        Private Shared ReadOnly RegistryProvider As New RegistryProvider
+        Private Shared _eventWatcher As FileSystemWatcher
+#End Region
+
+#Region "Private Methods"
+        Private Shared Function GetPuttyConfPath() As String
+            Dim puttyPath As String
+            If My.Settings.UseCustomPuttyPath Then
+                puttyPath = My.Settings.CustomPuttyPath
+            Else
+                puttyPath = Info.General.PuttyPath
+            End If
+            Return Path.Combine(Path.GetDirectoryName(puttyPath), "putty.conf")
+        End Function
+
+        Private Shared Function GetSessionsFolderPath() As String
+            Dim puttyConfPath As String = GetPuttyConfPath()
+            Dim sessionFileReader As New PuttyConfFileReader(puttyConfPath)
+            Dim basePath As String = Environment.ExpandEnvironmentVariables(sessionFileReader.GetValue("sshk&sess"))
+            Return Path.Combine(basePath, "sessions")
+        End Function
+
+        Private Shared Function GetRegistrySessionName(ByVal sessionName As String) As String
+            Dim regex As New Regex(RegistrySessionNamePattern)
+
+            Dim matches As MatchCollection = regex.Matches(sessionName)
+            If matches.Count < 1 Then Return String.Empty
+
+            Dim groups As GroupCollection = matches(0).Groups
+            If groups.Count < 1 Then Return String.Empty ' This should always include at least one item, but check anyway
+
+            Return groups(1).Value
+        End Function
+
+        Private Shared Function ModifyRegistrySessionInfo(ByVal sessionInfo As Connection.PuttySession.Info) As Connection.PuttySession.Info
+            sessionInfo.Name = String.Format(RegistrySessionNameFormat, sessionInfo.Name)
+            sessionInfo.PuttySession = String.Format(RegistrySessionNameFormat, sessionInfo.PuttySession)
+            Return sessionInfo
+        End Function
+
+        Private Sub OnFileSystemEventArrived(ByVal sender As Object, ByVal e As FileSystemEventArgs)
+            OnSessionChanged(New SessionChangedEventArgs())
+        End Sub
+
+        Private Sub OnRegistrySessionChanged(ByVal sender As Object, ByVal e As SessionChangedEventArgs)
+            OnSessionChanged(New SessionChangedEventArgs())
+        End Sub
+#End Region
+
+#Region "Private Classes"
+        Private Class PuttyConfFileReader
+            Public Sub New(ByVal puttyConfFile As String)
+                _puttyConfFile = puttyConfFile
+            End Sub
+
+            Private ReadOnly _puttyConfFile As String
+            Private _configurationLoaded As Boolean = False
+            Private ReadOnly _configuration As New Dictionary(Of String, String)
+
+            Private Sub LoadConfiguration()
+                _configurationLoaded = True
+                Try
+                    If Not File.Exists(_puttyConfFile) Then Return
+                    Using streamReader As New StreamReader(_puttyConfFile)
+                        Dim line As String
+                        Do
+                            line = streamReader.ReadLine()
+                            If line Is Nothing Then Exit Do
+                            line = line.Trim()
+                            If line = String.Empty Then Continue Do ' Blank line
+                            If line.Substring(0, 1) = ";" Then Continue Do ' Comment
+                            Dim parts() As String = line.Split(New Char() {"="}, 2)
+                            If parts.Length < 2 Then Continue Do
+                            If _configuration.ContainsKey(parts(0)) Then Continue Do ' As per http://www.straightrunning.com/XmingNotes/portableputty.php only first entry is used
+                            _configuration.Add(parts(0), parts(1))
+                        Loop
+                    End Using
+                Catch ex As Exception
+                    Runtime.MessageCollector.AddExceptionMessage("PuttyConfFileReader.LoadConfiguration() failed.", ex, MessageClass.ErrorMsg, True)
+                End Try
+            End Sub
+
+            Public Function GetValue(ByVal setting As String) As String
+                If Not _configurationLoaded Then LoadConfiguration()
+                If Not _configuration.ContainsKey(setting) Then Return String.Empty
+                Return _configuration(setting)
+            End Function
+        End Class
+
+        Private Class SessionFileReader
+            Public Sub New(ByVal sessionFile As String)
+                _sessionFile = sessionFile
+            End Sub
+
+            Private ReadOnly _sessionFile As String
+            Private _sessionInfoLoaded As Boolean = False
+            Private ReadOnly _sessionInfo As New Dictionary(Of String, String)
+
+            Private Sub LoadSessionInfo()
+                _sessionInfoLoaded = True
+                Try
+                    If Not File.Exists(_sessionFile) Then Return
+                    Using streamReader As New StreamReader(_sessionFile)
+                        Dim line As String
+                        Do
+                            line = streamReader.ReadLine()
+                            If line Is Nothing Then Exit Do
+                            Dim parts() As String = line.Split(New Char() {"\"})
+                            If parts.Length < 2 Then Continue Do
+                            _sessionInfo.Add(parts(0), parts(1))
+                        Loop
+                    End Using
+                Catch ex As Exception
+                    Runtime.MessageCollector.AddExceptionMessage("SessionFileReader.LoadSessionInfo() failed.", ex, MessageClass.ErrorMsg, True)
+                End Try
+            End Sub
+
+            Public Function GetValue(ByVal setting As String) As String
+                If Not _sessionInfoLoaded Then LoadSessionInfo()
+                If Not _sessionInfo.ContainsKey(setting) Then Return String.Empty
+                Return _sessionInfo(setting)
+            End Function
+        End Class
+#End Region
+    End Class
+End Namespace

mRemoteV1/Connection/Connection.Icon.vb

@@ -1,5 +1,5 @@
 Imports System.ComponentModel
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Public Class Icon
@@ -29,7 +29,7 @@ Namespace Connection
                     Return nI
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get Icon from String" & vbNewLine & ex.Message)
+                MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get Icon from String" & vbNewLine & ex.Message)
             End Try
 
             Return Nothing

mRemoteV1/Connection/Connection.Info.Inheritance.vb

@@ -0,0 +1,449 @@
+Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
+
+Namespace Connection
+    Partial Public Class Info
+        Public Class Inheritance
+#Region "Public Properties"
+#Region "General"
+            <LocalizedCategory("strCategoryGeneral", 1), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameAll"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionAll"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property EverythingInherited() As Boolean
+                Get
+                    If CacheBitmaps And Colors And Description And DisplayThemes And DisplayWallpaper _
+                    And EnableFontSmoothing And EnableDesktopComposition And Domain And Icon And Password _
+                    And Port And Protocol And PuttySession And RedirectDiskDrives And RedirectKeys _
+                    And RedirectPorts And RedirectPrinters And RedirectSmartCards And RedirectSound And Resolution _
+                    And AutomaticResize And UseConsoleSession And UseCredSsp And RenderingEngine And UserField _
+                    And ExtApp And Username And Panel And ICAEncryption And RDPAuthenticationLevel _
+                    And LoadBalanceInfo And PreExtApp And PostExtApp And MacAddress And VNCAuthMode _
+                    And VNCColors And VNCCompression And VNCEncoding And VNCProxyIP And VNCProxyPassword _
+                    And VNCProxyPort And VNCProxyType And VNCProxyUsername Then
+                        Return True
+                    Else
+                        Return False
+                    End If
+                End Get
+                Set(ByVal value As Boolean)
+                    SetAllValues(value)
+                End Set
+            End Property
+#End Region
+#Region "Display"
+            <LocalizedCategory("strCategoryDisplay", 2), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameDescription"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionDescription"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Description() As Boolean = My.Settings.InhDefaultDescription
+
+            <LocalizedCategory("strCategoryDisplay", 2), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameIcon"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionIcon"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Icon() As Boolean = My.Settings.InhDefaultIcon
+
+            <LocalizedCategory("strCategoryDisplay", 2), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNamePanel"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionPanel"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Panel() As Boolean = My.Settings.InhDefaultPanel
+#End Region
+#Region "Connection"
+            <LocalizedCategory("strCategoryConnection", 3), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameUsername"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionUsername"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Username() As Boolean = My.Settings.InhDefaultUsername
+
+            <LocalizedCategory("strCategoryConnection", 3), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNamePassword"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionPassword"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Password() As Boolean = My.Settings.InhDefaultPassword
+
+            <LocalizedCategory("strCategoryConnection", 3), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameDomain"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionDomain"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Domain() As Boolean = My.Settings.InhDefaultDomain
+#End Region
+#Region "Protocol"
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameProtocol"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionProtocol"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Protocol() As Boolean = My.Settings.InhDefaultProtocol
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameExternalTool"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalTool"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property ExtApp() As Boolean = My.Settings.InhDefaultExtApp
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNamePort"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionPort"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Port() As Boolean = My.Settings.InhDefaultPort
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNamePuttySession"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionPuttySession"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property PuttySession() As Boolean = My.Settings.InhDefaultPuttySession
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameEncryptionStrength"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionEncryptionStrength"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property ICAEncryption() As Boolean = My.Settings.InhDefaultICAEncryptionStrength
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameAuthenticationLevel"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionAuthenticationLevel"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDPAuthenticationLevel() As Boolean = My.Settings.InhDefaultRDPAuthenticationLevel
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameLoadBalanceInfo"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionLoadBalanceInfo"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property LoadBalanceInfo() As Boolean = My.Settings.InhDefaultLoadBalanceInfo
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRenderingEngine"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRenderingEngine"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RenderingEngine() As Boolean = My.Settings.InhDefaultRenderingEngine
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameUseConsoleSession"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionUseConsoleSession"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property UseConsoleSession() As Boolean = My.Settings.InhDefaultUseConsoleSession
+
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameUseCredSsp"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionUseCredSsp"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property UseCredSsp() As Boolean = My.Settings.InhDefaultUseCredSsp
+#End Region
+#Region "RD Gateway"
+            <LocalizedCategory("strCategoryGateway", 5), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUsageMethod"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayUsageMethod"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayUsageMethod() As Boolean = My.Settings.InhDefaultRDGatewayUsageMethod
+
+            <LocalizedCategory("strCategoryGateway", 5), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayHostname"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayHostname"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayHostname() As Boolean = My.Settings.InhDefaultRDGatewayHostname
+
+            <LocalizedCategory("strCategoryGateway", 5), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUseConnectionCredentials"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayUseConnectionCredentials"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayUseConnectionCredentials() As Boolean = My.Settings.InhDefaultRDGatewayUseConnectionCredentials
+
+            <LocalizedCategory("strCategoryGateway", 5), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUsername"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayUsername"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayUsername() As Boolean = My.Settings.InhDefaultRDGatewayUsername
+
+            <LocalizedCategory("strCategoryGateway", 5), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayPassword"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayPassword"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayPassword() As Boolean = My.Settings.InhDefaultRDGatewayPassword
+
+            <LocalizedCategory("strCategoryGateway", 5), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayDomain"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayDomain"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RDGatewayDomain() As Boolean = My.Settings.InhDefaultRDGatewayDomain
+ #End Region
+#Region "Appearance"
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameResolution"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionResolution"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Resolution() As Boolean = My.Settings.InhDefaultResolution
+
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameAutomaticResize"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionAutomaticResize"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property AutomaticResize() As Boolean = My.Settings.InhDefaultAutomaticResize
+
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameColors"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionColors"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property Colors() As Boolean = My.Settings.InhDefaultColors
+
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameCacheBitmaps"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionCacheBitmaps"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property CacheBitmaps() As Boolean = My.Settings.InhDefaultCacheBitmaps
+
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameDisplayWallpaper"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionDisplayWallpaper"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property DisplayWallpaper() As Boolean = My.Settings.InhDefaultDisplayWallpaper
+
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameDisplayThemes"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionDisplayThemes"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property DisplayThemes() As Boolean = My.Settings.InhDefaultDisplayThemes
+
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameEnableFontSmoothing"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionEnableFontSmoothing"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property EnableFontSmoothing() As Boolean = My.Settings.InhDefaultEnableFontSmoothing
+
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameEnableDesktopComposition"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionEnableEnableDesktopComposition"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property EnableDesktopComposition() As Boolean = My.Settings.InhDefaultEnableDesktopComposition
+#End Region
+#Region "Redirect"
+            <LocalizedCategory("strCategoryRedirect", 7), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectKeys"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectKeys"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RedirectKeys() As Boolean = My.Settings.InhDefaultRedirectKeys
+
+            <LocalizedCategory("strCategoryRedirect", 7), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectDrives"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectDrives"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RedirectDiskDrives() As Boolean = My.Settings.InhDefaultRedirectDiskDrives
+
+            <LocalizedCategory("strCategoryRedirect", 7), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectPrinters"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectPrinters"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RedirectPrinters() As Boolean = My.Settings.InhDefaultRedirectPrinters
+
+            <LocalizedCategory("strCategoryRedirect", 7), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectPorts"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectPorts"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RedirectPorts() As Boolean = My.Settings.InhDefaultRedirectPorts
+
+            <LocalizedCategory("strCategoryRedirect", 7), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectSmartCards"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectSmartCards"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RedirectSmartCards() As Boolean = My.Settings.InhDefaultRedirectSmartCards
+
+            <LocalizedCategory("strCategoryRedirect", 7), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectSounds"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectSounds"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property RedirectSound() As Boolean = My.Settings.InhDefaultRedirectSound
+#End Region
+#Region "Misc"
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameExternalToolBefore"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalToolBefore"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property PreExtApp() As Boolean = My.Settings.InhDefaultPreExtApp
+
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameExternalToolAfter"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalToolAfter"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property PostExtApp() As Boolean = My.Settings.InhDefaultPostExtApp
+
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameMACAddress"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionMACAddress"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property MacAddress() As Boolean = My.Settings.InhDefaultMacAddress
+
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameUser1"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionUser1"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property UserField() As Boolean = My.Settings.InhDefaultUserField
+#End Region
+#Region "VNC"
+            <LocalizedCategory("strCategoryAppearance", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameCompression"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionCompression"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCCompression() As Boolean = My.Settings.InhDefaultVNCCompression
+
+            <LocalizedCategory("strCategoryAppearance", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameEncoding"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionEncoding"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCEncoding() As Boolean = My.Settings.InhDefaultVNCEncoding
+
+            <LocalizedCategory("strCategoryConnection", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameAuthenticationMode"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionAuthenticationMode"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCAuthMode() As Boolean = My.Settings.InhDefaultVNCAuthMode
+
+            <LocalizedCategory("strCategoryMiscellaneous", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyType"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyType"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCProxyType() As Boolean = My.Settings.InhDefaultVNCProxyType
+
+            <LocalizedCategory("strCategoryMiscellaneous", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyAddress"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyAddress"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCProxyIP() As Boolean = My.Settings.InhDefaultVNCProxyIP
+
+            <LocalizedCategory("strCategoryMiscellaneous", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyPort"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyPort"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCProxyPort() As Boolean = My.Settings.InhDefaultVNCProxyPort
+
+            <LocalizedCategory("strCategoryMiscellaneous", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyUsername"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyUsername"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCProxyUsername() As Boolean = My.Settings.InhDefaultVNCProxyUsername
+
+            <LocalizedCategory("strCategoryMiscellaneous", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyPassword"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyPassword"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCProxyPassword() As Boolean = My.Settings.InhDefaultVNCProxyPassword
+
+            <LocalizedCategory("strCategoryAppearance", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameColors"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionColors"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCColors() As Boolean = My.Settings.InhDefaultVNCColors
+
+            <LocalizedCategory("strCategoryAppearance", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameSmartSizeMode"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionSmartSizeMode"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCSmartSizeMode() As Boolean = My.Settings.InhDefaultVNCSmartSizeMode
+
+            <LocalizedCategory("strCategoryAppearance", 9), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameViewOnly"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionViewOnly"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property VNCViewOnly() As Boolean = My.Settings.InhDefaultVNCViewOnly
+#End Region
+
+            <Browsable(False)> _
+            Public Property Parent() As Object
+
+            <Browsable(False)> _
+            Public Property IsDefault() As Boolean
+#End Region
+
+#Region "Constructors"
+            Public Sub New(ByVal parent As Object, Optional ByVal inheritEverything As Boolean = False)
+                Me.Parent = parent
+                If inheritEverything Then TurnOnInheritanceCompletely()
+            End Sub
+#End Region
+
+#Region "Public Methods"
+            Public Function Copy() As Inheritance
+                Return MemberwiseClone()
+            End Function
+
+            Public Sub TurnOnInheritanceCompletely()
+                SetAllValues(True)
+            End Sub
+
+            Public Sub TurnOffInheritanceCompletely()
+                SetAllValues(False)
+            End Sub
+#End Region
+
+#Region "Private Methods"
+            Private Sub SetAllValues(ByVal value As Boolean)
+                ' Display
+                Description = value
+                Icon = value
+                Panel = value
+
+                ' Connection
+                Username = value
+                Password = value
+                Domain = value
+
+                ' Protocol
+                Protocol = value
+                ExtApp = value
+                Port = value
+                PuttySession = value
+                ICAEncryption = value
+                RDPAuthenticationLevel = value
+                LoadBalanceInfo = value
+                RenderingEngine = value
+                UseConsoleSession = value
+                UseCredSsp = value
+
+                ' RD Gateway
+                RDGatewayUsageMethod = value
+                RDGatewayHostname = value
+                RDGatewayUseConnectionCredentials = value
+                RDGatewayUsername = value
+                RDGatewayPassword = value
+                RDGatewayDomain = value
+
+                ' Appearance
+                Resolution = value
+                AutomaticResize = value
+                Colors = value
+                CacheBitmaps = value
+                DisplayWallpaper = value
+                DisplayThemes = value
+                EnableFontSmoothing = value
+                EnableDesktopComposition = value
+
+                ' Redirect
+                RedirectKeys = value
+                RedirectDiskDrives = value
+                RedirectPrinters = value
+                RedirectPorts = value
+                RedirectSmartCards = value
+                RedirectSound = value
+
+                ' Misc
+                PreExtApp = value
+                PostExtApp = value
+                MacAddress = value
+                UserField = value
+
+                ' VNC
+                VNCCompression = value
+                VNCEncoding = value
+                VNCAuthMode = value
+                VNCProxyType = value
+                VNCProxyIP = value
+                VNCProxyPort = value
+                VNCProxyUsername = value
+                VNCProxyPassword = value
+                VNCColors = value
+                VNCSmartSizeMode = value
+                VNCViewOnly = value
+            End Sub
+#End Region
+        End Class
+    End Class
+End Namespace

mRemoteV1/Connection/Connection.InterfaceControl.vb

@@ -1,6 +1,6 @@
 Imports System.Windows.Forms
 Imports System.Drawing
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Public Class InterfaceControl
@@ -37,7 +37,7 @@ Namespace Connection
                 Me.Anchor = AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right Or AnchorStyles.Top
                 InitializeComponent()
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new InterfaceControl" & vbNewLine & ex.Message)
+                MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new InterfaceControl" & vbNewLine & ex.Message)
             End Try
         End Sub
 #End Region

mRemoteV1/Connection/Connection.List.vb

@@ -1,5 +1,3 @@
-Imports System.Windows.Forms
-
 Namespace Connection
     Public Class List
         Inherits CollectionBase

mRemoteV1/Connection/Connection.Protocol.Base.vb

@@ -1,6 +1,6 @@
 Imports System.Windows.Forms
 Imports System.Threading
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Namespace Protocol
@@ -17,14 +17,24 @@ Namespace Connection
                 End Set
             End Property
 
-
-            Private _InterfaceControl As Connection.InterfaceControl
-            Public Property InterfaceControl() As Connection.InterfaceControl
+            Private WithEvents _connectionWindow As UI.Window.Connection
+            Public Property ConnectionWindow As UI.Window.Connection
                 Get
-                    Return Me._InterfaceControl
+                    Return _connectionWindow
                 End Get
-                Set(ByVal value As Connection.InterfaceControl)
-                    Me._InterfaceControl = value
+                Set(value As UI.Window.Connection)
+                    _connectionWindow = value
+                End Set
+            End Property
+
+            Private _interfaceControl As InterfaceControl
+            Public Property InterfaceControl() As InterfaceControl
+                Get
+                    Return _interfaceControl
+                End Get
+                Set(ByVal value As InterfaceControl)
+                    _interfaceControl = value
+                    ConnectionWindow = TryCast(_interfaceControl.GetContainerControl(), UI.Window.Connection)
                 End Set
             End Property
 
@@ -39,12 +49,12 @@ Namespace Connection
             End Property
 #End Region
 
-            Private _Force As mRemote.Connection.Info.Force
-            Public Property Force() As mRemote.Connection.Info.Force
+            Private _Force As mRemoteNG.Connection.Info.Force
+            Public Property Force() As mRemoteNG.Connection.Info.Force
                 Get
                     Return Me._Force
                 End Get
-                Set(ByVal value As mRemote.Connection.Info.Force)
+                Set(ByVal value As mRemoteNG.Connection.Info.Force)
                     Me._Force = value
                 End Set
             End Property
@@ -58,26 +68,38 @@ Namespace Connection
                 Try
                     Me._Control.Focus()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't focus Control (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't focus Control (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
+            Public Overridable Sub ResizeBegin(ByVal sender As System.Object, ByVal e As EventArgs) Handles _connectionWindow.ResizeBegin
+
+            End Sub
+
+            Public Overridable Sub Resize(ByVal sender As System.Object, ByVal e As EventArgs) Handles _connectionWindow.Resize
+
+            End Sub
+
+            Public Overridable Sub ResizeEnd(ByVal sender As System.Object, ByVal e As EventArgs) Handles _connectionWindow.ResizeEnd
+
+            End Sub
+
             Public Overridable Function SetProps() As Boolean
                 Try
-                    Me._InterfaceControl.Parent.Tag = Me._InterfaceControl
-                    Me._InterfaceControl.Show()
+                    Me._interfaceControl.Parent.Tag = Me._interfaceControl
+                    Me._interfaceControl.Show()
 
                     If Me._Control IsNot Nothing Then
                         Me._Control.Name = Me._Name
-                        Me._Control.Parent = Me._InterfaceControl
-                        Me._Control.Location = Me._InterfaceControl.Location
+                        Me._Control.Parent = Me._interfaceControl
+                        Me._Control.Location = Me._interfaceControl.Location
                         Me._Control.Size = Me.InterfaceControl.Size
-                        Me._Control.Anchor = Me._InterfaceControl.Anchor
+                        Me._Control.Anchor = Me._interfaceControl.Anchor
                     End If
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -92,12 +114,9 @@ Namespace Connection
                 Me.Close()
             End Sub
 
-            Public Overridable Sub Resize()
-
-            End Sub
-
             Public Overridable Sub Close()
                 Dim t As New Thread(AddressOf CloseBG)
+                t.SetApartmentState(Threading.ApartmentState.STA)
                 t.IsBackground = True
                 t.Start()
             End Sub
@@ -112,7 +131,7 @@ Namespace Connection
                         Try
                             Me.DisposeControl()
                         Catch ex As Exception
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "Could not dispose control, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                            MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Could not dispose control, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                         End Try
                     End If
 
@@ -126,11 +145,11 @@ Namespace Connection
                                 Me.DisposeInterface()
                             End If
                         Catch ex As Exception
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "Could not set InterfaceControl.Parent.Tag or Dispose Interface, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                            MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Could not set InterfaceControl.Parent.Tag or Dispose Interface, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                         End Try
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Close InterfaceControl BG (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Close InterfaceControl BG (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 

mRemoteV1/Connection/Connection.Protocol.HTTP.vb

@@ -1,6 +1,3 @@
-Imports System.Windows.Forms
-Imports mRemote.App.Runtime
-
 Namespace Connection
     Namespace Protocol
         Public Class HTTP

mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb

@@ -1,7 +1,6 @@
 Imports System.Windows.Forms
-Imports mRemote.App.Runtime
-Imports Skybound.Gecko
-Imports System.ComponentModel
+Imports mRemoteNG.App.Runtime
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -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
@@ -28,7 +26,7 @@ Namespace Connection
 
                     NewExtended()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new Connection.Protocol.HTTPBase" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -39,24 +37,34 @@ 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.ScrollBarsEnabled = True
+
+                        AddHandler objWebBrowser.Navigated, AddressOf wBrowser_Navigated
+                        AddHandler objWebBrowser.DocumentTitleChanged, AddressOf wBrowser_DocumentTitleChanged
+                        AddHandler objAxWebBrowser.NewWindow3, AddressOf wBrowser_NewWindow3
                     End If
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.HTTPBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -66,7 +74,7 @@ Namespace Connection
                     Dim strHost As String = Me.InterfaceControl.Info.Hostname
                     Dim strAuth As String = ""
 
-                    If Me.InterfaceControl.Info.Username <> "" And Me.InterfaceControl.Info.Password <> "" Then
+                    If Not ((Force And Info.Force.NoCredentials) = Info.Force.NoCredentials) And Not String.IsNullOrEmpty(InterfaceControl.Info.Username) And Not String.IsNullOrEmpty(InterfaceControl.Info.Password) Then
                         strAuth = "Authorization: Basic " + Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes(Me.InterfaceControl.Info.Username & ":" & Me.InterfaceControl.Info.Password)) & vbNewLine
                     End If
 
@@ -99,7 +107,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Connect (Connection.Protocol.HTTPBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -110,15 +118,22 @@ Namespace Connection
 #End Region
 
 #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
+            Private Sub wBrowser_Navigated(sender As Object, e As System.Windows.Forms.WebBrowserNavigatedEventArgs)
+                Dim objWebBrowser As WebBrowser = TryCast(wBrowser, WebBrowser)
+                If objWebBrowser Is Nothing Then Return
+
+                ' This can only be set once the WebBrowser control is shown, it will throw a COM exception otherwise.
+                objWebBrowser.AllowWebBrowserDrop = False
+
+                RemoveHandler objWebBrowser.Navigated, AddressOf wBrowser_Navigated
             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 +146,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,20 +162,45 @@ 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)
+                    MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strHttpDocumentTileChangeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
 
+#Region "Enums"
             Public Enum RenderingEngine
-                <Description("Internet Explorer")> _
+                <LocalizedDescription("strHttpInternetExplorer")> _
                 IE = 1
-                <Description("Gecko (Firefox)")> _
+                <LocalizedDescription("strHttpGecko")> _
                 Gecko = 2
             End Enum
+
+            Private Enum NWMF
+                ' ReSharper disable InconsistentNaming
+                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
+                ' ReSharper restore InconsistentNaming
+            End Enum
+#End Region
         End Class
     End Namespace
 End Namespace

mRemoteV1/Connection/Connection.Protocol.HTTPS.vb

@@ -1,7 +1,4 @@
-Imports System.Windows.Forms
-Imports mRemote.App.Runtime
-
-Namespace Connection
+Namespace Connection
     Namespace Protocol
         Public Class HTTPS
             Inherits Connection.Protocol.HTTPBase

mRemoteV1/Connection/Connection.Protocol.ICA.vb

@@ -1,7 +1,7 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Threading
 Imports AxWFICALib
-Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -18,7 +18,7 @@ Namespace Connection
                 Try
                     Me.Control = New AxICAClient
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new Connection.Protocol.ICA" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaControlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -45,13 +45,37 @@ Namespace Connection
 
                     Me.SetSecurity()
 
+                    'Disable hotkeys for international users
+                    ICA.Hotkey1Shift = Nothing
+                    ICA.Hotkey1Char = Nothing
+                    ICA.Hotkey2Shift = Nothing
+                    ICA.Hotkey2Char = Nothing
+                    ICA.Hotkey3Shift = Nothing
+                    ICA.Hotkey3Char = Nothing
+                    ICA.Hotkey4Shift = Nothing
+                    ICA.Hotkey4Char = Nothing
+                    ICA.Hotkey5Shift = Nothing
+                    ICA.Hotkey5Char = Nothing
+                    ICA.Hotkey6Shift = Nothing
+                    ICA.Hotkey6Char = Nothing
+                    ICA.Hotkey7Shift = Nothing
+                    ICA.Hotkey7Char = Nothing
+                    ICA.Hotkey8Shift = Nothing
+                    ICA.Hotkey8Char = Nothing
+                    ICA.Hotkey9Shift = Nothing
+                    ICA.Hotkey9Char = Nothing
+                    ICA.Hotkey10Shift = Nothing
+                    ICA.Hotkey10Char = Nothing
+                    ICA.Hotkey11Shift = Nothing
+                    ICA.Hotkey11Char = Nothing
+
                     ICA.PersistentCacheEnabled = Info.CacheBitmaps
 
                     ICA.Title = Info.Name
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.ICA)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -64,7 +88,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed!" & vbNewLine & ex.Message)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
@@ -73,6 +97,8 @@ Namespace Connection
 #Region "Private Methods"
             Private Sub SetCredentials()
                 Try
+                    If (Force And Info.Force.NoCredentials) = Info.Force.NoCredentials Then Return
+
                     Dim _user As String = Me.Info.Username
                     Dim _pass As String = Me.Info.Password
                     Dim _dom As String = Me.Info.Domain
@@ -110,7 +136,7 @@ Namespace Connection
                         ICA.Domain = _dom
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ICA SetCredentials failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetCredentialsFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -132,10 +158,11 @@ Namespace Connection
                             ICA.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, Screen.FromControl(frmMain).Bounds.Width, Screen.FromControl(frmMain).Bounds.Height, 0)
                             ICA.FullScreenWindow()
                         Case Else
-                            ICA.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, RDP.Resolutions.Items(Int(Info.Resolution)).Width, RDP.Resolutions.Items(Int(Info.Resolution)).Height, 0)
+                            Dim resolution As Rectangle = RDP.GetResolutionRectangle(Info.Resolution)
+                            ICA.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, resolution.Width, resolution.Height, 0)
                     End Select
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ICA SetResolution failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetResolutionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -143,6 +170,8 @@ Namespace Connection
                 Select Case Info.Colors
                     Case RDP.RDPColors.Colors256
                         ICA.SetProp("DesiredColor", 2)
+                    Case RDP.RDPColors.Colors15Bit
+                        ICA.SetProp("DesiredColor", 4)
                     Case RDP.RDPColors.Colors16Bit
                         ICA.SetProp("DesiredColor", 4)
                     Case Else
@@ -174,7 +203,7 @@ Namespace Connection
                     AddHandler ICA.OnConnectFailed, AddressOf ICAEvent_OnConnectFailed
                     AddHandler ICA.OnDisconnect, AddressOf ICAEvent_OnDisconnect
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ICA SetEventHandlers failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -229,15 +258,15 @@ Namespace Connection
             End Enum
 
             Public Enum EncryptionStrength
-                <Description("Basic")> _
+                <LocalizedDescription("strEncBasic")> _
                 EncrBasic = 1
-                <Description("128 Bit (logon only)")> _
+                <LocalizedDescription("strEnc128BitLogonOnly")> _
                 Encr128BitLogonOnly = 127
-                <Description("40 Bit")> _
+                <LocalizedDescription("strEnc40Bit")> _
                 Encr40Bit = 40
-                <Description("56 Bit")> _
+                <LocalizedDescription("strEnc56Bit")> _
                 Encr56Bit = 56
-                <Description("128 Bit")> _
+                <LocalizedDescription("strEnc128Bit")> _
                 Encr128Bit = 128
             End Enum
 #End Region

mRemoteV1/Connection/Connection.Protocol.IntApp.vb

@@ -1,186 +0,0 @@
-Imports mRemote.App.Native
-Imports System.Threading
-Imports Microsoft.Win32
-Imports System.Drawing
-Imports mRemote.App.Runtime
-
-Namespace Connection
-    Namespace Protocol
-        Public Class IntApp
-            Inherits Connection.Protocol.Base
-
-#Region "Private Properties"
-            Private IntAppProcessStartInfo As New ProcessStartInfo()
-            Private Arguments As String
-            Private ExtApp As Tools.ExternalApp
-#End Region
-
-#Region "Public Properties"
-            Private _IntAppHandle As IntPtr
-            Public Property IntAppHandle() As IntPtr
-                Get
-                    Return Me._IntAppHandle
-                End Get
-                Set(ByVal value As IntPtr)
-                    Me._IntAppHandle = value
-                End Set
-            End Property
-
-            Private _IntAppProcess As Process
-            Public Property IntAppProcess() As Process
-                Get
-                    Return Me._IntAppProcess
-                End Get
-                Set(ByVal value As Process)
-                    Me._IntAppProcess = value
-                End Set
-            End Property
-
-            Private _IntAppPath As String
-            Public Property IntAppPath() As String
-                Get
-                    Return _IntAppPath
-                End Get
-                Set(ByVal value As String)
-                    _IntAppPath = value
-                End Set
-            End Property
-
-            Public ReadOnly Property Focused() As Boolean
-                Get
-                    If GetForegroundWindow() = IntAppHandle Then
-                        Return True
-                    Else
-                        Return False
-                    End If
-                End Get
-            End Property
-#End Region
-
-#Region "Private Events & Handlers"
-            Private Sub ProcessExited(ByVal sender As Object, ByVal e As System.EventArgs)
-                MyBase.Event_Closed(Me)
-            End Sub
-#End Region
-
-#Region "Public Methods"
-            Public Sub New()
-
-            End Sub
-
-            Public Overrides Function SetProps() As Boolean
-                ExtApp = App.Runtime.GetExtAppByName(InterfaceControl.Info.ExtApp)
-                If InterfaceControl.Info IsNot Nothing Then
-                    ExtApp.ConnectionInfo = InterfaceControl.Info
-                End If
-
-                _IntAppPath = ExtApp.ParseText(ExtApp.FileName)
-                Arguments = ExtApp.ParseText(ExtApp.Arguments)
-
-                Return MyBase.SetProps()
-            End Function
-
-            Public Overrides Function Connect() As Boolean
-                Try
-                    If ExtApp.TryIntegrate = False Then
-                        ExtApp.Start(Me.InterfaceControl.Info)
-                        Me.Close()
-                        Return Nothing
-                    End If
-
-                    IntAppProcessStartInfo.FileName = _IntAppPath
-                    IntAppProcessStartInfo.Arguments = Arguments
-
-                    IntAppProcess = Process.Start(IntAppProcessStartInfo)
-                    IntAppProcess.EnableRaisingEvents = True
-                    IntAppProcess.WaitForInputIdle()
-
-                    AddHandler IntAppProcess.Exited, AddressOf ProcessExited
-
-                    Dim TryCount As Integer = 0
-                    Do Until IntAppProcess.MainWindowHandle <> IntPtr.Zero And Me.InterfaceControl.Handle <> IntPtr.Zero And Me.IntAppProcess.MainWindowTitle <> "Default IME"
-                        If TryCount >= My.Settings.MaxPuttyWaitTime * 2 Then
-                            Exit Do
-                        End If
-
-                        IntAppProcess.Refresh()
-
-                        Thread.Sleep(500)
-
-                        TryCount += 1
-                    Loop
-
-                    IntAppHandle = IntAppProcess.MainWindowHandle
-
-
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "--- IntApp Stuff ---", True)
-
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "IntApp Handle: " & IntAppHandle.ToString, True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "IntApp Title: " & IntAppProcess.MainWindowTitle, True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "IntApp Handle: " & Me.InterfaceControl.Parent.Handle.ToString, True)
-
-                    SetParent(Me.IntAppHandle, Me.InterfaceControl.Parent.Handle)
-                    SetWindowLong(Me.IntAppHandle, 0, WS_VISIBLE)
-                    ShowWindow(Me.IntAppHandle, SW_SHOWMAXIMIZED)
-
-                    Resize()
-
-                    MyBase.Connect()
-                    Return True
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Connect" & vbNewLine & ex.Message)
-                    Return False
-                End Try
-            End Function
-
-
-            Public Overrides Sub Focus()
-                Try
-                    SetForegroundWindow(IntAppHandle)
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Focus (Connection.Protocol.IntApp)" & vbNewLine & ex.Message, True)
-                End Try
-            End Sub
-
-            Public Overrides Sub Resize()
-                Try
-                    MoveWindow(IntAppHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), Me.InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), Me.InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True)
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Resize (Connection.Protocol.IntApp)" & vbNewLine & ex.Message, True)
-                End Try
-            End Sub
-
-            Public Overrides Sub Close()
-                Try
-                    If IntAppProcess.HasExited = False Then
-                        IntAppProcess.Kill()
-                    End If
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Killing IntApp Process failed (Connection.Protocol.IntApp)" & vbNewLine & ex.Message, True)
-                End Try
-
-                Try
-                    If IntAppProcess.HasExited = False Then
-                        IntAppProcess.Dispose()
-                    End If
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Dispose of IntApp process failed (Connection.Protocol.IntApp)" & vbNewLine & ex.Message, True)
-                End Try
-
-                MyBase.Close()
-            End Sub
-#End Region
-
-#Region "Public Shared Methods"
-          
-#End Region
-
-#Region "Enums"
-            Public Enum Defaults
-                Port = 0
-            End Enum
-#End Region
-
-        End Class
-    End Namespace
-End Namespace

mRemoteV1/Connection/Connection.Protocol.IntegratedProgram.vb

@@ -0,0 +1,121 @@
+Imports mRemoteNG.App.Native
+Imports System.Threading
+Imports mRemoteNG.App.Runtime
+Imports mRemoteNG.Tools
+
+Namespace Connection
+    Namespace Protocol
+        Public Class IntegratedProgram
+            Inherits Base
+#Region "Public Methods"
+            Public Overrides Function SetProps() As Boolean
+                If InterfaceControl.Info IsNot Nothing Then
+                    _externalTool = GetExtAppByName(InterfaceControl.Info.ExtApp)
+                    _externalTool.ConnectionInfo = InterfaceControl.Info
+                End If
+
+                Return MyBase.SetProps()
+            End Function
+
+            Public Overrides Function Connect() As Boolean
+                Try
+                    If _externalTool.TryIntegrate = False Then
+                        _externalTool.Start(InterfaceControl.Info)
+                        Close()
+                        Return Nothing
+                    End If
+
+                    _process = New Process()
+
+                    With _process.StartInfo
+                        .UseShellExecute = True
+                        .FileName = _externalTool.ParseArguments(_externalTool.FileName)
+                        .Arguments = _externalTool.ParseArguments(_externalTool.Arguments)
+                    End With
+
+                    _process.EnableRaisingEvents = True
+                    AddHandler _process.Exited, AddressOf ProcessExited
+
+                    _process.Start()
+                    _process.WaitForInputIdle(My.Settings.MaxPuttyWaitTime * 1000)
+
+                    Dim startTicks As Integer = Environment.TickCount
+                    While _handle.ToInt32 = 0 And Environment.TickCount < startTicks + (My.Settings.MaxPuttyWaitTime * 1000)
+                        _process.Refresh()
+                        If Not _process.MainWindowTitle = "Default IME" Then _handle = _process.MainWindowHandle
+                        If _handle.ToInt32 = 0 Then Thread.Sleep(0)
+                    End While
+
+                    SetParent(_handle, InterfaceControl.Handle)
+
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strIntAppStuff, True)
+
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.strIntAppHandle, _handle.ToString), True)
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.strIntAppTitle, _process.MainWindowTitle), True)
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.strIntAppParentHandle, InterfaceControl.Parent.Handle.ToString), True)
+
+                    Resize(Me, New EventArgs)
+
+                    MyBase.Connect()
+                    Return True
+                Catch ex As Exception
+                    MessageCollector.AddExceptionMessage(My.Language.strIntAppConnectionFailed, ex)
+                    Return False
+                End Try
+            End Function
+
+            Public Overrides Sub Focus()
+                Try
+                    If ConnectionWindow.InTabDrag Then Return
+                    SetForegroundWindow(_handle)
+                Catch ex As Exception
+                    MessageCollector.AddExceptionMessage(My.Language.strIntAppFocusFailed, ex, , True)
+                End Try
+            End Sub
+
+            Public Overrides Sub Resize(ByVal sender As Object, ByVal e As EventArgs)
+                Try
+                    If InterfaceControl.Size = Size.Empty Then Return
+                    MoveWindow(_handle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True)
+                Catch ex As Exception
+                    MessageCollector.AddExceptionMessage(My.Language.strIntAppResizeFailed, ex, , True)
+                End Try
+            End Sub
+
+            Public Overrides Sub Close()
+                Try
+                    If Not _process.HasExited Then _process.Kill()
+                Catch ex As Exception
+                    MessageCollector.AddExceptionMessage(My.Language.strIntAppKillFailed, ex, , True)
+                End Try
+
+                Try
+                    If Not _process.HasExited Then _process.Dispose()
+                Catch ex As Exception
+                    MessageCollector.AddExceptionMessage(My.Language.strIntAppDisposeFailed, ex, , True)
+                End Try
+
+                MyBase.Close()
+            End Sub
+#End Region
+
+#Region "Private Fields"
+            Private _externalTool As ExternalTool
+            Private _handle As IntPtr
+            Private _process As Process
+#End Region
+
+#Region "Private Methods"
+            Private Sub ProcessExited(ByVal sender As Object, ByVal e As EventArgs)
+                Event_Closed(Me)
+            End Sub
+#End Region
+
+#Region "Enumerations"
+            Public Enum Defaults
+                Port = 0
+            End Enum
+#End Region
+        End Class
+    End Namespace
+End Namespace

mRemoteV1/Connection/Connection.Protocol.Protocols.vb

@@ -1,32 +1,44 @@
-Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
+        Public Class Converter
+            Public Shared Function ProtocolToString(ByVal protocol As Protocols) As String
+                Return protocol.ToString()
+            End Function
+
+            Public Shared Function StringToProtocol(ByVal protocol As String) As Protocols
+                Try
+                    Return [Enum].Parse(GetType(Protocols), protocol, True)
+                Catch ex As Exception
+                    Return Protocols.RDP
+                End Try
+            End Function
+        End Class
+
         Public Enum Protocols
-            <Description("RDP")> _
+            <LocalizedDescription("strRDP")> _
             RDP = 0
-            <Description("VNC")> _
+            <LocalizedDescription("strVnc")> _
             VNC = 1
-            <Description("SSH1")> _
+            <LocalizedDescription("strSsh1")> _
             SSH1 = 2
-            <Description("SSH2")> _
+            <LocalizedDescription("strSsh2")> _
             SSH2 = 3
-            <Description("Telnet")> _
+            <LocalizedDescription("strTelnet")> _
             Telnet = 4
-            <Description("Rlogin")> _
+            <LocalizedDescription("strRlogin")> _
             Rlogin = 5
-            <Description("RAW")> _
+            <LocalizedDescription("strRAW")> _
             RAW = 6
-            <Description("HTTP")> _
+            <LocalizedDescription("strHttp")> _
             HTTP = 7
-            <Description("HTTPS")> _
+            <LocalizedDescription("strHttps")> _
             HTTPS = 8
-            <Description("ICA")> _
+            <LocalizedDescription("strICA")> _
             ICA = 9
-            <Description("Ext. App")> _
+            <LocalizedDescription("strExtApp")> _
             IntApp = 20
-            <Browsable(False)> _
-            NONE = 999
         End Enum
     End Namespace
 End Namespace

mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb

@@ -1,17 +1,25 @@
-Imports mRemote.App.Native
+Imports System.Runtime.InteropServices
+Imports System.ComponentModel
+Imports mRemoteNG.Messages
+Imports mRemoteNG.App.Native
 Imports System.Threading
 Imports Microsoft.Win32
 Imports System.Drawing
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
+Imports System.Text.RegularExpressions
+Imports mRemoteNG.Tools
 
 Namespace Connection
     Namespace Protocol
         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
+            Dim _isPuttyNg As Boolean
 #End Region
 
 #Region "Public Properties"
@@ -65,18 +73,6 @@ Namespace Connection
                 End Set
             End Property
 
-            'Private borderWidth As Integer = frmMain.Size.Width - frmMain.ClientSize.Width
-            'Private borderHeight As Integer = frmMain.Size.Height - frmMain.ClientSize.Height
-            Private Shared _BorderSize As Size
-            Public Shared Property BorderSize() As Size
-                Get
-                    Return _BorderSize
-                End Get
-                Set(ByVal value As Size)
-                    _BorderSize = value
-                End Set
-            End Property
-
             Public ReadOnly Property Focused() As Boolean
                 Get
                     If GetForegroundWindow() = PuttyHandle Then
@@ -101,99 +97,118 @@ Namespace Connection
 
             Public Overrides Function Connect() As Boolean
                 Try
-                    PuttyProcessStartInfo.FileName = _PuttyPath
+                    _isPuttyNg = (PuttyTypeDetector.GetPuttyType() = PuttyTypeDetector.PuttyType.PuttyNg)
 
-                    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 = ""
+                    PuttyProcess = New Process
+                    With PuttyProcess.StartInfo
+                        .UseShellExecute = False
+                        .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) & """"
+                        Dim arguments As New CommandLineArguments
+                        arguments.EscapeForShell = False
+
+                        arguments.Add("-load", InterfaceControl.Info.PuttySession)
+
+                        If Not TypeOf InterfaceControl.Info Is PuttySession.Info Then
+                            arguments.Add("-" & _PuttyProtocol.ToString)
+
+                            If _PuttyProtocol = Putty_Protocol.ssh Then
+                                Dim username As String = ""
+                                Dim password As String = ""
+
+                                If Not String.IsNullOrEmpty(InterfaceControl.Info.Username) Then
+                                    username = InterfaceControl.Info.Username
+                                Else
+                                    If My.Settings.EmptyCredentials = "windows" Then
+                                        username = Environment.UserName
+                                    ElseIf My.Settings.EmptyCredentials = "custom" Then
+                                        username = My.Settings.DefaultUsername
+                                    End If
+                                End If
+
+                                If Not String.IsNullOrEmpty(InterfaceControl.Info.Password) Then
+                                    password = InterfaceControl.Info.Password
+                                Else
+                                    If My.Settings.EmptyCredentials = "custom" Then
+                                        password = Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey)
+                                    End If
+                                End If
+
+                                arguments.Add("-" & _PuttySSHVersion)
+
+                                If Not ((Force And Info.Force.NoCredentials) = Info.Force.NoCredentials) Then
+                                    If Not String.IsNullOrEmpty(username) Then
+                                        arguments.Add("-l", username)
+                                    End If
+                                    If Not String.IsNullOrEmpty(password) Then
+                                        arguments.Add("-pw", password)
+                                    End If
+                                End If
                             End If
 
-                            If Me.InterfaceControl.Info.Username <> "" Then
-                                UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
-                            End If
-
-                            If Me.InterfaceControl.Info.Password <> "" Then
-                                PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
-                            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
-
-                    'REMOVE IN RELEASE!
-                    'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & Arguments, True)
-
-                    PuttyProcessStartInfo.Arguments = Arguments
-
-                    PuttyProcess = Process.Start(PuttyProcessStartInfo)
-                    PuttyProcess.EnableRaisingEvents = True
-                    PuttyProcess.WaitForInputIdle()
-
-                    AddHandler PuttyProcess.Exited, AddressOf ProcessExited
-
-                    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
-                            Exit Do
+                            arguments.Add("-P", InterfaceControl.Info.Port.ToString)
+                            arguments.Add(InterfaceControl.Info.Hostname)
                         End If
 
-                        PuttyProcess.Refresh()
+                        If _isPuttyNg Then
+                            arguments.Add("-hwndparent", InterfaceControl.Handle.ToString())
+                        End If
 
-                        Thread.Sleep(500)
+                        .Arguments = arguments.ToString
+                    End With
 
-                        TryCount += 1
-                    Loop
+                    PuttyProcess.EnableRaisingEvents = True
+                    AddHandler PuttyProcess.Exited, AddressOf ProcessExited
 
-                    PuttyHandle = PuttyProcess.MainWindowHandle
+                    PuttyProcess.Start()
+                    PuttyProcess.WaitForInputIdle(My.Settings.MaxPuttyWaitTime * 1000)
 
+                    Dim startTicks As Integer = Environment.TickCount
+                    While PuttyHandle.ToInt32 = 0 And Environment.TickCount < startTicks + (My.Settings.MaxPuttyWaitTime * 1000)
+                        If _isPuttyNg Then
+                            PuttyHandle = FindWindowEx(InterfaceControl.Handle, 0, vbNullString, vbNullString)
+                        Else
+                            PuttyProcess.Refresh()
+                            PuttyHandle = PuttyProcess.MainWindowHandle
+                        End If
+                        If PuttyHandle.ToInt32 = 0 Then Thread.Sleep(0)
+                    End While
 
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "--- PuTTY Stuff ---", True)
+                    If Not _isPuttyNg Then
+                        SetParent(PuttyHandle, InterfaceControl.Handle)
+                    End If
 
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Handle: " & PuttyHandle.ToString, True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Title: " & PuttyProcess.MainWindowTitle, True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "Panel Handle: " & Me.InterfaceControl.Parent.Handle.ToString, True)
+                    MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strPuttyStuff, True)
 
-                    SetParent(Me.PuttyHandle, Me.InterfaceControl.Parent.Handle)
-                    SetWindowLong(Me.PuttyHandle, 0, WS_VISIBLE)
-                    ShowWindow(Me.PuttyHandle, SW_SHOWMAXIMIZED)
-                    Resize()
+                    MessageCollector.AddMessage(MessageClass.InformationMsg, String.Format(My.Language.strPuttyHandle, PuttyHandle.ToString), True)
+                    MessageCollector.AddMessage(MessageClass.InformationMsg, String.Format(My.Language.strPuttyTitle, PuttyProcess.MainWindowTitle), True)
+                    MessageCollector.AddMessage(MessageClass.InformationMsg, String.Format(My.Language.strPuttyParentHandle, InterfaceControl.Parent.Handle.ToString), True)
+
+                    Resize(Me, New EventArgs)
 
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Connect" & vbNewLine & ex.Message)
+                    MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
 
-
             Public Overrides Sub Focus()
                 Try
+                    If ConnectionWindow.InTabDrag Then Return
                     SetForegroundWindow(PuttyHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Focus (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyFocusFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
-            Public Overrides Sub Resize()
+            Public Overrides Sub Resize(ByVal sender As Object, ByVal e As EventArgs)
                 Try
-                    MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), Me.InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), Me.InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True)
+                    If InterfaceControl.Size = Size.Empty Then Return
+                    MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Resize (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyResizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -203,53 +218,24 @@ Namespace Connection
                         PuttyProcess.Kill()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Killing Putty Process failed (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyKillFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Try
                     PuttyProcess.Dispose()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Dispose of Putty process failed (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyDisposeFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 MyBase.Close()
             End Sub
-#End Region
 
-#Region "Public Shared Methods"
-            Public Shared Function GetSessions() As Array
+            Public Sub ShowSettingsDialog()
                 Try
-                    Dim regKey As RegistryKey
-                    regKey = Registry.CurrentUser.OpenSubKey("Software\SimonTatham\PuTTY\Sessions")
-
-                    Dim arrKeys() As String
-                    arrKeys = regKey.GetSubKeyNames()
-                    Array.Resize(arrKeys, arrKeys.Length + 1)
-                    arrKeys(arrKeys.Length - 1) = "Default Settings"
-
-                    For i As Integer = 0 To arrKeys.Length - 1
-                        arrKeys(i) = System.Web.HttpUtility.UrlDecode(arrKeys(i))
-                    Next
-
-                    Return arrKeys
+                    PostMessage(Me.PuttyHandle, WM_SYSCOMMAND, IDM_RECONF, 0)
+                    SetForegroundWindow(Me.PuttyHandle)
                 Catch ex As Exception
-                    App.Runtime.mC.AddMessage(Messages.MessageClass.WarningMsg, "Couldn't get Putty sessions" & vbNewLine & ex.Message, True)
-                    Return Nothing
-                End Try
-            End Function
-
-            Public Shared Sub StartPutty()
-                Try
-                    Dim p As Process
-                    Dim pSI As New ProcessStartInfo
-                    pSI.FileName = PuttyPath
-
-                    p = Process.Start(pSI)
-                    p.WaitForExit()
-
-                    mRemote.Connection.PuttySession.PuttySessions = GetSessions()
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Start Putty (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyShowSettingsDialogFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -268,7 +254,6 @@ Namespace Connection
                 ssh2 = 2
             End Enum
 #End Region
-
         End Class
     End Namespace
 End Namespace

mRemoteV1/Connection/Connection.Protocol.VNC.vb

@@ -1,6 +1,6 @@
-Imports mRemote.App.Runtime
-Imports AxViewerX
+Imports mRemoteNG.App.Runtime
 Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -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,88 +45,74 @@ 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 = My.Language.strInheritConnecting & " (SmartCode VNC viewer)"
+                    'VNC.DisconnectedText = My.Language.strInheritDisconnected
+                    'VNC.MessageBoxes = False
+                    'VNC.EndInit()
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetProps failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -148,9 +121,9 @@ 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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncConnectionOpenFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
 
@@ -161,7 +134,7 @@ Namespace Connection
                 Try
                     VNC.Disconnect()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC Disconnect failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncConnectionDisconnectFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -169,12 +142,12 @@ 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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSendSpecialKeysFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -183,7 +156,7 @@ Namespace Connection
                     SmartSize = Not SmartSize
                     RefreshScreen()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC ToggleSmartSize failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncToggleSmartSizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -191,30 +164,30 @@ Namespace Connection
                 Try
                     ViewOnly = Not ViewOnly
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC ToggleViewOnly failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncToggleViewOnlyFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
 
             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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncStartChatFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
             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,9 +195,9 @@ 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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncRefreshFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -232,20 +205,14 @@ 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
+                    AddHandler mRemoteNG.frmMain.clipboardchange, AddressOf VNCEvent_ClipboardChanged
+                    If Not ((Force And Info.Force.NoCredentials) = Info.Force.NoCredentials) And 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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -253,12 +220,21 @@ Namespace Connection
 #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 Sub VNCEvent_ClipboardChanged()
+                Me.VNC.FillServerClipboard()
+            End Sub
+
+            Private Function VNCEvent_Authenticate() As String
+                Return Info.Password
+            End Function
 #End Region
 
 #Region "Enums"
@@ -272,7 +248,7 @@ Namespace Connection
             End Enum
 
             Public Enum Compression
-                <Description(Language.Base.NoCompression)> _
+                <LocalizedDescription("strNoCompression")> _
                 CompNone = 99
                 <Description("0")> _
                 Comp0 = 0
@@ -316,36 +292,36 @@ Namespace Connection
             End Enum
 
             Public Enum AuthMode
-                <Description("VNC")> _
+                <LocalizedDescription("VNC")> _
                 AuthVNC
-                <Description("Windows")> _
+                <LocalizedDescription("Windows")> _
                 AuthWin
             End Enum
 
             Public Enum ProxyType
-                <Description(Language.Base.None)> _
+                <LocalizedDescription("strNone")> _
                 ProxyNone
-                <Description("HTTP")> _
+                <LocalizedDescription("strHttp")> _
                 ProxyHTTP
-                <Description("Socks 5")> _
+                <LocalizedDescription("strSocks5")> _
                 ProxySocks5
-                <Description("Ultra VNC Repeater")> _
+                <LocalizedDescription("strUltraVncRepeater")> _
                 ProxyUltra
             End Enum
 
             Public Enum Colors
-                <Description(Language.Base.Normal)> _
+                <LocalizedDescription("strNormal")> _
                 ColNormal
                 <Description("8-bit")> _
                 Col8Bit
             End Enum
 
             Public Enum SmartSizeMode
-                <Description(Language.Base.NoSmartSize)> _
+                <LocalizedDescription("strNoSmartSize")> _
                 SmartSNo
-                <Description(Language.Base.Free)> _
+                <LocalizedDescription("strFree")> _
                 SmartSFree
-                <Description(Language.Base.Aspect)> _
+                <LocalizedDescription("strAspect")> _
                 SmartSAspect
             End Enum
 #End Region

mRemoteV1/Connection/Connection.PuttySession.vb

@@ -1,21 +0,0 @@
-Imports System.ComponentModel
-
-Namespace Connection
-    Public Class PuttySession
-        Inherits StringConverter
-
-        Public Shared PuttySessions As String() = New String() {}
-
-        Public Overloads Overrides Function GetStandardValues(ByVal context As System.ComponentModel.ITypeDescriptorContext) As System.ComponentModel.TypeConverter.StandardValuesCollection
-            Return New StandardValuesCollection(PuttySessions)
-        End Function
-
-        Public Overloads Overrides Function GetStandardValuesExclusive(ByVal context As System.ComponentModel.ITypeDescriptorContext) As Boolean
-            Return True
-        End Function
-
-        Public Overloads Overrides Function GetStandardValuesSupported(ByVal context As ITypeDescriptorContext) As Boolean
-            Return True
-        End Function
-    End Class
-End Namespace

mRemoteV1/Connection/Connection.QuickConnect.vb

@@ -1,31 +0,0 @@
-Imports mRemote.App.Runtime
-
-Namespace Connection
-    Public Class QuickConnect
-        Private Shared qBox As ToolStripComboBox = frmMain.cmbQuickConnect
-
-        Public Class History
-            Public Shared Function Exists(ByVal Text As String) As Boolean
-                Try
-                    For i As Integer = 0 To qBox.Items.Count - 1
-                        If qBox.Items(i) = Text Then
-                            Return True
-                        End If
-                    Next
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "QuickConnect History Exists failed" & vbNewLine & ex.Message, True)
-                End Try
-
-                Return False
-            End Function
-
-            Public Shared Sub Add(ByVal Text As String)
-                Try
-                    qBox.Items.Insert(0, Text)
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "QuickConnect History Add failed" & vbNewLine & ex.Message, True)
-                End Try
-            End Sub
-        End Class
-    End Class
-End Namespace

mRemoteV1/Connection/PuttySession.Info.vb

@@ -0,0 +1,122 @@
+Imports System.ComponentModel
+Imports mRemoteNG.Messages
+Imports mRemoteNG.Tools.LocalizedAttributes
+Imports mRemoteNG.My
+Imports mRemoteNG.App.Runtime
+Imports mRemoteNG.Tools
+
+Namespace Connection
+    Namespace PuttySession
+        Public Class Info
+            Inherits Connection.Info
+            Implements IComponent
+
+#Region "Commands"
+            <Command(),
+                LocalizedDisplayName("strPuttySessionSettings")> _
+            Public Sub SessionSettings()
+                Try
+                    Dim puttyProcess As New PuttyProcessController
+                    If Not puttyProcess.Start() Then Return
+                    If puttyProcess.SelectListBoxItem(PuttySession) Then
+                        puttyProcess.ClickButton("&Load")
+                    End If
+                    puttyProcess.SetControlText("Button", "&Cancel", "&Close")
+                    puttyProcess.SetControlVisible("Button", "&Open", False)
+                    puttyProcess.WaitForExit()
+                Catch ex As Exception
+                    MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strErrorCouldNotLaunchPutty & vbNewLine & ex.Message, False)
+                End Try
+            End Sub
+#End Region
+
+#Region "Properties"
+            <Browsable(False)> _
+            Public Property RootPuttySessionsInfo() As Root.PuttySessions.Info
+
+            <[ReadOnly](True)> _
+            Public Overrides Property PuttySession() As String
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Name() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property Description() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property Icon() As String
+                Get
+                    Return "PuTTY"
+                End Get
+                Set(value As String)
+
+                End Set
+            End Property
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property Panel() As String
+                Get
+                    Return RootPuttySessionsInfo.Panel
+                End Get
+                Set(value As String)
+
+                End Set
+            End Property
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Hostname() As String
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Username() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property Password() As String
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Protocol() As Protocol.Protocols
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Port() As Integer
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property PreExtApp() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property PostExtApp() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property MacAddress() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property UserField() As String
+#End Region
+
+#Region "IComponent"
+            <Browsable(False)> _
+            Public Property Site() As ISite Implements IComponent.Site
+                Get
+                    Return New PropertyGridCommandSite(Me)
+                End Get
+                Set(value As ISite)
+                    Throw New NotImplementedException()
+                End Set
+            End Property
+
+            Public Sub Dispose() Implements IDisposable.Dispose
+                RaiseEvent Disposed(Me, EventArgs.Empty)
+            End Sub
+
+            Public Event Disposed As EventHandler Implements IComponent.Disposed
+#End Region
+        End Class
+    End Namespace
+End Namespace
+

mRemoteV1/Container/Container.Info.vb

@@ -1,27 +1,26 @@
 Imports System.Windows.Forms
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Container
     <DefaultProperty("Name")> _
     Public Class Info
 #Region "Properties"
-        Private _Name As String = "New Container"
-        <Category(Category1 & "Display"), _
-           Browsable(True), _
-           [ReadOnly](False), _
-           Bindable(False), _
-           DefaultValue(""), _
-           DesignOnly(False), _
-           DisplayName(Language.Base.Props_Name), _
-           Description("Enter a name"), _
-           Attributes.Container()> _
+        <LocalizedCategory("strCategoryDisplay", 1), _
+            Browsable(True), _
+            [ReadOnly](False), _
+            Bindable(False), _
+            DefaultValue(""), _
+            DesignOnly(False), _
+            LocalizedDisplayName("strPropertyNameName"), _
+            LocalizedDescription("strPropertyDescriptionName"), _
+            Attributes.Container()> _
         Public Property Name() As String
             Get
-                Return Me._ConnectionInfo.Name
+                Return ConnectionInfo.Name
             End Get
             Set(ByVal value As String)
-                Me._ConnectionInfo.Name = value
+                ConnectionInfo.Name = value
             End Set
         End Property
 
@@ -81,7 +80,7 @@ Namespace Container
             End Set
         End Property
 
-        Private _ConnectionInfo As Connection.Info = New Connection.Info
+        Private _ConnectionInfo As New Connection.Info
         Public Property ConnectionInfo() As Connection.Info
             Get
                 Return Me._ConnectionInfo

mRemoteV1/Container/Container.List.vb

@@ -1,5 +1,3 @@
-Imports System.Windows.Forms
-
 Namespace Container
     Public Class List
         Inherits CollectionBase

mRemoteV1/Controls/ListView.vb

@@ -0,0 +1,180 @@
+Imports System.ComponentModel
+
+Namespace Controls
+    Public Class ListView
+        Inherits Windows.Forms.ListView
+
+#Region "Public Properties"
+        <Category("Appearance"),
+        DefaultValue(GetType(Color), "HighlightText")> _
+        Public Property HighlightForeColor As Color = SystemColors.HighlightText
+
+        <Category("Appearance"),
+        DefaultValue(GetType(Color), "Highlight")> _
+        Public Property HighlightBackColor As Color = SystemColors.Highlight
+
+        <Category("Appearance"),
+        DefaultValue(GetType(Color), "HotTrack")> _
+        Public Property HighlightBorderColor As Color = SystemColors.HotTrack
+
+        <Category("Appearance"),
+        DefaultValue(GetType(Color), "ControlText")> _
+        Public Property InactiveHighlightForeColor As Color = SystemColors.ControlText
+
+        <Category("Appearance"),
+        DefaultValue(GetType(Color), "Control")> _
+        Public Property InactiveHighlightBackColor As Color = SystemColors.Control
+
+        <Category("Appearance"),
+        DefaultValue(GetType(Color), "ControlDark")> _
+        Public Property InactiveHighlightBorderColor As Color = SystemColors.ControlDark
+
+        <Category("Appearance"),
+        DefaultValue(True)> _
+        Public Overloads Property ShowFocusCues As Boolean = True
+
+        <Category("Appearance")> _
+        Public Property LabelAlignment As New Alignment(VerticalAlignment.Top, HorizontalAlignment.Left)
+#End Region
+
+#Region "Constructors"
+        Public Sub New()
+            OwnerDraw = True
+        End Sub
+#End Region
+
+#Region "Protected Methods"
+        Protected Overrides Sub OnDrawItem(e As DrawListViewItemEventArgs)
+            If Not View = View.Tile Then MyBase.OnDrawItem(e)
+            If e.ItemIndex < 0 Then MyBase.OnDrawItem(e)
+
+            Dim foreColorBrush As Brush = Nothing
+            Dim backColorBrush As Brush = Nothing
+            Dim borderPen As Pen = Nothing
+            Try
+                If Focused Then
+                    borderPen = New Pen(HighlightBorderColor)
+                Else
+                    borderPen = New Pen(InactiveHighlightBorderColor)
+                End If
+
+                If e.Item.Selected Then
+                    If Focused Then
+                        foreColorBrush = New SolidBrush(HighlightForeColor)
+                        backColorBrush = New SolidBrush(HighlightBackColor)
+                    Else
+                        foreColorBrush = New SolidBrush(InactiveHighlightForeColor)
+                        backColorBrush = New SolidBrush(InactiveHighlightBackColor)
+                    End If
+                Else
+                    foreColorBrush = New SolidBrush(e.Item.ForeColor)
+                    backColorBrush = New SolidBrush(BackColor)
+                End If
+
+                e.Graphics.FillRectangle(backColorBrush, e.Bounds)
+
+                If Focused And ShowFocusCues Then
+                    e.DrawFocusRectangle()
+                ElseIf e.Item.Selected Then
+                    e.Graphics.DrawRectangle(borderPen, e.Bounds.X, e.Bounds.Y, e.Bounds.Width - 1, e.Bounds.Height - 1)
+                End If
+
+                Dim imageBounds As New Rectangle(e.Bounds.X + 2, e.Bounds.Y + 6, 16, 16)
+                Dim textBounds As Rectangle = e.Bounds
+
+                If e.Item.ImageList IsNot Nothing Then
+                    Dim image As Image = Nothing
+                    If Not String.IsNullOrEmpty(e.Item.ImageKey) And e.Item.ImageList.Images.ContainsKey(e.Item.ImageKey) Then
+                        image = e.Item.ImageList.Images.Item(e.Item.ImageKey)
+                    ElseIf Not e.Item.ImageIndex < 0 And e.Item.ImageList.Images.Count > e.Item.ImageIndex Then
+                        image = e.Item.ImageList.Images(e.Item.ImageIndex)
+                    End If
+                    If image IsNot Nothing Then
+                        e.Graphics.DrawImageUnscaledAndClipped(image, imageBounds)
+                        textBounds.X = textBounds.Left + 20
+                        textBounds.Width = textBounds.Width - 20
+                    End If
+                End If
+
+                e.Graphics.DrawString(e.Item.Text, e.Item.Font, foreColorBrush, textBounds, GetStringFormat())
+            Finally
+                If foreColorBrush IsNot Nothing Then foreColorBrush.Dispose()
+                If backColorBrush IsNot Nothing Then backColorBrush.Dispose()
+                If borderPen IsNot Nothing Then borderPen.Dispose()
+            End Try
+        End Sub
+#End Region
+
+#Region "Private Methods"
+        Private Function GetStringFormat() As StringFormat
+            Dim format As StringFormat = StringFormat.GenericDefault
+
+            Select Case LabelAlignment.Vertical
+                Case VerticalAlignment.Top
+                    format.LineAlignment = StringAlignment.Near
+                Case VerticalAlignment.Middle
+                    format.LineAlignment = StringAlignment.Center
+                Case VerticalAlignment.Bottom
+                    format.LineAlignment = StringAlignment.Far
+            End Select
+
+            Select Case LabelAlignment.Horizontal
+                Case HorizontalAlignment.Left
+                    format.Alignment = StringAlignment.Near
+                Case HorizontalAlignment.Center
+                    format.Alignment = StringAlignment.Center
+                Case HorizontalAlignment.Right
+                    format.Alignment = StringAlignment.Far
+            End Select
+
+            If RightToLeft Then
+                format.FormatFlags = format.FormatFlags Or StringFormatFlags.DirectionRightToLeft
+            End If
+
+            If LabelWrap Then
+                format.FormatFlags = format.FormatFlags And Not StringFormatFlags.NoWrap
+            Else
+                format.FormatFlags = format.FormatFlags Or StringFormatFlags.NoWrap
+            End If
+
+            Return format
+        End Function
+#End Region
+    End Class
+
+    <TypeConverter(GetType(ExpandableObjectConverter))> _
+    Public Class Alignment
+        Public Sub New()
+
+        End Sub
+
+        Public Sub New(ByVal verticalAlignment As VerticalAlignment, ByVal horizontalAlignment As HorizontalAlignment)
+            Vertical = verticalAlignment
+            Horizontal = horizontalAlignment
+        End Sub
+
+        <NotifyParentProperty(True),
+        DefaultValue(VerticalAlignment.Top)> _
+        Public Property Vertical As VerticalAlignment = VerticalAlignment.Top
+
+        <NotifyParentProperty(True),
+        DefaultValue(HorizontalAlignment.Left)> _
+        Public Property Horizontal As HorizontalAlignment = HorizontalAlignment.Left
+
+        Public Overrides Function ToString() As String
+            Return String.Format("{0}, {1}", Vertical, Horizontal)
+        End Function
+    End Class
+
+    Public Enum VerticalAlignment As Integer
+        Top
+        Middle
+        Bottom
+    End Enum
+
+    Public Enum HorizontalAlignment As Integer
+        Left
+        Center
+        Right
+    End Enum
+End Namespace

mRemoteV1/Controls/QuickConnectComboBox.vb

@@ -0,0 +1,165 @@
+Imports mRemoteNG.App.Runtime
+
+Namespace Controls
+    Public Class QuickConnectComboBox
+        Inherits ToolStripComboBox
+
+        Private WithEvents _comboBox As ComboBox
+        Private _ignoreEnter As Boolean = False
+
+        Public Sub New()
+            _comboBox = ComboBox
+            _comboBox.DrawMode = DrawMode.OwnerDrawFixed
+
+            ' This makes it so that _ignoreEnter works correctly before any items are added to the combo box
+            _comboBox.Items.Clear()
+        End Sub
+
+        Private Sub ComboBox_PreviewKeyDown(ByVal sender As Object, ByVal e As PreviewKeyDownEventArgs) Handles _comboBox.PreviewKeyDown
+            If e.KeyCode = Keys.Enter And _comboBox.DroppedDown Then _ignoreEnter = True
+        End Sub
+
+        Protected Overrides Sub OnKeyDown(ByVal e As KeyEventArgs)
+            MyBase.OnKeyDown(e)
+            If e.KeyCode = Keys.Enter Then
+                ' Only connect if Enter was not pressed while the combo box was dropped down
+                If Not _ignoreEnter Then OnConnectRequested(New ConnectRequestedEventArgs(_comboBox.Text))
+                _ignoreEnter = False
+                e.Handled = True
+            ElseIf e.KeyCode = Keys.Delete And _comboBox.DroppedDown Then
+                If Not _comboBox.SelectedIndex = -1 Then
+                    ' Items can't be removed from the ComboBox while it is dropped down without possibly causing
+                    ' an exception so we must close it, delete the item, and then drop it down again. When we
+                    ' close it programmatically, the SelectedItem may revert to Nothing, so we must save it first.
+                    Dim item As Object = _comboBox.SelectedItem
+                    _comboBox.DroppedDown = False
+                    _comboBox.Items.Remove(item)
+                    _comboBox.SelectedIndex = -1
+                    If Not _comboBox.Items.Count = 0 Then
+                        _comboBox.DroppedDown = True
+                    End If
+                End If
+                e.Handled = True
+            End If
+        End Sub
+
+        Private Sub ComboBox_SelectedIndexChanged(sender As System.Object, e As EventArgs) Handles _comboBox.SelectedIndexChanged
+            If Not TypeOf _comboBox.SelectedItem Is HistoryItem Then Return
+            Dim historyItem As HistoryItem = CType(_comboBox.SelectedItem, HistoryItem)
+            OnProtocolChanged(New ProtocolChangedEventArgs(historyItem.ConnectionInfo.Protocol))
+        End Sub
+
+        Private Shared Sub ComboBox_DrawItem(ByVal sender As Object, ByVal e As DrawItemEventArgs) Handles _comboBox.DrawItem
+            Dim comboBox As ComboBox = TryCast(sender, ComboBox)
+            If comboBox Is Nothing Then Return
+            Dim drawItem As Object = comboBox.Items(e.Index)
+
+            Dim drawString As String
+            If TypeOf drawItem Is HistoryItem Then
+                Dim historyItem As HistoryItem = CType(drawItem, HistoryItem)
+                drawString = historyItem.ToString(includeProtocol:=True)
+            Else
+                drawString = drawItem.ToString()
+            End If
+
+            e.DrawBackground()
+            e.Graphics.DrawString(drawString, e.Font, New SolidBrush(e.ForeColor), New RectangleF(e.Bounds.X, e.Bounds.Y, e.Bounds.Width, e.Bounds.Height))
+            e.DrawFocusRectangle()
+        End Sub
+
+        Private Structure HistoryItem
+            Implements IEquatable(Of HistoryItem)
+
+            Public Property ConnectionInfo As Connection.Info
+
+            Public Overloads Function Equals(other As HistoryItem) As Boolean Implements IEquatable(Of HistoryItem).Equals
+                If Not ConnectionInfo.Hostname = other.ConnectionInfo.Hostname Then Return False
+                If Not ConnectionInfo.Port = other.ConnectionInfo.Port Then Return False
+                If Not ConnectionInfo.Protocol = other.ConnectionInfo.Protocol Then Return False
+                Return True
+            End Function
+
+            Public Overrides Function ToString() As String
+                Return ToString(False)
+            End Function
+
+            Public Overloads Function ToString(ByVal includeProtocol As Boolean) As String
+                Dim port As String = String.Empty
+                If Not ConnectionInfo.Port = ConnectionInfo.GetDefaultPort() Then
+                    port = String.Format(":{0}", ConnectionInfo.Port)
+                End If
+                If includeProtocol Then
+                    Return String.Format("{0}{1} ({2})", ConnectionInfo.Hostname, port, ConnectionInfo.Protocol)
+                Else
+                    Return String.Format("{0}{1}", ConnectionInfo.Hostname, port)
+                End If
+            End Function
+        End Structure
+
+        Private Function Exists(ByVal searchItem As HistoryItem) As Boolean
+            For Each item As Object In _comboBox.Items
+                If Not TypeOf item Is HistoryItem Then Continue For
+                Dim historyItem As HistoryItem = CType(item, HistoryItem)
+                If historyItem.Equals(searchItem) Then Return True
+            Next
+            Return False
+        End Function
+
+        Public Sub Add(ByVal connectionInfo As Connection.Info)
+            Try
+                Dim historyItem As New HistoryItem
+                historyItem.ConnectionInfo = connectionInfo
+                If Not Exists(historyItem) Then _comboBox.Items.Insert(0, historyItem)
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage(My.Language.strQuickConnectAddFailed, ex, Messages.MessageClass.ErrorMsg, True)
+            End Try
+        End Sub
+
+#Region "Events"
+        Public Class ConnectRequestedEventArgs
+            Inherits EventArgs
+
+            Public Sub New(ByVal connectionString As String)
+                _connectionString = connectionString
+            End Sub
+
+            Private ReadOnly _connectionString As String
+
+            Public ReadOnly Property ConnectionString As String
+                Get
+                    Return _connectionString
+                End Get
+            End Property
+        End Class
+
+        Public Event ConnectRequested(ByVal sender As Object, ByVal e As ConnectRequestedEventArgs)
+
+        Protected Overridable Sub OnConnectRequested(ByVal e As ConnectRequestedEventArgs)
+            RaiseEvent ConnectRequested(Me, New ConnectRequestedEventArgs(e.ConnectionString))
+        End Sub
+
+        Public Class ProtocolChangedEventArgs
+            Inherits EventArgs
+
+            Public Sub New(ByVal protocol As Connection.Protocol.Protocols)
+                _protocol = protocol
+            End Sub
+
+            Private ReadOnly _protocol As Connection.Protocol.Protocols
+
+            Public ReadOnly Property Protocol As Connection.Protocol.Protocols
+                Get
+                    Return _protocol
+                End Get
+            End Property
+        End Class
+
+        Public Event ProtocolChanged(ByVal sender As Object, ByVal e As ProtocolChangedEventArgs)
+
+        Protected Overridable Sub OnProtocolChanged(ByVal e As ProtocolChangedEventArgs)
+            RaiseEvent ProtocolChanged(Me, New ProtocolChangedEventArgs(e.Protocol))
+        End Sub
+#End Region
+    End Class
+End Namespace
+

mRemoteV1/Controls/TextBox.vb

@@ -0,0 +1,45 @@
+Imports System.ComponentModel
+
+' Adapted from http://stackoverflow.com/a/3678888/2101395
+
+Namespace Controls
+    Public Class TextBox
+        Inherits Windows.Forms.TextBox
+
+#Region "Public Properties"
+        <Category("Behavior"),
+        DefaultValue(False)> _
+        Public Property SelectAllOnFocus As Boolean = False
+#End Region
+
+#Region "Protected Methods"
+        Protected Overrides Sub OnEnter(ByVal e As EventArgs)
+            MyBase.OnEnter(e)
+
+            If MouseButtons = MouseButtons.None Then
+                SelectAll()
+                _focusHandled = True
+            End If
+        End Sub
+
+        Protected Overrides Sub OnLeave(ByVal e As EventArgs)
+            MyBase.OnLeave(e)
+
+            _focusHandled = False
+        End Sub
+
+        Protected Overrides Sub OnMouseUp(ByVal e As MouseEventArgs)
+            MyBase.OnMouseUp(e)
+
+            If Not _focusHandled Then
+                If SelectionLength = 0 Then SelectAll()
+                _focusHandled = True
+            End If
+        End Sub
+#End Region
+
+#Region "Private Fields"
+        Private _focusHandled As Boolean = False
+#End Region
+    End Class
+End Namespace

mRemoteV1/Controls/ToolStripSplitButton.vb

@@ -0,0 +1,42 @@
+Namespace Controls
+    Public Class ToolStripSplitButton
+        Inherits Windows.Forms.ToolStripSplitButton
+
+        Public Overloads Property DropDown As ToolStripDropDown
+            Get
+                Return MyBase.DropDown
+            End Get
+            Set(value As ToolStripDropDown)
+                If MyBase.DropDown IsNot value Then
+                    MyBase.DropDown = value
+                    AddHandler MyBase.DropDown.Closing, AddressOf DropDown_Closing
+                End If
+            End Set
+        End Property
+
+        Private Sub DropDown_Closing(ByVal sender As Object, e As ToolStripDropDownClosingEventArgs)
+            If Not e.CloseReason = ToolStripDropDownCloseReason.AppClicked Then Return
+
+            Dim dropDownButtonBoundsClient As Rectangle = DropDownButtonBounds ' Relative to the ToolStripSplitButton
+            dropDownButtonBoundsClient.Offset(Bounds.Location) ' Relative to the parent of the ToolStripSplitButton
+            Dim dropDownButtonBoundsScreen As Rectangle = GetCurrentParent().RectangleToScreen(dropDownButtonBoundsClient) ' Relative to the screen
+
+            If dropDownButtonBoundsScreen.Contains(Control.MousePosition) Then e.Cancel = True
+        End Sub
+
+        Protected Overrides Sub OnMouseDown(e As MouseEventArgs)
+            _dropDownVisibleOnMouseDown = DropDown.Visible
+            MyBase.OnMouseDown(e)
+        End Sub
+
+        Protected Overrides Sub OnMouseUp(e As MouseEventArgs)
+            If _dropDownVisibleOnMouseDown Then
+                DropDown.Close()
+            Else
+                MyBase.OnMouseUp(e)
+            End If
+        End Sub
+
+        Private _dropDownVisibleOnMouseDown As Boolean = False
+    End Class
+End Namespace

mRemoteV1/Credential/Credential.Info.vb

@@ -1,15 +1,14 @@
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
-Imports mRemote.Tools.Misc.PropertyGridValue
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Credential
     Public Class Info
 #Region "1 Display"
         Private _Name As String
-        <Category(Category1 & "Display"), _
-           Browsable(True), _
-           DisplayName(Language.Base.Props_Name), _
-           Description("Enter a name")> _
+        <LocalizedCategory("strCategoryDisplay", 1), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameName"), _
+            LocalizedDescription("strPropertyDescriptionName")> _
         Public Property Name() As String
             Get
                 Return _Name
@@ -20,10 +19,10 @@ Namespace Credential
         End Property
 
         Private _Description As String
-        <Category(Category1 & "Description"), _
-           Browsable(True), _
-           DisplayName(Language.Base.Props_Description), _
-           Description("Enter a description")> _
+        <LocalizedCategory("strCategoryDisplay", 1), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameDescription"), _
+            LocalizedDescription("strPropertyDescriptionDescription")> _
         Public Property Description() As String
             Get
                 Return _Description
@@ -35,10 +34,10 @@ Namespace Credential
 #End Region
 #Region "2 Credentials"
         Private _Username As String
-        <Category(Category2 & "Credentials"), _
+        <LocalizedCategory("strCategoryCredentials", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Username), _
-            Description("Enter a username")> _
+            LocalizedDisplayName("strPropertyNameUsername"), _
+            LocalizedDescription("strPropertyDescriptionUsername")> _
         Public Property Username() As String
             Get
                 Return _Username
@@ -49,10 +48,10 @@ Namespace Credential
         End Property
 
         Private _Password As String
-        <Category(Category2 & "Credentials"), _
+        <LocalizedCategory("strCategoryCredentials", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Password), _
-            Description("Enter a password"), _
+            LocalizedDisplayName("strPropertyNamePassword"), _
+            LocalizedDescription("strPropertyDescriptionPassword"), _
             PasswordPropertyText(True)> _
         Public Property Password() As String
             Get
@@ -64,10 +63,10 @@ Namespace Credential
         End Property
 
         Private _Domain As String
-        <Category(Category2 & "Credentials"), _
+        <LocalizedCategory("strCategoryCredentials", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Domain), _
-            Description("Enter a domain")> _
+            LocalizedDisplayName("strPropertyNameDomain"), _
+            LocalizedDescription("strPropertyDescriptionDomain")> _
         Public Property Domain() As String
             Get
                 Return _Domain

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