- modifiche

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

@@ -1,14 +1,15 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="BeamMachiningsWindowV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 WindowStyle="None"
-                                 Width="500" Height="450"
-                                 WindowStartupLocation="CenterOwner" 
-                                 ShowInTaskbar="False"
-                                 Title="{Binding Title}"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="BeamMachiningsWindowV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            Width="500" Height="450"
+                            IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
    
    <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
@@ -21,9 +22,9 @@
                   SelectedItem="{Binding SelMachining}"
                   IsSynchronizedWithCurrentItem="True"
                   Margin="5,0,5,0"
-                  Style="{StaticResource OnlyHeaders_TabControl}"/>
+                  Style="{StaticResource OnlyProdTabControl_OnlyHeaders}"/>
 
-      <Border Grid.Row="1" Margin="0,1,0,2" Style="{StaticResource Optimizer_Border}">
+      <Border Grid.Row="1" Margin="0,1,0,2" Style="{StaticResource OnlyProdPage_Border}">
 
          <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                       ItemsSource="{Binding TableRowList}"
@@ -40,7 +41,7 @@
                                       AlternationCount="2"
                                       ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                                       CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                      Style="{StaticResource Optimizer_DataGrid}">
+                                      Style="{StaticResource DataGrid_OnlyProd}">
 
             <DataGrid.RowStyle>
                <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
@@ -67,14 +68,14 @@
                <DataGridCheckBoxColumn x:Key="colON" Binding="{Binding OnPar, UpdateSourceTrigger=PropertyChanged}"
                                        CellStyle="{StaticResource DataGridCheckBoxColumn_Style}">
                   <DataGridCheckBoxColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.OnHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.OnHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
                   </DataGridCheckBoxColumn.Header>
                </DataGridCheckBoxColumn>
 
                <!--Colonna Name-->
                <DataGridTemplateColumn x:Key="colNAME">
                   <DataGridTemplateColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
                   </DataGridTemplateColumn.Header>
                   <DataGridTemplateColumn.CellEditingTemplate>
                      <DataTemplate>
@@ -95,7 +96,7 @@
                <!--Colonna Style-->
                <DataGridTemplateColumn x:Key="colTYPE">
                   <DataGridTemplateColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.TypeHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.TypeHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
                   </DataGridTemplateColumn.Header>
                   <DataGridTemplateColumn.CellEditingTemplate>
                      <DataTemplate>
@@ -132,29 +133,29 @@
                  Command="{Binding MoveRowUp_Command}"
                  Grid.Column="0"
                  Margin="0,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="\/"
                  Command="{Binding MoveRowDown_Command}"
                  Grid.Column="1"
                  Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding AddRowMsg}"
                  Command="{Binding AddRow_Command}"
                  Grid.Column="2"
                  Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding DeleteRowMsg}"
                  Command="{Binding DeleteRow_Command}"
                  Grid.Column="3"
                  Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding SaveMsg}"
                  Command="{Binding Save_Command}"
                  Grid.Column="4"
                  Margin="2.5,0,0,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
 
       </Grid>
 
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
 
    Sub New(Owner As System.Windows.Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = BeamMachiningsWindowVM

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml

@@ -12,38 +12,37 @@
       <RowDefinition Height="1*"/>
       <RowDefinition Height="1*"/>
    </Grid.RowDefinitions>
-   <StackPanel Style="{StaticResource List_StackPanel}">
+   <StackPanel Margin="5,5,5,0">
       <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Style="{StaticResource Warehouse_GroupBox}">
-         <UniformGrid Rows="2"
-                      Style="{StaticResource General_UniformGrid}">
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" 
-                      SelectedItem="{Binding SelectedLanguage}"
-                      DisplayMemberPath="Name" 
-                      Style="{StaticResource General_ComboBox}"/>
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" 
-                       Style="{StaticResource General_TextBlock}"/>
+                Margin="0,0,0,5"
+                Foreground="{StaticResource BeamWall_Corduroy}">
+         <UniformGrid Rows="2" Margin="3,3,3,3">
+            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
+                      DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
+                      Margin="0,0,0,5" Style="{StaticResource OnlyProd_ComboBox}" />
+            <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
+                       TextAlignment="Center"/>
          </UniformGrid>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <TextBlock Text="{Binding MMUnits_Msg}" 
-                    Style="{StaticResource MMUnits_TextBlock}"/>
+                   Margin="0,0,0,5">
+         <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
          <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" 
-                   Style="{StaticResource UnitMeasureList_ComboBox}"/>
+                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
+                   Margin="0,5,0,0" Style="{StaticResource OnlyProd_ComboBox}" />
       </UniformGrid>
       <GroupBox Header="{Binding Nesting_Msg}"
-                Style="{StaticResource Warehouse_GroupBox}">
+                Margin="0,0,0,5"
+                Foreground="{StaticResource BeamWall_Corduroy}">
          <StackPanel>
             <UniformGrid Columns="2"
-                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                         Margin="0,0,0,5">
                <TextBlock Text="{Binding SectionTime_Msg}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"/>
             </UniformGrid>
             <UniformGrid Columns="2"
-                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                         Margin="0,0,0,5">
                <TextBlock Grid.Row="1" Text="{Binding PartTime_Msg}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1" 
                                       Grid.Column="1"
@@ -52,14 +51,13 @@
          </StackPanel>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <TextBlock Text="{Binding PrintLabel_Msg}"
-                    Style="{StaticResource MMUnits_TextBlock}"/>
+                   Margin="0,0,0,5">
+         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
          <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Style="{StaticResource General_CheckBox}"/>
+                   Margin="0,5,0,0"/>
       </UniformGrid>
       <GroupBox Header="Backup And Restore"
-                Style="{StaticResource Optimizer_GroupBox}">
+                Foreground="{StaticResource BeamWall_Corduroy}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -67,33 +65,36 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Grid Style="{StaticResource General_Grid}">
+            <Grid Margin="0,2,0,5">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
                <CheckBox x:Name="ExternalBackup_CheckBox"
                          IsChecked="{Binding bExternalBackupActive}"
-                         Style="{StaticResource PParameters_CheckBox}"/>
+                         VerticalAlignment="Center"/>
                <TextBlock Grid.Column="1"
                           Text="External file path:"
-                          Style="{StaticResource Ext_TextBlock}"/>
+                          VerticalAlignment="Center"/>
             </Grid>
             <Grid Grid.Row="1"
-                  Style="{StaticResource General_Grid}">
+                  Margin="0,2,0,5">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
                <TextBox Text="{Binding ExternalBackupFolderPath}"
                         IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                        Style="{StaticResource General_TextBox}"/>
+                        Margin="0,0,2.5,0"/>
                <Button Grid.Column="1"
                        Content="..."
                        Foreground="{StaticResource BeamWall_White}"
+                       Width="20"
+                       Height="20"
                        Command="{Binding ChooseExternalBackupFolderPath_Command}"
                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Style="{StaticResource General_Button}"/>
+                       Margin="2.5,0,0,0"
+                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
             </Grid>
             <Grid Grid.Row="2">
                <Grid.ColumnDefinitions>
@@ -104,25 +105,25 @@
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding ReminderList}"
                          SelectedItem="{Binding SelReminder}"
-                         Style="{StaticResource GeneralConfiguration_ComboBox}" />
+                         Margin="0,0,0,5" Style="{StaticResource OnlyProd_ComboBox}" />
             </Grid>
             <StackPanel Grid.Row="3"
-                        Style="{StaticResource PartManager_StackPanel}">
+                        Orientation="Horizontal">
                <Button Content="Backup"
                        Command="{Binding Backup_Command}"
-                       Style="{StaticResource MovePartInRawPartWnd_Button}"/>
+                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"
+                       Margin="0,0,5,0"/>
                <Button Content="Restore"
                        Command="{Binding Restore_Command}"
-                       Style="{StaticResource EgtWPFLib5_Button}"/>
+                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
             </StackPanel>
          </Grid>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Style="{StaticResource GeneralConfiguration_UniformGrid}">
-         <TextBlock Text="Importa BTL con verifica" 
-                    Style="{StaticResource MMUnits_TextBlock}"/>
+                   Margin="0,5,0,0">
+         <TextBlock Text="Importa BTL con verifica" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
          <CheckBox IsChecked="{Binding bVerifyImportBTL_IsChecked}"
-                   Style="{StaticResource General_CheckBox}"/>
+                   Margin="0,5,0,0"/>
       </UniformGrid>
    </StackPanel>
 

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml

@@ -14,36 +14,30 @@
    </Grid.RowDefinitions>
 
    <StackPanel Orientation="Horizontal">
-      <GroupBox Style="{StaticResource MachineConfiguration_GroupBox}">
+      <GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
          <EgtBEAMWALLCORE:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
       </GroupBox>
    </StackPanel>
 
-   <StackPanel Grid.Row="1"
-               Visibility="{Binding MachineParameter_Visibility}"
-               Style="{StaticResource PartManager_StackPanel}">
+   <StackPanel Grid.Row="1" Orientation="Horizontal" Visibility="{Binding MachineParameter_Visibility}">
       <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel"
-                           Style="{StaticResource PartManager_StackPanel}"/>
+               <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
             </ItemsPanelTemplate>
          </ItemsControl.ItemsPanel>
          <ItemsControl.ItemTemplate>
             <DataTemplate>
-               <GroupBox Header="{Binding sName}" 
-                         Style="{StaticResource MachineParam_GroupBox}">
-                  <ItemsControl Name="MachParamsItemsControl" 
-                                ItemsSource="{Binding MachParamList}" 
-                                Style="{StaticResource MachinePanel_ItemsControl}">
+               <GroupBox Header="{Binding sName}" Width="Auto" VerticalAlignment="Top" Height="Auto" Foreground="{StaticResource BeamWall_Corduroy}">
+                  <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
                      <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                           <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
+                           <WrapPanel Orientation="Vertical"/>
                         </ItemsPanelTemplate>
                      </ItemsControl.ItemsPanel>
                      <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                           <Grid Style="{StaticResource MachParam_Grid}">
+                           <Grid Margin="0,0,5,5">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="*" />
                                  <ColumnDefinition Width="*" />
@@ -51,14 +45,18 @@
                               </Grid.ColumnDefinitions>
                               <TextBlock Text="{Binding sName}"
                                          ToolTip="{Binding sName}"
-                                         Style="{StaticResource MachinePanel_TextBlock}"/>
+                                         TextWrapping="WrapWithOverflow"
+                                         Width="150"
+                                         Style="{StaticResource MachParamTextBlock}"/>
                               <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                                      Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Style="{StaticResource MachineConfiguration_TextBox}"/>
+                                                     Width="60"/>
                               <TextBlock Grid.Column="2"
                                          Text="{Binding sDescription}"
                                          ToolTip="{Binding sDescription}"
-                                         Style="{StaticResource Description_TextBlock}"/>
+                                         TextWrapping="WrapWithOverflow"
+                                         Width="148"
+                                         Style="{StaticResource MachParamTextBlock}"/>
                            </Grid>
                         </DataTemplate>
                      </ItemsControl.ItemTemplate>
@@ -74,8 +72,7 @@
            ToolTip="{Binding SaveToolTip}"
            Visibility="{Binding Machine_Visibility}"
            Style="{StaticResource SaveMachinePanel_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
    </Button>
 
 </Grid>

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -35,7 +35,7 @@ Public Module ConstGen
       CONFIG = 3
       INPUTS = 4
       OUTPUTS = 5
-      OPTIMIZERPAGE = 6
+      ONLYPRODPAGE = 6
       CONFIGPROGRAM = 7
    End Enum
 
@@ -90,8 +90,6 @@ Public Module ConstGen
    Public Const MACHINES_DFL_DIR As String = "Machines"
    ' Sottodirettorio di default per toolmakers
    Public Const TOOLMAKERS_DFL_DIR As String = "ToolMakers"
-   ' Sottodirettorio di immagini
-   Public Const IMAGE_DIR As String = "Image"
    ' Nome file Lua con le funzioni di attrezzaggio
    Public Const SETUP_LUA As String = "SetUp.lua"
    ' Nome eseguibile per stampa

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -56,9 +56,6 @@
     <Reference Include="EgwProxy.LiMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EgwProxy.LiMan.1.0.2408.718\lib\EgwProxy.LiMan.dll</HintPath>
     </Reference>
-    <Reference Include="EgwWPFBaseLib, Version=2.7.11.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgwWPFBaseLib.2.7.11-beta.4\lib\EgwWPFBaseLib.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
@@ -119,6 +116,10 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
+    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
+      <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
     <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
     <Compile Include="ConfigurationPage\Machine_ConfigurationPageV.xaml.vb">
@@ -182,10 +183,6 @@
     <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
       <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="OptmizerWindow\OptimizerWindow.vb" />
-    <Compile Include="TitleBar\TitleBarV.xaml.vb">
-      <DependentUpon>TitleBarV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Utility\Configuration.vb" />
     <Compile Include="ProjectFileVM\ProdItem.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
@@ -257,6 +254,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ConfigurationPage\Machine_ConfigurationPageV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -301,23 +302,12 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="TitleBar\TitleBarV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ViewPanel\ViewPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\EgalwareLogo.ico" />
-    <Content Include="Resources\PartManager\Locked.old.png" />
-    <Content Include="Resources\PartManager\Unlocked.old.png" />
     <Content Include="Resources\ProjectManager\Save.png" />
   </ItemGroup>
   <ItemGroup>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml

@@ -1,218 +1,268 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtColorPickerV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding sTitle}"
-                                 WindowStartupLocation="CenterOwner"
-                                 SizeToContent="WidthAndHeight"
-                                 ShowInTaskbar="False"
-                                 Width="750" Height="450"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+<EgtWPFLib5:EgtCustomWindow x:Class="EgtColorPickerV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding sTitle}"
+                            WindowStartupLocation="CenterOwner"
+                            SizeToContent="WidthAndHeight"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            IsMinimizable="False" ShowInTaskbar="False"
+                            Width="750" Height="450"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   
+   <Grid Margin="5,5,5,0">
+   <Grid.RowDefinitions>
+      <RowDefinition Height="1*"/>
+      <RowDefinition Height="Auto"/>
+   </Grid.RowDefinitions>
+   <Grid Margin="5,5,5,0">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+      <Grid Margin="5,5,5,0">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+         <TabControl>
+            <TabItem Header="{Binding BasicColor_Msg}">
+               <Grid HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <ListBox ItemsSource="{Binding BasicColors}"
+                              SelectedItem="{Binding SelColor}"
+                              HorizontalAlignment="Center"
+                              BorderThickness="0">
+                     <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                           <UniformGrid Columns="13"/>
+                        </ItemsPanelTemplate>
+                     </ListBox.ItemsPanel>
+                     <ListBox.ItemTemplate>
+                        <DataTemplate>
+                           <Rectangle Width="20"
+                                      Height="20"
+                                      Margin="2"
+                                      Stroke="Black" 
+                                      StrokeThickness="0.5"
+                                      Fill="{Binding Fill}"/>
+                        </DataTemplate>
+                     </ListBox.ItemTemplate>
+                     <ListBox.ItemContainerStyle>
+                        <Style TargetType="ListBoxItem">
+                           <Setter Property="Margin" Value="0"/>
+                           <Setter Property="Padding" Value="0"/>
+                        </Style>
+                     </ListBox.ItemContainerStyle>
+                  </ListBox>
+               </Grid>
+            </TabItem>
+            <TabItem Header="{Binding ColorPicker_Msg}">
+               <TabItem.Resources>
+                  <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
+                     <Setter Property="BorderThickness" Value="1.5"/>
+                     <Setter Property="BorderBrush" Value="White"/>
+                  </Style>
+               </TabItem.Resources>
+               <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
+                                         SelectedItem="{Binding sHexSelColor}"
+                                         Orientation="Vertical" 
+                                         Margin="2.5"
+                                         RowCount="13" 
+                                         ColumnCount="13"
+                                         Height="300"
+                                         Width="350"
+                                         Style="{StaticResource EgtHexList}">
+                  <EgtWPFLib5:EgtHexList.ItemTemplate>
+                     <DataTemplate/>
+                  </EgtWPFLib5:EgtHexList.ItemTemplate>
+                  <EgtWPFLib5:EgtHexList.ItemContainerStyle>
+                     <Style TargetType="EgtWPFLib5:EgtHexItem" BasedOn="{StaticResource EgtHexItem}">
+                        <Setter Property="Grid.Row" Value="{Binding nRow}"/>
+                        <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
+                        <Setter Property="Background" Value="{Binding Background}"/>
+                     </Style>
+                  </EgtWPFLib5:EgtHexList.ItemContainerStyle>
+               </EgtWPFLib5:EgtHexList>
+            </TabItem>
+            <TabItem Header="{Binding ColorPickerTheme_Msg}">
+               <Grid HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <ListBox ItemsSource="{Binding BasicColorsTheme}"
+                              SelectedItem="{Binding SelColorTheme}"
+                              BorderThickness="0">
+                     <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                           <UniformGrid Columns="13"/>
+                        </ItemsPanelTemplate>
+                     </ListBox.ItemsPanel>
+                     <ListBox.ItemTemplate>
+                        <DataTemplate>
+                           <Rectangle Width="20"
+                                         Height="20"
+                                         Margin="2"
+                                         Stroke="Black" 
+                                         StrokeThickness="0.5"
+                                         Fill="{Binding Fill}"/>
+                        </DataTemplate>
+                     </ListBox.ItemTemplate>
+                     <ListBox.ItemContainerStyle>
+                        <Style TargetType="ListBoxItem">
+                           <Setter Property="Margin" Value="0"/>
+                           <Setter Property="Padding" Value="0"/>
+                        </Style>
+                     </ListBox.ItemContainerStyle>
+                  </ListBox>
+               </Grid>
+            </TabItem>
+         </TabControl>
+      </Grid>
+      <Grid Grid.Column="1"
+               Margin="5,0,0,0">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <TextBlock Text="{Binding CustomColor_Msg}"
+                       Margin="5,18,5,10"
+                       Style="{StaticResource DialogWindow_TextBlock}"/>
+         <Grid Grid.Row="1">
             <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
-            <TabControl>
-               <TabItem Header="{Binding BasicColor_Msg}">
-                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <ListBox ItemsSource="{Binding BasicColors}"
-                              SelectedItem="{Binding SelColor}"
-                              Style="{StaticResource EgtColorPicker_ListBox}">
-                        <ListBox.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <UniformGrid Columns="13"/>
-                           </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Rectangle Fill="{Binding Fill}"
-                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemContainerStyle>
-                           <Style TargetType="ListBoxItem">
-                              <Setter Property="Margin" Value="0"/>
-                              <Setter Property="Padding" Value="0"/>
-                           </Style>
-                        </ListBox.ItemContainerStyle>
-                     </ListBox>
-                  </Grid>
-               </TabItem>
-               <TabItem Header="{Binding ColorPicker_Msg}">
-                  <TabItem.Resources>
-                     <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
-                        <Setter Property="BorderThickness" Value="1.5"/>
-                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
-                     </Style>
-                  </TabItem.Resources>
-                  <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
-                                         SelectedItem="{Binding sHexSelColor}"
-                                         Style="{StaticResource EgtHexList}">
-                     <EgtWPFLib5:EgtHexList.ItemTemplate>
-                        <DataTemplate/>
-                     </EgtWPFLib5:EgtHexList.ItemTemplate>
-                     <EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                        <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
-                           <Setter Property="Grid.Row" Value="{Binding nRow}"/>
-                           <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
-                           <Setter Property="Background" Value="{Binding Background}"/>
-                        </Style>
-                     </EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                  </EgtWPFLib5:EgtHexList>
-               </TabItem>
-               <TabItem Header="{Binding ColorPickerTheme_Msg}">
-                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <ListBox ItemsSource="{Binding BasicColorsTheme}"
-                              SelectedItem="{Binding SelColorTheme}"
-                              Style="{StaticResource BasicColor_ListBox}">
-                        <ListBox.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <UniformGrid Columns="13"/>
-                           </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Rectangle Fill="{Binding Fill}"
-                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemContainerStyle>
-                           <Style TargetType="ListBoxItem">
-                              <Setter Property="Margin" Value="0"/>
-                              <Setter Property="Padding" Value="0"/>
-                           </Style>
-                        </ListBox.ItemContainerStyle>
-                     </ListBox>
-                  </Grid>
-               </TabItem>
-            </TabControl>
-         </Grid>
-         <Grid Grid.Column="1"
-               Style="{StaticResource CustomerColor_Grid}">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <TextBlock Text="{Binding CustomColor_Msg}"
-                       Style="{StaticResource EgtColorPicker_TextBlock}"/>
-            <Grid Grid.Row="1">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <ListBox ItemsSource="{Binding CustomColors}"
+            <ListBox ItemsSource="{Binding CustomColors}"
                         SelectedItem="{Binding SelCustomColor}"
-                        Style="{StaticResource CustomerColor_ListBox}">
-                  <ListBox.ItemsPanel>
-                     <ItemsPanelTemplate>
-                        <UniformGrid Columns="13"/>
-                     </ItemsPanelTemplate>
-                  </ListBox.ItemsPanel>
-                  <ListBox.ItemTemplate>
-                     <DataTemplate>
-                        <Rectangle Fill="{Binding Fill}"
-                                   Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-                  <ListBox.ItemContainerStyle>
-                     <Style TargetType="ListBoxItem">
-                        <Setter Property="Margin" Value="0"/>
-                        <Setter Property="Padding" Value="0"/>
-                     </Style>
-                  </ListBox.ItemContainerStyle>
-               </ListBox>
-            </Grid>
-            <Grid Grid.Row="2"
-                  Style="{StaticResource CurrColor_Grid}">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid Style="{StaticResource AddColor_Grid}">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="Auto"/>
-                  </Grid.RowDefinitions>
-                  <Rectangle Fill="{Binding CurrColor}"
-                             Style="{StaticResource CurrColor_Rectangle}"/>
-                  <Button Grid.Row="1"
-                          x:Name="SaveColor"                          
+                        HorizontalAlignment="Center"
+                        Background="Transparent"
+                        BorderThickness="0">
+               <ListBox.ItemsPanel>
+                  <ItemsPanelTemplate>
+                     <UniformGrid Columns="13"/>
+                  </ItemsPanelTemplate>
+               </ListBox.ItemsPanel>
+               <ListBox.ItemTemplate>
+                  <DataTemplate>
+                     <Rectangle Width="20"
+                                   Height="20"
+                                   Margin="2"
+                                   Stroke="Black" 
+                                   StrokeThickness="0.5"
+                                   Fill="{Binding Fill}"/>
+                  </DataTemplate>
+               </ListBox.ItemTemplate>
+               <ListBox.ItemContainerStyle>
+                  <Style TargetType="ListBoxItem">
+                     <Setter Property="Margin" Value="0"/>
+                     <Setter Property="Padding" Value="0"/>
+                  </Style>
+               </ListBox.ItemContainerStyle>
+            </ListBox>
+         </Grid>
+         <Grid Grid.Row="2"
+                  Margin="0,20,0,0">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid Margin="0,10,5,0"
+                     HorizontalAlignment="Left">
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Rectangle Width="100" 
+                             Height="70" 
+                             Stroke="Black" 
+                             StrokeThickness="0.5"
+                             Fill="{Binding CurrColor}"/>
+               <Button x:Name="SaveColor"
+                          Grid.Row="1"
+                          Margin="0,10,0,0"
                           Content="{Binding AddCColor_Msg}"
                           Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource EgtColorPicker_TextButton}"/>
-               </Grid>
-               <Grid Grid.Column="1">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="1*"/>
-                     <ColumnDefinition Width="1*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <TextBlock Text="{Binding Red_Msg}"
-                             Style="{StaticResource RedColor_TextBlock}"/>
-                  <TextBox Grid.Column="1" 
+                          Style="{StaticResource LeftPanel_TextButton}"/>
+            </Grid>
+            <Grid Grid.Column="1">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+               <TextBlock Text="{Binding Red_Msg}"
+                             Margin="0,10,5,0"
+                             HorizontalAlignment="Right"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+               <TextBox Grid.Column="1" 
+                           HorizontalAlignment="Right"
+                           Margin="0,5,5,0"
+                           IsReadOnly="False"
                            Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource RedColor_TextBox}"/>
-                  <TextBlock Grid.Row="1"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+               <TextBlock Grid.Row="1"
                              Text="{Binding Green_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
-                  <TextBox Grid.Column="1"
+                             Margin="5,5,5,0"
+                             HorizontalAlignment="Right"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+               <TextBox Grid.Column="1"
                            Grid.Row="1"
+                           HorizontalAlignment="Right"
+                           Margin="5,5,5,0"
+                           IsReadOnly="False"
                            Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
-                  <TextBlock Grid.Row="2"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+               <TextBlock Grid.Row="2"
                              Text="{Binding Blu_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
-                  <TextBox Grid.Row="2"
-                           Grid.Column="1"
+                             Margin="5,5,5,0"
+                             HorizontalAlignment="Right"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+               <TextBox Grid.Column="1"
+                           Grid.Row="2"
+                           HorizontalAlignment="Right"
+                           Margin="5,5,5,0"
+                           IsReadOnly="False"
                            Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
-                  <TextBlock Grid.Row="3"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+               <TextBlock Grid.Row="3"
                              Text="{Binding Hexadecimal_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
-                  <TextBox Grid.Row="3"
-                           Grid.Column="1"                           
+                             Margin="5,5,5,0"
+                             HorizontalAlignment="Right"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+               <TextBox Grid.Column="1"
+                           Grid.Row="3"
+                           HorizontalAlignment="Right"
+                           Margin="5,5,5,0"
                            Text="{Binding Hexadecimal}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
-               </Grid>
+                           Style="{StaticResource ColorPicker_TextBox}"/>
             </Grid>
          </Grid>
       </Grid>
-      <UniformGrid Grid.Row="2"  
+   </Grid>
+   <UniformGrid Grid.Row="2"  
                    Rows="1"
-                   Style="{StaticResource EgtColorPicker_UniformGrid}">
-         <Button IsDefault="True"
+                   Margin="10,10,10,0">
+      <Button IsDefault="True"
                  Content="OK"
                  Command="{Binding Ok_Command}"
-                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
-         <Button Content="Cancel"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+      <Button Content="Cancel"
                  Command="{Binding Cancel_Command}"
-                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
-      </UniformGrid>
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+   </UniformGrid>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb

@@ -35,6 +35,7 @@ Public Class EgtColorPickerV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As Window, EtgColorPickerVM As EgtColorPickerVM)
+      MyBase.New(Owner)
       InitializeComponent()
       Me.DataContext = EtgColorPickerVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml

@@ -1,22 +1,22 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtManageFileDialogV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding sTitle}"
-                                 WindowStartupLocation="CenterOwner"
-                                 ShowInTaskbar="False"
-                                 Height="500" Width="800"
-                                 Style="{StaticResource OptimizerWindow.Dialog}">
-
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+<EgtWPFLib5:EgtCustomWindow x:Class="EgtManageFileDialogV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding sTitle}"
+                            WindowStartupLocation="CenterOwner"
+                            WindowStyle="None" ResizeMode="NoResize" 
+                            IsMinimizable="False" ShowInTaskbar="False"
+                            Height="500" Width="800"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+      <Grid Margin="5,5,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
@@ -28,35 +28,44 @@
                    Style="{StaticResource Button_Image}"/>
          </Button>
          <TextBlock Grid.Column="1"
+                    Margin="5"
                     Text="{Binding sSelPath}"
-                    Style="{StaticResource EgtManageDialog_TextBlock}"/>
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
          <ComboBox Grid.Column="2"
+                   HorizontalAlignment="Right"
+                   IsSynchronizedWithCurrentItem="True"
                    ItemsSource="{Binding ViewModeList}"
                    SelectedItem="{Binding SelViewMode}"
-                   Style="{StaticResource EgtManageDialog_ComboBox}"/>
+                   Margin="2.5,5,2.5,5"
+                   Style="{StaticResource RightPanel_ComboBox}"/>
       </Grid>
       <Grid Grid.Row="1"
-            Style="{StaticResource AddRawPartWnd_Grid}">
+            Margin="5,5,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="4*"/>
          </Grid.ColumnDefinitions>
          <TreeView x:Name="FileTree" 
                    ItemsSource="{Binding RootList}"                   
-                   Style="{StaticResource EgtManageDialog_TreeView}">
+                   Margin="10"
+                   FontSize="15"
+                   BorderBrush="White">
             <TreeView.Resources>
                <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
                                          ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal">
                      <Image Source="{Binding sIconSource}"
+                            Height="15"
                             Style="{StaticResource Button_Image}"/>
                      <TextBlock Text="{Binding sName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
                </HierarchicalDataTemplate>
                <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal">
                      <Image Source="{Binding sIconSource}"
+                            Height="15"
                             Style="{StaticResource Button_Image}"/>
                      <TextBlock Text="{Binding sName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
@@ -71,27 +80,34 @@
             </TreeView.ItemContainerStyle>
          </TreeView>
          <TabControl Grid.Column="1"
-                     SelectedIndex="{Binding nSelTab}"
-                     Style="{StaticResource EgtManageDialog_TabControl}">
+                     Background="Transparent"
+                     BorderBrush="White"
+                     BorderThickness="0"
+                     SelectedIndex="{Binding nSelTab}">
             <TabControl.ItemContainerStyle>
                <Style TargetType="{x:Type TabItem}">
                   <Setter Property="Visibility" Value="Collapsed"/>
                </Style>
             </TabControl.ItemContainerStyle>
             <TabItem Header="LISTBOX">
-               <ListBox Grid.Row="1"
-                        x:Name="FileList"                         
+               <ListBox x:Name="FileList" 
+                        Grid.Row="1"
+                        Margin="5,5,5,5"
+                        BorderBrush="White"
+                        IsSynchronizedWithCurrentItem="True"
                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
                         SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
                   <ListBox.Resources>
                      <DataTemplate x:Key="ListTemplateView" 
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource EgtManageDialog_Grid}">
+                        <Grid Margin="5,5,5,0"
+                              Height="20">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="Auto"/>
                            </Grid.ColumnDefinitions>
                            <Image Source="{Binding sIconSource}"
+                                  Height="15"
                                   Style="{StaticResource Button_Image}"/>
                            <TextBlock Grid.Column="1"
                                       Text="{Binding sName}"
@@ -100,7 +116,9 @@
                      </DataTemplate>
                      <DataTemplate x:Key="TilesTemplateView"
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource EgtDirectory_Grid}">
+                        <Grid Margin="5,5,5,0"
+                              Height="50"
+                              Width="250">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="1*"/>
@@ -109,19 +127,26 @@
                                   Style="{StaticResource Button_Image}"/>
                            <UniformGrid Grid.Column="1"
                                         Rows="3"
-                                        Style="{StaticResource EgtManageDialog_UniformGrid}">
-                              <TextBlock Text="{Binding sName}"
-                                         Style="{StaticResource Info_TextBlock}"/>
-                              <TextBlock Text="{Binding ghTypeItem}"
-                                         Style="{StaticResource Info_TextBlock}"/>
-                              <TextBlock Text="{Binding sDimension}"
-                                         Style="{StaticResource Info_TextBlock}"/>
+                                        Margin="2.5,0,2.5,5">
+                              <TextBlock TextAlignment="Left"
+                                         Text="{Binding sName}"
+                                         HorizontalAlignment="Left"
+                                         Style="{StaticResource DialogWindow_TextBlock}"/>
+                              <TextBlock TextAlignment="Left"
+                                         Text="{Binding ghTypeItem}"
+                                         HorizontalAlignment="Left"
+                                         Style="{StaticResource DialogWindow_TextBlock}"/>
+                              <TextBlock TextAlignment="Left"
+                                         Text="{Binding sDimension}"
+                                         HorizontalAlignment="Left"
+                                         Style="{StaticResource DialogWindow_TextBlock}"/>
                            </UniformGrid>
                         </Grid>
                      </DataTemplate>
                      <DataTemplate x:Key="ContentTemplateView"
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource ContentTemplate_Grid}">
+                        <Grid Margin="5,5,5,0"
+                              Height="50">
                            <Grid.RowDefinitions>
                               <RowDefinition Height="1*"/>
                               <RowDefinition Height="Auto"/>
@@ -136,23 +161,32 @@
                                      Style="{StaticResource Button_Image}"/>
                               <UniformGrid Grid.Column="1"
                                            Rows="2"
-                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
-                                 <TextBlock Text="{Binding sName}"
-                                            Style="{StaticResource Info_TextBlock}"/>
-                                 <TextBlock Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource Info_TextBlock}"/>
+                                           Margin="2.5,0,2.5,5">
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding sName}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding ghTypeItem}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                               </UniformGrid>
                               <UniformGrid Grid.Column="2"
                                            Rows="2"
