From 83d748ace80ee4c9ee5c1bbfd7346237c299c68a Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Fri, 20 Feb 2026 10:35:58 +0100
Subject: [PATCH] EgtBEAMWALL 3.1.2.5: -cambio grafica finestra apertura
 -sistemato chiusura programma -modifica grafica a StatisticsTimePanel

---
 EgtBEAMWALL.Core/My Project/AssemblyInfo.vb   |   4 +-
 .../NewOpenProjectFileDialogV.xaml            |   8 +--
 .../NewOpenProjectFileDialogVM.vb             |   2 -
 EgtBEAMWALL.Core/Themes/Generic.xaml          |  68 ++++++++++++++++--
 EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml    |  14 ++--
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../AboutBoxWindow/AboutBoxV.xaml             |  55 ++++++++------
 .../BTLPartManager/BTLPartManagerVM.vb        |   1 +
 .../EgtBEAMWALL.Optimizer.vbproj              |   3 +
 .../ItemParamList/BTLPartListV.xaml.vb        |   1 -
 .../ItemParamList/RawPartListV.xaml.vb        |   1 -
 .../LeftPanel/LeftPanelVM.vb                  |   1 +
 .../My Project/AssemblyInfo.vb                |   4 +-
 .../NewOpenProjectFileDialogVM.vb             |   4 ++
 .../ProdManager/ProdManagerVM.vb              |  16 ++++-
 .../RawPartManager/RawPartManagerVM.vb        |   4 ++
 .../Resources/NewPage/clock.png               | Bin 0 -> 1043 bytes
 .../StatisticsTimePanelV.xaml                 |  53 ++++++++------
 EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml |  50 ++++++++++---
 .../AboutBoxWindow/AboutBoxV.xaml             |  55 ++++++++------
 .../My Project/AssemblyInfo.vb                |   4 +-
 .../Utility/Dictionary.xaml                   |   1 +
 22 files changed, 251 insertions(+), 102 deletions(-)
 create mode 100644 EgtBEAMWALL.Optimizer/Resources/NewPage/clock.png

diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index 3d943457..a78a1d51 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.2.4")>
-<Assembly: AssemblyFileVersion("3.1.2.4")>
+<Assembly: AssemblyVersion("3.1.2.5")>
+<Assembly: AssemblyFileVersion("3.1.2.5")>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
index 3261a3c3..74ae562d 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
@@ -104,7 +104,7 @@
                                  AlternationCount="2"
                                  ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                                  Style="{StaticResource Optimizer_DataGrid}"
-                                 CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
+                                 CellStyle="{StaticResource CellDataGrid_NewOpenProject}">
          <DataGrid.Resources>
             <!-- ProdId -->
             <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
@@ -126,7 +126,7 @@
                      <ToggleButton Grid.Column="1"
                                    IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
                                    Style="{StaticResource Small_ToggleButton}">
-                        <Image Source="\Resources\CalcPanel\Edit.png"
+                        <Image Source="{StaticResource Edit_Image}"
                                Style="{StaticResource Lock_Image}"/>
                      </ToggleButton>
                   </Grid>
@@ -148,7 +148,7 @@
             <DataGridTemplateColumn x:Key="colARCHIVED">
                <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate>
-                     <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
+                     <Image Source="{StaticResource Archived_Image}"
                             Visibility="{Binding Archived_Visibility}"
                             Style="{StaticResource Archived_Image}"/>
                   </DataTemplate>
@@ -167,7 +167,7 @@
          </DataGrid.RowStyle>
          <DataGrid.RowDetailsTemplate>
             <DataTemplate>
-               <ItemsControl ItemsSource="{Binding ProjFileList}"
+               <ItemsControl ItemsSource="{Binding ProjFileList}" HorizontalAlignment="Left" Margin="50,-1,0,0"
                              Style="{StaticResource ProjFileList_ItemsControl}">
                   <ItemsControl.ItemTemplate>
                      <DataTemplate>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
index 8dca509b..0a670bf3 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
@@ -719,8 +719,6 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    ''' Execute the New.  This method is invoked by the NewCommand.
    ''' </summary>
    Public Overridable Sub Cancel()
-      ' Salvo modifiche a colonne
-      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
    End Sub
 
 #End Region ' Cancel
