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

Merge pull request #1162 from larsbrubaker/master

Browse source 
Changed upload to sync
This commit is contained in:
Lars Brubaker 2016-07-21 17:31:47 -07:00 • committed by GitHub
commit e2b10e08a2
6 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SetupWizard/CopyGuestProfilesToUser.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl
List<CheckBox> checkBoxes = new List<CheckBox>();
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

2
SetupWizard/WizardWindow.cs
View file

@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl
WizardWindow wizardWindow = GetWindow("PrinterSetup");
wizardWindow.Title = "Setup Wizard".Localize();
wizardWindow.ChangeToPage<SetupStepComPortOne>();
wizardWindow.ChangeToPage<SetupStepInstallDriver>();
}
public static bool IsOpen(string uri)

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;

6
StaticData/Translations/Master.txt
View file

@ -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