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

Simplify

Browse source
This commit is contained in:
John Lewin 2018-10-31 12:28:14 -07:00
parent f310be38d7
commit f51ac64d79
2 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControlLib/PartPreviewWindow/MainViewWidget.cs
View file

@ -129,6 +129,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var updateAvailableButton = new LinkLabel("Update Available".Localize(), theme)
{
Visible = false,
Name = "Update Available Link",
ToolTipText = "There is a new update available for download".Localize(),
VAnchor = VAnchor.Center,
Margin = new BorderDouble(10, 0)
};
// make the function inline so we don't have to create members for the buttons
@ -207,11 +211,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}, 120);
};
updateAvailableButton.Name = "Update Available Link";
SetLinkButtonsVisibility(this, null);
updateAvailableButton.ToolTipText = "There is a new update available for download".Localize();
updateAvailableButton.VAnchor = VAnchor.Center;
updateAvailableButton.Margin = new BorderDouble(10, 0);
updateAvailableButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
UpdateControlData.Instance.CheckForUpdate();

16
MatterControlLib/SlicerConfiguration/SliceSettingsRow.cs
View file

@ -160,15 +160,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// show a right click menu ('Set as Default' & 'Help')
var popupMenu = new PopupMenu(ApplicationController.Instance.MenuTheme);
//var clearUserOverrideMenuItem = popupMenu.CreateMenuItem("Cleare User Override".Localize());
//clearUserOverrideMenuItem.Enabled = HasUserOverride(settingData.SlicerConfigName); // check if the settings is already the default
//clearUserOverrideMenuItem.Click += (s, e) =>
//{
// // clear the override
// UpdateStyle();
// printer.Settings.Save();
//};
var setAsDefaultMenuItem = popupMenu.CreateMenuItem("Set as Default".Localize());
setAsDefaultMenuItem.Focus();
setAsDefaultMenuItem.Enabled = !SettingIsOem(); // check if the settings is already the default
@ -182,12 +173,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
printer.Settings.Save();
};
//var helpMenuItem = popupMenu.CreateMenuItem("Help".Localize());
//helpMenuItem.Enabled = false; // check if there is any help available
//helpMenuItem.Click += (s, e) =>
//{
//};
var sourceEvent = mouseEvent.Position;
var systemWindow = this.Parents<SystemWindow>().FirstOrDefault();
this.Parents<SystemWindow>().FirstOrDefault().ToolTipManager.Clear();
@ -292,7 +277,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
public void AddContent(GuiWidget content)
{
dataArea.AddChild(content);