diff --git a/EgtBEAMWALL.Core/Themes/Generic.xaml b/EgtBEAMWALL.Core/Themes/Generic.xaml
index ae6ca96a..c6ac35c3 100644
--- a/EgtBEAMWALL.Core/Themes/Generic.xaml
+++ b/EgtBEAMWALL.Core/Themes/Generic.xaml
@@ -413,7 +413,6 @@
    <!--#region Image-->
 
    <BitmapImage x:Key="Save_Image" UriSource="/Resources/ProjectManager/Save.png"/>
-   <BitmapImage x:Key="Restore_Image" UriSource="/Resources/EgtDialog/Restore.png"/>
 
    <!--#endregion Image-->
 
@@ -623,6 +622,21 @@
       </Style.Triggers>
    </Style>
 
+   <!--#region AboutBox_TextBlock-->
+   
+   <Style x:Key="AboutBox_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="FontSize" Value="18"/>
+   </Style>
+
+   <Style x:Key="Copyright_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource AboutBox_TextBlock}">
+      <Setter Property="FontSize" Value="12"/>
+   </Style>
+
+   <!--#endregion AboutBox_TextBlock-->
+   
    <!--#endregion TextBlock-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -701,6 +715,15 @@
       <Setter Property="Margin" Value="0,0,2.5,0"/>
    </Style>
 
+   <Style x:Key="AboutBox_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="FontSize" Value="12"/>
+      <Setter Property="IsReadOnly" Value="True"/>
+   </Style>
+
    <!--#endregion TextBox-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -938,16 +961,15 @@
    <Style x:Key="RightPanel_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="Height" Value="24"/>
       <Setter Property="Width" Value="64"/>
-      <Setter Property="BorderThickness" Value="1,1,1,0"/>
    </Style>
 
    <Style x:Key="EgtColorPicker_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource RightPanel_HalfRound_Button}">
-      <Setter Property="Margin" Value="2.5,0,2.5,0"/>
+      <Setter Property="Margin" Value="2.5,0,2.5,2"/>
    </Style>
 
    <Style x:Key="EgtManageDialogOK_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource RightPanel_HalfRound_Button}">
       <Setter Property="HorizontalAlignment" Value="Right"/>
-      <Setter Property="Margin" Value="15,0,2.5,0"/>
+      <Setter Property="Margin" Value="15,0,2.5,2"/>
    </Style>
 
    <Style x:Key="MachiningDB_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource RightPanel_HalfRound_Button}">
@@ -956,13 +978,18 @@
 
    <Style x:Key="EgtManageDialogCancel_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource RightPanel_HalfRound_Button}">
       <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="Margin" Value="2.5,0,0,0"/>
+      <Setter Property="Margin" Value="2.5,0,0,2"/>
    </Style>
 
    <!--#endregion RightPanel_HalfRound-->
       
    <!--#endregion Optimizer-->
 
+   <Style x:Key="AboutBox_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Margin" Value="100,0"/>
+      <Setter Property="IsCancel" Value="True"/>
+   </Style>
+
    <!--#endregion Button-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -2325,6 +2352,15 @@
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
+   <Style x:Key="AboutBoxV_Border" TargetType="{x:Type Border}">
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_RegentStBlue}"/>
+      <Setter Property="BorderThickness" Value="2"/>
+   </Style>
+
+   <Style x:Key="AboutBox_Border" TargetType="{x:Type Border}">
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
+   </Style>
+
    <!--#endregion Border-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -2570,6 +2606,28 @@
       </Style.Triggers>
    </Style>
 
+   <Style x:Key="CellDataGrid_NewOpenProject" TargetType="{x:Type DataGridCell}">
+      <Setter Property="Height" Value="24"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+      <Setter Property="TextBlock.TextAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="10,0,0,0"/>
+      <Style.Resources>
+         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
+         <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
+      </Style.Resources>
+      <Style.Triggers>
+         <Trigger Property="IsSelected" Value="True">
+            <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
    <!--#endregion DataGrid-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
diff --git a/EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml b/EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml
index 76185725..7c02bc1a 100644
--- a/EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml
+++ b/EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml
@@ -6,43 +6,43 @@
    <Button ToolTip="{Binding ZoomAllToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding ZoomAllCommand}">
