From 92a572e5f2424e8c9bd0b1b57c722a4a35ae4438 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 21 Jul 2016 17:15:47 -0700 Subject: [PATCH] Changed upload to sync 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 --- SetupWizard/CopyGuestProfilesToUser.cs | 6 +++--- SetupWizard/WizardWindow.cs | 2 +- SlicerConfiguration/Settings/ActiveSliceSettings.cs | 12 +++++++----- SlicerConfiguration/SliceSettingsDetailControl.cs | 4 +++- SlicerConfiguration/SliceSettingsWidget.cs | 12 +++++++++++- StaticData/Translations/Master.txt | 6 ++++++ 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/SetupWizard/CopyGuestProfilesToUser.cs b/SetupWizard/CopyGuestProfilesToUser.cs index eed245ba5..899eac813 100644 --- a/SetupWizard/CopyGuestProfilesToUser.cs +++ b/SetupWizard/CopyGuestProfilesToUser.cs @@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl List checkBoxes = new List(); public CopyGuestProfilesToUser(Action afterProfilesImported) - : base("Cancel", "Select Printers to Upload") + : base("Cancel", "Select Printers to Sync") { var scrollWindow = new ScrollableWidget() { @@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl var guestProfileManager = ProfileManager.LoadGuestDB(); if (guestProfileManager?.Profiles.Count > 0) { - container.AddChild(new TextWidget("Printers to Upload:".Localize()) + container.AddChild(new TextWidget("Printers to Sync:".Localize()) { TextColor = ActiveTheme.Instance.PrimaryTextColor, Margin = new BorderDouble(0, 3, 0, 15), @@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl } } - var uploadButton = textImageButtonFactory.Generate("Upload".Localize()); + var uploadButton = textImageButtonFactory.Generate("Sync".Localize()); uploadButton.Click += (s, e) => { // do the import diff --git a/SetupWizard/WizardWindow.cs b/SetupWizard/WizardWindow.cs index 6bd5a5fa8..09eb5dbce 100644 --- a/SetupWizard/WizardWindow.cs +++ b/SetupWizard/WizardWindow.cs @@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl WizardWindow wizardWindow = GetWindow("PrinterSetup"); wizardWindow.Title = "Setup Wizard".Localize(); - wizardWindow.ChangeToPage(); + wizardWindow.ChangeToPage(); } public static bool IsOpen(string uri) diff --git a/SlicerConfiguration/Settings/ActiveSliceSettings.cs b/SlicerConfiguration/Settings/ActiveSliceSettings.cs index f09aa6eec..198c005f5 100644 --- a/SlicerConfiguration/Settings/ActiveSliceSettings.cs +++ b/SlicerConfiguration/Settings/ActiveSliceSettings.cs @@ -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(SettingsKey.auto_connect)) + if (ActiveSliceSettings.Instance.PrinterSelected) { - UiThread.RunOnIdle(() => + if (Instance.GetValue(SettingsKey.auto_connect)) { + UiThread.RunOnIdle(() => + { //PrinterConnectionAndCommunication.Instance.HaltConnectionThread(); PrinterConnectionAndCommunication.Instance.ConnectToActivePrinter(); - }, 2); + }, 2); + } } } } diff --git a/SlicerConfiguration/SliceSettingsDetailControl.cs b/SlicerConfiguration/SliceSettingsDetailControl.cs index a8cd9a934..745039932 100644 --- a/SlicerConfiguration/SliceSettingsDetailControl.cs +++ b/SlicerConfiguration/SliceSettingsDetailControl.cs @@ -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", "Export Settings"); return true; } }, - { "Printer History".Localize(), () => { WizardWindow.Show("somecontext", "Hello world"); return true; } }, + { "Settings History".Localize(), () => { WizardWindow.Show("somecontext", "Hello world"); return true; } }, { "Reset to defaults".Localize(),() => { UiThread.RunOnIdle(ResetToDefaults); return true; } }, }; diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index b0d169cf4..c968ef6e7 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -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; diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 42b98640d..7fe4e10a6 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -5257,3 +5257,9 @@ Translated:The profile you are attempting to load has been corrupted. We loaded English:Recovered printer profile Translated:Recovered printer profile +English:Sorry! Looks like an account already exists for that email address. +Translated:Sorry! Looks like an account already exists for that email address. + +English:Settings History +Translated:Settings History +