mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 22:11:48 +08:00
code cleanup
This commit is contained in:
27
mRemoteV1/UI/Controls/AdTree.Designer.cs
generated
27
mRemoteV1/UI/Controls/AdTree.Designer.cs
generated
@@ -30,19 +30,19 @@
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdTree));
|
||||
this.TvAd = new System.Windows.Forms.TreeView();
|
||||
this.tvActiveDirectory = new System.Windows.Forms.TreeView();
|
||||
this.ImglTree = new System.Windows.Forms.ImageList(this.components);
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// TvAd
|
||||
// tvActiveDirectory
|
||||
//
|
||||
this.TvAd.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.TvAd.Location = new System.Drawing.Point(0, 0);
|
||||
this.TvAd.Name = "TvAd";
|
||||
this.TvAd.Size = new System.Drawing.Size(800, 450);
|
||||
this.TvAd.TabIndex = 0;
|
||||
this.TvAd.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.TvAD_AfterExpand);
|
||||
this.TvAd.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.TvAD_AfterSelect);
|
||||
this.tvActiveDirectory.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tvActiveDirectory.Location = new System.Drawing.Point(0, 0);
|
||||
this.tvActiveDirectory.Name = "tvActiveDirectory";
|
||||
this.tvActiveDirectory.Size = new System.Drawing.Size(800, 450);
|
||||
this.tvActiveDirectory.TabIndex = 0;
|
||||
this.tvActiveDirectory.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.TvActiveDirectory_AfterExpand);
|
||||
this.tvActiveDirectory.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.TvActiveDirectory_AfterSelect);
|
||||
//
|
||||
// ImglTree
|
||||
//
|
||||
@@ -57,18 +57,17 @@
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.ClientSize = new System.Drawing.Size(800, 450);
|
||||
this.Controls.Add(this.TvAd);
|
||||
this.Controls.Add(this.tvActiveDirectory);
|
||||
this.Name = "AdTree";
|
||||
this.Text = "AdTree2";
|
||||
this.Load += new System.EventHandler(this.ADtree_Load);
|
||||
this.Size = new System.Drawing.Size(800, 450);
|
||||
this.Load += new System.EventHandler(this.AdTree_Load);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.TreeView TvAd;
|
||||
private System.Windows.Forms.TreeView tvActiveDirectory;
|
||||
private System.Windows.Forms.ImageList ImglTree;
|
||||
}
|
||||
}
|
||||
@@ -7,12 +7,34 @@ namespace mRemoteNG.UI.Controls
|
||||
{
|
||||
public partial class AdTree : UserControl
|
||||
{
|
||||
#region Public Methods
|
||||
|
||||
public AdTree()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void TvAD_AfterExpand(object sender, TreeViewEventArgs e)
|
||||
public event AdPathChangedEventHandler AdPathChanged;
|
||||
|
||||
public delegate void AdPathChangedEventHandler(object sender);
|
||||
|
||||
public string AdPath { get; set; }
|
||||
|
||||
public string Domain
|
||||
{
|
||||
private get => string.IsNullOrEmpty(_domain) == false ? _domain : Environment.UserDomainName;
|
||||
set => _domain = value;
|
||||
}
|
||||
|
||||
public object SelectedNode { get; internal set; }
|
||||
|
||||
#endregion Public Methods
|
||||
|
||||
#region Private Methods
|
||||
|
||||
private string _domain;
|
||||
|
||||
private void TvActiveDirectory_AfterExpand(object sender, TreeViewEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -25,36 +47,20 @@ namespace mRemoteNG.UI.Controls
|
||||
}
|
||||
}
|
||||
|
||||
private void TvAD_AfterSelect(object sender, TreeViewEventArgs e)
|
||||
private void TvActiveDirectory_AfterSelect(object sender, TreeViewEventArgs e)
|
||||
{
|
||||
AdPath = e.Node.Tag.ToString();
|
||||
var pathChangedEvent = AdPathChanged;
|
||||
pathChangedEvent?.Invoke(this);
|
||||
}
|
||||
|
||||
public event AdPathChangedEventHandler AdPathChanged;
|
||||
|
||||
public delegate void AdPathChangedEventHandler(object sender);
|
||||
|
||||
private string _domain;
|
||||
|
||||
public string AdPath { get; set; }
|
||||
|
||||
public string Domain
|
||||
private void AdTree_Load(object sender, EventArgs e)
|
||||
{
|
||||
private get => string.IsNullOrEmpty(_domain) == false ? _domain : Environment.UserDomainName;
|
||||
set => _domain = value;
|
||||
}
|
||||
public BorderStyle BorderStyle { get; internal set; }
|
||||
public object SelectedNode { get; internal set; }
|
||||
|
||||
private void ADtree_Load(object sender, EventArgs e)
|
||||
{
|
||||
TvAd.Nodes.Clear();
|
||||
tvActiveDirectory.Nodes.Clear();
|
||||
var treeNode = new TreeNode(Domain) { Tag = "" };
|
||||
TvAd.Nodes.Add(treeNode);
|
||||
tvActiveDirectory.Nodes.Add(treeNode);
|
||||
AddTreeNodes(treeNode);
|
||||
TvAd.Nodes[0].Expand();
|
||||
tvActiveDirectory.Nodes[0].Expand();
|
||||
}
|
||||
|
||||
private void AddTreeNodes(TreeNode tNode)
|
||||
@@ -62,7 +68,7 @@ namespace mRemoteNG.UI.Controls
|
||||
var adhelper = new ADhelper(Domain);
|
||||
adhelper.GetChildEntries(tNode.Tag.ToString());
|
||||
var enumerator = adhelper.Children.GetEnumerator();
|
||||
TvAd.BeginUpdate();
|
||||
tvActiveDirectory.BeginUpdate();
|
||||
while (enumerator.MoveNext())
|
||||
{
|
||||
var flag1 = false;
|
||||
@@ -102,7 +108,7 @@ namespace mRemoteNG.UI.Controls
|
||||
node1.SelectedImageIndex = imageIndex;
|
||||
}
|
||||
|
||||
TvAd.EndUpdate();
|
||||
tvActiveDirectory.EndUpdate();
|
||||
}
|
||||
|
||||
private static int GetImageIndex(string objType)
|
||||
@@ -111,5 +117,7 @@ namespace mRemoteNG.UI.Controls
|
||||
return 2;
|
||||
return objType.Equals("OU") ? 1 : 3;
|
||||
}
|
||||
|
||||
#endregion Private Methods
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA4
|
||||
DAAAAk1TRnQBSQFMAgEBBAEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
DAAAAk1TRnQBSQFMAgEBBAEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
|
||||
Reference in New Issue
Block a user