From 2ca05912ef0a2299bfb960d7ae3d67419a5f8be0 Mon Sep 17 00:00:00 2001
From: John Lewin <lewin76@gmail.com>
Date: Sat, 11 Aug 2018 09:16:19 -0700
Subject: [PATCH] Revert back to two buttons - merge/delete

---
 PartPreviewWindow/SelectedObjectPanel.cs |  36 ++++++++++++-----------
 StaticData/Icons/noun_766157.png         | Bin 0 -> 889 bytes
 2 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 StaticData/Icons/noun_766157.png

diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/PartPreviewWindow/SelectedObjectPanel.cs
index 56e788cd5..13ed3cc67 100644
--- a/PartPreviewWindow/SelectedObjectPanel.cs
+++ b/PartPreviewWindow/SelectedObjectPanel.cs
@@ -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);
 
diff --git a/StaticData/Icons/noun_766157.png b/StaticData/Icons/noun_766157.png
new file mode 100644
index 0000000000000000000000000000000000000000..871df3d880c2953b474ba6462dbe0487ce856dbc
GIT binary patch
literal 889
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7r87e!N+NuHtdjF{^%7I^
zlT!66atjzhz{b9!ATc>RwL~E)H9a%WR_Xoj{Yna%DYi=CroINg1<t7%nI2U|slio#
zA<0$Q$(AWf_I6x06;>6w1-Ypui3%0DIeEoa6}C!XbFK1<tw6&1N(x{lCE2!05xxNm
z&iO^D3Z{CddIm~%TnaWtDQQ+gE^biGMJZ{vN*N_31y=g{<>lpi<;HsXMd|v6mX?<K
z21fcuM!H2QX}ZOgc_oPzx_QOQAR{1VxTF>*7iAWdWaj57fXqxx$}cUkRZ`LiS)vaT
z3373><Fe5QI|k%1J1&HeQ}a@6m5P+??WDX`zhYouY|3<Y4k!+CcT(_lbv84!G&9pR
z(lcaW(3n^{@w~Q6pvZCiv=c`%M7X)Tr?bsgwD-!<ajO#*OP+G@+1bx&ZfAS0SLaX4
znfg{l)vQkU2loxF?4=!3bk?lt<h@)xFHm`A@$Tn!@4n9~-t|4^gUjWpW2@dY`CKzo
zUYwX}X0|-U{^8<jRazP0rl)7jk?Rb)b}wJm@6E2mYeVhc#jlRNqRXpQbEtV%;;lo;
zhlI7aJ^VDSVDYpd@mBv9=VdVgKaO2}>{?f58TrJ2`q_*W4x6usygrE^uirS$$oSBw
zqNbT8e!qA2{}$RmZ|=-#TV2zP#RT0r7aN>2aQ<@fY{L&bs}~D{%ch)s|LffRq{t%E
zk8G=F=uA{;_4T+iC**pnZ^ydR9-Ci%`=1}b)+OJ6<1Txi(Eh&9x45p(4me?b?s(&4
z5x#@J8J^z^`uEB1%l^)J`k4o9Io2G0>FU{?fA}Vw$zADHE9<=DX3leAitAgb$Hp5T
zU>yJE=6Or^a)H>%>vy%xjm?<+<G>+t1HSaLmv076W?*38EbxddW?<kJ24O~qS#u;9
z7#PYtT^vI!dhcE`<T~Ua(E3n6&Q)hmM{8!zms4V5amv1L7IS(&6fwJ*dfn+mdt+k7
z=L#O@S<zRtX7@Nwvp0xHZs%LSLNCoVCh2Eqaqc9s<5L#=eDU1rvzq=x0nJqwi68bk
uf8^cv!Z7I&^Y2+A;dg?Y?$<xM&c+>oQRwvdl^3^wa*U^|pUXO@geCwEqiFH~

literal 0
HcmV?d00001