Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #373 from mRemoteNG/cleanup_converts

Browse Source 
Cleanup converts
This commit is contained in:
Sean Kaim
2017-01-27 17:04:37 -05:00
committed by GitHub
parent 2445c74638 1cc7bfcb2d
commit ffc8b5619e
16 changed files with 162 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mRemoteV1/App/Runtime.cs
View File

@@ -173,22 +173,20 @@ namespace mRemoteNG.App
try
{
var tagEnumeration = (IEnumerable)((ToolStripMenuItem)sender).Tag;
if (tagEnumeration != null)
if (tagEnumeration == null) return;
foreach (var obj in tagEnumeration)
{
foreach (var obj in tagEnumeration)
var screen1 = obj as Screen;
if (screen1 != null)
{
var screen1 = obj as Screen;
if (screen1 != null)
{
screen = screen1;
}
else if (obj is DockContent)
{
panel = (DockContent)obj;
}
screen = screen1;
}
else if (obj is DockContent)
{
panel = (DockContent)obj;
}
Screens.SendPanelToScreen(panel, screen);
}
Screens.SendPanelToScreen(panel, screen);
}
catch (Exception ex)
{
@@ -283,7 +281,7 @@ namespace mRemoteNG.App
connectionsLoader.ConnectionFileName = GetStartupConnectionFileName();
}
CreateBackupFile(Convert.ToString(connectionsLoader.ConnectionFileName));
CreateBackupFile(connectionsLoader.ConnectionFileName);
}
connectionsLoader.UseDatabase = Settings.Default.UseSQLServer;
@@ -334,7 +332,7 @@ namespace mRemoteNG.App
if (ex is FileNotFoundException && !withDialog)
{
MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionsLoader.ConnectionFileName), ex, MessageClass.InformationMsg);
NewConnections(Convert.ToString(connectionsLoader.ConnectionFileName));
NewConnections(connectionsLoader.ConnectionFileName);
return;
}
@@ -389,18 +387,12 @@ namespace mRemoteNG.App
var fileName = GetFileName(baseName);
var directoryName = GetDirectoryName(baseName);
if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName))
{
return;
}
if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName)) return;
var searchPattern = string.Format(Settings.Default.BackupFileNameFormat, fileName, "*");
var files = Directory.GetFiles(directoryName, searchPattern);
if (files.Length <= Settings.Default.BackupFileKeepCount)
{
return;
}
if (files.Length <= Settings.Default.BackupFileKeepCount) return;
Array.Sort(files);
Array.Resize(ref files, files.Length - Settings.Default.BackupFileKeepCount);
@@ -416,10 +408,8 @@ namespace mRemoteNG.App
var newPath = ConnectionsFileInfo.DefaultConnectionsPath + "\\" + ConnectionsFileInfo.DefaultConnectionsFile;
#if !PORTABLE
var oldPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\" + Application.ProductName + "\\" + ConnectionsFileInfo.DefaultConnectionsFile;
if (File.Exists(oldPath))
{
return oldPath;
}
// ReSharper disable once ConvertIfStatementToReturnStatement
if (File.Exists(oldPath)) return oldPath;
#endif
return newPath;
}
@@ -465,11 +455,11 @@ namespace mRemoteNG.App
if (Settings.Default.UseSQLServer)
{
connectionsSaver.SaveFormat = ConnectionsSaver.Format.SQL;
connectionsSaver.SQLHost = Convert.ToString(Settings.Default.SQLHost);
connectionsSaver.SQLDatabaseName = Convert.ToString(Settings.Default.SQLDatabaseName);
connectionsSaver.SQLUsername = Convert.ToString(Settings.Default.SQLUser);
connectionsSaver.SQLHost = Settings.Default.SQLHost;
connectionsSaver.SQLDatabaseName = Settings.Default.SQLDatabaseName;
connectionsSaver.SQLUsername = Settings.Default.SQLUser;
var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.SQLPass), EncryptionKey);
connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Settings.Default.SQLPass, EncryptionKey);
}
connectionsSaver.SaveConnections();
@@ -508,8 +498,7 @@ namespace mRemoteNG.App
saveFileDialog.Filter = string.Join("|", fileTypes.ToArray());
if (saveFileDialog.ShowDialog(frmMain.Default) != DialogResult.OK)
return;
if (saveFileDialog.ShowDialog(frmMain.Default) != DialogResult.OK) return;
connectionsSave.SaveFormat = ConnectionsSaver.Format.mRXML;
connectionsSave.ConnectionFileName = saveFileDialog.FileName;
@@ -548,10 +537,7 @@ namespace mRemoteNG.App
try
{
var uri = new Uri("dummyscheme" + Uri.SchemeDelimiter + connectionString);
if (string.IsNullOrEmpty(uri.Host))
{
return null;
}
if (string.IsNullOrEmpty(uri.Host)) return null;
var newConnectionInfo = new ConnectionInfo();
newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance);

