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

Convert RenamePage into reusable InputBoxPage, use for Create Folder

Browse source 
- Allow WizardPage objects to control window Width & MinimumSize
- Issue MatterHackers/MCCentral#2086
Invalid button styling - custom window type rather than WizardPage
This commit is contained in:
John Lewin 2017-10-17 12:35:24 -07:00
parent ce32ef42b7
commit d277290497
10 changed files with 131 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

101
Library/Widgets/PrintLibraryWidget.cs
View file

@ -45,8 +45,6 @@ namespace MatterHackers.MatterControl.PrintLibrary
{
public class PrintLibraryWidget : GuiWidget
{
private static CreateFolderWindow createFolderWindow = null;
private Button addToLibraryButton;
private Button createFolderButton;
private FlowLayoutWidget buttonPanel;
@ -303,31 +301,30 @@ namespace MatterHackers.MatterControl.PrintLibrary
// the create folder button
createFolderButton = textImageButtonFactory.Generate("Create Folder".Localize());
createFolderButton.Enabled = false; // The library selector (the first library selected) is protected so we can't add to it.
createFolderButton.Enabled = false; // Disabled until changed by the ActiveContainer
createFolderButton.Name = "Create Folder From Library Button";
createFolderButton.Margin = new BorderDouble(0, 0, 3, 0);
createFolderButton.Click += (sender, e) =>
{
if (createFolderWindow == null)
{
createFolderWindow = new CreateFolderWindow((result) =>
{
if (!string.IsNullOrEmpty(result.newName)
&& this.libraryView.ActiveContainer is ILibraryWritableContainer writableContainer)
WizardWindow.Show(
new InputBoxPage(
"Create Folder".Localize(),
"Folder Name".Localize(),
"",
"Enter New Name Here".Localize(),
"Create".Localize(),
(newName) =>
{
writableContainer.Add(
new[]
if (!string.IsNullOrEmpty(newName)
&& this.libraryView.ActiveContainer is ILibraryWritableContainer writableContainer)
{
writableContainer.Add(new[]
{
new CreateFolderItem() { Name = result.newName }
new CreateFolderItem() { Name = newName }
});
}
});
createFolderWindow.Closed += (sender2, e2) => { createFolderWindow = null; };
}
else
{
createFolderWindow.BringToFront();
}
}
}));
};
buttonPanel.AddChild(createFolderButton);
@ -452,7 +449,38 @@ namespace MatterHackers.MatterControl.PrintLibrary
AllowMultiple = false,
AllowProtected = false,
AllowContainers = true,
Action = (selectedLibraryItems, listView) => renameFromLibraryButton_Click(selectedLibraryItems, null),
Action = (selectedLibraryItems, listView) =>
{
if (libraryView.SelectedItems.Count == 1)
{
var selectedItem = libraryView.SelectedItems.FirstOrDefault();
if (selectedItem == null)
{
return;
}
WizardWindow.Show(
new InputBoxPage(
"Rename Item".Localize(),
"Name".Localize(),
selectedItem.Model.Name,
"Enter New Name Here".Localize(),
"Rename".Localize(),
(newName) =>
{
var model = libraryView.SelectedItems.FirstOrDefault()?.Model;
if (model != null)
{
var container = libraryView.ActiveContainer as ILibraryWritableContainer;
if (container != null)
{
container.Rename(model, newName);
libraryView.SelectedItems.Clear();
}
}
}));
}
},
});
// move menu item
@ -611,37 +639,6 @@ namespace MatterHackers.MatterControl.PrintLibrary
});
}
private void renameFromLibraryButton_Click(IEnumerable<ILibraryItem> items, object p)
{
if (libraryView.SelectedItems.Count == 1)
{
var selectedItem = libraryView.SelectedItems.FirstOrDefault();
if (selectedItem == null)
{
return;
}
var renameItemPage = new RenameItemPage(
"Rename Item:".Localize(),
selectedItem.Model.Name,
(newName) =>
{
var model = libraryView.SelectedItems.FirstOrDefault()?.Model;
if (model != null)
{
var container = libraryView.ActiveContainer as ILibraryWritableContainer;
if (container != null)
{
container.Rename(model, newName);
libraryView.SelectedItems.Clear();
}
}
});
WizardWindow.Show(renameItemPage);
}
}
public override void OnClosed(ClosedEventArgs e)
{
if (libraryView?.ActiveContainer != null)

149
Library/Widgets/SystemWindows/CreateFolderWindow.cs
View file

@ -1,149 +0,0 @@
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.DataStorage;
using System;
using System.IO;
namespace MatterHackers.MatterControl
{
public class CreateFolderWindow : SystemWindow
{
private Action<CreateFolderReturnInfo> functionToCallToCreateNamedFolder;
private TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory();
private MHTextEditWidget folderNameWidget;
public CreateFolderWindow(Action<CreateFolderReturnInfo> functionToCallToCreateNamedFolder)
: base(480, 180)
{
Title = "MatterControl - Create Folder";
AlwaysOnTopOfMain = true;
this.functionToCallToCreateNamedFolder = functionToCallToCreateNamedFolder;
FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
topToBottom.AnchorAll();
topToBottom.Padding = new BorderDouble(3, 0, 3, 5);
// Creates Header
FlowLayoutWidget headerRow = new FlowLayoutWidget(FlowDirection.LeftToRight);
headerRow.HAnchor = HAnchor.Stretch;
headerRow.Margin = new BorderDouble(0, 3, 0, 0);
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
//Creates Text and adds into header
{
string createFolderLabel = "Create New Folder:".Localize();
TextWidget elementHeader = new TextWidget(createFolderLabel, pointSize: 14);
elementHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
elementHeader.HAnchor = HAnchor.Stretch;
elementHeader.VAnchor = Agg.UI.VAnchor.Bottom;
headerRow.AddChild(elementHeader);
topToBottom.AddChild(headerRow);
this.AddChild(topToBottom);
}
//Creates container in the middle of window
FlowLayoutWidget middleRowContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
{
middleRowContainer.HAnchor = HAnchor.Stretch;
middleRowContainer.VAnchor = VAnchor.Stretch;
middleRowContainer.Padding = new BorderDouble(5);
middleRowContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
}
string fileNameLabel = "Folder Name".Localize();
TextWidget textBoxHeader = new TextWidget(fileNameLabel, pointSize: 12);
textBoxHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
textBoxHeader.Margin = new BorderDouble(5);
textBoxHeader.HAnchor = HAnchor.Left;
//Adds text box and check box to the above container
folderNameWidget = new MHTextEditWidget("", pixelWidth: 300, messageWhenEmptyAndNotSelected: "Enter a Folder Name Here".Localize());
folderNameWidget.Name = "Create Folder - Text Input";
folderNameWidget.HAnchor = HAnchor.Stretch;
folderNameWidget.Margin = new BorderDouble(5);
middleRowContainer.AddChild(textBoxHeader);
middleRowContainer.AddChild(folderNameWidget);
middleRowContainer.AddChild(new HorizontalSpacer());
topToBottom.AddChild(middleRowContainer);
//Creates button container on the bottom of window
FlowLayoutWidget buttonRow = new FlowLayoutWidget(FlowDirection.LeftToRight);
{
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
buttonRow.HAnchor = HAnchor.Stretch;
buttonRow.Padding = new BorderDouble(0, 3);
}
Button createFolderButton = textImageButtonFactory.Generate("Create".Localize());
createFolderButton.Name = "Create Folder Button";
createFolderButton.Visible = true;
createFolderButton.Cursor = Cursors.Hand;
buttonRow.AddChild(createFolderButton);
createFolderButton.Click += createFolderButton_Click;
folderNameWidget.ActualTextEditWidget.EnterPressed += new KeyEventHandler(ActualTextEditWidget_EnterPressed);
//Adds Create and Close Button to button container
buttonRow.AddChild(new HorizontalSpacer());
Button cancelButton = textImageButtonFactory.Generate("Cancel".Localize());
cancelButton.Visible = true;
cancelButton.Cursor = Cursors.Hand;
buttonRow.AddChild(cancelButton);
cancelButton.Click += (sender, e) =>
{
CloseOnIdle();
};
topToBottom.AddChild(buttonRow);
ShowAsSystemWindow();
}
public override void OnLoad(EventArgs args)
{
UiThread.RunOnIdle(folderNameWidget.Focus);
base.OnLoad(args);
}
private void ActualTextEditWidget_EnterPressed(object sender, KeyEventArgs keyEvent)
{
SubmitForm();
}
private void createFolderButton_Click(object sender, EventArgs mouseEvent)
{
SubmitForm();
}
private void SubmitForm()
{
string newName = folderNameWidget.ActualTextEditWidget.Text;
if (newName != "")
{
string fileName = Path.ChangeExtension(Path.GetRandomFileName(), ".amf");
string fileNameAndPath = Path.Combine(ApplicationDataStorage.Instance.ApplicationLibraryDataPath, fileName);
CreateFolderReturnInfo returnInfo = new CreateFolderReturnInfo(newName);
functionToCallToCreateNamedFolder(returnInfo);
CloseOnIdle();
}
}
public class CreateFolderReturnInfo
{
public string newName;
public CreateFolderReturnInfo(string newName)
{
this.newName = newName;
}
}
}
}

3
MatterControl.csproj
View file

@ -249,7 +249,7 @@
<Compile Include="PrinterCommunication\Io\RequestTemperaturesStream.cs" />
<Compile Include="Program.cs" />
<Compile Include="SetupWizard\CopyGuestProfilesToUser.cs" />
<Compile Include="Library\Widgets\SystemWindows\RenameItemPage.cs" />
<Compile Include="SetupWizard\InputBoxPage.cs" />
<Compile Include="LocalizedString.cs" />
<Compile Include="PartPreviewWindow\BedSettings.cs" />
<Compile Include="PartPreviewWindow\ColorGradientWidget.cs" />
@ -300,7 +300,6 @@
<Compile Include="PrinterControls\TerminalWindow\TextScrollWidget.cs" />
<Compile Include="PrinterControls\TerminalWindow\TerminalWidget.cs" />
<Compile Include="History\PrintHistoryData.cs" />
<Compile Include="Library\Widgets\SystemWindows\CreateFolderWindow.cs" />
<Compile Include="Library\Export\IExportPlugin.cs" />
<Compile Include="SetupWizard\AndroidConnectDevicePage.cs" />
<Compile Include="SetupWizard\ImportSettingsPage.cs" />

26
PartPreviewWindow/View3D/PrinterActionsBar.cs
View file

@ -178,18 +178,20 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Title = "Rename Printer".Localize(),
Action = () =>
{
var renameItemPage = new RenameItemPage(
"Rename Printer".Localize() + ":",
printer.Settings.GetValue(SettingsKey.printer_name),
(newName) =>
{
if (!string.IsNullOrEmpty(newName))
{
printer.Settings.SetValue(SettingsKey.printer_name, newName);
}
});
WizardWindow.Show(renameItemPage);
WizardWindow.Show(
new InputBoxPage(
"Rename Printer".Localize(),
"Name".Localize(),
printer.Settings.GetValue(SettingsKey.printer_name),
"Enter New Name Here".Localize(),
"Rename".Localize(),
(newName) =>
{
if (!string.IsNullOrEmpty(newName))
{
printer.Settings.SetValue(SettingsKey.printer_name, newName);
}
}));
}
},
new NamedAction() { Title = "----" },

