From 0ffb3a5b41f33a903db50dd05cc5079c6989d4dc Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 23 Jan 2017 14:58:29 -0800 Subject: [PATCH] Make more touch screen settings be about touch not android. --- AboutPage/UpdateControlData.cs | 7 +++-- ApplicationView/AdvancedControlsPanel.cs | 13 ++++---- ApplicationView/MainApplicationWidget.cs | 22 +++++++------ BrailleBuilder/View3DBrailleBuilder.cs | 8 +++-- .../ApplicationSettingsView.cs | 31 +++++++++++-------- SettingsManagement/ApplicationSettings.cs | 1 + SettingsManagement/UserSettings.cs | 2 ++ Submodules/agg-sharp | 2 +- TextCreator/View3DTextCreator.cs | 8 +++-- 9 files changed, 55 insertions(+), 39 deletions(-) diff --git a/AboutPage/UpdateControlData.cs b/AboutPage/UpdateControlData.cs index aef55c817..90a78ab96 100644 --- a/AboutPage/UpdateControlData.cs +++ b/AboutPage/UpdateControlData.cs @@ -125,9 +125,10 @@ namespace MatterHackers.MatterControl if (this.UpdateRequired && !haveShowUpdateRequired) { haveShowUpdateRequired = true; -#if !__ANDROID__ - UiThread.RunOnIdle(CheckForUpdateWindow.Show); -#endif + if (!UserSettings.Instance.IsTouchScreen) + { + UiThread.RunOnIdle(CheckForUpdateWindow.Show); + } } } } diff --git a/ApplicationView/AdvancedControlsPanel.cs b/ApplicationView/AdvancedControlsPanel.cs index 3a364d316..79b34f46d 100644 --- a/ApplicationView/AdvancedControlsPanel.cs +++ b/ApplicationView/AdvancedControlsPanel.cs @@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl TextImageButtonFactory advancedControlsButtonFactory = new TextImageButtonFactory(); advancedControlsButtonFactory.fontSize = 14; advancedControlsButtonFactory.invertImageLocation = false; - backButton = advancedControlsButtonFactory.Generate("Back".Localize(), StaticData.Instance.LoadIcon("icon_arrow_left_32x32.png", 32,32)); + backButton = advancedControlsButtonFactory.Generate("Back".Localize(), StaticData.Instance.LoadIcon("icon_arrow_left_32x32.png", 32, 32)); backButton.ToolTipText = "Switch to Queue, Library and History".Localize(); backButton.Margin = new BorderDouble(right: 3); backButton.VAnchor = VAnchor.ParentBottom; @@ -137,15 +137,16 @@ namespace MatterHackers.MatterControl var sliceSettingsTabPage = new TabPage(sliceSettingsWidget, "Settings".Localize().ToUpper()); var sliceSettingPopOut = new PopOutTextTabWidget(sliceSettingsTabPage, SliceSettingsTabName, new Vector2(590, 400), textSize); advancedControls.AddTab(sliceSettingPopOut); - + var controlsTabPage = new TabPage(manualPrinterControlsScrollArea, "Controls".Localize().ToUpper()); var controlsPopOut = new PopOutTextTabWidget(controlsTabPage, ControlsTabName, new Vector2(400, 300), textSize); advancedControls.AddTab(controlsPopOut); -#if !__ANDROID__ - MenuOptionSettings.sliceSettingsPopOut = sliceSettingPopOut; - MenuOptionSettings.controlsPopOut = controlsPopOut; -#endif + if (!UserSettings.Instance.IsTouchScreen) + { + MenuOptionSettings.sliceSettingsPopOut = sliceSettingPopOut; + MenuOptionSettings.controlsPopOut = controlsPopOut; + } var optionsControls = new PrinterConfigurationScrollWidget(); advancedControls.AddTab(new SimpleTextTabWidget(new TabPage(optionsControls, "Options".Localize().ToUpper()), "Options Tab", textSize, diff --git a/ApplicationView/MainApplicationWidget.cs b/ApplicationView/MainApplicationWidget.cs index f96b5af3e..21da53d44 100644 --- a/ApplicationView/MainApplicationWidget.cs +++ b/ApplicationView/MainApplicationWidget.cs @@ -109,11 +109,12 @@ namespace MatterHackers.MatterControl TopContainer = new FlowLayoutWidget(FlowDirection.TopToBottom); TopContainer.HAnchor = HAnchor.ParentLeftRight; -#if !__ANDROID__ - // The application menu bar, which is suppressed on Android - ApplicationMenuRow menuRow = new ApplicationMenuRow(); - TopContainer.AddChild(menuRow); -#endif + if (!UserSettings.Instance.IsTouchScreen) + { + // The application menu bar, which is suppressed on Android + ApplicationMenuRow menuRow = new ApplicationMenuRow(); + TopContainer.AddChild(menuRow); + } menuSeparator = new GuiWidget(); menuSeparator.Height = 12; @@ -154,11 +155,12 @@ namespace MatterHackers.MatterControl var container = new FlowLayoutWidget(FlowDirection.TopToBottom); container.AnchorAll(); -#if !__ANDROID__ - // The application menu bar, which is suppressed on Android - var menuRow = new ApplicationMenuRow(); - container.AddChild(menuRow); -#endif + if (!UserSettings.Instance.IsTouchScreen) + { + // The application menu bar, which is suppressed on Android + var menuRow = new ApplicationMenuRow(); + container.AddChild(menuRow); + } var menuSeparator = new GuiWidget() { diff --git a/BrailleBuilder/View3DBrailleBuilder.cs b/BrailleBuilder/View3DBrailleBuilder.cs index a36beebe3..17706e4c2 100644 --- a/BrailleBuilder/View3DBrailleBuilder.cs +++ b/BrailleBuilder/View3DBrailleBuilder.cs @@ -352,9 +352,11 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder { if (firstDraw) { -#if !__ANDROID__ - textToAddWidget.Focus(); -#endif + if (!UserSettings.Instance.IsTouchScreen) + { + textToAddWidget.Focus(); + } + //textToAddWidget.Text = "Test Text"; firstDraw = false; } diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs index 8141406e8..c0f57f035 100644 --- a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs +++ b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs @@ -56,10 +56,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage { cannotRestartWhilePrintIsActiveMessage = "Oops! You cannot restart while a print is active.".Localize(); cannotRestartWhileActive = "Unable to restart".Localize(); -#if __ANDROID__ - mainContainer.AddChild(new HorizontalLine(separatorLineColor)); + if (UserSettings.Instance.IsTouchScreen) + { + mainContainer.AddChild(new HorizontalLine(separatorLineColor)); + } -#endif if (UserSettings.Instance.IsTouchScreen) { mainContainer.AddChild(GetUpdateControl()); @@ -77,14 +78,15 @@ namespace MatterHackers.MatterControl.ConfigurationPage } -#if !__ANDROID__ - mainContainer.AddChild(GetThumbnailRenderingControl()); - mainContainer.AddChild(new HorizontalLine(separatorLineColor)); + if (!UserSettings.Instance.IsTouchScreen) + { + mainContainer.AddChild(GetThumbnailRenderingControl()); + mainContainer.AddChild(new HorizontalLine(separatorLineColor)); - mainContainer.AddChild(GetDisplayControl()); - mainContainer.AddChild(new HorizontalLine(separatorLineColor)); - -#endif + mainContainer.AddChild(GetDisplayControl()); + mainContainer.AddChild(new HorizontalLine(separatorLineColor)); + } + if (UserSettings.Instance.IsTouchScreen) { mainContainer.AddChild(GetModeControl()); @@ -446,11 +448,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage if (acceptableUpdateFeedTypeValues.IndexOf(currentThumbnailRenderingMode) == -1) { -#if __ANDROID__ + if (!UserSettings.Instance.IsTouchScreen) + { UserSettings.Instance.set(UserSettingsKey.ThumbnailRenderingMode, "orthographic"); -#else + } + else + { UserSettings.Instance.set(UserSettingsKey.ThumbnailRenderingMode, "raytraced"); -#endif + } } interfaceOptionsDropList.SelectedValue = UserSettings.Instance.get(UserSettingsKey.ThumbnailRenderingMode); diff --git a/SettingsManagement/ApplicationSettings.cs b/SettingsManagement/ApplicationSettings.cs index b079baf8c..4adf29753 100644 --- a/SettingsManagement/ApplicationSettings.cs +++ b/SettingsManagement/ApplicationSettings.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System; using Newtonsoft.Json; using System.Linq; +using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl { diff --git a/SettingsManagement/UserSettings.cs b/SettingsManagement/UserSettings.cs index 4dc3f9241..67f484d04 100644 --- a/SettingsManagement/UserSettings.cs +++ b/SettingsManagement/UserSettings.cs @@ -1,6 +1,7 @@ using MatterHackers.MatterControl.DataStorage; using System.Collections.Generic; using System.Linq; +using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl { @@ -55,6 +56,7 @@ namespace MatterHackers.MatterControl if (globalInstance == null) { globalInstance = new UserSettings(); + ToolTipManager.AllowToolTips = !UserSettings.Instance.IsTouchScreen; } } } diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 7f09ac8cd..f995c5e29 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 7f09ac8cd545abb3e8e75edc0b20acd3b8540e11 +Subproject commit f995c5e29ece6e2603117314fc8cc7d88d4cd89a diff --git a/TextCreator/View3DTextCreator.cs b/TextCreator/View3DTextCreator.cs index f86fef265..c42428e39 100644 --- a/TextCreator/View3DTextCreator.cs +++ b/TextCreator/View3DTextCreator.cs @@ -361,9 +361,11 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator { if (firstDraw) { -#if !__ANDROID__ - textToAddWidget.Focus(); -#endif + if (!UserSettings.Instance.IsTouchScreen) + { + textToAddWidget.Focus(); + } + //textToAddWidget.Text = "Test Text"; firstDraw = false; }