Merge branch 'NewInterface' into NewWidow

- aggiunti nome e path del progetto
- gestito bordo della finestra che sparisce quando massimizzata
- creata finestra UpdateMachine al posto di MachineBox

Icarus/ChooseMachineWnd/ChooseMachineWndV.xaml

@@ -1,71 +1,50 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="ChooseMachineWndV"
+<EgtWPFLib5:EgtMainWindow x:Class="ChooseMachineWndV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                          xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:Icarus="clr-namespace:Icarus"
+                          xmlns:Icarus="clr-namespace:Icarus"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                          Title="New Project"
-                            WindowStyle="None" ResizeMode="NoResize"
+                          SizeToContent="WidthAndHeight"
-                            SizeToContent="WidthAndHeight"
+                          WindowStartupLocation="CenterOwner"
-                            MinWidth="500"
+                          Style="{StaticResource Dialog_Window}">
-                            WindowStartupLocation="CenterOwner"
+   <Grid Margin="2.5,2.5,2.5,0">
-                            IsClosable="False"
+      <Grid.RowDefinitions>
-                            IsMinimizable="False"
+         <RowDefinition Height="Auto"/>
-                            IsResizable="False"
+         <RowDefinition Height="Auto"/>
-                            Title="ProjectType">
+         <RowDefinition Height="Auto"/>
-    <StackPanel Margin="5,5,5,0">
+      </Grid.RowDefinitions>
-        <Border Grid.Row="1"
-              BorderThickness="1"
-              BorderBrush="DarkGray"
-              Background="White"
-              Margin="5">
-            <Grid Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
 
-                <Grid HorizontalAlignment="Center"
+      <TextBlock Text="{Binding ChooseMachine_Msg}"
-                  Grid.Row="0"
+                 Margin="20,20,20,2.5"
-                  Margin="15">
+                 Style="{StaticResource DialogWindow_TextBlock}"/>
-                    <Grid.RowDefinitions>
+      <ComboBox Grid.Row="1" 
-                        <RowDefinition Height="Auto"/>
+                ItemsSource="{Binding MachineList}"
-                        <RowDefinition Height="1*"/>
+                SelectedItem="{Binding SelMachine}"
-                        <RowDefinition Height="Auto"/>
+                DisplayMemberPath="Name" 
-                    </Grid.RowDefinitions>
+                SelectedValuePath="Name" 
-                    <Grid.ColumnDefinitions>
+                Width="160"
-                        <ColumnDefinition Width="Auto"/>
+                HorizontalAlignment="Center"
-                    </Grid.ColumnDefinitions>
+                HorizontalContentAlignment="Center"
-                    <TextBlock Text="{Binding ChooseMachine_Msg}"
+                Margin="2.5,10,2.5,2.5"
-                               Style="{StaticResource OptionTextBlock}"
+                Style="{StaticResource RightPanel_ComboBox}"/>
-                               Grid.Row="0" Grid.ColumnSpan="2"/>
-                    <Rectangle Height="22" Grid.Row="1"/>
-                    <ComboBox ItemsSource="{Binding MachineList}" DisplayMemberPath="Name" 
-                              SelectedItem="{Binding SelMachine}" SelectedValuePath="Name" 
-                              Grid.Row="2"
-                              Style="{StaticResource BtlData_ComboBox}"/>
-                </Grid>
 
-                <Grid Grid.Row="2" Margin="5">
+      <UniformGrid Grid.Row="2"
-                    <Grid.ColumnDefinitions>
+                   Rows="1"
-                        <ColumnDefinition Width="1*"/>
+                   Margin="0,20,0,0">
-                        <ColumnDefinition Width="Auto"/>
+         <Button Command="{Binding Ok_Command}"
-                        <ColumnDefinition Width="1*"/>
+                 IsDefault="True"
-                        <ColumnDefinition Width="Auto"/>
+                 Margin="0,0,2.5,0"
-                        <ColumnDefinition Width="1*"/>
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
-                    </Grid.ColumnDefinitions>
+            <Image Source="\Resources\Common\Ok.png"
-                    <Button Content="Ok"
+                   Style="{StaticResource Button_Image}"/>
-                            Command="{Binding Ok_Command}"
+         </Button>
-                            IsDefault="True"
+         <Button IsCancel="True"
-                            Grid.Column="1"
+                 Margin="0,0,2.5,0"
-                            Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
-                    <Button Content="Cancel"
+            <Image Source="\Resources\Common\Cancel.png"
-                            IsCancel="True"
+                   Style="{StaticResource Button_Image}"/>
-                            Grid.Column="3"
+         </Button>
-                            Style="{StaticResource EgtWPFLib5_InputButton}"/>
+      </UniformGrid>
-                </Grid>
 
-            </Grid>
+   </Grid>
-        </Border>
+</EgtWPFLib5:EgtMainWindow>
-    </StackPanel>
-</EgtWPFLib5:EgtCustomWindow>

Icarus/ChooseMachineWnd/ChooseMachineWndVM.vb

@@ -40,7 +40,7 @@ Public Class ChooseMachineWndVM
 
    Public ReadOnly Property ChooseMachine_Msg As String
       Get
-         Return "Macchina: "
+         Return "Select the new project machine from the list"
       End Get
    End Property
 

Icarus/Icarus.vbproj

@@ -80,6 +80,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
     </Reference>
+    <Reference Include="EgtWPFLib48">
+      <HintPath>..\..\..\EgtProg\DllD64\EgtWPFLib48.dll</HintPath>
+    </Reference>
     <Reference Include="EgtWPFLib5, Version=2.4.5.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
@@ -201,8 +204,8 @@
       <DependentUpon>MaterialDbV.xaml</DependentUpon>
     </Compile>
     <Compile Include="MaterialDb\MaterialDbVM.vb" />
-    <Compile Include="OptionsWindow\MachineBox.xaml.vb">
+    <Compile Include="UpdateMachine\UpdateMachineV.xaml.vb">
-      <DependentUpon>MachineBox.xaml</DependentUpon>
+      <DependentUpon>UpdateMachineV.xaml</DependentUpon>
     </Compile>
     <Compile Include="OptionsWindow\OptionModule.vb" />
     <Compile Include="OptionsWindow\OptionWindowV.xaml.vb">
@@ -304,6 +307,7 @@
     <Compile Include="TSFEditor\TFSEditorV.xaml.vb">
       <DependentUpon>TFSEditorV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UpdateMachine\UpdateMachineVM.vb" />
     <Compile Include="Utility\CurrentMachine.vb" />
     <Compile Include="Utility\Dictionary.xaml.vb">
       <DependentUpon>Dictionary.xaml</DependentUpon>
@@ -417,7 +421,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="OptionsWindow\MachineBox.xaml">
+    <Page Include="UpdateMachine\UpdateMachineV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -787,6 +791,14 @@
   <ItemGroup>
     <Resource Include="Resources\ViewPanel\LookFromISO_SE.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Common\Close.png" />
+    <Resource Include="Resources\Common\Maximize.png" />
+    <Resource Include="Resources\Common\Minimize.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Common\Restore.png" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\SliceManager\StopCalculation.png" />
   </ItemGroup>

Icarus/ImportExportMachiningPanel/ImportExportMachiningPanelV.xaml

@@ -1,20 +1,21 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="ImportExportMachiningPanelV"
+<EgtWPFLib5:EgtMainWindow x:Class="ImportExportMachiningPanelV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                          xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding OkMsg}"
+                          Title="{Binding OkMsg}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                          SizeToContent="WidthAndHeight"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                          WindowStartupLocation="CenterOwner"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                          Style="{StaticResource Dialog_Window}">
-                            Width="400" Height="500">
 
-   <Grid>
+   <Grid Margin="2.5,2.5,2.5,0">
       <Grid.RowDefinitions>
-         <RowDefinition Height="7*"/>
+         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <ListBox ItemsSource="{Binding MachiningList}">
+      <ListBox ItemsSource="{Binding MachiningList}"
+               Height="400"
+               Width="250">
          <ListBox.ItemTemplate>
             <DataTemplate DataType="{x:Type EgtWPFLib5:ImpExpMachiningItem}">
                <Grid Height="20">
@@ -32,7 +33,7 @@
                             Margin="0,0,5,0"
                             VerticalContentAlignment="Center"
                             Visibility="{Binding Path=DataContext.Active_Visibility,
-                                                 RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                                                 RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtMainWindow}}}"/>
                   <TextBlock Grid.Column="1" 
                              Text="{Binding sName}" 
                              FontSize="15" 
@@ -49,14 +50,23 @@
 
          </ListBox.ItemTemplate>
       </ListBox>
-
+      <UniformGrid Grid.Row="2"
-      <Button Command="{Binding OkCommand}" 
+                   Rows="1"
-              Content="{Binding OkMsg}" 
+                   Margin="0,20,0,0">
-              IsEnabled="{Binding IsEnabledOkBtn, Mode=OneWay}"
+         <Button Command="{Binding OkCommand}"
-              Grid.Row="1"
+                 IsEnabled="{Binding IsEnabledOkBtn, Mode=OneWay}"
-              Height="30" Width="100" 
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
-              Margin="10" />
+            <Image Source="\Resources\Common\Ok.png"
+                     Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button IsCancel="True"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
+            <Image Source="\Resources\Common\Cancel.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+      </UniformGrid>
 
    </Grid>
 
-</EgtWPFLib5:EgtCustomWindow>
+</EgtWPFLib5:EgtMainWindow>

Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml

@@ -1,50 +1,42 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="MachSaveInDbWndV"
+<EgtWPFLib5:EgtMainWindow x:Class="MachSaveInDbWndV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                          xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                          Title="Save in Database"
-                            Title="Machining Param Name" 
+                          SizeToContent="WidthAndHeight"
-                            Height="150" Width="300"
+                          WindowStartupLocation="CenterOwner"
-                            WindowStartupLocation="CenterOwner"
+                          Style="{StaticResource Dialog_Window}">
-                            Icon="/Resources/Icarus.ico"
+   <Grid Margin="2.5,2.5,2.5,0">
-                            WindowStyle="None" ResizeMode="NoResize"
-                            ShowInTaskbar="False"
-                            IsMinimizable="False">
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
-         <RowDefinition Height="10"/>
          <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <TextBlock Grid.Column="1"
