From 4db56e7e096bfebb979e87c9423ea4c4e53601bd Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Sat, 9 Jul 2016 19:17:02 +0000
Subject: [PATCH] EgtCAM5 : - Migliorie varie.

---
 Application.xaml.vb                           |   5 +
 Base/TabViewModel.vb                          |   9 +-
 EgtCAM5.vbproj                                |  21 ++-
 EgtCAM5Resources.xaml                         |   3 +
 MainWindow/MainWindowViewModel.vb             |  20 ++-
 .../GridViewPanel/GridViewPanelView.xaml      |   3 +-
 .../DrawOptionPanel/DrawOptionPanelView.xaml  |   4 +
 .../DrawOptionPanelViewModel.vb               |  74 +++++++-
 .../ManageLayerExpander/LayerTreeView.vb      |  18 ++
 .../ManageLayerExpanderView.xaml              |   3 +-
 .../ManageLayerExpanderViewModel.vb           |  13 --
 .../OperationExpanderView.xaml                |  33 ++++
 .../OperationExpanderView.xaml.vb             |   3 +
 .../OperationExpanderViewModel.vb             | 167 ++++++++++++++++++
 .../OperationExpander/OperationListBox.vb     |  75 ++++++++
 ProjectPage/ProjectViewModel.vb               |  71 +++++++-
 Resources/TopCommandBar/Exec.png              | Bin 0 -> 973 bytes
 Resources/TopCommandBar/Export.png            | Bin 0 -> 903 bytes
 Resources/TopCommandBar/Import.png            | Bin 0 -> 776 bytes
 Resources/TopCommandBar/Insert.png            | Bin 0 -> 747 bytes
 Resources/TopCommandBar/New.png               | Bin 0 -> 538 bytes
 Resources/TopCommandBar/Open.png              | Bin 0 -> 647 bytes
 Resources/TopCommandBar/Save.png              | Bin 0 -> 610 bytes
 Resources/TopCommandBar/SaveAs.png            | Bin 0 -> 951 bytes
 TopCommandBar/TopCommandBarView.xaml          |  32 +++-
 25 files changed, 510 insertions(+), 44 deletions(-)
 create mode 100644 ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml
 create mode 100644 ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
 create mode 100644 ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderViewModel.vb
 create mode 100644 ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationListBox.vb
 create mode 100644 Resources/TopCommandBar/Exec.png
 create mode 100644 Resources/TopCommandBar/Export.png
 create mode 100644 Resources/TopCommandBar/Import.png
 create mode 100644 Resources/TopCommandBar/Insert.png
 create mode 100644 Resources/TopCommandBar/New.png
 create mode 100644 Resources/TopCommandBar/Open.png
 create mode 100644 Resources/TopCommandBar/Save.png
 create mode 100644 Resources/TopCommandBar/SaveAs.png

diff --git a/Application.xaml.vb b/Application.xaml.vb
index 3190f1f..034d211 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -1,4 +1,5 @@
 Imports EgtCAM5.EgtCAM5
+
 Class Application
 
    ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
@@ -25,6 +26,10 @@ Class Application
    Friend Const CLOSEAPPLICATION As String = "CloseApplication"
    Friend Const PROJECTPAGE_SELECTED As String = "ProjectPage_Selected"
    Friend Const PROJECTPAGE_DESELECTED As String = "ProjectPage_Deselected"
+   Friend Const PROJECTPAGE_DRAWMODE As String = "ProjectPage_DrawMode"
+   Friend Const PROJECTPAGE_MACHININGMODE As String = "ProjectPage_MachiningMode"
+   Friend Const RESETSTATUS As String = "ResetStatus"
+   Friend Const LOADOPERATIONLIST As String = "LoadOperationList"
 
    ' ProjectPage messages
    Friend Const NOTIFYCURRPOS As String = "NotifyCurrPos"
diff --git a/Base/TabViewModel.vb b/Base/TabViewModel.vb
index 1670e91..cc267f5 100644
--- a/Base/TabViewModel.vb
+++ b/Base/TabViewModel.vb
@@ -3,13 +3,16 @@
    Public Class TabViewModel
       Inherits ViewModelBase
 
-      Private m_sTabName As String
-      Public Property sTabName As String
+      Friend m_sTabName As String
+      Public Overridable Property sTabName As String
          Get
             Return m_sTabName
          End Get
          Set(value As String)
-            m_sTabName = value
+            If value <> m_sTabName Then
+               m_sTabName = value
+               OnPropertyChanged("sTabName")
+            End If
          End Set
       End Property
 
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index d273169..b6099bf 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -152,6 +152,11 @@
       <DependentUpon>ManageLayerExpanderView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderViewModel.vb" />
+    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationExpander\OperationExpanderView.xaml.vb">
+      <DependentUpon>OperationExpanderView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationExpander\OperationExpanderViewModel.vb" />
+    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationExpander\OperationListBox.vb" />
     <Compile Include="ProjectPage\ProjectView.xaml.vb">
       <DependentUpon>ProjectView.xaml</DependentUpon>
     </Compile>
@@ -220,6 +225,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationExpander\OperationExpanderView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ProjectPage\ProjectView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -287,7 +296,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Internals\" />
-    <Folder Include="ProjectPage\OptionPanel\MachiningOptionPanel\" />
+    <Folder Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationPropertyExpander\" />
     <Folder Include="Resources\OptionPanel\DrawOptionPanel\" />
     <Folder Include="Resources\OptionPanel\MachiningOptionPanel\" />
     <Folder Include="Resources\ProjectPage\" />
@@ -383,6 +392,16 @@
     <Resource Include="Resources\TreeView\Text.ico" />
     <Resource Include="Resources\TreeView\Vector.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Exec.png" />
+    <Resource Include="Resources\TopCommandBar\Export.png" />
+    <Resource Include="Resources\TopCommandBar\Import.png" />
+    <Resource Include="Resources\TopCommandBar\Insert.png" />
+    <Resource Include="Resources\TopCommandBar\New.png" />
+    <Resource Include="Resources\TopCommandBar\Open.png" />
+    <Resource Include="Resources\TopCommandBar\Save.png" />
+    <Resource Include="Resources\TopCommandBar\SaveAs.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index 1403c93..6b0d700 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -74,6 +74,9 @@
       <Setter Property="Width" Value="30"/>
    </Style>
 
+   <Style x:Key="DrawOptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+   </Style>
+
    <Style x:Key="EgtCAM5_LampToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index b1d7693..ae5273e 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -128,7 +128,7 @@ Namespace EgtCAM5
          ' INITIALIZE EGALTECH ENVIRONMENT
          InitializeEgtEnvironment()
 
-
+         AddHandler Application.Current.MainWindow.KeyDown, AddressOf MainWindow_KeyDown
          ' INITIALIZE GRAPHICS
          TabList.Add(New ProjectViewModel)
          TabList.Add(New ToolsDbViewModel)
