Merge commit '36ea7e64040c7be2255ebc8753c6383186a6344a'

MainWindow/MainWindowM.vb

@@ -209,8 +209,8 @@ Public Class MainWindowM
       Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
       EgtSetNetHwKey(bNetHwKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2603, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2603, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
       ' Inizializzazione generale di EgtInterface

My Project/AssemblyInfo.vb

@@ -59,5 +59,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.2.1")>
-<Assembly: AssemblyFileVersion("2.6.2.1")>
+<Assembly: AssemblyVersion("2.6.3.1")>
+<Assembly: AssemblyFileVersion("2.6.3.1")>

OptionWindow/OptionWindowV.xaml

@@ -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"/>

Utility/Dictionary.xaml

@@ -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>