67
Library/Widgets/SystemWindows/RenameItemPage.cs → SetupWizard/InputBoxPage.cs
View file

@ -30,71 +30,62 @@ either expressed or implied, of the FreeBSD Project.
using System;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{
public class RenameItemPage : WizardPage
public class InputBoxPage : WizardPage
{
private Action<string> renameCallback;
private MHTextEditWidget textEditWidget;
private MHTextEditWidget saveAsNameWidget;
public RenameItemPage(string windowTitle, string currentItemName, Action<string> functionToCallToRenameItem)
public InputBoxPage(string windowTitle, string label, string initialValue, string emptyText, string actionButtonTitle, Action<string> action)
{
this.renameCallback = functionToCallToRenameItem;
this.WindowTitle = windowTitle;
this.HeaderText = windowTitle;
this.WindowSize = new Vector2(500, 200);
var textBoxHeader = new TextWidget("Name".Localize(), pointSize: 12)
Button actionButton = null;
contentRow.AddChild(new TextWidget(label, pointSize: 12)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
Margin = new BorderDouble(5),
HAnchor = HAnchor.Left
};
contentRow.AddChild(textBoxHeader);
});
//Adds text box and check box to the above container
saveAsNameWidget = new MHTextEditWidget(currentItemName, pixelWidth: 300, messageWhenEmptyAndNotSelected: "Enter New Name Here".Localize());
saveAsNameWidget.HAnchor = HAnchor.Stretch;
saveAsNameWidget.Margin = new BorderDouble(5);
saveAsNameWidget.ActualTextEditWidget.EnterPressed += (s, e) =>
textEditWidget = new MHTextEditWidget(initialValue, pixelWidth: 300, messageWhenEmptyAndNotSelected: emptyText);
textEditWidget.HAnchor = HAnchor.Stretch;
textEditWidget.Margin = new BorderDouble(5);
textEditWidget.ActualTextEditWidget.EnterPressed += (s, e) =>
{
SubmitForm();
actionButton.OnClick(null);
};
contentRow.AddChild(saveAsNameWidget);
contentRow.AddChild(textEditWidget);
var renameItemButton = textImageButtonFactory.Generate("Rename".Localize());
renameItemButton.Name = "Rename Button";
renameItemButton.Visible = true;
renameItemButton.Cursor = Cursors.Hand;
renameItemButton.Click += (s, e) =>
actionButton = textImageButtonFactory.Generate(actionButtonTitle);
actionButton.Name = "InputBoxPage Action Button";
actionButton.Cursor = Cursors.Hand;
actionButton.Click += (s, e) =>
{
SubmitForm();
string newName = textEditWidget.ActualTextEditWidget.Text;
if (!string.IsNullOrEmpty(newName))
{
action.Invoke(newName);
this.WizardWindow.CloseOnIdle();
}
};
this.AddPageAction(renameItemButton);
this.AddPageAction(actionButton);
}
public override void OnLoad(EventArgs args)
{
UiThread.RunOnIdle(() =>
{
saveAsNameWidget.Focus();
saveAsNameWidget.ActualTextEditWidget.InternalTextEditWidget.SelectAll();
textEditWidget.Focus();
textEditWidget.ActualTextEditWidget.InternalTextEditWidget.SelectAll();
});
base.OnLoad(args);
}
private void SubmitForm()
{
string newName = saveAsNameWidget.ActualTextEditWidget.Text;
if (newName != "")
{
renameCallback(newName);
this.WizardWindow.CloseOnIdle();
}
}
}
}
}