+      <TextBlock Text="Write the new Database machining name"
-                 Grid.Row="1"
+                 Margin="20,20,20,2.5"
-                 Text="Name"
+                 Style="{StaticResource DialogWindow_TextBlock}"/>
-                 Margin="0,0,10,0"
+      <EgtWPFLib5:EgtTextBox2 Grid.Row="1"
-                 Style="{Binding OptionTextBlock}"/>
+                              Text="{Binding sName}"
-      <EgtWPFLib5:EgtTextBox Grid.Column="2"
+                              IsExplicitFocused="True"
-                             Grid.Row="1"
+                              Width="160"
-                             Width="180"
+                              Margin="20,10,20,2.5"
-                             Text="{Binding sName}"
+                              Style="{StaticResource LeftPanel_TextBox2}"/>
-                             Style="{StaticResource LeftPanel_TextBox}"/>
+      <UniformGrid Grid.Row="3" 
-      <UniformGrid Grid.Column="1"
+                   Rows="1"
-                   Grid.ColumnSpan="2"
+                   Margin="0,20,0,0">
-                   Grid.Row="3" 
+         <Button Command="{Binding Ok_Command}"
-                   Rows="1">
-         <Button Content="Ok"
-                 Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource ToolBar_TextButton}"/>
+                 Margin="0,0,2.5,0"
-         <Button Content="Cancel"
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
-                 Command="{Binding Cancel_Command}"
+            <Image Source="\Resources\Common\Ok.png"
-                 Style="{StaticResource ToolBar_TextButton}"/>
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Command="{Binding Cancel_Command}"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
+            <Image Source="\Resources\Common\Cancel.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
       </UniformGrid>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtWPFLib5:EgtMainWindow>

Icarus/MainWindow/MainWindowV.xaml

@@ -1,20 +1,14 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
+<EgtWPFLib5:EgtMainWindow x:Class="MainWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                          xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:PrintApp="clr-namespace:Icarus"
+                          xmlns:PrintApp="clr-namespace:Icarus"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                          MinHeight="600" MinWidth="800"
-                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
+                          AllowDrop="True"
-                            MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
+                          Drop="MainWindowV_Drop"
-                            AllowDrop="True" Drop="MainWindowV_Drop"
+                          ShowInTaskbar="True"
-                            ShowInTaskbar="True"
+                          Topmost="False"
-                            Topmost="False"
+                          Style="{StaticResource NoStyle_Window}">
-                            CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-   <!--<EgtWPFLib5:EgtCustomWindow.TitlePanel>
-
-      <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
-   
-   </EgtWPFLib5:EgtCustomWindow.TitlePanel>-->
 
    <Grid>
       <Grid.RowDefinitions>
@@ -23,14 +17,5 @@
       </Grid.RowDefinitions>
       <PrintApp:SceneHostV Grid.Row="1"/>
    </Grid>
-   <!--Pannello principale --><!--
-   <DockPanel>
 
-      --><!--StatusBar --><!--
+</EgtWPFLib5:EgtMainWindow>
-      <PrintApp:StatusBarV DataContext="{StaticResource StatusBarVM}"
-                             DockPanel.Dock="Bottom"/>
-      <PrintApp:ProjectV DataContext="{StaticResource ProjectVM}"/>
-
-   </DockPanel>-->
-
-</EgtWPFLib5:EgtCustomWindow>

Icarus/MainWindow/MainWindowV.xaml.vb

@@ -5,7 +5,6 @@ Imports System.Windows.Interop
 Class MainWindowV
 
    Private m_MainWindowVM As MainWindowVM
-   Private m_SceneHostWnd As SecondaryWindowV
 
 #Region "CONSTRUCTOR"
 
@@ -20,6 +19,8 @@ Class MainWindowV
       AddHandler Me.Closing, AddressOf MainWindowV_Closing
       AddHandler Me.KeyDown, AddressOf MainWindowV_KeyDown
       AddHandler Me.StateChanged, AddressOf MainWindowV_StateChanged
+      'AddHandler Me.LocationChanged, AddressOf MainWindowV_LocationChanged
+      'AddHandler Me.SizeChanged, AddressOf MainWindowV_SizeChanged
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -60,15 +61,27 @@ Class MainWindowV
          Me.Activate()
          ' Recupero l'array di stringhe con i nomi del file
          Dim sFiles() As String = DirectCast(e.Data.GetData(DataFormats.FileDrop), String())
+      End If
+   End Sub
 
+   Private Sub MainWindowV_LocationChanged(sender As Object, e As EventArgs)
+      If Not IsNothing(Map.refSecondaryWindowV) Then
+         Map.refSecondaryWindowV.Top = Me.Top
+         Map.refSecondaryWindowV.Left = Me.Left
+      End If
+   End Sub
+
+   Private Sub MainWindowV_SizeChanged(sender As Object, e As SizeChangedEventArgs)
+      If Not IsNothing(Map.refSecondaryWindowV) Then
+         If e.WidthChanged Then Map.refSecondaryWindowV.Width = e.NewSize.Width
+         If e.HeightChanged Then Map.refSecondaryWindowV.Height = e.NewSize.Height
+         Map.refSecondaryWindowV.InvalidateVisual()
       End If
    End Sub
 
    Private Sub MainWindowV_StateChanged(sender As Object, e As EventArgs)
       If Not IsNothing(Map.refSecondaryWindowV) AndAlso Not Map.refSecondaryWindowV.WindowChangingState Then
          Map.refSecondaryWindowV.WindowState = Me.WindowState
-         'Application.Current.MainWindow.Topmost = True
-         'Application.Current.MainWindow.Topmost = False
       End If
    End Sub
 

Icarus/MainWindow/MainWindowVM.vb

@@ -7,9 +7,6 @@ Imports System.Windows.Threading
 Public Class MainWindowVM
    Inherits VMBase
 
-   Private m_SupervisorCommThread As Thread
-   Private m_Supervisor_Timer As New DispatcherTimer
-
    ' Riferimento al Model della MainWindow
    Private m_MainWindowM As MainWindowM
    Friend ReadOnly Property MainWindowM As MainWindowM
@@ -27,25 +24,34 @@ Public Class MainWindowVM
    End Property
 
    ' Titolo
-   Private m_sTitle As String
+   Public ReadOnly Property sTitle As String
-   Public Property sTitle As String
       Get
-         Return m_sTitle
+         Return "Icarus"
       End Get
-      Set(value As String)
-         m_sTitle = value
-         NotifyPropertyChanged(NameOf(sTitle))
-      End Set
    End Property
 
-   ' proprietà che seleziona la giusta pagina del TabControl
+   Public ReadOnly Property sProjectName As String
-   Public Property nSelTabPage As Integer
       Get
-         ' Return If(IsNothing(Map.refMainMenuVM.SelPage) OrElse Map.refMainMenuVM.SelPage = -1 OrElse Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING, 0, 1)
+         Dim sFilePath As String = ""
-         Return -1
+         EgtGetCurrFilePath(sFilePath)
+         If String.IsNullOrEmpty(sFilePath) Then
+            sFilePath = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString()
+            Return sFilePath
+         Else
+            Return Path.GetFileNameWithoutExtension(sFilePath) & If(EgtGetModified(), "*", "")
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property sProjectPath As String
+      Get
+         Dim sFilePath As String = ""
+         EgtGetCurrFilePath(sFilePath)
+         If String.IsNullOrEmpty(sFilePath) Then
+            sFilePath = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString()
+         End If
+         Return sFilePath
       End Get
-      Set(value As Integer)
-      End Set
    End Property
 
    Private m_MachinePanelVM As MachinePanelVM
@@ -55,9 +61,6 @@ Public Class MainWindowVM
       End Get
    End Property
 
-   'Friend m_SupervisorStop As Boolean = False
-   'Private BlockedWnd As BlockedWndV
-
    ' definizione comandi
    Private m_cmdAboutBox As ICommand
    Private m_cmdCloseApplication As ICommand
@@ -71,117 +74,16 @@ Public Class MainWindowVM
       m_MainWindowM = New MainWindowM
       ' inizializzo machine panel
       m_MachinePanelVM = New MachinePanelVM
-      ' inizializzo contatore per blocco da supervisore
-      m_Supervisor_Timer.Interval = TimeSpan.FromMilliseconds(500)
-      ' AddHandler m_Supervisor_Timer.Tick, AddressOf SupervisorTimer_Tick
-      m_Supervisor_Timer.Start()
    End Sub
 
 #End Region    ' CONSTRUCTOR
 
    '#Region "METHODS"
 
-   Friend Sub SetTitle(sTitle As String)
-      m_sTitle = sTitle
-      NotifyPropertyChanged(NameOf(sTitle))
-      ' aggiorno titolo nella secondaryPage che e' quello che si vede nella barra in alto
-      Map.refSecondaryWindowVM.SetTitle(sTitle)
-   End Sub
-
-   'Public Sub UpdateTitle()
-   '   m_Title = ""
-   '   Select Case Map.refMainMenuVM.SelPage
-   '      Case Pages.VIEW
-   '         If Not IsNothing(Map.refProjManagerVM.CurrProj) Then
-   '            If Map.refProjManagerVM.CurrProj.bIsNew Then m_Title = "New - "
-   '            m_Title &= Map.refProjManagerVM.CurrProj.nProjId.ToString("0000") & " - " & Map.refProjManagerVM.CurrProj.sBTLFileName
-   '         End If
-   '      Case Pages.MACHINING
-   '         If Not IsNothing(Map.refProdManagerVM.CurrProd) Then
-   '            If Map.refProdManagerVM.CurrProd.bIsNew Then m_Title = "New - "
-   '            m_Title &= Map.refProdManagerVM.CurrProd.nProdId.ToString("0000") & " - " & Map.refProdManagerVM.CurrProd.sBTLFileName
-   '         End If
-   '      Case Pages.CONFIG
-   '         m_Title = "Configuration Page"
-   '   End Select
-   '   m_Title &= " - EgtBEAMWALL"
-   '   NotifyPropertyChanged(NameOf(Title))
-   'End Sub
-
    Friend Sub ContentRendered()
-      'DbControllers.Init()
-      '' chiamata a caso su Db per inizializzarlo
-      'DbControllers.m_ProjController.FindByProjDbId(0)
-      '' Verifico che l'inizializzazione di tutte le parti del programma sia andata a buon fine
-      'If Map.EndInit() Then
-      '   m_bInitStatus = True
-      '   ' altrimenti chiudo il programma
-      'Else
-      '   m_bInitStatus = False
-      'End If
-      '' Aggiorno visualizzazione unità di misura
-      ''Map.refStatusBarVM.SetMeasureUnit(If(EgtUiUnitsAreMM(), MeasureUnitOpt.MM, MeasureUnitOpt.INCH))
-      '' imposto MainWindow per finestra di Loading
-      'LoadingWndHelper.SetMainWindow(Application.Current.MainWindow)
-      '' leggo riga di comando
-      'Dim nCommandType As Integer = 0
-      'Dim nPage As Pages = Pages.VIEW
-      'Dim nProdId As Integer = 0
-      'If ProcessCommandLine(nCommandType, nPage, nProdId) Then
-      '   Select Case nCommandType
-      '      Case 1
-      '         Map.refProdManagerVM.SetCurrProd(nProdId)
-      '      Case 2
-      '         ' pagina gia' impostata nella variabile
-      '   End Select
-      'Else
-      '   ' setto il primo file dalla lista degli MRU come progetto corrente da aprire
-      '   Dim sLastProjectPath As String = String.Empty
-      '   GetMainPrivateProfileString(S_MRUPROJFILES, 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)
-      '      Map.refProjManagerVM.SetCurrProj(PjId)
-      '   End If
-      'End If
-      '' seleziono pagina da aprire
-      'Map.refMainMenuVM.SelPage = nPage
-
-      '' inizializzo thread di aggiornamento e comunicazione con DB
-      '' creo thread gestione macchina
-      'm_SupervisorCommThread = New Thread(Sub()
-      '                                       SupervisorCommThread.SupervisorCommThreadFunction()
-      '                                    End Sub)
-      'm_SupervisorCommThread.SetApartmentState(ApartmentState.STA)
-      '' avvio thread di gestione della macchina che avvia la connessione
-      'm_SupervisorCommThread.Start()
 
    End Sub
 