-      <Image Source="/Resources/ViewPanel/ZoomAll.png"
+      <Image Source="{StaticResource ZoomAll_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromTopToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding TopViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
+      <Image Source="{StaticResource LookFromTOP_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding FrontViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
+      <Image Source="{StaticResource LookFromFRONT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding RightViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
+      <Image Source="{StaticResource LookFromRIGHT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding BackViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
+      <Image Source="{StaticResource LookFromBACK_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding LeftViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
+      <Image Source="{StaticResource LookFromLEFT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromIso_SWToolTip}"
            Style="{StaticResource Mach_Button}"
            Command="{Binding IsoViewSWCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
+      <Image Source="{StaticResource LookFromISO_SW_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index 16933aa8..806df61b 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.2.4")]
-[assembly: AssemblyFileVersion("3.1.2.4")]
+[assembly: AssemblyVersion("3.1.2.5")]
+[assembly: AssemblyFileVersion("3.1.2.5")]
diff --git a/EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml b/EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml
index 54742670..ca98eea3 100644
--- a/EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml
+++ b/EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml
@@ -1,11 +1,16 @@
 <Window x:Class="AboutBoxV"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-        ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+        Title="AboutBox" 
+        Height="400" 
+        Width="360" 
+        WindowStyle="None"
+        ResizeMode="NoResize"
+        ShowInTaskbar="False" 
+        WindowStartupLocation="CenterOwner">
 
-   <Border BorderThickness="2" BorderBrush="LightBlue">
-      <Grid >
+   <Border Style="{StaticResource AboutBoxV_Border}">
+      <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.5*"/>
             <ColumnDefinition Width="5*"/>
@@ -24,29 +29,39 @@
             <RowDefinition Height="0.35*"/>
          </Grid.RowDefinitions>
 
-         <Grid Grid.Column="1" Grid.Row="1">
+         <Grid Grid.Row="1"
+               Grid.Column="1">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="3*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-            <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/AboutBox/EgalwareLogo.png" Stretch="Uniform"/>
+            <Border Grid.Column="1"
+                    Style="{StaticResource AboutBox_Border}">
+               <Image Source="{StaticResource AboutBox_Image}" 
+                      Style="{StaticResource BTLDataWnd_Image}"/>
             </Border>
          </Grid>
-         <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="18" />
-         <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="12" />
-         <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
-         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-                 Margin="100,0"/>
-
+         <TextBlock Grid.Row="3"
+                    Grid.Column="1"
+                    Name="DescriptionLbl"   
+                    Style="{StaticResource AboutBox_TextBlock}"/>
+         <TextBlock Grid.Row="4"
+                    Grid.Column="1"
+                    Name="VersionLbl" 
+                    Style="{StaticResource AboutBox_TextBlock}"/>
+         <TextBlock Grid.Row="5"
+                    Grid.Column="1"
+                    Name="CopyrightLbl" 
+                    Style="{StaticResource Copyright_TextBlock}"/>
+         <TextBox Grid.Row="6"
+                  Grid.Column="1" 
+                  Name="InfoLbl" 
+                  Style="{StaticResource AboutBox_TextBox}"/>
+         <Button Grid.Row="8"
+                 Grid.Column="1"
+                 Name="ExitBtn"                   
+                 Style="{StaticResource AboutBox_Button}"/>
       </Grid>
-
    </Border>
-
 </Window>
diff --git a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
index fd35489f..07e89af5 100644
--- a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
@@ -480,6 +480,7 @@ Public Class BTLPartManagerVM
    Public Sub ResetCalc()
       If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
       Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
+      Map.refCALCPanelVM.SetCalculating(False)
       Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
       If IsNothing(SelPart) Then Return
       If SelPart.nGlobalState <> CalcStates.NOTCALCULATED Then
diff --git a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
index 1f10420e..b7e3d6c0 100644
--- a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+++ b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
@@ -1186,6 +1186,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewPage\modify_adjustment.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\clock.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerR32.exe
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
index c4793bb7..509df953 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
@@ -1,5 +1,4 @@
 Imports System.Reflection
-Imports System.Windows.Controls.Primitives
 
 Public Class BTLPartListV
 
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml.vb
index 31392232..ecf98a42 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml.vb
@@ -1,6 +1,5 @@
 Imports EgtBEAMWALL.Core
 Imports EgtUILib.EgtInterface
-Imports System.Windows.Controls.Primitives
 
 Public Class RawPartListV
 
diff --git a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
index 71d98521..b1edfc66 100644
--- a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
@@ -327,6 +327,7 @@ Public Class LeftPanelVM
    Public Sub ResetCalc()
       If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
       Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
