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

Added separate button with help text for 'Cancel Connection'.

Browse source 
Fixed duplicate method within PrintLevelWizard.
This commit is contained in:
Kevin Pope 2014-02-11 11:59:43 -08:00
parent 180dbe5896
commit 9153bbb7ca
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ActionBar/PrintActionRow.cs
View file

@ -25,6 +25,8 @@ namespace MatterHackers.MatterControl.ActionBar
List<TooltipButton> activePrintButtons = new List<TooltipButton>(); List<TooltipButton> activePrintButtons = new List<TooltipButton>();
List<TooltipButton> allPrintButtons = new List<TooltipButton>(); List<TooltipButton> allPrintButtons = new List<TooltipButton>();
TooltipButton cancelConnectButton;
TooltipButton addButton; TooltipButton addButton;
TooltipButton startButton; TooltipButton startButton;
@ -72,6 +74,10 @@ namespace MatterHackers.MatterControl.ActionBar
string pauseButtonMessage = new LocalizedString("Pause the current print").Translated; string pauseButtonMessage = new LocalizedString("Pause the current print").Translated;
pauseButton = makeButton(pauseButtonTxt, pauseButtonMessage); pauseButton = makeButton(pauseButtonTxt, pauseButtonMessage);
string cancelCancelButtonTxt = new LocalizedString("Cancel Connect").Translated;
string cancelConnectButtonMessage = new LocalizedString("Stop trying to connect to the printer.").Translated;
cancelConnectButton = makeButton(cancelCancelButtonTxt, cancelConnectButtonMessage);
string cancelButtonTxt = new LocalizedString("Cancel").Translated; string cancelButtonTxt = new LocalizedString("Cancel").Translated;
string cancelButtonMessage = new LocalizedString("Stop the current print").Translated; string cancelButtonMessage = new LocalizedString("Stop the current print").Translated;
cancelButton = makeButton(cancelButtonTxt, cancelButtonMessage); cancelButton = makeButton(cancelButtonTxt, cancelButtonMessage);
@ -109,6 +115,9 @@ namespace MatterHackers.MatterControl.ActionBar
this.AddChild(cancelButton); this.AddChild(cancelButton);
allPrintButtons.Add(cancelButton); allPrintButtons.Add(cancelButton);
this.AddChild(cancelConnectButton);
allPrintButtons.Add(cancelConnectButton);
this.AddChild(reprintButton); this.AddChild(reprintButton);
allPrintButtons.Add(reprintButton); allPrintButtons.Add(reprintButton);
@ -389,7 +398,7 @@ namespace MatterHackers.MatterControl.ActionBar
switch (PrinterCommunication.Instance.CommunicationState) switch (PrinterCommunication.Instance.CommunicationState)
{ {
case PrinterCommunication.CommunicationStates.AttemptingToConnect: case PrinterCommunication.CommunicationStates.AttemptingToConnect:
this.activePrintButtons.Add(cancelButton); this.activePrintButtons.Add(cancelConnectButton);
EnableActiveButtons(); EnableActiveButtons();
break; break;

4
PrintLevelWizard.cs
View file

@ -389,10 +389,6 @@ namespace MatterHackers.MatterControl
{ {
UiThread.RunOnIdle (DoDoneButton_Click); UiThread.RunOnIdle (DoDoneButton_Click);
} }
void DoDoneButton_Click(object state)
{
UiThread.RunOnIdle(DoDoneButton_Click);
}
void DoDoneButton_Click(object state) void DoDoneButton_Click(object state)
{ {