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

Removed unnecessary code

Browse Source
This commit is contained in:
David Sparer
2016-09-23 13:00:58 -06:00
parent 02fea4ad5d
commit d80497011b
3 changed files with 9 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mRemoteV1/App/Runtime.cs
View File

@@ -13,9 +13,11 @@ using System.Collections;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Threading;
using System.Windows.Forms;
using System.Xml;
using mRemoteNG.Root.PuttySessions;
using mRemoteNG.Security.SymmetricEncryption;
using mRemoteNG.UI.Forms;
using mRemoteNG.UI.Forms.Input;
@@ -241,7 +243,9 @@ namespace mRemoteNG.App
connectionsLoader.ConnectionList = ConnectionList;
connectionsLoader.ContainerList = ContainerList;
ConnectionTree.ResetTree();
var rootConnectionNode = ConnectionTreeModel.RootNodes.First(node => !(node is RootPuttySessionsNodeInfo));
ConnectionTreeModel.RemoveRootNode(rootConnectionNode);
// Load config
connectionsLoader.ConnectionFileName = filename;

157
mRemoteV1/Tree/ConnectionTree.cs
View File

@@ -1,155 +1,15 @@
using mRemoteNG.App;
using mRemoteNG.Connection;
using mRemoteNG.Messages;
using mRemoteNG.Tools.Sorting;
using System;
using System.Collections.Generic;
using System.Windows.Forms;
namespace mRemoteNG.Tree
{
public static class ConnectionTree
{
private static TreeNode SetNodeToolTip_old_node;
private static TreeNode treeNodeToBeSelected;
public static TreeView TreeView { get; set; }
public static TreeNode SelectedNode
{
get
{
return TreeView?.SelectedNode;
}
set
{
treeNodeToBeSelected = value;
SelectNode();
}
}
//TODO Fix for TreeListView
public static void Sort(TreeNode treeNode, SortOrder sorting)
{
if (TreeView == null)
return;
TreeView.BeginUpdate();
if (treeNode == null)
{
if (TreeView.Nodes.Count > 0)
treeNode = TreeView.Nodes[0];
else
return;
}
else if (ConnectionTreeNode.GetNodeType(treeNode) == TreeNodeType.Connection)
{
treeNode = treeNode.Parent;
if (treeNode == null)
return;
}
Sort(treeNode, new TreeNodeSorter(sorting));
TreeView.EndUpdate();
}
//TODO Fix for TreeListView
private static void Sort(TreeNode treeNode, TreeNodeSorter nodeSorter)
{
// Adapted from http://www.codeproject.com/Tips/252234/ASP-NET-TreeView-Sort
foreach (TreeNode childNode in treeNode.Nodes)
{
Sort(childNode, nodeSorter);
}
try
{
List<TreeNode> sortedNodes = new List<TreeNode>();
TreeNode currentNode = null;
while (treeNode.Nodes.Count > 0)
{
foreach (TreeNode childNode in treeNode.Nodes)
{
if (currentNode == null || nodeSorter.Compare(childNode, currentNode) < 0)
{
currentNode = childNode;
}
}
if (currentNode != null)
{
treeNode.Nodes.Remove(currentNode);
sortedNodes.Add(currentNode);
}
currentNode = null;
}
foreach (TreeNode childNode in sortedNodes)
{
treeNode.Nodes.Add(childNode);
}
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "Sort nodes failed" + Environment.NewLine + ex.Message, true);
}
}
//TODO Fix for TreeListView
public static TreeNode Find(TreeNode treeNode, string searchFor)
{
try
{
if (IsThisTheNodeWeAreSearchingFor(treeNode, searchFor))
return treeNode;
foreach (TreeNode childNode in treeNode.Nodes)
{
TreeNode tmpNode = Find(childNode, searchFor);
if (tmpNode != null)
{
return tmpNode;
}
}
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "Find node failed" + Environment.NewLine + ex.Message, true);
}
return null;
}
//TODO Fix for TreeListView
private static bool IsThisTheNodeWeAreSearchingFor(TreeNode treeNode, string searchFor)
{
return treeNode.Text.ToLower().IndexOf(searchFor.ToLower(), StringComparison.Ordinal) + 1 > 0;
}
//TODO Fix for TreeListView
public static TreeNode Find(TreeNode treeNode, ConnectionInfo conInfo)
{
try
{
if (treeNode.Tag == conInfo)
return treeNode;
foreach (TreeNode childNode in treeNode.Nodes)
{
TreeNode tmpNode = Find(childNode, conInfo);
if (tmpNode != null)
return tmpNode;
}
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "Find node failed" + Environment.NewLine + ex.Message, true);
}
return null;
}
//TODO Fix for TreeListView
private delegate void ResetTreeDelegate();
public static void ResetTree()
@@ -167,20 +27,5 @@ namespace mRemoteNG.Tree
TreeView.EndUpdate();
}
}
//TODO Fix for TreeListView
private delegate void SelectNodeDelegate();
private static void SelectNode()
{
if (TreeView.InvokeRequired)
{
SelectNodeDelegate d = SelectNode;
TreeView.Invoke(d);
}
else
{
TreeView.SelectedNode = treeNodeToBeSelected;
}
}
}
}

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

@@ -156,7 +156,6 @@ namespace mRemoteNG.UI.Forms
}
Windows.treePanel.Focus();
ConnectionTree.TreeView = Windows.treeForm.tvConnections;
PuttySessionsManager.Instance.StartWatcher();
if (Settings.Default.StartupComponentsCheck)
@@ -426,9 +425,10 @@ namespace mRemoteNG.UI.Forms
{
var extA = (ExternalTool)((ToolStripButton)sender).Tag;
if (ConnectionTreeNode.GetNodeType(ConnectionTree.SelectedNode) == TreeNodeType.Connection | ConnectionTreeNode.GetNodeType(ConnectionTree.SelectedNode) == TreeNodeType.PuttySession)
var selectedTreeNode = Windows.treeForm.SelectedNode;
if (selectedTreeNode.GetTreeNodeType() == TreeNodeType.Connection | selectedTreeNode.GetTreeNodeType() == TreeNodeType.PuttySession)
{
extA.Start((ConnectionInfo)ConnectionTree.SelectedNode.Tag);
extA.Start(selectedTreeNode);
}
else
{