-                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
-                                 <TextBlock Text="{Binding sLastModifyDate}"
-                                            Style="{StaticResource Info_TextBlock}"/>
-                                 <TextBlock Text="{Binding sDimension}"
-                                            Style="{StaticResource Info_TextBlock}"/>
+                                           Margin="2.5,0,2.5,5">
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding sLastModifyDate}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding sDimension}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                               </UniformGrid>
                            </Grid>
                            <Border Grid.Row="1"
-                                   Style="{StaticResource EgtManageDialog_Border}"/>
+                                   BorderThickness="1"
+                                   BorderBrush="LightGray"/>
                         </Grid>
                      </DataTemplate>
                   </ListBox.Resources>
@@ -162,13 +196,13 @@
                            <ContentControl.Style>
                               <Style TargetType="{x:Type ContentControl}">
                                  <Style.Triggers>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="0">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="0">
                                        <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
                                     </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="1">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
                                        <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
                                     </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="2">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="2">
                                        <Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
                                     </DataTrigger>
                                  </Style.Triggers>
@@ -185,42 +219,40 @@
                   </ListBox.ItemContainerStyle>
                   <ListBox.Style>
                      <Style TargetType="{x:Type ListBox}">
-                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
-                        <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
-                        <Setter Property="Margin" Value="5"/>
                         <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
                                         Value="0">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
+                                       <WrapPanel Orientation="Vertical"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
                            </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
                                         Value="1">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <WrapPanel Style="{StaticResource ProjectH_WrapPanel}"/>
+                                       <WrapPanel Orientation="Horizontal"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
                            </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
                                         Value="2">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <StackPanel Style="{StaticResource EgtManageDialog_StackPanel}"/>
+                                       <StackPanel Orientation="Vertical"
+                                                   HorizontalAlignment="Stretch"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
@@ -241,16 +273,16 @@
                          SelectedItem="{Binding ItemSelected}"
                          RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
                          CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                         Style="{StaticResource Optimizer_DataGrid}">
+                         Style="{StaticResource DataGrid_OnlyProd}">
                   <DataGrid.ColumnHeaderStyle>
                      <Style TargetType="{x:Type DataGridColumnHeader}">
                         <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
                         <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
                         <Setter Property="HorizontalContentAlignment" Value="Center"/>
                         <Setter Property="FontWeight" Value="Bold"/>
                         <Setter Property="FontSize" Value="15"/>
                         <Setter Property="Padding" Value="1"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
                         <Setter Property="BorderThickness" Value="0,0,1,1"/>
                      </Style>
                   </DataGrid.ColumnHeaderStyle>
@@ -259,7 +291,7 @@
                         <DataGridTemplateColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                                         HorizontalAlignment="Left"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
                         <DataGridTemplateColumn.CellTemplate>
@@ -270,80 +302,115 @@
                                     <ColumnDefinition Width="1*"/>
                                  </Grid.ColumnDefinitions>
                                  <Image Source="{Binding sIconSource}"
-                                        Style="{StaticResource Source_Image}"/>
+                                        Margin="2.5,0,2.5,0"
+                                        Style="{StaticResource Button_Image}"/>
                                  <TextBlock Grid.Column="1"
                                             Text="{Binding sName}"
-                                            Style="{StaticResource NameImage_TextBlock}"/>
+                                            VerticalAlignment="Center"
+                                            Margin="2.5,0,0,0"/>
                               </Grid>
                            </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                      </DataGridTemplateColumn>
                      <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*"
-                                         ElementStyle="{StaticResource DataGrid_TextBlock}">
+                                         Width="2*">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                                         HorizontalAlignment="Left"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
+                        <DataGridTextColumn.ElementStyle>
+                           <Style TargetType="TextBlock">
+                              <Setter Property="HorizontalAlignment" Value="Left"/>
+                              <Setter Property="VerticalAlignment" Value="Center"/>
+                              <Setter Property="TextAlignment" Value="Left"/>
+                              <Setter Property="Padding" Value="12,6,12,6"/>
+                           </Style>
+                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                      <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*"
-                                         ElementStyle="{StaticResource DataGrid_TextBlock}">
+                                         Width="1*">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                                         HorizontalAlignment="Left"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
+                        <DataGridTextColumn.ElementStyle>
+                           <Style TargetType="TextBlock">
+                              <Setter Property="HorizontalAlignment" Value="Left"/>
+                              <Setter Property="VerticalAlignment" Value="Center"/>
+                              <Setter Property="TextAlignment" Value="Left"/>
+                              <Setter Property="Padding" Value="12,6,12,6"/>
+                           </Style>
+                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                      <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*"
-                                         ElementStyle="{StaticResource DataGridR_TextBlock}">
+                                         Width="1*">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                                         HorizontalAlignment="Left"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
+                        <DataGridTextColumn.ElementStyle>
+                           <Style TargetType="TextBlock">
+                              <Setter Property="HorizontalAlignment" Value="Right"/>
+                              <Setter Property="VerticalAlignment" Value="Center"/>
+                              <Setter Property="TextAlignment" Value="Right"/>
+                              <Setter Property="Padding" Value="12,6,12,6"/>
+                           </Style>
+                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                   </DataGrid.Columns>
                   <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
+                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
                   </DataGrid.InputBindings>
                </DataGrid>
             </TabItem>
          </TabControl>
       </Grid>
       <Grid Grid.Row="2" 
-            Style="{StaticResource AddRawPartWnd_Grid}">
+            Margin="5,5,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
-         <TextBlock Text="{Binding FileName_Msg}"
-                    Style="{StaticResource FileName_TextBlock}"/>
+         <TextBlock Margin="5,5,5,5"
+                    Text="{Binding FileName_Msg}"
+                    HorizontalAlignment="Right"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
          <TextBox Grid.Column="1"
+                  Margin="2.5,2.5,2.5,5"
+                  TextAlignment="Left"
+                  HorizontalAlignment="Stretch"
                   Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource SaveFileName_TextBox}"/>
+                  Style="{StaticResource ParameterList_TextBox}"/>
          <ComboBox Grid.Column="2"
+                   IsSynchronizedWithCurrentItem="True"
                    ItemsSource="{Binding FilterList}"
                    SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
                    DisplayMemberPath="sNameExstension"
-                   Style="{StaticResource FilterList_ComboBox}"/>
+                   HorizontalAlignment="Right"
+                   Margin="10,2.5,2.5,5"
+                   Style="{StaticResource RightPanel_ComboBox}"/>
       </Grid>
       <UniformGrid Grid.Row="3"  
                    Rows="1"
-                   Style="{StaticResource Command_UniformGrid}">
+                   Margin="2.5,0,2.5,0">
          <Button IsDefault="True"
                  Content="OK"
                  Command="{Binding Ok_Command}"
-                 Style="{StaticResource EgtManageDialogOK_HalfRound_Button}"/>
+                 HorizontalAlignment="Right"
+                 Margin="15,0,2.5,0"
+                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
          <Button Content="Cancel"
                  Command="{Binding Cancel_Command}"
-                 Style="{StaticResource EgtManageDialogCancel_HalfRound_Button}"/>
+                 HorizontalAlignment="Left"
+                 Margin="2.5,0,0,0"
+                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
       </UniformGrid>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb

@@ -108,6 +108,7 @@ Public Class EgtManageFileDialogV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As System.Windows.Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
+      MyBase.New(Owner)
       InitializeComponent()
       Me.DataContext = EgtManageFileDialogVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml

@@ -1,32 +1,34 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtMessageBoxV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding sTitle}"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 ShowInTaskbar="False"
-                                 Style="{StaticResource OptimizerWindow.Dialog}">
-
-   <Grid Style="{StaticResource EgtMessageBox_Grid}">
+<EgtWPFLib5:EgtCustomWindow x:Class="EgtMessageBoxV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding sTitle}"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            WindowStyle="None" ResizeMode="NoResize" 
+                            IsMinimizable="False" ShowInTaskbar="False"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   
+   <Grid Margin="2.5,2.5,2.5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Style="{StaticResource MessageBox_Grid}">
+      <Grid Margin="20,20,20,20">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"/>
+         <Image Source="{Binding sIconSource}"
+                Margin="0,0,0,0"/>
          <TextBlock Grid.Column="1"
                     Text="{Binding sMessage}"
-                    Style="{StaticResource EgtMessageBox_TextBlock}"/>
+                    Margin="5,0,5,0"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
       </Grid>
       <ItemsControl Grid.Row="1"
                     ItemsSource="{Binding ButtonList}"
-                    Style="{StaticResource EgtMessageBox_ItemsControl}">
+                    HorizontalAlignment="Center">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                <UniformGrid Rows="1"/>
@@ -37,9 +39,11 @@
                <Button IsDefault="{Binding bIsDefault}"
                        Content="{Binding sMessage}"
                        Command="{Binding Command_Command}"
-                       Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
+                       Margin="2.5,0,2.5,0"
+                       Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
+
       </ItemsControl>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb

@@ -14,6 +14,7 @@ Public Class EgtMessageBoxV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = EgtMessageBoxVM

EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb

@@ -1,5 +1,4 @@
 Imports System.Threading
-Imports System.Threading.Tasks
 Imports System.Windows.Threading
 
 Public Module LoadingWndHelper

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml

@@ -8,7 +8,7 @@
                             ResizeMode="NoResize" WindowStyle="None"
                             IsClosable="False" IsMinimizable="False"
                             WindowStartupLocation="Manual" ShowInTaskbar="False">
-
+   
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
@@ -23,27 +23,33 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding TotText_Msg}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"/>
       <TextBlock Grid.Row="2"
                  Text="{Binding StepText_Msg}"
-                 Visibility="{Binding StepText_Visibility}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"
+                 Visibility="{Binding StepText_Visibility}"/>
       <Grid Grid.Row="3"
             Visibility="{Binding StepProgress_Visibility}">
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         <Grid Style="{StaticResource EgtManageDialog_Grid}"/>
+         <Grid Height="20"/>
          <ProgressBar Grid.Row="1"
-                      Value="{Binding StepProgress_Value}"
-                      Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
+                   Minimum="0"
+                   Maximum="100"
+                   Value="{Binding StepProgress_Value}"
+                   Height="20"
+                   Margin="40,0,40,0"/>
       </Grid>
       <ProgressBar Grid.Row="5"
+                   Minimum="0"
+                   Maximum="100"
                    Value="{Binding TotProgress_Value}"
-                   Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
+                   Height="20"
+                   Margin="40,0,40,0"/>
       <TextBlock Grid.Row="7"
                  Text="{Binding TotProgress_Msg}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"/>
    </Grid>
 </EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml

@@ -8,34 +8,35 @@
       <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
 
-   <Grid Style="{StaticResource CalcPanel_Grid}">
+   <Grid Margin="0,0,5,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <TextBlock Text="Macchina corrente" 
-                 Style="{StaticResource CurrMach_TextBlock}"/>
+                 VerticalAlignment="Center"  
+                 Margin="0,0,5,0"
+                 Foreground="{StaticResource BeamWall_Corduroy}"/>
       <!--Combobox per selezionare la macchina corrente-->
       <ComboBox Grid.Column="1"
                 ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
                 SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Style="{StaticResource CalcPanel_ComboBox}"/>
+                Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
    </Grid>
-   <StackPanel Grid.Column="1" 
-               Style="{StaticResource MachinePanel_StackPanel}">
+   <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
       <Button Content="{Binding ToolDBMsg}"
               ToolTip="{Binding ToolDBToolTip}"
               Command="{Binding ToolDbCommand}"
-              Style="{StaticResource GeneralConfiguration_Button}"/>
+              Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
       <Button Content="{Binding SetUpMsg}"
               Command="{Binding SetUpCommand}" 
               ToolTip="{Binding SetUpToolTip}"
-              Style="{StaticResource GeneralConfiguration_Button}"
+              Style="{StaticResource GeneralConfigurationToolBar_TextButton}"
               Visibility="{Binding SetUp_Visibility}"/>
       <Button Content="{Binding ParameterMachineMsg}"
               ToolTip="{Binding ParameterMachineMsg}"
               Command="{Binding ParameterMachine_Command}"
-              Style="{StaticResource ParameterMachine_Button}"/>
+              Style="{StaticResource MachineToolBar_ParameterMachineButton}" Width="140"/>
    </StackPanel>
 
 </Grid>

EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml

@@ -1,23 +1,24 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="MachiningDbWindowV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding Title}"
-                                 TitleBarHeight="30"
-                                 WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="MachiningDbWindowV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseMachiningsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
 
-   <EgtBEAMWALLCORE:OptimizerWindow.InputBindings>
+   <EgtWPFLib5:EgtCustomWindow.InputBindings>
       <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
                   CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.InputBindings>
+   </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
-   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
       <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
       <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
       <Grid.ColumnDefinitions>
@@ -33,28 +34,37 @@
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
 
-         <UniformGrid Columns="3">
-            <Button Content="{Binding NewMsg}"
-                    Command="{Binding NewCommand}"
+         <UniformGrid Grid.Row="0" Columns="3">
+            <Button Content="{Binding NewMsg}" Command="{Binding NewCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-            <Button Content="{Binding SaveMsg}" 
-                    Command="{Binding SaveCommand}"
+                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding SaveMsg}" Command="{Binding SaveCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-            <Button Content="{Binding RemoveMsg}" 
-                    Command="{Binding RemoveCommand}"
+                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding RemoveMsg}" Command="{Binding RemoveCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
+                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
          </UniformGrid>
 
-         <TreeView Grid.Row="1"
-                   Name="MachiningsTreeView"
-                   ItemsSource="{Binding Path=MachiningsList}"
-                   Style="{StaticResource MachiningDB_TreeView}">
+         <TreeView Name="MachiningsTreeView" Grid.Row="1"
+                   ItemsSource="{Binding Path=MachiningsList}">
+            <TreeView.Style>
+               <Style TargetType="{x:Type TreeView}">
+                  <Setter Property="Background">
+                     <Setter.Value>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+                           <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+                           <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+                           <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+                        </LinearGradientBrush>
+                     </Setter.Value>
+                  </Setter>
+               </Style>
+            </TreeView.Style>
+
             <TreeView.ItemContainerStyle>
                <Style TargetType="{x:Type TreeViewItem}">
                   <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
@@ -62,63 +72,57 @@
                   <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
                </Style>
             </TreeView.ItemContainerStyle>
+
             <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" 
-                                         ItemsSource="{Binding Items}">
-                  <Grid Style="{StaticResource MachiningDB_Grid}">
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
+
+                  <Grid Height="20">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <Image Source="{Binding PictureString}" 
-                            Style="{StaticResource MachiningDB_Image}"/>
-                     <TextBlock Grid.Column="1" 
-                                Text="{Binding Name}" 
-                                Style="{StaticResource MachiningDB_TextBlock}"/>
-                     <Ellipse Grid.Column="2" 
-                              Fill="{Binding FamilyColor}"
-                              Style="{StaticResource SetUp_Ellipse}"/>
+
+                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
+
                   </Grid>
+
                </HierarchicalDataTemplate>
+
                <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                  <Grid Style="{StaticResource MachiningDB_Grid}">
+                  <Grid Height="20">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <TextBlock Grid.Column="1" 
-                                Text="{Binding NamePar}" 
-                                Style="{StaticResource MachiningDB_TextBlock}"/>
-                     <Ellipse Grid.Column="2" 
-                              Fill="{Binding ToolColor}"
-                              Style="{StaticResource SetUp_Ellipse}"/>
+
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
+
                   </Grid>
                </DataTemplate>
             </TreeView.Resources>
+
          </TreeView>
 
-         <UniformGrid Grid.Row="2" 
-                      Columns="3">
-            <Button Content="{Binding ImportMsg}" 
-                    Command="{Binding ImportCommand}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-            <Button Content="{Binding ExportMsg}" 
-                    Command="{Binding ExportCommand}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-            <Button Content="{Binding ResetMsg}" 
-                    Command="{Binding ReloadMachiningCommand}" 
-                    CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"
-                    Style="{StaticResource MachiningDB_Button}"/>
+         <UniformGrid Grid.Row="2" Columns="3">
+            <Button Content="{Binding ImportMsg}" Command="{Binding ImportCommand}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding ExportMsg}" Command="{Binding ExportCommand}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding ResetMsg}" Command="{Binding ReloadMachiningCommand}" 
+                    CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
          </UniformGrid>
 
       </Grid>
 
-      <ContentControl Grid.Column="1" 
-                      Grid.ColumnSpan="2"
-                      Content="{Binding Path=ParamPageV}"/>
+      <ContentControl Content="{Binding Path=ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
 
    </Grid>
 
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb

@@ -6,6 +6,7 @@ Public Class MachiningDbWindowV
    Private WithEvents m_MachiningDbWindowVM As MachiningDbWindowVM
 
    Sub New(Owner As System.Windows.Window, MachiningDbWindowVM As MachiningDbWindowVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = MachiningDbWindowVM

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -1,7 +1,6 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
-Imports System.Windows
 
 ' General Information about an assembly is controlled through the following
 ' set of attributes. Change these attribute values to modify the information
@@ -25,8 +24,6 @@ Imports System.Windows
 'The following GUID is for the ID of the typelib if this project is exposed to COM
 <Assembly: Guid("632ea0b1-10e2-4f07-8b1b-d9371ef8392e")>
 
-<Assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)>
-
 ' Version information for an assembly consists of the following four values:
 '
 '      Major Version
@@ -38,5 +35,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.11.10")>
-<Assembly: AssemblyFileVersion("2.7.11.10")>
+<Assembly: AssemblyVersion("2.7.1.1")>
+<Assembly: AssemblyFileVersion("2.7.1.1")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -1,18 +1,19 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="NewOpenProjectFileDialogV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding Title}"
-                                 ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-                                  WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                                 MinHeight="500" MinWidth="500"
-                                 DataContext="{Binding RelativeSource={RelativeSource Self}}"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="NewOpenProjectFileDialogV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            IsClosable="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
-   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -23,7 +24,7 @@
 
       <GroupBox Header="{Binding Filters_Msg}"
                 Visibility="{Binding Filters_Visibility}"
-                Style="{StaticResource NewOpenProjectFile_GroupBox}">
+                Margin="5">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -39,28 +40,30 @@
                          SelectedIndex="{Binding SelBTLDateType}"
                          Style="{StaticResource BTLDateTypeList_ComboBox}"/>
                <StackPanel Grid.Column="1" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
                             Style="{StaticResource DayTypeList_ComboBox}"/>
-                  <StackPanel Visibility="{Binding Date_Visibility}"
-                              Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal" 
+                              Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"                                 
-                                 CalendarStyle="{StaticResource Filter_Calendar}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
+                                Style="{StaticResource Filter_TextBlock}"
+                                Foreground="{StaticResource BeamWall_Corduroy}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                                 Style="{StaticResource Filter_DatePicker}"
+                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
                      <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"                                 
-                                 CalendarStyle="{StaticResource Filter_Calendar}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
+                                Style="{StaticResource Filter_TextBlock}"
+                                Foreground="{StaticResource BeamWall_Corduroy}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                                 Style="{StaticResource Filter_DatePicker}"
+                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
                   </StackPanel>
                </StackPanel>
                <CheckBox Grid.Column="2"
                          IsChecked="{Binding bViewArchived}"
                          Content="{Binding ViewArchived_Msg}"
-                         Style="{StaticResource PParameters_CheckBox}"/>
+                         VerticalAlignment="Center"/>
             </Grid>
             <Grid Grid.Row="1">
                <Grid.ColumnDefinitions>
@@ -70,25 +73,27 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Visibility="{Binding SearchText_Visibility}"
                                       Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource Option_TextBlock}"/>
+                             Style="{StaticResource OptionTextBlock}"
+                             Foreground="{StaticResource BeamWall_Corduroy}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource OpenProjectFileDialog_ComboBox}"/>
+                            Style="{StaticResource OnyProd_FeatureComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1" 
-              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
+      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
 
       <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                    x:Name="MainDataGrid"
@@ -102,7 +107,7 @@
                                    AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
                                    AlternationCount="2"
                                    ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   Style="{StaticResource Optimizer_DataGrid}"
+                                   Style="{StaticResource DataGrid_OnlyProd}"
                                    CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
          <DataGrid.Resources>
             <!-- ProdId -->
@@ -124,9 +129,9 @@
                      <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                      <ToggleButton Grid.Column="1"
                                    IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
-                                   Style="{StaticResource Small_ToggleButton}">
+                                   Style="{StaticResource ToolBar_SmallToggleButton}">
                         <Image Source="\Resources\CalcPanel\Edit.png"
-                               Style="{StaticResource Lock_Image}"/>
+                               Style="{StaticResource LockImage}"/>
                      </ToggleButton>
                   </Grid>
                </DataGridTextColumn.Header>
@@ -179,11 +184,12 @@
                               <RowDefinition Height="1"/>
                               <RowDefinition Height="1*"/>
                            </Grid.RowDefinitions>
-                           <Grid Grid.ColumnSpan="2"
+                           <Grid Grid.Row="0"
+                                 Grid.ColumnSpan="2"
                                  Style="{StaticResource Gray_Grid}"/>
                            <Grid Grid.Column="1"
                                  Grid.Row="1"
-                                 Style="{StaticResource NewOpenProjectFile_Grid}">
+                                 Margin="2">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="Auto"/>
                                  <ColumnDefinition Width="1*"/>
@@ -201,8 +207,8 @@
                               <TextBlock Grid.Row="1"
                                          Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
                                          Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Row="1"
-                                         Grid.Column="1"                                         
+                              <TextBlock Grid.Column="1"
+                                         Grid.Row="1"
                                          Text="{Binding sListName}"/>
                               <TextBlock Grid.Column="2"
                                          Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
@@ -218,26 +224,24 @@
          </DataGrid.RowDetailsTemplate>
       </EgtBEAMWALLCORE:EgtDataGrid>
 
-      <UniformGrid Grid.Row="2"
-                   Columns="4" 
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <Button Name="OpenBtn"
-                 IsDefault="True"
+      <UniformGrid Columns="4" Grid.Row="2" 
+                   Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Archive_Msg}"
                  Command="{Binding Archive_Command}"
                  IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
                  IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Command="{Binding Cancel_Command}"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
 
    </Grid>
 
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -1,18 +1,18 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="OpenProjectFileDialogV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding Title}"
-                                 ResizeMode="NoResize" TitleBarHeight="30"
-                                 WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                                 MinHeight="500" MinWidth="500"
-                                 DataContext="{Binding RelativeSource={RelativeSource Self}}"
-                                 Style="{StaticResource OptimizerWindow.Dialog}">
+<EgtWPFLib5:EgtCustomWindow x:Class="OpenProjectFileDialogV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
-   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -22,8 +22,9 @@
       </Grid.RowDefinitions>
 
       <GroupBox Header="Filters"
+                Margin="5"
                 Visibility="{Binding Filters_Visibility}"
-                Style="{StaticResource OpenProjectFile_GroupBox}">
+                BorderBrush="{StaticResource BeamWall_RegentStBlue}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -36,24 +37,28 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
-               <StackPanel Grid.Column="1" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Style="{StaticResource OpenProjectFile_ComboBox}"/>
-                  <StackPanel Visibility="{Binding Date_Visibility}"
-                              Style="{StaticResource PartManager_StackPanel}">
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"                                 
-                                 CalendarStyle="{StaticResource Filter_Calendar}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
+                                Style="{StaticResource Filter_TextBlock}"
+                                Foreground="{StaticResource BeamWall_Corduroy}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                                 Style="{StaticResource Filter_DatePicker}"
+                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
                      <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"                                 
-                                 CalendarStyle="{StaticResource Filter_Calendar}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
+                                Style="{StaticResource Filter_TextBlock}"
+                                Foreground="{StaticResource BeamWall_Corduroy}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                                 Style="{StaticResource Filter_DatePicker}"
+                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
                   </StackPanel>
                </StackPanel>
             </Grid>
@@ -65,25 +70,29 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
+                                      Margin="5"
                                       Visibility="{Binding SearchText_Visibility}"
                                       Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <TextBlock Text="Rows"
-                             Style="{StaticResource Option_TextBlock}"/>
+                             Style="{StaticResource OptionTextBlock}"
+                             Foreground="{StaticResource BeamWall_Corduroy}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource RowQTY_ComboBox}"/>
+                            Width="55"
+                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1" 
-              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
+      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
 
       <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
                                    ItemsSource="{Binding ProjectList}" 
@@ -94,7 +103,7 @@
                                    AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
                                    AlternationCount="2"
                                    ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   Style="{StaticResource Optimizer_DataGrid}"
+                                   Style="{StaticResource DataGrid_OnlyProd}"
                                    CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
          <DataGrid.RowStyle>
             <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
@@ -172,21 +181,18 @@
          </DataGrid.Resources>
       </EgtBEAMWALLCORE:EgtDataGrid>
 
-      <UniformGrid Grid.Row="2"
-                   Columns="3"  
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <Button Name="OpenBtn"
-                 IsDefault="True"
+      <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button IsCancel="True"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
 
    </Grid>
 
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/OptmizerWindow/OptimizerWindow.vb

@@ -1,10 +0,0 @@
-Imports System.Windows
-
-Public Class OptimizerWindow
-   Inherits EgwWPFBaseLib.EgtWindow
-
-   Shared Sub New()
-      DefaultStyleKeyProperty.OverrideMetadata(GetType(OptimizerWindow), New FrameworkPropertyMetadata(GetType(OptimizerWindow)))
-   End Sub
-
-End Class

EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml

@@ -1,20 +0,0 @@
-<Grid x:Class="TitleBar"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="Auto" />
-      <ColumnDefinition Width="Auto" />
-      <ColumnDefinition Width="*" />
-      <ColumnDefinition Width="Auto" />
-      <ColumnDefinition Width="Auto" />
-      <ColumnDefinition Width="Auto" />
-   </Grid.ColumnDefinitions>
-   <Border Grid.ColumnSpan="6"
-           Style="{StaticResource TitleBar_Border}"/>
-   <Image MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
-		    Source="/Resources/EgalwareLogo.ico"/>
-   <ContentControl Grid.Column="1"/>
-   <TextBlock Grid.Column="2"
-		        Text="{Binding sTitle}"
-              Style="{StaticResource TitleBar_TextBlock}"/>
-</Grid>

EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml.vb

