nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't crash if bad object request for menu

Browse source 
Delete dead android code
add 'bad load' icon
This commit is contained in:
Lars Brubaker 2021-11-10 16:33:36 -08:00
parent 5b77462b91
commit 1f812d6df1
4 changed files with 11 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

41
MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
View file

@ -116,45 +116,6 @@ namespace MatterHackers.MatterControl
theme.ApplyBoxStyle(generalSection);
#if __ANDROID__
// Camera Monitoring
bool hasCamera = true || ApplicationSettings.Instance.get(ApplicationSettingsKey.HardwareHasCamera) == "true";
var previewButton = new IconButton(configureIcon, theme)
{
ToolTipText = "Preview".Localize()
};
previewButton.Click += (s, e) =>
{
AppContext.Platform.OpenCameraPreview();
};
var printer = ApplicationController.Instance.ActivePrinters.FirstOrDefault();
// TODO: Sort out how handle this better on Android and in a multi-printer setup
if (printer != null)
{
this.AddSettingsRow(
new SettingsItem(
"Camera Monitoring".Localize(),
theme,
new SettingsItem.ToggleSwitchConfig()
{
Checked = printer.Settings.GetValue<bool>(SettingsKey.publish_bed_image),
ToggleAction = (itemChecked) =>
{
printer.Settings.SetValue(SettingsKey.publish_bed_image, itemChecked ? "1" : "0");
}
},
previewButton,
StaticData.Instance.LoadIcon("camera-24x24.png", 24, 24))
{
Enabled = printer.Settings.PrinterSelected
},
generalPanel
);
}
#endif
// Print Notifications
var configureNotificationsButton = new IconButton(configureIcon, theme)
{
@ -216,7 +177,6 @@ namespace MatterHackers.MatterControl
this.AddSettingsRow(new SettingsItem("Language".Localize(), languageSelector, theme), generalPanel);
#if !__ANDROID__
// ThumbnailRendering
var thumbnailsModeDropList = new MHDropDownList("", theme, maxHeight: 200 * GuiWidget.DeviceScale);
thumbnailsModeDropList.AddItem("Flat".Localize(), "orthographic");
@ -279,7 +239,6 @@ namespace MatterHackers.MatterControl
thumbnailsModeDropList,
theme),
generalPanel);
#endif
// TextSize
if (!double.TryParse(UserSettings.Instance.get(UserSettingsKey.ApplicationTextSize), out double currentTextSize))