-   '   Friend Function ProcessCommandLine(ByRef nCommandType As Integer, ByRef nPage As Pages, ByRef nProdId As Integer) As Boolean
-   '      ' Se non ci sono veri parametri su linea di comando, esco (il primo è sempre il nome del programma)
-   '      If Environment.GetCommandLineArgs.Count() <= 1 Then Return False
-   '      ' Recupero primo parametro che dovrebbe essere il tipo di modalita' riga di comando
-   '      Dim sFile As String = Environment.GetCommandLineArgs(1)
-   '      If String.IsNullOrWhiteSpace(sFile) OrElse Not Integer.TryParse(sFile, nCommandType) OrElse nCommandType <= 0 Then Return False
-   '      Select Case nCommandType
-   '         Case 1         ' apri progetto in ottimizzatore
-   '            ' recupero secondo parametro
-   '            Dim sProdId As String = Environment.GetCommandLineArgs(2)
-   '            If Not Integer.TryParse(sProdId, nProdId) OrElse nProdId <= 0 Then Return False
-   '            nPage = Pages.MACHINING
-   '            Return True
-   '         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.VIEW AndAlso nPage <> Pages.MACHINING) Then Return False
-   '            Return True
-   '      End Select
-   '      Return False
-   '   End Function
-
    Friend Sub KeyDown(PressedKey As Key)
       ' Con ESC esco dall'azione corrente
       If PressedKey = Key.Escape Then
@@ -240,36 +142,6 @@ Public Class MainWindowVM
       End If
    End Sub
 
-   '   Friend m_ManagingSupervisorStop As Boolean = False
-
-   '   Private Sub SupervisorTimer_Tick()
-   '      If SupervisorCommThread.bViewerOptimizerBlocked And Not m_ManagingSupervisorStop Then
-   '         m_ManagingSupervisorStop = True
-   '         BlockedWnd = New BlockedWndV(Application.Current.MainWindow, New BlockedWndVM)
-   '         BlockedWnd.ShowDialog()
-   '      ElseIf Not SupervisorCommThread.bViewerOptimizerBlocked And m_ManagingSupervisorStop Then
-   '         m_ManagingSupervisorStop = False
-   '         BlockedWnd.Close()
-   '      End If
-   '   End Sub
-
-   '#End Region    ' METHODS
-
-   '#Region "COMMANDS"
-
-   '#Region "CloseApplicationCommand"
-
-   '   ' Returns a command that manage the MainWindow_Unloaded command
-   '   Public ReadOnly Property CloseApplicationCommand() As ICommand
-   '      Get
-   '         If m_cmdCloseApplication Is Nothing Then
-   '            m_cmdCloseApplication = New Command(AddressOf CloseApplication)
-   '         End If
-   '         Return m_cmdCloseApplication
-   '      End Get
-   '   End Property
-
-   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
    Friend Sub CloseApplication()
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          Return
@@ -300,8 +172,52 @@ Public Class MainWindowVM
       Application.Current.Shutdown()
    End Sub
 
-   '#End Region ' CloseApplicationCommand
+#Region "COMMANDS"
 
