claudio/wpf_ax_utility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added copyalways to ico, changed mainwindow layout to stretch on resize

Browse Source
This commit is contained in:
PAL\dc
2022-03-09 14:11:21 +01:00
parent 8e08f03bf3
commit 7c78765d5c
2 changed files with 81 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wpf_ax_utility/MainWindow.xaml
+50 -26
View File
@@ -28,7 +28,16 @@
<Grid> <Grid>
<Border BorderBrush="#0082C4" BorderThickness="1.5" CornerRadius="10" Background="White"> <Border BorderBrush="#0082C4" BorderThickness="1.5" CornerRadius="10" Background="White">
<StackPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<DockPanel> <DockPanel>
<Border Height="25" Width="25" CornerRadius="5" Margin="2,0,0,0"> <Border Height="25" Width="25" CornerRadius="5" Margin="2,0,0,0">
<Border.Background> <Border.Background>
@@ -48,63 +57,78 @@
<TextBlock Text="x" Margin="0,-5,0,0"/> <TextBlock Text="x" Margin="0,-5,0,0"/>
</Button> </Button>
</DockPanel> </DockPanel>
<GroupBox Margin="15,5,15,10"
VerticalAlignment="Center" <GroupBox Margin="10,2,10,10"
VerticalAlignment="Stretch"
BorderBrush="LightGray" BorderBrush="LightGray"
BorderThickness="1" BorderThickness="1"
Header="Ambienti"> Header="Ambienti"
<StackPanel Name="LayoutRoot" Grid.Row="1">
VerticalAlignment="Center" <Grid>
Margin="5,5,5,5"> <Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="60" />
</Grid.RowDefinitions>
<Button Style="{StaticResource TabButton}" <Button Style="{StaticResource TabButton}"
x:Name="LIVE" x:Name="LIVE"
Click="ButtonClicked" Click="ButtonClicked"
Height="115" Width="325" Margin="5"
Content="LIVE" Content="LIVE"
FontSize="36" FontSize="36"
Background="LightGray"/> Background="LightGray"
<DockPanel HorizontalAlignment="Center" Grid.ColumnSpan="4" />
Margin="0,10,0,0">
<Button Style="{StaticResource TabButton}" <Button Style="{StaticResource TabButton}"
x:Name="LIVE02" x:Name="LIVE02"
Click="ButtonClicked" Click="ButtonClicked"
Height="45" Width="75" Margin="5"
Margin="0,0,5,0"
Content="LIVE 02" Content="LIVE 02"
FontSize="16" FontSize="16"
FontWeight="DemiBold" FontWeight="DemiBold"
Background="LightGray"/> Background="LightGray"
Grid.Row="1"/>
<Button Style="{StaticResource TabButton}" <Button Style="{StaticResource TabButton}"
x:Name="DEV" x:Name="DEV"
Click="ButtonClicked" Click="ButtonClicked"
Height="45" Width="75" Margin="5"
Margin="0,0,5,0"
Content="DEV" Content="DEV"
FontSize="16" FontSize="16"
FontWeight="DemiBold" FontWeight="DemiBold"
Background="#00FF80"/> Background="#00FF80"
Grid.Row="1"
Grid.Column="1"/>
<Button Style="{StaticResource TabButton}" <Button Style="{StaticResource TabButton}"
x:Name="TEST" x:Name="TEST"
Click="ButtonClicked" Click="ButtonClicked"
Height="45" Width="75" Margin="5"
Margin="5,0,5,0"
Content="TEST" Content="TEST"
FontSize="16" FontSize="16"
FontWeight="DemiBold" FontWeight="DemiBold"
Background="#8080FF"/> Background="#8080FF"
Grid.Row="1"
Grid.Column="2"/>
<Button Style="{StaticResource TabButton}" <Button Style="{StaticResource TabButton}"
x:Name="STAGING" x:Name="STAGING"
Click="ButtonClicked" Click="ButtonClicked"
Height="45" Width="75" Margin="5"
Margin="5,0,0,0"
Content="STAGING" Content="STAGING"
FontSize="16" FontSize="16"
FontWeight="DemiBold" FontWeight="DemiBold"
Background="#FFFF00"/> Background="#FFFF00"
</DockPanel> Grid.Row="1"
</StackPanel> Grid.Column="3"/>
</Grid>
</GroupBox> </GroupBox>
</StackPanel> </Grid>
</Border> </Border>
</Grid> </Grid>
</Window> </Window>
wpf_ax_utility/wpf_ax_utility.csproj
+7
View File
@@ -5,6 +5,7 @@
<TargetFramework>net6.0-windows</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<ApplicationIcon>axlogo.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -13,6 +14,12 @@
<None Remove="rdrect1197.png" /> <None Remove="rdrect1197.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="axlogo.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog" Version="2.10.0" /> <PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Graylog" Version="2.3.0" /> <PackageReference Include="Serilog.Sinks.Graylog" Version="2.3.0" />