@@ -1,41 +0,0 @@
-Imports System.Windows
-
-Public Class TitleBar
-
-   ' Proprietà che permette di attivare e disattivare lo spostamento della finestra
-   Public Shared ReadOnly TitleProperty As DependencyProperty = DependencyProperty.Register("Title", GetType(String), GetType(TitleBar), New PropertyMetadata(""))
-   Public Property Title() As Boolean
-      Get
-         Return CBool(GetValue(TitleProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(TitleProperty, value)
-      End Set
-   End Property
-
-   ' Proprietà che permette di attivare e disattivare lo spostamento della finestra
-   Public Shared ReadOnly IsMinimizableProperty As DependencyProperty = DependencyProperty.Register("IsMinimizable", GetType(Boolean), GetType(TitleBar), New PropertyMetadata(True))
-   Public Property IsMinimizable() As Boolean
-      Get
-         Return CBool(GetValue(IsMinimizableProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(IsMinimizableProperty, value)
-      End Set
-   End Property
-
-   ' Proprietà che permette di attivare e disattivare il bottone di chiusura della finestra
-   Public Shared ReadOnly IsClosableProperty As DependencyProperty = DependencyProperty.Register("IsClosable", GetType(Boolean), GetType(TitleBar), New PropertyMetadata(True))
-   Public Property IsClosable() As Boolean
-      Get
-         Return CBool(GetValue(IsClosableProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(IsClosableProperty, value)
-         If Not value Then
-            IsMinimizable = False
-         End If
-      End Set
-   End Property
-
-End Class

EgtBEAMWALL.Core/Utility/Configuration.vb

@@ -32,4 +32,53 @@ Public Module Configuration
       m_bMachConfig = value
    End Sub
 
+   ''' <summary>
+   ''' Flag per impostare la visualizzazione con la singola pagina
+   ''' </summary>
+   Private m_sServerAddressRelease As String
+   Public ReadOnly Property sServerAddressRelease As String
+      Get
+         Return m_sServerAddressRelease
+      End Get
+   End Property
+   Public Sub SetServerAddressRelease(value As String)
+      m_sServerAddressRelease = value
+   End Sub
+
+   ' Versione attuale del programma
+   Public ReadOnly Property ActualVersion As String
+      Get
+         Return My.Application.Info.Version.ToString()
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Funzione che recupera la directory del file INI
+   ''' </summary>
+   Public Sub GetIniFileDirectory()
+      ' Impostazione path radice per i dati
+      Dim m_sDataRoot As String = System.AppDomain.CurrentDomain.BaseDirectory
+      If EgtUILib.GetPrivateProfileString(ConstGen.S_DATA, ConstGen.K_DATAROOT, "", m_sDataRoot, m_sDataRoot & "\" & ConstGen.DAT_FILE_NAME) = 0 Then
+         m_sDataRoot = System.AppDomain.CurrentDomain.BaseDirectory
+      End If
+      ' Impostazione direttorio di configurazione
+      Dim m_sConfigDir As String = m_sDataRoot & "\" & ConstGen.CONF_DIR
+      ' Impostazione path Ini file
+      IniFile.m_sIniFile = m_sConfigDir & "\" & Core.ConstIni.INI_FILE_NAME
+   End Sub
+
+   ''' <summary>
+   ''' Metodo che controlla la comunicazione server
+   ''' </summary>
+   ''' <returns></returns>
+   Public Function GetComunication() As Boolean
+      ' eseguo test per comunicazione server (ping, alive)
+      m_commLib = New DataSyncro(EgtBEAMWALL.Core.Configuration.sServerAddressRelease)
+      If m_commLib.CheckRemote() Then
+         Return True
+      Else
+         Return False
+      End If
+   End Function
+
 End Module

EgtBEAMWALL.Core/Utility/Enum.vb

@@ -63,7 +63,7 @@ Public Enum StatusMapOpType
    ChangeProdInProdRequest = 16
    OpenPageInViewOptimRequest = 17
    MachGroupValidationUpdate = 18
-   ChangeProdInOptimizerRequest = 19
+   ChangeProdInOnlyProdRequest = 19
 End Enum
 
 Public Enum DimensionType

EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml

@@ -1,49 +1,44 @@
-<StackPanel x:Class="ViewPanelV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource BTLPartManager_StackPanel}">
+<EgtFloating:EgtFloatingPanel x:Class="ViewPanelV"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
+                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
 
    <Button ToolTip="{Binding ZoomAllToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding ZoomAllCommand}">
-      <Image Source="/Resources/ViewPanel/ZoomAll.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromTopToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding TopViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding FrontViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding RightViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding BackViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding LeftViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromIso_SWToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding IsoViewSWCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
    </Button>
 
-</StackPanel>
+</EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.Core/packages.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EgwProxy.LiMan" version="1.0.2408.718" targetFramework="net472" />
-  <package id="EgwWPFBaseLib" version="2.7.11-beta.4" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net472" />
   <package id="RestSharp" version="111.2.0" targetFramework="net472" />

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml

@@ -1,11 +1,15 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="AddFeatureWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 Title="AddProcess"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="AddFeatureWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="AddProcess"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
 
    <Grid Margin="5">
       <Grid.ColumnDefinitions>
@@ -18,12 +22,14 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Border Style="{StaticResource AddFeatureWnd_Border}">
+      <Border Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2" CornerRadius="4,0,0,4">
       <TextBlock Text="{Binding Process_Msg}"
-                 Style="{StaticResource List_TextBlock}"/>
+                 Style="{StaticResource ListTextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
-              Style="{StaticResource PRCList_Border}">
+              Style="{StaticResource OnlyProdPage_Border}"
+              CornerRadius="4,0,0,4"
+              BorderThickness="2,2,0,2">
          <ListBox Grid.Row="1"
                   ItemsSource="{Binding PRCListView}"
                   SelectedItem="{Binding nSelPRC}"
@@ -33,21 +39,23 @@
                <DataTemplate>
                   <TextBlock Text="{Binding ghDesc}"
                              ToolTip="{Binding ghDesc}"
+                             TextAlignment="Justify"
                              Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
-                             Style="{StaticResource PRCList_TextBlock}"/>
+                             Style="{StaticResource OptionTextBlock}"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
       </Border>
-      <Border Grid.Column="1"
-              Style="{StaticResource Custom_Border}">
+      <Border Grid.Column="1" Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2">
          <TextBlock Grid.Column="1"
-                    Text="{Binding Custom_Msg}"
-                    Style="{StaticResource List_TextBlock}"/>
+                 Text="{Binding Custom_Msg}"
+                 Style="{StaticResource ListTextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
               Grid.Column="1" 
-              Style="{StaticResource MacroCustomList_Border}">
+              Style="{StaticResource OnlyProdPage_Border}"
+              CornerRadius="0"
+              BorderThickness="0,2,0,2">
          <ListBox ItemsSource="{Binding MacroCustomList}"
                   SelectedIndex="{Binding nSelMacroCustom}"
                   Style="{StaticResource MacroCustom_ListBox}">
@@ -73,14 +81,16 @@
             </ListBox.ItemTemplate>
          </ListBox>
       </Border>
-      <Border Grid.Column="2" 
-              Style="{StaticResource Default_Border}">
-         <TextBlock Text="{Binding Default_Msg}"
-                    Style="{StaticResource List_TextBlock}"/>
+      <Border Grid.Column="2" Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2" Padding="0,10,0,10" CornerRadius="0,4,4,0">
+         <TextBlock 
+                 Text="{Binding Default_Msg}"
+                 Style="{StaticResource ListTextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
               Grid.Column="2" 
-              Style="{StaticResource MacroDefaultList_Border}">
+              Style="{StaticResource OnlyProdPage_Border}"
+              CornerRadius="0,4,4,0"
+              BorderThickness="0,2,2,2">
          <ListBox ItemsSource="{Binding MacroDefaultList}"
                   SelectedIndex="{Binding nSelMacroDefault}"
                   Style="{StaticResource MacroDefault_ListBox}"
@@ -88,6 +98,7 @@
             <ListBox.ItemTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding sMacroName}"
+                             TextAlignment="Justify"
                              Style="{StaticResource MacroDefault_TextBlock}"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
@@ -96,14 +107,14 @@
       <UniformGrid Columns="2"
                    Grid.Row="2"
                    Grid.ColumnSpan="3"
-                   Style="{StaticResource AddFeatureWnd_UniformGrid}">
+                   Margin="5">
          <Button Content="{Binding OK_Msg}"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Cancel_Msg}"
                  IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -57,6 +57,8 @@ Public Class AddFeatureWndVM
       End Get
    End Property
 
+#Region "New Macro OnlyProdPage"
+
    Private m_MacroDefaultList As New ObservableCollection(Of Object)
    Public ReadOnly Property MacroDefaultList As ObservableCollection(Of Object)
       Get
@@ -76,6 +78,8 @@ Public Class AddFeatureWndVM
       End Set
    End Property
 
+#End Region ' New Macro OnlyProdPage
+
    Private m_nSelPRC As PRC = Nothing
    Public Property nSelPRC As PRC
       Get

EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml

@@ -1,12 +1,15 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="AddPartWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 Title="AddPartWndV"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="AddPartWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="AddPartWndV"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
 
    <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
@@ -16,19 +19,19 @@
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <Grid Style="{StaticResource AddPart_Grid}">
+      <Grid Style="{StaticResource OnlyProdAddPart_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="Name"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Style="{StaticResource OptionTextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding sNAM}"
                                 Style="{StaticResource NAM_TextBox}"/>
       </Grid>
       <Grid Grid.Row="1"
-            Style="{StaticResource AddPartWnd_Grid}">
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -36,19 +39,19 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="Prod Number"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Style="{StaticResource OptionTextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding nPDN}"
                                 Style="{StaticResource Dimension_TextBox}"/>
          <TextBlock Grid.Column="2"
                     Text="Count"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Style="{StaticResource OptionTextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="3"
                                 Text="{Binding sCNT}"
                                 Style="{StaticResource Dimension_TextBox}"/>
       </Grid>
       <Grid Grid.Row="2"
-            Style="{StaticResource AddPartWnd_Grid}">
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -58,19 +61,19 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="W"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Style="{StaticResource OptionTextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding sW}"
                                 Style="{StaticResource Dimension_TextBox}"/>
          <TextBlock Grid.Column="2"
                     Text="H"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Style="{StaticResource OptionTextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="3"
                                 Text="{Binding sH}"
                                 Style="{StaticResource Dimension_TextBox}"/>
          <TextBlock Grid.Column="4"
                     Text="L"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Style="{StaticResource OptionTextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="5"
                                 Text="{Binding sL}"
                                 Style="{StaticResource Dimension_TextBox}"/>
@@ -78,14 +81,14 @@
 
       <UniformGrid Grid.Row="3"
                    Columns="2"
-                   Style="{StaticResource AddPartWnd_UniformGrid}">
+                   Margin="0,5,0,5">
          <Button Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_AddPartWndVM As AddPartWndVM
 
    Sub New(Owner As Window, AddPartWndVM As AddPartWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = AddPartWndVM

EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml

@@ -1,14 +1,16 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="AddRawPartWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 Title="AddRawPartWnd"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-   
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+<EgtWPFLib5:EgtCustomWindow x:Class="AddRawPartWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="AddRawPartWnd"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
@@ -18,18 +20,20 @@
                 SelectedItem="{Binding SelDimension}"
                 DisplayMemberPath="sDimension"
                 Visibility="{Binding DimensionsList_Visibility}"
-                Style="{StaticResource AddRawPartWnd_ComboBox}"/>
+                Margin="0,0,0,5"
+                Style="{StaticResource OnlyProd_ComboBox}"/>
       <ItemsControl Grid.Row="1"
                     ItemsSource="{Binding VariableList}">
          <ItemsControl.ItemTemplate>
             <DataTemplate>
-               <Grid Style="{StaticResource AddPartWnd_Grid}">
+               <Grid Margin="0,0,0,5">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="Auto"/>
                   </Grid.ColumnDefinitions>
+
                   <TextBlock Text="{Binding sMsg}"
-                             Style="{StaticResource Option_TextBlock}"/>
+                             Style="{StaticResource OptionTextBlock}"/>
                   <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                          Text="{Binding sValue}"
                                          Style="{StaticResource Value_TextBox}"/>
@@ -39,18 +43,18 @@
       </ItemsControl>
       <UniformGrid Grid.Row="2"
                    Columns="2"
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                   Margin="0,0,0,5">
          <Button Grid.Column="1"
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource AddRawPartWnd_Button}"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"
                  Margin="0,0,5,0"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
 
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_AddRawPartWndVM As AddRawPartWndVM
 
    Sub New(Owner As Window, AddRawPartWndVM As AddRawPartWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = AddRawPartWndVM

EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb

@@ -59,6 +59,7 @@ Public Class AddRawPartWndVM
       End Set
    End Property
 
+   Private m_DimensionsList_Visibility As Visibility
    Public ReadOnly Property DimensionsList_Visibility As Visibility
       Get
          Return If(m_EditType = EditTypes.ONLY_COMBO OrElse m_EditType = EditTypes.TEXT_AND_COMBO, Visibility.Visible, Visibility.Collapsed)

EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml

@@ -1,16 +1,20 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="AddSectionXMaterialWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 Title="AddSectionXMaterial"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-   
-   <StackPanel Style="{StaticResource AddSectionXMaterialWnd_StackPanel}">
+<EgtWPFLib5:EgtCustomWindow x:Class="AddSectionXMaterialWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
+                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="AddSectionXMaterial">
+   <StackPanel Margin="5,5,5,0">
 
-      <EgtBEAMWALLCORE:EgtDataGrid Width="500" MaxHeight="600"
+      <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="0" Width="500" MaxHeight="600"
                                    ItemsSource="{Binding NewSectionXMaterialList}" 
                                    SelectedItem="{Binding SelNewSectionXMaterial}"
                                    CanUserAddRows="False"
@@ -40,7 +44,7 @@
                   <DataTemplate>
                      <CheckBox IsChecked="{Binding Path=Alias_IsChecked, UpdateSourceTrigger=PropertyChanged}" 
                                IsEnabled="{Binding Alias_IsEnabled}"
-                               Style="{StaticResource Alias_CheckBox}"/>
+                               HorizontalAlignment="Center"/>
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
             </DataGridTemplateColumn>
@@ -52,7 +56,7 @@
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
                <DataGridTextColumn.CellStyle>
-                  <Style TargetType="{x:Type DataGridCell}">
+                  <Style TargetType="DataGridCell">
                      <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
                   </Style>
                </DataGridTextColumn.CellStyle>
@@ -65,7 +69,7 @@
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
                <DataGridTextColumn.CellStyle>
-                  <Style TargetType="{x:Type DataGridCell}">
+                  <Style TargetType="DataGridCell">
                      <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
                   </Style>
                </DataGridTextColumn.CellStyle>
@@ -91,7 +95,7 @@
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
                <DataGridTextColumn.CellStyle>
-                  <Style TargetType="{x:Type DataGridCell}">
+                  <Style TargetType="DataGridCell">
                      <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
                   </Style>
                </DataGridTextColumn.CellStyle>
@@ -99,8 +103,7 @@
          </DataGrid.Resources>
       </EgtBEAMWALLCORE:EgtDataGrid>
 
-      <Grid Grid.Row="2" 
-            Style="{StaticResource AddPartWnd_Grid}">
+      <Grid Grid.Row="2" Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -108,17 +111,17 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Grid.Column="1"
-                 Content="{Binding Ok_Msg}"
+         <Button Content="{Binding Ok_Msg}"
                  Command="{Binding Ok_Command}"
-                 IsDefault="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Grid.Column="3"
-                 Content="{Binding Cancel_Msg}"
+                 IsDefault="True"
+                 Grid.Column="1"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Cancel_Msg}"
                  Command="{Binding Cancel_Command}"
-                 IsCancel="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 IsCancel="True"
+                 Grid.Column="3"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </Grid>
 
    </StackPanel>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_AddSectionXMaterialWndVM As AddSectionXMaterialWndVM
 
    Sub New(Owner As Window, AddSectionXMaterialWndVM As AddSectionXMaterialWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = AddSectionXMaterialWndVM

EgtBEAMWALL.Optimizer/Application.xaml

@@ -1,15 +1,9 @@
 <Application x:Class="Application"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer">
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <Application.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="pack://application:,,,/EgtBEAMWALL.Core;component/Themes/Generic.xaml"/>
-            <ResourceDictionary Source="Utility/Dictionary.xaml"/>
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
+      <ResourceDictionary Source="Utility/Dictionary.xaml"/>
    </Application.Resources>
 
 </Application>

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml

@@ -1,15 +1,17 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="BTLDataWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 IsClosable="True"
-                                 Title="BTLDataWndV"
-                                 Name="BTLDataWndV"
-                                 Style="{StaticResource OptimizerWindow.Dialog}">
+<EgtWPFLib5:EgtCustomWindow x:Class="BTLDataWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="True"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="BTLDataWndV"
+                            Name="BTLDataWndV"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
 
    <TabControl>
       <TabItem Header="Strategy">
@@ -18,9 +20,9 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
-            <ComboBox ItemsSource="{Binding StrategySetupList}" 
+            <ComboBox ItemsSource="{Binding StrategySetupList}" HorizontalAlignment="Center" Margin="0,10,0,10"
                       SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource BTLDataWnd_ComboBox}"/>
+                      Style="{StaticResource Strategy_ComboBox}" />
             <Grid Grid.Row="1">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
@@ -29,29 +31,27 @@
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <OPTIMIZER:ProjectParametersV Grid.RowSpan="2" 
-                                             Margin="0,10,0,0"
+               <OPTIMIZER:ProjectParametersV Grid.RowSpan="2" Margin="0,10,0,0"
                                              Tag="{Binding GeneralParametersList}"
                                              IsEnabled="{Binding GeneralParametersIsEnable}"/>
-               <UniformGrid Grid.Column="1"
-                            Rows="2" 
-                            Style="{StaticResource BTLDataWnd_UniformGrid}">
+               <UniformGrid Rows="2" Grid.Column="1" Margin="0,0,5,0">
                   <CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}" 
-                            Style="{StaticResource BTLDataWnd_CheckBox}"/>
-                  <Button Command="{Binding Ok_Command}"
+                            Margin="10,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
+                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+                  <Button Command="{Binding Ok_Command}" VerticalAlignment="Bottom" Margin="0,0,0,5"
                           ToolTip="{Binding SaveAsToolTip}"
-                          Style="{StaticResource BTLDataWnd_Button}">
-                     <Image Source="/Resources/NewPage/Ok.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                          Style="{StaticResource SaveStrategy_Button}">
+                     <Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
                   </Button>
+
                </UniformGrid>
             </Grid>
          </Grid>
       </TabItem>
       <TabItem Header="BTL">
          <UniformGrid Margin="5"
-                      Columns="6" 
-                      Rows="7">
+                      Columns="6" Rows="7">
+
             <TextBlock Text="{Binding PROJNUM_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
@@ -170,4 +170,4 @@
          </UniformGrid>
       </TabItem>
    </TabControl>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_BTLDataWndVM As BTLDataWndVM
 
    Sub New(Owner As Window, BTLDataWndVM As BTLDataWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = BTLDataWndVM

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb

@@ -157,7 +157,7 @@ Public Class BTLDataWndVM
    Public ReadOnly Property nPROJTYPE As BWType
       Get
          Select Case Map.refMainMenuVM.SelPage
-            Case Pages.OPTIMIZERPAGE
+            Case Pages.ONLYPRODPAGE
                Return Map.refProdManagerVM.nProdType
             Case Else
                Return BWType.NULL
@@ -596,6 +596,8 @@ Public Class BTLDataWndVM
       End While
       ' leggo parametri Btl
       ReadBtlParams()
+      '' leggo strategia
+      'EgtGetInfo(m_nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
 
       ' Controllo se presente file default config
       Dim sDefaultConfigFile As String = String.Empty
@@ -739,6 +741,13 @@ Public Class BTLDataWndVM
    End Property
 
    Public Sub Ok()
+      '' scrivo AISetup
+      'Dim sOldStrategySetup As String = ""
+      'EgtGetInfo(m_nBTLInfoLayerId, "AISETUP", sOldStrategySetup)
+      'If m_SelStrategySetup <> sOldStrategySetup Then
+      '   EgtSetInfo(m_nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
+      'End If
+
       Dim sInfo As String = String.Empty
       If m_bSaveGeneralParameters Then
          For Each GeneralParameter In GeneralParametersList

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml

@@ -2,49 +2,47 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         DataContext="{StaticResource BTLPartManagerVM}"
-        Style="{StaticResource BTLPartManager_Border}">
+        CornerRadius="5"
+        BorderThickness="2"
+        BorderBrush="{StaticResource BeamWall_Teal}"
+        Background="{StaticResource BeamWall_FountainBlue}">
 
    <StackPanel Orientation="Horizontal"
-               Style="{StaticResource BTLPartManager_StackPanel}">
+               Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
       <Button Command="{Binding CopyPart_Command}"
               Click="ClosePopUp_Click"
               ToolTip="{Binding CopyPart_ToolTip}"
               IsEnabled="{Binding CopyPart_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/LeftPanel/CopyPart.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/LeftPanel/CopyPart.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding RemovePart_Command}"
               Click="ClosePopUp_Click"
               ToolTip="{Binding RemovePart_ToolTip}"
               IsEnabled="{Binding RemovePart_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/NewPage/Remove.png"
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding Simulate_ToolTip}"
               Click="ClosePopUp_Click"
               Command="{Binding Simulate_Command}"
               IsEnabled="{Binding Simulate_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/Simulate.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding Edit_ToolTip}"
               Click="ClosePopUp_Click"
               Command="{Binding Edit_Command}"
               IsEnabled="{Binding Edit_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/Edit.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
               Click="ClosePopUp_Click"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/ResetCalc.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
       </Button>
    </StackPanel>
 

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -152,6 +152,7 @@ Public Class BTLPartManagerVM
 
    Friend Sub PartShowAllChanged()
       NotifyPropertyChanged(NameOf(CopyPart_IsEnabled))
+      'NotifyPropertyChanged(NameOf(RotatePart_IsEnabled))
       NotifyPropertyChanged(NameOf(RemovePart_IsEnabled))
    End Sub
 
@@ -434,8 +435,8 @@ Public Class BTLPartManagerVM
       Map.refProjectVM.SetFeatureListVisibility(Visibility.Collapsed)
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.FEATUREMANAGER)
       ' Disabilito LeftPanel
-      Map.refProjectVM.SetLeftPanel_IsEnabled(False)
-      Map.refProjectVM.SetLeftPanel_Opacity(0.2)
+      Map.refProjectVM.SetOnlyProdLeftPanel_IsEnabled(False)
+      Map.refProjectVM.SetOnlyProdLeftPanel_Opacity(0.2)
    End Sub
 
 #End Region ' Edit

EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb

@@ -489,7 +489,7 @@ Public Class BTLFeatureVM
    End Property
 
    Public Sub DeleteFeature()
-      Map.refFeatureListManagerVM.RemoveFeature()
+      If Map.refMainMenuVM.SelPage = Pages.VIEW Then Map.refFeatureListManagerVM.RemoveFeature()
    End Sub
 
 #End Region ' DeleteFeature
@@ -567,8 +567,8 @@ Public Class BTLFeatureVM
    Public Sub Strategy()
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.STRATEGYMANAGER)
       ' Disabilito LeftPanel
-      Map.refProjectVM.SetLeftPanel_IsEnabled(False)
-      Map.refProjectVM.SetLeftPanel_Opacity(0.2)
+      Map.refProjectVM.SetOnlyProdLeftPanel_IsEnabled(False)
+      Map.refProjectVM.SetOnlyProdLeftPanel_Opacity(0.2)
       Map.refForcedStrategyPanelVM.Init(BTLFeatureM)
    End Sub
 
@@ -587,6 +587,7 @@ Public Class BTLFeatureVM
 
    Friend Sub EditFeature()
       If Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then
+         'Map.refForcedStrategyBTLVM.Init(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.BTLFeatureM)
          Map.refForcedStrategyPanelVM.Init(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.BTLFeatureM)
       End If
       ' se modalità building, la tolgo
@@ -598,13 +599,14 @@ Public Class BTLFeatureVM
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.FEATUREMANAGERBTL)
       Map.refProjectVM.SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.STRATEGYMANAGERBTL)
       ' Disabilito LeftPanel
-      Map.refProjectVM.SetLeftPanel_IsEnabled(False)
-      Map.refProjectVM.SetLeftPanel_Opacity(0.2)
+      Map.refProjectVM.SetOnlyProdLeftPanel_IsEnabled(False)
+      Map.refProjectVM.SetOnlyProdLeftPanel_Opacity(0.2)
       EgtDraw()
    End Sub
 
 #End Region ' EditFeature
 
+
 #End Region    ' COMMANDS
 
 #Region "EVENTS"

EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb

@@ -107,7 +107,7 @@ Public Class BTLPartVM
                ' avviso che tutti i pezzi verranno tolti dai grezzi e chiedo di confermare
                If MessageBox.Show(String.Format(EgtMsg(61851), nDuploCount), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
                   MyMachGroupPanelM.DuploSetToDelete(m_BTLPartM.nPartId)
-                  DeleteDuplo_Otmizer(DuploList)
+                  DeleteDuplo_OnlyProdPage(DuploList)
                Else
                   ' reimposto vecchio valore
                   Return False
@@ -140,7 +140,7 @@ Public Class BTLPartVM
       Return True
    End Function
 
-   Private Sub DeleteDuplo_Otmizer(DuploList As List(Of Integer))
+   Private Sub DeleteDuplo_OnlyProdPage(DuploList As List(Of Integer))
       For Each nDuploId In DuploList
          ' recupero grezzo cui appartiene
          Dim nRawPartId As Integer = MyMachGroupPanelM.DuploGetRawPart(nDuploId)
@@ -765,7 +765,7 @@ Public Class BTLPartVM
             StringToLenAdv(sValArray(1), m_BTLPartM.m_dCamberLen2, True) AndAlso
             StringToLenAdv(sValArray(2), m_BTLPartM.m_dCamberLen3, True) AndAlso
             StringToLenAdv(sValArray(3), m_BTLPartM.m_dCamberCross3, True) AndAlso
-            EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_CAMBER, " SIDE: " & (value + 1) &
+            EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_CAMBER, "SIDE: " & (value + 1) &
                                                            " P01: " & sValArray(0) &
                                                            " P02: " & sValArray(1) &
                                                            " P03: " & sValArray(2) &
@@ -814,7 +814,7 @@ Public Class BTLPartVM
       End Get
       Set(value As Integer)
          Dim nValue As Integer = IdNameStruct.IdFromInd(value, ocREFSIDEFIXCLAMP)
-         Dim sValue As String = ocREFSIDEFIXCLAMP(nValue).Name
+         Dim sValue As String = ocREFSIDEFIXCLAMP(nValue).Name '[Enum].GetName(GetType(PartOffset_RefSideFixClamp), nValue)
 
          Dim sValArray() As String = PartOffsetParams.Split(",")
          If sValArray.Count() >= 4 AndAlso
@@ -843,7 +843,7 @@ Public Class BTLPartVM
       End Get
       Set(value As String)
          Dim nValue As Integer = IdNameStruct.IdFromInd(SelREFSIDEFIXCLAMP, ocREFSIDEFIXCLAMP)
-         Dim sValue As String = ocREFSIDEFIXCLAMP(nValue).Name
+         Dim sValue As String = ocREFSIDEFIXCLAMP(nValue).Name '[Enum].GetName(GetType(PartOffset_RefSideFixClamp), nValue)
 
          Dim sValArray() As String = value.Split(",")
          If sValArray.Count() >= 4 AndAlso
@@ -1110,7 +1110,7 @@ Public Class BTLPartVM
       End Get
       Set(value As Integer)
          Dim nValue As Integer = IdNameStruct.IdFromInd(value, ocMATERIALTYPEGRP)
-         Dim sValue As String = ocMATERIALTYPEGRP(nValue).Name
+         Dim sValue As String = ocMATERIALTYPEGRP(nValue).Name '[Enum].GetName(GetType(MaterialType), nValue)
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_MATERIALTYPE, sValue & ": " & sMATERIALTYPESPEC) Then
             m_BTLPartM.SelMATERIALTYPEGRP = value
          Else
@@ -1125,7 +1125,7 @@ Public Class BTLPartVM
       End Get
       Set(value As String)
          Dim nValue As Integer = IdNameStruct.IdFromInd(SelMATERIALTYPEGRP, ocMATERIALTYPEGRP)
-         Dim sValue As String = ocMATERIALTYPEGRP(nValue).Name
+         Dim sValue As String = ocMATERIALTYPEGRP(nValue).Name '[Enum].GetName(GetType(MaterialType), nValue)
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_MATERIALTYPE, sValue & ": " & value) Then
             m_BTLPartM.sMATERIALTYPESPEC = value
          Else
@@ -1560,6 +1560,11 @@ Public Class BTLPartVM
             Else
                Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed)
             End If
+            ' Forzo strategia
+            'Map.refForcedStrategyBTLVM.Init(m_SelBTLFeatureVM.BTLFeatureM)
+            Map.refForcedStrategyPanelVM.Init(m_SelBTLFeatureVM.BTLFeatureM)
+            'Else
+            '   EgtDeselectAll()
          End If
          If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
          EgtDraw()
@@ -1575,6 +1580,32 @@ Public Class BTLPartVM
          End If
       End Set
    End Property
+   'Public Property SelBTLFeatureVMOnlyGraph As BTLFeatureVM
+   '   Get
+   '      Return m_SelBTLFeatureVM
+   '   End Get
+   '   Set(value As BTLFeatureVM)
+   '      m_SelBTLFeatureVM = value
+   '      If Not IsNothing(m_SelBTLFeatureVM) Then
+   '         m_SelBTLFeatureVM.SelGeomFeature()
+   '         ' deseleziono i parametri
+   '         If Not IsNothing(SelBTLFeatureVM.SelPBTLParam) Then SelBTLFeatureVM.SelPBTLParam = Nothing
+   '      End If
+   '      If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
+   '      EgtResetCurrMachGroup()
+   '      ResetSearchFound()
+   '      Map.refStatisticsTimePanelVM.SetViewPage_Visibility(Visibility.Visible)
+   '      Map.refStatisticsTimePanelVM.SetMachiningPage_Visibility(Visibility.Collapsed)
+   '      EgtDraw()
+   '      NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
+   '      NotifyPropertyChanged(NameOf(SelBTLFeatureVMOnlyGraph))
+   '      ' se modalità building, la tolgo
+   '      If Not IsNothing(m_SelBTLFeatureVM) AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
+   '         Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
+   '         Map.refShowBeamPanelVM.SetShowBuilding(False)
+   '      End If
+   '   End Set
+   'End Property
 
    Private m_Calc_PartEnd As Boolean = False
    Public ReadOnly Property Calc_PartEnd As Boolean
@@ -2295,6 +2326,9 @@ Public Class BTLPartVM
 
 #Region "Verify"
 
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
    Public ReadOnly Property Verify_Command As ICommand
       Get
          If m_cmdVerify Is Nothing Then
@@ -2304,6 +2338,9 @@ Public Class BTLPartVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
    Friend Sub Verify()
       If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
       Map.refCALCPanelVM.Verify(ProjectType.PROJ)
@@ -2314,6 +2351,9 @@ Public Class BTLPartVM
 
 #Region "AddToRawPart"
 
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
    Public ReadOnly Property AddToRawPart_Command As ICommand
       Get
          If m_cmdAddToRawPart Is Nothing Then
@@ -2323,6 +2363,9 @@ Public Class BTLPartVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
    Public Sub AddToRawPart()
       If IsNothing(ProjectManagerVM.CurrProd) Then Return
       Dim SelPart As BTLPartVM

EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb

@@ -58,6 +58,64 @@ Public Class BTLStructureVM
          m_bOnlySelectItem = value
       End Set
    End Property
+   'Private m_PrevSelectionType As SelectionTypes = SelectionTypes.NULL
+   'Friend ReadOnly Property PrevSelectionType As SelectionTypes
+   '   Get
+   '      Return m_PrevSelectionType
+   '   End Get
+   'End Property
+   'Private m_SelectionType As SelectionTypes = SelectionTypes.NULL
+   'Friend ReadOnly Property SelectionType As SelectionTypes
+   '   Get
+   '      Return m_SelectionType
+   '   End Get
+   'End Property
+   'Friend Sub SetSelectionType(value As SelectionTypes)
+   '   If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
+   '      ' resetto gruppo di lavorazione corrente
+   '      EgtResetCurrMachGroup()
+   '   End If
+   '   If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+   '      ' rimuovo selezione da pezzo in MachGroup
+   '      If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) AndAlso Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup) Then
+   '         If Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart) Then
+   '            Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart = Nothing
+   '         End If
+   '      End If
+   '   End If
+   '   m_PrevSelectionType = m_SelectionType
+   '   If value = m_SelectionType And (Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Or Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PARTLIST) Then
+   '      For Each BTLPart In m_BTLPartVMList
+   '         BTLPart.SetOpenFeatureList(False)
+   '      Next
+   '      Return
+   '   End If
+   '   m_SelectionType = value
+   '   Select Case m_SelectionType
+   '      Case SelectionTypes.SELECT_
+   '         ' verifico reset mark su tutti i pezzi
+   '         For Each BTLPart In m_BTLPartVMList
+   '            EgtResetMark(BTLPart.nPartId)
+   '         Next
+   '      Case SelectionTypes.HIGHLIGHT
+   '         If m_PrevSelectionType = SelectionTypes.SELECT_ Then
+   '            EgtBeamShowFacesName(False)
+   '            EgtBeamShowLoadingSide(False, False)
+   '         End If
+   '         If Not IsNothing(m_SelBTLPart) Then
+   '            m_SelBTLPart = Nothing
+   '            NotifyPropertyChanged(NameOf(SelBTLPart))
+   '         End If
+   '         ' mostro pezzi selezionati
+   '         Map.refProjectVM.BTLStructureVM.ShowAll(False)
+   '         ' se attivata opzione, li assemblo
+   '         'Map.refProjectVM.BTLStructureVM.ShowBuilding(If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Map.refShowBeamPanelVM.ShowBuilding_IsChecked, False), False)
+   '   End Select
+   '   ' aggiornamento grafica
+   '   If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.PartShowAllChanged()
+   '   If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.PartShowAllChanged()
+   '   If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
+   'End Sub
 
    Private m_SelBTLParts As New PartsObservableCollection(Of BTLPartVM)
    Public ReadOnly Property SelBTLParts As PartsObservableCollection(Of BTLPartVM)
@@ -425,7 +483,7 @@ Public Class BTLStructureVM
    Public ReadOnly Property nPROJTYPE As BWType
       Get
          Select Case Map.refMainMenuVM.SelPage
-            Case Pages.OPTIMIZERPAGE
+            Case Pages.ONLYPRODPAGE
                Return Map.refProdManagerVM.nProdType
             Case Else
                Return BWType.NULL
@@ -1237,6 +1295,7 @@ Public Class BTLStructureVM
             End If
          End If
       End If
+
    End Sub
 
 #End Region    ' AddPart

EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml

@@ -1,13 +1,13 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="BlockedWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 Title="{Binding Title}" 
-                                 WindowStartupLocation="CenterOwner"
-                                 Height="200" Width="400"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="BlockedWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Title="{Binding Title}" WindowStartupLocation="CenterOwner"
+                            Height="200" Width="400">
 
-   <Grid>      
+   <Grid>
+      
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
@@ -19,8 +19,9 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding Msg_Text}"
-                 Style="{StaticResource Msg_TextBlock}"/>
-      <Grid Style="{StaticResource BlockedWnd_Grid}">
+                 TextAlignment="Center"
+                 Margin="40,0,40,0"/>
+      <Grid Grid.Row="5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -28,18 +29,17 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Grid.Column="1" 
-                 Content="{Binding Save_Msg}"
+         <Button Grid.Column="1" Content="{Binding Save_Msg}"
                  IsDefault="True"
                  Command="{Binding Save_Command}"
                  Visibility="{Binding Buttons_Visibility}"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Grid.Column="3" 