2
mRemoteV1/Config/Connections/ConnectionsSaver.cs
View File

@@ -187,7 +187,7 @@ namespace mRemoteNG.Config.Connections
{
if (rootTreeNode.Password)
{
_password = Convert.ToString(rootTreeNode.PasswordString).ConvertToSecureString();
_password = rootTreeNode.PasswordString.ConvertToSecureString();
strProtected = cryptographyProvider.Encrypt("ThisIsProtected", _password);
}
else

2
mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs
View File

@@ -93,7 +93,7 @@ namespace mRemoteNG.Config.Putty
try
{
var currentUserSid = WindowsIdentity.GetCurrent().User?.Value;
var key = Convert.ToString(string.Join("\\", currentUserSid, PuttySessionsKey).Replace("\\", "\\\\"));
var key = string.Join("\\", currentUserSid, PuttySessionsKey).Replace("\\", "\\\\");
var query = new WqlEventQuery($"SELECT * FROM RegistryTreeChangeEvent WHERE Hive = \'HKEY_USERS\' AND RootPath = \'{key}\'");
_eventWatcher = new ManagementEventWatcher(query);
_eventWatcher.EventArrived += OnManagementEventArrived;

2
mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs
View File

@@ -168,7 +168,7 @@ namespace mRemoteNG.Config.Putty
#region Private Methods
private static string GetPuttyConfPath()
{
var puttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? Convert.ToString(mRemoteNG.Settings.Default.CustomPuttyPath) : App.Info.GeneralAppInfo.PuttyPath;
var puttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : App.Info.GeneralAppInfo.PuttyPath;
return Path.Combine(puttyPath, "putty.conf");
}

4
mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs
View File

@@ -47,7 +47,7 @@ namespace mRemoteNG.Config.Serializers
var schemaVersion = Convert.ToInt32(rdcManNode?.Attributes?["schemaVersion"].Value);
if (schemaVersion != 1)
{
throw (new FileFormatException($"Unsupported schema version ({schemaVersion})."));
throw new FileFormatException($"Unsupported schema version ({schemaVersion}).");
}
}
@@ -176,7 +176,7 @@ namespace mRemoteNG.Config.Serializers
var remoteDesktopNode = xmlNode.SelectSingleNode("./remoteDesktop");
if (remoteDesktopNode?.Attributes?["inherit"].Value == "None")
{
var resolutionString = Convert.ToString(remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", ""));
var resolutionString = remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", "");
try
{
connectionInfo.Resolution = (ProtocolRDP.RDPResolutions)Enum.Parse(typeof(ProtocolRDP.RDPResolutions), "Res" + resolutionString);

2
mRemoteV1/Config/Settings/ExternalAppsLoader.cs
View File

@@ -73,7 +73,7 @@ namespace mRemoteNG.Config.Settings
Runtime.ExternalTools.Add(extA);
}
_MainForm.SwitchToolBarText(Convert.ToBoolean(mRemoteNG.Settings.Default.ExtAppsTBShowText));
_MainForm.SwitchToolBarText(mRemoteNG.Settings.Default.ExtAppsTBShowText);
frmMain.Default.AddExternalToolsToToolBar();
}

12
mRemoteV1/Config/Settings/SettingsLoader.cs
View File

@@ -131,7 +131,7 @@ namespace mRemoteNG.Config.Settings
private void SetAutoSave()
{
if (mRemoteNG.Settings.Default.AutoSaveEveryMinutes <= 0) return;
MainForm.tmrAutoSave.Interval = Convert.ToInt32(mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000);
MainForm.tmrAutoSave.Interval = mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000;
MainForm.tmrAutoSave.Enabled = true;
}
@@ -150,7 +150,7 @@ namespace mRemoteNG.Config.Settings
private static void SetPuttyPath()
{
PuttyBase.PuttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? Convert.ToString(mRemoteNG.Settings.Default.CustomPuttyPath) : GeneralAppInfo.PuttyPath;
PuttyBase.PuttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : GeneralAppInfo.PuttyPath;
}
private static void EnsureSettingsAreSavedInNewestVersion()
@@ -200,14 +200,14 @@ namespace mRemoteNG.Config.Settings
private void AddStaticPanels()
{
ToolStripPanelFromString(Convert.ToString(mRemoteNG.Settings.Default.QuickyTBParentDock)).Join(MainForm.tsQuickConnect, mRemoteNG.Settings.Default.QuickyTBLocation);
MainForm.tsQuickConnect.Visible = Convert.ToBoolean(mRemoteNG.Settings.Default.QuickyTBVisible);
ToolStripPanelFromString(mRemoteNG.Settings.Default.QuickyTBParentDock).Join(MainForm.tsQuickConnect, mRemoteNG.Settings.Default.QuickyTBLocation);
MainForm.tsQuickConnect.Visible = mRemoteNG.Settings.Default.QuickyTBVisible;
}
private void AddDynamicPanels()
{
ToolStripPanelFromString(Convert.ToString(mRemoteNG.Settings.Default.ExtAppsTBParentDock)).Join(MainForm.tsExternalTools, mRemoteNG.Settings.Default.ExtAppsTBLocation);
MainForm.tsExternalTools.Visible = Convert.ToBoolean(mRemoteNG.Settings.Default.ExtAppsTBVisible);
ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock).Join(MainForm.tsExternalTools, mRemoteNG.Settings.Default.ExtAppsTBLocation);
MainForm.tsExternalTools.Visible = mRemoteNG.Settings.Default.ExtAppsTBVisible;
}
private ToolStripPanel ToolStripPanelFromString(string Panel)

2
mRemoteV1/Config/Settings/SettingsSaver.cs
View File

@@ -63,7 +63,7 @@ namespace mRemoteNG.Config.Settings
var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
mRemoteNG.Settings.Default.ConDefaultPassword =
cryptographyProvider.Encrypt(Convert.ToString(mRemoteNG.Settings.Default.ConDefaultPassword), EncryptionKey);
cryptographyProvider.Encrypt(mRemoteNG.Settings.Default.ConDefaultPassword, EncryptionKey);
mRemoteNG.Settings.Default.Save();

127
mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs
View File

@@ -53,7 +53,7 @@ namespace mRemoteNG.Connection.Protocol.Http
try
{
TabPage objTabPage = InterfaceControl.Parent as TabPage;
var objTabPage = InterfaceControl.Parent as TabPage;
if (objTabPage != null) tabTitle = objTabPage.Title;
}
catch (Exception)
@@ -67,7 +67,7 @@ namespace mRemoteNG.Connection.Protocol.Http
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
GeckoWebBrowser GeckoBrowser = (GeckoWebBrowser) wBrowser;
var GeckoBrowser = (GeckoWebBrowser) wBrowser;
if (GeckoBrowser != null)
{
GeckoBrowser.DocumentTitleChanged += geckoBrowser_DocumentTitleChanged;
@@ -76,7 +76,7 @@ namespace mRemoteNG.Connection.Protocol.Http
}
else
{
WebBrowser objWebBrowser = (WebBrowser)wBrowser;
var objWebBrowser = (WebBrowser)wBrowser;
//SHDocVw.WebBrowserClass objAxWebBrowser = (SHDocVw.WebBrowserClass)objWebBrowser.ActiveXInstance;
objWebBrowser.ScrollBarsEnabled = true;
@@ -102,7 +102,7 @@ namespace mRemoteNG.Connection.Protocol.Http
{
try
{
string strHost = Convert.ToString(InterfaceControl.Info.Hostname);
var strHost = InterfaceControl.Info.Hostname;
/*
* Commenting out since this codes doesn't actually do anything at this time...
* Possibly related to MR-221 and/or MR-533 ????
@@ -169,11 +169,8 @@ namespace mRemoteNG.Connection.Protocol.Http
#region Events
private void wBrowser_Navigated(object sender, WebBrowserNavigatedEventArgs e)
{
WebBrowser objWebBrowser = wBrowser as WebBrowser;
if (objWebBrowser == null)
{
return;
}
var objWebBrowser = wBrowser as WebBrowser;
if (objWebBrowser == null) return;
// This can only be set once the WebBrowser control is shown, it will throw a COM exception otherwise.
objWebBrowser.AllowWebBrowserDrop = false;
@@ -205,42 +202,40 @@ namespace mRemoteNG.Connection.Protocol.Http
{
var tabP = InterfaceControl.Parent as TabPage;
if (tabP != null)
{
string shortTitle;
if (tabP == null) return;
string shortTitle;
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
if (((GeckoWebBrowser) wBrowser).DocumentTitle.Length >= 15)
{
shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "...";
}
else
{
shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle;
}
}
else
{
if (((WebBrowser) wBrowser).DocumentTitle.Length >= 15)
{
shortTitle = ((WebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "...";
}
else
{
shortTitle = ((WebBrowser) wBrowser).DocumentTitle;
}
}
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
if (((GeckoWebBrowser) wBrowser).DocumentTitle.Length >= 15)
{
shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "...";
}
else
{
shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle;
}
}
else
{
if (((WebBrowser) wBrowser).DocumentTitle.Length >= 15)
{
shortTitle = ((WebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "...";
}
else
{
shortTitle = ((WebBrowser) wBrowser).DocumentTitle;
}
}
if (!string.IsNullOrEmpty(tabTitle))
{
tabP.Title = tabTitle + @" - " + shortTitle;
}
else
{
tabP.Title = shortTitle;
}
}
if (!string.IsNullOrEmpty(tabTitle))
{
tabP.Title = tabTitle + @" - " + shortTitle;
}
else
{
tabP.Title = shortTitle;
}
}
catch (Exception ex)
{
@@ -255,42 +250,40 @@ namespace mRemoteNG.Connection.Protocol.Http
{
var tabP = InterfaceControl.Parent as TabPage;
if (tabP != null)
if (tabP == null) return;
string shortTitle;
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
string shortTitle;
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
if (((GeckoWebBrowser)wBrowser).DocumentTitle.Length >= 15)
{
if (((GeckoWebBrowser)wBrowser).DocumentTitle.Length >= 15)
{
shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "...";
}
else
{
shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle;
}
shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "...";
}
else
{
if (((WebBrowser) wBrowser).DocumentTitle.Length >= 15)
{
shortTitle = ((WebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "...";
}
else
{
shortTitle = ((WebBrowser) wBrowser).DocumentTitle;
}
shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle;
}
if (!string.IsNullOrEmpty(tabTitle))
}
else
{
if (((WebBrowser) wBrowser).DocumentTitle.Length >= 15)
{
tabP.Title = tabTitle + @" - " + shortTitle;
shortTitle = ((WebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "...";
}
else
{
tabP.Title = shortTitle;
shortTitle = ((WebBrowser) wBrowser).DocumentTitle;
}
}
if (!string.IsNullOrEmpty(tabTitle))
{
tabP.Title = tabTitle + @" - " + shortTitle;
}
else
{
tabP.Title = shortTitle;
}
}
catch (Exception ex)
{

10
mRemoteV1/Connection/Protocol/PuttyBase.cs
View File

@@ -80,7 +80,7 @@ namespace mRemoteNG.Connection.Protocol
}
else if (Settings.Default.EmptyCredentials == "custom")
{
username = Convert.ToString(Settings.Default.DefaultUsername);
username = Settings.Default.DefaultUsername;
}
}
@@ -93,7 +93,7 @@ namespace mRemoteNG.Connection.Protocol
if (Settings.Default.EmptyCredentials == "custom")
{
var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
password = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey);
password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
}
}
@@ -127,10 +127,10 @@ namespace mRemoteNG.Connection.Protocol
PuttyProcess.Exited += ProcessExited;
PuttyProcess.Start();
PuttyProcess.WaitForInputIdle(Convert.ToInt32(Settings.Default.MaxPuttyWaitTime * 1000));
PuttyProcess.WaitForInputIdle(Settings.Default.MaxPuttyWaitTime * 1000);
var startTicks = Environment.TickCount;
while (PuttyHandle.ToInt32() == 0 & Environment.TickCount < startTicks + (Settings.Default.MaxPuttyWaitTime * 1000))
while (PuttyHandle.ToInt32() == 0 & Environment.TickCount < startTicks + Settings.Default.MaxPuttyWaitTime * 1000)
{
if (_isPuttyNg)
{
@@ -193,7 +193,7 @@ namespace mRemoteNG.Connection.Protocol
{
return;
}
NativeMethods.MoveWindow(PuttyHandle, Convert.ToInt32(-SystemInformation.FrameBorderSize.Width), Convert.ToInt32(-(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height)), InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), true);
NativeMethods.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 (Exception ex)
{

6
mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
View File

@@ -434,7 +434,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
else if (Settings.Default.EmptyCredentials == "custom")
{
_rdpClient.UserName = Convert.ToString(Settings.Default.DefaultUsername);
_rdpClient.UserName = Settings.Default.DefaultUsername;
}
}
else
@@ -449,7 +449,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
if (Settings.Default.DefaultPassword != "")
{
var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
_rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey);
_rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
}
}
}
@@ -466,7 +466,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
else if (Settings.Default.EmptyCredentials == "custom")
{
_rdpClient.Domain = Convert.ToString(Settings.Default.DefaultDomain);
_rdpClient.Domain = Settings.Default.DefaultDomain;
}
}
else

64
mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
View File

@@ -52,11 +52,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
base.SaveSettings();
chkSingleClickOnConnectionOpensIt.Checked =
Convert.ToBoolean(Settings.Default.SingleClickOnConnectionOpensIt);
chkSingleClickOnOpenedConnectionSwitchesToIt.Checked =
Convert.ToBoolean(Settings.Default.SingleClickSwitchesToOpenConnection);
chkHostnameLikeDisplayName.Checked = Convert.ToBoolean(Settings.Default.SetHostnameLikeDisplayName);
chkSingleClickOnConnectionOpensIt.Checked = Settings.Default.SingleClickOnConnectionOpensIt;
chkSingleClickOnOpenedConnectionSwitchesToIt.Checked = Settings.Default.SingleClickSwitchesToOpenConnection;
chkHostnameLikeDisplayName.Checked = Settings.Default.SetHostnameLikeDisplayName;
numRdpReconnectionCount.Value = Convert.ToDecimal(Settings.Default.RdpReconnectionCount);
@@ -65,39 +63,39 @@ namespace mRemoteNG.UI.Forms.OptionsPages
numAutoSave.Value = Convert.ToDecimal(Settings.Default.AutoSaveEveryMinutes);
// ReSharper disable once StringLiteralTypo
if (Settings.Default.EmptyCredentials == "noinfo")
// ReSharper disable once SwitchStatementMissingSomeCases
switch (Settings.Default.EmptyCredentials)
{
radCredentialsNoInfo.Checked = true;
}
else if (Settings.Default.EmptyCredentials == "windows")
{
radCredentialsWindows.Checked = true;
}
else if (Settings.Default.EmptyCredentials == "custom")
{
radCredentialsCustom.Checked = true;
case "noinfo":
radCredentialsNoInfo.Checked = true;
break;
case "windows":
radCredentialsWindows.Checked = true;
break;
case "custom":
radCredentialsCustom.Checked = true;
break;
}
txtCredentialsUsername.Text = Convert.ToString(Settings.Default.DefaultUsername);
txtCredentialsUsername.Text = Settings.Default.DefaultUsername;
var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
txtCredentialsPassword.Text = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey);
txtCredentialsDomain.Text = Convert.ToString(Settings.Default.DefaultDomain);
txtCredentialsPassword.Text = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
txtCredentialsDomain.Text = Settings.Default.DefaultDomain;
if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Never)
switch (Settings.Default.ConfirmCloseConnection)
{
radCloseWarnNever.Checked = true;
}
else if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Exit)
{
radCloseWarnExit.Checked = true;
}
else if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Multiple)
{
radCloseWarnMultiple.Checked = true;
}
else
{
radCloseWarnAll.Checked = true;
case (int) ConfirmCloseEnum.Never:
radCloseWarnNever.Checked = true;
break;
case (int) ConfirmCloseEnum.Exit:
radCloseWarnExit.Checked = true;
break;
case (int) ConfirmCloseEnum.Multiple:
radCloseWarnMultiple.Checked = true;
break;
default:
radCloseWarnAll.Checked = true;
break;
}
}
@@ -114,7 +112,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
Settings.Default.AutoSaveEveryMinutes = (int) numAutoSave.Value;
if (Settings.Default.AutoSaveEveryMinutes > 0)
{
frmMain.Default.tmrAutoSave.Interval = Convert.ToInt32(Settings.Default.AutoSaveEveryMinutes*60000);
frmMain.Default.tmrAutoSave.Interval = Settings.Default.AutoSaveEveryMinutes*60000;
frmMain.Default.tmrAutoSave.Enabled = true;
}
else

23
mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs
View File

@@ -55,7 +55,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
base.SaveSettings();
chkCheckForUpdatesOnStartup.Checked = Convert.ToBoolean(Settings.Default.CheckForUpdatesOnStartup);
chkCheckForUpdatesOnStartup.Checked = Settings.Default.CheckForUpdatesOnStartup;
cboUpdateCheckFrequency.Enabled = chkCheckForUpdatesOnStartup.Checked;
cboUpdateCheckFrequency.Items.Clear();
var nDaily = cboUpdateCheckFrequency.Items.Add(Language.strUpdateFrequencyDaily);
@@ -104,18 +104,18 @@ namespace mRemoteNG.UI.Forms.OptionsPages
break;
}
chkUseProxyForAutomaticUpdates.Checked = Convert.ToBoolean(Settings.Default.UpdateUseProxy);
pnlProxyBasic.Enabled = Convert.ToBoolean(Settings.Default.UpdateUseProxy);
txtProxyAddress.Text = Convert.ToString(Settings.Default.UpdateProxyAddress);
chkUseProxyForAutomaticUpdates.Checked = Settings.Default.UpdateUseProxy;
pnlProxyBasic.Enabled = Settings.Default.UpdateUseProxy;
txtProxyAddress.Text = Settings.Default.UpdateProxyAddress;
numProxyPort.Value = Convert.ToDecimal(Settings.Default.UpdateProxyPort);
chkUseProxyAuthentication.Checked = Convert.ToBoolean(Settings.Default.UpdateProxyUseAuthentication);
pnlProxyAuthentication.Enabled = Convert.ToBoolean(Settings.Default.UpdateProxyUseAuthentication);
txtProxyUsername.Text = Convert.ToString(Settings.Default.UpdateProxyAuthUser);
chkUseProxyAuthentication.Checked = Settings.Default.UpdateProxyUseAuthentication;
pnlProxyAuthentication.Enabled = Settings.Default.UpdateProxyUseAuthentication;
txtProxyUsername.Text = Settings.Default.UpdateProxyAuthUser;
var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
txtProxyPassword.Text = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.UpdateProxyAuthPass), Runtime.EncryptionKey);
txtProxyPassword.Text = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey);
btnTestProxy.Enabled = Convert.ToBoolean(Settings.Default.UpdateUseProxy);
btnTestProxy.Enabled = Settings.Default.UpdateUseProxy;
}
public override void SaveSettings()
@@ -246,12 +246,11 @@ namespace mRemoteNG.UI.Forms.OptionsPages
throw e.Error;
}
CTaskDialog.ShowCommandBox(this, Convert.ToString(Application.ProductName),
Language.strProxyTestSucceeded, "", Language.strButtonOK, false);
CTaskDialog.ShowCommandBox(this, Application.ProductName, Language.strProxyTestSucceeded, "", Language.strButtonOK, false);
}
catch (Exception ex)
{
CTaskDialog.ShowCommandBox(this, Convert.ToString(Application.ProductName), Language.strProxyTestFailed,
CTaskDialog.ShowCommandBox(this, Application.ProductName, Language.strProxyTestFailed,
MiscTools.GetExceptionMessageRecursive(ex), "", "", "", Language.strButtonOK, false, ESysIcons.Error,
0);
}

2
mRemoteV1/UI/Forms/frmMain.cs
View File

@@ -713,7 +713,7 @@ namespace mRemoteNG.UI.Forms
for (var i = 0; i <= Runtime.WindowList.Count - 1; i++)
{
var tItem = new ToolStripMenuItem(Convert.ToString(Runtime.WindowList[i].Text),
var tItem = new ToolStripMenuItem(Runtime.WindowList[i].Text,
Runtime.WindowList[i].Icon.ToBitmap(), ConnectionPanelMenuItem_Click) {Tag = Runtime.WindowList[i]};
mMenViewConnectionPanels.DropDownItems.Add(tItem);
}

6
mRemoteV1/UI/Window/ComponentsCheckWindow.cs
View File

@@ -406,7 +406,7 @@ namespace mRemoteNG.UI.Window
private void ComponentsCheck_Load(object sender, EventArgs e)
{
ApplyLanguage();
chkAlwaysShow.Checked = Convert.ToBoolean(Settings.Default.StartupComponentsCheck);
chkAlwaysShow.Checked = Settings.Default.StartupComponentsCheck;
CheckComponents();
}
@@ -470,7 +470,7 @@ namespace mRemoteNG.UI.Window
System.Windows.Forms.Application.DoEvents();
}
if (!(new Version(Convert.ToString(rdpClient.Version)) >= ProtocolRDP.Versions.RDC80))
if (!(new Version(rdpClient.Version) >= ProtocolRDP.Versions.RDC80))
{
throw new Exception(
$"Found RDC Client version {rdpClient.Version} but version {ProtocolRDP.Versions.RDC80} or higher is required.");
@@ -541,7 +541,7 @@ namespace mRemoteNG.UI.Window
}
else
{
pPath = Convert.ToString(Settings.Default.CustomPuttyPath);
pPath = Settings.Default.CustomPuttyPath;
}
if (File.Exists(pPath))

26
mRemoteV1/UI/Window/HelpWindow.cs
View File

@@ -28,7 +28,7 @@ namespace mRemoteNG.UI.Window
TreeNode TreeNode4 = new TreeNode("Configuration");
TreeNode TreeNode5 = new TreeNode("SQL Configuration");
TreeNode TreeNode6 = new TreeNode("Command-Line Switches");
TreeNode TreeNode7 = new TreeNode("Getting Started", new TreeNode[] {TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6});
TreeNode TreeNode7 = new TreeNode("Getting Started", new[] {TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6});
TreeNode TreeNode8 = new TreeNode("Main Menu");
TreeNode TreeNode9 = new TreeNode("Connections");
TreeNode TreeNode10 = new TreeNode("Config");
@@ -43,9 +43,9 @@ namespace mRemoteNG.UI.Window
TreeNode TreeNode20 = new TreeNode("Import From Active Directory");
TreeNode TreeNode21 = new TreeNode("External Applications");
TreeNode TreeNode22 = new TreeNode("Port Scan");
TreeNode TreeNode23 = new TreeNode("User Interface", new TreeNode[] {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22});
TreeNode TreeNode23 = new TreeNode("User Interface", new[] {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22});
TreeNode TreeNode24 = new TreeNode("Quick Reference");
TreeNode TreeNode25 = new TreeNode("Help", new TreeNode[] {TreeNode1, TreeNode7, TreeNode23, TreeNode24});
TreeNode TreeNode25 = new TreeNode("Help", new[] {TreeNode1, TreeNode7, TreeNode23, TreeNode24});
wbHelp = new WebBrowser();
wbHelp.DocumentTitleChanged += new EventHandler(wbHelp_DocumentTitleChanged);
tvIndex = new TreeView();
@@ -61,8 +61,8 @@ namespace mRemoteNG.UI.Window
//
//wbHelp
//
wbHelp.Anchor = ((AnchorStyles.Top | AnchorStyles.Bottom)
| AnchorStyles.Left)
wbHelp.Anchor = AnchorStyles.Top | AnchorStyles.Bottom
| AnchorStyles.Left
| AnchorStyles.Right;
wbHelp.Location = new System.Drawing.Point(1, 36);
wbHelp.MinimumSize = new System.Drawing.Size(20, 20);
@@ -73,8 +73,8 @@ namespace mRemoteNG.UI.Window
//
//tvIndex
//
tvIndex.Anchor = ((AnchorStyles.Top | AnchorStyles.Bottom)
| AnchorStyles.Left)
tvIndex.Anchor = AnchorStyles.Top | AnchorStyles.Bottom
| AnchorStyles.Left
| AnchorStyles.Right;
tvIndex.BorderStyle = BorderStyle.None;
tvIndex.HideSelection = false;
@@ -150,7 +150,7 @@ namespace mRemoteNG.UI.Window
TreeNode25.Name = "Node0";
TreeNode25.Text = "Help";
TreeNode25.Tag = "Index";
tvIndex.Nodes.AddRange(new TreeNode[] {TreeNode25});
tvIndex.Nodes.AddRange(new[] {TreeNode25});
tvIndex.ShowRootLines = false;
tvIndex.Size = new System.Drawing.Size(207, 321);
tvIndex.TabIndex = 0;
@@ -163,8 +163,8 @@ namespace mRemoteNG.UI.Window
//
//pnlSplitter
//
pnlSplitter.Anchor = ((AnchorStyles.Top | AnchorStyles.Bottom)
| AnchorStyles.Left)
pnlSplitter.Anchor = AnchorStyles.Top | AnchorStyles.Bottom
| AnchorStyles.Left
| AnchorStyles.Right;
pnlSplitter.FixedPanel = FixedPanel.Panel1;
pnlSplitter.Location = new System.Drawing.Point(0, 0);
@@ -184,7 +184,7 @@ namespace mRemoteNG.UI.Window
//
//lblDocName
//
lblDocName.Anchor = (AnchorStyles.Top | AnchorStyles.Left)
lblDocName.Anchor = AnchorStyles.Top | AnchorStyles.Left
| AnchorStyles.Right;
lblDocName.BackColor = System.Drawing.Color.DimGray;
lblDocName.Font = new System.Drawing.Font("Segoe UI", 12.0F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, Convert.ToByte(0));
@@ -243,9 +243,9 @@ namespace mRemoteNG.UI.Window
tvIndex.SelectedNode = e.Node;
}
private void tvIndex_AfterSelect(Object sender, TreeViewEventArgs e)
private void tvIndex_AfterSelect(object sender, TreeViewEventArgs e)
{
if (((string)e.Node.Tag) != "" && e.Node.Tag != null)
if ((string)e.Node.Tag != "" && e.Node.Tag != null)
{
wbHelp.Navigate(GeneralAppInfo.HomePath + "\\Help\\" + Convert.ToString(e.Node.Tag) +".htm");
}