-   '#End Region    ' COMMANDS
+#Region "AboutBoxCommand"
+
+   ' Returns a command that manage the MainWindow_Unloaded command
+   Public ReadOnly Property AboutBoxCommand() As ICommand
+      Get
+         If m_cmdAboutBox Is Nothing Then
+            m_cmdAboutBox = New Command(AddressOf AboutBox)
+         End If
+         Return m_cmdAboutBox
+      End Get
+   End Property
+
+   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
+   Public Sub AboutBox(ByVal param As Object)
+      Dim AboutBoxWindow As New AboutBoxV
+      AboutBoxWindow.Owner = Application.Current.MainWindow
+      AboutBoxWindow.ShowDialog()
+   End Sub
+
+#End Region ' AboutBoxCommand
+
+#Region "CloseApplicationCommand"
+
+   ' Returns a command that manage the MainWindow_Unloaded command
+   Public ReadOnly Property CloseApplicationCommand() As ICommand
+      Get
+         If m_cmdCloseApplication Is Nothing Then
+            m_cmdCloseApplication = New Command(AddressOf CloseApplication)
+         End If
+         Return m_cmdCloseApplication
+      End Get
+   End Property
+
+   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
+   Public Sub CloseApplication(ByVal param As Object)
+      If Map.refSliceManagerVM.bCalculating Then
+         MessageBox.Show("Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         Return
+      End If
+      CloseApplication()
+   End Sub
+
+#End Region ' CloseApplicationCommand
+
+#End Region    ' COMMANDS
 
 End Class

Icarus/OptionsWindow/MachineBox.xaml

@@ -1,36 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="MachineBox"
-    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"
-    Height="160" Width="380" WindowStyle="None" ResizeMode="NoResize" 
-    TitleBarHeight="30" IsResizable="False" IsMinimizable="False"
-    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
-
-   <Border BorderThickness="2" BorderBrush="LightBlue">
-      <Grid >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.25*"/>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="0.25*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="0.25*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="0.25*"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="0.25*"/>
-         </Grid.RowDefinitions>
-
-         <TextBlock Name="MessageLbl" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center"
-               VerticalAlignment="Center" />
-         <UniformGrid Grid.Column="1" Grid.Row="3" Columns="3">
-            <Button Name="ReplaceBtn" Height="26" Margin="0,0,5,0"/>
-            <Button Name="UpdateBtn" Height="26" Margin="5,0,5,0"/>
-            <Button Name="CancelBtn" IsDefault="True" Height="26" Margin="5,0,0,0"/>
-         </UniformGrid>
-
-      </Grid>
-
-   </Border>
-
-</EgtWPFLib5:EgtCustomWindow>

Icarus/OptionsWindow/MachineBox.xaml.vb

@@ -1,45 +0,0 @@
-Imports EgtUILib
-
-Public Class MachineBox
-
-   Public Shadows DialogResult As MessageBoxResult = MessageBoxResult.Cancel
-
-   Public Sub New( Owner As Window, sMachName As String)
-
-       InitializeComponent()
-
-       Me.Owner = Owner
-
-       Title = EgtMsg( 6534)                ' Avviso
-
-       MessageLbl.Text = String.Format( EgtMsg( 6528), sMachName)  ' La macchina "{0}" esiste già,<br/> cosa vuoi fare ?
-
-       ReplaceBtn.Content = EgtMsg( 6531)   ' Sostituisci
-
-       UpdateBtn.Content = EgtMsg( 6532)    ' Aggiorna
-
-       CancelBtn.Content = EgtMsg( 6533)    ' Annulla
-
-   End Sub
-
-   Private Sub ReplaceBtn_Click( sender As Object, e As RoutedEventArgs) Handles ReplaceBtn.Click
-      DialogResult = MessageBoxResult.Yes
-      Close()
-   End Sub
-
-   Private Sub UpdateBtn_Click( sender As Object, e As RoutedEventArgs) Handles UpdateBtn.Click
-      DialogResult = MessageBoxResult.No
-      Close()
-   End Sub
-
-   Private Sub CancelBtn_Click( sender As Object, e As RoutedEventArgs) Handles CancelBtn.Click
-      DialogResult = MessageBoxResult.Cancel
-      Close()
-   End Sub
-
-   Public Overloads Function ShowDialog() As MessageBoxResult
-      MyBase.ShowDialog()
-      Return DialogResult
-   End Function
-
-End Class

Icarus/OptionsWindow/OptionWindowV.xaml

@@ -1,328 +1,342 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OptionWindowV"
+<EgtWPFLib5:EgtMainWindow x:Class="OptionWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:Icarus="clr-namespace:Icarus"
+                          xmlns:Icarus="clr-namespace:Icarus"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                          xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                          Style="{StaticResource Dialog_Window}"
-                            Title="{Binding Title}" Icon="/Resources/Icarus.ico"
+                          Title="{Binding Title}" Icon="/Resources/Icarus.ico"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                          WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                          WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            MinWidth="400" MinHeight="382"
+                          MinWidth="400" MinHeight="382"
-                            Width="400" Height="412">
+                          Width="400" Height="412">
 
    <!--<EgtWPFLib5:EgtCustomWindow.Resources>
       <local:GeomTypeConverter x:Key="GeomTypeConverter"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>-->
 
-   <TabControl Margin="5,5,5,5">
+   <Grid>
-      <TabItem Header="{Binding GenericMsg}">
+      <Grid.RowDefinitions>
-         <StackPanel Margin="5,5,5,0">
+         <RowDefinition Height="1*"/>
-            <!--<GroupBox Header="{Binding CurrentLanguageMsg}"
+         <RowDefinition Height="Auto"/>
-                      Margin="0,0,0,5">
+      </Grid.RowDefinitions>
-               <UniformGrid Rows="2" Margin="3,3,3,3">
+      <TabControl Margin="5,5,5,5">
-                  <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
+         <TabItem Header="{Binding GenericMsg}">
-                            DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
+            <StackPanel Margin="5,5,5,0">
-                            Margin="0,0,0,5"/>
+               <!--<GroupBox Header="{Binding CurrentLanguageMsg}"
-                  <TextBlock Text="{Binding LanguageAdvertMsg}" TextWrapping="Wrap"
-                  TextAlignment="Center"/>
-               </UniformGrid>
-            </GroupBox>-->
-            <UniformGrid Columns="2"
                          Margin="0,0,0,5">
-               <TextBlock Text="{Binding TopSceneBackgroundMsg}" VerticalAlignment="Center"/>
+                  <UniformGrid Rows="2" Margin="3,3,3,3">
-               <Button Background="{Binding TopSceneBackground}"
+                     <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
-                       Command="{Binding TopSceneBackground_Command}"
+                               DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                               Margin="0,0,0,5"/>
-            </UniformGrid>
+                     <TextBlock Text="{Binding LanguageAdvertMsg}" TextWrapping="Wrap"
-            <UniformGrid Columns="2"
+                     TextAlignment="Center"/>
-                         Margin="0,0,0,5">
+                  </UniformGrid>
-               <TextBlock Text="{Binding BotSceneBackgroundMsg}" VerticalAlignment="Center"/>
+               </GroupBox>-->
-               <Button Background="{Binding BotSceneBackground}"
+               <UniformGrid Columns="2"
-                       Command="{Binding BotSceneBackground_Command}"
-                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
-            </UniformGrid>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding GridColorMsg}" VerticalAlignment="Center"/>
-               <Button Background="{Binding GridColor}"
-                       Command="{Binding GridColor_Command}"
-                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
-            </UniformGrid>
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <TextBlock Text="{Binding ThickLineMsg}" VerticalAlignment="Center"
-                          Grid.Row="0" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding ThickLine}"
-                          Grid.Column="1" Grid.Row="0" Margin="22,5,0,5" VerticalAlignment="Center"/>
-               <TextBlock Text="{Binding SmoothTriMeshMsg}" VerticalAlignment="Center"
-                          Grid.Row="1" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding SmoothTriMesh}"
-                          Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
-            </Grid>
-            <!--<UniformGrid Columns="2"
-                     Margin="0,0,0,5">
-                <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
-                <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedTextFont}" Height="25"
-                            Margin="10,5,0,0"/>
-            </UniformGrid>-->
-            <Grid Margin="5,5,5,5">
-               <Button Content="{Binding UpdateLicenceMsg}" Command="{Binding UpdateLicence_Command}"  Height="26" Margin="100,1"/>
-            </Grid>
-         </StackPanel>
-      </TabItem>
-      <TabItem Header="{Binding CADMsg}">
-         <StackPanel Margin="5,5,5,0">
-            <UniformGrid Grid.ColumnSpan="2" Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding GeometryToleranceMsg}" VerticalAlignment="Center"/>
-               <TextBox Text="{Binding GeometryTolerance}" Height="25"
-                        VerticalContentAlignment="Center"
-                        Margin="10,0,0,0"/>
-            </UniformGrid>
-            <ItemsControl ItemsSource="{Binding LayerColorList}">
-               <ItemsControl.ItemTemplate>
-                  <DataTemplate>
-                     <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-                        <TextBlock Text="{Binding Color_Msg}" VerticalAlignment="Center"/>
-                        <Grid Margin="10,0,0,0">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="35"/>
-                           </Grid.ColumnDefinitions>
-                           <Button Background="{Binding Background}"
-                          Command="{Binding Color_Command}"
-                          Margin="0,0,5,0"
-                          Style="{StaticResource EgtWPFLib5_InputButton}"/>
-                           <Slider Grid.Column="1"
-                          Value="{Binding dAlpha}"
-                          Minimum="10"
-                          Maximum="100"
-                          TickPlacement="BottomRight"
-                          TickFrequency="10"
-                          IsSnapToTickEnabled="True"
-                          Margin="0,0,5,0"/>
-                           <TextBlock Grid.Column="2"
-                             Text="{Binding sAlpha}"
-                             TextAlignment="Right"/>
-                        </Grid>
-                     </UniformGrid>
-                  </DataTemplate>
-               </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            <!--<GroupBox Grid.Column="1" Grid.RowSpan="2"
-                      Header="{Binding DimensionMsg}"
-                      Margin="0,0,0,5">
-               <UniformGrid Grid.ColumnSpan="2" Columns="2">
-                  <TextBlock Text="{Binding ExtLineLenMsg}" VerticalAlignment="Center"/>
-                  <TextBox Text="{Binding ExtLineLen}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                  <TextBlock Text="{Binding ArrowLenMsg}" VerticalAlignment="Center"/>
-                  <TextBox Text="{Binding ArrowLen}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                  <TextBlock Text="{Binding TextDistMsg}" VerticalAlignment="Center"/>
-                  <TextBox Text="{Binding TextDist}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                  <TextBlock Text="{Binding LenIsMMMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                                 SelectedItem="{Binding SelectedUnitMeasure}" Height="25"
-                                 Margin="10,5,0,0"/>
-                  <TextBlock Text="{Binding DecDigitMsg}" VerticalAlignment="Center"/>
-                  <TextBox Text="{Binding DecDigit}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                  <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
-                                 SelectedItem="{Binding SelectedFont}" Height="25"
-                                 Margin="10,5,0,0"/>
-                  <TextBlock Text="{Binding TextHeightMsg}" VerticalAlignment="Center"/>
-                  <TextBox Text="{Binding TextHeight}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-               </UniformGrid>
-            </GroupBox>-->
-         </StackPanel>
-
-      </TabItem>
-      <TabItem Header="{Binding ImportMsg}">
-         <StackPanel Margin="5,5,5,0">
-            <Grid Margin="0,5,0,0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="0.8*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <TextBlock Grid.Row="0" Grid.Column="1" 
-                             VerticalAlignment="Center" HorizontalAlignment="Center"  
-                             Text="{Binding UnitScaleMsg}" />
-               <TextBlock Grid.Row="0" Grid.Column="2" 
-                             VerticalAlignment="Center" HorizontalAlignment="Center"  
-                             Text="{Binding FactorScaleMsg}"/>
-
-               <TextBlock Grid.Row="1" Grid.Column="0" 
-                             Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
-               <ComboBox  Grid.Row="1" Grid.Column="1"
-                         ItemsSource="{Binding ScaleDXFList, Mode=OneWay}"
-                         SelectedItem="{Binding SelectedDXFScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
-                         Margin="10,0,0,5"/>
-               <TextBox  Grid.Row="1" Grid.Column="2"
-                        Text="{Binding DxfScaleFactor}" Height="25"
-                        IsEnabled="{Binding DXFScaleEnable, UpdateSourceTrigger=LostFocus}"
-                        VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
-               <TextBlock Grid.Row="2" Grid.Column="0"
-                        Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
-               <ComboBox Grid.Row="2" Grid.Column="1"
-                        ItemsSource="{Binding ScaleSTLList, Mode=OneWay}"
-                         SelectedItem="{Binding SelectedSTLScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
-                         Margin="10,0,0,5"/>
-               <TextBox Grid.Row="2" Grid.Column="2"
-                        Text="{Binding StlScaleFactor}" Height="25"
-                        IsEnabled="{Binding STLScaleEnable, UpdateSourceTrigger=LostFocus}"
-                        VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
-               <!--<TextBlock Grid.Row="3" Grid.Column="0"
-                        Text="{Binding ImageScaleFactorMsg}" VerticalAlignment="Center"/>
-               <ComboBox Grid.Row="3" Grid.Column="1"
-                        ItemsSource="{Binding ScaleImageList, Mode=OneWay}"
-                         SelectedItem="{Binding SelectedImageScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
-                         Margin="10,0,0,5"/>
-               <TextBox Grid.Row="3" Grid.Column="2"
-                        Text="{Binding ImageScaleFactor}" Height="25"
-                        IsEnabled="{Binding ImageScaleEnable, UpdateSourceTrigger=LostFocus}"
-                         VerticalContentAlignment="Center"
-                         Margin="10,0,0,5"/>-->
-            </Grid>
-         </StackPanel>
-      </TabItem>
-      <!--<TabItem Header="{Binding ExportMsg}">
-         <StackPanel>
-            <GroupBox Grid.Column="1" Grid.RowSpan="2"
-                      Header="{Binding ImageMsg}"
-                      Margin="5,5,5,0">
-               <UniformGrid Grid.ColumnSpan="2" Columns="2">
-                  <TextBlock Text="{Binding ImageWidthMsg}" VerticalAlignment="Center"/>
-                  <TextBox Text="{Binding ImageWidth}" Height="25"
-                        VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
-                  <TextBlock Text="{Binding ImageHeightMsg}" VerticalAlignment="Center"/>
-                  <TextBox Text="{Binding ImageHeight}" Height="25"
-                        VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
-               </UniformGrid>
-            </GroupBox>
-         </StackPanel>
-      </TabItem>-->
-      <TabItem Header="{Binding CAMMsg}">
-         <StackPanel>
-            <!--<GroupBox Grid.Column="1" Grid.RowSpan="2"
-                      Header="{Binding MachiningSelGeomMsg}"
-                      Margin="5,5,5,0">
-               <UniformGrid Columns="2">
-                  <TextBlock Text="{Binding GeomTypeDrillingMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedDrillingGeomType}" Height="25">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <TextBlock Text="{Binding GeomTypeSawingMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedSawingGeomType}" Height="25">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <TextBlock Text="{Binding GeomTypeMillingMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedMillingGeomType}" Height="25"
                             Margin="0,0,0,5">
-                     <ComboBox.ItemTemplate>
+                  <TextBlock Text="{Binding TopSceneBackgroundMsg}" VerticalAlignment="Center"/>
-                        <DataTemplate>
+                  <Button Background="{Binding TopSceneBackground}"
-                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                          Command="{Binding TopSceneBackground_Command}"
-                        </DataTemplate>
+                          Style="{StaticResource EgtWPFLib5_InputButton}"/>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <TextBlock Text="{Binding GeomTypePocketingMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedPocketingGeomType}" Height="25">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <TextBlock Text="{Binding GeomTypeMortisingMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedMortisingGeomType}" Height="25">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <TextBlock Text="{Binding GeomTypeChiselingMsg}" VerticalAlignment="Center"/>
-                  <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedChiselingGeomType}" Height="25">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
                </UniformGrid>
