From 86f5560f203014f4034b9abd5f3fc888adcd09ea Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.p@egaltech.com>
Date: Mon, 12 Apr 2021 13:51:59 +0000
Subject: [PATCH] EgtDOORCreator 2.3d1 : -> migliorato l'impaginazione dei dati
 per interfacce piccole.

---
 Assembly/AssemblyPageV.xaml   |  68 ++++++----
 DoorParameters/PartPageV.xaml | 233 +++++++++++++++++++++++-----------
 DoorParameters/PartPageVM.vb  |  13 ++
 MainWindow/MainWindowModel.vb |   4 +-
 My Project/AssemblyInfo.vb    |   4 +-
 5 files changed, 217 insertions(+), 105 deletions(-)

diff --git a/Assembly/AssemblyPageV.xaml b/Assembly/AssemblyPageV.xaml
index 365dc0a..2dda9de 100644
--- a/Assembly/AssemblyPageV.xaml
+++ b/Assembly/AssemblyPageV.xaml
@@ -52,6 +52,8 @@
                     <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
 
+                <!--Margin="0.4,2,29.6,3.2"-->
+                
                 <!--UP-->
                 <TextBlock Grid.Row="0" Text="{Binding LightUpMsg}"
                           Style="{StaticResource DoorParamsTxBl}"
@@ -59,7 +61,8 @@
                           Grid.Column="0"/>
                 <TextBox Grid.Column="1" Grid.Row="0" Style="{StaticResource DoorParamsTxBx}"
                         Text="{Binding CurrAssembly.LightUp, UpdateSourceTrigger=PropertyChanged}"
-                        Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto" />
+                        MaxWidth="120" Margin="0.4,2,10,3.2" 
+                        VerticalAlignment="Stretch" Height="Auto" />
                 <!--Lock-->
                 <TextBlock Grid.Row="1" Text="{Binding LightLockMsg}"
                           Style="{StaticResource DoorParamsTxBl}"
@@ -67,7 +70,8 @@
                           Grid.Column="0"/>
                 <TextBox Grid.Column="1" Grid.Row="1" Style="{StaticResource DoorParamsTxBx}"
                         Text="{Binding CurrAssembly.LightLock, UpdateSourceTrigger=PropertyChanged}"
-                        Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                        MaxWidth="120" Margin="0.4,2,10,3.2" 
+                        VerticalAlignment="Stretch" Height="Auto"/>
                 <!--Hinge-->
                 <TextBlock Grid.Row="2" Text="{Binding LightHingeMsg}"
                           Style="{StaticResource DoorParamsTxBl}"
@@ -75,7 +79,8 @@
                           Grid.Column="0"/>
                 <TextBox Grid.Column="1" Grid.Row="2" Style="{StaticResource DoorParamsTxBx}"
                         Text="{Binding CurrAssembly.LightHinge, UpdateSourceTrigger=PropertyChanged}"
-                        Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                        MaxWidth="120" Margin="0.4,2,10,3.2" 
+                        VerticalAlignment="Stretch" Height="Auto"/>
                 <!--Bottom-->
                 <TextBlock Grid.Row="3" Text="{Binding LightBottomMsg}"
                           Style="{StaticResource DoorParamsTxBl}"
@@ -83,7 +88,8 @@
                           Grid.Column="0"/>
                 <TextBox Grid.Column="1" Grid.Row="3" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrAssembly.LightBottom, UpdateSourceTrigger=PropertyChanged}"
-                     Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                     MaxWidth="120" Margin="0.4,2,10,3.2" 
+                     VerticalAlignment="Stretch" Height="Auto"/>
                 <!--ThicknessHead-->
                 <TextBlock Grid.Row="0" Text="{Binding ThicknessHeadMsg}"
                        Style="{StaticResource DoorParamsTxBl}"
@@ -92,7 +98,8 @@
                 <TextBox  Grid.Row="0" Grid.Column="3"
                       Style="{StaticResource DoorParamsTxBx}"
                       Text="{Binding CurrAssembly.ThicknessHead, UpdateSourceTrigger=PropertyChanged}"
-                      Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                      MaxWidth="120" Margin="0.4,2,10,3.2" 
+                      VerticalAlignment="Stretch" Height="Auto"/>
                 <!--OverlapHinge-->
                 <TextBlock Grid.Row="1" Text="{Binding OverlapHingeMsg}"
                        Style="{StaticResource DoorParamsTxBl}"
@@ -101,7 +108,8 @@
                 <TextBox  Grid.Row="1" Grid.Column="3"
                       Style="{StaticResource DoorParamsTxBx}"
                       Text="{Binding CurrAssembly.OverlapHinge, UpdateSourceTrigger=PropertyChanged}"
