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

improving svg, refactoring, updating nuget

Browse source
This commit is contained in:
Lars Brubaker 2022-10-20 10:53:25 -07:00
parent c4b5333628
commit e3755724c4
12 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Launcher/Launcher.csproj
View file

@ -8,7 +8,7 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

2
MatterControl.Printing/MatterControl.Printing.csproj
View file

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Include="System.IO.Ports" Version="7.0.0-preview.5.22301.12" />
</ItemGroup>

2
MatterControl.SLA/MatterControl.SLA.csproj
View file

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
</ItemGroup>
<ItemGroup>

2
MatterControl.Winforms/MatterControl.Winforms.csproj
View file

@ -28,7 +28,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

2
MatterControl.csproj
View file

@ -103,7 +103,7 @@
<Version>1.0.2-beta1</Version>
</PackageReference>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.IO.Ports" Version="7.0.0-preview.5.22301.12" />

8
MatterControlLib/DialogPages/StartupPage.cs
View file

@ -103,12 +103,14 @@ namespace MatterHackers.MatterControl
var wordWidth = bounds.Width * .8;
graphics = pulseImage.NewGraphics2D();
graphics.ImageRenderQuality = Graphics2D.TransformQuality.Best;
graphics.RenderMaxSize(pulseWord, pulseImage.Width / 2 - wordWidth / 2, margin, wordWidth, bounds.Height, out _);
graphics.RenderMaxSize(pulseWord, new Vector2(pulseImage.Width / 2 - wordWidth / 2, margin), new Vector2(wordWidth, bounds.Height));
var pulseLogo = StaticData.Instance.LoadIcon("pulse_logo.png").SetToColor(theme.TextColor);
var logoWidth = bounds.Width * .5;
graphics = pulseImage.NewGraphics2D();
graphics.ImageRenderQuality = Graphics2D.TransformQuality.Best;
graphics.RenderMaxSize(pulseLogo, pulseImage.Width / 2 - logoWidth / 2, pulseImage.Height * .42, logoWidth, bounds.Height, out _, preScale: false);
graphics.RenderMaxSize(pulseLogo,
new Vector2(pulseImage.Width / 2 - logoWidth / 2, pulseImage.Height * .42),
new Vector2(logoWidth, bounds.Height));
ThemedIconButton lastButton = null;
buttonRow.AddChild(AddButtonText(lastButton = new ThemedIconButton(pulseImage, theme)
{
@ -130,7 +132,7 @@ namespace MatterHackers.MatterControl
var imageWidth = bounds.Width * .8;
var printerIcon = StaticData.Instance.LoadIcon(iconFile).CropToVisible().SetToColor(theme.TextColor);
var offset = pulseImage.Width / 2 - imageWidth / 2;
graphics.RenderMaxSize(printerIcon, offset, offset, imageWidth, bounds.Height, out _);
graphics.RenderMaxSize(printerIcon, new Vector2(offset, offset), new Vector2(imageWidth, bounds.Height));
return printerImage;
}

2
MatterControlLib/MatterControlLib.csproj
View file

@ -112,7 +112,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
</ItemGroup>
<ItemGroup>

2
PrinterDriverInstaller/InfInstaller.csproj
View file

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit ecc289e5b6d9f43be6a0d1bd2d0d7ca4ada1cf33
Subproject commit 7e79fdb5d6d0ff90eb5d24f84716c62e5fb048df

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 8d9c41fda05ae25a84ba5e3483255fb4b4f040b4
Subproject commit fd09e961bc6c5d5c104cc093ef303fd591b960f2

4
Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
View file

@ -14,11 +14,11 @@
<Authors>$(AssemblyName)</Authors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

4
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

@ -39,11 +39,11 @@
<ProjectReference Include="..\..\Submodules\MatterSlice\MatterSliceLib\MatterSliceLib.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>