-            </GroupBox>-->
+               <UniformGrid Columns="2"
+                            Margin="0,0,0,5">
+                  <TextBlock Text="{Binding BotSceneBackgroundMsg}" VerticalAlignment="Center"/>
+                  <Button Background="{Binding BotSceneBackground}"
+                          Command="{Binding BotSceneBackground_Command}"
+                          Style="{StaticResource EgtWPFLib5_InputButton}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2"
+                            Margin="0,0,0,5">
+                  <TextBlock Text="{Binding GridColorMsg}" VerticalAlignment="Center"/>
+                  <Button Background="{Binding GridColor}"
+                          Command="{Binding GridColor_Command}"
+                          Style="{StaticResource EgtWPFLib5_InputButton}"/>
+               </UniformGrid>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="2*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <TextBlock Text="{Binding ThickLineMsg}" VerticalAlignment="Center"
+                             Grid.Row="0" Margin="0,5,0,5"/>
+                  <CheckBox IsChecked="{Binding ThickLine}"
+                             Grid.Column="1" Grid.Row="0" Margin="22,5,0,5" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding SmoothTriMeshMsg}" VerticalAlignment="Center"
+                             Grid.Row="1" Margin="0,5,0,5"/>
+                  <CheckBox IsChecked="{Binding SmoothTriMesh}"
+                             Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
+               </Grid>
+               <!--<UniformGrid Columns="2"
+                        Margin="0,0,0,5">
+                   <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
+                   <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
+                               SelectedItem="{Binding SelectedTextFont}" Height="25"
+                               Margin="10,5,0,0"/>
+               </UniformGrid>-->
+               <Grid Margin="5,5,5,5">
+                  <Button Content="{Binding UpdateLicenceMsg}" Command="{Binding UpdateLicence_Command}"  Height="26" Margin="100,1"/>
+               </Grid>
+            </StackPanel>
+         </TabItem>
+         <TabItem Header="{Binding CADMsg}">
+            <StackPanel Margin="5,5,5,0">
+               <UniformGrid Grid.ColumnSpan="2" Columns="2"
+                            Margin="0,0,0,5">
+                  <TextBlock Text="{Binding GeometryToleranceMsg}" VerticalAlignment="Center"/>
+                  <TextBox Text="{Binding GeometryTolerance}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,0,0,0"/>
+               </UniformGrid>
+               <ItemsControl ItemsSource="{Binding LayerColorList}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <UniformGrid Columns="2"
+                            Margin="0,0,0,5">
+                           <TextBlock Text="{Binding Color_Msg}" VerticalAlignment="Center"/>
+                           <Grid Margin="10,0,0,0">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="35"/>
+                              </Grid.ColumnDefinitions>
+                              <Button Background="{Binding Background}"
+                             Command="{Binding Color_Command}"
+                             Margin="0,0,5,0"
+                             Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                              <Slider Grid.Column="1"
+                             Value="{Binding dAlpha}"
+                             Minimum="10"
+                             Maximum="100"
+                             TickPlacement="BottomRight"
+                             TickFrequency="10"
+                             IsSnapToTickEnabled="True"
+                             Margin="0,0,5,0"/>
+                              <TextBlock Grid.Column="2"
+                                Text="{Binding sAlpha}"
+                                TextAlignment="Right"/>
+                           </Grid>
+                        </UniformGrid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+               <!--<GroupBox Grid.Column="1" Grid.RowSpan="2"
+                         Header="{Binding DimensionMsg}"
+                         Margin="0,0,0,5">
+                  <UniformGrid Grid.ColumnSpan="2" Columns="2">
+                     <TextBlock Text="{Binding ExtLineLenMsg}" VerticalAlignment="Center"/>
+                     <TextBox Text="{Binding ExtLineLen}" Height="25"
+                                    VerticalContentAlignment="Center"
+                                    Margin="10,5,0,0"/>
+                     <TextBlock Text="{Binding ArrowLenMsg}" VerticalAlignment="Center"/>
+                     <TextBox Text="{Binding ArrowLen}" Height="25"
+                                    VerticalContentAlignment="Center"
+                                    Margin="10,5,0,0"/>
+                     <TextBlock Text="{Binding TextDistMsg}" VerticalAlignment="Center"/>
+                     <TextBox Text="{Binding TextDist}" Height="25"
+                                    VerticalContentAlignment="Center"
+                                    Margin="10,5,0,0"/>
+                     <TextBlock Text="{Binding LenIsMMMsg}" VerticalAlignment="Center"/>
+                     <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
+                                    SelectedItem="{Binding SelectedUnitMeasure}" Height="25"
+                                    Margin="10,5,0,0"/>
+                     <TextBlock Text="{Binding DecDigitMsg}" VerticalAlignment="Center"/>
+                     <TextBox Text="{Binding DecDigit}" Height="25"
+                                    VerticalContentAlignment="Center"
+                                    Margin="10,5,0,0"/>
+                     <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
+                     <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
+                                    SelectedItem="{Binding SelectedFont}" Height="25"
+                                    Margin="10,5,0,0"/>
+                     <TextBlock Text="{Binding TextHeightMsg}" VerticalAlignment="Center"/>
+                     <TextBox Text="{Binding TextHeight}" Height="25"
+                                    VerticalContentAlignment="Center"
+                                    Margin="10,5,0,0"/>
+                  </UniformGrid>
+               </GroupBox>-->
+            </StackPanel>
 
-            <!--<Grid Margin="5,5,5,0">
+         </TabItem>
-               <Grid.ColumnDefinitions>
+         <TabItem Header="{Binding ImportMsg}">
-                  <ColumnDefinition Width="2*"/>
+            <StackPanel Margin="5,5,5,0">
-                  <ColumnDefinition Width="1*"/>
+               <Grid Margin="0,5,0,0">
-               </Grid.ColumnDefinitions>
+                  <Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
+                     <ColumnDefinition Width="1*"/>
-                  <RowDefinition Height="1*"/>
+                     <ColumnDefinition Width="0.8*"/>
-                  <RowDefinition Height="1*"/>
+                     <ColumnDefinition Width="1*"/>
-               </Grid.RowDefinitions>
+                  </Grid.ColumnDefinitions>
-               <TextBlock Text="{Binding NewMachiningPosMsg}" VerticalAlignment="Center"
+                  <Grid.RowDefinitions>
-                          Grid.Row="0" Margin="0,0,0,5"/>
+                     <RowDefinition Height="1*"/>
-               <CheckBox IsChecked="{Binding NewMachiningIsLastOne}"
+                     <RowDefinition Height="1*"/>
-                         Grid.Column="1" Grid.Row="0" Margin="4,0,0,0" VerticalAlignment="Center"/>
+                     <RowDefinition Height="1*"/>
-               <TextBlock Text="{Binding UseDispositionScriptMsg}" VerticalAlignment="Center"
+                     <RowDefinition Height="1*"/>
-                          Grid.Row="1" Margin="0,0,0,5"/>
+                  </Grid.RowDefinitions>
-               <CheckBox IsChecked="{Binding UseDispositionScript}"
+                  <TextBlock Grid.Row="0" Grid.Column="1" 
-                         Grid.Column="1" Grid.Row="1" Margin="4,0,0,0" VerticalAlignment="Center"/>
+                                VerticalAlignment="Center" HorizontalAlignment="Center"  
-            </Grid>-->
+                                Text="{Binding UnitScaleMsg}" />
+                  <TextBlock Grid.Row="0" Grid.Column="2" 
+                                VerticalAlignment="Center" HorizontalAlignment="Center"  
+                                Text="{Binding FactorScaleMsg}"/>
 
-            <Grid Margin="5,5,5,0">
+                  <TextBlock Grid.Row="1" Grid.Column="0" 
-               <Button Content="{Binding AddMachineMsg}" Command="{Binding AddMachine_Command}"  Height="26" Margin="100,1"/>
+                                Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
-            </Grid>
+                  <ComboBox  Grid.Row="1" Grid.Column="1"
+                            ItemsSource="{Binding ScaleDXFList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedDXFScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
+                            Margin="10,0,0,5"/>
+                  <TextBox  Grid.Row="1" Grid.Column="2"
+                           Text="{Binding DxfScaleFactor}" Height="25"
+                           IsEnabled="{Binding DXFScaleEnable, UpdateSourceTrigger=LostFocus}"
+                           VerticalContentAlignment="Center"
+                           Margin="10,0,0,5"/>
+                  <TextBlock Grid.Row="2" Grid.Column="0"
+                           Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
+                  <ComboBox Grid.Row="2" Grid.Column="1"
+                           ItemsSource="{Binding ScaleSTLList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedSTLScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
+                            Margin="10,0,0,5"/>
+                  <TextBox Grid.Row="2" Grid.Column="2"
+                           Text="{Binding StlScaleFactor}" Height="25"
+                           IsEnabled="{Binding STLScaleEnable, UpdateSourceTrigger=LostFocus}"
+                           VerticalContentAlignment="Center"
+                           Margin="10,0,0,5"/>
+                  <!--<TextBlock Grid.Row="3" Grid.Column="0"
+                           Text="{Binding ImageScaleFactorMsg}" VerticalAlignment="Center"/>
+                  <ComboBox Grid.Row="3" Grid.Column="1"
+                           ItemsSource="{Binding ScaleImageList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedImageScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
+                            Margin="10,0,0,5"/>
+                  <TextBox Grid.Row="3" Grid.Column="2"
+                           Text="{Binding ImageScaleFactor}" Height="25"
+                           IsEnabled="{Binding ImageScaleEnable, UpdateSourceTrigger=LostFocus}"
+                            VerticalContentAlignment="Center"
+                            Margin="10,0,0,5"/>-->
+               </Grid>
+            </StackPanel>
+         </TabItem>
+         <!--<TabItem Header="{Binding ExportMsg}">
+            <StackPanel>
+               <GroupBox Grid.Column="1" Grid.RowSpan="2"
+                         Header="{Binding ImageMsg}"
+                         Margin="5,5,5,0">
+                  <UniformGrid Grid.ColumnSpan="2" Columns="2">
+                     <TextBlock Text="{Binding ImageWidthMsg}" VerticalAlignment="Center"/>
+                     <TextBox Text="{Binding ImageWidth}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,0,0,5"/>
+                     <TextBlock Text="{Binding ImageHeightMsg}" VerticalAlignment="Center"/>
+                     <TextBox Text="{Binding ImageHeight}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,0,0,5"/>
+                  </UniformGrid>
+               </GroupBox>
+            </StackPanel>
+         </TabItem>-->
+         <TabItem Header="{Binding CAMMsg}">
+            <StackPanel>
+               <!--<GroupBox Grid.Column="1" Grid.RowSpan="2"
+                         Header="{Binding MachiningSelGeomMsg}"
+                         Margin="5,5,5,0">
+                  <UniformGrid Columns="2">
+                     <TextBlock Text="{Binding GeomTypeDrillingMsg}" VerticalAlignment="Center"/>
+                     <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                               SelectedItem="{Binding SelectedDrillingGeomType}" Height="25">
+                        <ComboBox.ItemTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                           </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                     </ComboBox>
+                     <TextBlock Text="{Binding GeomTypeSawingMsg}" VerticalAlignment="Center"/>
+                     <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                               SelectedItem="{Binding SelectedSawingGeomType}" Height="25">
+                        <ComboBox.ItemTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                           </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                     </ComboBox>
+                     <TextBlock Text="{Binding GeomTypeMillingMsg}" VerticalAlignment="Center"/>
+                     <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                               SelectedItem="{Binding SelectedMillingGeomType}" Height="25"
+                               Margin="0,0,0,5">
+                        <ComboBox.ItemTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                           </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                     </ComboBox>
+                     <TextBlock Text="{Binding GeomTypePocketingMsg}" VerticalAlignment="Center"/>
+                     <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                               SelectedItem="{Binding SelectedPocketingGeomType}" Height="25">
+                        <ComboBox.ItemTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                           </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                     </ComboBox>
+                     <TextBlock Text="{Binding GeomTypeMortisingMsg}" VerticalAlignment="Center"/>
+                     <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                               SelectedItem="{Binding SelectedMortisingGeomType}" Height="25">
+                        <ComboBox.ItemTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                           </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                     </ComboBox>
+                     <TextBlock Text="{Binding GeomTypeChiselingMsg}" VerticalAlignment="Center"/>
+                     <ComboBox ItemsSource="{Binding GeomTypeList, Mode=OneWay}"
+                               SelectedItem="{Binding SelectedChiselingGeomType}" Height="25">
+                        <ComboBox.ItemTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding Converter={StaticResource GeomTypeConverter}}"/>
+                           </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                     </ComboBox>
+                  </UniformGrid>
+               </GroupBox>-->
 