@@ -442,6 +442,24 @@ Namespace EgtCAM5
          End If
       End Sub
 
+#End Region
+
+#Region "Events"
+
+      Private Sub MainWindow_KeyDown(ByVal sender As System.Object, ByVal e As KeyEventArgs)
+         ' Con ESC esco dall'azione corrente
+         If e.Key = Key.Escape Then
+            ' reset Azione corrente
+            Application.Msn.NotifyColleagues(Application.RESETSTATUS)
+            ' reset Analisi e Distanza
+            'chkAnalyze.Checked = False
+            'chkGetDist.Checked = False
+            ' pulisco output
+            Application.Msn.NotifyColleagues(Application.NOTIFYSTATUSOUTPUT, "")
+            Application.Msn.NotifyColleagues(Application.RESETINPUTBOX)
+         End If
+      End Sub
+
 #End Region
 
    End Class
diff --git a/ProjectPage/GridViewPanel/GridViewPanelView.xaml b/ProjectPage/GridViewPanel/GridViewPanelView.xaml
index 6c78dc4..497ce14 100644
--- a/ProjectPage/GridViewPanel/GridViewPanelView.xaml
+++ b/ProjectPage/GridViewPanel/GridViewPanelView.xaml
@@ -12,7 +12,6 @@
       <RadioButton Style="{StaticResource EgtCAM5_RadioButton}" Command="{Binding ShadingCommand}">
          <Image Source="/Resources/GridViewPanel/RenderingSH.png" Stretch="Uniform"/>
       </RadioButton>
-      <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Background="LightGray"/>
       <Button Style="{StaticResource EgtCAM5_Button}" Command="{Binding ZoomAllCommand}">
          <Image Source="/Resources/GridViewPanel/ZoomAll.png" Stretch="Uniform"/>
       </Button>
@@ -22,6 +21,7 @@
       <Button Style="{StaticResource EgtCAM5_Button}" Command="{Binding ZoomOutCommand}">
          <Image Source="/Resources/GridViewPanel/ZoomOut.png" Stretch="Uniform"/>
       </Button>
+      <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Background="LightGray"/>
       <Button Style="{StaticResource EgtCAM5_Button}" Command="{Binding TopViewCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromTOP.png" Stretch="Uniform"/>
       </Button>
@@ -58,6 +58,7 @@
       <ToggleButton Style="{StaticResource EgtCAM5_ToggleButton}" Command="{Binding GetDistCommand}">
          <Image Source="/Resources/GridViewPanel/GetDist.png" Stretch="Uniform"/>
       </ToggleButton>
+      <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Background="LightGray"/>
       <Button Style="{StaticResource EgtCAM5_Button}" Command="{Binding CPlaneTopCommand}">
          <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
       </Button>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelView.xaml
index 2e6e721..cfe00f6 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelView.xaml
@@ -3,6 +3,10 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="200">
 
    <StackPanel Background="DarkGray">
+      <UniformGrid Rows="1">
+         <RadioButton Style="{StaticResource DrawOptionPanel_ToggleButton}" Content="DRAW" Height="30" IsChecked="{Binding DrawIsChecked}"/>
+         <RadioButton Style="{StaticResource DrawOptionPanel_ToggleButton}" Content="MACHINING" Height="30" IsChecked="{Binding WorkIsChecked}"/>
+      </UniformGrid>
       <!--ContentPresenter that contains the ManageLayerExpander-->
       <ContentPresenter Content="{Binding ManageLayerExpander}"/>
       <!--ContentPresenter that contains the InfoExpander-->
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
index 79f7360..9b060ff 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/DrawOptionPanelViewModel.vb
@@ -1,17 +1,70 @@
-Namespace EgtCAM5
+Imports EgtUILib
+
+Namespace EgtCAM5
 
    Public Class DrawOptionPanelViewModel
       Inherits ViewModelBase
 
-      ' GRAPHICAL ELEMENTS
-      Private m_ManageLayerExpander As ManageLayerExpanderView
-      Public ReadOnly Property ManageLayerExpander As ManageLayerExpanderView
+      Private m_DrawIsChecked As Boolean
+      Public Property DrawIsChecked As Boolean
          Get
-            If IsNothing(m_ManageLayerExpander) Then
-               m_ManageLayerExpander = New ManageLayerExpanderView
-               m_ManageLayerExpander.DataContext = New ManageLayerExpanderViewModel
+            Return m_DrawIsChecked
+         End Get
+         Set(value As Boolean)
+            If value <> m_DrawIsChecked Then
+               m_DrawIsChecked = value
+               If value Then
+                  Application.Msn.NotifyColleagues(Application.PROJECTPAGE_DRAWMODE)
+                  EgtResetCurrMachGroup()
+                  EgtZoom(ZM.ALL)
+               End If
+               OnPropertyChanged("ManageLayerExpander")
+            End If
+         End Set
+      End Property
+
+      Private m_WorkIsChecked As Boolean
+      Public Property WorkIsChecked As Boolean
+         Get
+            Return m_WorkIsChecked
+         End Get
+         Set(value As Boolean)
+            If value <> m_WorkIsChecked Then
+               m_WorkIsChecked = value
+               If value Then
+                  Application.Msn.NotifyColleagues(Application.PROJECTPAGE_MACHININGMODE)
+                  Dim nId = EgtGetFirstMachGroup()
+                  If nId <> GDB_ID.NULL Then
+                     EgtSetCurrMachGroup(nId)
+                  Else
+                     EgtAddMachGroup("Mach01", "CMS-PF122R8RR")
+                  End If
+                  EgtZoom(ZM.ALL)
+                  Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST)
+               End If
+               OnPropertyChanged("ManageLayerExpander")
+            End If
+         End Set
+      End Property
+
+      ' GRAPHICAL ELEMENTS
+      Private m_OperationExpander As OperationExpanderView
+      Private m_ManageLayerExpander As ManageLayerExpanderView
+      Public ReadOnly Property ManageLayerExpander As ContentControl
+         Get
+            If m_DrawIsChecked Then
+               If IsNothing(m_ManageLayerExpander) Then
+                  m_ManageLayerExpander = New ManageLayerExpanderView
+                  m_ManageLayerExpander.DataContext = New ManageLayerExpanderViewModel
+               End If
+               Return m_ManageLayerExpander
+            Else
+               If IsNothing(m_OperationExpander) Then
+                  m_OperationExpander = New OperationExpanderView
+                  m_OperationExpander.DataContext = New OperationExpanderViewModel
+               End If
+               Return m_OperationExpander
             End If
-            Return m_ManageLayerExpander
          End Get
       End Property
 
@@ -37,6 +90,11 @@
          End Get
       End Property
 