-                 Content="{Binding DoNotSave_Msg}"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Grid.Column="3" Content="{Binding DoNotSave_Msg}"
                  Command="{Binding DoNotSave_Command}"
                  Visibility="{Binding Buttons_Visibility}"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-      </Grid>      
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+      </Grid>
+      
    </Grid>
    
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_BlockedWndVM As BlockedWndVM
 
    Sub New(Owner As Window, BlockedWndVM As BlockedWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = BlockedWndVM

EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndVM.vb

@@ -114,6 +114,9 @@ Public Class BlockedWndVM
 
 #Region "Save"
 
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
    Public ReadOnly Property Save_Command As ICommand
       Get
          If m_cmdSave Is Nothing Then
@@ -123,8 +126,12 @@ Public Class BlockedWndVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
    Public Sub Save()
       ' salvo progetto
+      'Map.refProdManagerVM.Save()
       Map.refProdManagerVM.Save()
       ' mando messaggio di blocco avvenuto
       DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
@@ -134,6 +141,9 @@ Public Class BlockedWndVM
 
 #Region "DoNotSave"
 
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
    Public ReadOnly Property DoNotSave_Command As ICommand
       Get
          If m_cmdDoNotSave Is Nothing Then
@@ -143,6 +153,9 @@ Public Class BlockedWndVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
    Public Sub DoNotSave()
       ' mando messaggio di blocco avvenuto
       DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")

EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb

@@ -40,6 +40,16 @@ Public Class CALCPanelVM
       End Set
    End Property
 
+   'Private m_VerifyAll_IsEnabled As Boolean = True
+   'Public Property VerifyAll_IsEnabled As Boolean
+   '   Get
+   '      Return m_VerifyAll_IsEnabled
+   '   End Get
+   '   Set(value As Boolean)
+   '      m_VerifyAll_IsEnabled = value
+   '   End Set
+   'End Property
+
    Private m_ChooseMachineBtn_Visibility As Boolean = True
    Public Property ChooseMachineBtn_Visibility As Visibility
       Get
@@ -151,7 +161,7 @@ Public Class CALCPanelVM
          Map.refProdManagerVM.Save()
       End If
       ' se modalita' assemblato attiva
-      If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+      If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
          ' lo rimonto
          Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
       End If
@@ -520,6 +530,12 @@ Public Class CALCPanelVM
       m_OrigSelectedMachine = SelectedMachine
    End Sub
 
+   Friend Sub PartShowAllChanged()
+      'NotifyPropertyChanged(NameOf(Verify_IsEnabled))
+      'NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
+      'NotifyPropertyChanged(NameOf(Edit_IsEnabled))
+   End Sub
+
    Friend Sub Verify(ProgramPage As ProjectType)
       If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
       Dim ProjType As BWType = ProjectManagerVM.CurrProd.nType
@@ -875,8 +891,13 @@ Public Class CALCPanelVM
       ' resetto i parametri errori integration ciclando su ogni Part e per ogni Part ogni Feature
       Dim ProjId As Integer
       Dim nPartProjId As Integer
+      'Dim TempList As New List(Of BTLPartM)
       Dim nPartId As Integer = EgtGetFirstPart()
+      'If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
       ProjId = ProjectManagerVM.CurrProd.nProjIdList(0)
+      'Else
+      '   ProjId = ProjectManagerVM.CurrProj.nProjId
+      'End If
       EgtGetInfo(nPartId, BTL_PRT_PROJ, nPartProjId)
       While nPartId <> GDB_ID.NULL
          ' se devo filtrare un progetto
@@ -909,8 +930,11 @@ Public Class CALCPanelVM
                   ' verifico che sia una feature
                   Dim nGRP As Integer
                   If EgtGetInfo(nFeatureId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nFeatureId, BTL_FTR_MAINID) Then
+                     'EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, ITG_PROJ_ERR, ITG_PROD_ERR))
                      EgtRemoveInfo(nFeatureId, ITG_PROD_ERR)
+                     'EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, ITG_PROJ_MSG, ITG_PROD_MSG))
                      EgtRemoveInfo(nFeatureId, ITG_PROD_MSG)
+                     'EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, ITG_PROJ_ROT, ITG_PROD_ROT))
                      EgtRemoveInfo(nFeatureId, ITG_PROD_ROT)
                   End If
                   nFeatureId = EgtGetNext(nFeatureId)

EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml

@@ -1,33 +1,32 @@
 <StackPanel x:Class="CalcPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource PartManager_StackPanel}">
+            Style="{StaticResource OnlyProdPartManager_StackPanel}">
    
    <Button ToolTip="{Binding ChooseMachine_ToolTip}"
            Command="{Binding ChooseMachine_Command}"
            IsEnabled="{Binding CALCPanel_IsEnabled}"
            Visibility="{Binding ChooseMachineBtn_Visibility}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/CALCPanel/ChooseMachine.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>
    </Button>
 
-   <Grid Visibility="{Binding ChooseMachine_Visibility}"
-         Style="{StaticResource CalcPanel_Grid}">
+   <Grid Margin="0,0,5,0" Visibility="{Binding ChooseMachine_Visibility}">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="Auto"/>
          <ColumnDefinition Width="Auto"/>
       </Grid.ColumnDefinitions>
       <!--Combobox per selezionare la macchina corrente-->
-      <ComboBox ItemsSource="{Binding Path=MachineList}" 
+      <ComboBox Grid.Column="0"
+                ItemsSource="{Binding Path=MachineList}" 
                 DisplayMemberPath="Name"
                 SelectedItem="{Binding Path=SelectedMachine}" 
                 SelectedValuePath="Name"
-                Style="{StaticResource CalcPanel_ComboBox}"/>
+                Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
       <Button Grid.Column="1"
               Content="OK"
               Command="{Binding Ok_Command}"
-              Style="{StaticResource CalcPanel_Button}"/>
+              Style="{StaticResource ToolBarOnlyProdCalcPanel_Button}"/>
    </Grid>
 
 </StackPanel>

EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml

@@ -1,21 +1,26 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="ChangeMaterialWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 Title="ChangeMaterialWnd"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="ChangeMaterialWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="ChangeMaterialWnd">
 
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <Grid Grid.Row="0"
-            Style="{StaticResource ChangeMaterialWnd_Grid}">
+      <Grid HorizontalAlignment="Center"
+            Grid.Row="0"
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -25,28 +30,31 @@
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
          <TextBlock Text="{Binding ProjMaterial_Msg}"
-                    Style="{StaticResource Option_TextBlock}"/>
-         <ComboBox Grid.Column="1"
-                   ItemsSource="{Binding ProjMaterialList}"
-                   SelectedItem="{Binding SelProjMaterial}"                   
-                   Style="{StaticResource ProjMaterial_ComboBox}"/>
+                    Style="{StaticResource OptionTextBlock}"/>
+         <ComboBox ItemsSource="{Binding ProjMaterialList}"
+                   SelectedItem="{Binding SelProjMaterial}"
+                   Grid.Column="1"
+                   Width="150"
+                   Style="{StaticResource FeatureComboBox}"/>
       </Grid>
-      <Grid Grid.Row="1"
-            Style="{StaticResource ChangeMaterialWnd_Grid}">
+      <Grid HorizontalAlignment="Center"
+            Grid.Row="1"
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="{Binding WjMaterial_Msg}"
-                    Style="{StaticResource Option_TextBlock}"/>
-         <ComboBox Grid.Column="1"
-                   ItemsSource="{Binding WhMaterialList}"
-                   SelectedItem="{Binding SelWhMaterial}"                   
-                   Style="{StaticResource ProjMaterial_ComboBox}"/>
+                    Style="{StaticResource OptionTextBlock}"/>
+         <ComboBox ItemsSource="{Binding WhMaterialList}"
+                   SelectedItem="{Binding SelWhMaterial}"
+                   Grid.Column="1"
+                   Width="150"
+                   Style="{StaticResource FeatureComboBox}"/>
       </Grid>
 
       <Grid Grid.Row="2"
-            Style="{StaticResource AddPartWnd_Grid}">
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -54,15 +62,15 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Grid.Column="1"
-                 Content="{Binding Ok_Msg}"
+         <Button Content="{Binding Ok_Msg}"
                  Command="{Binding Ok_Command}"
-                 IsDefault="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Grid.Column="3"
-                 Content="{Binding Cancel_Msg}"
-                 IsCancel="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 IsDefault="True"
+                 Grid.Column="1"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Cancel_Msg}"
+                 IsCancel="True"
+                 Grid.Column="3"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </Grid>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_ChangeMaterialWndVM As ChangeMaterialWndVM
 
    Sub New(Owner As Window, ChangeMaterialWndVM As ChangeMaterialWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = ChangeMaterialWndVM

EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml

@@ -1,15 +1,18 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="ChangeParameterWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="Height"
-                                 WindowStartupLocation="CenterOwner"
-                                 Width="300"
-                                 Title="ChangeParameterWnd"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="ChangeParameterWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="Height"
+                            Width="300"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="ChangeParameterWnd">
 
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+   <Grid Margin="5,5,5,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="2*"/>
@@ -27,50 +30,49 @@
       </Grid.RowDefinitions>
 
       <TextBlock Text="Process"
-                 Style="{StaticResource Option_TextBlock}"/>
+                 Style="{StaticResource OptionTextBlock}"/>
       <ComboBox Grid.Column="1"
                 ItemsSource="{Binding PRCList}"
                 SelectedItem="{Binding SelPRC}"
                 DisplayMemberPath="ghDesc"
-                Style="{StaticResource PRCList_ComboBox}"/>
+                HorizontalAlignment="Stretch"
+                Style="{StaticResource FeatureComboBox}"/>
 
       <TextBlock Grid.Row="2"
                  Text="Parameter"
-                 Style="{StaticResource Option_TextBlock}"/>
+                 Style="{StaticResource OptionTextBlock}"/>
       <ComboBox Grid.Row="2" Grid.Column="1"
                 ItemsSource="{Binding ParamList}"
                 SelectedItem="{Binding SelParam}"
                 DisplayMemberPath="sNameAndDescription"
-                Style="{StaticResource PRCList_ComboBox}"/>
+                HorizontalAlignment="Stretch"
+                Style="{StaticResource FeatureComboBox}"/>
 
       <TextBlock Grid.Row="4" 
                  Text="Actual value"
-                 Style="{StaticResource Option_TextBlock}"/>
+                 Style="{StaticResource OptionTextBlock}"/>
       <EgtWPFLib5:EgtTextBox Grid.Row="4" Grid.Column="1"
                              Text="{Binding SelParam.sActualValue}"
                              Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
-      <CheckBox Grid.Row="4" 
-                Grid.Column="1"
+      <CheckBox Grid.Row="4" Grid.Column="1"
                 IsChecked="{Binding SelParam.bActualValue}"
-                Visibility="{Binding SelParam.IsCheckBox_Visibility}"
-                Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Visibility="{Binding SelParam.IsCheckBox_Visibility}"/>
 
-      <TextBlock Grid.Row="6" 
-                 Text="New Value"
-                 Style="{StaticResource Option_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Row="6" 
-                             Grid.Column="1"
+      <TextBlock Grid.Row="6" Text="New Value"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <EgtWPFLib5:EgtTextBox Grid.Row="6" Grid.Column="1"
                              Text="{Binding SelParam.sNewValue}"
                              Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
-      <CheckBox Grid.Row="6" 
-                Grid.Column="1"
+      <CheckBox Grid.Row="6" Grid.Column="1"
                 IsChecked="{Binding SelParam.bNewValue}"
-                Visibility="{Binding SelParam.IsCheckBox_Visibility}"
-                Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Visibility="{Binding SelParam.IsCheckBox_Visibility}"/>
 
-      <Grid Grid.Row="8" 
-            Grid.ColumnSpan="2"
-            Style="{StaticResource AddPartWnd_Grid}">
+      <Grid Grid.Row="8" Grid.ColumnSpan="2"
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -78,15 +80,15 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Grid.Column="1"
-                 Content="Ok"
+         <Button Content="Ok"
                  Command="{Binding Ok_Command}"
-                 IsDefault="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Grid.Column="3"
-                 Content="Cancel"
-                 IsCancel="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 IsDefault="True"
+                 Grid.Column="1"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Content="Cancel"
+                 IsCancel="True"
+                 Grid.Column="3"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </Grid>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_ChangeParameterWndVM As ChangeParameterWndVM
 
    Sub New(Owner As Window, ChangeParameterWndVM As ChangeParameterWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = ChangeParameterWndVM

EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageV.xaml

@@ -2,7 +2,7 @@
            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-           DataContext="{DynamicResource ConfigurationPageVM}">
+           DataContext="{StaticResource ConfigurationPageVM}">
 
    <OPTIMIZER:MachinePanelV DataContext="{Binding MachinePanelVM}"/>
    

EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -17,6 +17,16 @@ Public Class ConfigurationPageVM
       PDFEDITOR = 2
    End Enum
 
+   Private m_QParametersModified As Boolean = False
+   Friend ReadOnly Property QParametersModified As Boolean
+      Get
+         Return m_QParametersModified
+      End Get
+   End Property
+   Friend Sub ResetQParametersModified()
+      m_QParametersModified = False
+   End Sub
+
    Private m_SelConfigSubPage As ConfigSubPages = ConfigSubPages.GENERAL
    Public Property SelConfigSubPage As Integer
       Get
@@ -546,12 +556,18 @@ Public Class ConfigurationPageVM
 
    ' funzione che verifica la modifica dei valori in Configurazione e ne chiede il salvataggio
    Friend Sub VerifyConfigPageModification()
-      ' aggiorno tutti i valori senza verificare modifiche
-      WriteMainPrivateProfileString(S_GENERAL, K_MESSAGES, m_SelectedLanguage.Name)
-      WriteMainPrivateProfileString(S_SCENE, K_MMUNITS, SelMeasureUnit.ToString())
-      WriteMainPrivateProfileString(S_NEST, K_SECTIONTIME, DoubleToString(m_SectionTime, 5))
-      WriteMainPrivateProfileString(S_NEST, K_PARTTIME, DoubleToString(m_PartTime, 5))
-      WriteMainPrivateProfileString(S_PRINTER, K_ENABLE, If(m_bPrintLabel_IsChecked, 1, 0))
+      Dim bExitFor = False
+      Select Case m_SelConfigSubPage
+         Case ConfigSubPages.GENERAL
+            ' aggiorno tutti i valori senza verificare modifiche
+            WriteMainPrivateProfileString(S_GENERAL, K_MESSAGES, m_SelectedLanguage.Name)
+            WriteMainPrivateProfileString(S_SCENE, K_MMUNITS, SelMeasureUnit.ToString())
+            WriteMainPrivateProfileString(S_NEST, K_SECTIONTIME, DoubleToString(m_SectionTime, 5))
+            WriteMainPrivateProfileString(S_NEST, K_PARTTIME, DoubleToString(m_PartTime, 5))
+            WriteMainPrivateProfileString(S_PRINTER, K_ENABLE, If(m_bPrintLabel_IsChecked, 1, 0))
+         Case ConfigSubPages.MACHINE
+            'Map.refMachinePanelVM.VerifyConfigPageModification()
+      End Select
    End Sub
 
    ' funzione che verifica l'inserimento della password quando si edita un parametro Macchina
@@ -575,6 +591,7 @@ Public Class ConfigurationPageVM
 
 #Region "SaveCommand"
 
+
    Public ReadOnly Property SaveCommand As ICommand
       Get
          If m_cmdSave Is Nothing Then
@@ -901,4 +918,200 @@ Public Class ConfigurationPageVM
 
 #End Region    ' Commands
 
-End Class
+End Class
+
+'Public Class MachParam
+'   Inherits VMBase
+
+'   ' table a cui appartiene il parametro
+'   Private m_nParentTable As Integer
+'   Friend ReadOnly Property nParentTable As Integer
+'      Get
+'         Return m_nParentTable
+'      End Get
+'   End Property
+
+'   ' indice del parametro
+'   Private m_nParamIndex As Integer
+'   Friend ReadOnly Property nParamIndex As Integer
+'      Get
+'         Return m_nParamIndex
+'      End Get
+'   End Property
+
+'   ' tipo della variabile
+'   Private m_nType As MachParamType
+'   Friend ReadOnly Property nType As MachParamType
+'      Get
+'         Return m_nType
+'      End Get
+'   End Property
+
+'   ' parametri da struttura
+'   Private m_sName As String
+'   Public Property sName As String
+'      Get
+'         Return m_sName
+'      End Get
+'      Set(value As String)
+'         m_sName = value
+'      End Set
+'   End Property
+
+'   ' parametri da geometria
+'   Private m_IsModifiedValue As Boolean = False
+'   Private m_dValue As Double
+'   Private m_sValue As String
+'   Public Property sValue As String
+'      Get
+'         Select Case nType
+'            Case MachParamType.DOUBLE_
+'               Return DoubleToString(m_dValue, 3)
+'            Case MachParamType.LENGTH
+'               Return LenToString(m_dValue, 3)
+'            Case Else      ' stringhe
+'               Return m_sValue
+'         End Select
+'         Return If(nType = MachParamType.LENGTH, LenToString(m_dValue, 3), DoubleToString(m_dValue, 3))
+'      End Get
+'      Set(value As String)
+'         Dim dNewValue As Double
+'         ' verifico se valore immesso è diverso dall'originale
+'         If nParentTable > 0 Then
+'            ' trasformo valori
+'            Select Case nType
+'               Case MachParamType.DOUBLE_
+'                  StringToDoubleAdv(value, dNewValue, True)
+'                  m_IsModifiedValue = Math.Abs(dNewValue - m_dValue) > EPS_SMALL
+'               Case MachParamType.LENGTH
+'                  StringToLenAdv(value, dNewValue, True)
+'                  m_IsModifiedValue = Math.Abs(dNewValue - m_dValue) > EPS_SMALL
+'               Case Else
+'                  m_IsModifiedValue = String.Compare(value, m_sValue) <> 0
+'            End Select
+'         End If
+'         ' se valore immesso è diverso e password non inserita
+'         If m_IsModifiedValue AndAlso Not Map.refConfigurationPageVM.bModifyMachParam Then
+'            Map.refConfigurationPageVM.bModifyMachParam = Map.refConfigurationPageVM.VerifyConfigPagePassword()
+'            If Not Map.refConfigurationPageVM.bModifyMachParam Then
+'               NotifyPropertyChanged(NameOf(sValue))
+'               m_IsModifiedValue = False
+'               Return
+'            End If
+'         End If
+
+'         Select Case nType
+'            Case MachParamType.DOUBLE_, MachParamType.LENGTH
+'               UpdateParamValue(dNewValue, "")
+'            Case Else
+'               UpdateParamValue(0, value)
+'         End Select
+
+'         If Map.refConfigurationPageVM.bModifyMachParam Then Map.refConfigurationPageVM.VerifyConfigPageModification()
+'      End Set
+'   End Property
+'   Public Property dValue As Double
+'      Get
+'         Return m_dValue
+'      End Get
+'      Set(value As Double)
+'         m_dValue = value
+'         NotifyPropertyChanged(NameOf(sValue))
+'      End Set
+'   End Property
+
+'   ' descrizione del parametro
+'   Private m_sDescription As String
+'   Public Property sDescription As String
+'      Get
+'         Return m_sDescription
+'      End Get
+'      Set(value As String)
+'         m_sDescription = value
+'      End Set
+'   End Property
+
+'   Private Sub StdInit(nParentTable As Integer, nParamIndex As Integer, Type As MachParamType, sName As String, sDescription As String)
+'      m_nParentTable = nParentTable
+'      m_nParamIndex = nParamIndex
+'      m_nType = Type
+'      m_sName = sName
+'      m_sDescription = MsgToString(sDescription)
+'   End Sub
+
+'   ' new per double e length
+'   Sub New(nParentTable As Integer, nParamIndex As Integer, nType As MachParamType, sParamName As String, dValue As Double, sDescription As String)
+'      StdInit(nParentTable, nParamIndex, nType, sParamName, sDescription)
+'      m_dValue = dValue 'sValue = DoubleToString(dValue, 3)
+'   End Sub
+
+'   ' new per stringhe
+'   Sub New(nParentTable As Integer, nParamIndex As Integer, nType As MachParamType, sParamName As String, sDescription As String)
+'      StdInit(nParentTable, nParamIndex, nType, sParamName, sDescription)
+'   End Sub
+
+'   ' new per parametro vuoto
+'   Sub New(nType As MachParamType, nParamIndex As Integer, sParamName As String)
+'      StdInit(Nothing, nParamIndex, nType, sParamName, "")
+'   End Sub
+
+'   Friend Sub UpdateParamValue(dNewValue As Double, sNewValue As String, Optional bDraw As Boolean = True)
+'      Select Case nType
+'         Case MachParamType.DOUBLE_, MachParamType.LENGTH
+'            m_dValue = dNewValue
+'         Case MachParamType.STRING_
+'            m_sValue = sNewValue
+'      End Select
+'   End Sub
+
+'   Public ReadOnly Property IsModified() As Boolean
+'      Get
+'         Return m_IsModifiedValue
+'      End Get
+'   End Property
+
+'   Public Sub IsModifiedReset()
+'      m_IsModifiedValue = False
+'   End Sub
+
+'End Class
+
+'Public Class MachTable
+'   Inherits VMBase
+
+'   ' nome della table
+'   Private m_sName As String
+'   Public Property sName As String
+'      Get
+'         Return m_sName
+'      End Get
+'      Set(value As String)
+'         m_sName = value
+'      End Set
+'   End Property
+
+'   Private m_MachParamList As New ObservableCollection(Of MachParam)
+'   Public Property MachParamList As ObservableCollection(Of MachParam)
+'      Get
+'         Return m_MachParamList
+'      End Get
+'      Set(value As ObservableCollection(Of MachParam))
+'         m_MachParamList = value
+'      End Set
+'   End Property
+
+'   Sub New(Name As String, ParamList As ObservableCollection(Of MachParam))
+'      sName = Name
+'      MachParamList = ParamList
+'   End Sub
+
+'End Class
+
+'' Tipo parametro nel file di configurazione Macchina
+'Public Enum MachParamType As Integer
+'   DOUBLE_ = 1
+'   STRING_ = 2
+'   COMBO = 3
+'   LENGTH = 4
+'   CHECKBOX = 5
+'End Enum

EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml

@@ -3,7 +3,7 @@
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-           DataContext="{DynamicResource ConfigurationPageVM}">
+           DataContext="{StaticResource ConfigurationPageVM}">
    <Grid>
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
@@ -13,21 +13,19 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="6*"/>
       </Grid.RowDefinitions>
-      <TabControl Grid.RowSpan="2" 
-                  Grid.ColumnSpan="2"
+      <TabControl Grid.RowSpan="2" Grid.ColumnSpan="2"
                   SelectedIndex="{Binding SelConfigSubPage}"
-                  Style="{StaticResource Optimizer_TabControl}">
+                  Style="{StaticResource OnlyProd_TabControl}">
          <TabItem>
             <TabItem.Header>
-               <StackPanel Style="{StaticResource ConfigurationProgram_StackPanel}">
+               <StackPanel Orientation="Horizontal" Margin="5">
                   <TextBlock Text="{Binding General_Msg}"
-                             Style="{StaticResource ConfigurationProgram_TextBlock}"/>
+                             FontSize="15"/>
                   <Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding General_Visibility}"
                           Style="{StaticResource SaveOptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
                   </Button>
                </StackPanel>
             </TabItem.Header>
@@ -37,15 +35,14 @@
          </TabItem>
          <TabItem>
             <TabItem.Header>
-               <StackPanel Style="{StaticResource ConfigurationProgram_StackPanel}">
+               <StackPanel Orientation="Horizontal" Margin="5">
                   <TextBlock Text="{Binding PDFEditor_Msg}"
-                             Style="{StaticResource ConfigurationProgram_TextBlock}"/>
+                             FontSize="15"/>
                   <Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding PDFEditor_Visibility}"
                           Style="{StaticResource SaveOptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
                   </Button>
                </StackPanel>
             </TabItem.Header>

EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj

@@ -81,7 +81,6 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationFramework.Aero2" />
-    <Reference Include="ReachFramework" />
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
@@ -92,7 +91,6 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Printing" />
     <Reference Include="System.Security" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
@@ -131,6 +129,10 @@
     <Compile Include="AddRawPartWnd\AddRawPartWndV.xaml.vb">
       <DependentUpon>AddRawPartWndV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="AddSectionXMaterialWnd\AddSectionXMaterialWndV.xaml.vb">
+      <DependentUpon>AddSectionXMaterialWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="AddSectionXMaterialWnd\AddSectionXMaterialWndVM.vb" />
     <Compile Include="Application.xaml.vb">
       <DependentUpon>Application.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -169,21 +171,6 @@
       <DependentUpon>NestingRunningWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
-    <Compile Include="Panel\LeftPanelBottomV.xaml.vb">
-      <DependentUpon>LeftPanelBottomV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Panel\LeftPanelTopV.xaml.vb">
-      <DependentUpon>LeftPanelTopV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Panel\RightPanelBottomV.xaml.vb">
-      <DependentUpon>RightPanelBottomV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Panel\RightPanelTopV.xaml.vb">
-      <DependentUpon>RightPanelTopV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Panel\TopPanelV.xaml.vb">
-      <DependentUpon>TopPanelV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="ProdManager\ProdManagerV.xaml.vb">
       <DependentUpon>ProdManagerV.xaml</DependentUpon>
     </Compile>
@@ -272,7 +259,6 @@
     <Compile Include="Statistics\PDFEditorV.xaml.vb">
       <DependentUpon>PDFEditorV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Statistics\PDFFlowHelper.vb" />
     <Compile Include="Statistics\StatisticsV.xaml.vb">
       <DependentUpon>StatisticsV.xaml</DependentUpon>
     </Compile>
@@ -520,6 +506,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="AddSectionXMaterialWnd\AddSectionXMaterialWndV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="BlockedWnd\BlockedWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -578,7 +568,7 @@
     </Page>
     <Page Include="GeneralParametersStrategy\GeneralParametersStrategyV.xaml">
       <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="GeneralParametersStrategy\GeneralParametersWnd.xaml">
       <SubType>Designer</SubType>
@@ -652,26 +642,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Panel\LeftPanelBottomV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Panel\LeftPanelTopV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Panel\RightPanelBottomV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Panel\RightPanelTopV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Panel\TopPanelV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ProdManager\ProdManagerV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -975,6 +945,7 @@
     <Resource Include="Resources\ViewPanel\ZoomIn.png" />
     <Resource Include="Resources\ViewPanel\ZoomOut.png" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <PackageReference Include="BouncyCastle">
       <Version>1.8.5</Version>

EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml

@@ -2,28 +2,25 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             DataContext="{StaticResource FeatureListManagerVM}"
-            Style="{StaticResource FeatureListManager_StackPanel}">
+            Style="{StaticResource OnlyProdFeatureListManager_StackPanel}">
    
    <Button Command="{Binding CopyFeature_Command}"
            ToolTip="{Binding CopyFeature_ToolTip}"
            IsEnabled="{Binding CopyFeature_IsEnabled}"
-           Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/LeftPanel/CopyFeature.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
+      <Image Source="/Resources/LeftPanel/CopyFeature.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding AddFeature_Command}"
            ToolTip="{Binding AddFeature_ToolTip}"
            IsEnabled="{Binding AddFeature_IsEnabled}"
-           Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/LeftPanel/AddFeature.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
+      <Image Source="/Resources/LeftPanel/AddFeature.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemoveFeature_Command}"
            ToolTip="{Binding RemoveFeature_ToolTip}"
            IsEnabled="{Binding RemoveFeature_IsEnabled}"
-           Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/NewPage/Remove.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Style="{StaticResource OnlyProdLeftPanel_Button}">
+      <Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
    </Button>
 
 </StackPanel>

EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml

@@ -3,7 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-      Style="{StaticResource FeatureManager_Grid}">
+      Margin="30,4,0,2">
    
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="Auto"/>
@@ -20,7 +20,7 @@
 
    <Expander Header="{Binding Face_Msg}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
-             Style="{StaticResource FeatureManager_Expander}">
+             Width="80">
       <ListBox ItemsSource="{Binding Tag.SIDEList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                SelectedItem="{Binding Tag.nSelSIDE, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                IsEnabled="{Binding FeatureManager_IsEnabled}"
@@ -30,7 +30,7 @@
    <Expander Grid.Column="1"
              Header="{Binding Group_Msg}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
-             Style="{StaticResource FeatureManager_Expander}">
+             Width="80">
       <ListBox ItemsSource="{Binding Tag.GRPList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                SelectedItem="{Binding Tag.nSelGRP, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                IsEnabled="{Binding FeatureManager_IsEnabled}"
@@ -41,7 +41,7 @@
               Text="{Binding Priority_Msg}"
               IsEnabled="{Binding FeatureManager_IsEnabled}"
               Visibility="{Binding Priority_Visibility}"
-              Style="{StaticResource Option_TextBlock}"/>
+              Style="{StaticResource OptionTextBlock}"/>
    <EgtWPFLib5:EgtTextBox Grid.Column="3"
                           Text="{Binding Tag.sPriority, 
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}},
@@ -51,36 +51,35 @@
                           Style="{StaticResource Dimension_TextBox}"/>
    <TextBlock Grid.Column="4"
               Text="{Binding Tag.sName, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-              Style="{StaticResource FeatureManager_TextBlock}"/>
+              Style="{StaticResource OnlyProdFeatureManager_OnlyProd}"/>
    <ComboBox Grid.Column="5"
              ItemsSource="{Binding Tag.VARIANTList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
              SelectedItem="{Binding Tag.nSelVARIANT, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
              Visibility="{Binding Variant_Visibility}"
-             Style="{StaticResource Feature_ComboBox}"/>
+             Style="{StaticResource FeatureComboBox}"/>
    <Button Grid.Column="6"
            Content="{Binding Edit_Msg}"
            Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.Edit_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            IsEnabled="{Binding Edit_IsEnabled}"
-           Style="{StaticResource GeneralConfiguration_Button}"/>
+           Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
    <Button Grid.Column="7"
            Content="{Binding Save_Msg}"
            Command="{Binding Tag.Save_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-           Style="{StaticResource GeneralConfiguration_Button}"/>
+           Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
    <Button Grid.Column="8"
            Content="{Binding Cancel_Msg}"
            Command="{Binding Tag.Cancel_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-           Style="{StaticResource GeneralConfiguration_Button}"/>
-   <Button Grid.Column="9" 
+           Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
+   <Button Grid.Column="9" HorizontalAlignment="Right"
            Command="{Binding MacroFeature_Command}"
            ToolTip="{Binding MacroFeature_ToolTip}"
            IsEnabled="{Binding MacroFeature_IsEnabled}"
-           Style="{StaticResource MacroFeaturen_Button}">
-      <Image Source="/Resources/LeftPanel/MacroFeature.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Style="{StaticResource OnlyProdFeatureMan_Button}">
+      <Image Source="/Resources/LeftPanel/MacroFeature.png" Stretch="Uniform"/>
    </Button>
 
 </Grid>

EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml

@@ -8,31 +8,45 @@
          <ColumnDefinition Width="Auto"/>
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
-      <Border Grid.RowSpan="2"
-              Style="{StaticResource ForcedStrategyBTL_Border}">
+      <Border Margin="2,0,2,0" 
+              Grid.RowSpan="2"
+              Style="{StaticResource OnlyProdPage_Border}">
          <ListBox ItemsSource="{Binding StrategyList}"
                   SelectedItem="{Binding SelStrategy}"
-                  Style="{StaticResource ForcedStrategyBTL_ListBox}">
+                  IsSynchronizedWithCurrentItem="True"
+                  HorizontalAlignment="Left"
+                  Style="{StaticResource NewAddFeature_ListBox}">
             <ListBox.Resources>
                <DataTemplate DataType="{x:Type Optimizer:Strategy}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal">
                      <RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                   GroupName="ForcedStrategy"/>
                      <Image Source="{Binding sStrategyImagePath}"
-                            Style="{StaticResource ForcedStrategyBTL_Image}"/>
+                            Stretch="Uniform"
+                            Width="100"
+                            Height="100"/>
                      <TextBlock Text="{Binding sStrategyName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
                </DataTemplate>
             </ListBox.Resources>
+            <ListBox.ItemContainerStyle>
+               <Style TargetType="ListBoxItem">
+                  <!--<EventSetter Event="PreviewMouseDown" Handler="AvailableStrategyList_PreviewMouseDown"/>-->
+               </Style>
+            </ListBox.ItemContainerStyle>
          </ListBox>
       </Border>
       
       <GroupBox Grid.Column="1" 
-                Style="{StaticResource ForcedStrategyBTL_GroupBox}">
+                Foreground="Black"
+                BorderThickness="2"
+                Margin="0,-5,0,0"
+                BorderBrush="{StaticResource BeamWall_Glacier}">
          <GroupBox.Header>
             <TextBlock Text="{Binding SelStrategy.sStrategyName}" 
-                       Style="{StaticResource ForcedStrategyBTL_TextBlock}"/>
+                       FontWeight="Bold"
+                       Style="{StaticResource DialogWindow_TextBlock}"/>
          </GroupBox.Header>
          <Optimizer:ParameterStrategyV Tag="{Binding SelStrategy}"/>
       </GroupBox>

EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml

@@ -12,30 +12,44 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Border Grid.RowSpan="2"
-              Style="{StaticResource ForcedStrategyBTL_Border}">
+              Margin="2,0,2,0" 
+              Style="{StaticResource OnlyProdPage_Border}">
          <ListBox ItemsSource="{Binding StrategyList}"
                   SelectedItem="{Binding SelStrategy}"
-                  Style="{StaticResource ForcedStrategyBTL_ListBox}">
+                  Height="Auto"
+                  IsSynchronizedWithCurrentItem="True"
+                  Style="{StaticResource NewAddFeature_ListBox}">
             <ListBox.Resources>
                <DataTemplate DataType="{x:Type OPTIMIZER:Strategy}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal">
                      <RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                   GroupName="ForcedStrategy"/>
                      <Image Source="{Binding sStrategyImagePath}"
-                            Style="{StaticResource ForcedStrategyBTL_Image}"/>
+                         Stretch="Uniform"
+                         Width="100"
+                         Height="100"/>
                      <TextBlock Text="{Binding sStrategyName}"
                              Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
                </DataTemplate>
             </ListBox.Resources>
+            <ListBox.ItemContainerStyle>
+               <Style TargetType="ListBoxItem">
+                  <!--<EventSetter Event="PreviewMouseDown" Handler="AvailableStrategyList_PreviewMouseDown"/>-->
+               </Style>
+            </ListBox.ItemContainerStyle>
          </ListBox>
       </Border>
       
       <GroupBox Grid.Column="1" 
-                Style="{StaticResource ForcedStrategyBTL_GroupBox}">
+                Foreground="Black"
+                BorderThickness="2"
+                Margin="0,-5,0,0"
+                BorderBrush="{StaticResource BeamWall_Glacier}">
          <GroupBox.Header>
             <TextBlock Text="{Binding SelStrategy.sStrategyName}" 
-                       Style="{StaticResource ForcedStrategyBTL_TextBlock}"/>
+                       FontWeight="Bold"
+                       Style="{StaticResource DialogWindow_TextBlock}"/>
          </GroupBox.Header>
          <OPTIMIZER:ParameterStrategyV Tag="{Binding SelStrategy}"/>
       </GroupBox>
@@ -43,7 +57,7 @@
       <StackPanel Grid.Row="2"
                   Grid.ColumnSpan="2"
                   HorizontalAlignment="Right"
-                  Style="{StaticResource PartManager_StackPanel}">
+                  Style="{StaticResource OnlyProdPartManager_StackPanel}">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">

EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb

@@ -243,6 +243,7 @@ Public Class ForcedStrategyPanelVM
       If File.Exists(sAvailableStrategiesFilePath) Then
          Dim sReadedFile As String = File.ReadAllText(sAvailableStrategiesFilePath)
          Dim JsonStrategyFeatureList As List(Of JsonAvailableStrategyFeature) = JsonConvert.DeserializeObject(Of List(Of JsonAvailableStrategyFeature))(sReadedFile)