-            <Grid Margin="5,5,5,0">
+               <!--<Grid Margin="5,5,5,0">
-               <Button Content="{Binding ExportMachineMsg}" Command="{Binding ExportMachine_Command}"  Height="26" Margin="100,1"/>
+                  <Grid.ColumnDefinitions>
-            </Grid>
+                     <ColumnDefinition Width="2*"/>
-         </StackPanel>
+                     <ColumnDefinition Width="1*"/>
-      </TabItem>
+                  </Grid.ColumnDefinitions>
-   </TabControl>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <TextBlock Text="{Binding NewMachiningPosMsg}" VerticalAlignment="Center"
+                             Grid.Row="0" Margin="0,0,0,5"/>
+                  <CheckBox IsChecked="{Binding NewMachiningIsLastOne}"
+                            Grid.Column="1" Grid.Row="0" Margin="4,0,0,0" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding UseDispositionScriptMsg}" VerticalAlignment="Center"
+                             Grid.Row="1" Margin="0,0,0,5"/>
+                  <CheckBox IsChecked="{Binding UseDispositionScript}"
+                            Grid.Column="1" Grid.Row="1" Margin="4,0,0,0" VerticalAlignment="Center"/>
+               </Grid>-->
 
-</EgtWPFLib5:EgtCustomWindow>
+               <Grid Margin="5,5,5,0">
+                  <Button Content="{Binding AddMachineMsg}" Command="{Binding AddMachine_Command}"  Height="26" Margin="100,1"/>
+               </Grid>
+
+               <Grid Margin="5,5,5,0">
+                  <Button Content="{Binding ExportMachineMsg}" Command="{Binding ExportMachine_Command}"  Height="26" Margin="100,1"/>
+               </Grid>
+            </StackPanel>
+         </TabItem>
+      </TabControl>
+      <Button Grid.Row="1"
+              Command="{Binding Ok_Command}"
+              IsCancel="True"
+              Margin="0,0,2.5,0"
+              Style="{StaticResource RightPanel_HalfRound_Button}">
+         <Image Source="\Resources\Common\Ok.png"
+                Style="{StaticResource Button_Image}"/>
+      </Button>
+   </Grid>
+
+</EgtWPFLib5:EgtMainWindow>

Icarus/OptionsWindow/OptionWindowVM.vb

@@ -980,16 +980,17 @@ Public Class OptionWindowVM
       Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists( sMachDir)
       Dim bUpdate As Boolean = True
       If bOldExists Then
-         Dim MachBox As New MachineBox( Application.Current.MainWindow, sMachName)
+         Dim MachBox As New UpdateMachineV(Application.Current.MainWindow, New UpdateMachineVM(sMachName))
-         Select MachBox.ShowDialog()
+         MachBox.ShowDialog()
-         Case MessageBoxResult.Yes
+         Select Case MachBox.DialogResult
-            bUpdate = False
+            Case MessageBoxResult.Yes
-         Case MessageBoxResult.No
+               bUpdate = False
-            bUpdate = True
+            Case MessageBoxResult.No
-         Case MessageBoxResult.Cancel
+               bUpdate = True
-            ' Rimuovo il direttorio temporaneo ed esco
+            Case MessageBoxResult.Cancel
-            My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+               ' Rimuovo il direttorio temporaneo ed esco
-            Return
+               My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+               Return
          End Select
          ' Faccio una copia di backup della macchina corrente
          Dim sBackupDir As String = sMachDir & ".old"

Icarus/RibParamPanel/CopyFromWndV.xaml

@@ -1,35 +1,45 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="CopyFromWndV"
+<EgtWPFLib5:EgtMainWindow x:Class="CopyFromWndV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                          xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                          Title="Copy From"
-                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
+                          SizeToContent="WidthAndHeight" 
-                            WindowStyle="None" ResizeMode="NoResize" IsClosable="False"
+                          WindowStartupLocation="CenterOwner"
-                            WindowStartupLocation="CenterOwner"
+                          Style="{StaticResource Dialog_Window}">
-                            SizeToContent="WidthAndHeight">
+   <Grid Margin="2.5,2.5,2.5,0">
-   <Grid Margin="5">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       <TextBlock Text="Select Rib to Copy"
-               HorizontalAlignment="Center"
+                 Margin="20,20,20,2.5"
-               Margin="0,0,0,2.5"/>
+                 Style="{StaticResource DialogWindow_TextBlock}"/>
       <ComboBox Grid.Row="1"
                 ItemsSource="{Binding RibList}"
                 SelectedItem="{Binding SelRib}"
                 DisplayMemberPath="ghName"
-                Margin="0,2.5,0,2.5"/>
+                Width="160"
+                HorizontalAlignment="Center"
+                HorizontalContentAlignment="Center"
+                Margin="2.5,10,2.5,2.5"
+                Style="{StaticResource RightPanel_ComboBox}"/>
       <UniformGrid Grid.Row="2"
                    Rows="1"
-                   Margin="0,2.5,0,0">
+                   Margin="0,20,0,0">
-         <Button Content="Ok"
+         <Button Command="{Binding Ok_Command}"
-                    Command="{Binding Ok_Command}"
+                 IsDefault="True"
-                    Style="{StaticResource ToolBar_TextButton}"/>
+                 Margin="0,0,2.5,0"
-         <Button Content="Cancel"
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
-                    Command="{Binding Cancel_Command}"
+            <Image Source="\Resources\Common\Ok.png"
-                    Style="{StaticResource ToolBar_TextButton}"/>
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button IsCancel="True"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
+            <Image Source="\Resources\Common\Cancel.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
       </UniformGrid>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtWPFLib5:EgtMainWindow>

Icarus/SceneHost/MySceneHostVM.vb

@@ -234,19 +234,8 @@ Public Class MySceneHostVM
    End Sub
 
    Friend Sub EmitTitle()
-      ' nome file
-      Dim sTitle As String = MainController.GetCurrFile()
-      If String.IsNullOrEmpty(sTitle) Then
-         sTitle = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString()
-      End If
-      ' indicazione di modificato 
-      If MainController.GetModified() Then
-         sTitle += "*"
-      End If
-      ' dati del prodotto
-      sTitle += " - Icarus"
       ' emissione del titolo
-      Map.refMainWindowVM.SetTitle(sTitle)
+      Map.refSecondaryWindowVM.SetTitle()
    End Sub
 
 #End Region    ' METHODS

Icarus/SecondaryWindow/SecondaryWindowV.xaml

@@ -1,24 +1,22 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="SecondaryWindowV"
+<EgtWPFLib5:EgtMainWindow x:Class="SecondaryWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                          xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:PrintApp="clr-namespace:Icarus"
+                          xmlns:PrintApp="clr-namespace:Icarus"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                          Title="{Binding sTitle}"
-                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
+                          ProjectName="{Binding sProjectName}"
-                            WindowStyle="None" ResizeMode="NoResize"
+                          ProjectPath="{Binding sProjectPath}"
-                            ShowInTaskbar="False"
+                          Icon="/Resources/Icarus.ico"
-                            AllowsTransparency="True"
+                          CloseCommand="{Binding CloseApplicationCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                            Background="Transparent"
+                          ShowInTaskbar="False"
-                            AboutBoxCommand="{Binding AboutBoxCommand}"
+                          AllowsTransparency="True"
-                            CloseCommand="{Binding CloseApplicationCommand,
+                          Background="Transparent"
-                                                   Mode=OneWay,
+                          Style="{DynamicResource {x:Type EgtWPFLib5:EgtMainWindow}}">
-                                                   UpdateSourceTrigger=PropertyChanged}"
+   <EgtWPFLib5:EgtMainWindow.TitlePanel>
-                            >
-   <EgtWPFLib5:EgtCustomWindow.TitlePanel>
 
       <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
 
-   </EgtWPFLib5:EgtCustomWindow.TitlePanel>
+   </EgtWPFLib5:EgtMainWindow.TitlePanel>
 
    <!--Pannello principale -->
    <DockPanel>
@@ -27,6 +25,4 @@
 
    </DockPanel>
    
-   <!--<PrintApp:SceneHostV/>-->
+</EgtWPFLib5:EgtMainWindow>
-   
-</EgtWPFLib5:EgtCustomWindow>

Icarus/SecondaryWindow/SecondaryWindowV.xaml.vb

@@ -27,15 +27,15 @@ Public Class SecondaryWindowV
       AddHandler Me.StateChanged, AddressOf SecondaryWindowV_StateChanged
    End Sub
 
-   Private Sub SecondaryWindowV_ContentRendered(sender As Object, e As EventArgs)
-      m_SecondaryWindowVM.ContentRendered()
-   End Sub
-
    Private Sub SecondaryWindowV_Loaded(sender As Object, e As RoutedEventArgs)
       ' Carico e imposto posizione finestra
       WinPosFromIniToWindow(S_GENERAL, K_WINPLACE, Me)
    End Sub
 
+   Private Sub SecondaryWindowV_ContentRendered(sender As Object, e As EventArgs)
+      m_SecondaryWindowVM.ContentRendered()
+   End Sub
+
    Private Sub SecondaryWindowV_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          e.Cancel = True

Icarus/SecondaryWindow/SecondaryWindowVM.vb

@@ -1,5 +1,6 @@
 Imports EgtWPFLib5
 Imports EgtUILib
+Imports System.IO
 Imports System.Windows.Threading
 
 Public Class SecondaryWindowVM
@@ -9,15 +10,34 @@ Public Class SecondaryWindowVM
    Private m_WaitAfterRender As Integer = 0
 
    ' Titolo
-   Private m_sTitle As String
+   Public ReadOnly Property sTitle As String
-   Public Property sTitle As String
       Get
-         Return m_sTitle
+         Return "Icarus"
+      End Get
+   End Property
+
+   Public ReadOnly Property sProjectName As String
+      Get
+         Dim sFilePath As String = ""
+         EgtGetCurrFilePath(sFilePath)
+         If String.IsNullOrEmpty(sFilePath) Then
+            sFilePath = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString()
+            Return sFilePath
+         Else
+            Return Path.GetFileNameWithoutExtension(sFilePath) & If(EgtGetModified(), "*", "")
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property sProjectPath As String
+      Get
+         Dim sFilePath As String = ""
+         EgtGetCurrFilePath(sFilePath)
+         If String.IsNullOrEmpty(sFilePath) Then
+            sFilePath = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString()
+         End If
+         Return sFilePath
       End Get
