From 88d005caf622ce556ad7c8e800b8d70c5fe7c3d3 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Wed, 14 Sep 2016 08:59:03 -0600 Subject: [PATCH] Rearranged some event handler declarations --- .../Window/ConnectionTreeWindow.Designer.cs | 3 - mRemoteV1/UI/Window/ConnectionTreeWindow.cs | 73 +++++++++++-------- 2 files changed, 43 insertions(+), 33 deletions(-) diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs index 0627f978..7711b870 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs @@ -264,7 +264,6 @@ namespace mRemoteNG.UI.Window this.cMenTreeDuplicate.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.cMenTreeDuplicate.Size = new System.Drawing.Size(199, 22); this.cMenTreeDuplicate.Text = "Duplicate"; - this.cMenTreeDuplicate.Click += new System.EventHandler(this.cMenTreeDuplicate_Click); // // cMenTreeRename // @@ -273,7 +272,6 @@ namespace mRemoteNG.UI.Window this.cMenTreeRename.ShortcutKeys = System.Windows.Forms.Keys.F2; this.cMenTreeRename.Size = new System.Drawing.Size(199, 22); this.cMenTreeRename.Text = "Rename"; - this.cMenTreeRename.Click += new System.EventHandler(this.cMenTreeRename_Click); // // cMenTreeDelete // @@ -282,7 +280,6 @@ namespace mRemoteNG.UI.Window this.cMenTreeDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete; this.cMenTreeDelete.Size = new System.Drawing.Size(199, 22); this.cMenTreeDelete.Text = "Delete"; - this.cMenTreeDelete.Click += new System.EventHandler(this.cMenTreeDelete_Click); // // cMenTreeSep3 // diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs index db10146e..967f38cd 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs @@ -91,17 +91,30 @@ namespace mRemoteNG.UI.Window private void SetEventHandlers() { - olvConnections.Collapsed += (sender, args) => ((ContainerInfo) args.Model).IsExpanded = false; - olvConnections.Expanded += (sender, args) => ((ContainerInfo) args.Model).IsExpanded = true; - olvConnections.BeforeLabelEdit += tvConnections_BeforeLabelEdit; - olvConnections.AfterLabelEdit += tvConnections_AfterLabelEdit; - olvConnections.SelectionChanged += tvConnections_AfterSelect; - olvConnections.CellClick += tvConnections_NodeMouseSingleClick; - olvConnections.CellClick += tvConnections_NodeMouseDoubleClick; - olvConnections.CellToolTipShowing += tvConnections_CellToolTipShowing; + SetTreeEventHandlers(); + SetMenuEventHandlers(); + } + + private void SetTreeEventHandlers() + { + olvConnections.Collapsed += (sender, args) => ((ContainerInfo)args.Model).IsExpanded = false; + olvConnections.Expanded += (sender, args) => ((ContainerInfo)args.Model).IsExpanded = true; + olvConnections.BeforeLabelEdit += tvConnections_BeforeLabelEdit; + olvConnections.AfterLabelEdit += tvConnections_AfterLabelEdit; + olvConnections.SelectionChanged += tvConnections_AfterSelect; + olvConnections.CellClick += tvConnections_NodeMouseSingleClick; + olvConnections.CellClick += tvConnections_NodeMouseDoubleClick; + olvConnections.CellToolTipShowing += tvConnections_CellToolTipShowing; olvConnections.ModelCanDrop += _dragAndDropHandler.HandleEvent_ModelCanDrop; olvConnections.ModelDropped += _dragAndDropHandler.HandleEvent_ModelDropped; - } + } + + private void SetMenuEventHandlers() + { + cMenTreeDuplicate.Click += (sender, args) => DuplicateSelectedNode(); + cMenTreeRename.Click += (sender, args) => RenameSelectedNode(); + cMenTreeDelete.Click += (sender, args) => DeleteSelectedNode(); + } private void PopulateTreeView() { @@ -218,6 +231,27 @@ namespace mRemoteNG.UI.Window olvConnections.EnsureModelVisible(GetRootConnectionNode()); } + public void DuplicateSelectedNode() + { + var newNode = SelectedNode.Clone(); + newNode.Parent.SetChildBelow(newNode, SelectedNode); + Runtime.SaveConnectionsBG(); + olvConnections.RefreshObject(SelectedNode); + } + + public void RenameSelectedNode() + { + olvConnections.SelectedItem.BeginEdit(); + Runtime.SaveConnectionsBG(); + } + + public void DeleteSelectedNode() + { + ConnectionTreeModel.DeleteNode(SelectedNode); + Runtime.SaveConnectionsBG(); + olvConnections.RefreshObject(SelectedNode); + } + #region Private Methods private void tvConnections_BeforeLabelEdit(object sender, LabelEditEventArgs e) { @@ -525,27 +559,6 @@ namespace mRemoteNG.UI.Window StartExternalApp((Tools.ExternalTool)((ToolStripMenuItem)sender).Tag); } - private void cMenTreeDuplicate_Click(object sender, EventArgs e) - { - var newNode = SelectedNode.Clone(); - newNode.Parent.SetChildBelow(newNode, SelectedNode); - Runtime.SaveConnectionsBG(); - olvConnections.RefreshObject(SelectedNode); - } - - private void cMenTreeRename_Click(object sender, EventArgs e) - { - olvConnections.SelectedItem.BeginEdit(); - Runtime.SaveConnectionsBG(); - } - - private void cMenTreeDelete_Click(object sender, EventArgs e) - { - ConnectionTreeModel.DeleteNode(SelectedNode); - Runtime.SaveConnectionsBG(); - olvConnections.RefreshObject(SelectedNode); - } - //TODO Fix for TreeListView private void cMenTreeImportFile_Click(object sender, EventArgs e) {