+         'nGRP = CalcBeamPrivateProfileGRP(nGRP)
          Dim JsonAvailableStrategyFeature As JsonAvailableStrategyFeature = JsonStrategyFeatureList.FirstOrDefault(Function(x) x.nGrp = nGRP AndAlso x.nPrc = nPRC)
          If IsNothing(JsonAvailableStrategyFeature) Then Return
          Dim JsonAvailableTopology As JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
@@ -329,11 +330,47 @@ Public Class ForcedStrategyPanelVM
    End Property
 
    Public Sub Ok()
+      '' cancello precedenti valori
+      'Dim sPrecStrategyID As String = ""
+      'EgtGetInfo(m_CurrentFeature.nFeatureId, "STRATEGY", sPrecStrategyID)
+      'If Not String.IsNullOrWhiteSpace(sPrecStrategyID) Then
+      '   Dim PrecInfo As String() = {}
+      '   EgtGetAllInfo(m_CurrentFeature.nFeatureId, PrecInfo)
+      '   Dim PrecStrategyInfo As String() = PrecInfo.Where(Function(x) x.StartsWith(sPrecStrategyID)).ToArray()
+      '   For Each Info In PrecStrategyInfo
+      '      EgtRemoveInfo(m_CurrentFeature.nFeatureId, Info.Split("="c)(0))
+      '   Next
+      'End If
+      'If m_SelStrategy.sStrategyId = AUTOMATICSTRATEGYID Then
+      '   EgtRemoveInfo(m_CurrentFeature.nFeatureId, "STRATEGY")
+      'Else
+      '   EgtSetInfo(m_CurrentFeature.nFeatureId, "STRATEGY", SelStrategy.sStrategyId)
+      '   Dim sInfo As String = String.Empty
+      '   For Each Param In SelStrategy.ParameterList
+      '      Select Case Param.GetType()
+      '         Case GetType(BooleanStrategyParameter)
+      '            EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, DirectCast(Param, BooleanStrategyParameter).bValue)
+      '         Case GetType(DoubleStrategyParameter)
+      '            EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, DirectCast(Param, DoubleStrategyParameter).sValue)
+      '         Case GetType(ComboStrategyParameter)
+      '            EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, DirectCast(Param, ComboStrategyParameter).SelValue.sValue)
+      '         Case GetType(StringStrategyParameter)
+      '            EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, DirectCast(Param, StringStrategyParameter).sValue)
+      '         Case GetType(ListStrategyParameter)
+      '            For Each Item As ToolParameter In DirectCast(Param, ListStrategyParameter).ListValue
+      '               If Item.bIsActive Then
+      '                  sInfo &= Item.sUUID & "," & Item.sName & ";"
+      '                  EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, sInfo)
+      '               End If
+      '            Next
+      '      End Select
+      '   Next
+      'End If
       ForcedStrategy()
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER)
       ' Abilito LeftPanel
-      Map.refProjectVM.SetLeftPanel_IsEnabled(True)
-      Map.refProjectVM.SetLeftPanel_Opacity(1)
+      Map.refProjectVM.SetOnlyProdLeftPanel_IsEnabled(True)
+      Map.refProjectVM.SetOnlyProdLeftPanel_Opacity(1)
    End Sub
 
 #End Region ' Ok_Command
@@ -352,8 +389,8 @@ Public Class ForcedStrategyPanelVM
    Public Sub Cancel()
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER)
       ' Abilito LeftPanel
-      Map.refProjectVM.SetLeftPanel_IsEnabled(True)
-      Map.refProjectVM.SetLeftPanel_Opacity(1)
+      Map.refProjectVM.SetOnlyProdLeftPanel_IsEnabled(True)
+      Map.refProjectVM.SetOnlyProdLeftPanel_Opacity(1)
    End Sub
 
 #End Region ' Cancel_Command

EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml

@@ -1,13 +1,23 @@
 <UserControl x:Class="FreeContourInputV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Style="{StaticResource FreeContourInput_UserControl}">
+             Height="32">
    
-   <StackPanel Style="{StaticResource FreeContourInput_StackPanel}">
+   <StackPanel>
+      <StackPanel.Style>
+         <Style TargetType="{x:Type StackPanel}">
+            <Setter Property="Orientation" Value="Horizontal"/>
+            <Style.Triggers>
+               <DataTrigger Binding="{Binding FocusTextBox}" Value="True">
+                  <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=PropertySearch}"/>
+               </DataTrigger>
+            </Style.Triggers>
+         </Style>
+      </StackPanel.Style>
       
       <TextBlock Text="{Binding Message}"
                  Visibility="{Binding Message_Visibility}"
-                 Style="{StaticResource Option_TextBlock}"/>
+                 Style="{StaticResource OptionTextBlock}"/>
       <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}"
                Visibility="{Binding Text_Visibility}" 
                Style="{StaticResource FreeContour_TextBox}">
@@ -23,8 +33,8 @@
       <ComboBox ItemsSource="{Binding ComboItemsList}" 
                 SelectedIndex="{Binding ComboSelectedIndex}"
                 Visibility="{Binding Combo_Visibility}" 
-                Style="{StaticResource FreeContourInput_ComboBox}"/>
-      <Grid Style="{StaticResource FreeContourInput_Grid}">
+                Margin="5,0,5,0"/>
+      <Grid Margin="5,0,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
@@ -32,12 +42,12 @@
          <Button Command="{Binding Show_Command}" 
                  Visibility="{Binding ShowBtn_Visibility}"
                  Content="{Binding ShowMsg}" 
-                 Style="{StaticResource GeneralConfiguration_Button}"/>
+                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
          <Button Grid.Column="1"
                  Command="{Binding Done_Command}" 
                  Visibility="{Binding DoneBtn_Visibility}"
                  Content="{Binding OkMsg}" 
-                 Style="{StaticResource GeneralConfiguration_Button}"/>
+                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
       </Grid>
    </StackPanel>
 </UserControl>

EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputVM.vb

@@ -38,6 +38,7 @@ Public Class FreeContourInputVM
       End Get
       Set(value As String)
          m_Text = value
+         'Map.refProjectVM.NotifyInputText(value)
          NotifyPropertyChanged(NameOf(Text))
       End Set
    End Property
@@ -220,7 +221,8 @@ Public Class FreeContourInputVM
       End If
    End Sub
 
-   Friend Sub PrepareInputBox(sTitle As String, sLabel As String, sCheckLabel As String, bShowCombo As Boolean, bShowBtn As Boolean)
+   Friend Sub PrepareInputBox(sTitle As String, sLabel As String, sCheckLabel As String,
+                                  bShowCombo As Boolean, bShowBtn As Boolean)
       Title = sTitle
       If sLabel <> "" Then
          Message = sLabel
@@ -280,6 +282,9 @@ Public Class FreeContourInputVM
 
 #Region "Show"
 
+   ''' <summary>
+   ''' Returns a command that do Point.
+   ''' </summary>
    Public ReadOnly Property Show_Command As ICommand
       Get
          If m_cmdShow Is Nothing Then
@@ -289,6 +294,9 @@ Public Class FreeContourInputVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Point.  This method is invoked by the PointCommand.
+   ''' </summary>
    Public Sub Show(ByVal param As Object)
       Map.refSceneHostVM.MainController.Show(m_Text)
    End Sub
@@ -297,6 +305,9 @@ Public Class FreeContourInputVM
 
 #Region "Done"
 
+   ''' <summary>
+   ''' Returns a command that do Point.
+   ''' </summary>
    Public ReadOnly Property Done_Command As ICommand
       Get
          If m_cmdDone Is Nothing Then
@@ -306,6 +317,9 @@ Public Class FreeContourInputVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Point.  This method is invoked by the PointCommand.
+   ''' </summary>
    Public Sub Done(ByVal param As Object)
       If Map.refFreeContourManagerVM.bIsActive AndAlso Map.refFreeContourManagerVM.bIsModifyingTextAngle Then
          Map.refFreeContourManagerVM.CloseIsModifyingTextAngle(True)

EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml

@@ -1,76 +1,66 @@
 <StackPanel x:Class="FreeContourManagerV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource BTLPartManager_StackPanel}">
+            Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
 
    <ComboBox ItemsSource="{Binding TypeList}"
              SelectedIndex="{Binding SelType, Delay=1}"
-             Style="{StaticResource ProdType_ComboBox}"/>
+             Style="{StaticResource OnlyProdType_ComboBox}"/>
    <ComboBox ItemsSource="{Binding PathList}"
              SelectedIndex="{Binding SelPath}"
              Visibility="{Binding PathList_Visibility}"
-             Style="{StaticResource ProdPath_ComboBox}"/>
+             Style="{StaticResource OnlyProdPath_ComboBox}"/>
    <Button Command="{Binding Line2P_Command}"
            ToolTip="{Binding Line2P_ToolTip}"
            IsEnabled="{Binding Line2P_IsEnabled}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Line2P.png" 
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding Delete_Command}"
            ToolTip="{Binding Delete_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Delete.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding ModifyCurve_Command}"
            ToolTip="{Binding ModifyCurve_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/ModifyCurve.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding AddPointCurve_Command}"
            ToolTip="{Binding AddPointCurve_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/AddPointCurve.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemovePointCurve_Command}"
            ToolTip="{Binding RemovePointCurve_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/RemovePointCurve.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding ChangeStart_Command}"
            ToolTip="{Binding ChangeStart_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/ChangeStart.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding InvertCurve_Command}"
            ToolTip="{Binding InvertCurve_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/InvertCurve.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding Move_Command}"
            ToolTip="{Binding Move_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Move.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding Rotate_Command}"
            ToolTip="{Binding Rotate_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Rotate.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding TextAngle_Command}"
            ToolTip="{Binding TextAngle_ToolTip}" 
            Visibility="{Binding TextAngle_Visibility}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Text.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
    </Button>
 
 </StackPanel>

EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerVM.vb

@@ -272,6 +272,7 @@ Public Class FreeContourManagerVM
    Private m_cmdModifyCurve As ICommand
    Private m_cmdAddPointCurve As ICommand
    Private m_cmdRemovePointCurve As ICommand
+   Private m_cmdArcflip As ICommand
    Private m_cmdMove As ICommand
    Private m_cmdRotate As ICommand
    Private m_cmdMirror As ICommand
@@ -874,6 +875,7 @@ Public Class FreeContourManagerVM
       m_nNewPathCopyForSideAngleId = EgtCopyGlob(m_nNewPathId, nSelFeatureId, GDB_POS.AFTER)
       SideAngValues = NewSideAngValues
       EgtDraw()
+      'End If
    End Sub
 
    Friend Sub CloseIsModifyingTextAngle(bResult As Boolean)
@@ -953,6 +955,9 @@ Public Class FreeContourManagerVM
 
 #Region "Line2P"
 
+   ''' <summary>
+   ''' Returns a command that do Line2P.
+   ''' </summary>
    Public ReadOnly Property Line2P_Command As ICommand
       Get
          If m_cmdLine2P Is Nothing Then
@@ -962,6 +967,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Line2P.  This method is invoked by the Line2PCommand.
+   ''' </summary>
    Public Sub Line2P(ByVal param As Object)
       ' cancello eventuale gruppo precedente
       Dim nNewPathLayerId As Integer = EgtGetFirstNameInGroup(nSelPartId, "NewPathLayer")
@@ -985,6 +993,9 @@ Public Class FreeContourManagerVM
 
 #Region "Delete"
 
+   ''' <summary>
+   ''' Returns a command that do Line2P.
+   ''' </summary>
    Public ReadOnly Property Delete_Command As ICommand
       Get
          If m_cmdDelete Is Nothing Then
@@ -994,6 +1005,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Line2P.  This method is invoked by the Line2PCommand.
+   ''' </summary>
    Public Sub Delete(ByVal param As Object)
       InitCommand(True)
       Map.refSceneHostVM.MainController.SetLastInteger(GDB_ID.SEL)
@@ -1004,6 +1018,9 @@ Public Class FreeContourManagerVM
 
 #Region "ModifyCurve"
 
+   ''' <summary>
+   ''' Returns a command that do Linear Dimension.
+   ''' </summary>
    Public ReadOnly Property ModifyCurve_Command As ICommand
       Get
          If m_cmdModifyCurve Is Nothing Then
@@ -1013,6 +1030,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
+   ''' </summary>
    Public Sub ModifyCurve(ByVal param As Object)
       InitCommand(True)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
@@ -1022,6 +1042,9 @@ Public Class FreeContourManagerVM
 
 #Region "AddPointCurve"
 
+   ''' <summary>
+   ''' Returns a command that do Linear Dimension.
+   ''' </summary>
    Public ReadOnly Property AddPointCurve_Command As ICommand
       Get
          If m_cmdAddPointCurve Is Nothing Then
@@ -1031,6 +1054,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
+   ''' </summary>
    Public Sub AddPointCurve(ByVal param As Object)
       InitCommand(True)
       If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
@@ -1046,6 +1072,9 @@ Public Class FreeContourManagerVM
 
 #Region "RemovePointCurve"
 
+   ''' <summary>
+   ''' Returns a command that do Linear Dimension.
+   ''' </summary>
    Public ReadOnly Property RemovePointCurve_Command As ICommand
       Get
          If m_cmdRemovePointCurve Is Nothing Then
@@ -1055,6 +1084,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
+   ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
       If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
          If Not m_bClosedPathNeeded Then
@@ -1077,6 +1109,9 @@ Public Class FreeContourManagerVM
 
 #Region "Move"
 
+   ''' <summary>
+   ''' Returns a command that do Move.
+   ''' </summary>
    Public ReadOnly Property Move_Command As ICommand
       Get
          If m_cmdMove Is Nothing Then
@@ -1086,6 +1121,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Move.  This method is invoked by the MoveCommand.
+   ''' </summary>
    Public Sub Move(ByVal param As Object)
       InitCommand(True)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE)
@@ -1095,6 +1133,9 @@ Public Class FreeContourManagerVM
 
 #Region "Rotate"
 
+   ''' <summary>
+   ''' Returns a command that do Rotate.
+   ''' </summary>
    Public ReadOnly Property Rotate_Command As ICommand
       Get
          If m_cmdRotate Is Nothing Then
@@ -1104,6 +1145,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Rotate.  This method is invoked by the RotateCommand.
+   ''' </summary>
    Public Sub Rotate(ByVal param As Object)
       InitCommand(True)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.ROTATE)
@@ -1113,6 +1157,9 @@ Public Class FreeContourManagerVM
 
 #Region "Mirror"
 
+   ''' <summary>
+   ''' Returns a command that do Mirror.
+   ''' </summary>
    Public ReadOnly Property Mirror_Command As ICommand
       Get
          If m_cmdMirror Is Nothing Then
@@ -1122,6 +1169,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Mirror.  This method is invoked by the MirrorCommand.
+   ''' </summary>
    Public Sub Mirror(ByVal param As Object)
       InitCommand(True)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MIRROR)
@@ -1131,6 +1181,9 @@ Public Class FreeContourManagerVM
 
 #Region "Scale"
 
+   ''' <summary>
+   ''' Returns a command that do Scale.
+   ''' </summary>
    Public ReadOnly Property Scale_Command As ICommand
       Get
          If m_cmdScale Is Nothing Then
@@ -1140,6 +1193,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Scale.  This method is invoked by the ScaleCommand.
+   ''' </summary>
    Public Sub Scale(ByVal param As Object)
       InitCommand(True)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.SCALE)
@@ -1149,6 +1205,9 @@ Public Class FreeContourManagerVM
 
 #Region "ChangeStart"
 
+   ''' <summary>
+   ''' Returns a command that do Scale.
+   ''' </summary>
    Public ReadOnly Property ChangeStart_Command As ICommand
       Get
          If m_cmdChangeStart Is Nothing Then
@@ -1158,6 +1217,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Scale.  This method is invoked by the ScaleCommand.
+   ''' </summary>
    Public Sub ChangeStart(ByVal param As Object)
       InitCommand(True)
       Map.refSceneHostVM.MainScene.SetSnapPointType(SP.PT_END)
@@ -1168,6 +1230,9 @@ Public Class FreeContourManagerVM
 
 #Region "InvertCurve"
 
+   ''' <summary>
+   ''' Returns a command that do Scale.
+   ''' </summary>
    Public ReadOnly Property InvertCurve_Command As ICommand
       Get
          If m_cmdInvertCurve Is Nothing Then
@@ -1177,6 +1242,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Scale.  This method is invoked by the ScaleCommand.
+   ''' </summary>
    Public Sub InvertCurve(ByVal param As Object)
       InitCommand(True)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.INVERTCURVE)
@@ -1186,6 +1254,9 @@ Public Class FreeContourManagerVM
 
 #Region "TextAngle"
 
+   ''' <summary>
+   ''' Returns a command that do Scale.
+   ''' </summary>
    Public ReadOnly Property TextAngle_Command As ICommand
       Get
          If m_cmdTextAngle Is Nothing Then