-                      Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                      MaxWidth="120" Margin="0.4,2,10,3.2" 
+                      VerticalAlignment="Stretch" Height="Auto"/>
                 <!--OverlapLock-->
                 <TextBlock Grid.Row="2" Text="{Binding OverlapLockMsg}"
                        Style="{StaticResource DoorParamsTxBl}"
@@ -110,13 +118,15 @@
                 <TextBox  Grid.Row="2" Grid.Column="3"
                       Style="{StaticResource DoorParamsTxBx}"
                       Text="{Binding CurrAssembly.OverlapLock, UpdateSourceTrigger=PropertyChanged}"
-                      Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"
+                      MaxWidth="120" Margin="0.4,2,10,3.2" 
+                      VerticalAlignment="Stretch" Height="Auto"
                       IsEnabled="{Binding CurrAssembly.OneDoorProperty}"/>
                 <!--DoorsNumber-->
                 <TextBlock Grid.Row="4" Grid.Column="0" Text="{Binding DoorNumberMsg}"
                           Style="{StaticResource DoorParamsTxBl}"
                           Margin="2,0,0,2"/>
-                <ComboBox  Grid.Row="4" Grid.Column="1" Margin="0.4,2,29.6,3.2"
+                <ComboBox  Grid.Row="4" Grid.Column="1" 
+                      MaxWidth="120" Margin="0.4,2,10,3.2" 
                       ItemsSource="{Binding CurrAssembly.DoorListNumber}" 
                       SelectedItem="{Binding CurrAssembly.DoorNumber}"
                       Style="{StaticResource DoorParamsCmBx}" 
@@ -129,7 +139,8 @@
                 <TextBox  Grid.Row="3" Grid.Column="3"
                          Style="{StaticResource DoorParamsTxBx}"
                          Text="{Binding CurrAssembly.Thickness, UpdateSourceTrigger=PropertyChanged}"
-                         Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                         MaxWidth="120" Margin="0.4,2,10,3.2" 
+                         VerticalAlignment="Stretch" Height="Auto"/>
                 <!--Width-->
                 <TextBlock Grid.Row="4" Text="{Binding WidthMsg}"
                        Style="{StaticResource DoorParamsTxBl}"
@@ -138,7 +149,8 @@
                 <TextBox  Grid.Row="4" Grid.Column="3"
                          Style="{StaticResource DoorParamsTxBx}"
                          Text="{Binding CurrAssembly.Width, UpdateSourceTrigger=PropertyChanged}"
-                         Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                         MaxWidth="120" Margin="0.4,2,10,3.2" 
+                         VerticalAlignment="Stretch" Height="Auto"/>
                 <!--OverlapTop-->
                 <TextBlock Grid.Row="5" Grid.Column="0"
                        Text="{Binding OverlapTopMsg}"
@@ -147,7 +159,8 @@
                 <TextBox  Grid.Row="5" Grid.Column="1"
                         Style="{StaticResource DoorParamsTxBx}"
                         Text="{Binding CurrAssembly.OverlapTop, UpdateSourceTrigger=PropertyChanged}"
-                        Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                        MaxWidth="120" Margin="0.4,2,10,3.2" 
+                        VerticalAlignment="Stretch" Height="Auto"/>
 
             </Grid>
         </GroupBox>
@@ -190,7 +203,7 @@
                       ItemsSource="{Binding CurrAssembly.EdgeTypeList}" 
                       SelectedItem="{Binding CurrAssembly.LockEdgeType}"
                       Style="{StaticResource DoorEdgeParamsCmBx}"
-                      Margin="0.4,2,39.6,2"/>
+                      MaxWidth="120" Margin="0.4,2,10,3.2"/>
 
                 <TextBlock Grid.Column="0" Grid.Row="2" 
                       Text="{Binding HingeedgeMsg}"
@@ -200,8 +213,7 @@
                       ItemsSource="{Binding CurrAssembly.EdgeTypeList}" 
                       SelectedItem="{Binding CurrAssembly.HingeEdgeType}"
                       Style="{StaticResource DoorEdgeParamsCmBx}"
-                      Margin="0.4,0,39.6,2">
-                </ComboBox>
+                      MaxWidth="120" Margin="0.4,2,10,3.2"/>
 
                 <TextBlock Grid.Column="0" Grid.Row="3" 
                        Text="{Binding TopMsg}"
@@ -211,7 +223,7 @@
                       ItemsSource="{Binding CurrAssembly.EdgeTypeList}" 
                       SelectedItem="{Binding CurrAssembly.TopType}"
                       Style="{StaticResource DoorEdgeParamsCmBx}"
-                      Margin="0.4,0,39.6,2"/>
+                      MaxWidth="120" Margin="0.4,2,10,3.2"/>
 
                 <TextBlock Grid.Column="0" Grid.Row="4" 
                        Text="{Binding BottomMsg}"
@@ -221,7 +233,7 @@
                       ItemsSource="{Binding CurrAssembly.EdgeTypeList}" 
                       SelectedItem="{Binding CurrAssembly.BottomType}"
                       Style="{StaticResource DoorEdgeParamsCmBx}"
