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

Working on new import and export wizard

Browse source
This commit is contained in:
Lars Brubaker 2016-06-14 11:45:18 -07:00
parent 12bca2d0c5
commit 86a7e7c415
3 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
SetupWizard/ImportSettingsPage.cs
View file

@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl
private string importMode;
public ImportSettingsPage() :
base("Cancel")
base("Cancel", "Import Wizard")
{
var container = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
@ -60,7 +60,7 @@ namespace MatterHackers.MatterControl
this.importMode = "new";
container.AddChild(
CreateDetailInfo("Add a new printer profile, base on the imported settings, to your list of available printers.\nThis will not change your current settings.")
CreateDetailInfo("Add a new printer profile to your list of available printers.\nThis will not change your current settings.")
);
// merge into current settings
@ -69,29 +69,29 @@ namespace MatterHackers.MatterControl
container.AddChild(mergeButton);
container.AddChild(
CreateDetailInfo("Merge imported settings and presets into your current profile. \nNote: You will still be able to revert to the factory settings at any time.")
CreateDetailInfo("Merge settings and presets (if any) into your current profile. \nYou will still be able to revert to the factory settings at any time.")
);
// replace current settings
var replaceButton = new RadioButton("Replace current printer profile".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
replaceButton.CheckedStateChanged += (s, e) => importMode = "replace";
container.AddChild(replaceButton);
// add as quality preset
var newQualityPresetButton = new RadioButton("Import settings as new QUALITY preset".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
newQualityPresetButton.CheckedStateChanged += (s, e) => importMode = "qualityPreset";
container.AddChild(newQualityPresetButton);
container.AddChild(
CreateDetailInfo("Replace current settings and presets with the imported profile. \nNote: You will still be able to revert to the factory settings at any time.")
CreateDetailInfo("Add new quality preset with the settings from this import.")
);
// add as preset
var newPresetButton = new RadioButton("Add as a new quality preset".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
newPresetButton.CheckedStateChanged += (s, e) => importMode = "qualityPreset";
container.AddChild(newPresetButton);
// add as materila preset
var newMaterialPresetButton = new RadioButton("Import settings as new MATERIAL preset".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
newMaterialPresetButton.CheckedStateChanged += (s, e) => importMode = "materialPreset";
container.AddChild(newMaterialPresetButton);
container.AddChild(
CreateDetailInfo("Add new quality preset(s) with the settings from this import.")
CreateDetailInfo("Add new material preset with the settings from this import.")
);
var importButton = textImageButtonFactory.Generate("Import Settings".Localize());
var importButton = textImageButtonFactory.Generate("Choose File".Localize());
importButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
FileDialog.OpenFileDialog(
@ -136,8 +136,7 @@ namespace MatterHackers.MatterControl
break;
case "merge":
case "replace":
ReplaceOrMergeSettings(settingsFilePath);
MergeSettings(settingsFilePath);
break;
case "qualityPreset":
@ -146,7 +145,7 @@ namespace MatterHackers.MatterControl
}
}
private void ReplaceOrMergeSettings(string settingsFilePath)
private void MergeSettings(string settingsFilePath)
{
if (!string.IsNullOrEmpty(settingsFilePath) && File.Exists(settingsFilePath))
{
@ -166,11 +165,6 @@ namespace MatterHackers.MatterControl
{
var activeSettings = ActiveSliceSettings.Instance;
if (importMode == "replace")
{
activeSettings.ClearUserOverrides();
}
foreach (var item in settingsToImport)
{
// Compare the value to import to the layer cascade value and only set if different