nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert back to two buttons - merge/delete

Browse source
This commit is contained in:
John Lewin 2018-08-11 09:16:19 -07:00
parent 902799333c
commit 2ca05912ef
2 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -96,17 +96,29 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var scene = sceneContext.Scene;
var removeMenu = new PopupMenu(ApplicationController.Instance.MenuTheme);
var applyAndDeleteItem = removeMenu.CreateMenuItem("Apply & Delete".Localize(), AggContext.StaticData.LoadIcon("fa-check_16.png", 16, 16, theme.InvertIcons).SetPreMultiply());
applyAndDeleteItem.Click += (s, e) => UiThread.RunOnIdle(() =>
// put in a make permanent button
var icon = AggContext.StaticData.LoadIcon("noun_766157.png", 16, 16, theme.InvertIcons).SetPreMultiply();
var applyButton = new IconButton(icon, theme)
{
Margin = theme.ButtonSpacing,
ToolTipText = "Merge".Localize(),
Enabled = scene.SelectedItem?.CanApply == true
};
applyButton.Click += (s, e) =>
{
this.item.Apply(view3DWidget.Scene.UndoBuffer);
scene.SelectedItem = null;
});
};
scene.SelectionChanged += (s, e) => applyButton.Enabled = scene.SelectedItem?.CanApply == true;
toolbar.AddChild(applyButton);
var deleteItem = removeMenu.CreateMenuItem("Delete".Localize());
deleteItem.Click += (s, e) => UiThread.RunOnIdle(() =>
// put in a remove button
var removeButton = new IconButton(AggContext.StaticData.LoadIcon("close.png", 16, 16, theme.InvertIcons), theme)
{
Margin = theme.ButtonSpacing,
ToolTipText = "Delete".Localize()
};
removeButton.Click += (s, e) =>
{
var rootSelection = scene.SelectedItemRoot;
@ -120,16 +132,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
scene.SelectedItem = rootSelection;
}
});
// Delete button
var removeButton = new PopupMenuButton(AggContext.StaticData.LoadIcon("close.png", 16, 16, theme.InvertIcons), theme);
removeButton.PopupBorderColor = ApplicationController.Instance.MenuTheme.GetBorderColor(120);
removeButton.DynamicPopupContent = () =>
{
applyAndDeleteItem.Enabled = scene.SelectedItem?.CanApply == true;
return removeMenu;
};
toolbar.AddChild(removeButton);

BIN
StaticData/Icons/noun_766157.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 889 B