+      Map.refCALCPanelVM.SetCalculating(False)
       For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
          If Part.nGlobalState <> CalcStates.NOTCALCULATED Then
             ' resetto stato dei calcoli
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index c7da1afb..450762d6 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("3.1.2.4")>
-<Assembly: AssemblyFileVersion("3.1.2.4")>
+<Assembly: AssemblyVersion("3.1.2.5")>
+<Assembly: AssemblyFileVersion("3.1.2.5")>
diff --git a/EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
index 306a2f4a..56a85b6c 100644
--- a/EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
@@ -208,6 +208,10 @@ Public Class NewOpenProjectFileDialogVM
             Next
          End If
       End If
+      ' Abilito pulsante assemblato
+      Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
+      ' Salvo modifiche a colonne
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
       CloseWindow(False)
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
index f8ce96ba..83313b74 100644
--- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
@@ -509,6 +509,8 @@ Public Class ProdManagerVM
       If BTLDlg.ShowDialog() Then
          sImportFilePath = BTLDlg.FileName
       Else
+         ' Abilito pulsante assemblato
+         Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
          Return False
       End If
       Dim sProjDir As String = ""
@@ -1554,7 +1556,11 @@ Public Class ProdManagerVM
          .Mode = 1}
 
       If IsNothing(sExportFileName) Then
-         If ExportDlg.ShowDialog() <> True Then Return Nothing
+         If ExportDlg.ShowDialog() <> True Then
+            ' Abilito pulsante assemblato
+            Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
+            Return Nothing
+         End If
       End If
 
       LoadingWndHelper.OpenLoadingWnd(ActiveIds.EXPORTPROJECT, 2, EgtMsg(63010), EgtMsg(63016), 30)           ' Project exporting     ' Adding export info
@@ -1659,7 +1665,11 @@ Public Class ProdManagerVM
          .ValidateNames = True,
          .Mode = 1}
 
-      If ImportDlg.ShowDialog() <> True Then Return
+      If ImportDlg.ShowDialog() <> True Then
+         ' Abilito pulsante assemblato
+         Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
+         Return
+      End If
 
       ' creo cartella temporanea di estrazione in Temp
       Dim sProjectimportDir As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\ProjectImport"
@@ -1945,6 +1955,8 @@ Public Class ProdManagerVM
       If BTLDlg.ShowDialog() Then
          sFile = BTLDlg.FileName
       Else
+         ' Abilito pulsante assemblato
+         Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
          Return
       End If
       Dim nNewProjId As Integer = 0
diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
index 4b68ecea..ae2d2f93 100644
--- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
@@ -241,6 +241,10 @@ Public Class RawPartManagerVM
             If CurrMachGroup.nProduction_State >= ItemState.Assigned Then Continue For
             CurrMachGroup.DeleteMachGroup(True)
          Next
+         ' seleziono primo pezzo
+         If Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count > 0 Then
+            Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList(0))
+         End If
       Else
          Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
          If IsNothing(SelMachGroup) Then Return
