mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 22:11:48 +08:00
code cleanup
This commit is contained in:
@@ -15,7 +15,8 @@ namespace mRemoteNG.UI.Window
|
||||
public partial class ConnectionTreeWindow
|
||||
{
|
||||
#region Form Stuff
|
||||
public void Tree_Load(object sender, EventArgs e)
|
||||
|
||||
private void Tree_Load(object sender, EventArgs e)
|
||||
{
|
||||
ApplyLanguage();
|
||||
|
||||
@@ -73,8 +74,8 @@ namespace mRemoteNG.UI.Window
|
||||
|
||||
txtSearch.Text = Language.strSearchPrompt;
|
||||
}
|
||||
|
||||
public void ApplyTheme()
|
||||
|
||||
private void ApplyTheme()
|
||||
{
|
||||
msMain.BackColor = Themes.ThemeManager.ActiveTheme.ToolbarBackgroundColor;
|
||||
msMain.ForeColor = Themes.ThemeManager.ActiveTheme.ToolbarTextColor;
|
||||
@@ -105,9 +106,9 @@ namespace mRemoteNG.UI.Window
|
||||
tvConnections_AfterSelect(tvConnections, new TreeViewEventArgs(tvConnections.SelectedNode, TreeViewAction.ByMouse));
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Public Properties
|
||||
public ToolTip DescriptionTooltip {get; set;}
|
||||
private ToolTip DescriptionTooltip {get; set;}
|
||||
#endregion
|
||||
|
||||
#region Private Methods
|
||||
@@ -123,7 +124,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "FillImageList (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("FillImageList (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,7 +146,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_AfterLabelEdit (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_AfterLabelEdit (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,7 +178,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_AfterSelect (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_AfterSelect (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -205,7 +206,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_NodeMouseClick (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_NodeMouseClick (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,7 +227,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_MouseMove (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_MouseMove (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -373,7 +374,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "ShowHideTreeContextMenuItems (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("ShowHideTreeContextMenuItems (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -396,7 +397,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_DragDrop (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_DragDrop (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -420,7 +421,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_DragEnter (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_DragEnter (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -467,7 +468,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_DragOver (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_DragOver (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -476,19 +477,15 @@ namespace mRemoteNG.UI.Window
|
||||
try
|
||||
{
|
||||
TreeNode dragTreeNode = e.Item as TreeNode;
|
||||
if (dragTreeNode == null)
|
||||
|
||||
if (dragTreeNode?.Tag == null)
|
||||
{
|
||||
return ;
|
||||
}
|
||||
|
||||
if (dragTreeNode.Tag == null)
|
||||
{
|
||||
return ;
|
||||
return;
|
||||
}
|
||||
if (dragTreeNode.Tag is PuttySessionInfo|| !(dragTreeNode.Tag is ConnectionInfo|| dragTreeNode.Tag is ContainerInfo))
|
||||
{
|
||||
tvConnections.SelectedNode = dragTreeNode;
|
||||
return ;
|
||||
return;
|
||||
}
|
||||
|
||||
//Set the drag node and initiate the DragDrop
|
||||
@@ -496,7 +493,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_ItemDrag (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_ItemDrag (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -683,7 +680,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "UI.Window.Tree.AddConnection() failed." + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("UI.Window.Tree.AddConnection() failed.", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -731,7 +728,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, string.Format(Language.strErrorAddFolderFailed, ex.Message), true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace(Language.strErrorAddFolderFailed, ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -768,7 +765,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "DisconnectConnection (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("DisconnectConnection (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -787,7 +784,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("SSHTransferFile (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -821,7 +818,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.ConnectionTreeWindow)" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("cMenTreeTools_DropDownOpening failed (UI.Window.ConnectionTreeWindow)", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -836,18 +833,18 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "cMenTreeToolsExternalAppsEntry_Click failed (UI.Window.ConnectionTreeWindow)" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("cMenTreeToolsExternalAppsEntry_Click failed (UI.Window.ConnectionTreeWindow)", ex);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Menu
|
||||
public static void mMenViewExpandAllFolders_Click(object sender, EventArgs e)
|
||||
private void mMenViewExpandAllFolders_Click(object sender, EventArgs e)
|
||||
{
|
||||
ConnectionTree.ExpandAllNodes();
|
||||
}
|
||||
|
||||
public void mMenViewCollapseAllFolders_Click(object sender, EventArgs e)
|
||||
|
||||
private void mMenViewCollapseAllFolders_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (tvConnections.SelectedNode != null)
|
||||
{
|
||||
@@ -859,9 +856,9 @@ namespace mRemoteNG.UI.Window
|
||||
ConnectionTree.CollapseAllNodes();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Search
|
||||
public void txtSearch_GotFocus(object sender, EventArgs e)
|
||||
private void txtSearch_GotFocus(object sender, EventArgs e)
|
||||
{
|
||||
txtSearch.ForeColor = Themes.ThemeManager.ActiveTheme.SearchBoxTextColor;
|
||||
if (txtSearch.Text == Language.strSearchPrompt)
|
||||
@@ -869,8 +866,8 @@ namespace mRemoteNG.UI.Window
|
||||
txtSearch.Text = "";
|
||||
}
|
||||
}
|
||||
|
||||
public void txtSearch_LostFocus(object sender, EventArgs e)
|
||||
|
||||
private void txtSearch_LostFocus(object sender, EventArgs e)
|
||||
{
|
||||
if (txtSearch.Text == "")
|
||||
{
|
||||
@@ -878,8 +875,8 @@ namespace mRemoteNG.UI.Window
|
||||
txtSearch.Text = Language.strSearchPrompt;
|
||||
}
|
||||
}
|
||||
|
||||
public void txtSearch_KeyDown(object sender, KeyEventArgs e)
|
||||
|
||||
private void txtSearch_KeyDown(object sender, KeyEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -903,16 +900,16 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "txtSearch_KeyDown (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("txtSearch_KeyDown (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
public void txtSearch_TextChanged(object sender, EventArgs e)
|
||||
|
||||
private void txtSearch_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
tvConnections.SelectedNode = ConnectionTree.Find(tvConnections.Nodes[0], txtSearch.Text);
|
||||
}
|
||||
|
||||
public void tvConnections_KeyPress(object sender, KeyPressEventArgs e)
|
||||
|
||||
private void tvConnections_KeyPress(object sender, KeyPressEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -926,11 +923,11 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_KeyPress (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_KeyPress (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
public void tvConnections_KeyDown(object sender, KeyEventArgs e)
|
||||
|
||||
private void tvConnections_KeyDown(object sender, KeyEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -961,7 +958,7 @@ namespace mRemoteNG.UI.Window
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "tvConnections_KeyDown (UI.Window.ConnectionTreeWindow) failed" + Environment.NewLine + ex.Message, true);
|
||||
Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_KeyDown (UI.Window.ConnectionTreeWindow) failed", ex);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
Reference in New Issue
Block a user