From 62730c186dfa19d64663544e90e6f5bddb62e01f Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 4 Dec 2014 11:23:33 -0800 Subject: [PATCH] Don't hide top container on touch screen. Better words on support angle. --- ApplicationView/MainApplicationWidget.cs | 2 +- StaticData/SliceSettings/Properties.json | 4 ++-- StaticData/Translations/Master.txt | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ApplicationView/MainApplicationWidget.cs b/ApplicationView/MainApplicationWidget.cs index d28e8db8b..629122c95 100644 --- a/ApplicationView/MainApplicationWidget.cs +++ b/ApplicationView/MainApplicationWidget.cs @@ -171,7 +171,7 @@ namespace MatterHackers.MatterControl public override void OnMouseDown(MouseEventArgs mouseEvent) { base.OnMouseDown(mouseEvent); - ApplicationController.Instance.MainView.HideTopContainer(); + //ApplicationController.Instance.MainView.HideTopContainer(); } } diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 1cad48fb7..ab5e053f2 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -913,11 +913,11 @@ }, { "SlicerConfigName": "support_material_threshold", - "PresentationName": "Supported Angles", + "PresentationName": "Amount", "HelpText": "The last angle at which support material will be generated. Larger numbers will result in more support.", "DataEditType": "POSITIVE_DOUBLE", "ExtraSettings": "degrees", - "QuickMenuSettings": [{"MenuName" : "Few", "Value": "20"},{"MenuName" : "Standard", "Value": "45"},{"MenuName" : "All", "Value": "90"}] + "QuickMenuSettings": [{"MenuName" : "Minimum", "Value": "20"},{"MenuName" : "Standard", "Value": "45"},{"MenuName" : "All", "Value": "90"}] }, { "SlicerConfigName": "support_material_xy_distance", diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 0632f798f..ee1212592 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2894,3 +2894,6 @@ Translated:Cannot find this file\nWould you like to remove it from the queue? English:Supported Angles Translated:Supported Angles +English:Amount +Translated:Amount +