3
SetupWizard/WizardPage.cs
View file

@ -32,6 +32,7 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{
@ -44,6 +45,8 @@ namespace MatterHackers.MatterControl
private WrappedTextWidget headerLabel;
protected Button cancelButton { get; }
public Vector2 WindowSize { get; set; }
protected TextImageButtonFactory textImageButtonFactory { get; } = ApplicationController.Instance.Theme.WizardButtons;
protected TextImageButtonFactory whiteImageButtonFactory { get; } = ApplicationController.Instance.Theme.WhiteButtonFactory;
protected LinkButtonFactory linkButtonFactory = ApplicationController.Instance.Theme.LinkButtonFactory;

41
SetupWizard/WizardWindow.cs
View file

@ -1,14 +1,12 @@
using MatterHackers.Agg;
using System;
using System.Collections.Generic;
using MatterHackers.Agg;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrinterControls.PrinterConnections;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
using System;
using System.Collections.Generic;
namespace MatterHackers.MatterControl
{
@ -25,12 +23,9 @@ namespace MatterHackers.MatterControl
: base(500 * GuiWidget.DeviceScale, 500 * GuiWidget.DeviceScale)
{
this.AlwaysOnTopOfMain = true;
this.MinimumSize = new Vector2(200, 200);
this.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
this.Padding = new BorderDouble(8);
this.MinimumSize = new Vector2(350 * GuiWidget.DeviceScale, 400 * GuiWidget.DeviceScale);
this.ShowAsSystemWindow();
}
public static void Close(Type type)
@ -47,16 +42,40 @@ namespace MatterHackers.MatterControl
{
WizardWindow wizardWindow = GetWindow(typeof(PanelType));
var newPanel = wizardWindow.ChangeToPage<PanelType>();
wizardWindow.Title = newPanel.WindowTitle;
wizardWindow.Title = newPanel.WindowTitle;
SetSizeAndShow(wizardWindow, newPanel);
}
public static void Show(WizardPage wizardPage)
{
WizardWindow wizardWindow = GetWindow(wizardPage.GetType());
wizardWindow.Title = wizardPage.WindowTitle;
SetSizeAndShow(wizardWindow, wizardPage);
wizardWindow.ChangeToPage(wizardPage);
}
WizardPage activePage;
// Allow the WizardPage MinimumSize to override our MinimumSize
public override Vector2 MinimumSize
{
get => activePage?.MinimumSize ?? base.MinimumSize;
set => base.MinimumSize = value;
}
public static void SetSizeAndShow(WizardWindow wizardWindow, WizardPage wizardPage)
{
if (wizardPage.WindowSize != Vector2.Zero)
{
wizardWindow.Size = wizardPage.WindowSize;
}
wizardWindow.ShowAsSystemWindow();
}
public static void ShowPrinterSetup(bool userRequestedNewPrinter = false)
{
WizardWindow wizardWindow = GetWindow(typeof(SetupStepComPortOne));
@ -160,6 +179,8 @@ namespace MatterHackers.MatterControl
internal void ChangeToPage(WizardPage pageToChangeTo)
{
activePage = pageToChangeTo;
pageToChangeTo.WizardWindow = this;
this.CloseAllChildren();
this.AddChild(pageToChangeTo);

2
Tests/MatterControl.AutomationTests/LibraryDownloadsTest.cs
View file

@ -200,7 +200,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Create Folder From Library Button");
testRunner.Delay(2);
testRunner.Type(newFolderName);
testRunner.ClickByName("Create Folder Button");
testRunner.ClickByName("InputBoxPage Action Button");
testRunner.Delay(2);
Assert.IsTrue(testRunner.WaitForName(newFolderName + " Row Item Collection", 2), $"{newFolderName} exists");

4
Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
View file

@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Type("New Folder");
testRunner.Delay(.5);
testRunner.ClickByName("Create Folder Button");
testRunner.ClickByName("InputBoxPage Action Button");
testRunner.Delay(.2);
// Confirm newly created folder exists
@ -133,7 +133,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Delay(.5);
testRunner.Type("Renamed Library Folder");
testRunner.ClickByName("Rename Button");
testRunner.ClickByName("InputBoxPage Action Button");
testRunner.Delay(.2);
// Make sure the renamed Library Folder exists

2
Tests/MatterControl.Tests/MatterControl/PerformanceTests.cs
View file

@ -206,7 +206,7 @@ namespace MatterHackers.MatterControl
testRunner.ClickByName("Create Folder From Library Button");
testRunner.Delay(2);
testRunner.Type("New Folder");
testRunner.ClickByName("Create Folder Button");
testRunner.ClickByName("InputBoxPage Action Button");
testRunner.ClickByName("Library Edit Button");
testRunner.ClickByName("Row Item New Folder");