From 8322cd092d48adce6ecaa76ae1041196b2b5a6c2 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 9 Apr 2018 17:48:06 -0700 Subject: [PATCH] Disable camera on desktop - Issue MatterHackers/MCCentral#3051 Camera Monitoring should only be visible if system supports it --- .../ApplicationSettings/ApplicationSettingsView.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs index f481307ee..72facbf2e 100644 --- a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs +++ b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs @@ -56,11 +56,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage this.VAnchor = VAnchor.Fit; this.theme = theme; + var configureIcon = AggContext.StaticData.LoadIcon("fa-cog_16.png", IconColor.Raw); + +#if __ANDROID__ // Camera Monitoring bool hasCamera = true || ApplicationSettings.Instance.get(ApplicationSettingsKey.HardwareHasCamera) == "true"; - var configureIcon = AggContext.StaticData.LoadIcon("fa-cog_16.png", IconColor.Raw); - var previewButton = new IconButton(configureIcon, theme) { ToolTipText = "Configure Camera View".Localize() @@ -84,6 +85,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage previewButton, AggContext.StaticData.LoadIcon("camera-24x24.png", 24, 24)) ); +#endif // Print Notifications var configureNotificationsButton = new IconButton(configureIcon, theme) @@ -420,7 +422,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage [Conditional("DEBUG")] private void GenerateLocalizationValidationFile() { -#if ! __ANDROID__ +#if !__ANDROID__ if (AggContext.StaticData is FileSystemStaticData fileSystemStaticData) { char currentChar = 'A';