-                      Margin="0.4,0,39.6,2"/>
+                      MaxWidth="120" Margin="0.4,2,10,3.2"/>
 
                 <!--Machining-->
                 <CheckBox Grid.Column="2" Grid.Row="1"
@@ -241,22 +253,24 @@
                       IsChecked="{Binding CurrAssembly.BottomMachining}"
                       />
 
+                <!--Margin="15,2,24.6,3.2"-->
+                
                 <TextBox Grid.Column="4" Grid.Row="1" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrAssembly.LockEdgeOverMaterial, UpdateSourceTrigger=PropertyChanged}"
                      IsEnabled="{Binding IsChecked, ElementName=LockEdge}"
-                     Margin="15,2,24.6,3.2"/>
+                     MaxWidth="120" Margin="10,2,10,3.2"/>
                 <TextBox Grid.Column="4" Grid.Row="2" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrAssembly.HingeEdgeOverMaterial, UpdateSourceTrigger=PropertyChanged}"
                      IsEnabled="{Binding IsChecked, ElementName=HingeEdge}"
-                     Margin="15,2,24.6,3.2"/>
+                     MaxWidth="120" Margin="10,2,10,3.2"/>
                 <TextBox Grid.Column="4" Grid.Row="3" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrAssembly.TopOverMaterial, UpdateSourceTrigger=PropertyChanged}"
                      IsEnabled="{Binding IsChecked, ElementName=Top}"
-                     Margin="15,2,24.6,3.2"/>
+                     MaxWidth="120" Margin="10,2,10,3.2"/>
                 <TextBox Grid.Column="4" Grid.Row="4" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrAssembly.BottomOverMaterial, UpdateSourceTrigger=PropertyChanged}"
                      IsEnabled="{Binding IsChecked, ElementName=Bottom}"
-                     Margin="15,2,24.6,3.2"/>
+                     MaxWidth="120" Margin="10,2,10,3.2"/>
 
             </Grid>
         </GroupBox>
@@ -275,6 +289,8 @@
                 </StackPanel>
             </GroupBox.Header>
 
+            <!--Margin="0.4,2,29.6,3.2"-->
+
             <Grid Margin="0,0,0,2" IsEnabled="{Binding IsChecked, ElementName=Exterior}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
@@ -294,7 +310,8 @@
                 <TextBox Grid.Row ="0" Grid.Column="1"
                   Style="{StaticResource DoorParamsTxBx}"
                   Text="{Binding CurrAssembly.OverlapBottom, UpdateSourceTrigger=PropertyChanged}"
-                  Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                  MaxWidth="120" Margin="0.4,2,10,3.2"
+                  VerticalAlignment="Stretch" Height="Auto"/>
                 <!--Thickness Bottom-->
                 <TextBlock Grid.Row ="0" Grid.Column="2"
                    Text="{Binding ThicknessBottomMsg}"
@@ -303,7 +320,8 @@
                 <TextBox Grid.Row ="0" Grid.Column="3"
                   Style="{StaticResource DoorParamsTxBx}"
                   Text="{Binding CurrAssembly.ThicknessBottom, UpdateSourceTrigger=PropertyChanged}"
-                  Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                  MaxWidth="120" Margin="0.4,2,10,3.2"
+                  VerticalAlignment="Stretch" Height="Auto"/>
                 <!--Depth Bottom-->
                 <TextBlock Grid.Row ="1" Grid.Column="0"
                    Text="{Binding DepthBottomMsg}"
@@ -312,7 +330,8 @@
                 <TextBox Grid.Row ="1" Grid.Column="1"
                   Style="{StaticResource DoorParamsTxBx}"
                   Text="{Binding CurrAssembly.DepthBottom, UpdateSourceTrigger=PropertyChanged}"
-                  Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                  MaxWidth="120" Margin="0.4,2,10,3.2"
+                  VerticalAlignment="Stretch" Height="Auto"/>
                 <!--Delta Bottom-->
                 <TextBlock Grid.Row ="1" Grid.Column="2"
                   Text="{Binding DeltaBottomMsg}"
@@ -321,7 +340,8 @@
                 <TextBox Grid.Row ="1" Grid.Column="3"
                   Style="{StaticResource DoorParamsTxBx}"
                   Text="{Binding CurrAssembly.DeltaBottom, UpdateSourceTrigger=PropertyChanged}"
-                  Margin="0.4,2,29.6,3.2" VerticalAlignment="Stretch" Height="Auto"/>
+                  MaxWidth="120" Margin="0.4,2,10,3.2"
+                  VerticalAlignment="Stretch" Height="Auto"/>
             </Grid>
         </GroupBox>
 
