universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move XML CommandBar parsing into common CommandItem.FromMarkup function

Browse Source
This commit is contained in:
Michael Becker 2020-02-12 01:53:13 -05:00
parent 86ea89730b
commit 7d94e5a690
No known key found for this signature in database
GPG Key ID: 506F54899E2BFED7
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
CSharp/Libraries/UniversalEditor.UserInterface/Common/Reflection.cs
View File

@ -151,7 +151,7 @@ namespace UniversalEditor.UserInterface.Common
MarkupTagElement tagItem = (elItem as MarkupTagElement);
if (tagItem == null) continue;
CommandItem ci = LoadCommandItem(tagItem);
CommandItem ci = CommandItem.FromMarkup(tagItem);
if (ci != null)
cmd.Items.Add(ci);
}
@ -171,7 +171,7 @@ namespace UniversalEditor.UserInterface.Common
MarkupTagElement tagItem = (elItem as MarkupTagElement);
if (tagItem == null) continue;
CommandItem ci = LoadCommandItem(tagItem);
CommandItem ci = CommandItem.FromMarkup(tagItem);
if (ci != null)
{
er.MenuBar.Items.Add(ci);
@ -186,35 +186,6 @@ namespace UniversalEditor.UserInterface.Common
}
}
private static CommandItem LoadCommandItem(MarkupTagElement tagItem)
{
CommandItem ci = null;
MarkupAttribute attInsertBefore = tagItem.Attributes["InsertBefore"];
MarkupAttribute attInsertAfter = tagItem.Attributes["InsertAfter"];
switch (tagItem.Name)
{
case "CommandReference":
{
ci = new CommandReferenceCommandItem(tagItem.Attributes["CommandID"]?.Value);
break;
}
case "Separator":
{
ci = new SeparatorCommandItem();
break;
}
}
if (ci != null)
{
if (attInsertAfter != null)
ci.InsertAfterID = attInsertAfter.Value;
if (attInsertBefore != null)
ci.InsertBeforeID = attInsertBefore.Value;
}
return ci;
}
private static System.Reflection.Assembly[] mvarAvailableAssemblies = null;
private static System.Reflection.Assembly[] GetAvailableAssemblies()
{