put the ''apply to children" menu options in a sub-menu

This commit is contained in:
David Sparer
2019-05-15 10:09:08 -05:00
parent 2b5100c019
commit a66ec00587
3 changed files with 31 additions and 2 deletions

View File

@@ -204,6 +204,15 @@ namespace mRemoteNG {
}
}
/// <summary>
/// Looks up a localized string similar to Edit.
/// </summary>
internal static string Edit {
get {
return ResourceManager.GetString("Edit", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Environment.
/// </summary>

View File

@@ -2799,4 +2799,7 @@ Development Channel includes Alphas, Betas &amp; Release Candidates.</value>
<data name="ApplyInheritanceToChildren" xml:space="preserve">
<value>Apply inheritance to children</value>
</data>
<data name="Edit" xml:space="preserve">
<value>Edit</value>
</data>
</root>

View File

@@ -42,6 +42,7 @@ namespace mRemoteNG.UI.Controls
private ToolStripMenuItem _cMenTreeMoveDown;
private ToolStripMenuItem _cMenTreeToolsExternalApps;
private ToolStripMenuItem _cMenTreeDuplicate;
private ToolStripMenuItem _cMenEditSubMenu;
private ToolStripMenuItem _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting;
private ToolStripMenuItem _cMenTreeConnectWithOptionsDontConnectToConsoleSession;
private ToolStripMenuItem _cMenTreeImport;
@@ -100,6 +101,7 @@ namespace mRemoteNG.UI.Controls
_cMenTreeImportFile = new ToolStripMenuItem();
_cMenTreeImportActiveDirectory = new ToolStripMenuItem();
_cMenTreeImportPortScan = new ToolStripMenuItem();
_cMenEditSubMenu = new ToolStripMenuItem();
_cMenTreeApplyInheritanceToChildren = new ToolStripMenuItem();
_cMenTreeApplyDefaultInheritance = new ToolStripMenuItem();
_cMenTreeExportFile = new ToolStripMenuItem();
@@ -132,14 +134,13 @@ namespace mRemoteNG.UI.Controls
_cMenTreeRename,
_cMenTreeDelete,
_cMenTreeCopyHostname,
_cMenEditSubMenu,
_cMenTreeSep3,
_cMenTreeImport,
_cMenTreeExportFile,
_cMenTreeSep4,
_cMenTreeAddConnection,
_cMenTreeAddFolder,
_cMenTreeApplyDefaultInheritance,
_cMenTreeApplyInheritanceToChildren,
_toolStripSeparator1,
_cMenTreeToolsSort,
_cMenTreeMoveUp,
@@ -403,6 +404,17 @@ namespace mRemoteNG.UI.Controls
_cMenTreeMoveDown.Text = "Move down";
_cMenTreeMoveDown.Click += OnMoveDownClicked;
//
// cMenEditSubMenu
//
_cMenEditSubMenu.DropDownItems.AddRange(new ToolStripItem[]
{
_cMenTreeApplyInheritanceToChildren,
_cMenTreeApplyDefaultInheritance
});
_cMenEditSubMenu.Name = "_cMenEditSubMenu";
_cMenEditSubMenu.Size = new System.Drawing.Size(199, 22);
_cMenEditSubMenu.Text = "Edit";
//
// _cMenTreeApplyInheritanceToChildren
//
_cMenTreeApplyInheritanceToChildren.Name = "_cMenTreeApplyInheritanceToChildren";
@@ -455,6 +467,7 @@ namespace mRemoteNG.UI.Controls
_cMenTreeMoveUp.Text = Language.strMoveUp;
_cMenTreeMoveDown.Text = Language.strMoveDown;
_cMenEditSubMenu.Text = Language.Edit;
_cMenTreeApplyInheritanceToChildren.Text = Language.ApplyInheritanceToChildren;
_cMenTreeApplyDefaultInheritance.Text = Language.ApplyDefaultInheritance;
}
@@ -485,6 +498,9 @@ namespace mRemoteNG.UI.Controls
{
ShowHideMenuItemsForConnectionNode(_connectionTree.SelectedNode);
}
_cMenEditSubMenu.Enabled = _cMenEditSubMenu.DropDownItems
.OfType<ToolStripMenuItem>().Any(i => i.Enabled);
}
catch (Exception ex)
{
@@ -515,6 +531,7 @@ namespace mRemoteNG.UI.Controls
_cMenTreeConnectWithOptionsViewOnly.Enabled = false;
_cMenTreeApplyInheritanceToChildren.Enabled = false;
_cMenTreeApplyDefaultInheritance.Enabled = false;
_cMenTreeCopyHostname.Enabled = false;
}
internal void ShowHideMenuItemsForRootConnectionNode()