@@ -1195,6 +1266,9 @@ Public Class FreeContourManagerVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Scale.  This method is invoked by the ScaleCommand.
+   ''' </summary>
    Public Sub TextAngle(ByVal param As Object)
       InitCommand(False)
       ' imposto selezione solo testi

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml

@@ -1,15 +1,21 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="GeneralParametersStrategyV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 IsClosable="True"
-                                 MinWidth="500"
-                                 MinHeight="250"
-                                 Title="GeneralParameters"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="GeneralParametersStrategyV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="True"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            MinWidth="500"
+                            MinHeight="250"
+                            Height="Auto"
+                            Width="Auto"
+                            TitleBarHeight="30"
+                            Title="GeneralParameters"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
@@ -21,13 +27,14 @@
       <OPTIMIZER:ProjectParametersV Margin="0,10,0,0"/>
 
       <StackPanel Grid.Row="1"
-                  Style="{StaticResource GeneralParametersStrategy_StackPanel}">
+                  Orientation="Horizontal"
+                  HorizontalAlignment="Right"
+                  Margin="10">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding SaveAsToolTip}"
                  Style="{StaticResource SaveStrategy_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
-                   Style="{StaticResource BTLDataWnd_Image}"/>
+            <Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb

@@ -86,26 +86,23 @@ Public Class GeneralParametersStrategyVM
 
       Dim sAISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(Map.refStrategyManagerVM.SelStrategyType.Id, False)
 
-      If Not IsNothing(Map.refStrategyManagerVM.SelStrategySetup) Then
-         Dim sStrategyConfigurationFilePath As String = sAISetupDirPath & "\" & Map.refStrategyManagerVM.SelStrategySetup.sName & ".json"
-         If File.Exists(sStrategyConfigurationFilePath) Then
-            Dim sReadedFile As String = File.ReadAllText(sStrategyConfigurationFilePath)
+      Dim sStrategyConfigurationFilePath As String = sAISetupDirPath & "\" & Map.refStrategyManagerVM.SelStrategySetup.sName & ".json"
+      If File.Exists(sStrategyConfigurationFilePath) Then
+         Dim sReadedFile As String = File.ReadAllText(sStrategyConfigurationFilePath)
 
-            Dim JsonRoot As CustomJsonRoot = Nothing
-            Try
-               JsonRoot = JsonConvert.DeserializeObject(Of CustomJsonRoot)(sReadedFile)
-            Catch ex As Exception
-               JsonRoot = Nothing
-               Return
-            End Try
+         Dim JsonRoot As CustomJsonRoot = Nothing
+         Try
+            JsonRoot = JsonConvert.DeserializeObject(Of CustomJsonRoot)(sReadedFile)
+         Catch ex As Exception
+            JsonRoot = Nothing
+            Return
+         End Try
 
-            For Each ProjectItem In JsonRoot.GENERAL
-               Dim DefaultProject As ProjectParameters = m_GeneralParametersList.FirstOrDefault(Function(x) x.sName = ProjectItem.sName)
-               DefaultProject.ReadConfiguration(ProjectItem)
-            Next
-         End If
+         For Each ProjectItem In JsonRoot.GENERAL
+            Dim DefaultProject As ProjectParameters = m_GeneralParametersList.FirstOrDefault(Function(x) x.sName = ProjectItem.sName)
+            DefaultProject.ReadConfiguration(ProjectItem)
+         Next
       End If
-
    End Sub
 
 #End Region    ' Methods

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml

@@ -1,16 +1,19 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="GeneralParametersWnd"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 IsClosable="True"
-                                 Title="GeneralParametersWnd"
-                                 Name="GeneralParametersWnd"
-                                 Style="{StaticResource OptimizerWindow.Dialog}">
+<EgtWPFLib5:EgtCustomWindow x:Class="GeneralParametersWnd"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="True"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="GeneralParametersWnd"
+                            Name="GeneralParametersWnd"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
 
-   <Grid Style="{StaticResource GeneralParametersWnd_Grid}">
+   <Grid Margin="10">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="1*"/>
@@ -19,26 +22,21 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="Auto"/>
       </Grid.ColumnDefinitions>
-      <ComboBox Grid.ColumnSpan="2"
-                ItemsSource="{Binding StrategySetupList}" 
+      <ComboBox ItemsSource="{Binding StrategySetupList}" 
                 SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
-                Style="{StaticResource BTLDataWnd_ComboBox}"/>
-      <OPTIMIZER:ProjectParametersV Grid.Row="1" 
-                                    Grid.RowSpan="2" 
-                                    IsEnabled="{Binding GeneralParametersIsEnable}"/>
-      <UniformGrid Grid.Row="1" 
-                   Grid.Column="1"
-                   Rows="2" 
-                   Style="{StaticResource BTLDataWnd_UniformGrid}">
+                Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="0,10,0,10"
+                Style="{StaticResource Strategy_ComboBox}" />
+      <OPTIMIZER:ProjectParametersV Grid.Row="1" Grid.RowSpan="2" IsEnabled="{Binding GeneralParametersIsEnable}"/>
+      <UniformGrid Rows="2" Grid.Row="1" Grid.Column="1" Margin="0,0,5,0">
          <CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}"
-                   Style="{StaticResource BTLDataWnd_CheckBox}"/>
-         <Button Command="{Binding Ok_Command}"
+                   VerticalAlignment="Top" HorizontalAlignment="Center" Margin="10,10,0,0"
+                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
+         <Button Command="{Binding Ok_Command}" VerticalAlignment="Bottom" Margin="5,0,0,5"
                  ToolTip="{Binding SaveAsToolTip}"
-                 Style="{StaticResource GeneralParametersWnd_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
-                   Style="{StaticResource BTLDataWnd_Image}"/>
+                 Style="{StaticResource SaveStrategy_Button}">
+            <Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
          </Button>
       </UniformGrid>
    </Grid>
 
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml.vb

@@ -9,6 +9,7 @@
 #Region "CONSTRUCTOR"
 
    Sub New(Owner As Window, GeneralParametersWndVM As GeneralParametersWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = GeneralParametersWndVM

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml

@@ -11,13 +11,19 @@
       </CollectionViewSource>
    </UserControl.Resources>
 
-   <GroupBox Style="{StaticResource ProjectParameters_GroupBox}">
+   <GroupBox Foreground="Black"
+             BorderThickness="2"          
+             Margin="0,-11,0,0"
+             BorderBrush="{StaticResource BeamWall_Glacier}">
       <GroupBox.Header>
          <TextBlock Text="GENERAL PARAMETERS" 
-                    Style="{StaticResource ProjectParameters_TextBlock}"/>
+                    FontWeight="Bold"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
       </GroupBox.Header>
       <ItemsControl ItemsSource="{Binding Source={StaticResource GroupedParameters}}"
-                    Style="{StaticResource ParameterStrategy_ItemsControl}">
+                    Foreground="Black"
+                    Margin="5,10,0,0"
+                    Style="{StaticResource UsersControlStyle}">
          <ItemsControl.GroupStyle>
             <GroupStyle>
                <GroupStyle.Panel>
@@ -30,10 +36,14 @@
                      <Setter Property="Template">
                         <Setter.Value>
                            <ControlTemplate TargetType="{x:Type GroupItem}">
-                              <GroupBox Style="{StaticResource Item_GroupBox}">
+                              <GroupBox Margin="0,5,0,0"
+                                        BorderBrush="{StaticResource BeamWall_Glacier}"
+                                        BorderThickness="1"
+                                        Foreground="Black">
                                  <GroupBox.Header>
                                     <TextBlock Text="{Binding Name}" 
-                                               Style="{StaticResource ProjectParameters_TextBlock}"/>
+                                               FontWeight="Bold"
+                                               Style="{StaticResource DialogWindow_TextBlock}"/>
                                  </GroupBox.Header>
                                  <ItemsPresenter />
                                  <GroupBox.Visibility>
@@ -52,50 +62,60 @@
          <ItemsControl.Resources>
             <DataTemplate DataType="{x:Type OPTIMIZER:BooleanGenericParameter}">
                <UniformGrid Columns="2" 
-                            Visibility="{Binding bBooleanVisibility}"
-                            Style="{StaticResource ProjectParameters_UniformGrid}">
+                            Margin="2,2,2,5"
+                            Visibility="{Binding bBooleanVisibility}">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ProjectParameters_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
                </UniformGrid>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OPTIMIZER:DoubleGenericParameter}">
                <UniformGrid Columns="2" 
-                            Visibility="{Binding bDoubleVisibility}"
-                            Style="{StaticResource ProjectParameters_UniformGrid}">
+                            Margin="2,2,2,5"
+                            Visibility="{Binding bDoubleVisibility}">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ProjectParameters_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Text="{Binding sValue}"
                            Style="{StaticResource ColorPicker_TextBox}"/>
                </UniformGrid>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OPTIMIZER:ComboGenericParameter}">
                <UniformGrid Columns="2" 
-                            Visibility="{Binding bComboBoxVisibility}"
-                            Style="{StaticResource ProjectParameters_UniformGrid}">
+                            Margin="2,2,2,5"
+                            Visibility="{Binding bComboBoxVisibility}">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ProjectParameters_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding ComboList}"
                             SelectedItem="{Binding SelValue}"
                             DisplayMemberPath="sValue"
-                            Style="{StaticResource ProjectParameters_ComboBox}">
+                            Margin="0"
+                            Foreground="Black"
+                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}">
                   </ComboBox>
                </UniformGrid>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OPTIMIZER:StringGenericParameter}">
                <UniformGrid Columns="2" 
-                            Visibility="{Binding bStringVisibility}"
-                            Style="{StaticResource ProjectParameters_UniformGrid}">
+                            Margin="5,2,5,0"
+                            Visibility="{Binding bStringVisibility}">
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ProjectParameters_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Text="{Binding sValue}"
                            Style="{StaticResource ColorPicker_TextBox}"/>
                </UniformGrid>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OPTIMIZER:ListGenericParameter}">
-               <Grid Visibility="{Binding bListBoxVisibility}"
-                     Style="{StaticResource AddRawPartWnd_Grid}">
+               <Grid Margin="5,5,5,0"
+                     Visibility="{Binding bListBoxVisibility}">
                   <Grid.RowDefinitions>
                      <RowDefinition Height="Auto"/>
                      <RowDefinition Height="Auto"/>
@@ -105,31 +125,42 @@
                      <ColumnDefinition Width="1*"/>
                   </Grid.ColumnDefinitions>
                   <TextBlock Text="{Binding sDescriptionShort}" 
-                             Style="{StaticResource ListProjectParameters_TextBlock}"/>
-                  <StackPanel Grid.Column="1" 
-                              Style="{StaticResource PartManager_StackPanel}">
-                     <StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
-                        <Button ToolTip="{Binding OpenToolListToolTip}"
+                             HorizontalAlignment="Left"
+                             VerticalAlignment="Top"
+                             TextWrapping="WrapWithOverflow"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                  <StackPanel Grid.Column="1" Orientation="Horizontal">
+                     <StackPanel  Orientation="Vertical" Margin="0,7,5,0" HorizontalAlignment="Right">
+                        <Button VerticalAlignment="Top"
+                                Width="50"
+                                Margin="0,0,0,5"
+                                ToolTip="{Binding OpenToolListToolTip}"
                                 IsEnabled="{Binding OpenToolListIsEnable}"
                                 Command="{Binding OpenToolListCommand}"
-                                Style="{StaticResource ProjectParameters_Button}">
-                           <Image Source="/Resources/NewPage/+.png"
-                                  Style="{StaticResource BTLDataWnd_Image}"/>
+                                Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                           <Image Source="/Resources/NewPage/+.png" Stretch="Uniform"/>
                         </Button>
-                        <Button ToolTip="{Binding DeselectAllToolTip}"
+                        <Button VerticalAlignment="Top"
+                                Width="50"
+                                Margin="0"
+                                ToolTip="{Binding DeselectAllToolTip}"
                                 IsEnabled="{Binding ActiveToolListIsEnable}"
                                 Command="{Binding DeselectAllCommand}"
-                                Style="{StaticResource CloseProjectParameters_Button}">
-                           <Image Source="/Resources/NewPage/deselectall.png"
-                                  Style="{StaticResource BTLDataWnd_Image}"/>
+                                Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                           <Image Source="/Resources/NewPage/deselectall.png" Stretch="Uniform"/>
                         </Button>
                      </StackPanel>
-                     <Border Style="{StaticResource ForcedStrategyBTL_Border}">
+                     <Border Margin="2,0,2,0" 
+                             Style="{StaticResource OnlyProdPage_Border}">
                         <ItemsControl ItemsSource="{Binding ActiveToolList_View}"
-                                      Style="{StaticResource ProjectParameters_ItemsControl}">
+                                      BorderThickness="0"
+                                      Height="95"
+                                      Width="180"
+                                      Foreground="Black"
+                                      Style="{StaticResource UsersControlStyle}">
                            <ItemsControl.ItemTemplate>
                               <DataTemplate>
-                                 <StackPanel Style="{StaticResource List_StackPanel}">
+                                 <StackPanel Style="{StaticResource StackPanel_List}">
                                     <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
                                                Style="{StaticResource FreeContourInput_CheckBox}"/>
                                     <TextBlock Text="{Binding sName}"
@@ -140,31 +171,37 @@
                         </ItemsControl>
                      </Border>
                   </StackPanel>
-                  <StackPanel Grid.Row="1" 
-                              Grid.Column="1" 
-                              Visibility="{Binding AvailableToolListVisibility}"
-                              Style="{StaticResource PartManager_StackPanel}">
-                     <StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
-                        <Button ToolTip="{Binding CloseToolListToolTip}"
+                  <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Visibility="{Binding AvailableToolListVisibility}">
+                     <StackPanel Orientation="Vertical" Margin="0,7,5,0" HorizontalAlignment="Right">
+                        <Button VerticalAlignment="Top"
+                                Width="50"
+                                Margin="0,0,0,5"
+                                ToolTip="{Binding CloseToolListToolTip}"
                                 Command="{Binding CloseToolListCommand}"
-                                Style="{StaticResource ProjectParameters_Button}">
-                           <Image Source="/Resources/PDFEditor/Delete.png"
-                                  Style="{StaticResource BTLDataWnd_Image}"/>
+                                Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                           <Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
                         </Button>
-                        <Button ToolTip="{Binding SelectAllToolTip}"
+                        <Button VerticalAlignment="Top"
+                                Width="50"
+                                Margin="0,0,0,5"
+                                ToolTip="{Binding SelectAllToolTip}"
                                 IsEnabled="{Binding AvailableToolListIsEnable}"
                                 Command="{Binding SelectAllCommand}"
-                                Style="{StaticResource ProjectParameters_Button}">
-                           <Image Source="/Resources/NewPage/selectall.png"
-                                  Style="{StaticResource BTLDataWnd_Image}"/>
+                                Style="{StaticResource MachineToolBar_ParameterMachineButton}">
+                           <Image Source="/Resources/NewPage/selectall.png" Stretch="Uniform"/>
                         </Button>
                      </StackPanel>
-                     <Border Style="{StaticResource ProjectParamters_Border}">
+                     <Border Margin="2,5,2,0" 
+                             Style="{StaticResource OnlyProdPage_Border}">
                         <ItemsControl ItemsSource="{Binding AvailableToolList_View}"                                   
-                                      Style="{StaticResource AvailableToolList_ItemsControl}">
+                                      BorderThickness="0"
+                                      Height="200"
+                                      Width="180"
+                                      Foreground="Black"
+                                      Style="{StaticResource UsersControlStyle}">
                            <ItemsControl.ItemTemplate>
                               <DataTemplate>
-                                 <StackPanel Style="{StaticResource List_StackPanel}">
+                                 <StackPanel Style="{StaticResource StackPanel_List}">
                                     <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
                                               Style="{StaticResource FreeContourInput_CheckBox}"/>
                                     <TextBlock Text="{Binding sName}"

EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml

@@ -1,27 +1,32 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="InputPwdWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 Title="InputPwdWndV"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="InputPwdWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="InputPwdWndV"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
 
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <TextBlock Text="{Binding PasswordMsg}"
+      <TextBlock Grid.Row="0"
+                 Text="{Binding PasswordMsg}"
                  Style="{StaticResource PasswordMsg_TextBlock}"/>
       <PasswordBox Grid.Row="1"
                    x:Name="PwdBox"
                    PasswordChanged="PasswordBox_PasswordChanged"/>
 
       <Grid Grid.Row="2"
-            Style="{StaticResource AddPartWnd_Grid}">
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -33,11 +38,11 @@
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource GeneralConfiguration_Button}"/>
+                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource GeneralConfiguration_Button}"/>
+                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
       </Grid>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/InputPwdWnd/InputPwdWndV.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_InputPwdWndVM As InputPwdWndVM
 
    Sub New(Owner As Window, InputPwdWndVM As InputPwdWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       PwdBox.Focus()

EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml

@@ -1,13 +1,12 @@
 <StackPanel x:Class="InstrumentPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource BTLPartManager_StackPanel}">
+            Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
 
    <ToggleButton ToolTip="{Binding GetDistToolTip}"
                  IsChecked="{Binding GetDistIsChecked}"
-                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/InstrumentPanel/GetDist.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+                 Style="{StaticResource ToolBarOnlyProdPage_ToggleButton}">
+      <Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
    </ToggleButton>
 
    <Button ToolTip="{Binding ChangeParam_ToolTip}"
@@ -15,8 +14,7 @@
            Visibility="{Binding ChangeParam_Visibility}"
            IsEnabled="{Binding InstrumentPanel_IsEnabled}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/InstrumentPanel/ChangeParam.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/InstrumentPanel/ChangeParam.png" Stretch="Uniform"/>
    </Button>
 
    <Button Content="MAT"
@@ -24,6 +22,7 @@
            Command="{Binding ChangeMaterial_Command}"
            Visibility="{Binding ChangeMaterial_Visibility}"
            IsEnabled="{Binding InstrumentPanel_IsEnabled}"
-           Style="{StaticResource InstrumentPanel_Button}"/>
+           FontSize="12"
+           Style="{StaticResource ToolBarViewPanel_Button}"/>
 
 </StackPanel>

EgtBEAMWALL.Optimizer/InstrumentPanel/MyInstrumentPanelVM.vb

@@ -16,7 +16,7 @@ Public Class MyInstrumentPanelVM
 
    Public ReadOnly Property ChangeMaterial_Visibility As Visibility
       Get
-         Return If(Map.refMainWindowVM.MainWindowM.nUserLevel > 5, Visibility.Visible, Visibility.Collapsed)
+         Return If(Map.refMainWindowVM.MainWindowM.nUserLevel > 5 AndAlso Map.refMainMenuVM.SelPage = Pages.VIEW, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
@@ -93,7 +93,7 @@ Public Class MyInstrumentPanelVM
    End Property
 
    Friend Sub ChangeParameter()
-      If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
+      If Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
       Dim ChangeParameterWndVM As New ChangeParameterWndVM
       Dim ChangeParameterWnd As New ChangeParameterWndV(Application.Current.MainWindow, ChangeParameterWndVM)
       If ChangeParameterWnd.ShowDialog() Then
@@ -140,7 +140,7 @@ Public Class MyInstrumentPanelVM
    End Property
 
    Friend Sub ChangeMaterial()
-      If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
+      If Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
       Dim ChangeMaterialWndVM As New ChangeMaterialWndVM
       Dim ChangeMaterialWnd As New ChangeMaterialWndV(Application.Current.MainWindow, ChangeMaterialWndVM)
       If ChangeMaterialWnd.ShowDialog() Then

EgtBEAMWALL.Optimizer/ItemParamList/BTLDataV.xaml

@@ -5,146 +5,145 @@
              xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer">
    
    <UniformGrid Margin="5"
-                Columns="6" 
-                Rows="7">
+                Columns="6" Rows="7">
 
       <TextBlock Text="{Binding PROJNUM_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}" 
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding PROJNAME_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding PROJPART_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding PROJGUID_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding LISTNAME_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding CUSTOMER_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding ARCHITECT_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EDITOR_MSG}"
               Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding DELIVDATE_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sDELIVDATE, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sDELIVDATE, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EXPDATE_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EXPTIME_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EXPRELEASE_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding LANGUAGE_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding RANGE_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <ComboBox Grid.Column="1"
-                ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
+      <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                       Path=Tag.ocRANGE,
                                       Mode=OneWay}"
                 SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                         Path=Tag.SelRANGE,
-                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                
+                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                Grid.Column="1"
                 Style="{StaticResource PartParam_ComboBox}"/>
       <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <ComboBox Grid.Column="1"
-                ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
+      <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                       Path=Tag.ocPROCESSINGQUALITY,
                                       Mode=OneWay}"
                 SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                         Path=Tag.SelPROCESSINGQUALITY,
-                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                
+                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                Grid.Column="1"
                 Style="{StaticResource PartParam_ComboBox}"/>
       <TextBlock Text="{Binding COMPUTERNAME_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding USER_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding SRCFILE_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1" 
-                             Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EXPFILE_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding RECESS_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <ComboBox Grid.Column="1"
-                ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
+      <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                       Path=Tag.ocRECESS,
                                       Mode=OneWay}"
                 SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}},
                                         Path=Tag.SelRECESS,
-                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                
+                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                Grid.Column="1"
                 Style="{StaticResource PartParam_ComboBox}"/>
       <TextBlock Text="{Binding USERATTRIBUTE_MSG}"
                  Style="{StaticResource PartParam_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                             Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
-                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"                             
+      <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
+                                            RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataV}}}"
+                             Grid.Column="1"
                              Style="{StaticResource PartParam_TextBox}"/>
 
    </UniformGrid>

EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml

@@ -10,6 +10,7 @@
       <OPTIMIZER:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
       <OPTIMIZER:FractionHeightConverter x:Key="FractionHeightConverter"/>
       <OPTIMIZER:ExpanderWidthConverter x:Key="ExpanderWidthConverter"/>
+      <OPTIMIZER:DataGridTotalWidthConverter x:Key="DataGridTotalWidthConverter"/>
       <sys:Double x:Key="FeatureWrapPanelHeight">0.6</sys:Double>
    </UserControl.Resources>
    <EgwWPFBaseLib:EgwDataGrid ItemsSource="{Binding Tag.BTLPartVMList,
@@ -23,6 +24,8 @@
                                 IsEnabled="{Binding PartList_IsEnabled}"
                                 AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
                                 AlternationCount="2"
+                              VerticalGridLinesBrush="Transparent"
+                              HorizontalGridLinesBrush="Transparent"
                                 AreRowDetailsFrozen="True"
                                 EnableRowVirtualization="True" 
                                 EnableColumnVirtualization="True"
@@ -35,7 +38,8 @@
                                 VirtualizingPanel.CacheLengthUnit="Pixel"
                                 RowBackground="{StaticResource BeamWall_BLackSqueeze}"
                                 ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                Style="{StaticResource Optimizer_DataGrid}">
+                              HorizontalScrollBarVisibility="Auto"
+                                Style="{StaticResource DataGrid_OnlyProd}">
       <DataGrid.InputBindings>
          <KeyBinding Key="Delete" Command="{Binding Tag.DeletePart_Command,
                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}" />
@@ -48,39 +52,39 @@
                   <Setter Property="Template">
                      <Setter.Value>
                         <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander Width="{Binding ActualWidth, Converter={StaticResource ExpanderWidthConverter}, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}}}"
-                                     Style="{StaticResource BTLPartList_Expander}">
+                           <Expander IsExpanded="True" HorizontalAlignment="Left">
                               <Expander.Header>
-                                 <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                                 <StackPanel Orientation="Horizontal"
+                                             HorizontalAlignment="Stretch">
                                     <TextBlock Text="{Binding Path=Name}" 
-                                               Style="{StaticResource BTLPartList_TextBlock}"/>
+                                               Margin="0,0,5,0" FontSize="14"/>
                                     <TextBlock Text="{Binding Path=Name, Converter={StaticResource ProjIdToBtlFileName}}"
-                                               Style="{StaticResource BTLPartList_TextBlock}"/>
+                                               Margin="0,0,5,0" FontSize="14"/>
                                     <Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                            Style="{StaticResource BTLPartList_Button}">
-                                       <Image Source="/Resources/NewPage/adjustment.png"
-                                              Style="{StaticResource BTLDataWnd_Image}"/>
+                                            Height="23.5" Width="25" Margin="5,0,0,0" 
+                                            Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                       <Image Source="/Resources/NewPage/adjustment.png" Stretch="Uniform"/>
                                     </Button>
                                     <Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                            Style="{StaticResource BTLPartList_Button}">
-                                       <Image Source="/Resources/LeftPanel/AddPart.png"
-                                              Style="{StaticResource BTLDataWnd_Image}"/>
+                                            Height="23.5" Width="25" Margin="5,0,0,0" 
+                                            Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                       <Image Source="/Resources/LeftPanel/AddPart.png" Stretch="Uniform"/>
                                     </Button>
                                     <Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                            Style="{StaticResource BTLPartList_Button}">
-                                       <Image Source="/Resources/ProjectManager/UpdateBTL.png"
-                                              Style="{StaticResource BTLDataWnd_Image}"/>
+                                            Height="23.5" Width="25" Margin="5,0,0,0" 
+                                            Style="{StaticResource OnlyProdLeftPanel_Button}">
+                                       <Image Source="/Resources/ProjectManager/UpdateBTL.png" Stretch="Uniform"/>
                                     </Button>
                                  </StackPanel>
                               </Expander.Header>
                               <Expander.Content>
-                                 <ItemsPresenter/>
+                                 <ItemsPresenter />
                               </Expander.Content>
                            </Expander>
                         </ControlTemplate>
@@ -104,14 +108,71 @@
          </Style>
       </DataGrid.CellStyle>
       <DataGrid.RowStyle>
-         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+         <!--<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
             <Setter Property="DetailsVisibility" Value="{Binding bOpenFeatureList, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             <EventSetter Event="PreviewMouseDown" Handler="PartList_PreviewMouseDown"/>
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="DataGridRow">
+                     <Grid>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto"/>
+                           <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+
+                         --><!--Celle della riga--><!-- 
+                        <DataGridCellsPresenter Grid.Row="0"/>
+
+                         --><!--Dettagli della riga--><!-- 
+                        <DataGridDetailsPresenter Grid.Row="1"
+                                                  Visibility="{TemplateBinding DetailsVisibility}"/>
+                     </Grid>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
             <Style.Triggers>
                <DataTrigger Binding="{Binding IsRowEnabled}" Value="False">
                   <Setter Property="IsEnabled" Value="False"/>
                </DataTrigger>
             </Style.Triggers>
+         </Style>-->
+         <Style TargetType="{x:Type DataGridRow}">
+            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
+            <Setter Property="SnapsToDevicePixels" Value="true"/>
+            <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
+            <Setter Property="ValidationErrorTemplate">
+               <Setter.Value>
+                  <ControlTemplate>
+                     <TextBlock Foreground="Red" Margin="2,0,0,0" Text="!" VerticalAlignment="Center"/>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="{x:Type DataGridRow}">
+                     <Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                        <SelectiveScrollingGrid>
+                           <SelectiveScrollingGrid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="*"/>
+                           </SelectiveScrollingGrid.ColumnDefinitions>
+                           <SelectiveScrollingGrid.RowDefinitions>
+                              <RowDefinition Height="*"/>
+                              <RowDefinition Height="Auto"/>
+                           </SelectiveScrollingGrid.RowDefinitions>
+                           <DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                           <DataGridDetailsPresenter Grid.Column="1" Grid.Row="1" Visibility="{TemplateBinding DetailsVisibility}"/>
+                           <DataGridRowHeader Grid.RowSpan="2" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                        </SelectiveScrollingGrid>
+                     </Border>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsNewItem" Value="True">
+                  <Setter Property="Margin" Value="{Binding NewItemMargin, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </Trigger>
+            </Style.Triggers>
          </Style>
       </DataGrid.RowStyle>
       <DataGrid.Resources>
@@ -136,7 +197,7 @@
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
                                 Visibility="{Binding CALC_FALL_Visibility}"
-                                Style="{StaticResource RawPartList_TextBlock}"/>
+                                Style="{StaticResource OnlyProdRawPartList_TextBlock}"/>
                      <Border Grid.Column="1"
                              Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
                              Background="{Binding Calc_BorderBrush}">
@@ -236,7 +297,7 @@
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+                  <Setter Property="Foreground" Value="Blue" />
                </Style>
             </DataGridTextColumn.EditingElementStyle>
          </DataGridTextColumn>
@@ -278,8 +339,7 @@
          <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/RotateIntestazione.png"
-                         Style="{StaticResource BTLPartList_Image}"/>
+                  <Image Source="/Resources/NewPage/RotateIntestazione.png" Stretch="Uniform" Height="20"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
@@ -290,14 +350,14 @@
                         <ColumnDefinition Width="1*"/>
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="{Binding sROTATED}"
-                                Style="{StaticResource Rotate_TextBlock}"/>
+                                TextAlignment="Center"
+                                Margin="2,0,2,0"/>
                      <Button Grid.Column="1"
                              Command="{Binding ForwardRotation_Command}"
                              ToolTip="{Binding ForwardRotation_ToolTip}"
                              IsEnabled="{Binding RotatePart_IsEnabled}"
                              Style="{StaticResource BTLPanel_Button}">
-                        <Image Source="/Resources/NewPage/Rotate.png"
-                               Style="{StaticResource BTLDataWnd_Image}"/>
+                        <Image Source="/Resources/NewPage/Rotate.png" Stretch="Uniform"/>
                      </Button>
                   </Grid>
                </DataTemplate>
@@ -307,14 +367,14 @@
          <DataGridTemplateColumn x:Key="colFLIP">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/InversionIntestazione.png"
-                         Style="{StaticResource BTLPartList_Image}"/>
+                  <Image Source="/Resources/NewPage/InversionIntestazione.png" Stretch="Uniform" Height="20"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding IsInverted, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
@@ -322,8 +382,7 @@
          <DataGridTemplateColumn x:Key="colVERIFY">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/VerifyIntestazione.png"
-                         Style="{StaticResource BTLPartList_Image}"/>
+                  <Image Source="/Resources/NewPage/VerifyIntestazione.png" Stretch="Uniform" Height="20"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
@@ -332,8 +391,7 @@
                           Command="{Binding Verify_Command}"
                           IsEnabled="{Binding Verify_IsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/CALCPanel/Verify.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                     <Image Source="/Resources/CALCPanel/Verify.png" Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
@@ -342,8 +400,7 @@
          <DataGridTemplateColumn x:Key="colADD">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/AddToRawPartIntestazione.png"
-                         Style="{StaticResource BTLPartList_Image}"/>
+                  <Image Source="/Resources/NewPage/AddToRawPartIntestazione.png" Stretch="Uniform" Height="20"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
@@ -353,8 +410,7 @@
                           ToolTip="{Binding AddToRawPart_ToolTip}"
                           IsEnabled="{Binding BTLPartManager_IsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/LeftPanel/AddToRawPart.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                     <Image Source="/Resources/LeftPanel/AddToRawPart.png" Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
@@ -363,8 +419,7 @@
          <DataGridTemplateColumn x:Key="colSETTING">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/SettingIntestazione.png"
-                         Style="{StaticResource BTLPartList_Image}"/>
+                  <Image Source="/Resources/NewPage/SettingIntestazione.png" Stretch="Uniform" Height="20"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
@@ -374,10 +429,12 @@
                              ToolTip="{Binding Settings_Command_ToolTip}"
                              Style="{StaticResource BTLPanel_Button}"                             
                              Click="OpenPopUp_Click">
-                        <Image Source="/Resources/NewPage/Setting.png"
-                               Style="{StaticResource BTLDataWnd_Image}"/>
+                        <Image Source="/Resources/NewPage/Setting.png" Stretch="Uniform"/>
                      </Button>
-                     <Popup Style="{StaticResource BTLPartList_PopUp}">
+                     <Popup AllowsTransparency="True" 
+                            PopupAnimation="None"
+                            Placement="Right"
+                            StaysOpen="False">
                         <Popup.VerticalOffset>
                            <MultiBinding Converter="{StaticResource DataGridCellBorderThicknessConverter}">
                               <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
@@ -394,6 +451,12 @@
       <DataGrid.RowDetailsTemplate>
          <DataTemplate>
             <Grid>
+               <Grid.MaxWidth>
+                  <MultiBinding Converter="{StaticResource DataGridTotalWidthConverter}">
+                     <Binding RelativeSource="{RelativeSource AncestorType=DataGrid}" Path="ActualWidth" />
+                     <Binding RelativeSource="{RelativeSource AncestorType=DataGrid}"/>
+                  </MultiBinding>
+               </Grid.MaxWidth>
                <Grid.RowDefinitions>
                   <RowDefinition Height="1*"/>
                   <RowDefinition Height="Auto"/>
@@ -407,19 +470,22 @@
                         ItemsSource="{Binding BTLFeatureVMList}"
                         SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
                         PreviewMouseWheel="ListBox_PreviewMouseWheel"
-                        Style="{StaticResource BTLPartList_ListBox}">
+                        Grid.IsSharedSizeScope="True"
+                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                        ScrollViewer.VerticalScrollBarVisibility="Auto"
+                        Style="{StaticResource BTL_ListBox}">
                   <ListBox.ItemsPanel>
                      <ItemsPanelTemplate>
-                        <WrapPanel Orientation="Vertical" 
-                                   MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}},
-                                                                                                    Converter={StaticResource FractionHeightConverter},
-                                                                                                    ConverterParameter={StaticResource FeatureWrapPanelHeight}}"
-                                   MinHeight="{Binding Parent.Children[0].ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"/>
+                        <WrapPanel Orientation="Vertical"
+                                    MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}},
+                                                                                                      Converter={StaticResource FractionHeightConverter},
+                                                                                                      ConverterParameter={StaticResource FeatureWrapPanelHeight}}"
+                                    MinHeight="{Binding Parent.Children[0].ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"/>
                      </ItemsPanelTemplate>
                   </ListBox.ItemsPanel>
                   <ListBox.ItemTemplate>
                      <DataTemplate>
-                        <Grid Style="{StaticResource BTLPartList_Grid}">
+                        <Grid Margin="0,0,10,0">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="50"/>
                               <ColumnDefinition Width="40"/>
@@ -433,72 +499,76 @@
                               <ColumnDefinition Width="Auto"/>
                            </Grid.ColumnDefinitions>
                            <TextBlock Text="{Binding nPRID}"
-                                      Style="{StaticResource Prod_TextBlock}"/>
+                                       Style="{StaticResource OnlyProd_TextBlock}"/>
                            <Grid Grid.Column="1">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="1*"/>
                                  <ColumnDefinition Width="10"/>
                               </Grid.ColumnDefinitions>
                               <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
-                                      Background="{Binding Calc_Background}"/>
+                                       Background="{Binding Calc_Background}"/>
                               <Grid Grid.Column="1">
                                  <Grid.RowDefinitions>
                                     <RowDefinition Height="1*"/>
                                     <RowDefinition Height="Auto"/>
                                  </Grid.RowDefinitions>
                                  <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
-                                          Style="{StaticResource FeatureInPartInRawPartList_Ellipse}"/>
+                                          Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
                                  <TextBlock Grid.Row="1"
-                                            Text="{Binding CALC_ERR_Letter}"
-                                            Foreground="{Binding CALC_ERR_Foreground}"
-                                            Style="{StaticResource FeatureInPartInRawPartList_TextBlock}"/>
+                                             Text="{Binding CALC_ERR_Letter}"
+                                             Foreground="{Binding CALC_ERR_Foreground}"
+                                             Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
                               </Grid>
                            </Grid>
                            <CheckBox Grid.Column="2"
-                                     IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                                     Style="{StaticResource BTLPartList_CheckBox}"/>
+                                       IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                                       VerticalAlignment="Center"
+                                       HorizontalAlignment="Center"
+                                       Margin="0,0,5,0"/>
                            <TextBlock Grid.Column="3"
-                                      Text="[" 
-                                      Style="{StaticResource Prod_TextBlock}"/>
+                                       Text="[" 
+                                       Style="{StaticResource OnlyProd_TextBlock}"/>
                            <TextBlock Grid.Column="4"
-                                      Text="{Binding nSelGRP}" 
-                                      Style="{StaticResource Prod_TextBlock}"/>
+                                       Text="{Binding nSelGRP}" 
+                                       Style="{StaticResource OnlyProd_TextBlock}"/>
                            <TextBlock Grid.Column="5"
-                                      Text="-" 
-                                      Style="{StaticResource Prod_TextBlock}"/>
+                                       Text="-" 
+                                       Style="{StaticResource OnlyProd_TextBlock}"/>
                            <TextBlock Grid.Column="6"
-                                      Text="{Binding nPRC, StringFormat={}{0:000}}" 
-                                      Style="{StaticResource Prod_TextBlock}"/>
+                                       Text="{Binding nPRC, StringFormat={}{0:000}}" 
+                                       Style="{StaticResource OnlyProd_TextBlock}"/>
                            <TextBlock Grid.Column="7"
-                                      Text="] " 
-                                      Style="{StaticResource Prod_TextBlock}"/>
+                                       Text="] " 
+                                       Style="{StaticResource OnlyProd_TextBlock}"/>
                            <TextBlock Grid.Column="8"
-                                      Text="{Binding sName}"
-                                      Style="{StaticResource Name_TextBlock}"/>
+                                       Text="{Binding sName}" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       Style="{StaticResource OnlyProd_TextBlock}"/>
                            <Button Grid.Column="9" 
-                                   Command="{Binding EditFeature_Command}"
-                                   Click="SelectButton_Click"
-                                   Style="{StaticResource EditFeature_Button}">
-                              <Image Source="/Resources/CALCPanel/Edit.png"
-                                     Style="{StaticResource BTLDataWnd_Image}"/>
+                                    Command="{Binding EditFeature_Command}"
+                                    Click="SelectButton_Click"
+                                    Style="{StaticResource EditFeature_Button}">
+                              <Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
                            </Button>
                         </Grid>
                      </DataTemplate>
                   </ListBox.ItemTemplate>
                </ListBox>
                <StackPanel Grid.Row="1" 
-                           Grid.ColumnSpan="2"
-                           Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                           Style="{StaticResource BTLPartList_StackPanel}">
+                           Grid.Column="1"  
+                           Orientation="Horizontal" 
+                           Margin="0,2,0,0">
                   <TextBlock Text="STATUS:" 
-                             Style="{StaticResource Status_TextBlock}"/>
-                  
+                              Foreground="{StaticResource BeamWall_Corduroy}" 
+                              HorizontalAlignment="Left" 
+                              Margin="0,0,10,0"/>
                   <TextBlock Text="{Binding Tag.SelBTLPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                             Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                             Style="{StaticResource SelBTLPart_TextBlock}"/>
+                              HorizontalAlignment="Left" 
+                              Foreground="{StaticResource BeamWall_Corduroy}"    
+                              Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"/>
 
                   <TextBlock Text="{Binding Tag.SelBTLPart.SelBTLFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                             Style="{StaticResource SelBTLPart_TextBlock}"/>
+                              HorizontalAlignment="Left"
+                              Foreground="{StaticResource BeamWall_Corduroy}" />
                </StackPanel>
             </Grid>
          </DataTemplate>

EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb

@@ -292,7 +292,7 @@ Class ExpanderWidthConverter
    Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
       If TypeOf value IsNot Double Then Return ""
       Dim dListBoxHeight As Double = CDbl(value)
-      Return Math.Floor(dListBoxHeight - 10)
+      Return Math.Floor(dListBoxHeight - 20)
    End Function
 
    Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
@@ -300,3 +300,24 @@ Class ExpanderWidthConverter
    End Function
 
 End Class
+
+Public Class DataGridTotalWidthConverter
+   Implements IMultiValueConverter
+
+   Public Function Convert(values() As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IMultiValueConverter.Convert
+      If TypeOf values(0) Is Double AndAlso TypeOf values(1) Is DataGrid Then
+         Dim dataGrid As DataGrid = DirectCast(values(1), DataGrid)
+         Dim total As Double = 0
+         For Each col In dataGrid.Columns
+            total += col.ActualWidth
+         Next
+         Return total
+      End If
+      Return 0
+   End Function
+
+   Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
+      Throw New NotImplementedException()
+   End Function
+
+End Class

EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml

@@ -16,7 +16,7 @@
                               AlternationCount="2"
                               ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                              Style="{StaticResource Optimizer_DataGrid}">
+                              Style="{StaticResource DataGrid_OnlyProd}">
 
       <DataGrid.InputBindings>
          <KeyBinding Key="Delete" Command="{Binding Tag.SelFeatureVM.DeleteFeature_Command,
@@ -27,13 +27,13 @@
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureInPartInRawPartListV}}}"
-                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                            Style="{StaticResource OnlyProdFeatureInPartInRawPartList_CheckBox}"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
@@ -49,17 +49,17 @@
                      <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
                              Background="{Binding Calc_Background}"/>
                      <Grid Grid.Column="1"
-                           Style="{StaticResource FeatureInPartInRawPartList_Grid}">
+                           HorizontalAlignment="Center">
                         <Grid.RowDefinitions>
                            <RowDefinition Height="1*"/>
                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
-                                 Style="{StaticResource FeatureInPartInRawPartList_Ellipse}"/>
+                                 Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
                                    Foreground="{Binding CALC_ERR_Foreground}"
-                                   Style="{StaticResource FeatureInPartInRawPartList_TextBlock}"/>
+                                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
@@ -92,14 +92,15 @@
                <DataTemplate>
                   <Button ToolTip="{Binding Strategy_ToolTip}"
                           Command="{Binding Strategy_Command}"
-                          Style="{StaticResource FeatureInPartInRawPartList_Button}">
-                     <Image Source="/Resources/CALCPanel/Verify.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                          Height="15" Width="15" Margin="0"
+                          Style="{StaticResource ToolBarViewPanel_Button}">
+                     <Image Source="/Resources/CALCPanel/Verify.png" Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
       </DataGrid.Resources>
+
    </EgwWPFBaseLib:EgwDataGrid>
 
 </UserControl>

EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml

@@ -24,7 +24,7 @@
                                  AlternationCount="2"
                                  ColumnHeaderStyle="{StaticResource PParam_DataGridColumnHeader}"
                                  CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                 Style="{StaticResource Optimizer_DataGrid}">
+                                 Style="{StaticResource DataGrid_OnlyProd}">
          <DataGrid.RowStyle>
             <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
                <EventSetter Event="PreviewMouseDown" Handler="PParameterList_PreviewMouseDown"/>
@@ -44,7 +44,7 @@
                   <DataTemplate>
                      <CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
                                Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                               Style="{StaticResource PParameters_CheckBox}"/>
+                               VerticalAlignment="Center"/>
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
             </DataGridTemplateColumn>
@@ -69,12 +69,12 @@
                         <Setter.Value>
                            <ControlTemplate TargetType="{x:Type DataGridCell}">
                               <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
-                                         Style="{StaticResource Prod_TextBlock}">
+                                         Style="{StaticResource OnlyProd_TextBlock}">
                                  <TextBlock.ToolTip>
-                                    <ToolTip Style="{StaticResource PParameters_ToolTip}">
+                                    <ToolTip Style="{StaticResource OnlyProd_ToolTip}">
                                        <ToolTip.Content>
                                           <TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
-                                                     Style="{StaticResource Prod_TextBlock}"/>
+                                                     Style="{StaticResource OnlyProd_TextBlock}"/>
                                        </ToolTip.Content>
                                     </ToolTip>
                                  </TextBlock.ToolTip>
@@ -126,24 +126,23 @@
          </DataGrid.Resources>
       </EgwWPFBaseLib:EgwDataGrid>
 
-      <Image Grid.Column="1"
+      <Image Grid.Column="1" Width="250"
              Source="{Binding sCurrDraw}" 
-             Style="{StaticResource CurrDraw_Image}"/>
+             Margin="2.5"/>
 
       <StackPanel Grid.Row="1"
                   Grid.ColumnSpan="2"
-                  Style="{StaticResource PParameters_StackPanel}">
+                  HorizontalAlignment="Right"
+                  Style="{StaticResource OnlyProdPartManager_StackPanel}">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
-                   Style="{StaticResource BTLDataWnd_Image}"/>
+            <Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding Cancel_Command}"
                  ToolTip="{Binding Cancel_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/PDFEditor/Delete.png"
-                   Style="{StaticResource BTLDataWnd_Image}"/>
+            <Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>
    </Grid>

EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb

@@ -110,9 +110,18 @@ Public Class PParameterListVM
       ' Aggiungo riferimento a Map
       Map.SetRefPParameterListVM(Me)
 
+      'Dim NewColumnList As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colNAME", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
+      '                                                                              New EgwWPFBaseLib.ColumnLayout("colDESC", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
+      '                                                                              New EgwWPFBaseLib.ColumnLayout("colVALUE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True),
+      '                                                                              New EgwWPFBaseLib.ColumnLayout("colMIN", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True),
+      '                                                                              New EgwWPFBaseLib.ColumnLayout("colMAX", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True)})
+      'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARAMETERLIST_P, NewColumnList)
+
       ' carico le colonne della datagrid
       EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARAMETERLIST_P, PParameterListColumns)
 
+      '' carico le colonne della datagrid
+      'GetPrivateProfileColumns(S_PARAMETERLIST_P, PParameterListColumns)
       ' recupero riferimento a colonna Value
       m_colPParam_Value = PParameterListColumns.FirstOrDefault(Function(x) x.Key = COL_VALUE)
    End Sub
@@ -151,8 +160,8 @@ Public Class PParameterListVM
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER)
       Map.refProjectVM.SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.FEATURERAWPARTMANAGER)
       ' Abilito LeftPanel
-      Map.refProjectVM.SetLeftPanel_IsEnabled(True)
-      Map.refProjectVM.SetLeftPanel_Opacity(1)
+      Map.refProjectVM.SetOnlyProdLeftPanel_IsEnabled(True)
+      Map.refProjectVM.SetOnlyProdLeftPanel_Opacity(1)
    End Sub
 
 #End Region ' Ok_Command
@@ -174,8 +183,8 @@ Public Class PParameterListVM
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER)
       Map.refProjectVM.SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.FEATURERAWPARTMANAGER)
       ' Abilito LeftPanel
-      Map.refProjectVM.SetLeftPanel_IsEnabled(True)
-      Map.refProjectVM.SetLeftPanel_Opacity(1)
+      Map.refProjectVM.SetOnlyProdLeftPanel_IsEnabled(True)
+      Map.refProjectVM.SetOnlyProdLeftPanel_Opacity(1)
    End Sub
 
 #End Region ' Cancel_Command

EgtBEAMWALL.Optimizer/ItemParamList/PartParametersV.xaml

@@ -17,79 +17,77 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
-      <UniformGrid Columns="2" 
-                   Style="{StaticResource PartParameters_UniformGrid}">
+      <UniformGrid Columns="2" Margin="0,0,0,-45">
          <TextBlock Text="{Binding NAM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding COUNT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ORDERNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PLANINGLEN_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding STARTOFFSET_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ENDOFFSET_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding DESIGN_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding GROUP_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding STOREY_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ANNOT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding MATERIAL_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
                                                RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
       </UniformGrid>
 
-      <GroupBox Grid.Row="1"
-                Style="{DynamicResource PartParam_GroupBox}">
-         <Grid Style="{StaticResource PartParameters_Grid}">
+      <GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="1" Margin="0,55">
+         <Grid Margin="0,5,0,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -99,111 +97,110 @@
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <TextBlock Text="{Binding COLOUR_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
-            <Button Grid.Column="1" 
-                    Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
+                       Grid.Row="0"
+              Style="{StaticResource PartParam_TextBlock}"/>
+            <Button Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
                     Command="{Binding Tag.PartColour_Command, UpdateSourceTrigger=PropertyChanged,
-                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                    
-                    Style="{StaticResource PartParameters_Button}"/>
-            <TextBlock Grid.Row="1"
-                       Text="{Binding TRANSPARENCY_MSG}"                       
+                                      RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    Width="100"
+                    Style="{StaticResource ToolBar_SmallButton}"/>
+            <TextBlock Text="{Binding TRANSPARENCY_MSG}"
+                       Grid.Row="1"
                        Style="{StaticResource PartParam_TextBlock}"/>
-            <EgtWPFLib5:EgtTextBox Grid.Row="1"
+            <EgtWPFLib5:EgtTextBox Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
+                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                   Grid.Row="1"
                                    Grid.Column="1"
-                                   Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                       
                                    Style="{StaticResource PartParam_TextBox}"/>
          </Grid>
       </GroupBox>
 
-      <UniformGrid Grid.Column="1" 
-                   Columns="2"
-                   Style="{StaticResource PartParameters_UniformGrid}">
+      <UniformGrid Grid.Column="1" Columns="2" Margin="0,0,0,-45">
          <TextBlock Text="{Binding TIMBERGRADE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding QUALITYGRADE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PACKAGE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ASSEMBLYNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ELEMENTNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding MODULENUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <ComboBox Grid.Column="1"
-                   ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+         <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                  Path=Tag.ocPROCESSINGQUALITY,
                                  Mode=OneWay}"
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                            Path=Tag.SelPROCESSINGQUALITY,
-                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                   
+                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                   Grid.Column="1"
                    Style="{StaticResource PartParam_ComboBox}"/>
          <TextBlock Text="{Binding RECESS_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <ComboBox Grid.Column="1"
-                   ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+         <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                          Path=Tag.ocRECESS,
                                          Mode=OneWay}"
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                            Path=Tag.SelRECESS,
-                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                   
+                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                   Grid.Column="1"
                    Style="{StaticResource PartParam_ComboBox}"/>
          <TextBlock Text="{Binding STOREYTYPE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <ComboBox Grid.Column="1"
-                   ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+         <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                          Path=Tag.ocSTOREYTYPE,
                                          Mode=OneWay}"
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                            Path=Tag.SelSTOREYTYPE,
-                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                   
+                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                   Grid.Column="1"
                    Style="{StaticResource PartParam_ComboBox}"/>
          <TextBlock Text="{Binding LAYER_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding COMMENT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
+                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
       </UniformGrid>
 
-      <GroupBox Grid.Row="1" 
-                Grid.Column="1"
-                Style="{DynamicResource PartParam_GroupBox}">
-         <Grid Style="{StaticResource PartParameters_Grid}">
+      <GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="1" Grid.Column="1" Margin="0,55">
+         <Grid Margin="0,5,0,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -214,28 +211,29 @@
             </Grid.RowDefinitions>
             <TextBlock Text="{Binding REFSIDE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
-            <ComboBox Grid.Column="1"
-                      ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+            <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                             Path=Tag.ocREFSIDE,
                                             Mode=OneWay}"
                       SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                               Path=Tag.SelREFSIDE,
-                                              Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                      
-                      Style="{StaticResource PartParam_ComboBox}"/>
-            <TextBlock Grid.Row="1"
-                       Text="{Binding REFSIDEALIGN_MSG}"                       
-                       Style="{StaticResource PartParam_TextBlock}"/>
-            <CheckBox Grid.Row="1"
+                                              Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                       Grid.Column="1"
-                      IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+                      Style="{StaticResource PartParam_ComboBox}"/>
+            <TextBlock Text="{Binding REFSIDEALIGN_MSG}"
+                       Grid.Row="1"
+                       Style="{StaticResource PartParam_TextBlock}"/>
+            <CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                           Path=Tag.bREFSIDEALIGN,
                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      Grid.Row="1"
+                      Grid.Column="1"/>
          </Grid>
       </GroupBox>
 
-      <Grid Grid.Column="2" 
-            Grid.RowSpan="2">
+
+      <Grid Grid.Row="0" Grid.Column="2" Grid.RowSpan="2">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
@@ -256,9 +254,7 @@
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         <GroupBox Grid.RowSpan="2"
-                   Grid.ColumnSpan="2"
-                   Style="{DynamicResource NoHeader_GroupBox}">
+         <GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="0" Grid.RowSpan="2" Grid.ColumnSpan="2">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
@@ -270,26 +266,25 @@
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding GRAINDIRECTION_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
+               <EgtWPFLib5:EgtTextBox Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
+                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                      Grid.Column="1"
                                       Style="{StaticResource PartParam_TextBox}"/>
-               <TextBlock Grid.Row="1"
-                          Text="{Binding GRAINDIRALIGN_MSG}"                          
+               <TextBlock Text="{Binding GRAINDIRALIGN_MSG}"
+                          Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <CheckBox Grid.Row="1"
-                         Grid.Column="1"
-                         IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+               <CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                              Path=Tag.bGRAINDIRALIGN,
                                              Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParameters_CheckBox}"/>
+                         HorizontalAlignment="Center"
+                         VerticalAlignment="Center"
+                         Grid.Row="1"
+                         Grid.Column="1"
+                         Margin="0,5"/>
             </Grid>
          </GroupBox>
-         <GroupBox Grid.Row="2" 
-                   Grid.RowSpan="2" 
-                   Grid.ColumnSpan="2"
-                   Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+         <GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="2" Grid.RowSpan="2" Grid.ColumnSpan="2">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -300,29 +295,26 @@
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding CAMBERSIDE_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+               <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                Path=Tag.ocCAMBERSIDE,
                                                Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelCAMBERSIDE,
-                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                         Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
-               <TextBlock Grid.Row="1"
-                          Text="{Binding CAMBERPARAMS_MSG}"                          
+               <TextBlock Text="{Binding CAMBERPARAMS_MSG}"
+                          Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Row="1"
+               <EgtWPFLib5:EgtTextBox Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
+                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                      Grid.Row="1"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
                                       Style="{StaticResource PartParam_TextBox}"/>
             </Grid>
          </GroupBox>
-         <GroupBox Grid.Row="4" 
-                   Grid.RowSpan="2" 
-                   Grid.ColumnSpan="2"
-                   Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+         <GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="4" Grid.RowSpan="2" Grid.ColumnSpan="2">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -333,29 +325,26 @@
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding REFSIDEFIXCLAMP_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+               <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                Path=Tag.ocREFSIDEFIXCLAMP,
                                                Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelREFSIDEFIXCLAMP,
-                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                         Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
-               <TextBlock Grid.Row="1"
-                          Text="{Binding PARTOFFSETPARAMS_MSG}"                          
+               <TextBlock Text="{Binding PARTOFFSETPARAMS_MSG}"
+                          Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Row="1"
+               <EgtWPFLib5:EgtTextBox Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
+                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                      Grid.Row="1"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
                                       Style="{StaticResource PartParam_TextBox}"/>
             </Grid>
          </GroupBox>
-         <GroupBox Grid.Row="6" 
-                   Grid.RowSpan="2" 
-                   Grid.ColumnSpan="2"
-                   Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+         <GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="6" Grid.RowSpan="2" Grid.ColumnSpan="2">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -366,29 +355,26 @@
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding MATERIALTYPEGRP_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+               <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                Path=Tag.ocMATERIALTYPEGRP,
                                                Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelMATERIALTYPEGRP,
-                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                         Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
-               <TextBlock Grid.Row="1"
-                          Text="{Binding MATERIALTYPESPEC_MSG}"                          
+               <TextBlock Text="{Binding MATERIALTYPESPEC_MSG}"
+                          Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Row="1"
+               <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
+                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                      Grid.Row="1"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
                                       Style="{StaticResource PartParam_TextBox}"/>
             </Grid>
          </GroupBox>
-         <GroupBox Grid.Row="8" 
-                   Grid.RowSpan="2" 
-                   Grid.ColumnSpan="2"
-                   Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+         <GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="8" Grid.RowSpan="2" Grid.ColumnSpan="2">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -399,33 +385,31 @@
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding ALIGNLOCATION_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+               <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                Path=Tag.ocALIGNLOCATION,
                                                Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelALIGNLOCATION,
-                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
-                         Style="{StaticResource PartParam_ComboBox}"/>
-               <TextBlock Grid.Row="1"
-                          Text="{Binding ALIGNENDTYPE_MSG}"                          
-                          Style="{StaticResource PartParam_TextBlock}"/>
-               <ComboBox Grid.Row="1"
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          Grid.Column="1"
-                         ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+                         Style="{StaticResource PartParam_ComboBox}"/>
+               <TextBlock Text="{Binding ALIGNENDTYPE_MSG}"
+                          Grid.Row="1"
+                          Style="{StaticResource PartParam_TextBlock}"/>
+               <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                Path=Tag.ocALIGNENDTYPE,
                                                Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelALIGNENDTYPE,
                                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource PartParameters_ComboBox}"/>
+                         Grid.Row="1"
+                         Grid.Column="1"
+                         Margin="0,5"
+                         Style="{StaticResource PartParam_ComboBox}"/>
             </Grid>
          </GroupBox>
-         <GroupBox Grid.Row="10" 
-                   Grid.RowSpan="4" 
-                   Grid.ColumnSpan="2"
-                   Style="{DynamicResource NoHeader_GroupBox}">
-            <Grid Style="{StaticResource PartParameters_Grid}">
+         <GroupBox Style="{DynamicResource GroupBoxStyle_NoHeader}" Grid.Row="10" Grid.RowSpan="4" Grid.ColumnSpan="2">
+            <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
@@ -438,40 +422,42 @@
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding UID_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
+               <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                 Path=Tag.ocUID,
                                                 Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}},
                                                  Path=Tag.SelUID,
-                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                         
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                         Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
-               <TextBlock Grid.Row="1"
-                          Text="{Binding TRANSFORIG_MSG}"                          
+               <TextBlock Text="{Binding TRANSFORIG_MSG}"
+                          Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Row="1"
+               <EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
+                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                      Grid.Row="1"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
                                       Style="{StaticResource PartParam_TextBox}"/>
-               <TextBlock Grid.Row="2"
-                          Text="{Binding TRANSFVERSX_MSG}"                          
+               <TextBlock Text="{Binding TRANSFVERSX_MSG}"
+                          Grid.Row="2"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Row="2"
+               <EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
+                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                      Grid.Row="2"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
                                       Style="{StaticResource PartParam_TextBox}"/>
-               <TextBlock Grid.Row="3"
-                          Text="{Binding TRANSFVERSY_MSG}"                          
+               <TextBlock Text="{Binding TRANSFVERSY_MSG}"
+                          Grid.Row="3"
                           Style="{StaticResource PartParam_TextBlock}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Row="3"
+               <EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
+                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"
+                                      Grid.Row="3"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersV}}}"                                      
                                       Style="{StaticResource PartParam_TextBox}"/>
             </Grid>
          </GroupBox>
+
       </Grid>
+
    </Grid>
 </UniformGrid>

EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml

@@ -18,7 +18,7 @@
                               ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
                               RowBackground="{StaticResource BeamWall_BLackSqueeze}"
-                              Style="{StaticResource Optimizer_DataGrid}">
+                              Style="{StaticResource DataGrid_OnlyProd}">
       <DataGrid.RowStyle>
          <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
             <Setter Property="Background" Value="{Binding Background}"/>
@@ -33,7 +33,8 @@
 
       <DataGrid.Resources>
          <!--ID - Id gruppo-->
-         <DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}" SortMemberPath="nName">
+         <DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}"
+                             SortMemberPath="nName">
             <DataGridTextColumn.HeaderTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding Path=DataContext.ID_Msg, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>                  
@@ -50,7 +51,7 @@
          <DataGridTemplateColumn x:Key="colCALC">
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
-                  <Grid Style="{StaticResource RawPartList_Grid}">
+                  <Grid Margin="5,0,-4,0">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="1*"/>
@@ -58,22 +59,22 @@
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
                                 Visibility="{Binding CALC_FALL_Visibility}"
-                                Style="{StaticResource RawPartList_TextBlock}"/>
+                                Style="{StaticResource OnlyProdRawPartList_TextBlock}"/>
                      <Border Grid.Column="1"
                              Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
                              Background="{Binding Calc_Background}"/>
                      <Grid Grid.Column="2"
-                           Style="{StaticResource FeatureInPartInRawPartList_Grid}">
+                           HorizontalAlignment="Center">
                         <Grid.RowDefinitions>
                            <RowDefinition Height="1*"/>
                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
-                                 Style="{StaticResource FeatureInPartInRawPartList_Ellipse}"/>
+                                 Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
                                    Foreground="{Binding CALC_ERR_Foreground}"
-                                   Style="{StaticResource FeatureInPartInRawPartList_TextBlock}"/>
+                                   Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
                      </Grid>
                   </Grid>
                </DataTemplate>
@@ -89,7 +90,7 @@
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+                  <Setter Property="Foreground" Value="Blue" />
                </Style>
             </DataGridTextColumn.EditingElementStyle>
          </DataGridTextColumn>
@@ -103,7 +104,7 @@
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+                  <Setter Property="Foreground" Value="Blue" />
                </Style>
             </DataGridTextColumn.EditingElementStyle>
          </DataGridTextColumn>
@@ -117,7 +118,7 @@
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+                  <Setter Property="Foreground" Value="Blue" />
                </Style>
             </DataGridTextColumn.EditingElementStyle>
          </DataGridTextColumn>
@@ -131,7 +132,7 @@
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+                  <Setter Property="Foreground" Value="Blue" />
                </Style>
             </DataGridTextColumn.EditingElementStyle>
          </DataGridTextColumn>
@@ -145,7 +146,7 @@
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+                  <Setter Property="Foreground" Value="Blue" />
                </Style>
             </DataGridTextColumn.EditingElementStyle>
          </DataGridTextColumn>
@@ -180,8 +181,7 @@
          <DataGridTemplateColumn x:Key="colVERIFY">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/VerifyIntestazione.png"
-                         Style="{StaticResource BTLPartList_Image}"/>
+                  <Image Source="/Resources/NewPage/VerifyIntestazione.png" Stretch="Uniform" Height="20"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
@@ -190,8 +190,7 @@
                           Command="{Binding Verify_Command}"
                           IsEnabled="{Binding Verify_IsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/CALCPanel/Verify.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                     <Image Source="/Resources/CALCPanel/Verify.png" Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
@@ -209,8 +208,7 @@
                           Command="{Binding Simulate_Command}"
                           IsEnabled="{Binding Simulate_IsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/CALCPanel/Simulate.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                     <Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
@@ -219,8 +217,7 @@
          <DataGridTemplateColumn x:Key="colPROD">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/ProduceRawPartIntestazione.png"
-                         Style="{StaticResource BTLPartList_Image}"/>
+                  <Image Source="/Resources/NewPage/ProduceRawPartIntestazione.png" Stretch="Uniform" Height="20"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
@@ -229,8 +226,7 @@
                           ToolTip="{Binding ProduceRawPart_ToolTip}"
                           IsEnabled="{Binding RawPartManagerIsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/TopPanel/ProduceRawPart.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                     <Image Source="/Resources/TopPanel/ProduceRawPart.png" Stretch="Uniform"/>
                   </Button>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
@@ -239,8 +235,7 @@
          <DataGridTemplateColumn x:Key="colSETTING">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/SettingIntestazione.png"
-                         Style="{StaticResource BTLPartList_Image}"/>
+                  <Image Source="/Resources/NewPage/SettingIntestazione.png" Stretch="Uniform" Height="20"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
@@ -250,51 +245,45 @@
                              ToolTip="{Binding Settings_Command_ToolTip}"
                              Style="{StaticResource BTLPanel_Button}"
                              Click="Button_Click">
-                        <Image Source="/Resources/NewPage/Setting.png"
-                               Style="{StaticResource BTLDataWnd_Image}"/>
+                        <Image Source="/Resources/NewPage/Setting.png" Stretch="Uniform"/>
                      </Button>
                      <Popup AllowsTransparency="True" 
                             PopupAnimation="Scroll" 
                             StaysOpen="False">
-                        <StackPanel Style="{StaticResource BTLPartManager_StackPanel}">
+                        <StackPanel Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
                            <!--COPY - Copia-->
                            <Button Command="{Binding CopyRawPart_Command}"
                                    ToolTip="{Binding CopyRawPart_ToolTip}"
                                    Click="ClosePopUp_Click"
-                                   Style="{StaticResource LP_Button}">
-                              <Image Source="/Resources/TopPanel/CopyRawPart.png"
-                                     Style="{StaticResource BTLDataWnd_Image}"/>
+                                   Style="{StaticResource OnlyProdLeftPanel_Button}">
+                              <Image Source="/Resources/TopPanel/CopyRawPart.png" Stretch="Uniform"/>
                            </Button>
                            <!--DELETE - Elimina-->
                            <Button Command="{Binding RemoveRawPart_Command}"
                                    ToolTip="{Binding RemoveRawPart_ToolTip}"
                                    Click="ClosePopUp_Click"
-                                   Style="{StaticResource LP_Button}">
-                              <Image Source="/Resources/NewPage/Remove.png"
-                                     Style="{StaticResource BTLDataWnd_Image}"/>
+                                   Style="{StaticResource OnlyProdLeftPanel_Button}">
+                              <Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
                            </Button>
                            <!--CAM - CAM-->
                            <Button ToolTip="{Binding Simulate_ToolTip}"
                                    Command="{Binding Simulate_Command}"
                                    Style="{StaticResource ToolBarViewPanel_Button}">
-                              <Image Source="/Resources/CALCPanel/Simulate.png"
-                                     Style="{StaticResource BTLDataWnd_Image}"/>
+                              <Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
                            </Button>
                            <!--REORDER - Riordina-->
                            <Button Command="{Binding ReOrderPart_Command}"
                                    ToolTip="{Binding ReOrderPart_ToolTip}"
                                    Click="ClosePopUp_Click"
-                                   Style="{StaticResource LP_Button}">
-                              <Image Source="/Resources/TopPanel/ReOrderPart.png"
-                                     Style="{StaticResource BTLDataWnd_Image}"/>
+                                   Style="{StaticResource OnlyProdLeftPanel_Button}">
+                              <Image Source="/Resources/TopPanel/ReOrderPart.png" Stretch="Uniform"/>
                            </Button>
                            <!--RESET - Reset-->
                            <Button Command="{Binding ResetCalc_Command}"
                                    ToolTip="{Binding ResetCalc_ToolTip}"
                                    Click="ClosePopUp_Click"
-                                   Style="{StaticResource LP_Button}">
-                              <Image Source="/Resources/CALCPanel/ResetCalc.png"
-                                     Style="{StaticResource BTLDataWnd_Image}"/>
+                                   Style="{StaticResource OnlyProdLeftPanel_Button}">
+                              <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
                            </Button>
                         </StackPanel>
                      </Popup>
@@ -326,7 +315,7 @@
                                           ScrollViewer.HorizontalScrollBarVisibility="Hidden"
                                           Width="860"
                                           CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                          Style="{StaticResource Optimizer_DataGrid}">
+                                          Style="{StaticResource DataGrid_OnlyProd}">
                   <DataGrid.RowStyle>
                      <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
                         <Setter Property="Background" Value="{Binding Background}"/>
@@ -358,23 +347,33 @@
                                     <ColumnDefinition Width="10"/>
                                  </Grid.ColumnDefinitions>
                                  <TextBlock Text="↓"
-                                            Visibility="{Binding CALC_FALL_Visibility}"
-                                            Style="{StaticResource RawPartList_TextBlock}"/>
-                                 <Border Grid.Column="1"
-                                         Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"                                                                   
+                                            Foreground="Aqua"
+                                            TextAlignment="Center"
+                                            FontWeight="Bold"
+                                            FontSize="12"
+                                            Margin="0,-6,0,-2"
+                                            Visibility="{Binding CALC_FALL_Visibility}"/>
+                                 <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
+                                         Grid.Column="1"                          
                                          Background="{Binding Calc_Background}"/>
                                  <Grid Grid.Column="2"
-                                       Style="{StaticResource FeatureInPartInRawPartList_Grid}">
+                                       HorizontalAlignment="Center">
                                     <Grid.RowDefinitions>
                                        <RowDefinition Height="1*"/>
                                        <RowDefinition Height="Auto"/>
                                     </Grid.RowDefinitions>
-                                    <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
-                                             Style="{StaticResource FeatureInPartInRawPartList_Ellipse}"/>
+                                    <Ellipse Width="5"
+                                             Height="5"
+                                             Fill="{StaticResource Omag_Blue}"
+                                             Visibility="{Binding CALC_ROT_Visibility}"
+                                             HorizontalAlignment="Center"/>
                                     <TextBlock Grid.Row="1"
                                                Text="{Binding CALC_ERR_Letter}"
                                                Foreground="{Binding CALC_ERR_Foreground}"
-                                               Style="{StaticResource CALC_ERRRawPartList_TextBlock}"/>
+                                               TextAlignment="Center"
+                                               FontWeight="Bold"
+                                               FontSize="12"
+                                               Margin="0,-6,0,-2"/>
                                  </Grid>
                               </Grid>
                            </DataTemplate>
@@ -406,8 +405,7 @@
                      <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
                         <DataGridTemplateColumn.HeaderTemplate>
                            <DataTemplate>
-                              <Image Source="/Resources/NewPage/RotateIntestazioneRawPart.png"
-                                     Style="{StaticResource BTLPartList_Image}"/>
+                              <Image Source="/Resources/NewPage/RotateIntestazioneRawPart.png" Stretch="Uniform" Height="20"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
                         <DataGridTemplateColumn.CellTemplate>
@@ -418,12 +416,13 @@
                                     <ColumnDefinition Width="Auto"/>
                                  </Grid.ColumnDefinitions>
                                  <TextBlock Text="{Binding sROT}"
-                                            Style="{StaticResource ROT_TextBlock}"/>
+                                            TextAlignment="Center"
+                                            Margin="2,3,0,2"/>
                                  <Button Grid.Column="1"
                                          Command="{Binding ForwardRotation_Command}"
-                                         Style="{StaticResource Rotation_Button}">
-                                    <Image Source="/Resources/NewPage/Rotate.png"
-                                           Style="{StaticResource BTLDataWnd_Image}"/>
+                                         Margin="-5,0,5,0"
+                                         Style="{StaticResource RawPart_Button}">
+                                    <Image Source="/Resources/NewPage/Rotate.png" Stretch="Uniform"/>
                                  </Button>
                               </Grid>
                            </DataTemplate>
@@ -433,14 +432,14 @@
                      <DataGridTemplateColumn x:Key="colFLIP">
                         <DataGridTemplateColumn.HeaderTemplate>
                            <DataTemplate>
-                              <Image Source="/Resources/NewPage/InversionIntestazioneRawPart.png"
-                                     Style="{StaticResource BTLPartList_Image}"/>
+                              <Image Source="/Resources/NewPage/InversionIntestazioneRawPart.png" Stretch="Uniform" Height="20"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
                         <DataGridTemplateColumn.CellTemplate>
                            <DataTemplate>
                               <CheckBox IsChecked="{Binding bFLIP, UpdateSourceTrigger=PropertyChanged}"
-                                        Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                      </DataGridTemplateColumn>
@@ -476,7 +475,7 @@
                         </DataGridTextColumn.CellStyle>
                         <DataGridTextColumn.EditingElementStyle>
                            <Style TargetType="{x:Type TextBox}">
-                              <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+                              <Setter Property="Foreground" Value="Blue" />
                            </Style>
                         </DataGridTextColumn.EditingElementStyle>
                      </DataGridTextColumn>
@@ -494,7 +493,7 @@
                         </DataGridTextColumn.CellStyle>
                         <DataGridTextColumn.EditingElementStyle>
                            <Style TargetType="{x:Type TextBox}">
-                              <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+                              <Setter Property="Foreground" Value="Blue" />
                            </Style>
                         </DataGridTextColumn.EditingElementStyle>
                      </DataGridTextColumn>
@@ -542,9 +541,9 @@
                            <DataTemplate>
                               <Button Command="{Binding MoveUpPart_Command}"
                                       ToolTip="{Binding MoveUpPart_ToolTip}"
-                                      Style="{StaticResource Move_Button}">
-                                 <Image Source="/Resources/NewPage/MoveUp.png"
-                                        Style="{StaticResource BTLDataWnd_Image}"/>
+                                      Margin="0"
+                                      Style="{StaticResource RawPart_Button}">
+                                 <Image Source="/Resources/NewPage/MoveUp.png" Stretch="Uniform"/>
                               </Button>
                            </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
@@ -560,9 +559,9 @@
                            <DataTemplate>
                               <Button Command="{Binding MoveDownPart_Command}"
                                       ToolTip="{Binding MoveDownPart_ToolTip}"
-                                      Style="{StaticResource Move_Button}">
-                                 <Image Source="/Resources/NewPage/MoveDown.png"
-                                        Style="{StaticResource BTLDataWnd_Image}"/>
+                                      Margin="0"
+                                      Style="{StaticResource RawPart_Button}">
+                                 <Image Source="/Resources/NewPage/MoveDown.png" Stretch="Uniform"/>
                               </Button>
                            </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
@@ -578,9 +577,9 @@
                            <DataTemplate>
                               <Button Command="{Binding RemovePart_Command}"
                                       ToolTip="{Binding RemovePart_ToolTip}"
-                                      Style="{StaticResource Move_Button}">
-                                 <Image Source="/Resources/NewPage/Remove.png"
-                                        Style="{StaticResource BTLDataWnd_Image}"/>
+                                      Margin="0"
+                                      Style="{StaticResource RawPart_Button}">
+                                 <Image Source="/Resources/NewPage/Remove.png" Stretch="Uniform"/>
                               </Button>
                            </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>

EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml

@@ -2,8 +2,14 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-      xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-      Style="{StaticResource LeftPanel_Grid}">
+      xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer">
+   <Grid.Background>
+      <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+         <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+         <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
+         <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+      </LinearGradientBrush>
+   </Grid.Background>
 
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -13,11 +19,9 @@
       <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
 
-   <Border Grid.RowSpan="2" 
-           Grid.ColumnSpan="2" 
-           Style="{StaticResource Optimizer_Border}"/>
+   <Border Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>
 
-   <Grid Style="{StaticResource Verify_Grid}">
+   <Grid Margin="4,1,20,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="Auto"/>
          <ColumnDefinition Width="Auto"/>
@@ -28,68 +32,68 @@
          <ColumnDefinition Width="Auto"/>
          <ColumnDefinition Width="Auto"/>
       </Grid.ColumnDefinitions>
-      <Button ToolTip="{Binding VerifyAll_ToolTip}"
+      <Button ToolTip="{Binding VerifyAll_ToolTip}" VerticalAlignment="Top"
               Command="{Binding VerifyAll_Command}"
               IsEnabled="{Binding VerifyAll_IsEnabled}"
-              Style="{StaticResource Verify_Button}">
-         <Image Source="/Resources/CALCPanel/VerifyAll.png"
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
       </Button>
       <Button Grid.Column="1"
-              Command="{Binding ResetCalc_Command}"
+              Command="{Binding ResetCalc_Command}" VerticalAlignment="Top"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
-              Style="{StaticResource Verify_Button}">
-         <Image Source="/Resources/CALCPanel/ResetCalc.png"
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
       </Button>
       <Button Grid.Column="2"
-              Name="FilterAllBtn"
+              Name="FilterAllBtn" VerticalAlignment="Top"
               ToolTip="{Binding FilterAll_ToolTip}"
               Command="{Binding ShowPopUpFilterBtnCommand}"
-              Style="{StaticResource Verify_Button}">
-         <Image Source="/Resources/LeftPanel/All_Filter.png"
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/LeftPanel/All_Filter.png" Stretch="Uniform"/>
       </Button>
       <Popup IsOpen="{Binding IsFilterBtnOpen}"
-             PlacementTarget="{Binding ElementName=FilterAllBtn}"
-             Style="{StaticResource Filter_PopUp}">
+             AllowsTransparency="True" 
+             PopupAnimation="Scroll" 
+             StaysOpen="False"
+             PlacementTarget="{Binding ElementName=FilterAllBtn}">
          <UniformGrid Columns="5" 
-                      Style="{StaticResource LeftPanel_UniformGrid}">
+                      Background="{StaticResource BeamWall_LinkWater}"
+                      Margin="0,10,10,10">
             <Expander  Header="{Binding Section_Msg}">
                <ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         DisplayMemberPath="sSectionXMaterial"
-                        Style="{StaticResource LeftPanel_ListBox}"
+                        Style="{StaticResource OnlyProdLeftPanel_ListBox}"
                         ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
             </Expander>
             <Expander Grid.Column="1" 
                       Header="{Binding Group_Msg}"
-                      Style="{StaticResource LeftPanel_Expander}">
+                      Margin="-2,0,0,0">
                <ListBox ItemsSource="{Binding Tag.GroupList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         SelectedItem="{Binding Tag.SelGroup, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
-                        Style="{StaticResource LeftPanel_ListBox}"
+                        Style="{StaticResource OnlyProdLeftPanel_ListBox}"
                         ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
             </Expander>
             <Expander Grid.Column="2" 
                       Header="{Binding SubGroup_Msg}"
-                      Style="{StaticResource LeftPanel_Expander}">
+                      Margin="-2,0,0,0">
                <ListBox ItemsSource="{Binding Tag.SubGroupList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         SelectedItem="{Binding Tag.SelSubGroup, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
-                        Style="{StaticResource LeftPanel_ListBox}"
+                        Style="{StaticResource OnlyProdLeftPanel_ListBox}"
                         ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
             </Expander>
             <Expander Grid.Column="3" 
                       Header="{Binding ParType_Msg}"
-                      Style="{StaticResource LeftPanel_Expander}">
+                      Margin="-2,0,0,0">
                <ListBox ItemsSource="{Binding Tag.SearchParamList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                         SelectedItem="{Binding Tag.SelSearchParam, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"             
-                        Style="{StaticResource LeftPanel_ListBox}"
+                        Style="{StaticResource OnlyProdLeftPanel_ListBox}"
                         ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
             </Expander>
             <Expander Grid.Column="4" 
                       Header="{Binding ParValue_Msg}"
-                      Style="{StaticResource LeftPanel_Expander}">
+                      Margin="-2,0,0,0">
                <EgtWPFLib5:EgtTextBox Text="{Binding Tag.SearchText, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                                       Style="{StaticResource SearchText_TextBox}"/>
             </Expander>
@@ -97,39 +101,41 @@
       </Popup>
       <Expander Grid.Column="3"
                 Header="{Binding Section_Msg}" 
-                Style="{StaticResource Section_Expander}">
+                Width="135"
+                Margin="0,4.5,5,0">
          <ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                   SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
                   DisplayMemberPath="sSectionXMaterial"
-                  Style="{StaticResource LeftPanel_ListBox}"
+                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"
                   ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
       </Expander>
       <EgtWPFLib5:EgtTextBox Grid.Column="4"
                              Text="{Binding Tag.SearchText, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
-                             Style="{StaticResource LeftPanel_TextBox}"/>
+                             TextAlignment="Justify"
+                             Height="25"
+                             Margin="0,6,4,0"
+                             Style="{StaticResource SearchText_TextBox}"/>
       <Button Grid.Column="5" Visibility="Collapsed"
               Command="{Binding RotateAll_Command}"
               ToolTip="{Binding RotateAll_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/NewPage/Rotate.png"
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/NewPage/Rotate.png" Stretch="Uniform"/>
       </Button>
       <Button Grid.Column="6" Visibility="Collapsed"
               Command="{Binding InvertAll_Command}"
               ToolTip="{Binding InvertAll_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/NewPage/Inversion.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/NewPage/Inversion.png" Stretch="Uniform"/>
       </Button>
       <Button Grid.Column="7" Visibility="Collapsed"
               Command="{Binding Edit_Command}"
               ToolTip="{Binding MultipleModify_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
-              Style="{StaticResource MacroFeaturen_Button}">
-         <Image Source="/Resources/CALCPanel/Edit.png"
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              HorizontalAlignment="Right"
+              Style="{StaticResource OnlyProdLeftPanel_Button}">
+         <Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
       </Button>
    </Grid>
 

EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb

@@ -1035,6 +1035,9 @@ Public Class MyMachGroupVM
 
 #Region "VerifyCommand"
 
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
    Public ReadOnly Property Verify_Command As ICommand
       Get
          If m_cmdVerify Is Nothing Then
@@ -1044,6 +1047,9 @@ Public Class MyMachGroupVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
    Friend Sub Verify()
       If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
       Map.refCALCPanelVM.Verify(ProjectType.PROD)
@@ -1054,6 +1060,9 @@ Public Class MyMachGroupVM
 
 #Region "SimulateCommand"
 
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
    Public ReadOnly Property Simulate_Command As ICommand
       Get
          If m_cmdSimulate Is Nothing Then
@@ -1063,6 +1072,9 @@ Public Class MyMachGroupVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
    Friend Sub Simulate()
       If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
       Dim ProjType As BWType
@@ -1125,6 +1137,9 @@ Public Class MyMachGroupVM
 
 #Region "ProduceRawPart"
 
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
    Public ReadOnly Property ProduceRawPart_Command As ICommand
       Get
          If m_cmdProduceRawPart Is Nothing Then
@@ -1134,6 +1149,9 @@ Public Class MyMachGroupVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
    Public Sub ProduceRawPart()
       If IsNothing(ProjectManagerVM.CurrProd) Then Return
       Dim ErrorMsg As String = ""
@@ -1207,6 +1225,9 @@ Public Class MyMachGroupVM
 
 #Region "CopyRawPart"
 
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
    Public ReadOnly Property CopyRawPart_Command As ICommand
       Get
          If m_cmdCopyRawPart Is Nothing Then
@@ -1216,6 +1237,9 @@ Public Class MyMachGroupVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
    Public Sub CopyRawPart()
       If IsNothing(ProjectManagerVM.CurrProd) Then Return
       Dim nQty As Integer = 1
@@ -1240,6 +1264,9 @@ Public Class MyMachGroupVM
 
 #Region "RemoveRawPart"
 
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
    Public ReadOnly Property RemoveRawPart_Command As ICommand
       Get
          If m_cmdRemoveRawPart Is Nothing Then
@@ -1249,6 +1276,9 @@ Public Class MyMachGroupVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
    Public Sub RemoveRawPartCmd()
       If MessageBox.Show(EgtMsg(62574) & Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.Name & " ?", EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
          RemoveRawPart()
@@ -1287,6 +1317,9 @@ Public Class MyMachGroupVM
 
 #Region "ReOrderPart"
 
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
    Public ReadOnly Property ReOrderPart_Command As ICommand
       Get
          If m_cmdReOrderPart Is Nothing Then
@@ -1296,15 +1329,24 @@ Public Class MyMachGroupVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
    Public Sub ReOrderPart()
       If IsNothing(ProjectManagerVM.CurrProd) Then Return
       Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
       If IsNothing(SelMachGroup) Then Return
       ' se barra gia' assegnata a supervisore, esco
       If SelMachGroup.nProduction_State >= ItemState.Assigned Then Return
+      'Dim SelPart As PartVM = SelMachGroup.SelPart
+      'If IsNothing(SelPart) Then Return
       If SelMachGroup.nType = MachineType.BEAM Then
          SelMachGroup.ReorderBeam()
          EgtDraw()
+         '' riseleziono trave
+         'If Not IsNothing(SelPart) Then
+         '   SelMachGroup.SelPart = SelPart
+         'End If
       End If
       SelMachGroup.ResetCalcMachGroup()
    End Sub
@@ -1313,6 +1355,9 @@ Public Class MyMachGroupVM
 
 #Region "ResetCalc"
 
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
    Public ReadOnly Property ResetCalc_Command As ICommand
       Get
          If m_cmdResetCalc Is Nothing Then
@@ -1322,6 +1367,9 @@ Public Class MyMachGroupVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
    Public Sub ResetCalc()
       If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
       Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup

EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml

@@ -3,8 +3,8 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-      IsEnabled="{Binding MachPanel_IsEnabled}"
-      Style="{StaticResource MachinePanel_Grid}">
+      Margin="0,10,0,10"
+      IsEnabled="{Binding MachPanel_IsEnabled}">
 
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -17,7 +17,7 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
 
-      <Grid Style="{StaticResource CalcPanel_Grid}">
+      <Grid Margin="0,0,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -25,20 +25,23 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="{Binding CurrentMachineMsg}" 
-                    Style="{StaticResource CurrentMachine_TextBlock}"/>
+                    Margin="10,0,5,0"
+                    Foreground="{StaticResource BeamWall_Corduroy}"
+                    Style="{StaticResource OnlyProdStatisticTimePanel_TextBlock}"/>
          <TextBlock Grid.Column="1"
-                    Text="{Binding SelMachineName, UpdateSourceTrigger=PropertyChanged}" 
-                    Style="{StaticResource SelMachine_TextBlock}"/>
+                    Text="{Binding SelMachineName}" 
+                    VerticalAlignment="Center"  
+                    FontWeight="Bold"
+                    Margin="10,0,5,0"
+                    Foreground="{StaticResource BeamWall_Corduroy}"
+                    Style="{StaticResource OnlyProdStatisticTimePanel_TextBlock}"/>
          <Button Grid.Column="2"
                  ToolTip="{Binding ChooseMachine_ToolTip}"
                  Command="{Binding ChooseMachine_Command}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/CALCPanel/ChooseMachine.png"
-                   Style="{StaticResource BTLDataWnd_Image}"/>
+            <Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>
          </Button>
-         <Grid Grid.Column="3"
-               Visibility="{Binding ChooseMachine_Visibility}"
-               Style="{StaticResource CalcPanel_Grid}">
+         <Grid Grid.Column="3" Margin="0,0,5,0" Visibility="{Binding ChooseMachine_Visibility}">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="Auto"/>
@@ -47,40 +50,42 @@
             <ComboBox x:Name="SelMachineCombo"
                       ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
                       SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                      Style="{StaticResource CalcPanel_ComboBox}"/>
+                      Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
             <Button Grid.Column="1"
                     Content="OK"
                     Command="{Binding Ok_Command}"
-                    Style="{StaticResource CalcPanel_Button}"/>
+                    Style="{StaticResource ToolBarOnlyProdCalcPanel_Button}"/>
          </Grid>
       </Grid>
-      <StackPanel Grid.Column="1"
-                  Style="{StaticResource PParameters_StackPanel}">
+      <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
          <RadioButton Content="{Binding StrategyManagerMsg}"
                       ToolTip="{Binding ParameterMachineMsg}"
                       IsChecked="{Binding StrategyManagerIsChecked}"
-                      Style="{StaticResource StrategyManager_ToggleButton}"/>
+                      Margin="0,0,50,0"
+                      Style="{StaticResource OnlyProdMainMenu_ToggleButton}" Width="140"/>
          <Button Content="{Binding ToolDBMsg}"
                  ToolTip="{Binding ToolDBToolTip}"
                  Command="{Binding ToolDbCommand}"
                  Click="Button_Click"
-                 Style="{StaticResource GeneralConfiguration_Button}"/>
+                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
          <Button Content="{Binding SetUpMsg}"
                  Command="{Binding SetUpCommand}" 
                  Click="Button_Click"
                  ToolTip="{Binding SetUpToolTip}"
-                 Style="{StaticResource GeneralConfiguration_Button}"
+                 Style="{StaticResource GeneralConfigurationToolBar_TextButton}"
                  Visibility="{Binding SetUp_Visibility}"/>
          <RadioButton Content="{Binding MachineParamsMsg}"
                       ToolTip="{Binding MachineParamsMsg}"
                       IsChecked="{Binding MachineParamsIsChecked}"
-                      Style="{StaticResource MachineParam_ToggleButton}"/>
+                      Margin="5,0,10,0"
+                      Style="{StaticResource OnlyProdMainMenu_ToggleButton}" Width="155"/>
       </StackPanel>
    </Grid>
 
    <TabControl Grid.Row="1"
+               BorderThickness="0"
                SelectedIndex="{Binding nSelTab}"
-               Style="{StaticResource SelTab_TabControl}">
+               Style="{StaticResource OnlyProd_TabControl}">
       <TabControl.ItemContainerStyle>
          <Style TargetType="{x:Type TabItem}">
             <Setter Property="Visibility" Value="Collapsed"/>
@@ -93,44 +98,44 @@
          </StackPanel>
       </TabItem>
       <TabItem Header="PARAMETERS">
-         <StackPanel Style="{StaticResource PartManager_StackPanel}">
+         <StackPanel Orientation="Horizontal">
             <ItemsControl ItemsSource="{Binding SelectedItem.MachTableList, ElementName=SelMachineCombo}">
                <ItemsControl.ItemsPanel>
                   <ItemsPanelTemplate>
-                     <StackPanel x:Name="GroupStackPanel"
-                                 Style="{StaticResource PartManager_StackPanel}"/>
+                     <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
                   </ItemsPanelTemplate>
                </ItemsControl.ItemsPanel>
                <ItemsControl.ItemTemplate>
                   <DataTemplate>
-                     <GroupBox Header="{Binding sName}" 
-                               Style="{StaticResource MachinePanel_GroupBox}">
-                        <ItemsControl Name="MachParamsItemsControl" 
-                                      ItemsSource="{Binding MachParamList}" 
-                                      Style="{StaticResource MachinePanel_ItemsControl}">
+                     <GroupBox Header="{Binding sName}" Width="Auto" VerticalAlignment="Top" Height="Auto" Foreground="{StaticResource BeamWall_Corduroy}">
+                        <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
-                                 <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
+                                 <WrapPanel Orientation="Vertical"/>
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.ItemTemplate>
                               <DataTemplate>
-                                 <Grid Style="{StaticResource MachParam_Grid}">
+                                 <Grid Margin="0,0,5,5">
                                     <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="*"/>
-                                       <ColumnDefinition Width="*"/>
-                                       <ColumnDefinition Width="*"/>
+                                       <ColumnDefinition Width="*" />
+                                       <ColumnDefinition Width="*" />
+                                       <ColumnDefinition Width="*" />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding sName}"
                                                ToolTip="{Binding sName}"
-                                               Style="{StaticResource MachinePanel_TextBlock}"/>
+                                               TextWrapping="WrapWithOverflow"
+                                               Width="150"
+                                               Style="{StaticResource MachParamTextBlock}"/>
                                     <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                                            Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                           Style="{StaticResource Name_TextBox}"/>
+                                                           Width="60"/>
                                     <TextBlock Grid.Column="2"
                                                Text="{Binding sDescription}"
                                                ToolTip="{Binding sDescription}"
-                                               Style="{StaticResource Description_TextBlock}"/>
+                                               TextWrapping="WrapWithOverflow"
+                                               Width="148"
+                                               Style="{StaticResource MachParamTextBlock}"/>
                                  </Grid>
                               </DataTemplate>
                            </ItemsControl.ItemTemplate>

EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb

@@ -34,6 +34,15 @@ Public Class MachinePanelVM
                Map.refStrategyManagerVM.Update()
             End If
             NotifyPropertyChanged(NameOf(SelectedMachine))
+            ' Salvo impostazione macchina corrente
+            ' SaveCurrentMachine()
+            ' inizializzo la macchina selezionata come macchina corrente
+            'Dim nMachType As MachineType = DirectCast(m_SelectedMachine, MyMachine).nType
+            'If Not IsNothing(value) Then
+            '   InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name, nMachType)
+            'Else
+            '   InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, m_SelectedMachine.Name, nMachType)
+            'End If
          End If
       End Set
    End Property
@@ -63,6 +72,20 @@ Public Class MachinePanelVM
       End Set
    End Property
 
+   'Private m_BeamTable_Visibility As Visibility
+   'Public ReadOnly Property BeamTable_Visibility As Visibility
+   '   Get
+   '      Return m_BeamTable_Visibility
+   '   End Get
+   'End Property
+
+   'Private m_WallTable_Visibility As Visibility
+   'Public ReadOnly Property WallTable_Visibility As Visibility
+   '   Get
+   '      Return m_WallTable_Visibility
+   '   End Get
+   'End Property
+
    Public ReadOnly Property SetUp_Visibility As Visibility
       Get
          Return If(Map.refMainWindowVM.MainWindowM.bModifySetup, Visibility.Visible, Visibility.Collapsed)
@@ -127,6 +150,7 @@ Public Class MachinePanelVM
       NotifyPropertyChanged(NameOf(StrategyManagerIsChecked))
    End Sub
 
+
 #Region "Messages"
 
    Public ReadOnly Property ToolDBMsg As String
@@ -263,6 +287,44 @@ Public Class MachinePanelVM
       End If
    End Sub
 
+   Friend Function BeamMachDb() As Boolean
+      ' Assegno le path
+      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Beam"
+      ' verifico se ci sono i file ini
+      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
+      Dim sTabTemplPath As String = sBaseDir & "\BeamTableTemplate.ini"
+      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
+         ' apro finestra di gestione lavorazioni travi
+         Dim sTitle = EgtMsg(9000)               'Tabelle delle lavorazioni delle travi
+         Dim BeamMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath)
+         Dim BeamMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
+         BeamMchsWinV.ShowDialog()
+      Else
+         ' Impossibile aprire l'Editor delle lavorazioni delle travi.<br/>Mancano i file di configurazione. - Errore
+         MessageBox.Show(EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
+      End If
+      Return True
+   End Function
+
+   Friend Function WallMachDb() As Boolean
+      ' Assegno le path
+      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Wall"
+      ' verifico se ci sono i file ini
+      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
+      Dim sTabTemplPath As String = sBaseDir & "\WallTableTemplate.ini"
+      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
+         ' apro finestra di gestione lavorazioni pareti
+         Dim sTitle = EgtMsg(9010)               'Tabelle delle lavorazioni delle pareti
+         Dim WallMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, False)
+         Dim WallMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
+         WallMchsWinV.ShowDialog()
+      Else
+         ' Impossibile aprire l'Editor delle lavorazioni delle pareti.<br/>Mancano i file di configurazione. - Errore
+         MessageBox.Show(EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
+      End If
+      Return True
+   End Function
+
    Public Overrides Sub ToolDb(ByVal param As Object)
       SetSelTab(ConfigTabs.EMPTY)
       If Not VerifyMachinesDir(m_sMachinesRoot) Then Return

EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml

@@ -1,14 +1,16 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="MacroFeatureWnd"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 Title="NewMacroFeature"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-   
-   <Grid Style="{StaticResource BlockedWnd_Grid}">
+<EgtWPFLib5:EgtCustomWindow x:Class="MacroFeatureWnd"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="NewMacroFeature"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   <Grid Margin="5">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="Auto"/>
          <ColumnDefinition Width="Auto"/>
@@ -20,34 +22,37 @@
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       <TextBlock Text="Feature"
-                 Style="{StaticResource Feature_TextBlock}"/>
-      <TextBlock Grid.Column="1"
-                 Text="{Binding sDescBTLFeature}"                 
-                 Style="{StaticResource DescBTLFeature_TextBlock}"/>
-      <CheckBox Grid.Column="2"
-                Content="Default Macro"
+                 Margin="5"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <TextBlock Text="{Binding sDescBTLFeature}"
+                 Grid.Column="1"
+                 HorizontalAlignment="Left"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <CheckBox Content="Default Macro"
                 IsChecked="{Binding bIsCustomChecked}"
-                Visibility="{Binding bCustomVisibility}"                
-                Style="{StaticResource DefaultMacro_CheckBox}"/>
-      <TextBlock Grid.Row="1"
-                 Text="Name"                 
-                 Style="{StaticResource Option_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Row="1"
+                Visibility="{Binding bCustomVisibility}"
+                Grid.Column="2"
+                Margin="0,6,5,0"/>
+      <TextBlock Text="Name"
+                 Grid.Row="1"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <EgtWPFLib5:EgtTextBox Text="{Binding sFeatureName}"
+                             Grid.Row="1"
                              Grid.Column="1"
                              Grid.ColumnSpan="2"
-                             Text="{Binding sFeatureName}"                             
-                             Style="{StaticResource FeatureName_TextBox}"/>
+                             Margin="5"
+                             Width="200"/>
       <UniformGrid Columns="2"
                    Grid.Row="2"
                    Grid.ColumnSpan="3"
-                   Style="{StaticResource AddFeatureWnd_UniformGrid}">
+                   Margin="5">
          <Button Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
    </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWnd.xaml.vb

@@ -3,6 +3,7 @@
    Private WithEvents m_MacroFeatureWndVM As MacroFeatureWndVM
 
    Sub New(Owner As Window, MacroFeatureWndVM As MacroFeatureWndVM)
+      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = MacroFeatureWndVM

EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml

@@ -1,11 +1,9 @@
 <Grid x:Class="MainMenuV"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:sys="clr-namespace:System;assembly=mscorlib"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
       IsEnabled="{Binding MainMenu_IsEnabled}"
-      DataContext="{DynamicResource MainMenuVM}"
-      WindowChrome.IsHitTestVisibleInChrome="True">
+      DataContext="{StaticResource MainMenuVM}">
 
    <!--Barra superiore dei comandi-->
    <Grid.ColumnDefinitions>
@@ -18,35 +16,37 @@
    </Grid.ColumnDefinitions>
 
    <RadioButton Content="{Binding OnlyProdPage_Msg}"
-                IsChecked="{Binding Optimizer_IsChecked}"
-                Style="{StaticResource MainMenu_ToggleButton}"/>
+                IsChecked="{Binding OnlyProdPage_IsChecked}"
+                Style="{StaticResource OnlyProdMainMenu_ToggleButton}"
+                Width="120"/>
 
    <RadioButton Grid.Column="1"
                 Content="{Binding Configuration_Msg}"
                 IsChecked="{Binding Config_IsChecked}"
-                Style="{StaticResource MainMenu_ToggleButton}"/>
+                Style="{StaticResource OnlyProdMainMenu_ToggleButton}"/>
 
    <Button Grid.Column="2"
            Content="{Binding Supervisor_Msg}"
            Command="{Binding Supervisor_Command}"
            Visibility="{Binding Supervisor_Visibility}"
-           Style="{StaticResource MainMenu_Button}"/>
+           Style="{StaticResource OnlyProdMainMenu_Button}"/>
 
    <Button Grid.Column="3"
            Command="{Binding SendFeedbackCommand}"
            ToolTip="{Binding SendFeedbackToolTip}"
+           Style="{StaticResource OnlyProdMainMenu_Button}"
            IsEnabled="{Binding SendFeedbackIsEnabled}"
-           Style="{StaticResource SendFeedback_Button}">
-      <Image Source="/Resources/MainMenu/Send.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Width="40">
+      <Image Source="/Resources/MainMenu/Send.png" Stretch="Uniform"/>
    </Button>
 
    <RadioButton Grid.Column="4"
                 IsChecked="{Binding ConfigProgram_IsChecked}"
                 ToolTip="{Binding ConfigurationProgramToolTip}"
-                Style="{StaticResource ConfigProgram_ToggleButton}">
-      <Image Source="{Binding sConfigurationImagePath}"
-             Style="{StaticResource ConfigProgram_Image}"/>
+                Width="40"
+                Background="Transparent"
+                Style="{StaticResource OnlyProdMainMenu_ToggleButton}">
+      <Image Source="{Binding sConfigurationImagePath}" Height="40" Margin="0,-6,0,0" Stretch="Uniform"/>
    </RadioButton>
 
    <OPTIMIZER:UserAdminV Grid.Column="5"/>

EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb

@@ -30,17 +30,17 @@ Public Class MainMenuVM
 
    Public ReadOnly Property SendFeedbackIsEnabled As Boolean
       Get
-         Return m_SelPage = Pages.OPTIMIZERPAGE
+         Return m_SelPage = Pages.ONLYPRODPAGE
       End Get
    End Property
 
-   Public Property Optimizer_IsChecked As Boolean
+   Public Property OnlyProdPage_IsChecked As Boolean
       Get
-         Return m_SelPage = Pages.OPTIMIZERPAGE
+         Return m_SelPage = Pages.ONLYPRODPAGE
       End Get
       Set(value As Boolean)
          If value Then
-            SelPage = Pages.OPTIMIZERPAGE
+            SelPage = Pages.ONLYPRODPAGE
             SetConfigurationImagePath("pack://application:,,,/Resources/NewPage/configuration.png")
          End If
       End Set
@@ -109,7 +109,7 @@ Public Class MainMenuVM
       Select Case m_SelPage
          Case Pages.CONFIG, Pages.CONFIGPROGRAM
             bOk = ExitCONFIG()
-         Case Pages.OPTIMIZERPAGE
+         Case Pages.ONLYPRODPAGE
             bOk = ExitONLYPRODPAGE(bVerifyModification)
       End Select
       If bOk Then
@@ -118,14 +118,14 @@ Public Class MainMenuVM
          Select Case m_SelPage
             Case Pages.CONFIG
                InitCONFIG()
-            Case Pages.OPTIMIZERPAGE, Pages.CONFIGPROGRAM
+            Case Pages.ONLYPRODPAGE, Pages.CONFIGPROGRAM
                InitONLYPRODPAGE()
          End Select
       End If
       ' aggiorno visualizzazione RadioButton
       NotifyPropertyChanged(NameOf(Supervisor_IsChecked))
       NotifyPropertyChanged(NameOf(Config_IsChecked))
-      NotifyPropertyChanged(NameOf(Optimizer_IsChecked))
+      NotifyPropertyChanged(NameOf(OnlyProdPage_IsChecked))
       NotifyPropertyChanged(NameOf(ConfigProgram_IsChecked))
    End Sub
 
@@ -354,6 +354,7 @@ Public Class MainMenuVM
             Return False
          End If
       End If
+      ' EgtResetCurrMachGroup()
       Return True
    End Function
 
@@ -544,6 +545,9 @@ Public Class MainMenuVM
 
 #Region "SendFeedbackCommand"
 
+   ''' <summary>
+   ''' Returns a command that do SendFeedback.
+   ''' </summary>
    Public ReadOnly Property SendFeedbackCommand As ICommand
       Get
          If m_cmdSendFeedback Is Nothing Then
