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

Moved redeem code into ApplicationController

Browse source
This commit is contained in:
Lars Brubaker 2016-11-14 16:50:55 -08:00
parent 0beb684a69
commit bfa1d735fc
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ApplicationView/MainApplicationWidget.cs
View file

@ -179,6 +179,9 @@ namespace MatterHackers.MatterControl
public class ApplicationController
{
public Action RedeemDesignCode;
public Action EnterShareCode;
private static ApplicationController globalInstance;
public RootedObjectEventHandler AdvancedControlsPanelReloading = new RootedObjectEventHandler();
public RootedObjectEventHandler CloudSyncStatusChanged = new RootedObjectEventHandler();

4
ApplicationView/MenuRow/MenuOptionFile.cs
View file

@ -33,8 +33,8 @@ namespace MatterHackers.MatterControl
new MenuItemAction("Add Printer".Localize(), AddPrinter_Click),
new MenuItemAction("Import Printer".Localize(), ImportPrinter),
new MenuItemAction("Add File To Queue".Localize(), importFile_Click),
new MenuItemAction("Redeem Design Code".Localize(), () => MatterControlApplication.Instance.RedeemDesignCode?.Invoke()),
new MenuItemAction("Enter Share Code".Localize(), () => MatterControlApplication.Instance.EnterShareCode?.Invoke()),
new MenuItemAction("Redeem Design Code".Localize(), () => ApplicationController.Instance.RedeemDesignCode?.Invoke()),
new MenuItemAction("Enter Share Code".Localize(), () => ApplicationController.Instance.EnterShareCode?.Invoke()),
new MenuItemAction("------------------------", null),
new MenuItemAction("Exit".Localize(), () =>
{

3
MatterControlApplication.cs
View file

@ -64,9 +64,6 @@ namespace MatterHackers.MatterControl
public static string MCWSBaseUri { get; } = "https://mattercontrol.appspot.com";
#endif
public Action RedeemDesignCode;
public Action EnterShareCode;
public static bool CameraInUseByExternalProcess { get; set; } = false;
public bool RestartOnClose = false;
private static readonly Vector2 minSize = new Vector2(600, 600);

4
SetupWizard/AndroidSetupOptionsPage.cs
View file

@ -219,7 +219,7 @@ namespace MatterHackers.MatterControl
redeemPurchaseButton.Margin = new BorderDouble(0, 0, 10, 0);
redeemPurchaseButton.Click += (sender, e) =>
{
MatterControlApplication.Instance.RedeemDesignCode?.Invoke();
ApplicationController.Instance.RedeemDesignCode?.Invoke();
};
buttonContainer.AddChild(redeemPurchaseButton);
@ -230,7 +230,7 @@ namespace MatterHackers.MatterControl
redeemShareButton.Margin = new BorderDouble(0, 0, 10, 0);
redeemShareButton.Click += (sender, e) =>
{
MatterControlApplication.Instance.EnterShareCode?.Invoke();
ApplicationController.Instance.EnterShareCode?.Invoke();
};
if (!signedIn)