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

Rename PartPreviewWidget -> MainViewWidget

Browse source 
- Consolidate AppView:MainView
This commit is contained in:
John Lewin 2018-10-30 14:02:50 -07:00
parent 6659156926
commit a2cd257293
8 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/Library/Widgets/HardwarePage/HardwareTabPage.cs
View file

@ -85,10 +85,10 @@ namespace MatterHackers.MatterControl.PrintLibrary
if (treeView?.SelectedNode.Tag is PrinterInfo printerInfo)
{
if (ApplicationController.Instance.ActivePrinters.FirstOrDefault(p => p.Settings.ID == printerInfo.ID) is PrinterConfig printer
&& ApplicationController.Instance.AppView.TabControl.AllTabs.FirstOrDefault(t => t.TabContent is PrinterTabPage printerTabPage && printerTabPage.printer == printer) is ITab tab)
&& ApplicationController.Instance.MainView.TabControl.AllTabs.FirstOrDefault(t => t.TabContent is PrinterTabPage printerTabPage && printerTabPage.printer == printer) is ITab tab)
{
// Switch to existing printer tab
ApplicationController.Instance.AppView.TabControl.ActiveTab = tab;
ApplicationController.Instance.MainView.TabControl.ActiveTab = tab;
}
else
{

16
MatterControlLib/Library/Widgets/LibraryWidget.cs
View file

@ -59,16 +59,16 @@ namespace MatterHackers.MatterControl.PrintLibrary
private GuiWidget searchInput;
private ILibraryContainer searchContainer;
private PartPreviewContent partPreviewContent;
private MainViewWidget mainViewWidget;
private ThemeConfig theme;
private OverflowBar navBar;
private GuiWidget searchButton;
private TreeView treeView;
public LibraryWidget(PartPreviewContent partPreviewContent, ThemeConfig theme)
public LibraryWidget(MainViewWidget mainViewWidget, ThemeConfig theme)
{
this.theme = theme;
this.partPreviewContent = partPreviewContent;
this.mainViewWidget = mainViewWidget;
this.Padding = 0;
this.AnchorAll();
@ -568,7 +568,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
providerMessageContainer.AddChild(providerMessageWidget);
}
public static void CreateMenuActions(LibraryListView libraryView, List<LibraryAction> menuActions, PartPreviewContent partPreviewContent, ThemeConfig theme, bool allowPrint)
public static void CreateMenuActions(LibraryListView libraryView, List<LibraryAction> menuActions, MainViewWidget mainViewWidget, ThemeConfig theme, bool allowPrint)
{
menuActions.Add(new LibraryAction(ActionScope.ListView)
{
@ -692,7 +692,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
Icon = AggContext.StaticData.LoadIcon("cube.png", 16, 16, theme.InvertIcons),
Action = (selectedLibraryItems, listView) =>
{
ApplicationController.Instance.AppView.CreatePartTab().ContinueWith(task =>
ApplicationController.Instance.MainView.CreatePartTab().ContinueWith(task =>
{
var workspace = ApplicationController.Instance.Workspaces.Last();
workspace.SceneContext.AddToPlate(selectedLibraryItems);
@ -735,7 +735,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
}
ApplicationController.Instance.BlinkTab(
ApplicationController.Instance.AppView.TabControl.AllTabs.FirstOrDefault(t => t.TabContent is PrinterTabPage));
ApplicationController.Instance.MainView.TabControl.AllTabs.FirstOrDefault(t => t.TabContent is PrinterTabPage));
},
IsEnabled = (selectedListItems, listView) =>
{
@ -763,7 +763,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
ApplicationController.Instance.Workspaces.Add(workspace);
partPreviewContent.CreatePartTab(workspace);
mainViewWidget.CreatePartTab(workspace);
// Load content after UI widgets to support progress notification during acquire/load
await workspace.SceneContext.LoadContent(
@ -1087,7 +1087,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
public override void OnLoad(EventArgs args)
{
// Defer creating menu items until plugins have loaded
LibraryWidget.CreateMenuActions(libraryView, menuActions, partPreviewContent, theme, allowPrint: false);
LibraryWidget.CreateMenuActions(libraryView, menuActions, mainViewWidget, theme, allowPrint: false);
navBar.OverflowButton.Name = "Print Library Overflow Menu";
navBar.ExtendOverflowMenu = (popupMenu) =>

8
MatterControlLib/Library/Widgets/PrintLibraryWidget.cs
View file

@ -63,15 +63,15 @@ namespace MatterHackers.MatterControl.PrintLibrary
private GuiWidget searchInput;
private ILibraryContainer searchContainer;
private PartPreviewContent partPreviewContent;
private MainViewWidget mainViewWidget;
private ThemeConfig theme;
private OverflowBar navBar;
private GuiWidget searchButton;
public PrintLibraryWidget(PartPreviewContent partPreviewContent, ThemeConfig theme, PopupMenuButton popupMenuButton)
public PrintLibraryWidget(MainViewWidget mainViewWidget, ThemeConfig theme, PopupMenuButton popupMenuButton)
{
this.theme = theme;
this.partPreviewContent = partPreviewContent;
this.mainViewWidget = mainViewWidget;
this.Padding = 0;
this.AnchorAll();
@ -477,7 +477,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
public override void OnLoad(EventArgs args)
{
// Defer creating menu items until plugins have loaded
LibraryWidget.CreateMenuActions(libraryView, menuActions, partPreviewContent, theme, allowPrint: true);
LibraryWidget.CreateMenuActions(libraryView, menuActions, mainViewWidget, theme, allowPrint: true);
navBar.OverflowButton.Name = "Print Library Overflow Menu";
navBar.ExtendOverflowMenu = (popupMenu) =>

2
MatterControlLib/Library/Widgets/StorePage/StoreTabPage.cs
View file

@ -36,7 +36,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
{
public class StoreTabPage : ScrollableWidget
{
public StoreTabPage(PartPreviewContent partPreviewContent, ThemeConfig theme)
public StoreTabPage(ThemeConfig theme)
{
this.AutoScroll = true;
this.ScrollArea.Padding = new BorderDouble(3);