diff --git a/DoorParameters/PartPageV.xaml b/DoorParameters/PartPageV.xaml
index 3c441ed..52f5400 100644
--- a/DoorParameters/PartPageV.xaml
+++ b/DoorParameters/PartPageV.xaml
@@ -21,7 +21,7 @@
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
 
-      <Grid Margin="0,0,0,2" Grid.Column="1" IsEnabled="{Binding IsReadOnly}">
+      <Grid Margin="0,0,0,0.2" Grid.Column="1" IsEnabled="{Binding IsReadOnly}">
          <Grid.InputBindings>
             <KeyBinding Key="Enter" Command="{Binding DataContext.RefreshCmd,RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
             <KeyBinding Key="F1" Command="{Binding DataContext.GuideCmd,RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
@@ -79,9 +79,10 @@
                <TextBlock Grid.Column="5" Grid.Row="0" Text="{Binding MachMsg}" VerticalAlignment="Center"
                     Style="{StaticResource DoorParamsTxBl}" />
                <TextBlock Grid.Column="6" Grid.Row="0" Text="{Binding OverMaterialMsg}" VerticalAlignment="Center"
-                    Style="{StaticResource DoorParamsTxBl}" Margin="10,0,5,0" />
+                    Style="{StaticResource DoorParamsTxBl}" Margin="10,0,5,0" MaxWidth="120"/>
 
                <!--General-->
+                <!--Margin="0.4,2,39.6,3.2"-->
                <TextBlock Text="{Binding WidthMsg}"
                        Style="{StaticResource DoorParamsTxBl}"
                        Margin="2,2,0,2"
@@ -90,7 +91,7 @@
                      Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrPart.Width, UpdateSourceTrigger=PropertyChanged}"
                      ToolTip="{Binding CurrPart.ToolTipEvaluatedWidth}"
-                     Margin="0.4,2,39.6,3.2" 
+                     MaxWidth="120" Margin="0.4,2,10,3.2"
                      VerticalAlignment="Stretch"                     
                      Height="Auto" IsReadOnly="{Binding DisableWidth}"/>
 
@@ -99,7 +100,8 @@
                        Margin="2,0,0,2"/>
                <TextBox Grid.Column="1" Grid.Row="1" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrPart.Height, UpdateSourceTrigger=PropertyChanged}"
-                     Margin="0.4,2,39.6,3.2" VerticalAlignment="Stretch" Height="Auto"
+                     MaxWidth="120" Margin="0.4,2,10,3.2"   
+                     VerticalAlignment="Stretch" Height="Auto"                       
                      ToolTip="{Binding CurrPart.ToolTipEvaluatedHeight}"   
                      IsReadOnly="{Binding DisableHeight}"/>
 
@@ -108,14 +110,16 @@
                        Margin="2,0,0,2"/>
                <TextBox Grid.Column="1" Grid.Row="2" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrPart.Thickness, UpdateSourceTrigger=PropertyChanged}"
-                     Margin="0.4,2,39.6,3.2" VerticalAlignment="Stretch" Height="Auto"
+                     MaxWidth="120" Margin="0.4,2,10,3.2" 
+                     VerticalAlignment="Stretch" Height="Auto"
                      ToolTip="{Binding CurrPart.ToolTipEvaluatedThickness}"
                      IsReadOnly="{Binding IsRaedOnly}"/>
 
                <TextBlock Grid.Row="3" Text="{Binding SwingMsg}"
                        Style="{StaticResource DoorParamsTxBl}"
                        Margin="2,0,0,2"/>
-               <ComboBox Grid.Column="1" Grid.Row="3" Margin="0.4,2,39.6,3.2"
+               <ComboBox Grid.Column="1" Grid.Row="3" 
+                      MaxWidth="120" Margin="0.4,2,10,3.2"   
                       ItemsSource="{Binding CurrPart.SwingTypeList}" 
                       SelectedItem="{Binding CurrPart.Swing}"
                       Style="{StaticResource DoorParamsCmBx}" Height="Auto"
@@ -129,7 +133,8 @@
                       Style="{StaticResource DoorParamsTxBx}"
                       Text="{Binding CurrPart.Weight, UpdateSourceTrigger=PropertyChanged}"
                       ToolTip="{Binding CurrPart.ToolTipEvaluatedWeight}"
-                      Margin="0.4,2,39.6,3.2" VerticalAlignment="Stretch" Height="Auto"
+                      MaxWidth="120" Margin="0.4,2,10,3.2"
+                      VerticalAlignment="Stretch" Height="Auto"
                       Visibility="{Binding CurrPart.VisibilityWeight}"/>
 
                <!--Seconda colonna -->
@@ -178,19 +183,12 @@
                       Margin="0.4,2,30,4" 
                       IsEnabled="{Binding IsRaedOnly, Converter={StaticResource TrueToFalse}}"/>
 