+      Sub New()
+         ' Inizializzo la selezione della modilità Draw all'apertura del programma
+         DrawIsChecked = True
+      End Sub
+
    End Class
 
 End Namespace
\ No newline at end of file
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb
index 214aa25..5c90cc6 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb
@@ -11,6 +11,24 @@ Public Class LayerTreeViewItem
       End Get
    End Property
 
+   ''' <summary>
+   ''' Property that determines if the Tool is selected or not
+   ''' </summary>
+   Public Overrides Property IsSelected As Boolean
+      Get
+         Return m_isSelected
+      End Get
+      Set(value As Boolean)
+         If (value <> m_isSelected) Then
+            m_isSelected = value
+            If value Then
+               ' recupero l'Id del nuovo oggetto selezionato
+               Application.Msn.NotifyColleagues(Application.UPDATEOBJINOBJTREE, Me.Id)
+            End If
+         End If
+      End Set
+   End Property
+
    Private m_Items As New ObservableCollection(Of LayerTreeViewItem)
    Public Property Items As ObservableCollection(Of LayerTreeViewItem)
       Get
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
index 396ce1a..3fae2b0 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
@@ -10,9 +10,8 @@
             <Ellipse Height="10" Width="10" Fill="{Binding HeaderColor}" />
          </StackPanel>
       </Expander.Header>
-      <StackPanel>
 
-         <TextBox/>
+      <StackPanel>
 
          <UniformGrid Rows="1">
             <Button Content="New Part" Command="{Binding NewPartCommand}"  Height="40"/>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
index c8cd946..e03e48d 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
@@ -378,19 +378,6 @@ Namespace EgtCAM5
          End If
       End Sub
 
-      'Private Sub ObjTree_AfterSelect(ByVal sender As Object, ByVal e As TreeViewEventArgs) Handles TreeView1.AfterSelect
-      '   ' verifico che il select derivi da azione utente
-      '   If e.Action = TreeViewAction.Unknown Then
-      '      Return
-      '   End If
-      '   ' recupero l'Id del nuovo oggetto selezionato
-      '   Dim nId As Integer
-      '   If Not Int32.TryParse(e.Node.Name, nId) Then
-      '      Return
-      '   End If
-      '   UpdateObjInObjTree(nId)
-      'End Sub
-
       'Private Sub ObjTree_MouseUp(ByVal sender As Object, e As MouseEventArgs) Handles TreeView1.MouseUp
       '   ' determino Id di eventuale item sotto il mouse
       '   Dim nId As Integer = GDB_ID.NULL
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml
new file mode 100644
index 0000000..7908bdc
--- /dev/null
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml
@@ -0,0 +1,33 @@
+<UserControl x:Class="OperationExpanderView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <Expander Header="Operations List" IsExpanded="{Binding IsExpanded}">
+
+      <StackPanel>
+
+         <UniformGrid Rows="1">
+            <Button Content="New Machining" Command="{Binding NewMachiningCommand}"  Height="40"/>
+            <Button Content="New Positioning" Command="{Binding NewPositioningCommand}"  Height="40"/>
+            <Button Content="Cancel Operation" Command="{Binding CancelOperationCommand}"  Height="40"/>
+         </UniformGrid>
+         <ListBox ItemsSource="{Binding OperationList}" SelectedItem="{Binding SelectedOperation}">
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                     </Grid.ColumnDefinitions>
+                     <Image Source="{Binding Image}" Height="15" Margin="0,0,5,0"/>
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" Margin="0,0,5,0"/>
+                     <TextBlock Grid.Column="2" Text="{Binding Tool}"/>
+                  </Grid>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
+
+      </StackPanel>
+   </Expander>
+</UserControl>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml.vb b/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
new file mode 100644
index 0000000..966d3cd
--- /dev/null
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
@@ -0,0 +1,3 @@
+Public Class OperationExpanderView
+
+End Class
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderViewModel.vb
new file mode 100644
index 0000000..2a792bc
--- /dev/null
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -0,0 +1,167 @@
+Imports System.Collections.ObjectModel
+Imports EgtUILib
+
+Namespace EgtCAM5
+
+   Public Class OperationExpanderViewModel
+      Inherits ViewModelBase
+
+      Private m_IsExpanded As Boolean
+      Public Property IsExpanded As Boolean
+         Get
+            Return m_IsExpanded
+         End Get
+         Set(value As Boolean)
+            If value <> m_IsExpanded Then
+               m_IsExpanded = value
+               OnPropertyChanged("IsExpanded")
+            End If
+         End Set
+      End Property
+      Private m_OperationList As New ObservableCollection(Of OperationListBoxItem)
+      Public Property OperationList As ObservableCollection(Of OperationListBoxItem)
+         Get
+            Return m_OperationList
+         End Get
+         Set(value As ObservableCollection(Of OperationListBoxItem))
+            m_OperationList = value
+         End Set
+      End Property
+
+      Private m_SelectedOperation As OperationListBoxItem
+      Public Property SelectedOperation As OperationListBoxItem
+         Get
+            Return m_SelectedOperation
+         End Get
+         Set(value As OperationListBoxItem)
+            m_SelectedOperation = value
+         End Set
+      End Property
+
+      ' Definizione comandi
+      Private m_cmdNewMachining As ICommand
+      Private m_cmdNewPositioning As ICommand
+      Private m_cmdCancelOperation As ICommand
+
+      Sub New()
+         Application.Msn.Register(Application.LOADOPERATIONLIST, Sub()
+                                                                    LoadOperationList()
+                                                                 End Sub)
+      End Sub
+#Region "COMMANDS"
+
+#Region "NewMachiningCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Point.
+      ''' </summary>
+      Public ReadOnly Property NewMachiningCommand As ICommand
+         Get
+            If m_cmdNewMachining Is Nothing Then
+               m_cmdNewMachining = New RelayCommand(AddressOf NewMachining, AddressOf CanNewMachining)
+            End If
+            Return m_cmdNewMachining
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the PointCommand.
+      ''' </summary>
+      Public Sub NewMachining(ByVal param As Object)
+
+      End Sub
+
+      ''' <summary>
+      ''' Returns always true.
+      ''' </summary>
+      Private Function CanNewMachining(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' NewMachiningCommand
+
+#Region "NewPositioningCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Point.
+      ''' </summary>
+      Public ReadOnly Property NewPositioningCommand As ICommand
+         Get
+            If m_cmdNewPositioning Is Nothing Then
+               m_cmdNewPositioning = New RelayCommand(AddressOf NewPositioning, AddressOf CanNewPositioning)
+            End If
+            Return m_cmdNewPositioning
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the PointCommand.
+      ''' </summary>
+      Public Sub NewPositioning(ByVal param As Object)
+
+      End Sub
+
+      ''' <summary>
+      ''' Returns always true.
+      ''' </summary>
+      Private Function CanNewPositioning(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' NewPositioningCommand
+
+#Region "CancelOperationCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Point.
+      ''' </summary>
+      Public ReadOnly Property CancelOperationCommand As ICommand
+         Get
+            If m_cmdCancelOperation Is Nothing Then
+               m_cmdCancelOperation = New RelayCommand(AddressOf CancelOperation, AddressOf CanCancelOperation)
+            End If
+            Return m_cmdCancelOperation
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the PointCommand.
+      ''' </summary>
+      Public Sub CancelOperation(ByVal param As Object)
+
+      End Sub
+
+      ''' <summary>
+      ''' Returns always true.
+      ''' </summary>
+      Private Function CanCancelOperation(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' CancelOperationCommand
+
+#End Region     ' Commands
+
+      Private Sub LoadOperationList()
+         Dim Id As Integer
+         Dim OpName As String = String.Empty
+         Dim OpType As Integer = 0
+         Dim OpTool As String = String.Empty
+         Id = EgtGetFirstOperation()
+         While Id <> GDB_ID.NULL
+            EgtGetOperationName(Id, OpName)
+            OpType = EgtGetOperationType(Id)
+            Select Case OpType
+               Case MCH_OY.DRILLING, MCH_OY.SAWING, MCH_OY.MILLING, MCH_OY.POCKETING, MCH_OY.MORTISING, MCH_OY.SAWROUGHING, MCH_OY.SAWFINISHING
+                  EgtSetCurrMachining(Id)
+                  EgtGetMachiningParam(MCH_MP.TOOL, OpTool)
+               Case MCH_OY.DISP
+                  OpTool = String.Empty
+            End Select
+            OperationList.Add(New OperationListBoxItem(Id, OpName, OpType, OpTool))
+            Id = EgtGetNextOperation(Id)
+         End While
+      End Sub
+   End Class
+
+End Namespace
\ No newline at end of file
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationListBox.vb b/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationListBox.vb
new file mode 100644
index 0000000..b0788f4
--- /dev/null
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationListBox.vb
@@ -0,0 +1,75 @@
+Imports EgtUILib
+
+Public Class OperationListBoxItem
+
+   Private m_Id As Integer
+   Public Property Id As Integer
+      Get
+         Return m_Id
+      End Get
+      Set(value As Integer)
+         m_Id = value
+      End Set
+   End Property
+
+   Private m_Name As String
+   Public Property Name As String
+      Get
+         Return m_Name
+      End Get
+      Set(value As String)
+         m_Name = value
+      End Set
+   End Property
+
+   Private m_Image As String
+   Public Property Image As String
+      Get
+         Return m_Image
+      End Get
+      Set(value As String)
+         m_Image = value
+      End Set
+   End Property
+
+   Private m_Tool As String
+   Public Property Tool As String
+      Get
+         Return m_Tool
+      End Get
+      Set(value As String)
+         m_Tool = value
+      End Set
+   End Property
+
+   Sub New(Id As Integer, Name As String, Type As Integer, Tool As String)
+      Me.Id = Id
+      Me.Name = Name
+      Me.Image = ConvertTypeToImage(Type)
+      Me.Tool = Tool
+   End Sub
+
+   Private Function ConvertTypeToImage(Type As Integer) As String
+      Select Type
+         Case MCH_OY.DISP
+            Return ""
+         Case MCH_OY.DRILLING
+            Return ""
+         Case MCH_OY.SAWING
+            Return ""
+         Case MCH_OY.MILLING
+            Return ""
+         Case MCH_OY.POCKETING
+            Return ""
+         Case MCH_OY.MORTISING
+            Return ""
+         Case MCH_OY.SAWROUGHING
+            Return ""
+         Case MCH_OY.SAWFINISHING
+            Return ""
+         Case Else
+            Return String.Empty
+      End Select
+   End Function
+
+End Class
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index 92d57da..d6a99f5 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -26,13 +26,14 @@ Namespace EgtCAM5
          Get
             If m_bfirst Then
                SceneHost = New WindowsFormsHost() With {.Child = m_ProjectScene}
+               PreInitializeScene()
                If Not m_ProjectScene.Init() Then
                   EgtOutLog("Error in Project scene creation")
                   ' Chiudo il programma
                   Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATIONCOMMAND)
                End If
                IniFile.m_ProjectSceneContext = m_ProjectScene.GetCtx
-               InitializeEgtProject()
+               PostInitializeScene()
                ' inizializzo gestore lavorazioni
                EgtInitMachMgr(IniFile.m_sMachinesRoot)
                m_bfirst = False
@@ -68,7 +69,7 @@ Namespace EgtCAM5
       Sub New()
          Me.sTabName = EgtMsg(MSG_MAINWINDOW + 1)
          Dim WinPos As New WinPos
-         GetPrivateProfileWinPos(S_GENERAL, "Win1", WinPos.nflag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
+         GetPrivateProfileWinPos(S_GENERAL, "Win1", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
          m_GridViewPanel = New BaseWindowView
          m_GridViewPanel.DataContext = New GridViewPanelViewModel
          WinPosToWindow(m_GridViewPanel, WinPos)
@@ -82,10 +83,15 @@ Namespace EgtCAM5
          m_DrawOptionPanel = New BaseWindowView
          m_DrawOptionPanel.DataContext = New DrawOptionPanelViewModel
          WinPosToWindow(m_DrawOptionPanel, WinPos)
+         GetPrivateProfileWinPos(S_GENERAL, "Win3", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
+         m_DrawOptionPanel = New BaseWindowView
+         m_DrawOptionPanel.DataContext = New DrawOptionPanelViewModel
+         WinPosToWindow(m_DrawOptionPanel, WinPos)
          m_DrawOptionPanel.Show()
          ' Funzione che contiene la registrazione alle funzioni che permettono di visualizzare e nascondere le finestre di disegno
          ManagePanelVisibility()
          ManageClosingApplication()
+         RegisterMainWindowCommands()
          ' Inizializza i parametri della scena
          'InitializeEgtProject()
          RegisterControllerCommands()
@@ -102,7 +108,43 @@ Namespace EgtCAM5
 
 #Region "METHODS"
 
-      Private Sub InitializeEgtProject()
+      Private Sub PreInitializeScene()
+         ' imposto colore di default
+         Dim DefColor As New Color3d(0, 0, 0)
+         GetPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
+         m_ProjectScene.SetDefaultMaterial(DefColor)
+         ' imposto colori sfondo
+         Dim BackTopColor As New Color3d(192, 192, 192)
+         GetPrivateProfileColor(S_SCENE, K_BACKTOP, BackTopColor)
+         Dim BackBotColor As New Color3d(BackTopColor)
+         GetPrivateProfileColor(S_SCENE, K_BACKBOTTOM, BackBotColor)
+         m_ProjectScene.SetViewBackground(BackTopColor, BackBotColor)
+         ' imposto colore di evidenziazione
+         Dim MarkColor As New Color3d(255, 255, 0)
+         GetPrivateProfileColor(S_SCENE, K_MARK, MarkColor)
+         m_ProjectScene.SetMarkMaterial(MarkColor)
+         ' imposto colore per superfici selezionate
+         Dim SelSurfColor As New Color3d(255, 255, 192)
+         GetPrivateProfileColor(S_SCENE, K_SELSURF, SelSurfColor)
+         m_ProjectScene.SetSelSurfMaterial(SelSurfColor)
+         ' imposto tipo e colore del rettangolo di zoom
+         Dim bOutline As Boolean = True
+         Dim ZwColor As New Color3d(0, 0, 0)
+         GetPrivateProfileZoomWin(S_SCENE, K_ZOOMWIN, bOutline, ZwColor)
+         m_ProjectScene.SetZoomWinAttribs(bOutline, ZwColor)
+         ' imposto colore della linea di distanza
+         Dim DstLnColor As New Color3d(255, 0, 0)
+         GetPrivateProfileColor(S_SCENE, K_DISTLINE, DstLnColor)
+         m_ProjectScene.SetDistLineMaterial(DstLnColor)
+         ' imposto parametri OpenGL
+         Dim nDriver As Integer = GetPrivateProfileInt(S_OPENGL, K_DRIVER, 3)
+         Dim b2Buff As Boolean = (GetPrivateProfileInt(S_OPENGL, K_DOUBLEBUFFER, 1) <> 0)
+         Dim nColorBits As Integer = GetPrivateProfileInt(S_OPENGL, K_COLORBITS, 32)
+         Dim nDepthBits As Integer = GetPrivateProfileInt(S_OPENGL, K_DEPTHBITS, 32)
+         m_ProjectScene.SetViewAttributes(nDriver, b2Buff, nColorBits, nDepthBits)
+      End Sub
+
+      Private Sub PostInitializeScene()
          'Impostazioni Controller
          m_Controller.SetScene(m_ProjectScene)
          Dim bLuaReg As Boolean = (GetPrivateProfileInt(S_GENERAL, K_COMMANDLOG, 0) <> 0)
@@ -143,6 +185,7 @@ Namespace EgtCAM5
          ' visualizzazione avanzata dei triangoli costituenti le superfici
          Dim bShowTriaAdv As Boolean = (GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
          EgtSetShowTriaAdv(bShowTriaAdv)
+         Application.Msn.NotifyColleagues(Application.PROJECTPAGE_DRAWMODE)
          ' ObjTree non selezionato
          Application.Msn.NotifyColleagues(Application.UPDATEOBJTREEOLDID, GDB_ID.NULL)
          ' nascondo input box
@@ -180,6 +223,18 @@ Namespace EgtCAM5
                                                                          m_DrawPanel.Visibility = Visibility.Hidden
                                                                          m_DrawOptionPanel.Visibility = Visibility.Hidden
                                                                       End Sub)
+         Application.Msn.Register(Application.PROJECTPAGE_DRAWMODE, Sub()
+                                                                       Me.sTabName = EgtMsg(MSG_MAINWINDOW + 1)
+                                                                       m_GridViewPanel.Visibility = Visibility.Visible
+                                                                       m_DrawPanel.Visibility = Visibility.Visible
+                                                                       m_DrawOptionPanel.Visibility = Visibility.Visible
+                                                                    End Sub)
+         Application.Msn.Register(Application.PROJECTPAGE_MACHININGMODE, Sub()
+                                                                            Me.sTabName = EgtMsg(MSG_MAINWINDOW + 2)
+                                                                            m_GridViewPanel.Visibility = Visibility.Visible
+                                                                            m_DrawPanel.Visibility = Visibility.Hidden
+                                                                            m_DrawOptionPanel.Visibility = Visibility.Visible
+                                                                         End Sub)
 
       End Sub
 
@@ -360,11 +415,11 @@ Namespace EgtCAM5
                                                            m_Controller.ExecuteCommand(Controller.CMD.PLANE)
                                                         End If
                                                      End Sub)
-   Application.Msn.Register(Application.DELETE, Sub()
+         Application.Msn.Register(Application.DELETE, Sub()
                                                          m_Controller.SetLastInteger(GDB_ID.SEL)
                                                          m_Controller.ExecuteCommand(Controller.CMD.DELETE)
                                                       End Sub)
-        Application.Msn.Register(Application.CHANGECOLOR, Sub()
+         Application.Msn.Register(Application.CHANGECOLOR, Sub()
                                                               If (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
                                                                  m_Controller.ExecuteCommand(Controller.CMD.CHANGEALPHA)
                                                               ElseIf (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
@@ -373,7 +428,7 @@ Namespace EgtCAM5
                                                                  m_Controller.ExecuteCommand(Controller.CMD.CHANGECOLOR)
                                                               End If
                                                            End Sub)
-        Application.Msn.Register(Application.BREAKCURVE, Sub()
+         Application.Msn.Register(Application.BREAKCURVE, Sub()
                                                              If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
                                                                 m_Controller.ExecuteCommand(Controller.CMD.BREAKCURVE)
                                                              Else
@@ -459,11 +514,13 @@ Namespace EgtCAM5
                                                               End Sub)
       End Sub
 
-
       Sub RegisterMainWindowCommands()
          Application.Msn.Register(Application.LOADGRIDDATA, Sub()
                                                                LoadGridData()
                                                             End Sub)
+         Application.Msn.Register(Application.RESETSTATUS, Sub()
+                                                              m_Controller.ResetStatus()
+                                                           End Sub)
       End Sub
 
       Private Sub ManageTopCommandBar()
diff --git a/Resources/TopCommandBar/Exec.png b/Resources/TopCommandBar/Exec.png
new file mode 100644
index 0000000000000000000000000000000000000000..649bab6a584ace54abe1d253e60bd0d377e6e3bb
GIT binary patch
literal 973
zcmV;;12X)HP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?16oN$
zK~#9!>{v}mR8bWE3@!gAM-6|AF;b(#9CRT>Hq#;(wnzz!g2EPJ(Iz9IMT=Rq2#joJ
z;vyj^N<v-aLKlr0feU3UGIR`;@|V=H@vjV~`(57*^Kh_v(-;%Xfx~0oyXTwl-E;2w
z&P;^M<wB_04uqhENrg!T+ad!EjA%GnCN5^-M&Wwl`N9W;JA~VWTV2;)w*`c)wIv8L
zmEvL%Zt!FIIM)ht&D%mskjWAkf}1=yWAwOfIEEwoEErP`!!|pJkB%|i8-E9^I=sWX
zg;xr4V?iS&2r)%g;R*bFbWaXiiffS+n}oQi*iGw~*H<vVGLMR$I=ug8ci&!Qx&<-Y
zUz1XH$mS;0T6_y8u{+U`(Rek|iRRHa=v$h>^x_245;9R3pNh);CvZBu1Z%(6&@FbY
zyyw0*G2@?h%pX!#cghCK8jzt&$CvLD$m_fVh%d$Zs_(#<M0_Z@i+#H@F*IjKQAe#O
zm4cKx;Fh2iwaL9hB-Ax(MPB=LQ8Np0UT#5kw#j#}c+PcPe=s>m#w%u0a0BjB7IzIX
zW!#~Pw+}rJ<9Ej4(J2dt&ov=GCD$ha*E5ds#PP<}OiJlP^4PPeSwk{qJ}f6W8@98J
zXf=xz#U^fg&N#*sM=^tfuX(4;?qknW#-e6Qwz9HArEp$&f(Hc`fv6Z&Dj824;;Ha8
zl42W>eTc`Nr_3K?N^6R$Fm?X1s@@n+9O8N7Yb7OLiH(uQW3R>1bg8o5`p(oNO~2O@
ze?XU^!q-YFU%rm$)HL>?K&&9ch$)fM)Ln5K^_OT+;cF#Dah1{`-&{1tK&*e#hV*Bb
zF!N(sezq@+tMIjwlHx@zqp?$Kv1#WFu69{a*j|Ha$5&7MXXm5}Un?o8Q508d8KuJ?
zTl%?-`ram_Kfi*;k#5g@#uG=1wHLltQr3;*?2zJ0Eu(a7Wo@52pcARO+5c26KO&Ct
z#POOQteQzF1DY%Vsy)S(TIS2_b0aXmtVX%D4p`aT%NWOa;<)Fmtp-59WQOAh)t=(o
za{PuWRjixb7gZRT9rg*p^^9Y@*BE07+LX{+S|`PIyQhTzbDj#x$<v=1ozlTh&Bn++
v^iO8=ko`3i(!cw{|0RS;g-Hd;ehV-F+QGR`Pa|<i00000NkvXXu0mjfz&ye-

literal 0
HcmV?d00001

diff --git a/Resources/TopCommandBar/Export.png b/Resources/TopCommandBar/Export.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bcb2f89bc448be360e813ac304e0f47c2aad177
GIT binary patch
literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0~AR_
zK~#9!?3i6hQ(+j#|J%;KP3On9GuuiQj0g%Vih?fsup+%k2@Io;i=ev5yh#WzG${+Q
zF8Tm1@UqB2vM|Y3DkKKe2qhCmHnkF$y3LOr=iJWeoN1}$oF7~6Vt*LtJ@5OTcfa$T
z=lq{@4v%3Ngq!#XLq(t>P{9_lP-owuvrHMqzZi-?9C6W|WUPGivZ35wNNTz!P}nu@
z+s{Z4<Jz9+6@xT>9Yy~T1%oacI<-_17MG6$%6ZcXtHT{WIYlZYxVvAE_$VTLpmO`B
zaL+BlyJ0$F2@$AesjB4(jHc@Ocit!+8mMN+)RGq8kf_G>nn$Q_sr}PuG*iKG^uP7p
zLnFJ%jx3!NG9l0JJQvNt8S6pb%Lm9|wCM5b@M35(G*G|6N-R#FyZe(;N+U`$fp&`*
zrLPO1-<}5ubfJOL5`2{GRzM#ofZ68tJFjPi4~dL{L9IZW)e3oQ5zZehK)FK`d?*gc
zMtPBIa`+<VPZ`Q-;7Ju*Gp)c!+fSgb5GVHKqmoJtZlZG$y8UGgDn5f$@$`?2o<Ak1
zY0x66ug!rOKit3;@3-Jv0vDlUqzHDi6(r@vE`@OMdZ(Ga2rYIiM!L#C(9Y2KR7I~1
z9RuS5=PB3Ew}Sc~9cXPXhLaj0{;PS;6_@a$_}F=U)s{~vewMGg|NPFzH7hfk#Ib++
zo_2p0*0wjjT?~u}B@~zN$K`3@PkGQk!9eJ?!r}7emBD0gd(VO$x{`Udchykb!x|YU
zg~=0m?h)lB&<SbCG{}+FWb+ws;kI?X+IU&g<En=zU2fOXBPA2@j47KWr_0ThV6HC}
z^>HPGeZ(H%UiB9*ABUCaP&t^wf-F3KA^mcNzhim+z9m@g&R6V6+AziN13CGuqu1e9
z`%R>i2XIuM3juoq5`qW02w>OowZ#O_7pWCFdbEUpmfa-BOuu_1b6|mFaSWeIRqaeV
zvo*UkMl83_85(ET>7HpjR$OMJQYm+E!_02OQu573Q{)cy-fB{zZCuR_!i#(gia<r6
d)=0ku7yy^w8XxF5vy1=$002ovPDHLkV1m)jp^g9m

literal 0
HcmV?d00001

diff --git a/Resources/TopCommandBar/Import.png b/Resources/TopCommandBar/Import.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cc008328427e82b929aeaba1f4da8e0b0fd4a11
GIT binary patch
literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0+mTb
zK~#9!V*LOAKf_=HObmk%j5=!6QKOEc2DpCxddltFxA&2x2~<we3IiRp;N!=S|3UcL
zwQDKF>Z3_WUAc0_=E;*Mcci7I<3W5@R#pZc9-f>53#nVTZcTan_U)%{-@g3^;b+gD
z{fDuEQQ1L^8I07bX0BenDh~{erD9@Y*64B{K73#h5D;K^_wL<GVCYHEC82{7v#6-(
z6>JUy0cK`qhTp$`GYAO@iQl+!ql1unI74b#zEw8^BZDZ0FBlo-M)V&$3=17jPR?Et
z5s_d}y1@rX2`v^}64Ig!sh0Y`_|e6;9%gd_QgXnY<s~dE+|SR?uSQI0qKB4-hDHTR
z(YLnLDnd-?KR-4(eYJnG=k~9^4-B2H#5xEBczJmlzJC1*V<(WDrvCk7un`sdi#@(g
z>KQaGJQO%MI7m)=#HKB*j{5zVfrpR#A65-~-_C&zCI=vg7SLgFpfpKRnnDJ9PqH!a
zaKTd*!~bJP85o&ZNpjGaAFK=xg^R(79R&XT`NIdyWU@f!Ly{f!`aLs)Ffer)X#7GF
zeMNF89lnJ~ey?7=I{M|ymuMXworh$F)YF&D3`(+pC@RP9K4xW*)OBI_{{8!BU}?Wd
zRaG^IqQdj-M_@X_k-mrp4_<OG@M*c-1y(s;gd9XLq&|IR0!JOC;Maf7k1{ecDnLwm
zd+Od}7K)<|lqP?E`OrtTMjkby?&@9U&#&J9n?w~yQ7h`c|6sVAGylW~syGT1b<*O0
zDULc|A%2)@ZFEr7i3(EYsO$Hb{yupAuZ}8?`u~rCjg6HGQTLPK4XIIwvq)fMVo?3^
zo#F4HvutEHOMm@lU<Bf8<mhD_9d#LX)TpCI9fbe@0R{ka$ju2?kIG{J0000<MNUMn
GLSTa9cUiFj

literal 0
HcmV?d00001

diff --git a/Resources/TopCommandBar/Insert.png b/Resources/TopCommandBar/Insert.png
new file mode 100644
index 0000000000000000000000000000000000000000..8afe2cfc4414e8b1ab14b7bacd7116c72f17ad9b
GIT binary patch
literal 747
zcmV<H0u=p;P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0(eP8
zK~#9!V*LOAKf_=HObmk%j5=!6QKOC;b<|*Y6bm-N6@^x|Y%C1jtSk&akj20MWDt1u
z{+~n6{1YGO?kHv^hHyLMKjwVg|4_s~ePv?UcZ%fzkZFL+Kt@JJ2OtH*AaDVQ4*;vP
z4HQKm&`~Dn4gvv?n1UpO{<dnX6fBN00Ai2>7C?m>p!fk07XalR0C4~@j$*`CA@6Ch
zd|+q%TOOCD3pdype*Q-AU;h_l$eVtKp)kgQ!Hn-7SnTmjh7VB_j|rlMASkp7fOak*
zIr?DWiRMxUPHsL7aaj`t`|H=Q43Q2F3|(EF433UYaB&p|27&YE&$k;I8die%K!+TF
zIt)Z#0P-)86;f|aHZ#1xwvXZA{;3Q+T;wO*U%*g(_le<9Xzww5po2i6qyP#vpxqNl
z3aR%(5exzX0t^?<Y-g}B{LR45Mt-~N+C4UgAHNtnp<DqVwufc_63Z!O4lu>`_YFl3
z0)dxr7~Xid9@_@xCIInAe2&5yQvW$67~b4E#vsi7i6RI6{Kd%d=^Mi}xViuTe*i{d
z0$CyTpH+b2)`4XV$}+zxa@5@?tPFquF)T$BE`VYZa~~T&(3|h55_J*%$7UfF4F{lU
z3RJFvLau=5koxfQ8G|tUONy%u<fwxJdnnD1t7gFIs7I%^P#$%UF{2I`GK@g#AP`Rk
zvK@$yK2Akj?oW@dQyg`VUow71jyfcVIgniU{rdTvU6|u7#ZmYD2g6;ewWt1ld&{XL
z`-kGF`}dz=5!IS5AKtwCcJ8MfC%F##_xJa|53gVU0Y+UvIr<q#yX~Wn8g<mDqedMy
dOdJIeU;z6Q?l=O==!O6Q002ovPDHLkV1fb7JL&)c

literal 0
HcmV?d00001

diff --git a/Resources/TopCommandBar/New.png b/Resources/TopCommandBar/New.png
new file mode 100644
index 0000000000000000000000000000000000000000..78a5a0b370a7195a57b7a80d2d0a714b7e701a0d
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0jEhs
zK~#9!V*LOAKf_=HObmk%j5=yaJBkIL<nlW|6@XL%8RmY7RAHZhEFe(0L!m3)Y6mY5
zdjwGK0@;pQzx!rSpsRW?IlcvY$N*@00?c!XHtGRD2dM+O4nRHwK8N9T)c2piRY3H`
zYcCnj+;~ouV@xz88T7TpLCkol<q4-QK09EhFC`CE(*OC(&zlSk>>6Y_3I>3dG<NvO
zH4st<j3NhRX~F#<_Rn8`7}(iZzz&;#<Yod88%)o3><2oq5Xjz;X5c~pguZ^y&2O(>
ze+7pa&@rHBya062Ltuz)_|Wh1U_f%8wvuRm-^TNwkR8?^tf&Bt&IbclB<O00-TC<Q
zw>`4MfKj<%pv$QQVCV#t1{*Jb`0V3Ps2Ip$6DTUDC<O5!LRgR!jFEr=y&d)8%$=7f
zpS}LffiCg;?>~une?4)EOLUT5)b9Z*5G`;N7Y)Fms~@e9M;$fls8L6aI%?EWqmCL5
z{XQfB>J~LnVo|P}t^>6lWe>$<11(h%>V(woH=mC$+j51fQ4{5(Q$R=!<LLO*sG~-L
cqW}U70A)I!b-_QHm;e9(07*qoM6N<$f`6&sod5s;

literal 0
HcmV?d00001

diff --git a/Resources/TopCommandBar/Open.png b/Resources/TopCommandBar/Open.png
new file mode 100644
index 0000000000000000000000000000000000000000..616c02b0358c88997f55c1dc475ec979fc1e2ada
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0u)I^
zK~#9!V*LOAKf_=HObmk%j5=!6QKOC;b<|*Y6bm5*tBR~HaI!OeKo<M`hk*lF4@?N|
zKDL68env({2PpFau=aRBv7;8{So!FwGU#h5{lbvjew1wjkXk{&K^uV70w4x?Dgnr6
z06MIJqUZyLkcW);AFOgFT7SiXp@`Q}KnDZ>@dhA10Cmg;pu-3{iV<Ihyt&fqfV<T%
zdtCC@?y)g^{)*p%FW(p#?mqqJm^1&x0chx508#<?qLPJ}IDVo$g@IF09z$H*1c-^y
zFY)+Z9gsQz<!*pRCj&)};^5?B;9zB9*wYcrAR+XRoDAi7cn`yWNIJEA89Vt{1I3PF
z<Pc?eaC8-emELa#QNh1tXZ25CnHXNbXW2?|IrW{}gn@&DgW=ts;}kgv1nxXy`SI+{
zzh;UZ^@Cl7f#EN(Nci!R;zIH1Ylf%51pk0yM=@|pf}>7R{3}Hc0!1Aw3&Sa@R5SmX
z*%@A3J;;EoydoCdd(6V{{~tpKbsWVl&%pNoJvE~4v47{WOH^^xvx|Eeqy)cF9CiQx
zGn}JZE8*>fYYfV=zbTG7U?tv56-Tl0OK>p#ctvs4y?n>;ETaF|VX8RlABTvNwBRR-
z9Q5-SBg5zK49}?6p8Eai)$_;f(gKgKk>{ZQ42%q4-#q>K>o>!6QuHy7cH2iCHR`BQ
hM~ymam^ca`zyNsEzydiX(p>-m002ovPDHLkV1iLQBOU+%

literal 0
HcmV?d00001

diff --git a/Resources/TopCommandBar/Save.png b/Resources/TopCommandBar/Save.png
new file mode 100644
index 0000000000000000000000000000000000000000..0eca26039c38c97a380275d355f192ef802a4768
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0q;pf
zK~#9!V*LOAKf_=HObmk%j5=!6QPc)3xFo)R|1JQe3}|Tg1x`-R4<tDX<e=Yw|L=JH
z_5XL6053Zu2e~fz{+r>~pMU@Vf!LzljGU~@j2=Md0a6{s0CG^^p|=7s{z)HEvV-OP
z!>=4q9=v1FR|Xl!{XvS4ad4!m;sf^>F5dk>ewv~-U}j=unCPL-peN5ecyiz2H-8v<
zKQS}JU;Z{)PK`PW4u1Y2znSy#*FV}gYQ>eWWI5=}lV1$`KK-V=n!yI9J^9XX<I^7o
zTM2fe^;~-Qn_>N%pVX=QaDiLj{xa~t`%RN*Bg;`eI(!Va3hWH`-u)$7k2D_>L+Yo0
z45g<&Fg*G5kGhV^lHp{~5ocq_-20y4-1k33J4%LyiJ{4mkD*eBmm&MYN9rbYTRBdK
zO*g-S9puISAB^>x2<Jvn=+vG6#9$)BMw{IC{0AiXZ3USa-rsx4;4VU3Koc8n6cwH?
z-hF3S`S9Ini9YHml8Xd3X6*8yCT%Z+(ttSX0<fd-yHt^zq5D2+otJd|2ap8zAzuBZ
ziK7_t4R8RvS)d-x2~Y=upM#P2`|tluzsPil6dx1gvrqp%Aopf~U91BnI|}A7AO-4z
wr~ok!rF}hO`hAR}LqVgC8g<kF0e}Dl0MSyjC6W+)8UO$Q07*qoM6N<$f|`sK>;M1&

literal 0
HcmV?d00001

diff --git a/Resources/TopCommandBar/SaveAs.png b/Resources/TopCommandBar/SaveAs.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d5cfaef973eac427f942bac7f5405d3b6bda223
GIT binary patch
literal 951
zcmV;o14#UdP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?14Kzg
zK~#9!?3hhV6G0Tm|GV4nb}7(;@>wbvkOC0|6hWiW6ET=5XuN2G7{C}b5km~>!RW!0
z9)uVVC=opvL5v=h7^6t!L^OgxO8Ah16m3BHC@rO>blsK@575%q7C7{uOm{l-Hv8Mz
zH*e+*!Eqcmnn-Lw`JjAIo|a&xMuWi+!(U>&^-z{&n_PzCRWN0=lusEkV>2QNk`;n>
z7h=lD%`Da<14$`=A>4sN^Po|5vqvYg*7G(qxRMp<_Q<rWbfUo@6G&GC^H5^<KA$~}
zj+^lA^N7>-*%_e-38JCV&Z4ZT9~B}Y5~4i}<tL($8Y^+h-uB6Y7*rfmV26|U3f5va
zm3B|_zdT^84lOd)vryABb7=cMxvc%qgcj#=<3Q82_d<d_S^eWwcGR-=Z%P%qluDQg
zDU#yl5VO?!2Tysp1T@27XpBNhRr}gR^huM&VZTHoL4MsBB>pUt!~Jomws)z|Xy&{F
z)yPljFKUzBeu|<{SCodz5B)g4PiAXd1bf!0_nuFkZ<|D(nn6mi(2fOx+yk*FeB6QR
z)5$2W?ZVOOZfL@Sz3b?M`Z>o2gb+!IGUPmH#ixrII9uHgGeJQRD)Bs2lz_zT-BQQ`
zNepWp`xoNH*b^i`X-y}p3R7_5Q3v|04{`y_DX6R417Mi7;N<%WsLd89?x0|n1lmUG
z)-eT6JZXo&m|sT4jOQGER}_tVojMS67UVFTt;mU0-j*Mk0RfHbk3)D}oQBz6HJ~?o
zHcovtn2}6#2%py5inYF)=(q^<n>f@p597s|6pShdpc<a`eDLhj=xoJVWv0pTOJ_n2
zKVtWD6u42}4e6z~(skbs7a!h+`l0zXGk>ofn}k%0Bd|4rVi^hniP0!;RN4NQWo`+h
zNwRs}69<kDE36f)p$7?3{=z~<NTkalA%I?)_sGtO`R($!#VxSsMX9*_RM}lwko?e9
zs8?BAm}_|&M)>mgziHfHB+#JYmX;NFv{mMZH`n*4J6ss-9dL|H=u1RG^6se4qPJ!s
zKeZOOPC{sYYekU+XPD)*i`fjHVi9gZE#!X(7pkfM=~C7h(&ud6NBE9{d{929b<$q}
Z1^|F<2Cx;T9FG71002ovPDHLkV1oXKwPXMQ

literal 0
HcmV?d00001

diff --git a/TopCommandBar/TopCommandBarView.xaml b/TopCommandBar/TopCommandBarView.xaml
index 2f71f75..94f0f1f 100644
--- a/TopCommandBar/TopCommandBarView.xaml
+++ b/TopCommandBar/TopCommandBarView.xaml
@@ -4,14 +4,30 @@
 
    <!--Barra superiore dei comandi-->
    <StackPanel Orientation="Horizontal" Height="30">
-      <Button Content="New" Command="{Binding NewCommand}"/>
-      <Button Content="Open" Command="{Binding OpenCommand}"/>
-      <Button Content="Save" Command="{Binding SaveCommand}"/>
-      <Button Content="Save as..." Command="{Binding SaveAsCommand}"/>
-      <Button Content="Insert" Command="{Binding InsertCommand}"/>
-      <Button Content="Import" Command="{Binding ImportCommand}"/>
-      <Button Content="Export" Command="{Binding ExportCommand}"/>
-      <Button Content="Execute" Command="{Binding ExecCommand}"/>
+      <Button Command="{Binding NewCommand}">
+            <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding OpenCommand}">
+         <Image Source="/Resources/TopCommandBar/Open.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding SaveCommand}">
+         <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding SaveAsCommand}">
+         <Image Source="/Resources/TopCommandBar/SaveAs.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding InsertCommand}">
+         <Image Source="/Resources/TopCommandBar/Insert.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding ImportCommand}">
+         <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding ExportCommand}">
+         <Image Source="/Resources/TopCommandBar/Export.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding ExecCommand}">
+         <Image Source="/Resources/TopCommandBar/Exec.png" Stretch="Uniform"/>
+      </Button>
    </StackPanel>
 
 </UserControl>