Enlarge config dialog and refine layout without scrolling
This commit is contained in:
@@ -7,11 +7,13 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
Title="Konfiguration © Copyright"
|
Title="Konfiguration © Copyright"
|
||||||
Height="410"
|
Height="540"
|
||||||
Width="760"
|
Width="840"
|
||||||
MinHeight="410"
|
MinHeight="540"
|
||||||
MinWidth="760"
|
MinWidth="840"
|
||||||
ResizeMode="NoResize"
|
ResizeMode="NoResize"
|
||||||
|
UseLayoutRounding="True"
|
||||||
|
SnapsToDevicePixels="True"
|
||||||
Background="{DynamicResource backgroundColor}"
|
Background="{DynamicResource backgroundColor}"
|
||||||
Icon="/Customer Panel;component/Resources/icons/logo_CustomerPanel.ico">
|
Icon="/Customer Panel;component/Resources/icons/logo_CustomerPanel.ico">
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
@@ -22,7 +24,9 @@
|
|||||||
<Setter Property="FontSize"
|
<Setter Property="FontSize"
|
||||||
Value="14" />
|
Value="14" />
|
||||||
<Setter Property="FontWeight"
|
<Setter Property="FontWeight"
|
||||||
Value="SemiBold" />
|
Value="Medium" />
|
||||||
|
<Setter Property="TextWrapping"
|
||||||
|
Value="Wrap" />
|
||||||
<Setter Property="VerticalAlignment"
|
<Setter Property="VerticalAlignment"
|
||||||
Value="Center" />
|
Value="Center" />
|
||||||
</Style>
|
</Style>
|
||||||
@@ -31,13 +35,13 @@
|
|||||||
<Setter Property="Background"
|
<Setter Property="Background"
|
||||||
Value="{DynamicResource inputBackgroundColor}" />
|
Value="{DynamicResource inputBackgroundColor}" />
|
||||||
<Setter Property="BorderBrush"
|
<Setter Property="BorderBrush"
|
||||||
Value="{DynamicResource panelBorderColor}" />
|
Value="{DynamicResource inputBorderColor}" />
|
||||||
<Setter Property="BorderThickness"
|
<Setter Property="BorderThickness"
|
||||||
Value="1" />
|
Value="1" />
|
||||||
<Setter Property="CornerRadius"
|
<Setter Property="CornerRadius"
|
||||||
Value="10" />
|
Value="10" />
|
||||||
<Setter Property="Padding"
|
<Setter Property="Padding"
|
||||||
Value="12,8" />
|
Value="12,9" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style x:Key="ConfigValueTextStyle"
|
<Style x:Key="ConfigValueTextStyle"
|
||||||
TargetType="TextBlock">
|
TargetType="TextBlock">
|
||||||
@@ -53,11 +57,11 @@
|
|||||||
<Style x:Key="ConfigActionButtonStyle"
|
<Style x:Key="ConfigActionButtonStyle"
|
||||||
TargetType="Button">
|
TargetType="Button">
|
||||||
<Setter Property="Foreground"
|
<Setter Property="Foreground"
|
||||||
Value="{DynamicResource buttonTextColor}" />
|
Value="{DynamicResource navForeground}" />
|
||||||
<Setter Property="Background"
|
<Setter Property="Background"
|
||||||
Value="{DynamicResource inactiveButtonColor}" />
|
Value="{DynamicResource panelBackgroundColor}" />
|
||||||
<Setter Property="BorderBrush"
|
<Setter Property="BorderBrush"
|
||||||
Value="{DynamicResource panelBorderColor}" />
|
Value="{DynamicResource inputBorderColor}" />
|
||||||
<Setter Property="BorderThickness"
|
<Setter Property="BorderThickness"
|
||||||
Value="1" />
|
Value="1" />
|
||||||
<Setter Property="Padding"
|
<Setter Property="Padding"
|
||||||
@@ -81,15 +85,18 @@
|
|||||||
Value="True">
|
Value="True">
|
||||||
<Setter TargetName="ButtonBorder"
|
<Setter TargetName="ButtonBorder"
|
||||||
Property="Background"
|
Property="Background"
|
||||||
Value="{DynamicResource activeButtonColor}" />
|
Value="{DynamicResource inactiveButtonColor}" />
|
||||||
|
<Setter TargetName="ButtonBorder"
|
||||||
|
Property="BorderBrush"
|
||||||
|
Value="{DynamicResource itemHoverBorderColor}" />
|
||||||
<Setter Property="Foreground"
|
<Setter Property="Foreground"
|
||||||
Value="White" />
|
Value="{DynamicResource navForeground}" />
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsPressed"
|
<Trigger Property="IsPressed"
|
||||||
Value="True">
|
Value="True">
|
||||||
<Setter TargetName="ButtonBorder"
|
<Setter TargetName="ButtonBorder"
|
||||||
Property="Opacity"
|
Property="Opacity"
|
||||||
Value="0.9" />
|
Value="0.94" />
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
@@ -98,17 +105,17 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
|
|
||||||
<Grid Margin="16">
|
<Grid Margin="14">
|
||||||
<Border CornerRadius="16"
|
<Border CornerRadius="18"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
BorderBrush="{DynamicResource panelBorderColor}"
|
BorderBrush="{DynamicResource panelBorderColor}"
|
||||||
Background="{DynamicResource panelBackgroundColor}">
|
Background="{DynamicResource panelBackgroundColor}">
|
||||||
<Grid Margin="20">
|
<Grid Margin="22">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="16" />
|
<RowDefinition Height="14" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
<RowDefinition Height="16" />
|
<RowDefinition Height="14" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
@@ -125,19 +132,20 @@
|
|||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
<TextBlock Text="Aktuelle Verbindungs- und Aktualisierungswerte"
|
<TextBlock Text="Aktuelle Verbindungs- und Aktualisierungswerte"
|
||||||
Foreground="{DynamicResource navForeground}"
|
Foreground="{DynamicResource navForeground}"
|
||||||
Opacity="0.75"
|
Opacity="0.72"
|
||||||
Margin="0,4,0,0" />
|
Margin="0,4,0,0" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Image Grid.Column="1"
|
<Image Grid.Column="1"
|
||||||
Width="140"
|
Width="150"
|
||||||
Height="38"
|
Height="40"
|
||||||
Margin="16,0,0,0"
|
Margin="16,0,0,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Stretch="Uniform"
|
Stretch="Uniform"
|
||||||
Source="/Customer Panel;component/Resources/consulting4it-header1.png" />
|
Source="/Customer Panel;component/Resources/consulting4it-header1.png" />
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid Grid.Row="2">
|
<Grid Grid.Row="2"
|
||||||
|
Margin="0,0,4,0">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="12" />
|
<RowDefinition Height="12" />
|
||||||
@@ -148,7 +156,7 @@
|
|||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="270" />
|
<ColumnDefinition Width="300" />
|
||||||
<ColumnDefinition Width="12" />
|
<ColumnDefinition Width="12" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
@@ -200,10 +208,10 @@
|
|||||||
|
|
||||||
<Border Grid.Row="4"
|
<Border Grid.Row="4"
|
||||||
Background="{DynamicResource inputBackgroundColor}"
|
Background="{DynamicResource inputBackgroundColor}"
|
||||||
BorderBrush="{DynamicResource panelBorderColor}"
|
BorderBrush="{DynamicResource inputBorderColor}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="10"
|
CornerRadius="10"
|
||||||
Padding="12,10">
|
Padding="12,8">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
@@ -226,6 +234,8 @@
|
|||||||
|
|
||||||
<Button Grid.Column="1"
|
<Button Grid.Column="1"
|
||||||
Content="Creative Commons"
|
Content="Creative Commons"
|
||||||
|
Height="34"
|
||||||
|
MinWidth="150"
|
||||||
Style="{StaticResource ConfigActionButtonStyle}"
|
Style="{StaticResource ConfigActionButtonStyle}"
|
||||||
Click="OnCcClicked" />
|
Click="OnCcClicked" />
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
Reference in New Issue
Block a user