diff --git a/mRemoteV1/App/ProgramRoot.cs b/mRemoteV1/App/ProgramRoot.cs index 038e32211..6371359e7 100644 --- a/mRemoteV1/App/ProgramRoot.cs +++ b/mRemoteV1/App/ProgramRoot.cs @@ -24,6 +24,8 @@ namespace mRemoteNG.App private static void StartApplication() { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); Startup.Instance.InitializeProgram(); Application.Run(frmMain.Default); } diff --git a/mRemoteV1/Config/Connections/ConnectionsLoader.cs b/mRemoteV1/Config/Connections/ConnectionsLoader.cs index 695255e6a..16844aaab 100644 --- a/mRemoteV1/Config/Connections/ConnectionsLoader.cs +++ b/mRemoteV1/Config/Connections/ConnectionsLoader.cs @@ -56,9 +56,9 @@ namespace mRemoteNG.Config.Connections ContainerList = ContainerList }; var connectionTreeModel = xmlConnectionsDeserializer.Deserialize(import); - var connectionTreeViewBuilder = new ConnectionTreeViewBuilder(connectionTreeModel); - connectionTreeViewBuilder.Build(); - connectionTreeViewBuilder.AppendTo(Windows.treeForm.tvConnections); + //var connectionTreeViewBuilder = new ConnectionTreeViewBuilder(connectionTreeModel); + //connectionTreeViewBuilder.Build(); + //connectionTreeViewBuilder.AppendTo(Windows.treeForm.tvConnections); Runtime.ConnectionTreeModel = connectionTreeModel; } diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs index 553797d6e..bd658916e 100644 --- a/mRemoteV1/UI/Forms/frmMain.cs +++ b/mRemoteV1/UI/Forms/frmMain.cs @@ -168,9 +168,10 @@ namespace mRemoteNG.UI.Forms Microsoft.Win32.SystemEvents.DisplaySettingsChanged += DisplayChanged; Opacity = 1; - Windows.treeForm.ExpandPreviouslyOpenedFolders(); - Windows.treeForm.EnsureRootNodeVisible(); - Windows.treeForm.OpenConnectionsFromLastSession(); + Windows.treeForm.ConnectionTreeModel = Runtime.ConnectionTreeModel; + //Windows.treeForm.ExpandPreviouslyOpenedFolders(); + //Windows.treeForm.EnsureRootNodeVisible(); + //Windows.treeForm.OpenConnectionsFromLastSession(); } private void ApplySpecialSettingsForPortableVersion() diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs index dcb85195e..9eb873f2b 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs @@ -1,13 +1,9 @@ - -using mRemoteNG.My; - namespace mRemoteNG.UI.Window { public partial class ConnectionTreeWindow : BaseWindow { #region Windows Form Designer generated code - private System.ComponentModel.Container components = null; internal System.Windows.Forms.TextBox txtSearch; internal System.Windows.Forms.Panel pnlConnections; internal System.Windows.Forms.ImageList imgListTree; @@ -45,451 +41,495 @@ namespace mRemoteNG.UI.Window internal System.Windows.Forms.ToolStripMenuItem mMenAddConnection; internal System.Windows.Forms.ToolStripMenuItem mMenAddFolder; public System.Windows.Forms.TreeView tvConnections; + public BrightIdeasSoftware.TreeListView olvConnections; private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.Load += new System.EventHandler(Tree_Load); - this.tvConnections = new System.Windows.Forms.TreeView(); - this.tvConnections.BeforeLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.tvConnections_BeforeLabelEdit); - this.tvConnections.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.tvConnections_AfterLabelEdit); - this.tvConnections.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvConnections_AfterSelect); - this.tvConnections.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tvConnections_NodeMouseClick); - this.tvConnections.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(tvConnections_NodeMouseDoubleClick); - this.tvConnections.MouseMove += new System.Windows.Forms.MouseEventHandler(this.tvConnections_MouseMove); - this.tvConnections.DragDrop += new System.Windows.Forms.DragEventHandler(tvConnections_DragDrop); - this.tvConnections.DragEnter += new System.Windows.Forms.DragEventHandler(tvConnections_DragEnter); - this.tvConnections.DragOver += new System.Windows.Forms.DragEventHandler(tvConnections_DragOver); - this.tvConnections.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.tvConnections_ItemDrag); - this.tvConnections.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tvConnections_KeyPress); - this.tvConnections.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tvConnections_KeyDown); - this.cMenTree = new System.Windows.Forms.ContextMenuStrip(this.components); - this.cMenTree.Opening += new System.ComponentModel.CancelEventHandler(this.cMenTree_DropDownOpening); - this.cMenTreeConnect = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeConnect.Click += new System.EventHandler(cMenTreeConnect_Click); - this.cMenTreeConnectWithOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeConnectWithOptionsConnectToConsoleSession = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeConnectWithOptionsConnectToConsoleSession.Click += new System.EventHandler(cMenTreeConnectWithOptionsConnectToConsoleSession_Click); - this.cMenTreeConnectWithOptionsDontConnectToConsoleSession = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Click += new System.EventHandler(cMenTreeConnectWithOptionsDontConnectToConsoleSession_Click); - this.cMenTreeConnectWithOptionsConnectInFullscreen = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeConnectWithOptionsConnectInFullscreen.Click += new System.EventHandler(cMenTreeConnectWithOptionsConnectInFullscreen_Click); - this.cMenTreeConnectWithOptionsNoCredentials = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeConnectWithOptionsNoCredentials.Click += new System.EventHandler(cMenTreeConnectWithOptionsNoCredentials_Click); - this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Click += new System.EventHandler(cMenTreeConnectWithOptionsChoosePanelBeforeConnecting_Click); - this.cMenTreeDisconnect = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeDisconnect.Click += new System.EventHandler(this.cMenTreeDisconnect_Click); - this.cMenTreeSep1 = new System.Windows.Forms.ToolStripSeparator(); - this.cMenTreeToolsExternalApps = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeToolsTransferFile = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeToolsTransferFile.Click += new System.EventHandler(cMenTreeToolsTransferFile_Click); - this.cMenTreeSep2 = new System.Windows.Forms.ToolStripSeparator(); - this.cMenTreeDuplicate = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeDuplicate.Click += new System.EventHandler(cMenTreeDuplicate_Click); - this.cMenTreeRename = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeRename.Click += new System.EventHandler(cMenTreeRename_Click); - this.cMenTreeDelete = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeDelete.Click += new System.EventHandler(cMenTreeDelete_Click); - this.cMenTreeSep3 = new System.Windows.Forms.ToolStripSeparator(); - this.cMenTreeImport = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeImportFile = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeImportFile.Click += new System.EventHandler(cMenTreeImportFile_Click); - this.cMenTreeImportActiveDirectory = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeImportActiveDirectory.Click += new System.EventHandler(cMenTreeImportActiveDirectory_Click); - this.cMenTreeImportPortScan = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeImportPortScan.Click += new System.EventHandler(cMenTreeImportPortScan_Click); - this.cMenTreeExportFile = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeExportFile.Click += new System.EventHandler(cMenTreeExportFile_Click); - this.cMenTreeSep4 = new System.Windows.Forms.ToolStripSeparator(); - this.cMenTreeAddConnection = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeAddConnection.Click += new System.EventHandler(this.cMenTreeAddConnection_Click); - this.cMenTreeAddFolder = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeAddFolder.Click += new System.EventHandler(this.cMenTreeAddFolder_Click); - this.ToolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.cMenTreeToolsSort = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeToolsSortAscending = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeToolsSortAscending.Click += new System.EventHandler(this.cMenTreeToolsSortAscending_Click); - this.cMenTreeToolsSortDescending = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeToolsSortDescending.Click += new System.EventHandler(this.cMenTreeToolsSortDescending_Click); - this.cMenTreeMoveUp = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeMoveUp.Click += new System.EventHandler(cMenTreeMoveUp_Click); - this.cMenTreeMoveDown = new System.Windows.Forms.ToolStripMenuItem(); - this.cMenTreeMoveDown.Click += new System.EventHandler(cMenTreeMoveDown_Click); - this.imgListTree = new System.Windows.Forms.ImageList(this.components); - this.pnlConnections = new System.Windows.Forms.Panel(); - this.PictureBox1 = new System.Windows.Forms.PictureBox(); - this.txtSearch = new System.Windows.Forms.TextBox(); - this.txtSearch.GotFocus += new System.EventHandler(this.txtSearch_GotFocus); - this.txtSearch.LostFocus += new System.EventHandler(this.txtSearch_LostFocus); - this.txtSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown); - this.txtSearch.TextChanged += new System.EventHandler(this.txtSearch_TextChanged); - this.msMain = new System.Windows.Forms.MenuStrip(); - this.mMenAddConnection = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenAddConnection.Click += new System.EventHandler(this.cMenTreeAddConnection_Click); - this.mMenAddFolder = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenAddFolder.Click += new System.EventHandler(this.cMenTreeAddFolder_Click); - this.mMenView = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenViewExpandAllFolders = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenViewExpandAllFolders.Click += new System.EventHandler(mMenViewExpandAllFolders_Click); - this.mMenViewCollapseAllFolders = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenViewCollapseAllFolders.Click += new System.EventHandler(this.mMenViewCollapseAllFolders_Click); - this.mMenSortAscending = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenSortAscending.Click += new System.EventHandler(this.mMenSortAscending_Click); - this.cMenTree.SuspendLayout(); - this.pnlConnections.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize) this.PictureBox1).BeginInit(); - this.msMain.SuspendLayout(); - this.SuspendLayout(); - // - //tvConnections - // - this.tvConnections.AllowDrop = true; - this.tvConnections.Anchor = (System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right); - this.tvConnections.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.tvConnections.ContextMenuStrip = this.cMenTree; - this.tvConnections.HideSelection = false; - this.tvConnections.ImageIndex = 0; - this.tvConnections.ImageList = this.imgListTree; - this.tvConnections.LabelEdit = true; - this.tvConnections.Location = new System.Drawing.Point(0, 0); - this.tvConnections.Name = "tvConnections"; - this.tvConnections.SelectedImageIndex = 0; - this.tvConnections.Size = new System.Drawing.Size(192, 410); - this.tvConnections.TabIndex = 20; - // - //cMenTree - // - this.cMenTree.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, System.Convert.ToByte(0)); - this.cMenTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.cMenTreeConnect, this.cMenTreeConnectWithOptions, this.cMenTreeDisconnect, this.cMenTreeSep1, this.cMenTreeToolsExternalApps, this.cMenTreeToolsTransferFile, this.cMenTreeSep2, this.cMenTreeDuplicate, this.cMenTreeRename, this.cMenTreeDelete, this.cMenTreeSep3, this.cMenTreeImport, this.cMenTreeExportFile, this.cMenTreeSep4, this.cMenTreeAddConnection, this.cMenTreeAddFolder, this.ToolStripSeparator1, this.cMenTreeToolsSort, this.cMenTreeMoveUp, this.cMenTreeMoveDown}); - this.cMenTree.Name = "cMenTree"; - this.cMenTree.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.cMenTree.Size = new System.Drawing.Size(187, 386); - // - //cMenTreeConnect - // - this.cMenTreeConnect.Image = Resources.Play; - this.cMenTreeConnect.Name = "cMenTreeConnect"; - this.cMenTreeConnect.ShortcutKeys = (System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.C); - this.cMenTreeConnect.Size = new System.Drawing.Size(186, 22); - this.cMenTreeConnect.Text = "Connect"; - // - //cMenTreeConnectWithOptions - // - this.cMenTreeConnectWithOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.cMenTreeConnectWithOptionsConnectToConsoleSession, this.cMenTreeConnectWithOptionsDontConnectToConsoleSession, this.cMenTreeConnectWithOptionsConnectInFullscreen, this.cMenTreeConnectWithOptionsNoCredentials, this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting}); - this.cMenTreeConnectWithOptions.Name = "cMenTreeConnectWithOptions"; - this.cMenTreeConnectWithOptions.Size = new System.Drawing.Size(186, 22); - this.cMenTreeConnectWithOptions.Text = "Connect (with options)"; - // - //cMenTreeConnectWithOptionsConnectToConsoleSession - // - this.cMenTreeConnectWithOptionsConnectToConsoleSession.Image = Resources.monitor_go; - this.cMenTreeConnectWithOptionsConnectToConsoleSession.Name = "cMenTreeConnectWithOptionsConnectToConsoleSession"; - this.cMenTreeConnectWithOptionsConnectToConsoleSession.Size = new System.Drawing.Size(231, 22); - this.cMenTreeConnectWithOptionsConnectToConsoleSession.Text = "Connect to console session"; - // - //cMenTreeConnectWithOptionsDontConnectToConsoleSession - // - this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Image = Resources.monitor_delete; - this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Name = "cMenTreeConnectWithOptionsDontConnectToConsoleSession"; - this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Size = new System.Drawing.Size(231, 22); - this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Text = "Don\'t connect to console session"; - this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Visible = false; - // - //cMenTreeConnectWithOptionsConnectInFullscreen - // - this.cMenTreeConnectWithOptionsConnectInFullscreen.Image = Resources.arrow_out; - this.cMenTreeConnectWithOptionsConnectInFullscreen.Name = "cMenTreeConnectWithOptionsConnectInFullscreen"; - this.cMenTreeConnectWithOptionsConnectInFullscreen.Size = new System.Drawing.Size(231, 22); - this.cMenTreeConnectWithOptionsConnectInFullscreen.Text = "Connect in fullscreen"; - // - //cMenTreeConnectWithOptionsNoCredentials - // - this.cMenTreeConnectWithOptionsNoCredentials.Image = Resources.key_delete; - this.cMenTreeConnectWithOptionsNoCredentials.Name = "cMenTreeConnectWithOptionsNoCredentials"; - this.cMenTreeConnectWithOptionsNoCredentials.Size = new System.Drawing.Size(231, 22); - this.cMenTreeConnectWithOptionsNoCredentials.Text = "Connect without credentials"; - // - //cMenTreeConnectWithOptionsChoosePanelBeforeConnecting - // - this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Resources.Panels; - this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Name = "cMenTreeConnectWithOptionsChoosePanelBeforeConnecting"; - this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Size = new System.Drawing.Size(231, 22); - this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = "Choose panel before connecting"; - // - //cMenTreeDisconnect - // - this.cMenTreeDisconnect.Image = Resources.Pause; - this.cMenTreeDisconnect.Name = "cMenTreeDisconnect"; - this.cMenTreeDisconnect.Size = new System.Drawing.Size(186, 22); - this.cMenTreeDisconnect.Text = "Disconnect"; - // - //cMenTreeSep1 - // - this.cMenTreeSep1.Name = "cMenTreeSep1"; - this.cMenTreeSep1.Size = new System.Drawing.Size(183, 6); - // - //cMenTreeToolsExternalApps - // - this.cMenTreeToolsExternalApps.Image = Resources.ExtApp; - this.cMenTreeToolsExternalApps.Name = "cMenTreeToolsExternalApps"; - this.cMenTreeToolsExternalApps.Size = new System.Drawing.Size(186, 22); - this.cMenTreeToolsExternalApps.Text = "External Applications"; - // - //cMenTreeToolsTransferFile - // - this.cMenTreeToolsTransferFile.Image = Resources.SSHTransfer; - this.cMenTreeToolsTransferFile.Name = "cMenTreeToolsTransferFile"; - this.cMenTreeToolsTransferFile.Size = new System.Drawing.Size(186, 22); - this.cMenTreeToolsTransferFile.Text = "Transfer File (SSH)"; - // - //cMenTreeSep2 - // - this.cMenTreeSep2.Name = "cMenTreeSep2"; - this.cMenTreeSep2.Size = new System.Drawing.Size(183, 6); - // - //cMenTreeDuplicate - // - this.cMenTreeDuplicate.Image = Resources.page_copy; - this.cMenTreeDuplicate.Name = "cMenTreeDuplicate"; - this.cMenTreeDuplicate.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D); - this.cMenTreeDuplicate.Size = new System.Drawing.Size(186, 22); - this.cMenTreeDuplicate.Text = "Duplicate"; - // - //cMenTreeRename - // - this.cMenTreeRename.Image = Resources.Rename; - this.cMenTreeRename.Name = "cMenTreeRename"; - this.cMenTreeRename.ShortcutKeys = System.Windows.Forms.Keys.F2; - this.cMenTreeRename.Size = new System.Drawing.Size(186, 22); - this.cMenTreeRename.Text = "Rename"; - // - //cMenTreeDelete - // - this.cMenTreeDelete.Image = Resources.Delete; - this.cMenTreeDelete.Name = "cMenTreeDelete"; - this.cMenTreeDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.cMenTreeDelete.Size = new System.Drawing.Size(186, 22); - this.cMenTreeDelete.Text = "Delete"; - // - //cMenTreeSep3 - // - this.cMenTreeSep3.Name = "cMenTreeSep3"; - this.cMenTreeSep3.Size = new System.Drawing.Size(183, 6); - // - //cMenTreeImport - // - this.cMenTreeImport.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.cMenTreeImportFile, this.cMenTreeImportActiveDirectory, this.cMenTreeImportPortScan}); - this.cMenTreeImport.Name = "cMenTreeImport"; - this.cMenTreeImport.Size = new System.Drawing.Size(186, 22); - this.cMenTreeImport.Text = "&Import"; - // - //cMenTreeImportFile - // - this.cMenTreeImportFile.Name = "cMenTreeImportFile"; - this.cMenTreeImportFile.Size = new System.Drawing.Size(213, 22); - this.cMenTreeImportFile.Text = "Import from &File..."; - // - //cMenTreeImportActiveDirectory - // - this.cMenTreeImportActiveDirectory.Name = "cMenTreeImportActiveDirectory"; - this.cMenTreeImportActiveDirectory.Size = new System.Drawing.Size(213, 22); - this.cMenTreeImportActiveDirectory.Text = "Import from &Active Directory..."; - // - //cMenTreeImportPortScan - // - this.cMenTreeImportPortScan.Name = "cMenTreeImportPortScan"; - this.cMenTreeImportPortScan.Size = new System.Drawing.Size(213, 22); - this.cMenTreeImportPortScan.Text = "Import from &Port Scan..."; - // - //cMenTreeExportFile - // - this.cMenTreeExportFile.Name = "cMenTreeExportFile"; - this.cMenTreeExportFile.Size = new System.Drawing.Size(186, 22); - this.cMenTreeExportFile.Text = "&Export to File..."; - // - //cMenTreeSep4 - // - this.cMenTreeSep4.Name = "cMenTreeSep4"; - this.cMenTreeSep4.Size = new System.Drawing.Size(183, 6); - // - //cMenTreeAddConnection - // - this.cMenTreeAddConnection.Image = Resources.Connection_Add; - this.cMenTreeAddConnection.Name = "cMenTreeAddConnection"; - this.cMenTreeAddConnection.Size = new System.Drawing.Size(186, 22); - this.cMenTreeAddConnection.Text = "New Connection"; - // - //cMenTreeAddFolder - // - this.cMenTreeAddFolder.Image = Resources.Folder_Add; - this.cMenTreeAddFolder.Name = "cMenTreeAddFolder"; - this.cMenTreeAddFolder.Size = new System.Drawing.Size(186, 22); - this.cMenTreeAddFolder.Text = "New Folder"; - // - //ToolStripSeparator1 - // - this.ToolStripSeparator1.Name = "ToolStripSeparator1"; - this.ToolStripSeparator1.Size = new System.Drawing.Size(183, 6); - // - //cMenTreeToolsSort - // - this.cMenTreeToolsSort.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.cMenTreeToolsSortAscending, this.cMenTreeToolsSortDescending}); - this.cMenTreeToolsSort.Name = "cMenTreeToolsSort"; - this.cMenTreeToolsSort.Size = new System.Drawing.Size(186, 22); - this.cMenTreeToolsSort.Text = "Sort"; - // - //cMenTreeToolsSortAscending - // - this.cMenTreeToolsSortAscending.Image = Resources.Sort_AZ; - this.cMenTreeToolsSortAscending.Name = "cMenTreeToolsSortAscending"; - this.cMenTreeToolsSortAscending.Size = new System.Drawing.Size(157, 22); - this.cMenTreeToolsSortAscending.Text = "Ascending (A-Z)"; - // - //cMenTreeToolsSortDescending - // - this.cMenTreeToolsSortDescending.Image = Resources.Sort_ZA; - this.cMenTreeToolsSortDescending.Name = "cMenTreeToolsSortDescending"; - this.cMenTreeToolsSortDescending.Size = new System.Drawing.Size(157, 22); - this.cMenTreeToolsSortDescending.Text = "Descending (Z-A)"; - // - //cMenTreeMoveUp - // - this.cMenTreeMoveUp.Image = Resources.Arrow_Up; - this.cMenTreeMoveUp.Name = "cMenTreeMoveUp"; - this.cMenTreeMoveUp.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up); - this.cMenTreeMoveUp.Size = new System.Drawing.Size(186, 22); - this.cMenTreeMoveUp.Text = "Move up"; - // - //cMenTreeMoveDown - // - this.cMenTreeMoveDown.Image = Resources.Arrow_Down; - this.cMenTreeMoveDown.Name = "cMenTreeMoveDown"; - this.cMenTreeMoveDown.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down); - this.cMenTreeMoveDown.Size = new System.Drawing.Size(186, 22); - this.cMenTreeMoveDown.Text = "Move down"; - // - //imgListTree - // - this.imgListTree.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit; - this.imgListTree.ImageSize = new System.Drawing.Size(16, 16); - this.imgListTree.TransparentColor = System.Drawing.Color.Transparent; - // - //pnlConnections - // - this.pnlConnections.Anchor = (System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right); - this.pnlConnections.Controls.Add(this.PictureBox1); - this.pnlConnections.Controls.Add(this.txtSearch); - this.pnlConnections.Controls.Add(this.tvConnections); - this.pnlConnections.Location = new System.Drawing.Point(0, 25); - this.pnlConnections.Name = "pnlConnections"; - this.pnlConnections.Size = new System.Drawing.Size(192, 428); - this.pnlConnections.TabIndex = 9; - // - //PictureBox1 - // - this.PictureBox1.Anchor = (System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left); - this.PictureBox1.Image = Resources.Search; - this.PictureBox1.Location = new System.Drawing.Point(2, 412); - this.PictureBox1.Name = "PictureBox1"; - this.PictureBox1.Size = new System.Drawing.Size(16, 16); - this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.PictureBox1.TabIndex = 1; - this.PictureBox1.TabStop = false; - // - //txtSearch - // - this.txtSearch.Anchor = (System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right); - this.txtSearch.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtSearch.ForeColor = System.Drawing.SystemColors.GrayText; - this.txtSearch.Location = new System.Drawing.Point(19, 413); - this.txtSearch.Name = "txtSearch"; - this.txtSearch.Size = new System.Drawing.Size(171, 13); - this.txtSearch.TabIndex = 30; - this.txtSearch.TabStop = false; - this.txtSearch.Text = "Search"; - // - //msMain - // - this.msMain.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, System.Convert.ToByte(0)); - this.msMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.mMenAddConnection, this.mMenAddFolder, this.mMenView, this.mMenSortAscending}); - this.msMain.Location = new System.Drawing.Point(0, 0); - this.msMain.Name = "msMain"; - this.msMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.msMain.ShowItemToolTips = true; - this.msMain.Size = new System.Drawing.Size(192, 24); - this.msMain.TabIndex = 10; - this.msMain.Text = "MenuStrip1"; - // - //mMenAddConnection - // - this.mMenAddConnection.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenAddConnection.Image = Resources.Connection_Add; - this.mMenAddConnection.Name = "mMenAddConnection"; - this.mMenAddConnection.Size = new System.Drawing.Size(28, 20); - // - //mMenAddFolder - // - this.mMenAddFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenAddFolder.Image = Resources.Folder_Add; - this.mMenAddFolder.Name = "mMenAddFolder"; - this.mMenAddFolder.Size = new System.Drawing.Size(28, 20); - // - //mMenView - // - this.mMenView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenView.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.mMenViewExpandAllFolders, this.mMenViewCollapseAllFolders}); - this.mMenView.Image = Resources.View; - this.mMenView.Name = "mMenView"; - this.mMenView.Size = new System.Drawing.Size(28, 20); - this.mMenView.Text = "&View"; - // - //mMenViewExpandAllFolders - // - this.mMenViewExpandAllFolders.Image = Resources.Expand; - this.mMenViewExpandAllFolders.Name = "mMenViewExpandAllFolders"; - this.mMenViewExpandAllFolders.Size = new System.Drawing.Size(161, 22); - this.mMenViewExpandAllFolders.Text = "Expand all folders"; - // - //mMenViewCollapseAllFolders - // - this.mMenViewCollapseAllFolders.Image = Resources.Collapse; - this.mMenViewCollapseAllFolders.Name = "mMenViewCollapseAllFolders"; - this.mMenViewCollapseAllFolders.Size = new System.Drawing.Size(161, 22); - this.mMenViewCollapseAllFolders.Text = "Collapse all folders"; - // - //mMenSortAscending - // - this.mMenSortAscending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenSortAscending.Image = Resources.Sort_AZ; - this.mMenSortAscending.Name = "mMenSortAscending"; - this.mMenSortAscending.Size = new System.Drawing.Size(28, 20); - // - //Tree - // - this.ClientSize = new System.Drawing.Size(192, 453); - this.Controls.Add(this.msMain); - this.Controls.Add(this.pnlConnections); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, System.Convert.ToByte(0)); - this.HideOnClose = true; - this.Icon = Resources.Root_Icon; - this.Name = "Tree"; - this.TabText = "Connections"; - this.Text = "Connections"; - this.cMenTree.ResumeLayout(false); - this.pnlConnections.ResumeLayout(false); - this.pnlConnections.PerformLayout(); - ((System.ComponentModel.ISupportInitialize) this.PictureBox1).EndInit(); - this.msMain.ResumeLayout(false); - this.msMain.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - + this.components = new System.ComponentModel.Container(); + this.olvConnections = new BrightIdeasSoftware.TreeListView(); + this.olvColumn1 = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); + this.cMenTree = new System.Windows.Forms.ContextMenuStrip(this.components); + this.cMenTreeConnect = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeConnectWithOptions = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeConnectWithOptionsConnectToConsoleSession = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeConnectWithOptionsDontConnectToConsoleSession = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeConnectWithOptionsConnectInFullscreen = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeConnectWithOptionsNoCredentials = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeDisconnect = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeSep1 = new System.Windows.Forms.ToolStripSeparator(); + this.cMenTreeToolsExternalApps = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeToolsTransferFile = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeSep2 = new System.Windows.Forms.ToolStripSeparator(); + this.cMenTreeDuplicate = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeRename = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeDelete = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeSep3 = new System.Windows.Forms.ToolStripSeparator(); + this.cMenTreeImport = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeImportFile = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeImportActiveDirectory = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeImportPortScan = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeExportFile = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeSep4 = new System.Windows.Forms.ToolStripSeparator(); + this.cMenTreeAddConnection = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeAddFolder = new System.Windows.Forms.ToolStripMenuItem(); + this.ToolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.cMenTreeToolsSort = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeToolsSortAscending = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeToolsSortDescending = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeMoveUp = new System.Windows.Forms.ToolStripMenuItem(); + this.cMenTreeMoveDown = new System.Windows.Forms.ToolStripMenuItem(); + this.imgListTree = new System.Windows.Forms.ImageList(this.components); + this.pnlConnections = new System.Windows.Forms.Panel(); + this.PictureBox1 = new System.Windows.Forms.PictureBox(); + this.txtSearch = new System.Windows.Forms.TextBox(); + this.msMain = new System.Windows.Forms.MenuStrip(); + this.mMenAddConnection = new System.Windows.Forms.ToolStripMenuItem(); + this.mMenAddFolder = new System.Windows.Forms.ToolStripMenuItem(); + this.mMenView = new System.Windows.Forms.ToolStripMenuItem(); + this.mMenViewExpandAllFolders = new System.Windows.Forms.ToolStripMenuItem(); + this.mMenViewCollapseAllFolders = new System.Windows.Forms.ToolStripMenuItem(); + this.mMenSortAscending = new System.Windows.Forms.ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)(this.olvConnections)).BeginInit(); + this.cMenTree.SuspendLayout(); + this.pnlConnections.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit(); + this.msMain.SuspendLayout(); + this.SuspendLayout(); + // + // olvConnections + // + this.olvConnections.AllColumns.Add(this.olvColumn1); + this.olvConnections.AllowDrop = true; + this.olvConnections.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.olvConnections.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.olvConnections.CellEditUseWholeCell = false; + this.olvConnections.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.olvColumn1}); + this.olvConnections.ContextMenuStrip = this.cMenTree; + this.olvConnections.Cursor = System.Windows.Forms.Cursors.Default; + this.olvConnections.FullRowSelect = true; + this.olvConnections.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.olvConnections.HideSelection = false; + this.olvConnections.LabelEdit = true; + this.olvConnections.Location = new System.Drawing.Point(0, 0); + this.olvConnections.MultiSelect = false; + this.olvConnections.Name = "olvConnections"; + this.olvConnections.ShowGroups = false; + this.olvConnections.Size = new System.Drawing.Size(192, 410); + this.olvConnections.SmallImageList = this.imgListTree; + this.olvConnections.TabIndex = 20; + this.olvConnections.UseCompatibleStateImageBehavior = false; + this.olvConnections.View = System.Windows.Forms.View.Details; + this.olvConnections.VirtualMode = true; + // + // olvColumn1 + // + this.olvColumn1.AspectName = "Name"; + this.olvColumn1.IsButton = true; + this.olvColumn1.Width = 200; + // + // cMenTree + // + this.cMenTree.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cMenTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cMenTreeConnect, + this.cMenTreeConnectWithOptions, + this.cMenTreeDisconnect, + this.cMenTreeSep1, + this.cMenTreeToolsExternalApps, + this.cMenTreeToolsTransferFile, + this.cMenTreeSep2, + this.cMenTreeDuplicate, + this.cMenTreeRename, + this.cMenTreeDelete, + this.cMenTreeSep3, + this.cMenTreeImport, + this.cMenTreeExportFile, + this.cMenTreeSep4, + this.cMenTreeAddConnection, + this.cMenTreeAddFolder, + this.ToolStripSeparator1, + this.cMenTreeToolsSort, + this.cMenTreeMoveUp, + this.cMenTreeMoveDown}); + this.cMenTree.Name = "cMenTree"; + this.cMenTree.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.cMenTree.Size = new System.Drawing.Size(200, 364); + this.cMenTree.Opening += new System.ComponentModel.CancelEventHandler(this.cMenTree_DropDownOpening); + // + // cMenTreeConnect + // + this.cMenTreeConnect.Image = global::mRemoteNG.Resources.Play; + this.cMenTreeConnect.Name = "cMenTreeConnect"; + this.cMenTreeConnect.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.C))); + this.cMenTreeConnect.Size = new System.Drawing.Size(199, 22); + this.cMenTreeConnect.Text = "Connect"; + this.cMenTreeConnect.Click += new System.EventHandler(this.cMenTreeConnect_Click); + // + // cMenTreeConnectWithOptions + // + this.cMenTreeConnectWithOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cMenTreeConnectWithOptionsConnectToConsoleSession, + this.cMenTreeConnectWithOptionsDontConnectToConsoleSession, + this.cMenTreeConnectWithOptionsConnectInFullscreen, + this.cMenTreeConnectWithOptionsNoCredentials, + this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting}); + this.cMenTreeConnectWithOptions.Name = "cMenTreeConnectWithOptions"; + this.cMenTreeConnectWithOptions.Size = new System.Drawing.Size(199, 22); + this.cMenTreeConnectWithOptions.Text = "Connect (with options)"; + // + // cMenTreeConnectWithOptionsConnectToConsoleSession + // + this.cMenTreeConnectWithOptionsConnectToConsoleSession.Image = global::mRemoteNG.Resources.monitor_go; + this.cMenTreeConnectWithOptionsConnectToConsoleSession.Name = "cMenTreeConnectWithOptionsConnectToConsoleSession"; + this.cMenTreeConnectWithOptionsConnectToConsoleSession.Size = new System.Drawing.Size(245, 22); + this.cMenTreeConnectWithOptionsConnectToConsoleSession.Text = "Connect to console session"; + this.cMenTreeConnectWithOptionsConnectToConsoleSession.Click += new System.EventHandler(this.cMenTreeConnectWithOptionsConnectToConsoleSession_Click); + // + // cMenTreeConnectWithOptionsDontConnectToConsoleSession + // + this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Image = global::mRemoteNG.Resources.monitor_delete; + this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Name = "cMenTreeConnectWithOptionsDontConnectToConsoleSession"; + this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Size = new System.Drawing.Size(245, 22); + this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Text = "Don\'t connect to console session"; + this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Visible = false; + this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Click += new System.EventHandler(this.cMenTreeConnectWithOptionsDontConnectToConsoleSession_Click); + // + // cMenTreeConnectWithOptionsConnectInFullscreen + // + this.cMenTreeConnectWithOptionsConnectInFullscreen.Image = global::mRemoteNG.Resources.arrow_out; + this.cMenTreeConnectWithOptionsConnectInFullscreen.Name = "cMenTreeConnectWithOptionsConnectInFullscreen"; + this.cMenTreeConnectWithOptionsConnectInFullscreen.Size = new System.Drawing.Size(245, 22); + this.cMenTreeConnectWithOptionsConnectInFullscreen.Text = "Connect in fullscreen"; + this.cMenTreeConnectWithOptionsConnectInFullscreen.Click += new System.EventHandler(this.cMenTreeConnectWithOptionsConnectInFullscreen_Click); + // + // cMenTreeConnectWithOptionsNoCredentials + // + this.cMenTreeConnectWithOptionsNoCredentials.Image = global::mRemoteNG.Resources.key_delete; + this.cMenTreeConnectWithOptionsNoCredentials.Name = "cMenTreeConnectWithOptionsNoCredentials"; + this.cMenTreeConnectWithOptionsNoCredentials.Size = new System.Drawing.Size(245, 22); + this.cMenTreeConnectWithOptionsNoCredentials.Text = "Connect without credentials"; + this.cMenTreeConnectWithOptionsNoCredentials.Click += new System.EventHandler(this.cMenTreeConnectWithOptionsNoCredentials_Click); + // + // cMenTreeConnectWithOptionsChoosePanelBeforeConnecting + // + this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = global::mRemoteNG.Resources.Panels; + this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Name = "cMenTreeConnectWithOptionsChoosePanelBeforeConnecting"; + this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Size = new System.Drawing.Size(245, 22); + this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = "Choose panel before connecting"; + this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Click += new System.EventHandler(this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting_Click); + // + // cMenTreeDisconnect + // + this.cMenTreeDisconnect.Image = global::mRemoteNG.Resources.Pause; + this.cMenTreeDisconnect.Name = "cMenTreeDisconnect"; + this.cMenTreeDisconnect.Size = new System.Drawing.Size(199, 22); + this.cMenTreeDisconnect.Text = "Disconnect"; + this.cMenTreeDisconnect.Click += new System.EventHandler(this.cMenTreeDisconnect_Click); + // + // cMenTreeSep1 + // + this.cMenTreeSep1.Name = "cMenTreeSep1"; + this.cMenTreeSep1.Size = new System.Drawing.Size(196, 6); + // + // cMenTreeToolsExternalApps + // + this.cMenTreeToolsExternalApps.Image = global::mRemoteNG.Resources.ExtApp; + this.cMenTreeToolsExternalApps.Name = "cMenTreeToolsExternalApps"; + this.cMenTreeToolsExternalApps.Size = new System.Drawing.Size(199, 22); + this.cMenTreeToolsExternalApps.Text = "External Applications"; + // + // cMenTreeToolsTransferFile + // + this.cMenTreeToolsTransferFile.Image = global::mRemoteNG.Resources.SSHTransfer; + this.cMenTreeToolsTransferFile.Name = "cMenTreeToolsTransferFile"; + this.cMenTreeToolsTransferFile.Size = new System.Drawing.Size(199, 22); + this.cMenTreeToolsTransferFile.Text = "Transfer File (SSH)"; + this.cMenTreeToolsTransferFile.Click += new System.EventHandler(this.cMenTreeToolsTransferFile_Click); + // + // cMenTreeSep2 + // + this.cMenTreeSep2.Name = "cMenTreeSep2"; + this.cMenTreeSep2.Size = new System.Drawing.Size(196, 6); + // + // cMenTreeDuplicate + // + this.cMenTreeDuplicate.Image = global::mRemoteNG.Resources.page_copy; + this.cMenTreeDuplicate.Name = "cMenTreeDuplicate"; + 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 + // + this.cMenTreeRename.Image = global::mRemoteNG.Resources.Rename; + this.cMenTreeRename.Name = "cMenTreeRename"; + 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 + // + this.cMenTreeDelete.Image = global::mRemoteNG.Resources.Delete; + this.cMenTreeDelete.Name = "cMenTreeDelete"; + 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 + // + this.cMenTreeSep3.Name = "cMenTreeSep3"; + this.cMenTreeSep3.Size = new System.Drawing.Size(196, 6); + // + // cMenTreeImport + // + this.cMenTreeImport.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cMenTreeImportFile, + this.cMenTreeImportActiveDirectory, + this.cMenTreeImportPortScan}); + this.cMenTreeImport.Name = "cMenTreeImport"; + this.cMenTreeImport.Size = new System.Drawing.Size(199, 22); + this.cMenTreeImport.Text = "&Import"; + // + // cMenTreeImportFile + // + this.cMenTreeImportFile.Name = "cMenTreeImportFile"; + this.cMenTreeImportFile.Size = new System.Drawing.Size(226, 22); + this.cMenTreeImportFile.Text = "Import from &File..."; + this.cMenTreeImportFile.Click += new System.EventHandler(this.cMenTreeImportFile_Click); + // + // cMenTreeImportActiveDirectory + // + this.cMenTreeImportActiveDirectory.Name = "cMenTreeImportActiveDirectory"; + this.cMenTreeImportActiveDirectory.Size = new System.Drawing.Size(226, 22); + this.cMenTreeImportActiveDirectory.Text = "Import from &Active Directory..."; + this.cMenTreeImportActiveDirectory.Click += new System.EventHandler(this.cMenTreeImportActiveDirectory_Click); + // + // cMenTreeImportPortScan + // + this.cMenTreeImportPortScan.Name = "cMenTreeImportPortScan"; + this.cMenTreeImportPortScan.Size = new System.Drawing.Size(226, 22); + this.cMenTreeImportPortScan.Text = "Import from &Port Scan..."; + this.cMenTreeImportPortScan.Click += new System.EventHandler(this.cMenTreeImportPortScan_Click); + // + // cMenTreeExportFile + // + this.cMenTreeExportFile.Name = "cMenTreeExportFile"; + this.cMenTreeExportFile.Size = new System.Drawing.Size(199, 22); + this.cMenTreeExportFile.Text = "&Export to File..."; + this.cMenTreeExportFile.Click += new System.EventHandler(this.cMenTreeExportFile_Click); + // + // cMenTreeSep4 + // + this.cMenTreeSep4.Name = "cMenTreeSep4"; + this.cMenTreeSep4.Size = new System.Drawing.Size(196, 6); + // + // cMenTreeAddConnection + // + this.cMenTreeAddConnection.Image = global::mRemoteNG.Resources.Connection_Add; + this.cMenTreeAddConnection.Name = "cMenTreeAddConnection"; + this.cMenTreeAddConnection.Size = new System.Drawing.Size(199, 22); + this.cMenTreeAddConnection.Text = "New Connection"; + this.cMenTreeAddConnection.Click += new System.EventHandler(this.cMenTreeAddConnection_Click); + // + // cMenTreeAddFolder + // + this.cMenTreeAddFolder.Image = global::mRemoteNG.Resources.Folder_Add; + this.cMenTreeAddFolder.Name = "cMenTreeAddFolder"; + this.cMenTreeAddFolder.Size = new System.Drawing.Size(199, 22); + this.cMenTreeAddFolder.Text = "New Folder"; + this.cMenTreeAddFolder.Click += new System.EventHandler(this.cMenTreeAddFolder_Click); + // + // ToolStripSeparator1 + // + this.ToolStripSeparator1.Name = "ToolStripSeparator1"; + this.ToolStripSeparator1.Size = new System.Drawing.Size(196, 6); + // + // cMenTreeToolsSort + // + this.cMenTreeToolsSort.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cMenTreeToolsSortAscending, + this.cMenTreeToolsSortDescending}); + this.cMenTreeToolsSort.Name = "cMenTreeToolsSort"; + this.cMenTreeToolsSort.Size = new System.Drawing.Size(199, 22); + this.cMenTreeToolsSort.Text = "Sort"; + // + // cMenTreeToolsSortAscending + // + this.cMenTreeToolsSortAscending.Image = global::mRemoteNG.Resources.Sort_AZ; + this.cMenTreeToolsSortAscending.Name = "cMenTreeToolsSortAscending"; + this.cMenTreeToolsSortAscending.Size = new System.Drawing.Size(161, 22); + this.cMenTreeToolsSortAscending.Text = "Ascending (A-Z)"; + this.cMenTreeToolsSortAscending.Click += new System.EventHandler(this.cMenTreeToolsSortAscending_Click); + // + // cMenTreeToolsSortDescending + // + this.cMenTreeToolsSortDescending.Image = global::mRemoteNG.Resources.Sort_ZA; + this.cMenTreeToolsSortDescending.Name = "cMenTreeToolsSortDescending"; + this.cMenTreeToolsSortDescending.Size = new System.Drawing.Size(161, 22); + this.cMenTreeToolsSortDescending.Text = "Descending (Z-A)"; + this.cMenTreeToolsSortDescending.Click += new System.EventHandler(this.cMenTreeToolsSortDescending_Click); + // + // cMenTreeMoveUp + // + this.cMenTreeMoveUp.Image = global::mRemoteNG.Resources.Arrow_Up; + this.cMenTreeMoveUp.Name = "cMenTreeMoveUp"; + this.cMenTreeMoveUp.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up))); + this.cMenTreeMoveUp.Size = new System.Drawing.Size(199, 22); + this.cMenTreeMoveUp.Text = "Move up"; + this.cMenTreeMoveUp.Click += new System.EventHandler(this.cMenTreeMoveUp_Click); + // + // cMenTreeMoveDown + // + this.cMenTreeMoveDown.Image = global::mRemoteNG.Resources.Arrow_Down; + this.cMenTreeMoveDown.Name = "cMenTreeMoveDown"; + this.cMenTreeMoveDown.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down))); + this.cMenTreeMoveDown.Size = new System.Drawing.Size(199, 22); + this.cMenTreeMoveDown.Text = "Move down"; + this.cMenTreeMoveDown.Click += new System.EventHandler(this.cMenTreeMoveDown_Click); + // + // imgListTree + // + this.imgListTree.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit; + this.imgListTree.ImageSize = new System.Drawing.Size(16, 16); + this.imgListTree.TransparentColor = System.Drawing.Color.Transparent; + // + // pnlConnections + // + this.pnlConnections.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pnlConnections.Controls.Add(this.PictureBox1); + this.pnlConnections.Controls.Add(this.txtSearch); + this.pnlConnections.Controls.Add(this.olvConnections); + this.pnlConnections.Location = new System.Drawing.Point(0, 25); + this.pnlConnections.Name = "pnlConnections"; + this.pnlConnections.Size = new System.Drawing.Size(192, 428); + this.pnlConnections.TabIndex = 9; + // + // PictureBox1 + // + this.PictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.PictureBox1.Image = global::mRemoteNG.Resources.Search; + this.PictureBox1.Location = new System.Drawing.Point(2, 412); + this.PictureBox1.Name = "PictureBox1"; + this.PictureBox1.Size = new System.Drawing.Size(16, 16); + this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.PictureBox1.TabIndex = 1; + this.PictureBox1.TabStop = false; + // + // txtSearch + // + this.txtSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtSearch.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.txtSearch.ForeColor = System.Drawing.SystemColors.GrayText; + this.txtSearch.Location = new System.Drawing.Point(19, 413); + this.txtSearch.Name = "txtSearch"; + this.txtSearch.Size = new System.Drawing.Size(171, 15); + this.txtSearch.TabIndex = 30; + this.txtSearch.TabStop = false; + this.txtSearch.Text = "Search"; + this.txtSearch.TextChanged += new System.EventHandler(this.txtSearch_TextChanged); + this.txtSearch.GotFocus += new System.EventHandler(this.txtSearch_GotFocus); + this.txtSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown); + this.txtSearch.LostFocus += new System.EventHandler(this.txtSearch_LostFocus); + // + // msMain + // + this.msMain.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.msMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mMenAddConnection, + this.mMenAddFolder, + this.mMenView, + this.mMenSortAscending}); + this.msMain.Location = new System.Drawing.Point(0, 0); + this.msMain.Name = "msMain"; + this.msMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.msMain.ShowItemToolTips = true; + this.msMain.Size = new System.Drawing.Size(192, 24); + this.msMain.TabIndex = 10; + this.msMain.Text = "MenuStrip1"; + // + // mMenAddConnection + // + this.mMenAddConnection.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mMenAddConnection.Image = global::mRemoteNG.Resources.Connection_Add; + this.mMenAddConnection.Name = "mMenAddConnection"; + this.mMenAddConnection.Size = new System.Drawing.Size(28, 20); + this.mMenAddConnection.Click += new System.EventHandler(this.cMenTreeAddConnection_Click); + // + // mMenAddFolder + // + this.mMenAddFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mMenAddFolder.Image = global::mRemoteNG.Resources.Folder_Add; + this.mMenAddFolder.Name = "mMenAddFolder"; + this.mMenAddFolder.Size = new System.Drawing.Size(28, 20); + this.mMenAddFolder.Click += new System.EventHandler(this.cMenTreeAddFolder_Click); + // + // mMenView + // + this.mMenView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mMenView.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mMenViewExpandAllFolders, + this.mMenViewCollapseAllFolders}); + this.mMenView.Image = global::mRemoteNG.Resources.View; + this.mMenView.Name = "mMenView"; + this.mMenView.Size = new System.Drawing.Size(28, 20); + this.mMenView.Text = "&View"; + // + // mMenViewExpandAllFolders + // + this.mMenViewExpandAllFolders.Image = global::mRemoteNG.Resources.Expand; + this.mMenViewExpandAllFolders.Name = "mMenViewExpandAllFolders"; + this.mMenViewExpandAllFolders.Size = new System.Drawing.Size(172, 22); + this.mMenViewExpandAllFolders.Text = "Expand all folders"; + this.mMenViewExpandAllFolders.Click += new System.EventHandler(this.mMenViewExpandAllFolders_Click); + // + // mMenViewCollapseAllFolders + // + this.mMenViewCollapseAllFolders.Image = global::mRemoteNG.Resources.Collapse; + this.mMenViewCollapseAllFolders.Name = "mMenViewCollapseAllFolders"; + this.mMenViewCollapseAllFolders.Size = new System.Drawing.Size(172, 22); + this.mMenViewCollapseAllFolders.Text = "Collapse all folders"; + this.mMenViewCollapseAllFolders.Click += new System.EventHandler(this.mMenViewCollapseAllFolders_Click); + // + // mMenSortAscending + // + this.mMenSortAscending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mMenSortAscending.Image = global::mRemoteNG.Resources.Sort_AZ; + this.mMenSortAscending.Name = "mMenSortAscending"; + this.mMenSortAscending.Size = new System.Drawing.Size(28, 20); + this.mMenSortAscending.Click += new System.EventHandler(this.mMenSortAscending_Click); + // + // ConnectionTreeWindow + // + this.ClientSize = new System.Drawing.Size(192, 453); + this.Controls.Add(this.msMain); + this.Controls.Add(this.pnlConnections); + this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HideOnClose = true; + this.Icon = global::mRemoteNG.Resources.Root_Icon; + this.Name = "ConnectionTreeWindow"; + this.TabText = "Connections"; + this.Text = "Connections"; + this.Load += new System.EventHandler(this.Tree_Load); + ((System.ComponentModel.ISupportInitialize)(this.olvConnections)).EndInit(); + this.cMenTree.ResumeLayout(false); + this.pnlConnections.ResumeLayout(false); + this.pnlConnections.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit(); + this.msMain.ResumeLayout(false); + this.msMain.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + } internal System.Windows.Forms.ToolStripMenuItem cMenTreeImport; internal System.Windows.Forms.ToolStripMenuItem cMenTreeExportFile; @@ -498,5 +538,8 @@ namespace mRemoteNG.UI.Window internal System.Windows.Forms.ToolStripMenuItem cMenTreeImportActiveDirectory; internal System.Windows.Forms.ToolStripMenuItem cMenTreeImportPortScan; #endregion - } + + private System.ComponentModel.IContainer components; + private BrightIdeasSoftware.OLVColumn olvColumn1; + } } diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs index 1c398121f..510ab2f20 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs @@ -14,14 +14,24 @@ namespace mRemoteNG.UI.Window { public partial class ConnectionTreeWindow { + private ConnectionTreeModel _connectionTreeModel; + private ToolTip DescriptionTooltip { get; } - #region Form Stuff + public ConnectionTreeModel ConnectionTreeModel + { + get { return _connectionTreeModel; } + set + { + _connectionTreeModel = value; + PopulateTreeView(); + } + } + #region Form Stuff private void Tree_Load(object sender, EventArgs e) { ApplyLanguage(); - Themes.ThemeManager.ThemeChanged += ApplyTheme; ApplyTheme(); @@ -29,6 +39,7 @@ namespace mRemoteNG.UI.Window txtSearch.MinimumSize = new Size(0, 14); txtSearch.Size = new Size(txtSearch.Size.Width, 14); txtSearch.Multiline = false; + olvConnections.Show(); } private void ApplyLanguage() @@ -81,9 +92,9 @@ namespace mRemoteNG.UI.Window { msMain.BackColor = Themes.ThemeManager.ActiveTheme.ToolbarBackgroundColor; msMain.ForeColor = Themes.ThemeManager.ActiveTheme.ToolbarTextColor; - tvConnections.BackColor = Themes.ThemeManager.ActiveTheme.ConnectionsPanelBackgroundColor; - tvConnections.ForeColor = Themes.ThemeManager.ActiveTheme.ConnectionsPanelTextColor; - tvConnections.LineColor = Themes.ThemeManager.ActiveTheme.ConnectionsPanelTreeLineColor; + olvConnections.BackColor = Themes.ThemeManager.ActiveTheme.ConnectionsPanelBackgroundColor; + olvConnections.ForeColor = Themes.ThemeManager.ActiveTheme.ConnectionsPanelTextColor; + //tvConnections.LineColor = Themes.ThemeManager.ActiveTheme.ConnectionsPanelTreeLineColor; BackColor = Themes.ThemeManager.ActiveTheme.ToolbarBackgroundColor; txtSearch.BackColor = Themes.ThemeManager.ActiveTheme.SearchBoxBackgroundColor; txtSearch.ForeColor = Themes.ThemeManager.ActiveTheme.SearchBoxTextPromptColor; @@ -104,6 +115,15 @@ namespace mRemoteNG.UI.Window ReshowDelay = 0 }; } + + private void PopulateTreeView() + { + olvColumn1.AspectGetter = item => ((ConnectionInfo) item).Name; + olvConnections.CanExpandGetter = item => item is ContainerInfo; + olvConnections.ChildrenGetter = item => ((ContainerInfo) item).Children; + olvConnections.Roots = ConnectionTreeModel.RootNodes; + olvConnections.ExpandAll(); + } public void InitialRefresh() { @@ -153,12 +173,12 @@ namespace mRemoteNG.UI.Window } } - private void tvConnections_BeforeLabelEdit(object sender, NodeLabelEditEventArgs e) + private void tvConnections_BeforeLabelEdit(object sender, LabelEditEventArgs e) { cMenTreeDelete.ShortcutKeys = Keys.None; } - private void tvConnections_AfterLabelEdit(object sender, NodeLabelEditEventArgs e) + private void tvConnections_AfterLabelEdit(object sender, LabelEditEventArgs e) { try { @@ -166,7 +186,7 @@ namespace mRemoteNG.UI.Window ConnectionTree.FinishRenameSelectedNode(e.Label); Windows.configForm.pGrid_SelectedObjectChanged(); - ShowHideTreeContextMenuItems(e.Node); + //ShowHideTreeContextMenuItems(e.Node); Runtime.SaveConnectionsBG(); } catch (Exception ex) @@ -175,67 +195,67 @@ namespace mRemoteNG.UI.Window } } - private void tvConnections_AfterSelect(object sender, TreeViewEventArgs e) + private void tvConnections_AfterSelect(object sender, EventArgs e) { - try - { - if ((ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection) || (ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.PuttySession)) - { - Windows.configForm.SetPropertyGridObject(e.Node.Tag); - } - else if (ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Container) - { - Windows.configForm.SetPropertyGridObject((ContainerInfo) e.Node.Tag); - } - else if ((ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Root) || (ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.PuttyRoot)) - { - Windows.configForm.SetPropertyGridObject(e.Node.Tag); - } - else - { - return; - } + //try + //{ + // if ((ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection) || (ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.PuttySession)) + // { + // Windows.configForm.SetPropertyGridObject(e.Node.Tag); + // } + // else if (ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Container) + // { + // Windows.configForm.SetPropertyGridObject((ContainerInfo) e.Node.Tag); + // } + // else if ((ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Root) || (ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.PuttyRoot)) + // { + // Windows.configForm.SetPropertyGridObject(e.Node.Tag); + // } + // else + // { + // return; + // } - Windows.configForm.pGrid_SelectedObjectChanged(); - ShowHideTreeContextMenuItems(e.Node); + // Windows.configForm.pGrid_SelectedObjectChanged(); + // ShowHideTreeContextMenuItems(e.Node); - Runtime.LastSelected = ConnectionTreeNode.GetConstantID(e.Node); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_AfterSelect (UI.Window.ConnectionTreeWindow) failed", ex); - } + // Runtime.LastSelected = ConnectionTreeNode.GetConstantID(e.Node); + //} + //catch (Exception ex) + //{ + // Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_AfterSelect (UI.Window.ConnectionTreeWindow) failed", ex); + //} } - private void tvConnections_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + private void tvConnections_NodeMouseClick(object sender, MouseEventArgs e) { - try - { - ShowHideTreeContextMenuItems(tvConnections.SelectedNode); - tvConnections.SelectedNode = e.Node; + //try + //{ + // ShowHideTreeContextMenuItems(tvConnections.SelectedNode); + // tvConnections.SelectedNode = e.Node; - if (e.Button == MouseButtons.Left) - { - if (Settings.Default.SingleClickOnConnectionOpensIt && - (ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection | - ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.PuttySession)) - { - Runtime.OpenConnection(); - } + // if (e.Button == MouseButtons.Left) + // { + // if (Settings.Default.SingleClickOnConnectionOpensIt && + // (ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection | + // ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.PuttySession)) + // { + // Runtime.OpenConnection(); + // } - if (Settings.Default.SingleClickSwitchesToOpenConnection && ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection) - { - Runtime.SwitchToOpenConnection((ConnectionInfo)e.Node.Tag); - } - } - } - catch (Exception ex) - { - Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_NodeMouseClick (UI.Window.ConnectionTreeWindow) failed", ex); - } + // if (Settings.Default.SingleClickSwitchesToOpenConnection && ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection) + // { + // Runtime.SwitchToOpenConnection((ConnectionInfo)e.Node.Tag); + // } + // } + //} + //catch (Exception ex) + //{ + // Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_NodeMouseClick (UI.Window.ConnectionTreeWindow) failed", ex); + //} } - private static void tvConnections_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e) + private static void tvConnections_NodeMouseDoubleClick(object sender, MouseEventArgs e) { if (ConnectionTreeNode.GetNodeType(ConnectionTree.SelectedNode) == TreeNodeType.Connection | ConnectionTreeNode.GetNodeType(ConnectionTree.SelectedNode) == TreeNodeType.PuttySession) @@ -536,32 +556,32 @@ namespace mRemoteNG.UI.Window Runtime.SaveConnectionsBG(); } - private static void cMenTreeConnect_Click(object sender, EventArgs e) + private void cMenTreeConnect_Click(object sender, EventArgs e) { Runtime.OpenConnection(ConnectionInfo.Force.DoNotJump); } - private static void cMenTreeConnectWithOptionsConnectToConsoleSession_Click(object sender, EventArgs e) + private void cMenTreeConnectWithOptionsConnectToConsoleSession_Click(object sender, EventArgs e) { Runtime.OpenConnection(ConnectionInfo.Force.UseConsoleSession | ConnectionInfo.Force.DoNotJump); } - private static void cMenTreeConnectWithOptionsNoCredentials_Click(object sender, EventArgs e) + private void cMenTreeConnectWithOptionsNoCredentials_Click(object sender, EventArgs e) { Runtime.OpenConnection(ConnectionInfo.Force.NoCredentials); } - private static void cMenTreeConnectWithOptionsDontConnectToConsoleSession_Click(object sender, EventArgs e) + private void cMenTreeConnectWithOptionsDontConnectToConsoleSession_Click(object sender, EventArgs e) { Runtime.OpenConnection(ConnectionInfo.Force.DontUseConsoleSession | ConnectionInfo.Force.DoNotJump); } - private static void cMenTreeConnectWithOptionsConnectInFullscreen_Click(object sender, EventArgs e) + private void cMenTreeConnectWithOptionsConnectInFullscreen_Click(object sender, EventArgs e) { Runtime.OpenConnection(ConnectionInfo.Force.Fullscreen | ConnectionInfo.Force.DoNotJump); } - private static void cMenTreeConnectWithOptionsChoosePanelBeforeConnecting_Click(object sender, EventArgs e) + private void cMenTreeConnectWithOptionsChoosePanelBeforeConnecting_Click(object sender, EventArgs e) { Runtime.OpenConnection(ConnectionInfo.Force.OverridePanel | ConnectionInfo.Force.DoNotJump); } @@ -571,7 +591,7 @@ namespace mRemoteNG.UI.Window DisconnectConnection(); } - private static void cMenTreeToolsTransferFile_Click(object sender, EventArgs e) + private void cMenTreeToolsTransferFile_Click(object sender, EventArgs e) { SshTransferFile(); } @@ -605,7 +625,7 @@ namespace mRemoteNG.UI.Window AddExternalApps(); } - private static void cMenTreeToolsExternalAppsEntry_Click(object sender, EventArgs e) + private void cMenTreeToolsExternalAppsEntry_Click(object sender, EventArgs e) { StartExternalApp((Tools.ExternalTool)((ToolStripMenuItem)sender).Tag); } @@ -616,44 +636,44 @@ namespace mRemoteNG.UI.Window Runtime.SaveConnectionsBG(); } - private static void cMenTreeRename_Click(object sender, EventArgs e) + private void cMenTreeRename_Click(object sender, EventArgs e) { ConnectionTree.StartRenameSelectedNode(); Runtime.SaveConnectionsBG(); } - private static void cMenTreeDelete_Click(object sender, EventArgs e) + private void cMenTreeDelete_Click(object sender, EventArgs e) { ConnectionTree.DeleteSelectedNode(); Runtime.SaveConnectionsBG(); } - private static void cMenTreeImportFile_Click(object sender, EventArgs e) + private void cMenTreeImportFile_Click(object sender, EventArgs e) { Import.ImportFromFile(Windows.treeForm.tvConnections.Nodes[0], Windows.treeForm.tvConnections.SelectedNode, true); } - private static void cMenTreeImportActiveDirectory_Click(object sender, EventArgs e) + private void cMenTreeImportActiveDirectory_Click(object sender, EventArgs e) { Windows.Show(WindowType.ActiveDirectoryImport); } - private static void cMenTreeImportPortScan_Click(object sender, EventArgs e) + private void cMenTreeImportPortScan_Click(object sender, EventArgs e) { Windows.Show(WindowType.PortScan); } - private static void cMenTreeExportFile_Click(object sender, EventArgs e) + private void cMenTreeExportFile_Click(object sender, EventArgs e) { Export.ExportToFile(Windows.treeForm.tvConnections.Nodes[0], Windows.treeForm.tvConnections.SelectedNode, Runtime.ConnectionTreeModel); } - private static void cMenTreeMoveUp_Click(object sender, EventArgs e) + private void cMenTreeMoveUp_Click(object sender, EventArgs e) { ConnectionTree.MoveNodeUp(); Runtime.SaveConnectionsBG(); } - private static void cMenTreeMoveDown_Click(object sender, EventArgs e) + private void cMenTreeMoveDown_Click(object sender, EventArgs e) { ConnectionTree.MoveNodeDown(); Runtime.SaveConnectionsBG(); @@ -933,7 +953,7 @@ namespace mRemoteNG.UI.Window { try { - tvConnections.SelectedNode = ConnectionTree.Find(tvConnections.Nodes[0], txtSearch.Text); + //tvConnections.SelectedNode = ConnectionTree.Find(tvConnections.Nodes[0], txtSearch.Text); } catch (Exception) { diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.resx b/mRemoteV1/UI/Window/ConnectionTreeWindow.resx index 4c0f58aeb..45d7100e9 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.resx +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.resx @@ -112,18 +112,18 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 208, 19 - + 17, 17 - + 119, 19 \ No newline at end of file