Skip to content

Commit

Permalink
Fix cylinder layout (#578)
Browse files Browse the repository at this point in the history 
* *fixed wraping in cylinder service header

* update package  ivf to 2.0.0
  • Loading branch information
@peterbarancek
peterbarancek authored Jan 30, 2023
1 parent 45ea2b0 commit 7be9a58
Show file tree
Hide file tree
Showing 32 changed files with 140 additions and 123 deletions.
140 changes: 85 additions & 55 deletions TcOpen.sln
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Tc.Prober/src/Tc.Prober/Tc.Prober.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<None Include="Assets\TcOpenLogo128.png">
Expand Down
2 changes: 1 addition & 1 deletion src/Tc.Prober/tests/PlcTcProberTestsConnector/PlcTcProberTestsConnector.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<None Remove="_generated\PlcTcProberTests\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Localizations.Designer.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/Tc.Prober/tests/Tc.ProberTest/Tc.ProberTest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
<PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="JunitXml.TestLogger" Version="2.1.10" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/PlcHammer.Hmi.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.4" />
Expand Down
6 changes: 1 addition & 5 deletions src/TcOpen.Hammer/TcOpenHammer/TcOpenHammer/TcOpenHammer.tsproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.22">
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.25">
<DataTypes>
<DataType>
<Name GUID="{18071995-0000-0000-0000-000000000035}" TcBaseType="true" HideType="true">UINTARR2</Name>
Expand Down Expand Up @@ -1454,7 +1454,6 @@ External Setpoint Generation:
<Var>
<Name>In</Name>
<Type GUID="{901C2423-655B-45CE-B7E3-21F174F0F99F}" Namespace="MC">NCENCODERSTRUCT_IN2B</Type>
<BitOffs>1024</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataIn1</Name>
</SubVar>
Expand Down Expand Up @@ -1485,7 +1484,6 @@ External Setpoint Generation:
<Var>
<Name>Out</Name>
<Type GUID="{9CC50AB2-5D79-4869-A3C2-1FA7761BAFEA}" Namespace="MC">NCENCODERSTRUCT_OUT2</Type>
<BitOffs>2048</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataOut1</Name>
</SubVar>
Expand Down Expand Up @@ -1517,7 +1515,6 @@ External Setpoint Generation:
<Var>
<Name>In</Name>
<Type GUID="{F95C7C69-0C87-46C4-9559-1285CCA5B23A}" Namespace="MC">NCDRIVESTRUCT_IN2</Type>
<BitOffs>1344</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataIn1</Name>
</SubVar>
Expand All @@ -1543,7 +1540,6 @@ External Setpoint Generation:
<Var>
<Name>Out</Name>
<Type GUID="{644DC4BD-3D15-4DCB-94C7-24F3A5D579AA}" Namespace="MC">NCDRIVESTRUCT_OUT2</Type>
<BitOffs>2368</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataOut1</Name>
</SubVar>
Expand Down
2 changes: 1 addition & 1 deletion src/TcOpen.Inxton/src/Abstractions/TcOpen.Inxton.Abstractions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.7" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TcOpen.Inxton/src/Application/TcOpen.Inxton.App.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TcOpen.Inxton/src/TcOpen.Inxton.Wpf/TcOpen.Inxton.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Abstractions\TcOpen.Inxton.Abstractions.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/TcOpen.Inxton/src/TcOpen.Inxton/TcOpen.Inxton.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Core" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Core" Version="2.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcOpen.Inxton.TcoCore.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
<PackageReference Include="Blazm.Components" Version="1.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.17" />
Expand Down
2 changes: 1 addition & 1 deletion src/TcoCore/src/TcoCore.Wpf/TcOpen.Inxton.TcoCore.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/TcoCore/src/TcoCore.Wpf/TcoComponent/TcoComponentServiceView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
<RowDefinition Height="Auto"/>
<RowDefinition />
</Grid.RowDefinitions>
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" HorizontalAlignment="Right" ItemsSource="{Binding Tasks}">
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" HorizontalAlignment="Left" ItemsSource="{Binding Tasks}">

<ItemsControl.ItemTemplate>
<DataTemplate>
<vortex:RenderableContentControl DataContext="{Binding}" Margin="5"></vortex:RenderableContentControl>
<DataTemplate>
<vortex:RenderableContentControl MinWidth="150" DataContext="{Binding}" Margin="5"></vortex:RenderableContentControl>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
Expand Down
4 changes: 2 additions & 2 deletions src/TcoCore/src/TcoCoreConnector/TcoCoreConnector.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<DefineConstants>PLC_DOCU</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.vortex.compiler.console" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
<PackageReference Include="Inxton.vortex.compiler.console" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<Content Include="_meta\TcoCore.library" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
Expand Down
2 changes: 1 addition & 1 deletion src/TcoCore/tests/TcoDummyTest/TcoDummyTest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Inxton.vortex.compiler.console" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.vortex.compiler.console" Version="2.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/TcoData/src/Blazor/TcOpen.Inxton.Data.Blazor/TcOpen.Inxton.Data.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.17" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TcoData/src/Wpf/TcoData.Wpf/TcOpen.Inxton.Data.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
<ProjectReference Include="..\..\..\..\TcOpen.Inxton\src\TcOpen.Inxton.Wpf\TcOpen.Inxton.Wpf.csproj" />
<ProjectReference Include="..\..\TcoDataConnector\TcoDataConnector.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion .../src/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcOpen.Inxton.TcoDrivesBeckhoff.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TcoElements/src/TcOpen.Inxton.TcoElements.Blazor/TcOpen.Inxton.TcoElements.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...s/src/Blazor/TcOpen.Inxton.TcoInspectors.Blazor/TcOpen.Inxton.TcoInspectors.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.17" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TcoIo/src/TcoIoConnector/TcoIoConnector.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PackageReference Include="Inxton.iXlinker" Version="0.1.4-alpha.100">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TcoCore\src\TcoCoreConnector\TcoCoreConnector.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/TcoIo/src/Wpf/TcOpen.Inxton.TcoIo.Wpf/TcOpen.Inxton.TcoIo.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...eumatics/src/TcOpen.Inxton.TcoPneumatics.Blazor/TcOpen.Inxton.TcoPneumatics.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
</ItemGroup>

Expand Down
21 changes: 7 additions & 14 deletions src/TcoPneumatics/src/TcoPneumatics.Wpf/Cylinders/TcoCylinderServiceView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,16 @@
<d:UserControl.DataContext>
<tcopneumatics:TcoCylinderServiceViewModel />
</d:UserControl.DataContext>
<UserControl.Resources>
<ItemsPanelTemplate x:Key="HorizontalWraped">
<WrapPanel Background="Transparent" Width="{Binding (FrameworkElement.ActualWidth) , RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}" MinWidth="{Binding ItemWidth , RelativeSource={RelativeSource Self}}" ItemHeight="{Binding (ListView.View).ItemHeight , RelativeSource={RelativeSource AncestorType=ListView}}" ItemWidth="{Binding (ListView.View).ItemWidth , RelativeSource={RelativeSource AncestorType=ListView}}" />
</ItemsPanelTemplate>

</UserControl.Resources>
<vortex:TcoComponentView >
<vortex:TcoComponentView.ComponentHeader>

<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" HorizontalAlignment="Right" DataContext="{Binding Model}" >
<ItemsControl.Resources>
<WrapPanel HorizontalAlignment="Left" DataContext="{Binding Model}" >
<WrapPanel.Resources>
<Style TargetType="StackPanel">
<Setter Property="MinWidth" Value="250"></Setter>
<Setter Property="MinWidth" Value="200"></Setter>
</Style>
</ItemsControl.Resources>
</WrapPanel.Resources>
<StackPanel>
<Border
Height="5"
Expand All @@ -48,15 +43,14 @@
CornerRadius="2" />
<vortex:RenderableContentControl DataContext="{Binding _moveWorkDefault}"/>
</StackPanel>
</ItemsControl>
</WrapPanel>
</vortex:TcoComponentView.ComponentHeader>
<vortex:TcoComponentView.ComponentDetails >
<ScrollViewer MaxHeight="200" DataContext="{Binding Model}">
<StackPanel Orientation="Vertical">
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" >
<ItemsControl >
<ItemsControl.Resources>
<Style TargetType="StackPanel">
<Setter Property="MinWidth" Value="250"></Setter>
<Setter Property="MinWidth" Value="200"></Setter>
<Setter Property="Margin" Value="10"></Setter>

</Style>
Expand All @@ -73,7 +67,6 @@


</ItemsControl>
</StackPanel>
</ScrollViewer>
</vortex:TcoComponentView.ComponentDetails>
</vortex:TcoComponentView>
Expand Down
24 changes: 8 additions & 16 deletions src/TcoPneumatics/src/TcoPneumatics.Wpf/Cylinders/TcoDoubleCylinderServiceView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,16 @@
<d:UserControl.DataContext>
<tcopneumatics:TcoDoubleCylinderServiceViewModel />
</d:UserControl.DataContext>
<UserControl.Resources>
<ItemsPanelTemplate x:Key="HorizontalWraped">
<WrapPanel Background="Transparent" Width="{Binding (FrameworkElement.ActualWidth) , RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}" MinWidth="{Binding ItemWidth , RelativeSource={RelativeSource Self}}" ItemHeight="{Binding (ListView.View).ItemHeight , RelativeSource={RelativeSource AncestorType=ListView}}" ItemWidth="{Binding (ListView.View).ItemWidth , RelativeSource={RelativeSource AncestorType=ListView}}" />
</ItemsPanelTemplate>

</UserControl.Resources>
<vortex:TcoComponentView>
<vortex:TcoComponentView.ComponentHeader>

<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" HorizontalAlignment="Right" DataContext="{Binding Model}" >
<ItemsControl.Resources>
<WrapPanel HorizontalAlignment="Left" DataContext="{Binding Model}" >
<WrapPanel.Resources>
<Style TargetType="StackPanel">
<Setter Property="MinWidth" Value="250"></Setter>
<Setter Property="MinWidth" Value="200"></Setter>
</Style>
</ItemsControl.Resources>
</WrapPanel.Resources>
<StackPanel>
<Border
Height="5"
Expand All @@ -48,15 +43,15 @@
CornerRadius="2" />
<vortex:RenderableContentControl DataContext="{Binding _moveWorkDefault}"/>
</StackPanel>
</ItemsControl>
</WrapPanel>
</vortex:TcoComponentView.ComponentHeader>
<vortex:TcoComponentView.ComponentDetails >
<ScrollViewer MaxHeight="200" DataContext="{Binding Model}">
<StackPanel Orientation="Vertical">
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" >

<ItemsControl >
<ItemsControl.Resources>
<Style TargetType="StackPanel">
<Setter Property="MinWidth" Value="250"></Setter>
<Setter Property="MinWidth" Value="200"></Setter>
<Setter Property="Margin" Value="10"></Setter>

</Style>
Expand All @@ -72,10 +67,7 @@
<tcoCore:TcoSignalInfoView DataContext="{Binding _toWorkPosSignalInfo}"></tcoCore:TcoSignalInfoView>
</StackPanel>



</ItemsControl>
</StackPanel>
</ScrollViewer>
</vortex:TcoComponentView.ComponentDetails>
</vortex:TcoComponentView>
Expand Down
2 changes: 1 addition & 1 deletion src/TcoPneumatics/src/TcoPneumatics.Wpf/TcOpen.Inxton.TcoPneumatics.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TcoPneumatics/src/TcoPneumaticsConnector/TcoPneumaticsConnector.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<Content Include="_meta\version.info" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TcoCore\src\TcoCoreConnector\TcoCoreConnector.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/TcoPneumatics/tests/Sandbox/PlcOpen.Wpf.Sandbox/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
PrimaryColor="BlueGrey"
SecondaryColor="LightGreen" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
<ResourceDictionary Source="pack://application:,,,/Vortex.Presentation.Styling.Wpf;component/VortexStyle.xaml" />
<ResourceDictionary Source="pack://application:,,,/Vortex.Presentation.Styling.Wpf;component/MDOverrides.xaml" />
<!--<ResourceDictionary Source="pack://application:,,,/Vortex.Presentation.Styling.Wpf;component/VortexStyle.xaml" />
<ResourceDictionary Source="pack://application:,,,/Vortex.Presentation.Styling.Wpf;component/MDOverrides.xaml" />-->
</ResourceDictionary.MergedDictionaries>
<!--<Color x:Key="MtsGreenColor">#FF20A024</Color>
<Color x:Key="MtsYellowColor">#FFFFD917</Color>
Expand Down
Loading

0 comments on commit 7be9a58

Please sign in to comment.