From 3dc0381d4649bf486144891013c31654e98fb8bf Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 3 Mar 2017 16:31:25 -0800 Subject: [PATCH] Working on power button for Android device. --- MatterControlApplication.cs | 5 +++++ SetupWizard/AndroidSetupOptionsPage.cs | 11 +++++++++++ StaticData/Icons/power.png | Bin 0 -> 10283 bytes 3 files changed, 16 insertions(+) create mode 100644 StaticData/Icons/power.png diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index 3355bc5cb..0073a5dd5 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -100,6 +100,11 @@ namespace MatterHackers.MatterControl public static bool IsLoading { get; private set; } = true; + public static void RequestPowerShutDown() + { + // does nothing on windows + } + static MatterControlApplication() { if (OsInformation.OperatingSystem == OSType.Mac && StaticData.Instance == null) diff --git a/SetupWizard/AndroidSetupOptionsPage.cs b/SetupWizard/AndroidSetupOptionsPage.cs index e07c0b907..9b7e76e8b 100644 --- a/SetupWizard/AndroidSetupOptionsPage.cs +++ b/SetupWizard/AndroidSetupOptionsPage.cs @@ -34,6 +34,8 @@ using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterCommunication; using MatterHackers.MatterControl.CustomWidgets; +using MatterHackers.Agg.PlatformAbstract; +using MatterHackers.Agg.ImageProcessing; namespace MatterHackers.MatterControl { @@ -56,6 +58,15 @@ namespace MatterHackers.MatterControl footerRow.AddChild(cancelButton); cancelButton.Text = "Back".Localize(); + +#if ANDROID_T7X + headerRow.AddChild(new HorizontalSpacer()); + var powerImage = StaticData.Instance.LoadIcon("power.png", 24, 24); + var powerButton = new TextImageButtonFactory() { FixedHeight = 32, Margin = new BorderDouble(0), borderWidth = 0 }.GenerateTooltipButton("", powerImage); + powerButton.Click += (s, e) => MatterControlApplication.RequestPowerShutDown(); + powerButton.VAnchor |= VAnchor.ParentCenter; + headerRow.AddChild(powerButton); +#endif } } diff --git a/StaticData/Icons/power.png b/StaticData/Icons/power.png new file mode 100644 index 0000000000000000000000000000000000000000..0e246241c5c62d454751ccf42d990e994e4a4131 GIT binary patch literal 10283 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%0D~;F`57r@^=Bz^2a+R3 z*p=#5gw?$7-(7d$LA+))!>e!CA8cW`^2~L|y}SRzLj%pd8FWkz{$tR%S!w>`dEo3@eFLYcoId`}mi5KamwRe1-PG!8l%F6NAae8oKL?A5tKkP`CPvr5 zvcP-NKN_cO{ro8`eXWMIcK+_~TngMDot@LI@?CH4IP!h@#i#ThSdU*;WcH+MSo zRmSaI@-Hi8*R6j$cO~Bf5krBB{Ium7*S z@Wx@c2v3CGit`|=Oi#NrFfcJOI_@<7U1rPpRioe`{^ufP_3H(e99)Y)0*~J^x6o8P;6&)lD&6>hpsP0O_Hb^h*Kxk4_@`|0$h_v6`Se|BJC5M}33tl4?| z!NW`TlZ(_6cYXO?es_Ji_vUhD8xDpBS$3Z7fA_}zxc4B}p}psCJtG@K^6Rx{`QLf; RF)%PNc)I$ztaD0e0sxNrCg}hG literal 0 HcmV?d00001