-               <TextBlock Grid.Row="5" Grid.Column="2"  
+               <!--<TextBlock Grid.Row="5" Grid.Column="2"  
                        Visibility="{Binding DispositionVisibility}"
                        Text="{Binding DispositionMsg}"
                        Style="{StaticResource DoorParamsTxBl}"
-                       Margin="20,2,0,2"/>
-               <ComboBox Grid.Column="3" Grid.Row="5"  
-                      Visibility="{Binding DispositionVisibility}"   
-                      ItemsSource="{Binding CurrPart.DispositionList}" 
-                      SelectedItem="{Binding CurrPart.DispositionItem}"
-                      DisplayMemberPath="Name"
-                      Style="{StaticResource DoorEdgeParamsCmBx}"
-                      Margin="0.4,2,30,4" 
-                      IsEnabled="{Binding IsRaedOnly, Converter={StaticResource TrueToFalse}}"/>
+                       Margin="20,2,0,2"/>-->
+
                <!--Resize-->
                <CheckBox Grid.Column="4" Grid.Row="1" Grid.RowSpan="2"
                       IsChecked="{Binding CurrPart.ResizeLockHinge}"
@@ -222,7 +220,7 @@
                       IsChecked="{Binding CurrPart.BottomMachining}"
                       IsEnabled="{Binding IsRaedOnly, Converter={StaticResource TrueToFalse}}"/>
 
-               <CheckBox Grid.Column="5" Grid.Row="5"
+               <!--<CheckBox Grid.Column="5" Grid.Row="5"
                       Visibility="{Binding CurrPart.VisibilityInvertBevel}"
                       Name="InvertBevel" Style="{StaticResource DoorParamsChBx}" 
                       IsChecked="{Binding CurrPart.InvertBevel}"
@@ -232,68 +230,144 @@
                        Visibility="{Binding CurrPart.VisibilityInvertBevel}"
                        Text="{Binding InvertBevelMsg}"
                        Style="{StaticResource DoorParamsTxBl}"
-                       Margin="10,2,40,4"/>
+                       MaxWidth="120" Margin="10,2,10,4"/>-->
+               <!--<ComboBox Grid.Column="3" Grid.Row="5"  
+                      Visibility="{Binding DispositionVisibility}"   
+                      ItemsSource="{Binding CurrPart.DispositionList}" 
+                      SelectedItem="{Binding CurrPart.DispositionItem}"
+                      DisplayMemberPath="Name"
+                      Style="{StaticResource DoorEdgeParamsCmBx}"
+                      Margin="0.4,2,30,4" 
+                      IsEnabled="{Binding IsRaedOnly, Converter={StaticResource TrueToFalse}}"/>-->
 
                <TextBox Grid.Column="6" Grid.Row="1" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrPart.LockEdgeOverMaterial, UpdateSourceTrigger=PropertyChanged}"
                      IsEnabled="{Binding IsChecked, ElementName=LockEdge}"
                      ToolTip="{Binding CurrPart.ToolTipEvaluatedLockOverMaterial}"
-                     Margin="10,2.6,40,2" IsReadOnly="{Binding IsRaedOnly}"/>
+                     MaxWidth="120" Margin="10,2,20,4"
+                     IsReadOnly="{Binding IsRaedOnly}"/>
                <TextBox Grid.Column="6" Grid.Row="2" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrPart.HingeEdgeOverMaterial, UpdateSourceTrigger=PropertyChanged}"
                      IsEnabled="{Binding IsChecked, ElementName=HingeEdge}"
                      ToolTip="{Binding CurrPart.ToolTipEvaluatedHingeOverMaterial}"
-                     Margin="10,2,40,2" IsReadOnly="{Binding IsRaedOnly}"/>
+                     MaxWidth="120" Margin="10,2,20,4"
+                     IsReadOnly="{Binding IsRaedOnly}"/>
                <TextBox Grid.Column="6" Grid.Row="3" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrPart.TopOverMaterial, UpdateSourceTrigger=PropertyChanged}"
                      IsEnabled="{Binding IsChecked, ElementName=Top}"
                      ToolTip="{Binding CurrPart.ToolTipEvaluatedTopOverMaterial}"
-                     Margin="10,2,40,2" IsReadOnly="{Binding IsReadOnly}"/>
+                     MaxWidth="120" Margin="10,2,20,4"
+                     IsReadOnly="{Binding IsReadOnly}"/>
                <TextBox Grid.Column="6" Grid.Row="4" Style="{StaticResource DoorParamsTxBx}"
                      Text="{Binding CurrPart.BottomOverMaterial, UpdateSourceTrigger=PropertyChanged}"
                      IsEnabled="{Binding IsChecked, ElementName=Bottom}"
                      ToolTip="{Binding CurrPart.ToolTipEvaluatedBottomOverMaterial}"
