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

Remove WizardButton factory

Browse source
This commit is contained in:
John Lewin 2018-04-14 20:51:01 -07:00
parent be71743435
commit b1cc3fe5ac
19 changed files with 60 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ApplicationView/ThemeConfig.cs
View file

@ -77,7 +77,6 @@ namespace MatterHackers.MatterControl
public TextImageButtonFactory WhiteButtonFactory { get; private set; }
public TextImageButtonFactory ButtonFactory { get; private set; }
public TextImageButtonFactory WizardButtons { get; private set; }
public int SplitterWidth => (int)(6 * (GuiWidget.DeviceScale <= 1 ? GuiWidget.DeviceScale : GuiWidget.DeviceScale * 1.4));
@ -127,6 +126,8 @@ namespace MatterHackers.MatterControl
{
}
private BorderDouble commonFactoryMargin = new BorderDouble(14, 0);
public void RebuildTheme(IThemeColors colors)
{
this.Colors = colors;
@ -138,7 +139,7 @@ namespace MatterHackers.MatterControl
commonOptions.HoverTextColor = colors.PrimaryTextColor;
commonOptions.PressedTextColor = colors.PrimaryTextColor;
commonOptions.DisabledTextColor = colors.TertiaryBackgroundColor;
commonOptions.Margin = new BorderDouble(14, 0);
commonOptions.Margin = commonFactoryMargin;
commonOptions.FontSize = this.DefaultFontSize;
commonOptions.ImageSpacing = 8;
commonOptions.BorderWidth = 0;
@ -164,15 +165,6 @@ namespace MatterHackers.MatterControl
this.ButtonFactory = new TextImageButtonFactory(commonOptions);
this.WizardButtons = new TextImageButtonFactory(new ButtonFactoryOptions(commonOptions)
{
#if __ANDROID__
FontSize = this.FontSize14,
FixedHeight = 34 * GuiWidget.DeviceScale,
Margin = commonOptions.Margin * 1.2
#endif
});
var commonGray = new ButtonFactoryOptions(commonOptions)
{
NormalTextColor = Color.Black,
@ -229,6 +221,27 @@ namespace MatterHackers.MatterControl
return radioButton;
}
public TextButton CreateDialogButton(string text)
{
var textSize = -1;
#if __ANDROID__
textSize = this.FontSize14,
#endif
var button = new TextButton(text, this, textSize)
{
BackgroundColor = this.SlightShade,
#if __ANDROID__
// Enlarge button height and margin on Android
Height = 34 * GuiWidget.DeviceScale,
Margin = commonFactoryMargin * 1.2
#endif
};
return button;
}
public Color GetBorderColor(int alpha)
{
return new Color(this.Colors.SecondaryTextColor, alpha);

2
ConfigurationPage/RunningMacroPage.cs
View file

@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.PrinterControls
if (macroData.waitOk | macroData.expireTime > 0)
{
Button okButton = textImageButtonFactory.Generate("Continue".Localize());
var okButton = theme.CreateDialogButton("Continue".Localize());
okButton.Click += (s, e) =>
{
printer.Connection.MacroContinue();

2
ControlElements/StyledMessageBoxWindow.cs
View file

@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl
}
}
Button affirmativeButton = textImageButtonFactory.Generate(yesOk);
var affirmativeButton = theme.CreateDialogButton(yesOk);
affirmativeButton.Click += (s, e) =>
{
UiThread.RunOnIdle(this.WizardWindow.Close);

2
CustomWidgets/ExportPrintItemPage.cs
View file

@ -122,7 +122,7 @@ namespace MatterHackers.MatterControl
contentRow.AddChild(showInFolderAfterSave);
}
var exportButton = textImageButtonFactory.Generate("Export".Localize());
var exportButton = theme.CreateDialogButton("Export".Localize());
exportButton.Name = "Export Button";
exportButton.Click += (s, e) =>
{

2
PrinterControls/MacroDetailPage.cs
View file

@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl
contentRow.AddChild(container);
Button addMacroButton = textImageButtonFactory.Generate("Save".Localize());
var addMacroButton = theme.CreateDialogButton("Save".Localize());
addMacroButton.Click += (s, e) =>
{
UiThread.RunOnIdle(() =>

2
PrinterControls/MacroListPage.cs
View file

@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl
this.RebuildList(printerSettings, linkButtonFactory);
Button addMacroButton = textImageButtonFactory.Generate("Add".Localize(), AggContext.StaticData.LoadIcon("fa-plus_16.png", theme.InvertIcons));
var addMacroButton = theme.CreateDialogButton("Add".Localize());
addMacroButton.ToolTipText = "Add a new Macro".Localize();
addMacroButton.Click += (s, e) =>
{

6
PrinterControls/PrinterConnections/SetupStepBaudRate.cs
View file

@ -45,8 +45,8 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private GuiWidget baudRateWidget;
private RadioButton otherBaudRateRadioButton;
private MHTextEditWidget otherBaudRateInput;
private Button nextButton;
private Button printerBaudRateHelpLink;
private GuiWidget nextButton;
private GuiWidget printerBaudRateHelpLink;
private TextWidget printerBaudRateHelpMessage;
private PrinterConfig printer;
@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
printerBaudRateContainer = createPrinterBaudRateContainer();
contentRow.AddChild(printerBaudRateContainer);
{
nextButton = textImageButtonFactory.Generate("Continue".Localize());
nextButton = theme.CreateDialogButton("Continue".Localize());
nextButton.Click += (s, e) =>
{
bool canContinue = this.OnSave();

14
PrinterControls/PrinterConnections/SetupStepComPortManual.cs
View file

@ -40,10 +40,10 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
public class SetupStepComPortManual : DialogPage
{
private Button nextButton;
private Button connectButton;
private Button refreshButton;
private Button printerComPortHelpLink;
private GuiWidget nextButton;
private GuiWidget connectButton;
private GuiWidget refreshButton;
private GuiWidget printerComPortHelpLink;
private bool printerComPortIsAvailable = false;
@ -62,11 +62,11 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
contentRow.AddChild(printerComPortContainer);
//Construct buttons
nextButton = textImageButtonFactory.Generate("Done".Localize());
nextButton = theme.CreateDialogButton("Done".Localize());
nextButton.Click += (s, e) => UiThread.RunOnIdle(Parent.Close);
nextButton.Visible = false;
connectButton = textImageButtonFactory.Generate("Connect".Localize());
connectButton = theme.CreateDialogButton("Connect".Localize());
connectButton.Click += (s, e) =>
{
try
@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
}
};
refreshButton = textImageButtonFactory.Generate("Refresh".Localize());
refreshButton = theme.CreateDialogButton("Refresh".Localize());
refreshButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
WizardWindow.ChangeToPage(new SetupStepComPortManual(printer));

2
PrinterControls/PrinterConnections/SetupStepComPortOne.cs
View file

@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
contentRow.AddChild(container);
//Construct buttons
var nextButton = textImageButtonFactory.Generate("Continue".Localize());
var nextButton = theme.CreateDialogButton("Continue".Localize());
nextButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
WizardWindow.ChangeToPage(new SetupStepComPortTwo(printer));

8
PrinterControls/PrinterConnections/SetupStepComPortTwo.cs
View file

@ -42,8 +42,8 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
private string[] startingPortNames;
private Button nextButton;
private Button connectButton;
private GuiWidget nextButton;
private GuiWidget connectButton;
private TextWidget printerErrorMessage;
private EventHandler unregisterEvents;
@ -57,11 +57,11 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
contentRow.AddChild(createPrinterConnectionMessageContainer());
//Construct buttons
nextButton = textImageButtonFactory.Generate("Done".Localize());
nextButton = theme.CreateDialogButton("Done".Localize());
nextButton.Click += (s, e) => UiThread.RunOnIdle(Parent.Close);
nextButton.Visible = false;
connectButton = textImageButtonFactory.Generate("Connect".Localize());
connectButton = theme.CreateDialogButton("Connect".Localize());
connectButton.Click += (s, e) =>
{
// Select the first port that's in GetPortNames() but not in startingPortNames

4
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private TextWidget printerNameError;
private Button nextButton;
private GuiWidget nextButton;
private bool usingDefaultName;
@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
contentRow.AddChild(createPrinterNameContainer());
//Construct buttons
nextButton = textImageButtonFactory.Generate("Save & Continue".Localize());
nextButton = theme.CreateDialogButton("Save & Continue".Localize());
nextButton.Name = "Save & Continue Button";
nextButton.Click += async (s, e) =>
{

4
PrinterControls/PrinterConnections/ShowAuthPanel.cs
View file

@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
this.SetCancelButtonName("Connection Wizard Skip Sign In Button");
var createAccountButton = textImageButtonFactory.Generate("Create Account".Localize());
var createAccountButton = theme.CreateDialogButton("Create Account".Localize());
createAccountButton.Name = "Create Account From Connection Wizard Button";
createAccountButton.Margin = new Agg.BorderDouble(right: 5);
createAccountButton.Click += (s, e) =>
@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
});
};
var signInButton = textImageButtonFactory.Generate("Sign In".Localize());
var signInButton = theme.CreateDialogButton("Sign In".Localize());
signInButton.Name = "Sign In From Connection Wizard Button";
signInButton.Click += (s, e) =>
{

2
SetupWizard/CopyGuestProfilesToUser.cs
View file

@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl
}
}
var syncButton = textImageButtonFactory.Generate("Copy".Localize());
var syncButton = theme.CreateDialogButton("Copy".Localize());
syncButton.Name = "CopyProfilesButton";
syncButton.Click += (s, e) =>
{

8
SetupWizard/DialogPage.cs
View file

@ -43,11 +43,10 @@ namespace MatterHackers.MatterControl
private FlowLayoutWidget footerRow;
private WrappedTextWidget headerLabel;
private Button cancelButton;
private GuiWidget cancelButton;
public Vector2 WindowSize { get; set; }
protected TextImageButtonFactory textImageButtonFactory { get; }
protected LinkButtonFactory linkButtonFactory { get; }
protected double labelFontSize = 12 * GuiWidget.DeviceScale;
@ -61,7 +60,6 @@ namespace MatterHackers.MatterControl
{
theme = ApplicationController.Instance.Theme;
textImageButtonFactory = theme.WizardButtons;
linkButtonFactory = theme.LinkButtonFactory;
if (cancelButtonText == null)
@ -76,7 +74,8 @@ namespace MatterHackers.MatterControl
this.AnchorAll();
cancelButton = textImageButtonFactory.Generate(cancelButtonText);
cancelButton = theme.CreateDialogButton(cancelButtonText);
cancelButton.Margin = 0;
cancelButton.Name = "Cancel Wizard Button";
// Create the main container
@ -154,6 +153,7 @@ namespace MatterHackers.MatterControl
public void AddPageAction(GuiWidget button)
{
button.Margin = new BorderDouble(right: ApplicationController.Instance.Theme.ButtonSpacing.Left);
button.Margin = new BorderDouble(right: footerRow.Margin.Top);
footerRow.AddChild(button);
}

2
SetupWizard/ImportSettingsPage.cs
View file

@ -158,7 +158,7 @@ namespace MatterHackers.MatterControl
}
var importButtonTitle = "Import".Localize();
var mergeButton = textImageButtonFactory.Generate(importButtonTitle);
var mergeButton = theme.CreateDialogButton(importButtonTitle);
mergeButton.Name = "Merge Profile";
mergeButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{

4
SetupWizard/InputBoxPage.cs
View file

@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl
this.HeaderText = windowTitle;
this.WindowSize = new Vector2(500, 200);
Button actionButton = null;
GuiWidget actionButton = null;
contentRow.AddChild(new TextWidget(label, pointSize: 12)
{
@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl
};
contentRow.AddChild(textEditWidget);
actionButton = textImageButtonFactory.Generate(actionButtonTitle);
actionButton = theme.CreateDialogButton(actionButtonTitle);
actionButton.Name = "InputBoxPage Action Button";
actionButton.Cursor = Cursors.Hand;
actionButton.Click += (s, e) =>

2
SetupWizard/LicenseAgreementPage.cs
View file

@ -54,7 +54,7 @@ public class LicenseAgreementPage : DialogPage
Name = "LicenseAgreementPage",
});
var acceptButton = textImageButtonFactory.Generate("Accept".Localize());
var acceptButton = theme.CreateDialogButton("Accept".Localize());
acceptButton.Click += (s, e) =>
{
UserSettings.Instance.set("SoftwareLicenseAccepted", "true");

4
SetupWizard/PrinterProfileHistoryPage.cs
View file

@ -34,7 +34,7 @@ namespace MatterHackers.MatterControl.SetupWizard
contentRow.FlowDirection = FlowDirection.TopToBottom;
contentRow.AddChild(scrollWindow);
var revertButton = textImageButtonFactory.Generate("Restore".Localize());
var revertButton = theme.CreateDialogButton("Restore".Localize());
revertButton.Click += async (s, e) =>
{
int index = radioButtonList.IndexOf(radioButtonList.Where(r => r.Checked).FirstOrDefault());
@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.SetupWizard
// Update active instance without calling ReloadAll
ApplicationController.Instance.RefreshActiveInstance(printerSettings);
}
UiThread.RunOnIdle(WizardWindow.Close);
}
};

2
SetupWizard/PublishPartToMatterHackers.cs
View file

@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl
Margin = new BorderDouble(5, 0, 0, 0)
});
var publishButton = textImageButtonFactory.Generate("Publish".Localize());
var publishButton = theme.CreateDialogButton("Publish".Localize());
publishButton.Name = "PublishPartButton";
publishButton.Click += (s, e) =>
{