-      Set(value As String)
-         m_sTitle = value
-         NotifyPropertyChanged(NameOf(sTitle))
-      End Set
    End Property
 
    Private m_Visibility As Boolean
@@ -37,11 +57,13 @@ Public Class SecondaryWindowVM
       End If
    End Sub
 
-   Friend Sub SetTitle(sTitle As String)
+   Friend Sub SetTitle()
-      m_sTitle = sTitle
       NotifyPropertyChanged(NameOf(sTitle))
+      NotifyPropertyChanged(NameOf(sProjectName))
+      NotifyPropertyChanged(NameOf(sProjectPath))
    End Sub
 
+
    ' definizione comandi
    Private m_cmdAboutBox As ICommand
    Private m_cmdCloseApplication As ICommand
@@ -106,8 +128,6 @@ Public Class SecondaryWindowVM
       Select Case nFileType
          Case FT.NGE
             Return Map.refProjManagerVM.OpenProject(sFile)
-            'Case FT.DXF, FT.STL, FT._3MF, FT.OBJ, FT.CNC, FT.CSF, FT.BTL, FT.BTLX, FT.IMG, FT.PNT, FT.IGES, FT.STEP_, FT.ACIS, FT.PARASOLID, FT.JT, FT.VRML, FT.C3D
-            '   Return m_Controller.ImportProject(sFile, False)
       End Select
       Return False
    End Function

Icarus/UpdateMachine/UpdateMachineV.xaml

@@ -0,0 +1,42 @@
+<EgtWPFLib5:EgtMainWindow x:Class="UpdateMachineV"
+                          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="Update Machine"
+                          SizeToContent="WidthAndHeight"
+                          WindowStartupLocation="CenterOwner"
+                          Style="{StaticResource Dialog_Window}">
+
+   <Grid Margin="2.5,2.5,2.5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="{Binding UpdateMachine_Msg}"
+                 Margin="20,20,20,2.5"
+                 Style="{StaticResource DialogWindow_TextBlock}"/>
+      <UniformGrid Grid.Row="2"
+                   Rows="1"
+                   Margin="0,20,0,0">
+         <Button Content="{Binding Replace_Msg}"
+                 Command="{Binding Replace_Command}"
+                 IsDefault="True"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         <Button Content="{Binding Update_Msg}"
+                 Command="{Binding Update_Command}"
+                 IsDefault="True"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         <Button Command="{Binding Cancel_Command}"
+                 Margin="2.5,0,0,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
+            <Image Source="\Resources\Common\Cancel.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+      </UniformGrid>
+
+   </Grid>
+
+</EgtWPFLib5:EgtMainWindow>

Icarus/UpdateMachine/UpdateMachineV.xaml.vb