-                     Margin="10,2,40,4" IsReadOnly="{Binding IsRaedOnly}"/>
-
+                     MaxWidth="120" Margin="10,2,20,4"
+                     IsReadOnly="{Binding IsRaedOnly}"/>
+                    <!--Margin="10,2,40,4"-->
+                   
                <!--Material and properties-->
                <!--Visibility="{Binding CurrPart.PropertiesIsVisible}"-->
-               <Grid Margin="0,0,0,2" Grid.Column="3" Grid.ColumnSpan="4"  Grid.Row="6">
+               <!--<Grid Margin="0,0,0,2" Grid.Column="2" Grid.ColumnSpan="5"  Grid.Row="5">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="Auto"/>
                   </Grid.ColumnDefinitions>
-                  <!--materieli-->
-                  <TextBlock Grid.Column="0"
-                       Visibility="{Binding Visibility, ElementName=Material}"      
-                       Text="{Binding MaterialMsg}"
-                       Style="{StaticResource DoorParamsTxBl}"
-                       Margin="4,16,11.2,2"/>
-                  <!--Solo se senza materiali allora stampo questo messaggio-->
-                  <TextBlock Grid.Column="1"                            
-                       Visibility="{Binding CurrPart.ShowPropeperty}"      
-                       Text="{Binding PropertyMsg}"
-                       Style="{StaticResource DoorParamsTxBl}"
-                       Margin="4,16,11.2,2"/>
-                  <!--Lista materiali-->
-                  <ComboBox Grid.Column="1" Margin="4,16,3.2,11.2"
-                            Name="Material"
-                            Visibility="{Binding CurrPart.MaterialIsVisible}"
-                            ItemsSource="{Binding CurrPart.MaterialsList}"
-                            SelectedItem="{Binding CurrPart.SelectedMaterial}"
-                            DisplayMemberPath="Name">
-                  </ComboBox>
-                  <!--lLsta proprietà-->
-                  <ComboBox Grid.Column="2" Margin="3.8,16,4,11.2"
-                            Visibility="{Binding CurrPart.PropertiesIsVisible}"
-                            ItemsSource="{Binding CurrPart.PropertiesList}"
-                            SelectedItem="{Binding CurrPart.SelectedProperty}"
-                            DisplayMemberPath="GraphicName">
-                  </ComboBox> 
-               </Grid>
+                  <Grid.RowDefinitions>
+                      <RowDefinition Height="1*"/>
+                      <RowDefinition Height="1*"/>
+                      <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>-->
 
+                <GroupBox Grid.Column="2" Grid.ColumnSpan="5"  Grid.Row="5" Margin="2,0,2,0" BorderBrush="White">
+                    <GroupBox.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <CheckBox  Grid.Row="0" Grid.Column="5"
+                                  Visibility="{Binding AllignGropBox}"
+                                  Style="{StaticResource DoorParamsChBx}"                                 
+                                  VerticalAlignment="Stretch"
+                                  Margin="2,0,0.2,0"/>
+                            <ComboBox  Style="{StaticResource DoorParamsCmBx}" Width="100"
+                                  Visibility="{Binding AllignGropBox}"     
+                                  VerticalAlignment="Stretch" Height="Auto"
+                                  Margin="2,0,0,0"/>
+                        </StackPanel>
+                    </GroupBox.Header>
 