@@ -553,8 +557,11 @@ Public Class MainMenuVM
       End Get
    End Property
 
+   ''' <summary>
+   ''' Execute the SendFeedback.  This method is invoked by the SendFeedbackCommand.
+   ''' </summary>
    Public Sub SendFeedback(ByVal param As Object)
-      If (SelPage = Pages.MACHINING OrElse SelPage = Pages.OPTIMIZERPAGE) AndAlso IsNothing(ProjectManagerVM.CurrProd) Then
+      If (SelPage = Pages.MACHINING OrElse SelPage = Pages.ONLYPRODPAGE) AndAlso IsNothing(ProjectManagerVM.CurrProd) Then
          MessageBox.Show(EgtMsg(61891), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
@@ -571,7 +578,7 @@ Public Class MainMenuVM
       EgtGetKeyInfo(sKey)
       ' Esporto il progetto
       Dim ProjFileMList As List(Of ProjFileM)
-      If (SelPage = Pages.MACHINING OrElse SelPage = Pages.OPTIMIZERPAGE) And Not IsNothing(ProjectManagerVM.CurrProd) Then
+      If (SelPage = Pages.MACHINING OrElse SelPage = Pages.ONLYPRODPAGE) And Not IsNothing(ProjectManagerVM.CurrProd) Then
          ProjFileMList = DbControllers.m_ProjController.GetByProdAsc(ProjectManagerVM.CurrProd.nProdId)
          'Map.refProjManagerVM.SetCurrProj(ProjFileMList(0).nProjId)
          Map.refProdManagerVM.SetCurrProj(ProjFileMList(0).nProjId)
@@ -595,7 +602,7 @@ Public Class MainMenuVM
             Select Case Map.refMainMenuVM.SelPage
                Case Pages.VIEW
                   ProdId = ProjectManagerVM.CurrProj.nProdId
-               Case Pages.MACHINING, Pages.OPTIMIZERPAGE
+               Case Pages.MACHINING, Pages.ONLYPRODPAGE
                   ProdId = ProjectManagerVM.CurrProd.nProdId
             End Select
             If ProdId = 0 Then

EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb

@@ -184,6 +184,14 @@ Public Class MainWindowM
       End Get
    End Property
 
+   ' Indirizzo server (DEBUG) 
+   Private m_sServerAddressRelease As String
+   Friend ReadOnly Property sServerAddressRelease As String
+      Get
+         Return m_sServerAddressRelease
+      End Get
+   End Property
+
 #End Region    ' FIELDS
 
 #Region "CONSTRUCTOR"
@@ -328,6 +336,10 @@ Public Class MainWindowM
       m_bMachConfig = GetMainPrivateProfileInt(S_MACH, K_MACHCONFIG, 0) = 1
       ' e lo imposto nel core
       Core.Configuration.SetModifySetup(m_bMachConfig)
+      ' Recupero Server Address
+      GetMainPrivateProfileString(S_GENERAL, K_SERVERADDRESS, "", m_sServerAddressRelease)
+      ' e lo imposto nel core
+      Core.Configuration.SetServerAddressRelease(m_sServerAddressRelease)
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString())
    End Sub
@@ -451,6 +463,40 @@ Public Class MainWindowM
       If Not IsNothing(m_objMutex) Then m_objMutex.Close()
    End Sub
 
+   ''' <summary>
+   ''' Funzione che recupera il CurrProd
+   ''' </summary>
+   ''' <returns></returns>
+   Private Function GetCurrProd() As Integer
+      Dim sLastProjectPath As String = String.Empty
+      Dim sMruSection As String = S_MRUPROJFILES
+      sMruSection = S_MRUPRODFILES
+      GetMainPrivateProfileString(sMruSection, K_FILE & "1", String.Empty, sLastProjectPath)
+      If Not String.IsNullOrWhiteSpace(sLastProjectPath) AndAlso File.Exists(sLastProjectPath) Then
+         ' ricavo l'Id e il progetto associato per l'apertura di quest'ultimo
+         Dim PjId As Integer = 0
+         Dim sPjId As String = Path.GetFileNameWithoutExtension(sLastProjectPath)
+         Integer.TryParse(sPjId, PjId)
+         Return PjId
+      End If
+      Return -1
+   End Function
+
+   '''' <summary>
+   '''' Funzione che recupera il tipo di progetto
+   '''' </summary>
+   '''' <returns></returns>
+   'Private Function GetProdType() As BWType
+   '   ' Recupero CurrProd
+   '   Dim currProd As Integer = GetCurrProd()
+   '   ProjectManagerVM.SetCurrProd(currProd)
+   '   If Not IsNothing(ProjectManagerVM.CurrProd) Then
+   '      Return ProjectManagerVM.CurrProd.nType
+   '   Else
+   '      Return BWType.NULL
+   '   End If
+   'End Function
+
    ''' <summary>
    ''' Fuzione che recupera la cartella dove salvare il file json CustomerConfig
    ''' </summary>
