From d767e8f05a07eaaa8df6295cdd8c8c9f6f657b71 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 11 Jul 2017 16:09:07 -0700 Subject: [PATCH] Use VS undo/redo icons, Material.io memory icon --- PartPreviewWindow/View3D/PrinterActionsBar.cs | 6 +++--- StaticData/Icons/Redo_grey_16x.png | Bin 0 -> 416 bytes StaticData/Icons/Undo_grey_16x.png | Bin 0 -> 334 bytes StaticData/Icons/chip_24x24.png | Bin 609 -> 0 bytes StaticData/Icons/memory_16x16.png | Bin 0 -> 300 bytes StaticData/Icons/redo_24x24.png | Bin 577 -> 0 bytes StaticData/Icons/undo_24x24.png | Bin 580 -> 0 bytes StaticData/OEMSettings/AboutPage.html | 4 ---- 8 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 StaticData/Icons/Redo_grey_16x.png create mode 100644 StaticData/Icons/Undo_grey_16x.png delete mode 100644 StaticData/Icons/chip_24x24.png create mode 100644 StaticData/Icons/memory_16x16.png delete mode 100644 StaticData/Icons/redo_24x24.png delete mode 100644 StaticData/Icons/undo_24x24.png diff --git a/PartPreviewWindow/View3D/PrinterActionsBar.cs b/PartPreviewWindow/View3D/PrinterActionsBar.cs index cf6eb8944..adbf73422 100644 --- a/PartPreviewWindow/View3D/PrinterActionsBar.cs +++ b/PartPreviewWindow/View3D/PrinterActionsBar.cs @@ -157,12 +157,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow buttonFactory.Margin = new BorderDouble(8, 0); - Button configureEePromButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("chip_24x24.png", 16, 16)); + Button configureEePromButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("memory_16x16.png", 16, 16)); configureEePromButton.ToolTipText = "EEProm"; configureEePromButton.Click += configureEePromButton_Click; this.AddChild(configureEePromButton); - Button undoButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("undo_24x24.png", 16, 16)); + Button undoButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("Undo_grey_16x.png", 16, 16)); undoButton.Name = "3D View Undo"; undoButton.ToolTipText = "Undo"; undoButton.Enabled = false; @@ -175,7 +175,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow undoButton.VAnchor = VAnchor.ParentCenter; undoButton.Margin = 3; - Button redoButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("redo_24x24.png", 16, 16)); + Button redoButton = buttonFactory.Generate("", StaticData.Instance.LoadIcon("Redo_grey_16x.png", 16, 16)); redoButton.Name = "3D View Redo"; redoButton.ToolTipText = "Redo"; redoButton.Enabled = false; diff --git a/StaticData/Icons/Redo_grey_16x.png b/StaticData/Icons/Redo_grey_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..75b508d6cd130ff91fab492e15394952d0224fdf GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0XBj({-ZRBb+K z1_s6;PZ!6Kin!Kb!@gz%0T<2Sk1fGfDqgp|`Iq>KDqeEC;O4R1B;XM9gbL=BjjLDo ziGN_w@L*nhzInsbn3}|;6R*dWmF-OyxwtIz*MbuoY+RcXBF_08igRaDe4-ioepjBy z}#WH7yP*o-dv!!{WF&^Hwv{zDK|R$w(g${FyDi#h+P=Tdv<- z$GpqG>-f{6#HmYfbevhV|8Ac2gbTmz%68BFbWMSG_Mfj+ts(XzTEXs9LR(fiv8|lJ zv?$~~SGU$3ozqUMYfgDiTG0Gnbkg9kcV* UE++RgFfcH9y85}Sb4q9e06LYiGXMYp literal 0 HcmV?d00001 diff --git a/StaticData/Icons/Undo_grey_16x.png b/StaticData/Icons/Undo_grey_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..36b625973588da15d7c6f1640b850f46945598e5 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0XB4ude`@%$Aj z3=E76o-U3d6>(F8Hm+@U;5o}7si^!%P^oIkmXiGm4Oe&^{QF%_GWa;U9_AAf$>Y<| zuM>QJWci7v$@89U{(JAHUHqZKbAQ*q_Tt%}dpkFBn%bRmftn81J|+LlE|v4Vi(;?a z`3BEd;ry`ep)=1QAvMzL{GUh3GVYy?i&=DxiWCm4)nHWG)#bqA>bB@&6X#9-5E1^5 zHkSX~UKbpy-y!lvNA9* zC?tCX`7$t6sWC7#v@kIIVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)@r zt9q4<7#J8h3p^r=85nr4gD|6$#_S3P1_t&LPhVH|hioij%33+$AR8F@ehYCH{Y42n zQj(p=nqIgH%sJ1co#}Yt%L~aZYnR+CcfPP8HD&W1#fl3akJrsuG&@a7u4R$4JNxu^ zZ+BmtcRBIJ35U~~c`ugUWs|6R7u#2~Z2K#Vz^Imzw$PcjYcgJEo!6b48uxU^V*BaG z{4cIwk^Sh}F(xm6K7(J)m%M|NCZF!z`?6|ww8`n7r$slXU+OOL5RdmgWGWt%FLr3I zYPLe;+uf!KK@rKBpGCRrGT$q0eH(Cf*R-y3Q~zbxeAe6yJba~f^?UZ;=gn;o>+hS% zFB*Ju`RrMTw=*y>sFt`!l%yncn(G>v=^B`X7#Ud^n_8I|X&V?> z85js==srNvkei>9nO2EgLxSnl7zPFgNstY}`DrEPiAAXl<>lpinR(g8$%zH2dih1^ Vv)|cBF)%PNc)I$ztaD0e0sv>s<=OxM diff --git a/StaticData/Icons/memory_16x16.png b/StaticData/Icons/memory_16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..f491961f34bfdb8165d22dbba09fee90b95101db GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=qM&(O>zbNyEa28KDFE{-7<{#z$^^EMmsxEMRJ%C_((sJOkc(X~EctJyB& zwLOjwEHAcc&=Nd{E%v30kgF7ZJXk--0}qFol*O49DK<(UH;*FZ!lvNA9* zC?tCX`7$t6sWC7#v@kIIVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)@r zt9q4<7#J8h3p^r=85nr4gD|6$#_S3P1_t&LPhVH|hioh&7J}vPre9@XVC467aSX9I zJ@vAocT=Fqv5)a-4(JLbFXw%(e^>m@HpZ-Ht?16!<618&O(R!L72mGv8=I^cnH=l8l*jJO zqteA9XV*=v>T3UabFRpYSJ{~_XD{2?SM2;Se#2u`O`a^lw^fo z){j_`IWst#UYqJiew!$oqyE-r&C&L5-ML&%`RsueCssFDzt?6BeS6g9p5%+QnJf0r zIiboId-0<(N7u%RbK(|V;%D@#1@$Y~rhhD7!PVsd`=i|Ei#Df@daawJdGFZvQhknj zVRbjA244A`rhl(-(qZ2ZypQ-##?`yFoLIJ$fq_A_#5JNMC9x#cD!C{%u_Tqj$iUEC z*T78Iz$C=Tz{=Fj%FtZfz{twLAS3UD28xE<{FKbJO57SGjSHqQFfd4hYzWRzD=AMb nN@XZ7FW1Y=%Pvk%EJ)SMFG`>N&PIxXfq}u()z4*}Q$iB}1sTqy diff --git a/StaticData/Icons/undo_24x24.png b/StaticData/Icons/undo_24x24.png deleted file mode 100644 index 4fdcac3b994b35f314c739373bb9aa16c101278f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#Ea{HEjtmSN`?>!lvNA9* zC?tCX`7$t6sWC7#v@kIIVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)@r zt9q4<7#J8h3p^r=85nr4gD|6$#_S3P1_t&LPhVH|hioh&7OG)U$q5V$j6$9+jv*GO zr%tx@W_A>4oBt%_(vqHt2$nZFAt6aKwdVFtu%F=cA$&#Ys**{ktR`qBq|2XRpQfp^ z?t8dgJ2U+s)du zZQSJ*tDaTfd^%Op)tZ6*;d!&$Lcuakbrn~(F)=VOsFt`!l%ync zn(G>v=^B`X7#UcZnpqi}Ya19@85n4JpASXRkei>9nO2EgL$p}=O9lo8NstY}`DrEP piAAXl<>lpinR(g8$%zH2dih1^v)|cBF)%PNc)I$ztaD0e0s!N<%IN?A diff --git a/StaticData/OEMSettings/AboutPage.html b/StaticData/OEMSettings/AboutPage.html index a3ee393ed..6937ce81a 100644 --- a/StaticData/OEMSettings/AboutPage.html +++ b/StaticData/OEMSettings/AboutPage.html @@ -5,10 +5,6 @@   Please consider donating to help support MatterControl.   - Special thanks to: - EEProm icon made by Freepik from www.flaticon.com is licensed by CC 3.0 BY - Undo/Redo icons made by Icomoon from www.flaticon.com is licensed by CC 3.0 BY -   Send Feedback   www.matterhackers.com