-               <Grid Margin="0,0,0,2" Grid.Row="6" Grid.ColumnSpan="4" Visibility="{Binding VisibilityTopShape}">
+                    <Grid Margin="0,0,0,0" Grid.Column="2" Grid.ColumnSpan="5"  Grid.Row="5">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Grid.Column="0"  Grid.Row="0"
+                                   Visibility="{Binding DispositionVisibility}"
+                                   Text="{Binding DispositionMsg}"
+                                   Style="{StaticResource DoorParamsTxBl}"
+                                   Margin="12,2,5,2" />
+                        <ComboBox Grid.Column="1" Grid.Row="0"  
+                                  Visibility="{Binding DispositionVisibility}"   
+                                  ItemsSource="{Binding CurrPart.DispositionList}" 
+                                  SelectedItem="{Binding CurrPart.DispositionItem}"
+                                  DisplayMemberPath="Name"
+                                  Style="{StaticResource DoorEdgeParamsCmBx}"
+                                  MaxWidth="120" Margin="-7,0,38,0"
+                                  IsEnabled="{Binding IsRaedOnly, Converter={StaticResource TrueToFalse}}"/>
+                        <CheckBox Grid.Column="2" Grid.Row="0"
+                                  Margin="0,0,0,0"
+                                  Visibility="{Binding CurrPart.VisibilityInvertBevel}"
+                                  Name="InvertBevel" Style="{StaticResource DoorParamsChBx}" 
+                                  IsChecked="{Binding CurrPart.InvertBevel}"
+                                  IsEnabled="{Binding IsInactive}"/>
+                        <TextBlock Grid.Column="3"  Grid.Row="0"
+                                  Visibility="{Binding CurrPart.VisibilityInvertBevel}"
+                                  Text="{Binding InvertBevelMsg}"
+                                  Style="{StaticResource DoorParamsTxBl}"
+                                  MaxWidth="120" Margin="18,0,12,0"/>
+
+                         <!--materieli-->
+                        <TextBlock Grid.Column="0" Grid.Row="1"
+                                   Visibility="{Binding Visibility, ElementName=Material}"      
+                                   Text="{Binding MaterialMsg}"
+                                   Style="{StaticResource DoorParamsTxBl}"
+                                   Margin="12,2,0,0" />
+                        <!--Solo se senza materiali allora stampo questo messaggio-->
+                        <TextBlock Grid.Column="1" Grid.Row="1"                           
+                                   Visibility="{Binding CurrPart.ShowPropeperty}"      
+                                   Text="{Binding PropertyMsg}"
+                                   Style="{StaticResource DoorParamsTxBl}"
+                                   Margin="12,0,5,0" />
+                        <!--Lista materiali-->
+                        <ComboBox Grid.Column="1" Grid.Row="1" 
+                                  MaxWidth="120" Margin="-7,0,38,0"
+                                  Style="{StaticResource DoorEdgeParamsCmBx}"
+                                  Name="Material"
+                                  Visibility="{Binding CurrPart.MaterialIsVisible}"
+                                  ItemsSource="{Binding CurrPart.MaterialsList}"
+                                  SelectedItem="{Binding CurrPart.SelectedMaterial}"
+                                  DisplayMemberPath="Name">
+                        </ComboBox>
+                        <!--lLsta proprietà-->
+                        <ComboBox Grid.Column="3" Grid.Row="1"
+                                  MaxWidth="120" Margin="18,0,12,0"
+                                  Style="{StaticResource DoorEdgeParamsCmBx}"
+                                  Visibility="{Binding CurrPart.PropertiesIsVisible}"
+                                  ItemsSource="{Binding CurrPart.PropertiesList}"
+                                  SelectedItem="{Binding CurrPart.SelectedProperty}"
+                                  DisplayMemberPath="GraphicName">
+                        </ComboBox>
+                    </Grid>
+                </GroupBox>
+
+                <Grid Margin="0,0,0,0.1" Grid.Row="5" Grid.ColumnSpan="4" Visibility="{Binding VisibilityTopShape}">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="1*"/>
@@ -308,72 +382,77 @@
                                       Style="{StaticResource DoorParamsChBx}" 
                                       IsChecked="{Binding CurrPart.TopShapeIsChecked}"
                                       VerticalAlignment="Stretch"
-                                      Margin="2,0,02,0"/>
+                                      Margin="2,0,0.2,0"/>
                            <ComboBox  Style="{StaticResource DoorParamsCmBx}" Width="100"
                                       ItemsSource="{Binding CurrPart.TopShapeList}"
                                       SelectedItem="{Binding CurrPart.SelectedShape}"
                                       VerticalAlignment="Stretch" Height="Auto"
-                                      Margin="2,-10,0,2" 
+                                      Margin="2,0,0,0"
                                       DisplayMemberPath="Name"/>
                         </StackPanel>
                      </GroupBox.Header>
 
-                     <Grid Margin="0,0,0,2" IsEnabled="{Binding IsChecked, ElementName=TopShape}">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <!--TopArc-->
-                        <TextBlock Grid.Column="0"
+                     <Grid Margin="0,0,0,0" IsEnabled="{Binding IsChecked, ElementName=TopShape}">
+                         <Grid.ColumnDefinitions>
+                             <ColumnDefinition Width="1*"/>
+                             <ColumnDefinition Width="1*"/>
+                             <ColumnDefinition Width="1*"/>
+                             <ColumnDefinition Width="1*"/>
+                         </Grid.ColumnDefinitions>
+                         <Grid.RowDefinitions>
+                             <RowDefinition Height="1*"/>
+                             <RowDefinition Height="1*"/>
+                         </Grid.RowDefinitions>
+                     <!--TopArc-->
+                        <TextBlock Grid.Column="0" Grid.ColumnSpan="2"
                                 Visibility="{Binding CurrPart.VisibilityTopArch}"   
                                 Text="{Binding RadiusMsg}"
                                 Style="{StaticResource DoorParamsTxBl}"
                                 Margin="2,2,0,2"/>
-                        <TextBox Grid.Column="1"
+                        <TextBox Grid.Column="1"  Grid.ColumnSpan="2"
                                 Visibility="{Binding CurrPart.VisibilityTopArch}"
                                 Style="{StaticResource DoorParamsTxBx}"
                                 Text="{Binding CurrPart.Radius, UpdateSourceTrigger=PropertyChanged}"
                                 ToolTip="{Binding CurrPart.ToolTipEvaluatedRadius}" 
