Compare commits

..

4 Commits

Author SHA1 Message Date
Nicola Pievani aac0b4c33e Merge commit 'a9540db0b2dac331592ebc959d54ecd096e7440e' 2024-02-13 15:29:24 +01:00
Nicola Pievani a9540db0b2 Migliorata interfaccia OptionPanel 2024-02-13 15:29:12 +01:00
Nicola Pievani a41230f4b9 Merge commit '3ec88260c1040922ac4067863e0e6cf4fc67f4e6' into develop 2024-02-13 15:16:38 +01:00
Nicola Pievani 0d1cc18716 Merge commit 'ca0466e60f409f2f5dbe22708a721790b668b54d' 2023-08-03 19:19:27 +02:00
2 changed files with 17 additions and 2 deletions
+5 -2
View File
@@ -44,7 +44,7 @@
<UniformGrid Columns="2">
<TextBlock Text="{Binding ThicknessToleranceMsg}"/>
<EgtWPFLib5:EgtTextBox Text="{Binding ThicknessTolerance}"
Margin="13,0,0,0"
Margin="36,0,0,0"
TextAlignment="Right"/>
</UniformGrid>
</GroupBox>
@@ -58,7 +58,7 @@
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding LabelFileName}"/>
<TextBlock Text="{Binding LabelFileName}" VerticalAlignment="Center"/>
<Button Content="{Binding BrowseMsg}" Grid.Column="1"
Command="{Binding BrowseCommand}"
Style="{StaticResource OptionPanel_TextButton}"
@@ -112,6 +112,9 @@
<ListBox ItemsSource="{Binding MaterialList}"
SelectedItem="{Binding SelMaterial}"
Background="{StaticResource Omag_Black}"
Foreground="{StaticResource Omag_White}"
BorderThickness="0"
Grid.RowSpan="2"
Margin="0,0,0,5"
Height="150"/>
+12
View File
@@ -748,4 +748,16 @@
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- GroupBox -->
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource {x:Type GroupBox}}">
<Setter Property="BorderThickness" Value="{StaticResource BorderGpBx_Thickness}"/>
<Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
<Setter Property="Margin" Value="0,0,0,0"/>
</Style>
<!-- ______________________________________________________________________________________________________________________________________________ -->
</ResourceDictionary>