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

Changed upload to sync

Browse source 
Go to driver install rather than not
Make sure delete printer updates settings view
Printer History -> Settings History
Make Settings Options menu not too big
Border on Delete Printer button
This commit is contained in:
Lars Brubaker 2016-07-21 17:15:47 -07:00
parent 775b8dba61
commit 92a572e5f2
6 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -74,20 +74,22 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
SwitchToPrinterTheme(MatterControlApplication.IsLoading);
if (!MatterControlApplication.IsLoading
&& ActiveSliceSettings.Instance.PrinterSelected)
if (!MatterControlApplication.IsLoading)
{
OnActivePrinterChanged(null);
string[] comportNames = FrostedSerialPort.GetPortNames();
if (Instance.GetValue<bool>(SettingsKey.auto_connect))
if (ActiveSliceSettings.Instance.PrinterSelected)
{
UiThread.RunOnIdle(() =>
if (Instance.GetValue<bool>(SettingsKey.auto_connect))
{
UiThread.RunOnIdle(() =>
{
//PrinterConnectionAndCommunication.Instance.HaltConnectionThread();
PrinterConnectionAndCommunication.Instance.ConnectToActivePrinter();
}, 2);
}, 2);
}
}
}
}

4
SlicerConfiguration/SliceSettingsDetailControl.cs
View file

@ -105,6 +105,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
BorderColor = new RGBA_Bytes(ActiveTheme.Instance.SecondaryTextColor, 100),
BackgroundColor = new RGBA_Bytes(0, 0, 0, 0),
BorderWidth = 1,
MenuAsWideAsItems = false,
AlignToRightEdge = true,
};
sliceOptionsMenuDropList.VAnchor |= VAnchor.ParentCenter;
sliceOptionsMenuDropList.SelectionChanged += new EventHandler(MenuDropList_SelectionChanged);
@ -114,7 +116,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
{ "Import".Localize(), ImportSettingsMenu_Click },
{ "Export".Localize(), () => { WizardWindow.Show<ExportSettingsPage>("ExportSettingsPage", "Export Settings"); return true; } },
{ "Printer History".Localize(), () => { WizardWindow.Show<PrinterProfileHistoryPage>("somecontext", "Hello world"); return true; } },
{ "Settings History".Localize(), () => { WizardWindow.Show<PrinterProfileHistoryPage>("somecontext", "Hello world"); return true; } },
{ "Reset to defaults".Localize(),() => { UiThread.RunOnIdle(ResetToDefaults); return true; } },
};

12
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -152,7 +152,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string categoryPageLabel = category.Name.Localize();
TabPage categoryPage = new TabPage(categoryPageLabel);
SimpleTextTabWidget textTabWidget = new SimpleTextTabWidget(categoryPage, category.Name + " Tab", 16,
ActiveTheme.Instance.TabLabelSelected, new RGBA_Bytes(), ActiveTheme.Instance.TabLabelUnselected, new RGBA_Bytes());
ActiveTheme.Instance.TabLabelSelected, new RGBA_Bytes(), ActiveTheme.Instance.TabLabelUnselected, new RGBA_Bytes());
categoryPage.AnchorAll();
topCategoryTabs.AddTab(textTabWidget);
@ -694,6 +694,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
// This is a place holder type to allow us to put in the control that will allow the deletion of a printer profile
TextImageButtonFactory buttonFactory = new TextImageButtonFactory();
buttonFactory.borderWidth = 1;
if (ActiveTheme.Instance.IsDarkTheme)
{
buttonFactory.normalBorderColor = new RGBA_Bytes(99, 99, 99);
}
else
{
buttonFactory.normalBorderColor = new RGBA_Bytes(140, 140, 140);
}
buttonFactory.normalTextColor = RGBA_Bytes.Red;
var button = buttonFactory.Generate("Delete Printer".Localize());
button.HAnchor = HAnchor.ParentCenter;