@@ -0,0 +1,24 @@
+Imports EgtUILib
+
+Public Class UpdateMachineV
+
+   Private WithEvents m_UpdateMachineVM As UpdateMachineVM
+
+   Public Shadows DialogResult As MessageBoxResult = MessageBoxResult.Cancel
+
+
+   Public Sub New(Owner As Window, UpdateMachineVM As UpdateMachineVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = UpdateMachineVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_UpdateMachineVM = UpdateMachineVM
+   End Sub
+
+   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_UpdateMachineVM.m_CloseWindow
+      Me.DialogResult = DialogResult
+      Me.Close()
+   End Sub
+
+End Class

Icarus/UpdateMachine/UpdateMachineVM.vb

@@ -0,0 +1,108 @@
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports System.Collections.ObjectModel
+Imports System.Windows.Forms
+
+Public Class UpdateMachineVM
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend Event m_CloseWindow(bDialogResult As MessageBoxResult)
+
+   Private m_MachineName As String = ""
+
+#Region "MESSAGES"
+
+   Public ReadOnly Property UpdateMachine_Msg As String
+      Get
+         Return String.Format(EgtMsg(6528), m_MachineName)  ' La macchina "{0}" esiste già,<br/> cosa vuoi fare ?
+
+      End Get
+   End Property
+
+   Public ReadOnly Property Replace_Msg As String
+      Get
+         Return EgtMsg(6531)   ' Sostituisci
+      End Get
+   End Property
+
+   Public ReadOnly Property Update_Msg As String
+      Get
+         Return EgtMsg(6532)    ' Aggiorna
+      End Get
+   End Property
+
+
+#End Region    ' MESSAGES
+
+   ' Definizione comandi
+   Private m_cmdReplace As ICommand
+   Private m_cmdUpdate As ICommand
+   Private m_cmdCancel As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTOR"
+
+   Sub New(MachineName As String)
+      m_MachineName = MachineName
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "COMMANDS"
+
+#Region "Replace"
+
+   Public ReadOnly Property Replace_Command As ICommand
+      Get
+         If m_cmdReplace Is Nothing Then
+            m_cmdReplace = New Command(AddressOf Replace)
+         End If
+         Return m_cmdReplace
+      End Get
+   End Property
+
+   Public Sub Replace()
+      RaiseEvent m_CloseWindow(MessageBoxResult.Yes)
+   End Sub
+
+#End Region ' Replace
+
+#Region "Update"
+
+   Public ReadOnly Property Update_Command As ICommand
+      Get
+         If m_cmdUpdate Is Nothing Then
+            m_cmdUpdate = New Command(AddressOf Update)
+         End If
+         Return m_cmdUpdate
+      End Get
+   End Property
+
+   Public Sub Update()
+      RaiseEvent m_CloseWindow(MessageBoxResult.No)
+   End Sub
+
+#End Region ' Update
+
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      RaiseEvent m_CloseWindow(MessageBoxResult.Cancel)
+   End Sub
+
+#End Region ' Replace
+
+#End Region    ' COMMANDS 
+
+End Class

Icarus/Utility/Dictionary.xaml

@@ -3,6 +3,7 @@
                     xmlns:PrintApp="clr-namespace:Icarus"
                     xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
                     xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:EgtWPFLib48="clr-namespace:EgtWPFLib48;assembly=EgtWPFLib48"
                     xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
@@ -122,6 +123,9 @@
    <!--convertert per visibilita' stringa di testo con misure in StatusBar-->
    <PrintApp:StringToVisibilityConverter x:Key="StringToVisibilityConverter"/>
 
+   <GridLength x:Key="TitleBarHeight">30</GridLength>
+   <Thickness x:Key="WindowBorder_Thickness">2</Thickness>
+   <sys:Double x:Key="WindowBorder_Height">2</sys:Double>
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- FocusVisual standard-->
@@ -137,7 +141,7 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- Button Style -->
+   <!-- Button -->
 
    <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
    <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
@@ -328,6 +332,11 @@
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
+   <Style x:Key="TitleBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderThickness" Value="0"/>
+   </Style>
+
    <Style x:Key="TopPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
@@ -775,12 +784,16 @@
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
 
-
    <Style x:Key="TSFEditor_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
+   <Style x:Key="DialogWindow_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
    <Style x:Key="ParameterList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
       <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
@@ -1572,14 +1585,14 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- EgtCustomWindow -->
+   <!-- EgtCustomWindow --><!--
 
    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
       <Setter Property="TitleBarHeight" Value="30"/>
       <Setter Property="TitleBarBrush" Value="White"/>
       <Setter Property="TitleBarForeground" Value="Black"/>
       <Setter Property="ShowInTaskbar" Value="False"/>
-   </Style>
+   </Style>-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -4006,4 +4019,562 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--EgtCustomWindow-->
+
+   <Style x:Key="AboutBox_Button" TargetType="{x:Type Button}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Padding" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="MinHeight" Value="320"/>
+      <Setter Property="MinWidth" Value="480"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
+               <Grid Background="Transparent" x:Name="WindowRoot">
+                  <Border x:Name="ResizeBorder"
+                          BorderBrush="{StaticResource Icarus_Gray}"
+                          BorderThickness="{StaticResource WindowBorder_Thickness}">
+                     <Grid x:Name="LayoutRoot"
+                           Background="{TemplateBinding Background}">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="{StaticResource TitleBarHeight}"/>
+                           <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+
+                        <!--TitleBar-->
+                        <Grid x:Name="PART_HeaderBar"
+                              Background="White">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+
+                           <Button Command="{Binding AboutBoxCommand}"
+                                   Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                   Style="{StaticResource AboutBox_Button}">
+                              <Image Source="{TemplateBinding Icon}"/>
+                           </Button>
+                           <Grid Grid.Column="1">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <ContentPresenter Content="{TemplateBinding TitlePanel}"  
+                                                VerticalAlignment="Center"/>
+                              <TextBlock Text="{TemplateBinding ProjectName}" 
+                                          ToolTip="{TemplateBinding ProjectPath}"
+                                          Grid.Column="1"
+                                          TextTrimming="CharacterEllipsis"
+                                          FontSize="14"
+                                          VerticalAlignment="Center"
+                                          Background="{StaticResource Icarus_Gray}"
+                                          Padding="5,2,5,3"
+                                          Margin="10,0,0,0"
+                                          Foreground="White"/>
+                              <TextBlock x:Name="PART_MoveRectangle"
+                                          Text="{TemplateBinding Title}" 
+                                          Grid.Column="2"
+                                          TextTrimming="CharacterEllipsis"
+                                          HorizontalAlignment="Stretch" 
+                                          FontSize="14"
+                                          TextAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Width="Auto"
+                                          Foreground="{StaticResource Icarus_Gray}"
+                                          Panel.ZIndex="0"/>
+                           </Grid>
+
+                           <Grid x:Name="WindowControlsGrid" 
+                                 Grid.Column="2" 
+                                 Background="White">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+
+                              <Button x:Name="MinimizeButton"
+                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                       Style="{StaticResource TitleBar_Button}">
+                                 <Image Source="\Resources\Common\Minimize.png"/>
+                              </Button>
+                              <Button x:Name="MaximizeButton"
+                                       Grid.Column="1"
+                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                       Style="{StaticResource TitleBar_Button}">
+                                 <Image Source="\Resources\Common\Maximize.png"/>
+                              </Button>
+                              <Button x:Name="RestoreButton"
+                                       Grid.Column="1"
+                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                       Style="{StaticResource TitleBar_Button}"
+                                       Visibility="Collapsed">
+                                 <Image Source="\Resources\Common\Restore.png"/>
+                              </Button>
+                              <Button x:Name="CloseButton"
+                                       Grid.Column="2"
+                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                       Command="{TemplateBinding CloseCommand}"
+                                       Style="{StaticResource TitleBar_Button}">
+                                 <Image Source="\Resources\Common\Close.png"/>
+                              </Button>
+                           </Grid>
+                        </Grid>
+                        <Grid x:Name="PART_MainContentGrid"
+                              Grid.Row="1"
+                              Panel.ZIndex="10">
+                           <ContentPresenter x:Name="PART_MainContentPresenter"/>
+                        </Grid>
+                     </Grid>
+                  </Border>
+                  <!-- Resize grid to be inserted here -->
+                  <Grid x:Name="PART_ResizeGrid">
+                     <Rectangle x:Name="top"
+                                Height="{StaticResource WindowBorder_Height}"
+                                VerticalAlignment="Top"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"
+                                Margin="5,0,5,0" />
+                     <Rectangle x:Name="bottom"
+                                Height="{StaticResource WindowBorder_Height}"
+                                VerticalAlignment="Bottom"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"
+                                Margin="5,0,5,0" />
+                     <Rectangle x:Name="left"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Left"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"
+                                Margin="0,5,0,5"/>
+                     <Rectangle x:Name="right"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Right"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"
+                                Margin="0,5,0,5"/>
+                     <Rectangle x:Name="bottomLeft"
+                                Height="{StaticResource WindowBorder_Height}"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Bottom"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"/>
+                     <Rectangle x:Name="bottomRight"
+                                Height="{StaticResource WindowBorder_Height}"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Bottom"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"/>
+                     <Rectangle x:Name="topRight"
+                                Height="{StaticResource WindowBorder_Height}"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"/>
+                     <Rectangle
+                        Stroke="{x:Null}"
+                        Fill="Transparent"
+                        HorizontalAlignment="Left"
+                        Width="{StaticResource WindowBorder_Height}"
+                        VerticalAlignment="Top"
+                        Height="{StaticResource WindowBorder_Height}"
+                        x:Name="topLeft" />
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Maximized">
+                     <Setter TargetName="ResizeBorder" Property="BorderThickness" Value="0"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="NoStyle_Window" TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="MinHeight" Value="320"/>
+      <Setter Property="MinWidth" Value="480"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
+               <Grid Background="{TemplateBinding Background}" x:Name="WindowRoot">
+                  <Border x:Name="ResizeBorder"
+                          BorderBrush="{StaticResource Icarus_Gray}"
+                          BorderThickness="{StaticResource WindowBorder_Thickness}">
+                     <Grid x:Name="LayoutRoot">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="{StaticResource TitleBarHeight}"/>
+                           <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+
+                        <Grid x:Name="PART_MainContentGrid"
+                              Grid.Row="1"
+                              Panel.ZIndex="10">
+                           <ContentPresenter x:Name="PART_MainContentPresenter" Grid.Row="1"/>
+                        </Grid>
+                     </Grid>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Maximized">
+                     <Setter TargetName="ResizeBorder" Property="BorderThickness" Value="0"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="Dialog_Window" TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="WindowStyle" Value="None"/>
+      <Setter Property="ResizeMode" Value="NoResize"/>
+      <Setter Property="AllowsTransparency" Value="True"/>
+      <Setter Property="ShowInTaskbar" Value="False"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
+
+               <Grid Background="Transparent" x:Name="WindowRoot">
+
+                  <Grid x:Name="LayoutRoot"
+                        Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+
+                     <!--TitleBar-->
+                     <Border Margin="0,0,0,2.5"
+                             Style="{StaticResource Title_Border}">
+                        <Grid x:Name="PART_HeaderBar">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+
+                           <TextBlock Text="{TemplateBinding Title}" 
+                                      Grid.Column="1"
+                                      TextTrimming="CharacterEllipsis"
+                                      HorizontalAlignment="Stretch" 
+                                      FontSize="14"
+                                      TextAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="Auto"
+                                      Foreground="{StaticResource Icarus_Gray}"
+                                      Panel.ZIndex="0"
+                                      IsEnabled="{TemplateBinding IsActive}"/>
+
+                        </Grid>
+                     </Border>
+
+                     <Border Grid.Row="1"
+                             CornerRadius="4,4,0,0"
+                             Margin="0,2.5,0,0"
+                             Panel.ZIndex="10"
+                             Style="{StaticResource WhiteBottomBlueRow_Border}">
+                        <Grid x:Name="PART_MainContentGrid">
+                           <ContentPresenter x:Name="PART_MainContentPresenter"/>
+                        </Grid>
+                     </Border>
+                  </Grid>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--EgtMainWindow-->
+   <!--
+
+   <Style x:Key="AboutBox_Button" TargetType="{x:Type Button}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Padding" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="MinHeight" Value="320"/>
+      <Setter Property="MinWidth" Value="480"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="WindowChrome.WindowChrome">
+         <Setter.Value>
+            <WindowChrome GlassFrameThickness="1" 
+                          ResizeBorderThickness="4"
+                          CaptionHeight="0"/>
+         </Setter.Value>
+      </Setter>
+
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+
+               <Grid Background="Transparent" x:Name="WindowRoot">
+
+                  <Grid x:Name="LayoutRoot"
+                        Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="{StaticResource TitleBarHeight}"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+
+                     -->
+   <!--TitleBar-->
+   <!--
+                     <Grid x:Name="PART_HeaderBar">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Button Command="{Binding AboutBoxCommand}"
+                                Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                Style="{StaticResource AboutBox_Button}">
+                           <Image Source="{TemplateBinding Icon}"/>
+                        </Button>
+                        <Grid Grid.Column="1">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                           </Grid.ColumnDefinitions>
+                           <ContentPresenter Content="{TemplateBinding TitlePanel}"  
+                                             VerticalAlignment="Center"/>
+                           <TextBlock Text="{TemplateBinding ProjectName}" 
+                                      ToolTip="{TemplateBinding ProjectPath}"
+                                      Grid.Column="1"
+                                      TextTrimming="CharacterEllipsis"
+                                      FontSize="14"
+                                      VerticalAlignment="Center"
+                                      Background="{StaticResource Icarus_Gray}"
+                                      Padding="5,2,5,3"
+                                      Margin="10,0,0,0"
+                                      Foreground="White"
+                                      IsEnabled="{TemplateBinding IsActive}"/>
+                           <TextBlock Text="{TemplateBinding Title}" 
+                                      Grid.Column="2"
+                                      TextTrimming="CharacterEllipsis"
+                                      HorizontalAlignment="Stretch" 
+                                      FontSize="14"
+                                      TextAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="Auto"
+                                      Foreground="{StaticResource Icarus_Gray}"
+                                      Panel.ZIndex="0"
+                                      IsEnabled="{TemplateBinding IsActive}"/>
+                        </Grid>
+
+                        <Grid x:Name="WindowControlsGrid" 
+                              Grid.Column="2" 
+                              Background="White">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+
+                           <Button x:Name="MinimizeButton"
+                                   Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                   Style="{StaticResource TitleBar_Button}">
+                              <Image Source="\Resources\Common\Minimize.png"/>
+                           </Button>
+                           <Button x:Name="MaximizeButton"
+                                   Grid.Column="1"
+                                   Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                   Style="{StaticResource TitleBar_Button}">
+                              <Image Source="\Resources\Common\Maximize.png"/>
+                           </Button>
+                           <Button x:Name="RestoreButton"
+                                   Grid.Column="1"
+                                   Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                   Visibility="Collapsed"
+                                   Style="{StaticResource TitleBar_Button}">
+                              <Image Source="\Resources\Common\Restore.png"/>
+                           </Button>
+                           <Button x:Name="CloseButton"
+                                   Grid.Column="2"
+                                   Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                   Command="{TemplateBinding CloseCommand}"
+                                   Style="{StaticResource TitleBar_Button}">
+                              <Image Source="\Resources\Common\Close.png"/>
+                           </Button>
+                        </Grid>
+                     </Grid>
+
+                     <Grid x:Name="PART_MainContentGrid"
+                           Grid.Row="1"
+                           Panel.ZIndex="10">
+                        <ContentPresenter x:Name="PART_MainContentPresenter"/>
+                     </Grid>
+                  </Grid>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="NoStyle_Window" TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="MinHeight" Value="320"/>
+      <Setter Property="MinWidth" Value="480"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="WindowChrome.WindowChrome">
+         <Setter.Value>
+            <WindowChrome GlassFrameThickness="1" 
+                              ResizeBorderThickness="4"
+                              CaptionHeight="0"/>
+         </Setter.Value>
+      </Setter>
+
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+
+               <Grid Background="Transparent" x:Name="WindowRoot">
+
+                  <Grid x:Name="LayoutRoot"
+                              Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="{StaticResource TitleBarHeight}"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+
+                     <Grid x:Name="PART_MainContentGrid"
+                                  Grid.Row="1"
+                                  Panel.ZIndex="10">
+                        <ContentPresenter x:Name="PART_MainContentPresenter" Grid.Row="1"/>
+                     </Grid>
+                  </Grid>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="Dialog_Window" TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="WindowStyle" Value="None"/>
+      <Setter Property="ResizeMode" Value="NoResize"/>
+      <Setter Property="AllowsTransparency" Value="True"/>
+      <Setter Property="ShowInTaskbar" Value="False"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="WindowChrome.WindowChrome">
+         <Setter.Value>
+            <WindowChrome GlassFrameThickness="1" 
+                          ResizeBorderThickness="4"
+                          CaptionHeight="0"/>
+         </Setter.Value>
+      </Setter>
+
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib48:EgtMainWindow}">
+
+               <Grid Background="Transparent" x:Name="WindowRoot">
+
+                  <Grid x:Name="LayoutRoot"
+                        Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+
+                     -->
+   <!--TitleBar-->
+   <!--
+                     <Border Margin="0,0,0,2.5"
+                             Style="{StaticResource Title_Border}">
+                        <Grid x:Name="PART_HeaderBar">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+
+                           <TextBlock Text="{TemplateBinding Title}" 
+                                      Grid.Column="1"
+                                      TextTrimming="CharacterEllipsis"
+                                      HorizontalAlignment="Stretch" 
+                                      FontSize="14"
+                                      TextAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="Auto"
+                                      Foreground="{StaticResource Icarus_Gray}"
+                                      Panel.ZIndex="0"
+                                      IsEnabled="{TemplateBinding IsActive}"/>
+
+                        </Grid>
+                     </Border>
+
+                     <Border Grid.Row="1"
+                             CornerRadius="4,4,0,0"
+                             Margin="0,2.5,0,0"
+                             Panel.ZIndex="10"
+                             Style="{StaticResource WhiteBottomBlueRow_Border}">
+                        <Grid x:Name="PART_MainContentGrid">
+                           <ContentPresenter x:Name="PART_MainContentPresenter"/>
+                        </Grid>
+                     </Border>
+                  </Grid>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
 </ResourceDictionary>