@@ -490,6 +536,15 @@ Public Class MainWindowM
    ''' <returns></returns>
    Friend Function GetStandardDirPath(StrategyType As BWType) As String
       Return GetStrategiesDirPath(StrategyType) & "\" & STANDARD_DIR
+
+      '' Recupero tipo progetto
+      'Dim nProdType As BWType = GetProdType()
+      'If nProdType = BWType.BEAM Then
+      '   Return sBeamRoot & "\" & STRATEGIES_DIR & "\" & STANDARD_DIR
+      'ElseIf nProdType = BWType.WALL Then
+      '   Return sWallRoot & "\" & STRATEGIES_DIR & "\" & STANDARD_DIR
+      'End If
+      'Return String.Empty
    End Function
 
 #End Region    ' METHODS

EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml

@@ -1,15 +1,19 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="MainWindowV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 MinHeight="600" MinWidth="800"
-                                 ShowInTaskbar="True"
-                                 Drop="MainWindowV_Drop"
-                                 Title="{Binding Title}">
-   <EgtBEAMWALLCORE:OptimizerWindow.TitlePanel>
+<EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            DataContext="{StaticResource MainWindowVM}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
+                            Title="{Binding Title}" Icon="/Resources/EgtBEAMWALL.ico"
+                            MinHeight="600" MinWidth="800"
+                            AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
+                            AllowDrop="True" Drop="MainWindowV_Drop"
+                            ShowInTaskbar="True"
+                            CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+   <EgtWPFLib5:EgtCustomWindow.TitlePanel>
       <OPTIMIZER:MainMenuV DataContext="{StaticResource MainMenuVM}"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.TitlePanel>
+   </EgtWPFLib5:EgtCustomWindow.TitlePanel>
 
    <!--Pannello principale -->
    <DockPanel>
@@ -30,12 +34,12 @@
             <OPTIMIZER:ProjectV DataContext="{StaticResource ProjectVM}"/>
          </TabItem>
          <TabItem>
-            <OPTIMIZER:ConfigurationPageV DataContext="{DynamicResource ConfigurationPageVM}"/>
+            <OPTIMIZER:ConfigurationPageV DataContext="{StaticResource ConfigurationPageVM}"/>
          </TabItem>
          <TabItem>
-            <OPTIMIZER:ConfigurationProgramV DataContext="{DynamicResource ConfigurationPageVM}"/>
+            <OPTIMIZER:ConfigurationProgramV DataContext="{StaticResource ConfigurationPageVM}"/>
          </TabItem>
       </TabControl>
 
    </DockPanel>
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb

@@ -9,19 +9,14 @@ Public Class MainWindowV
 #Region "CONSTRUCTOR"
 
    Sub New()
-      m_MainWindowVM = New MainWindowVM
       ' Funzione che interpreta l'xaml
       InitializeComponent()
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      Me.DataContext = m_MainWindowVM
-      'm_MainWindowVM = DirectCast(Me.DataContext, MainWindowVM)
-      'AddHandler Me.Loaded, AddressOf MainWindowV_Loaded
+      m_MainWindowVM = DirectCast(Me.DataContext, MainWindowVM)
+      AddHandler Me.Loaded, AddressOf MainWindowV_Loaded
       AddHandler Me.ContentRendered, AddressOf MainWindowV_ContentRendered
       AddHandler Me.Closing, AddressOf MainWindowV_Closing
       AddHandler Me.KeyDown, AddressOf MainWindowV_KeyDown
-      Me.SetPlacementAppName(S_GENERAL)
-      Me.SetPlacementKeyName(K_WINPLACE)
-      Me.SetPlacementFileName(IniFile.m_sIniFile)
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -38,7 +33,6 @@ Public Class MainWindowV
    End Sub
 
    Private Sub MainWindowV_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
-      m_MainWindowVM.CloseApplication()
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          e.Cancel = True
          Return

EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb

@@ -48,7 +48,7 @@ Public Class MainWindowVM
    Public Property nSelTabPage As Integer
       Get
          Select Case Map.refMainMenuVM.SelPage
-            Case Pages.EMPTY, Pages.OPTIMIZERPAGE
+            Case Pages.EMPTY, Pages.ONLYPRODPAGE
                Return 0
             Case Pages.CONFIG
                Return 1
@@ -57,6 +57,7 @@ Public Class MainWindowVM
             Case Else
                Return -1
          End Select
+         'Return If(IsNothing(Map.refMainMenuVM.SelPage) OrElse Map.refMainMenuVM.SelPage = -1 OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, 0, 1)
       End Get
       Set(value As Integer)
       End Set
@@ -72,13 +73,6 @@ Public Class MainWindowVM
    'Friend m_SupervisorStop As Boolean = False
    Private BlockedWnd As BlockedWndV
 
-   Private m_Window_Opacity As Double = 0.2
-   Public ReadOnly Property Window_Opacity As Double
-      Get
-         Return m_Window_Opacity
-      End Get
-   End Property
-
    ' definizione comandi
    Private m_cmdAboutBox As ICommand
    Private m_cmdCloseApplication As ICommand
@@ -119,7 +113,7 @@ Public Class MainWindowVM
       Select Case Map.refMainMenuVM.SelPage
          Case Pages.CONFIG
             m_Title = "Configuration Page"
-         Case Pages.OPTIMIZERPAGE
+         Case Pages.ONLYPRODPAGE
             If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then
                If Not IsNothing(ProjectManagerVM.CurrProd) Then
                   If ProjectManagerVM.CurrProd.bIsNew Then m_Title = "New - "
@@ -153,10 +147,10 @@ Public Class MainWindowVM
       MyExecProcessManager.Init()
 
       ' seleziono pagina da aprire
-      Map.refMainMenuVM.SelPage = Pages.OPTIMIZERPAGE
+      Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE
       ' leggo riga di comando
       Dim nCommandType As Integer = 0
-      Dim nPage As Pages = Pages.OPTIMIZERPAGE
+      Dim nPage As Pages = Pages.ONLYPRODPAGE
       Dim nProdId As Integer = 0
       If ProcessCommandLine(nCommandType, nPage, nProdId) Then
          Select Case nCommandType
@@ -249,8 +243,6 @@ Public Class MainWindowVM
 
    Private Sub SplashScreenTimer_Tick()
       If m_WaitAfterRender > 1 Then
-         m_Window_Opacity = 1
-         NotifyPropertyChanged(NameOf(Window_Opacity))
          ' chiudo SplashScreen
          MapV.refSplashScreenV.Close()
          m_SplashScreen_Timer.Stop()
@@ -275,7 +267,7 @@ Public Class MainWindowVM
          Case 2         ' apri pagina specifica senza progetto specifico
             ' recupero secondo parametro
             Dim sPage As String = Environment.GetCommandLineArgs(2)
-            If Not Integer.TryParse(sPage, nPage) OrElse (nPage <> Pages.OPTIMIZERPAGE) Then Return False
+            If Not Integer.TryParse(sPage, nPage) OrElse (nPage <> Pages.VIEW AndAlso nPage <> Pages.MACHINING AndAlso Pages.ONLYPRODPAGE) Then Return False
             Return True
       End Select
       Return False
@@ -304,7 +296,7 @@ Public Class MainWindowVM
                Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
             End If
             ' se Reset Macchina è aperto 
-            If Map.refCALCPanelVM.ChooseMachine_Visibility = Visibility.Visible Then
+            If (nSelTabPage = Pages.VIEW Or nSelTabPage = Pages.MACHINING Or nSelTabPage = Pages.ONLYPRODPAGE) AndAlso Map.refCALCPanelVM.ChooseMachine_Visibility = Visibility.Visible Then
                Map.refCALCPanelVM.CloseResetMachine()
             End If
             ' pulisco output
@@ -364,7 +356,7 @@ Public Class MainWindowVM
    End Property
 
    ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
-   Public Sub CloseApplication()
+   Public Sub CloseApplication(ByVal param As Object)
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          Return
       End If
@@ -388,7 +380,7 @@ Public Class MainWindowVM
          Case Pages.CONFIG
             ' Verifica modifica parametri Macchina e chiedo il salvataggio
             Map.refConfigurationPageVM.VerifyConfigPageModification()
-         Case Pages.OPTIMIZERPAGE
+         Case Pages.ONLYPRODPAGE
             bOk = ProdFileVM.VerifyProjectModification(ProjectManagerVM.CurrProd) <> MessageBoxResult.Cancel
       End Select
       ' se salvataggio annullato, rimango