diff --git a/EgtBEAMWALL.Optimizer/Resources/NewPage/clock.png b/EgtBEAMWALL.Optimizer/Resources/NewPage/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..df07c5555443d4619e5bb4abf8e14809257478c3
GIT binary patch
literal 1043
zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBpk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zo}pnEhuArwq8+Ibo@t(*S_~XO4l9EcBP#<VkmUu$(oi<YIU0=2U~wiO+mMloK@dns
z0dZzK3s^h{$OZwPaz=(1K<C0}bXyr1fRYo~8CZa74UCKp7#Bdy1=-2E0AkiOAR7dj
zfF?76RR&pF09jC7h6V;8*`^JDHeLFaya%Xmzo(01NQC>@8T<W%14WM8?=iXP5z*7D
zXe2UAL_9LZ!Kt9=($R~o{~6hLUv*KJ_3W^o${M7mmfms9#hIyDhohM<G-<2e5qX}d
z>F<5>`g8ABe-C}Fo*8$~`hNBK%I(|tKA)p_X)^n>hROsk31+uO!3Po+O!t`AH>Mxp
zelU6Nl6W8H&;^WJf@-7=2>1FQnNWM7vG9Rn0e8ojH|!hO-!T0?;QoNcf^`nNTI1;h
zst>jt`@@uVfce2%^ZG2YhGpNcwI8rukkT5f!6^FR!0g4GceWi`qBE=W)PW76s!w<d
zuJ3uUNc8B&H@x>)y21obv^*;=){k~H|05d3SQK`lvDm@!x<%2gAD!Vj2U(^}naYzK
z_38G+!uQtqeReqYmG(w&Z<BknXZ<G4|MeT5ajLB`Y@2oL+8V{SMcW0kuUYW^nX)mb
zmy?5+>u2`K`rGnrZdbJb`ngQiJK*rA+d(oeR;Tkk0$BHL?f?0@W@@~MyWORSv#wv<
zn8@}=+pNUrY2!|g9a@Ly^))*dELg*oU>Ed@al_+Iwu9@|1q&89n&;a%YUut}VEw(T
z&(-Tfz%N6OIsY$uNGjjTSh!=)8>xb$Hzqy$)9>Py7}z9sD)~V--;?Eyjh6q9Pb|us
zV%YXcXvew(=h)bu{gHQdh&30tb>vuY1ms<3oc3k)&AjU@#*bw;ofT=!%|0V^!1r#A
z|HSI!iOjRNGC6yydwGAH@cq=XuF&)ZwjXOM?N9idYh5y}i8W20cA+<twdA;z%^#hE
zvS%)|*Q^rX8`cr`Q{=#^?d-oo_a1qeK5zB4j#Yx{H@s#pZl5q&e!Bpxc0o&+v7*YV
zG#SOxc&Q?_1vhq`e;9ruy7o@;(F<HRFTRg+vdq>$cyaA(qs-RWf>`nI_D|wAJeTvj
zG+&FM->3eSi{)QGhx%7`AI{CT7ycirety!D=aJ#1pKO*q|0zA=*B@?;7faMZ$=cJ^
K&t;ucLK6U|{*GS&

literal 0
HcmV?d00001

diff --git a/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml b/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
index 97a9cf59..80567f49 100644
--- a/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml
@@ -3,26 +3,37 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
             Style="{StaticResource PartManager_StackPanel}">
-   
-   <Border ToolTip="{Binding TotalTime_ToolTip}"
-           Style="{StaticResource TotalTime_Border}">
-      <TextBlock Text="{Binding Tag.BTLStructureVM.sBTLTotTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                 Style="{StaticResource StatisticTimePanel_TextBlock}"/>
-   </Border>
-   <Border ToolTip="{Binding TotalTime_ToolTip}"
-           Style="{StaticResource TotalTime_Border}">
-      <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotEstimatedTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                 Style="{StaticResource StatisticTimePanel_TextBlock}"/>
-   </Border>
-   <Border ToolTip="{Binding DoneTime_ToolTip}"
-           Style="{StaticResource DoneTime_Border}">
-      <TextBlock Text="{Binding Tag.MachGroupPanelVM.sDoneTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                 Style="{StaticResource StatisticTimePanel_TextBlock}"/>
-   </Border>
-   <Border ToolTip="{Binding RemainingTime_ToolTip}"
-           Style="{StaticResource RemainingTime_Border}">
-      <TextBlock Text="{Binding Tag.MachGroupPanelVM.sRemainingTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
-                 Style="{StaticResource StatisticTimePanel_TextBlock}"/>
-   </Border>
 
+   <Border Style="{StaticResource StatisticTimePanel_Border}">
+      <StackPanel Style="{StaticResource StatisticsTimePanel_StackPanel}">
+         <Image Source="{StaticResource Clock_Image}"
+                Style="{StaticResource BTLDataWnd_Image}"/>
+         <Border ToolTip="{Binding TotalTime_ToolTip}"
+                 Style="{StaticResource TotalTime_Border}">
+            <TextBlock Text="{Binding Tag.BTLStructureVM.sBTLTotTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
+                       Style="{StaticResource StatisticTimePanel_TextBlock}"/>
+         </Border>
+      </StackPanel>
+   </Border>
+   <Border Style="{StaticResource StatisticsTimePanel_Border}">
+      <StackPanel Style="{StaticResource StatisticsTimePanel_StackPanel}">
+         <Image Source="{StaticResource Clock_Image}"
+                Style="{StaticResource BTLDataWnd_Image}"/>
+         <Border ToolTip="{Binding TotalTime_ToolTip}"
+                 Style="{StaticResource TotEstimatedTime_Border}">
+            <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotEstimatedTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
+                       Style="{StaticResource StatisticTimePanel_TextBlock}"/>
+         </Border>
+         <Border ToolTip="{Binding DoneTime_ToolTip}"
+                 Style="{StaticResource DoneTime_Border}">
+            <TextBlock Text="{Binding Tag.MachGroupPanelVM.sDoneTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
+                       Style="{StaticResource StatisticTimePanel_TextBlock}"/>
+         </Border>
+         <Border ToolTip="{Binding RemainingTime_ToolTip}"
+                 Style="{StaticResource RemainingTime_Border}">
+            <TextBlock Text="{Binding Tag.MachGroupPanelVM.sRemainingTime, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsTimePanelV}}}"
+                       Style="{StaticResource StatisticTimePanel_TextBlock}"/>
+         </Border>
+      </StackPanel>
+   </Border>
 </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index e41a77cf..13afc17e 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -141,6 +141,9 @@
    <BitmapImage x:Key="LookFromBACK_Image" UriSource="/Resources/ViewPanel/LookFromBACK.png"/>
    <BitmapImage x:Key="LookFromLEFT_Image" UriSource="/Resources/ViewPanel/LookFromLEFT.png"/>
    <BitmapImage x:Key="LookFromISO_SW_Image" UriSource="/Resources/ViewPanel/LookFromISO_SW.png"/>
+   <BitmapImage x:Key="Restore_Image" UriSource="/Resources/EgtDialog/Restore.png"/>
+   <BitmapImage x:Key="AboutBox_Image" UriSource="/Resources/AboutBox/EgalwareLogo.png"/>
+   <BitmapImage x:Key="Clock_Image" UriSource="/Resources/NewPage/clock.png"/>
 
    <!--#endregion Image-->
 
@@ -284,13 +287,6 @@
       <Setter Property="Margin" Value="15,5"/>
    </Style>
 
-   <Style x:Key="PRCList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextAlignment" Value="Justify"/>
-      <Setter Property="Margin" Value="10,5,10,0"/>
-   </Style>
-
    <Style x:Key="Msg_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
       <Setter Property="TextAlignment" Value="Center"/>
       <Setter Property="Margin" Value="40,0,40,0"/>
@@ -528,6 +524,14 @@
       <Setter Property="Margin" Value="2,3,0,2"/>
    </Style>
 
+   <Style x:Key="PRCList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="TextAlignment" Value="Justify"/>
+      <Setter Property="TextWrapping" Value="Wrap" />
+      <Setter Property="Margin" Value="10,5,10,0"/>
+   </Style>
+
    <!--#endregion TextBlock-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1994,6 +1998,10 @@
       <Setter Property="Margin" Value="10,2,2,2"/>
    </Style>
 
+   <Style x:Key="StatisticsTimePanel_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
    <!--#endregion PartManager-->
 
    <!--#region OptStatistics-->
@@ -2424,23 +2432,31 @@
 
    <!--#endregion Optimizer-->
 
+   <!--#region TotalTime_Border-->
+   
    <Style x:Key="TotalTime_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="Padding" Value="20,2,20,2"/>
-      <Setter Property="Margin" Value="0,2,20,2"/>
+      <Setter Property="Margin" Value="5,0,0,0"/>
       <Setter Property="CornerRadius" Value="2"/>
    </Style>
 
+   <Style x:Key="TotEstimatedTime_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource TotalTime_Border}">
+      <Setter Property="Margin" Value="5,0,10,0"/>
+   </Style>
+
+   <!--#endregion TotalTime_Border-->
+
    <Style x:Key="DoneTime_Border" TargetType="{x:Type Border}">
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_FruitSalad}"/>
       <Setter Property="Background" Value="{StaticResource BeamWall_FruitSalad}"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="Padding" Value="20,2,20,2"/>
-      <Setter Property="Margin" Value="2,2,20,2"/>
+      <Setter Property="Margin" Value="10,0,20,0"/>
       <Setter Property="CornerRadius" Value="2"/>
    </Style>
 
@@ -2450,7 +2466,7 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="BorderThickness" Value="2"/>
       <Setter Property="Padding" Value="20,2,20,2"/>
-      <Setter Property="Margin" Value="2"/>
+      <Setter Property="Margin" Value="2,0,0,0"/>
       <Setter Property="CornerRadius" Value="2"/>
    </Style>
 
@@ -2474,7 +2490,7 @@
    </Style>
 
    <Style x:Key="Custom_Border" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
+      <Setter Property="Background" Value="{StaticResource BeamWall_Kashmir}"/>
       <Setter Property="BorderThickness" Value="0,2,0,2"/>
    </Style>
 
@@ -2515,6 +2531,8 @@
       </Style.Triggers>
    </Style>
 
+   <!--#region TopPanel_Border-->
+   
    <Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
       <Setter Property="Background" Value="{StaticResource BeamWall_Alto}"/>
       <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
@@ -2522,6 +2540,16 @@
       <Setter Property="BorderThickness" Value="2"/>
    </Style>
 
+   <Style x:Key="StatisticTimePanel_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource TopPanel_Border}">
+      <Setter Property="Margin" Value="0,0,30,0"/>
+   </Style>
+
+   <Style x:Key="StatisticsTimePanel_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource TopPanel_Border}">
+      <Setter Property="Margin" Value="20,0,0,0"/>
+   </Style>
+
+   <!--#endregion TopPanel_Border-->
+   
    <!--#endregion Border-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
diff --git a/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml b/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml
index 54742670..a535e34d 100644
--- a/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml
+++ b/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml
@@ -1,11 +1,16 @@
 <Window x:Class="AboutBoxV"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-        ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+        Title="AboutBox" 
+        Height="400" 
+        Width="360" 
+        WindowStyle="None" 
+        ResizeMode="NoResize"
+        ShowInTaskbar="False" 
+        WindowStartupLocation="CenterOwner">
 
-   <Border BorderThickness="2" BorderBrush="LightBlue">
-      <Grid >
+   <Border Style="{StaticResource AboutBoxV_Border}">
+      <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.5*"/>
             <ColumnDefinition Width="5*"/>
@@ -24,29 +29,39 @@
             <RowDefinition Height="0.35*"/>
          </Grid.RowDefinitions>
 
-         <Grid Grid.Column="1" Grid.Row="1">
+         <Grid Grid.Row="1"
+               Grid.Column="1">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="3*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-            <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/AboutBox/EgalwareLogo.png" Stretch="Uniform"/>
+            <Border Grid.Column="1" 
+                    Style="{StaticResource AboutBox_Border}">
+               <Image Source="{StaticResource AboutBox_Image}" 
+                      Style="{StaticResource BTLDataWnd_Image}"/>
             </Border>
          </Grid>
-         <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="18" />
-         <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="12" />
-         <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
-         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-                 Margin="100,0"/>
-
+         <TextBlock Grid.Row="3"
+                    Grid.Column="1" 
+                    Name="DescriptionLbl"                      
+                    Style="{StaticResource AboutBox_TextBlock}"/>
+         <TextBlock Grid.Row="4" 
+                    Grid.Column="1" 
+                    Name="VersionLbl"                    
+                    Style="{StaticResource AboutBox_TextBlock}"/>
+         <TextBlock Grid.Row="5"
+                    Grid.Column="1" 
+                    Name="CopyrightLbl" 
+                    Style="{StaticResource Copyright_TextBlock}"/>
+         <TextBox Grid.Row="6"
+                  Grid.Column="1" 
+                  Name="InfoLbl" 
+                  Style="{StaticResource AboutBox_TextBox}"/>
+         <Button Grid.Row="8" 
+                 Grid.Column="1" 
+                 Name="ExitBtn"
+                 Style="{StaticResource AboutBox_Button}"/>
       </Grid>
-
    </Border>
-
 </Window>
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index b8ea8094..68323a41 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.2.4")>
-<Assembly: AssemblyFileVersion("3.1.2.4")>
+<Assembly: AssemblyVersion("3.1.2.5")>
+<Assembly: AssemblyFileVersion("3.1.2.5")>
diff --git a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
index 9afab781..ea4595e2 100644
--- a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
@@ -74,6 +74,7 @@
    <BitmapImage x:Key="LookFromBACK_Image" UriSource="/Resources/ViewPanel/LookFromBACK.png"/>
    <BitmapImage x:Key="LookFromLEFT_Image" UriSource="/Resources/ViewPanel/LookFromLEFT.png"/>
    <BitmapImage x:Key="LookFromISO_SW_Image" UriSource="/Resources/ViewPanel/LookFromISO_SW.png"/>
+   <BitmapImage x:Key="AboutBox_Image" UriSource="/Resources/AboutBox/EgalwareLogo.png"/>
 
    <!--#endregion Image-->