-                                Margin="0.4,2,10.6,3.2"  
+                                MaxWidth="120" Margin="0.4,2,1,2"  
                                 IsReadOnly="{Binding IsRaedOnly}"/>
-                        <TextBlock Grid.Column="2"
+                        <TextBlock Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
                                 Visibility="{Binding CurrPart.VisibilityTopArch}"   
                                 Text="{Binding PosxMsg}"
                                 Style="{StaticResource DoorParamsTxBl}"
                                 Margin="2,2,0,2"/>
-                        <TextBox Grid.Column="3"
+                        <TextBox Grid.Column="1" Grid.Row="1"  Grid.ColumnSpan="2"
                                 Visibility="{Binding CurrPart.VisibilityTopArch}"
                                 Style="{StaticResource DoorParamsTxBx}"
                                 Text="{Binding CurrPart.Posx, UpdateSourceTrigger=PropertyChanged}"
                                 ToolTip="{Binding CurrPart.ToolTipEvaluatedPosx}" 
-                                Margin="0.4,2,10.6,3.2"  
+                                MaxWidth="120" Margin="0.4,2,1,2"  
                                 IsReadOnly="{Binding IsRaedOnly}"/>
                         <!--TopAngle-->
-                        <TextBlock Grid.Column="0"
+                         <!--Margin="0.4,2,10.6,3.2"-->
+                        <TextBlock Grid.Column="0" Grid.ColumnSpan="2"
                                 Visibility="{Binding CurrPart.VisibilityTopAngle}"
                                 Text="{Binding AngleMsg}"
                                 Style="{StaticResource DoorParamsTxBl}"
                                 Margin="2,2,0,2"/>
-                        <TextBox Grid.Column="1"
+                        <TextBox Grid.Column="2" Grid.ColumnSpan="2"
                                 Visibility="{Binding CurrPart.VisibilityTopAngle}"
                                 Style="{StaticResource DoorParamsTxBx}"
                                 Text="{Binding CurrPart.Angle, UpdateSourceTrigger=PropertyChanged}"
                                 ToolTip="{Binding CurrPart.Angle}" 
-                                Margin="0.4,2,10.6,3.2"  
+                                MaxWidth="120" Margin="0.4,0,1,0"                                  
                                 IsReadOnly="{Binding IsRaedOnly}"/>
-                        <TextBlock Grid.Column="2"
+                        <TextBlock Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
                                 Visibility="{Binding CurrPart.VisibilityTopAngle}"   
                                 Text="{Binding PosxMsg}"
                                 Style="{StaticResource DoorParamsTxBl}"
-                                Margin="2,2,0,2"/>
-                        <TextBox Grid.Column="3"
+                                Margin="2,2,0,0.2"/>
+                        <TextBox Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2"
                                 Visibility="{Binding CurrPart.VisibilityTopAngle}" 
                                 Style="{StaticResource DoorParamsTxBx}"
                                 Text="{Binding CurrPart.PosxAngle, UpdateSourceTrigger=PropertyChanged}"
                                 ToolTip="{Binding CurrPart.ToolTipEvaluatedPosxAngle}" 
-                                 Margin="0.4,2,10.6,3.2"  
+                                MaxWidth="120" Margin="0.4,0,1,0"  
                                 IsReadOnly="{Binding IsRaedOnly}"/>
                      </Grid>
                   </GroupBox>
diff --git a/DoorParameters/PartPageVM.vb b/DoorParameters/PartPageVM.vb
index 816c943..f7ac86c 100644
--- a/DoorParameters/PartPageVM.vb
+++ b/DoorParameters/PartPageVM.vb
@@ -47,6 +47,19 @@ Public Class PartPageVM
       End Get
    End Property
 
+   Public ReadOnly Property AllignGropBox As Visibility
+      Get
+         If Not IsNothing(m_CurrPart) AndAlso m_CurrPart.TypePart.Contains("F") Then
+            Return Visibility.Collapsed
+         End If
+         If OptionModule.m_DisableArch = Visibility.Visible Then
+            Return Visibility.Hidden
+         Else
+            Return Visibility.Collapsed
+         End If
+      End Get
+   End Property
+
    Public ReadOnly Property DispositionVisibility As Visibility
       Get
          Return OptionModule.DispositionVisibility()
diff --git a/MainWindow/MainWindowModel.vb b/MainWindow/MainWindowModel.vb
index 51b07ec..62a3e8c 100644
--- a/MainWindow/MainWindowModel.vb
+++ b/MainWindow/MainWindowModel.vb
@@ -57,8 +57,8 @@ Friend Class MainWindowModel
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2303, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2303, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2304, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2304, 1, IniFile.m_nKeyOptions)
       'Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index f0c6eff..09a40b5 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.3.1")>
-<Assembly: AssemblyFileVersion("2.3.3.1")>
+<Assembly: AssemblyVersion("2.3.4.1")>
+<Assembly: AssemblyFileVersion("2.3.4.1")>