mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-25 11:18:37 +08:00
Compare commits
29 Commits
v1.74
...
v1.75Aplha
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b7668aa68 | ||
|
|
c8a684e10d | ||
|
|
5a5d675f3e | ||
|
|
a4acc60f1d | ||
|
|
b3bc04251b | ||
|
|
203111eb5a | ||
|
|
472168b9e4 | ||
|
|
328ebbe3f7 | ||
|
|
999cd19d81 | ||
|
|
d23f6a69e5 | ||
|
|
38c7fe9e0a | ||
|
|
dc02f51a15 | ||
|
|
dd7ea02c9f | ||
|
|
5e0bf0da6e | ||
|
|
f2f4b14f5e | ||
|
|
e27b4fa2f9 | ||
|
|
c71a57bd69 | ||
|
|
8c57b271d8 | ||
|
|
e167602a32 | ||
|
|
590f4ba2c6 | ||
|
|
b2c0dc235c | ||
|
|
f357a53e0e | ||
|
|
5f7d1f9f3f | ||
|
|
010c0a5061 | ||
|
|
f160e456ae | ||
|
|
2a3fc01937 | ||
|
|
7671328245 | ||
|
|
85dc45a479 | ||
|
|
eb696b49fe |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -282,3 +282,6 @@ Installer Projects/Installer/Fragments/FilesFragment.wxs
|
||||
Installer Projects/Installer/Fragments/HelpFilesFragment.wxs
|
||||
InstallerProjects/Installer/Fragments/FilesFragment.wxs
|
||||
InstallerProjects/Installer/Resources/License.rtf
|
||||
|
||||
# user preference: .editorconfig - http://editorconfig.org/
|
||||
.editorconfig
|
||||
115
CHANGELOG.TXT
115
CHANGELOG.TXT
@@ -1,3 +1,16 @@
|
||||
1.75 Alpha 1 (2016-07-08):
|
||||
|
||||
General Changes:
|
||||
----------------
|
||||
Additional code cleanup
|
||||
|
||||
|
||||
Fixes:
|
||||
------
|
||||
MR-905: mRemoteNG crashes at startup (in FIPS policy check)
|
||||
MR-902: mRemoteNG crashes after locking/unlocking the local system after loading a VNC connection
|
||||
|
||||
|
||||
1.74 (2016-06-28):
|
||||
|
||||
Supported Platforms/Components:
|
||||
@@ -9,57 +22,57 @@
|
||||
|
||||
General Changes:
|
||||
----------------
|
||||
Converted source from Visual Basic to C Sharp
|
||||
Lots of code refactoring/clean up/general stability changes
|
||||
MR-714: Removed Keyboard shortcut functionality
|
||||
- Introduced in 1.73 beta that was never officially released
|
||||
- This caused stability issues
|
||||
- May be re-added in a future release
|
||||
- Removal does *NOT* impact the ability to send keyboard shortcuts to RDP sessions (when redirect key combinations is set to "yes")
|
||||
MR-559: Removed RDP Sessions panel functionality. This required a library for which no trusted origin/source could be located
|
||||
Removed a bunch of old code/libraries and replaced them accordingly
|
||||
|
||||
|
||||
Security Updates:
|
||||
-----------------
|
||||
MR-775, MR-745: Updated PuTTY to 0.67
|
||||
|
||||
|
||||
Features/Enhancements:
|
||||
----------------------
|
||||
Updated to latest DockPanelSuite and enabled a slick new theme!
|
||||
MR-145: Installer is now MSI based
|
||||
MR-255: Updated RDP Client to version 8
|
||||
MR-389: Updates to IE rendering engine
|
||||
- Support for latest version of IE (9-11)
|
||||
- Dropped support for IE 7 & IE 8
|
||||
MR-850: Replaced XULRunner with GeckoFx
|
||||
- No need to manually configure to have the Gecko rendering engine available now
|
||||
- Install image is now significantly larger due to the inclusion of the Gecko Engine
|
||||
MR-821: Initial Japanese translation included
|
||||
Port Scan is now Asynchronous (and is significantly faster)
|
||||
|
||||
|
||||
Fixes:
|
||||
------
|
||||
MR-874: Added work-around to installer to ignore installation prerequisites
|
||||
MR-884: Slow startup in some scnearios checking authenticode certificate
|
||||
MR-872: Crash in External Tools when arguments aren't quoted
|
||||
MR-854: crashes when right clicking on connection tab
|
||||
MR-852: Option "Allow only a single instance of the application" non-functional
|
||||
MR-836: Trying to delete a folder of connections only deletes 2 connections at a time
|
||||
MR-824, MR-706: Suppress Script Errors when using the IE rendering engine
|
||||
MR-822: Improve RDP error code messages
|
||||
MR-640: Fixed Inheritance not working
|
||||
MR-639: RDP: Connect to console session
|
||||
MR-610, MR-582, MR-451: RDP: Protocol Error 3334 or exceptions with large number of connections open
|
||||
- This problem appears largely resolved by most reports and testing
|
||||
- Further workarounds/problem avoidance: Disable Bitmap Caching on all RDP session configuration
|
||||
MR-429: Display issue on the Options -> Advanced panel
|
||||
MR-385: Inheritance settings lost when moving item to the root of the tree
|
||||
|
||||
|
||||
|
||||
Converted source from Visual Basic to C Sharp
|
||||
Lots of code refactoring/clean up/general stability changes
|
||||
MR-714: Removed Keyboard shortcut functionality
|
||||
- Introduced in 1.73 beta that was never officially released
|
||||
- This caused stability issues
|
||||
- May be re-added in a future release
|
||||
- Removal does *NOT* impact the ability to send keyboard shortcuts to RDP sessions (when redirect key combinations is set to "yes")
|
||||
MR-559: Removed RDP Sessions panel functionality. This required a library for which no trusted origin/source could be located
|
||||
Removed a bunch of old code/libraries and replaced them accordingly
|
||||
|
||||
|
||||
Security Updates:
|
||||
-----------------
|
||||
MR-775, MR-745: Updated PuTTY to 0.67
|
||||
|
||||
|
||||
Features/Enhancements:
|
||||
----------------------
|
||||
Updated to latest DockPanelSuite and enabled a slick new theme!
|
||||
MR-145: Installer is now MSI based
|
||||
MR-255: Updated RDP Client to version 8
|
||||
MR-389: Updates to IE rendering engine
|
||||
- Support for latest version of IE (9-11)
|
||||
- Dropped support for IE 7 & IE 8
|
||||
MR-850: Replaced XULRunner with GeckoFx
|
||||
- No need to manually configure to have the Gecko rendering engine available now
|
||||
- Install image is now significantly larger due to the inclusion of the Gecko Engine
|
||||
MR-821: Initial Japanese translation included
|
||||
Port Scan is now Asynchronous (and is significantly faster)
|
||||
|
||||
|
||||
Fixes:
|
||||
------
|
||||
MR-874: Added work-around to installer to ignore installation prerequisites
|
||||
MR-884: Slow startup in some scnearios checking authenticode certificate
|
||||
MR-872: Crash in External Tools when arguments aren't quoted
|
||||
MR-854: crashes when right clicking on connection tab
|
||||
MR-852: Option "Allow only a single instance of the application" non-functional
|
||||
MR-836: Trying to delete a folder of connections only deletes 2 connections at a time
|
||||
MR-824, MR-706: Suppress Script Errors when using the IE rendering engine
|
||||
MR-822: Improve RDP error code messages
|
||||
MR-640: Fixed Inheritance not working
|
||||
MR-639: RDP: Connect to console session
|
||||
MR-610, MR-582, MR-451: RDP: Protocol Error 3334 or exceptions with large number of connections open
|
||||
- This problem appears largely resolved by most reports and testing
|
||||
- Further workarounds/problem avoidance: Disable Bitmap Caching on all RDP session configuration
|
||||
MR-429: Display issue on the Options -> Advanced panel
|
||||
MR-385: Inheritance settings lost when moving item to the root of the tree
|
||||
|
||||
|
||||
|
||||
1.73 Beta 2 (NEVER RELEASED):
|
||||
Fixed issue MR-619 - Keyboard shortcuts stop working after locking the screen with Win+L
|
||||
Added support for importing files from PuTTY Connection Manager.
|
||||
|
||||
@@ -115,7 +115,7 @@ Copyright
|
||||
Creative Commons Attribution 2.5 License
|
||||
http://www.famfamfam.com/
|
||||
|
||||
VncSharp 1.0
|
||||
VncSharp 1.1
|
||||
Copyright <20> 2004-2009 David Humphrey
|
||||
GNU General Public License (GPL) Version 2
|
||||
http://cdot.senecac.on.ca/projects/vncsharp/
|
||||
https://github.com/humphd/VncSharp
|
||||
|
||||
@@ -135,9 +135,9 @@ IF EXIST C:\mRemoteNG_code_signing_cert.pfx (
|
||||
)
|
||||
|
||||
REM Rename MSI to include version number
|
||||
powershell "&""$(SolutionDir)Tools\rename_installer_with_version.ps1""" %27$(SolutionDir)%27 %27!(TargetPath)%27
|
||||
powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\rename_installer_with_version.ps1" $(SolutionDir)
|
||||
|
||||
REM Copy MSI to Release folder
|
||||
IF %25buildenv: Portable=%25==Release (powershell "&""$(SolutionDir)Tools\copy_release_installer.ps1""" %27$(TargetDir)%27 %27$(SolutionDir)Release%27)</PostBuildEvent>
|
||||
IF %25buildenv: Portable=%25==Release (powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\copy_release_installer.ps1" $(TargetDir) $(SolutionDir)Release)</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
31
README.MD
Normal file
31
README.MD
Normal file
@@ -0,0 +1,31 @@
|
||||
[](https://twitter.com/intent/follow?screen_name=mRemoteNG)
|
||||
|
||||
[](http://ec2-52-39-111-114.us-west-2.compute.amazonaws.com:8080/job/mRemoteNG/job/mRemoteNG/job/develop/)
|
||||
[](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.74)
|
||||
|
||||
|
||||
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
|
||||
|
||||
mRemoteNG can be installed on Windows 7 or later.
|
||||
|
||||
Windows 7 systems require RDP version 8:
|
||||
https://support.microsoft.com/en-us/kb/2592687
|
||||
OR
|
||||
https://support.microsoft.com/en-us/kb/2923545
|
||||
|
||||
Windows 8+ support RDP version 8+ out of the box.
|
||||
|
||||
RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).
|
||||
@@ -12,15 +12,14 @@ Currently these protocols are supported:
|
||||
* HTTP/S (Hypertext Transfer Protocol)
|
||||
* Rlogin (Rlogin)
|
||||
* RAW
|
||||
|
||||
|
||||
mRemoteNG can be installed on Windows 7 or later.
|
||||
|
||||
Windows 7 systems require RDP version 8:
|
||||
https://support.microsoft.com/en-us/kb/2592687
|
||||
OR
|
||||
https://support.microsoft.com/en-us/kb/2923545
|
||||
Windows 7 systems require RDP version 8:
|
||||
https://support.microsoft.com/en-us/kb/2592687
|
||||
OR
|
||||
https://support.microsoft.com/en-us/kb/2923545
|
||||
|
||||
Windows 8+ support RDP version 8+ out of the box.
|
||||
|
||||
RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can
|
||||
connection successfully to a Windows 2003 host (for example).
|
||||
RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).
|
||||
@@ -1,6 +1,9 @@
|
||||
$sourcePath = $args[0]
|
||||
$destinationDir = $args[1]
|
||||
|
||||
Write-Host $sourcePath
|
||||
Write-Host $destinationDir
|
||||
|
||||
if (!(Test-Path -Path $destinationDir))
|
||||
{
|
||||
New-Item -Path $destinationDir -ItemType "directory"
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
#$solutionDir = $args[0] -replace "\\$"
|
||||
$solutionDir = "C:\Users\vsparda\Documents\Repositories\mRemoteNG Project\mRemoteNG\"
|
||||
#$renameTarget = $args[1]
|
||||
$renameTarget = "C:\Users\vsparda\Documents\Repositories\mRemoteNG Project\mRemoteNG\InstallerProjects\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
|
||||
$solutionDir = $args[0]
|
||||
$renameTarget = $solutionDir + "InstallerProjects\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
|
||||
|
||||
Write-Host $solutionDir
|
||||
Write-Host $renameTarget
|
||||
|
||||
$targetVersionedFile = "$solutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
|
||||
$version = &"$solutionDir\Tools\sigcheck.exe" /accepteula -q -n $targetVersionedFile
|
||||
|
||||
@@ -12,6 +14,8 @@ if ($renameTargetFileObject)
|
||||
# Build the new file name
|
||||
$oldFileName = $renameTargetFileObject.Name
|
||||
$newFileName = $oldFileName -replace "$("\"+$renameTargetFileObject.Extension)",$("-"+$version+$renameTargetFileObject.Extension)
|
||||
Write-Host $oldFileName
|
||||
Write-Host $newFileName
|
||||
|
||||
# Delete any items that already exist with the new name (effectively an overwrite)
|
||||
Remove-Item -Path "$($renameTargetFileObject.Directory.FullName)\$newFileName" -ErrorAction SilentlyContinue
|
||||
|
||||
@@ -10,11 +10,6 @@ namespace mRemoteNG.App
|
||||
{
|
||||
public class CompatibilityChecker
|
||||
{
|
||||
public CompatibilityChecker()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void CheckCompatibility()
|
||||
{
|
||||
CheckFipsPolicy();
|
||||
@@ -34,20 +29,18 @@ namespace mRemoteNG.App
|
||||
{
|
||||
var regKey = Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa");
|
||||
var fipsPolicy = regKey?.GetValue("FIPSAlgorithmPolicy");
|
||||
if (fipsPolicy != null && (int)fipsPolicy != 0)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
if (fipsPolicy == null) return false;
|
||||
fipsPolicy = Convert.ToInt32(fipsPolicy);
|
||||
return (int)fipsPolicy != 0;
|
||||
}
|
||||
|
||||
private bool FipsPolicyEnabledForServer2008AndNewer()
|
||||
{
|
||||
var regKey = Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy");
|
||||
var fipsPolicy = regKey?.GetValue("Enabled");
|
||||
if (fipsPolicy != null && (int)fipsPolicy != 0)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
if (fipsPolicy == null) return false;
|
||||
fipsPolicy = Convert.ToInt32(fipsPolicy);
|
||||
return (int)fipsPolicy != 0;
|
||||
}
|
||||
|
||||
private void CheckLenovoAutoScrollUtility()
|
||||
@@ -65,7 +58,7 @@ namespace mRemoteNG.App
|
||||
Runtime.MessageCollector.AddExceptionMessage("Error in CheckLenovoAutoScrollUtility", ex);
|
||||
}
|
||||
|
||||
if (proccesses?.Length > 0)
|
||||
if (proccesses.Length > 0)
|
||||
{
|
||||
CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected, string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected, Application.ProductName), "", "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok, ESysIcons.Warning, ESysIcons.Warning);
|
||||
if (CTaskDialog.VerificationChecked)
|
||||
|
||||
@@ -34,7 +34,7 @@ using System.Runtime.InteropServices;
|
||||
// by using the '*' as shown below:
|
||||
// <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
[assembly:AssemblyVersion("1.74.*")]
|
||||
[assembly: AssemblyVersion("1.75.*")]
|
||||
|
||||
[assembly:NeutralResourcesLanguageAttribute("en")]
|
||||
|
||||
|
||||
BIN
mRemoteV1/References/VncSharp.dll
Normal file
BIN
mRemoteV1/References/VncSharp.dll
Normal file
Binary file not shown.
Binary file not shown.
@@ -8,7 +8,7 @@ namespace mRemoteNG.UI.Controls.FilteredPropertyGrid
|
||||
internal class ObjectWrapper : ICustomTypeDescriptor
|
||||
{
|
||||
/// <summary>Contain a reference to the selected objet that will linked to the parent PropertyGrid.</summary>
|
||||
private object m_SelectedObject = null;
|
||||
private object m_SelectedObject;
|
||||
/// <summary>Contain a reference to the collection of properties to show in the parent PropertyGrid.</summary>
|
||||
/// <remarks>By default, m_PropertyDescriptors contain all the properties of the object. </remarks>
|
||||
List<PropertyDescriptor> m_PropertyDescriptors = new List<PropertyDescriptor>();
|
||||
@@ -22,7 +22,7 @@ namespace mRemoteNG.UI.Controls.FilteredPropertyGrid
|
||||
/// <summary>Get or set a reference to the selected objet that will linked to the parent PropertyGrid.</summary>
|
||||
public object SelectedObject {
|
||||
get { return m_SelectedObject; }
|
||||
set { if(m_SelectedObject != value) m_SelectedObject = value; }
|
||||
set { m_SelectedObject = value; }
|
||||
}
|
||||
|
||||
/// <summary>Get or set a reference to the collection of properties to show in the parent PropertyGrid.</summary>
|
||||
|
||||
@@ -22,19 +22,19 @@ namespace mRemoteNG.UI.Window
|
||||
{
|
||||
private bool _originalPropertyGridToolStripItemCountValid;
|
||||
private int _originalPropertyGridToolStripItemCount;
|
||||
private System.ComponentModel.Container components = null;
|
||||
internal ToolStripButton btnShowProperties;
|
||||
internal ToolStripButton btnShowDefaultProperties;
|
||||
internal ToolStripButton btnShowInheritance;
|
||||
internal ToolStripButton btnShowDefaultInheritance;
|
||||
internal ToolStripButton btnIcon;
|
||||
internal ToolStripButton btnHostStatus;
|
||||
private System.ComponentModel.Container components;
|
||||
private ToolStripButton btnShowProperties;
|
||||
private ToolStripButton btnShowDefaultProperties;
|
||||
private ToolStripButton btnShowInheritance;
|
||||
private ToolStripButton btnShowDefaultInheritance;
|
||||
private ToolStripButton btnIcon;
|
||||
private ToolStripButton btnHostStatus;
|
||||
internal ContextMenuStrip cMenIcons;
|
||||
internal ContextMenuStrip propertyGridContextMenu;
|
||||
internal ToolStripMenuItem propertyGridContextMenuShowHelpText;
|
||||
internal ToolStripMenuItem propertyGridContextMenuReset;
|
||||
internal ToolStripSeparator ToolStripSeparator1;
|
||||
internal FilteredPropertyGrid pGrid;
|
||||
private ToolStripMenuItem propertyGridContextMenuShowHelpText;
|
||||
private ToolStripMenuItem propertyGridContextMenuReset;
|
||||
private ToolStripSeparator ToolStripSeparator1;
|
||||
private FilteredPropertyGrid pGrid;
|
||||
|
||||
|
||||
private void InitializeComponent()
|
||||
@@ -96,7 +96,7 @@ namespace mRemoteNG.UI.Window
|
||||
//
|
||||
propertyGridContextMenuReset.Name = "propertyGridContextMenuReset";
|
||||
propertyGridContextMenuReset.Size = new Size(156, 22);
|
||||
propertyGridContextMenuReset.Text = "&Reset";
|
||||
propertyGridContextMenuReset.Text = @"&Reset";
|
||||
//
|
||||
//ToolStripSeparator1
|
||||
//
|
||||
@@ -107,7 +107,7 @@ namespace mRemoteNG.UI.Window
|
||||
//
|
||||
propertyGridContextMenuShowHelpText.Name = "propertyGridContextMenuShowHelpText";
|
||||
propertyGridContextMenuShowHelpText.Size = new Size(156, 22);
|
||||
propertyGridContextMenuShowHelpText.Text = "&Show Help Text";
|
||||
propertyGridContextMenuShowHelpText.Text = @"&Show Help Text";
|
||||
//
|
||||
//btnShowInheritance
|
||||
//
|
||||
@@ -116,7 +116,7 @@ namespace mRemoteNG.UI.Window
|
||||
btnShowInheritance.ImageTransparentColor = Color.Magenta;
|
||||
btnShowInheritance.Name = "btnShowInheritance";
|
||||
btnShowInheritance.Size = new Size(23, 22);
|
||||
btnShowInheritance.Text = "Inheritance";
|
||||
btnShowInheritance.Text = @"Inheritance";
|
||||
//
|
||||
//btnShowDefaultInheritance
|
||||
//
|
||||
@@ -125,7 +125,7 @@ namespace mRemoteNG.UI.Window
|
||||
btnShowDefaultInheritance.ImageTransparentColor = Color.Magenta;
|
||||
btnShowDefaultInheritance.Name = "btnShowDefaultInheritance";
|
||||
btnShowDefaultInheritance.Size = new Size(23, 22);
|
||||
btnShowDefaultInheritance.Text = "Default Inheritance";
|
||||
btnShowDefaultInheritance.Text = @"Default Inheritance";
|
||||
//
|
||||
//btnShowProperties
|
||||
//
|
||||
@@ -136,7 +136,7 @@ namespace mRemoteNG.UI.Window
|
||||
btnShowProperties.ImageTransparentColor = Color.Magenta;
|
||||
btnShowProperties.Name = "btnShowProperties";
|
||||
btnShowProperties.Size = new Size(23, 22);
|
||||
btnShowProperties.Text = "Properties";
|
||||
btnShowProperties.Text = @"Properties";
|
||||
//
|
||||
//btnShowDefaultProperties
|
||||
//
|
||||
@@ -145,7 +145,7 @@ namespace mRemoteNG.UI.Window
|
||||
btnShowDefaultProperties.ImageTransparentColor = Color.Magenta;
|
||||
btnShowDefaultProperties.Name = "btnShowDefaultProperties";
|
||||
btnShowDefaultProperties.Size = new Size(23, 22);
|
||||
btnShowDefaultProperties.Text = "Default Properties";
|
||||
btnShowDefaultProperties.Text = @"Default Properties";
|
||||
//
|
||||
//btnIcon
|
||||
//
|
||||
@@ -154,7 +154,7 @@ namespace mRemoteNG.UI.Window
|
||||
btnIcon.ImageTransparentColor = Color.Magenta;
|
||||
btnIcon.Name = "btnIcon";
|
||||
btnIcon.Size = new Size(23, 22);
|
||||
btnIcon.Text = "Icon";
|
||||
btnIcon.Text = @"Icon";
|
||||
//
|
||||
//btnHostStatus
|
||||
//
|
||||
@@ -165,7 +165,7 @@ namespace mRemoteNG.UI.Window
|
||||
btnHostStatus.Name = "btnHostStatus";
|
||||
btnHostStatus.Size = new Size(23, 22);
|
||||
btnHostStatus.Tag = "checking";
|
||||
btnHostStatus.Text = "Status";
|
||||
btnHostStatus.Text = @"Status";
|
||||
//
|
||||
//cMenIcons
|
||||
//
|
||||
@@ -179,9 +179,9 @@ namespace mRemoteNG.UI.Window
|
||||
Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, Convert.ToByte(0));
|
||||
HideOnClose = true;
|
||||
Icon = Resources.Config_Icon;
|
||||
Name = "Config";
|
||||
TabText = "Config";
|
||||
Text = "Config";
|
||||
Name = $"Config";
|
||||
TabText = @"Config";
|
||||
Text = @"Config";
|
||||
propertyGridContextMenu.ResumeLayout(false);
|
||||
ResumeLayout(false);
|
||||
|
||||
@@ -509,7 +509,7 @@ namespace mRemoteNG.UI.Window
|
||||
pGrid.SelectedObject = Obj;
|
||||
|
||||
btnShowProperties.Enabled = true;
|
||||
if (((Container.ContainerInfo)((ConnectionInfo)Obj).Parent).Parent != null)
|
||||
if (((ConnectionInfo)Obj).Parent.Parent != null)
|
||||
{
|
||||
btnShowInheritance.Enabled = true;
|
||||
}
|
||||
@@ -723,64 +723,67 @@ namespace mRemoteNG.UI.Window
|
||||
|
||||
private void UpdateConnectionInfoNode(PropertyValueChangedEventArgs e)
|
||||
{
|
||||
if (pGrid.SelectedObject is ConnectionInfo)
|
||||
var o = pGrid.SelectedObject as ConnectionInfo;
|
||||
if (o != null)
|
||||
{
|
||||
if (e.ChangedItem.Label == Language.strPropertyNameProtocol)
|
||||
{
|
||||
((ConnectionInfo)pGrid.SelectedObject).SetDefaultPort();
|
||||
o.SetDefaultPort();
|
||||
}
|
||||
else if (e.ChangedItem.Label == Language.strPropertyNameName)
|
||||
{
|
||||
Windows.treeForm.tvConnections.SelectedNode.Text = Convert.ToString(((ConnectionInfo)pGrid.SelectedObject).Name);
|
||||
if (Settings.Default.SetHostnameLikeDisplayName && pGrid.SelectedObject is ConnectionInfo)
|
||||
Windows.treeForm.tvConnections.SelectedNode.Text = Convert.ToString(o.Name);
|
||||
if (Settings.Default.SetHostnameLikeDisplayName)
|
||||
{
|
||||
var connectionInfo = (ConnectionInfo)pGrid.SelectedObject;
|
||||
var connectionInfo = o;
|
||||
if (!string.IsNullOrEmpty(connectionInfo.Name))
|
||||
connectionInfo.Hostname = connectionInfo.Name;
|
||||
}
|
||||
}
|
||||
else if (e.ChangedItem.Label == Language.strPropertyNameIcon)
|
||||
{
|
||||
var conIcon = ConnectionIcon.FromString(Convert.ToString(((ConnectionInfo)pGrid.SelectedObject).Icon));
|
||||
var conIcon = ConnectionIcon.FromString(Convert.ToString(o.Icon));
|
||||
if (conIcon != null)
|
||||
btnIcon.Image = conIcon.ToBitmap();
|
||||
}
|
||||
else if (e.ChangedItem.Label == Language.strPropertyNameAddress)
|
||||
{
|
||||
SetHostStatus(pGrid.SelectedObject);
|
||||
SetHostStatus(o);
|
||||
}
|
||||
|
||||
if (((ConnectionInfo)pGrid.SelectedObject).IsDefault)
|
||||
if (o.IsDefault)
|
||||
Runtime.DefaultConnectionToSettings();
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateRootInfoNode(PropertyValueChangedEventArgs e)
|
||||
{
|
||||
if (pGrid.SelectedObject is RootNodeInfo)
|
||||
var o = pGrid.SelectedObject as RootNodeInfo;
|
||||
if (o != null)
|
||||
{
|
||||
var rootInfo = (RootNodeInfo)pGrid.SelectedObject;
|
||||
switch (e.ChangedItem.PropertyDescriptor.Name)
|
||||
{
|
||||
case "Password":
|
||||
if (rootInfo.Password)
|
||||
{
|
||||
var passwordName = "";
|
||||
if (Settings.Default.UseSQLServer)
|
||||
passwordName = Language.strSQLServer.TrimEnd(':');
|
||||
else
|
||||
passwordName = Path.GetFileName(Runtime.GetStartupConnectionFileName());
|
||||
var rootInfo = o;
|
||||
if (e.ChangedItem.PropertyDescriptor != null)
|
||||
switch (e.ChangedItem.PropertyDescriptor.Name)
|
||||
{
|
||||
case "Password":
|
||||
if (rootInfo.Password)
|
||||
{
|
||||
string passwordName;
|
||||
if (Settings.Default.UseSQLServer)
|
||||
passwordName = Language.strSQLServer.TrimEnd(':');
|
||||
else
|
||||
passwordName = Path.GetFileName(Runtime.GetStartupConnectionFileName());
|
||||
|
||||
var password = MiscTools.PasswordDialog(passwordName);
|
||||
if (string.IsNullOrEmpty(password))
|
||||
rootInfo.Password = false;
|
||||
else
|
||||
rootInfo.PasswordString = password;
|
||||
}
|
||||
break;
|
||||
case "Name":
|
||||
break;
|
||||
}
|
||||
var password = MiscTools.PasswordDialog(passwordName);
|
||||
if (string.IsNullOrEmpty(password))
|
||||
rootInfo.Password = false;
|
||||
else
|
||||
rootInfo.PasswordString = password;
|
||||
}
|
||||
break;
|
||||
case "Name":
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1711,7 +1714,7 @@ namespace mRemoteNG.UI.Window
|
||||
try
|
||||
{
|
||||
pReply = pingSender.Send(HostName);
|
||||
if (pReply.Status == IPStatus.Success)
|
||||
if (pReply != null && pReply.Status == IPStatus.Success)
|
||||
{
|
||||
if ((string)btnHostStatus.Tag == "checking")
|
||||
{
|
||||
|
||||
@@ -89,9 +89,9 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>References\Tamir.SharpSSH.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="VncSharpNG, Version=1.1.2.0, Culture=neutral, PublicKeyToken=61974755c7bfea7c, processorArchitecture=MSIL">
|
||||
<Reference Include="VncSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=61974755c7bfea7c, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>References\VncSharpNG.dll</HintPath>
|
||||
<HintPath>References\VncSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.5.0.15095, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
|
||||
Reference in New Issue
Block a user