From 8a6c0106ae16a46421f53a20b6f5a7f29bc5e29b Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 19 Dec 2014 12:24:49 -0800 Subject: [PATCH] Put in a new edit 32x32 icon Made edit more consistent. --- PartPreviewWindow/View3D/View3DWidget.cs | 2 +- PrintLibrary/PrintLibraryWidget.cs | 8 ++++---- PrintQueue/QueueDataWidget.cs | 2 +- StaticData/Icons/296.png | Bin 455 -> 0 bytes StaticData/Icons/icon_edit_32x32.png | Bin 0 -> 471 bytes 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 StaticData/Icons/296.png create mode 100644 StaticData/Icons/icon_edit_32x32.png diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 4dc1f1fee..973ffcc00 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -408,7 +408,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }); }; - Button enterEdittingButton = textImageButtonFactory.Generate("Edit".Localize(), "296.png"); + Button enterEdittingButton = textImageButtonFactory.Generate("Edit".Localize(), "icon_edit_32x32.png"); enterEdittingButton.Margin = new BorderDouble(right: 10); enterEdittingButton.Click += (sender, e) => { diff --git a/PrintLibrary/PrintLibraryWidget.cs b/PrintLibrary/PrintLibraryWidget.cs index 379029bbf..b17fe55d4 100644 --- a/PrintLibrary/PrintLibraryWidget.cs +++ b/PrintLibrary/PrintLibraryWidget.cs @@ -79,10 +79,10 @@ namespace MatterHackers.MatterControl.PrintLibrary searchButtonFactory.borderWidth = 0; searchButtonFactory.FixedWidth = 80; - editButtonFactory.normalTextColor = ActiveTheme.Instance.SecondaryAccentColor; - editButtonFactory.hoverTextColor = RGBA_Bytes.White; - editButtonFactory.disabledTextColor = ActiveTheme.Instance.SecondaryAccentColor; - editButtonFactory.pressedTextColor = RGBA_Bytes.White; + editButtonFactory.normalTextColor = ActiveTheme.Instance.PrimaryTextColor; + editButtonFactory.hoverTextColor = ActiveTheme.Instance.PrimaryTextColor; + editButtonFactory.disabledTextColor = ActiveTheme.Instance.PrimaryTextColor; + editButtonFactory.pressedTextColor = ActiveTheme.Instance.PrimaryTextColor; editButtonFactory.borderWidth = 0; editButtonFactory.FixedWidth = 70; diff --git a/PrintQueue/QueueDataWidget.cs b/PrintQueue/QueueDataWidget.cs index e8fdeb52d..a0f6e37dd 100644 --- a/PrintQueue/QueueDataWidget.cs +++ b/PrintQueue/QueueDataWidget.cs @@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.PrintQueue FlowLayoutWidget allControls = new FlowLayoutWidget(FlowDirection.TopToBottom); { - enterEditModeButton = editButtonFactory.Generate("Edit".Localize(), "296.png", centerText: true); + enterEditModeButton = editButtonFactory.Generate("Edit".Localize(), centerText: true); leaveEditModeButton = editButtonFactory.Generate("Done".Localize(), centerText: true); leaveEditModeButton.Visible = false; diff --git a/StaticData/Icons/296.png b/StaticData/Icons/296.png deleted file mode 100644 index a657ac3bbf139d2434e4437327685b1b50d375aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 455 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>l znEKA@_iHZ3y|=W@-g@ojU3Zm22K!GjN*Uc9Yq~rZciidlkQ8_xBUEAifyd{gEdR>m zMQkw)#&HvSBVNc9yn6b4*@;}9nrpAWSS&taQZSV%u2(sD2~*Dv{a5-QDw*FgU;7&K z>7F$A%bJ4+xL1j9Iu@#3bMZiRsJy{1PmY?C4pkxYCRLg&`*IZSuHu*cYrwKENn!3P ze(App(l#^wYBc9JT6f-!x5mC?<#z||3u_j59ozA(X^mJ0lbor()|-zl+>kn*gGH=|qX0<`e&a18W z7=>5rEuPcSQS8^Sr{l@oV*kLq|GueDkohD3k<}|DH=O_Io_SBBFYeKPdfRU|>w~ba4!cIQ;gSp?7$o z#PN^Sv9nxcd?sB|a9wiHT;PgQmr7uBf{De_Wf2|DmsV#8*Rbzpbc~Hrn#Cl@B5m}#k%VXr$2 z_~#e21m|3fJ-}6F&|m*A+dSwbm)y~}5%x#LZMu}AcFY(4$M9URdUwb5z#}sM5>(9h ztW_>i^UO)+wzYiF{A22Y>mT<{I-(R-Ja^C31L=qBg?}fPJngF8!1Q0>-{d8q6Lr~Z zRxs5|{^QXT`tQp3qoAZD`u$<~!>Nz4u_W3%Xw&oUqKWFDv}NI&#f`=G7! zENhph&SG)-S)Fx W%qi7}{}~t<7(8A5T-G@yGywqllfs1n literal 0 HcmV?d00001