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

Change typename to reflect new shared platform role

Browse source
This commit is contained in:
John Lewin 2017-12-18 17:27:28 -08:00
parent 6441cc92bd
commit 5bbe550539
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ApplicationView/ApplicationController.cs
View file

@ -1514,7 +1514,7 @@ namespace MatterHackers.MatterControl
{
timer = Stopwatch.StartNew();
var systemWindow = new DesktopRootSystemWindow(width, height)
var systemWindow = new RootSystemWindow(width, height)
{
BackgroundColor = Color.DarkGray
};

2
ApplicationView/WindowsPlatformsFeatures.cs
View file

@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl
break;
case "SHOW_MEMORY":
DesktopRootSystemWindow.ShowMemoryUsed = true;
RootSystemWindow.ShowMemoryUsed = true;
break;
}
}

2
MatterControl.csproj
View file

@ -83,7 +83,6 @@
<Compile Include="ActionBar\TemperatureWidgetBed.cs" />
<Compile Include="ApplicationView\OemProfileDictionary.cs" />
<Compile Include="ApplicationView\WindowsPlatformsFeatures.cs" />
<Compile Include="DesktopRootSystemWindow.cs" />
<Compile Include="PartPreviewWindow\View3D\PrinterBar\PrintPopupMenu.cs" />
<Compile Include="PartPreviewWindow\View3D\PrinterBar\SliceButton.cs" />
<Compile Include="PartPreviewWindow\View3D\PrinterBar\PrinterConnectButton.cs" />
@ -152,6 +151,7 @@
<Compile Include="PrinterControls\MacroDetailPage.cs" />
<Compile Include="PrinterControls\MacroListPage.cs" />
<Compile Include="PrinterControls\PrinterConnections\PrinterSetup.cs" />
<Compile Include="RootSystemWindow.cs" />
<Compile Include="SetupWizard\DialogWindow.cs" />
<Compile Include="Utilities\InspectForm.cs" Condition="'$(Configuration)' == 'Debug'">
<SubType>Form</SubType>

2
Program.cs
View file

@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl
// Get startup bounds from MatterControl and construct system window
//var systemWindow = new DesktopMainWindow(400, 200)
var (width, height) = DesktopRootSystemWindow.GetStartupBounds();
var (width, height) = RootSystemWindow.GetStartupBounds();
Application.LoadRootWindow(width, height);
}

4
DesktopRootSystemWindow.cs → RootSystemWindow.cs
View file

@ -44,7 +44,7 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{
public class DesktopRootSystemWindow : SystemWindow
public class RootSystemWindow : SystemWindow
{
private static Vector2 minSize { get; set; } = new Vector2(600, 600);
@ -60,7 +60,7 @@ namespace MatterHackers.MatterControl
private bool exitDialogOpen = false;
public DesktopRootSystemWindow(double width, double height)
public RootSystemWindow(double width, double height)
: base(width, height)
{
this.Name = "MatterControl";

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

@ -592,7 +592,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
AutomationRunner.TimeToMoveMouse = config.TimeToMoveMouse;
AutomationRunner.UpDelaySeconds = config.MouseUpDelay;
rootSystemWindow = new DesktopRootSystemWindow(overrideWidth, overrideHeight);
rootSystemWindow = new RootSystemWindow(overrideWidth, overrideHeight);
await AutomationRunner.ShowWindowAndExecuteTests(
rootSystemWindow,