From 3e097b81a644cb2b44ebfd494e20b56d1dcdd099 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 5 Dec 2023 16:26:28 +0100
Subject: [PATCH 01/18] Gestione sfondo ComboBoxList

---
 MachinePanel/MyMachinePanelVM.vb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index 911e899..c02c3e5 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -148,6 +148,7 @@ Public Class MyMachinePanelVM
 
       ' Definisco lo stile della ComboBox
       ToolDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       ToolDbWindowVM.ForegroundCmBxTxBl = Brushes.White
       ToolDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
       ToolDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
@@ -241,6 +242,7 @@ Public Class MyMachinePanelVM
 
       ' Definisco lo stile della ComboBox
       MachDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       MachDbWindowVM.ForegroundCmBxTxBl = Brushes.White
       MachDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
       MachDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)

From 91f86f8682f05b26fc1e5246ffa4ddd78f938a01 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Mon, 22 Jan 2024 15:05:12 +0100
Subject: [PATCH 02/18] Aggiornamento versione

---
 MainWindow/MainWindowM.vb  | 4 ++--
 My Project/AssemblyInfo.vb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 56febe5..1b6c8c6 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -223,8 +223,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2511, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2511, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2512, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2512, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index ec54836..b110fb4 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.11.1")>
-<Assembly: AssemblyFileVersion("2.5.11.1")>
+<Assembly: AssemblyVersion("2.5.12.1")>
+<Assembly: AssemblyFileVersion("2.5.12.1")>
 

From 3d1d62398aba1f26917dc5bfe052a57391b9d91e Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Mon, 22 Jan 2024 15:38:54 +0100
Subject: [PATCH 03/18] Aggiornamento versione 2.6a1

---
 MainWindow/MainWindowM.vb  | 4 ++--
 My Project/AssemblyInfo.vb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 1b6c8c6..8cd907b 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -223,8 +223,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2512, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2512, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2601, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2601, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index b110fb4..6fa4394 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.12.1")>
-<Assembly: AssemblyFileVersion("2.5.12.1")>
+<Assembly: AssemblyVersion("2.6.1.1")>
+<Assembly: AssemblyFileVersion("2.6.1.1")>
 

From ce3ff4e3d65711fa19ff66a54ce0b694d52012fe Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Tue, 23 Jan 2024 12:14:10 +0100
Subject: [PATCH 04/18] OmagOFFICE : - correzione inizializzazione lavorazioni
 compatibili con materiale e spessore.

---
 CurrMachWindow/CurrMachWindowVM.vb | 16 ++++++++--------
 OmagOFFICE.vbproj                  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CurrMachWindow/CurrMachWindowVM.vb b/CurrMachWindow/CurrMachWindowVM.vb
index a0084ef..66a8849 100644
--- a/CurrMachWindow/CurrMachWindowVM.vb
+++ b/CurrMachWindow/CurrMachWindowVM.vb
@@ -456,28 +456,28 @@ Public Class CurrMachWindowVM
                ' --- DRILL ---
                CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrDrillingList.Count = 0 Then
+               If m_CurrDrillingList.Count <= 1 Then
                   CurrentMachine.sCurrDrilling = String.Empty
                End If
 
                ' --- MILL ---
                CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrMillingList.Count = 0 Then
+               If m_CurrMillingList.Count <= 1 Then
                   CurrentMachine.sCurrMilling = String.Empty
                End If
 
                ' --- SCASSO ---
                CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrPocketingList.Count = 0 Then
+               If m_CurrPocketingList.Count <= 1 Then
                   CurrentMachine.sCurrPocketing = String.Empty
                End If
 
                ' --- WATERJET ---
                CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrWaterjettingList.Count = 0 Then
+               If m_CurrWaterjettingList.Count <= 1 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
                m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)
@@ -487,28 +487,28 @@ Public Class CurrMachWindowVM
                ' --- DRILL ---
                CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrDrillingList.Count = 0 Then
+               If m_CurrDrillingList.Count <= 1 Then
                   CurrentMachine.sCurrDrilling = String.Empty
                End If
 
                ' --- MILL ---
                CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrMillingList.Count = 0 Then
+               If m_CurrMillingList.Count <= 1 Then
                   CurrentMachine.sCurrMilling = String.Empty
                End If
 
                ' --- SCASSO ---
                CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrPocketingList.Count = 0 Then
+               If m_CurrPocketingList.Count <= 1 Then
                   CurrentMachine.sCurrPocketing = String.Empty
                End If
 
                ' --- WATERJET ---
                CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrWaterjettingList.Count = 0 Then
+               If m_CurrWaterjettingList.Count <= 1 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
                m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)
diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj
index 37c0c2c..84e832e 100644
--- a/OmagOFFICE.vbproj
+++ b/OmagOFFICE.vbproj
@@ -128,8 +128,8 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
+    <Reference Include="DotNetZip">
+      <HintPath>..\..\EgtProg\OmagOFFICE\DotNetZip.dll</HintPath>
     </Reference>
     <Reference Include="EgtPHOTOLib, Version=2.3.1.1, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>

From 3a76d6c91a771f8644e33d5b7d2c46d1e0905e4c Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Wed, 24 Jan 2024 11:55:47 +0100
Subject: [PATCH 05/18] Modificata disposizione comandi

---
 MachinePanel/MachinePanelV.xaml          |  14 ++++---
 OmagOFFICE.vbproj                        |   3 ++
 OptionPanel/MachiningTab/SplitModeV.xaml |  47 ++++++++++++-----------
 Project/ProjectV.xaml                    |  40 +++++++++++++++----
 Resources/NewIcons/DB-WJ.png             | Bin 0 -> 5719 bytes
 5 files changed, 68 insertions(+), 36 deletions(-)
 create mode 100644 Resources/NewIcons/DB-WJ.png

diff --git a/MachinePanel/MachinePanelV.xaml b/MachinePanel/MachinePanelV.xaml
index 117e790..74d451b 100644
--- a/MachinePanel/MachinePanelV.xaml
+++ b/MachinePanel/MachinePanelV.xaml
@@ -9,17 +9,19 @@
             Height="20" Width="150"/>-->
 
     <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="Uniform"/>
+        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="Uniform"/>
     </Button>
     <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="UniformToFill"/>
-    </Button>
-    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
+        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="UniformToFill"/>
     </Button>
     <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}" Style="{StaticResource ToolBar_Button}">
         <Image Source="/Resources/NewIcons/ToolChangerPos.png" Stretch="Uniform" />
     </Button>
     <Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
-           Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
+           Style="{StaticResource ToolBar_Button}" Visibility="{Binding WjDb_Visibility}">
+        <Image Source="/Resources/NewIcons/DB-WJ.png" Stretch="UniformToFill"/>
+    </Button>
+    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
+        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
+    </Button>
 </DockPanel>
diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj
index 84e832e..4107fff 100644
--- a/OmagOFFICE.vbproj
+++ b/OmagOFFICE.vbproj
@@ -960,6 +960,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Linea-Copia.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\DB-WJ.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe
diff --git a/OptionPanel/MachiningTab/SplitModeV.xaml b/OptionPanel/MachiningTab/SplitModeV.xaml
index 10ffd8b..001bde6 100644
--- a/OptionPanel/MachiningTab/SplitModeV.xaml
+++ b/OptionPanel/MachiningTab/SplitModeV.xaml
@@ -378,7 +378,7 @@
                   ExpandDirection="Down" IsExpanded="{Binding bDirectSpLitCut_IsExpanded}">
 
                 <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
-                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="Crea" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding CreateCut_IsChecked}"
@@ -393,7 +393,7 @@
                         </ToggleButton>
                     </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="Elimina" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding RemoveCut_IsChecked}"
@@ -408,7 +408,7 @@
                         </ToggleButton>
                     </StackPanel>
 
-                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="Copia" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding CreateParallelCut_IsChecked}"
@@ -422,7 +422,7 @@
                             </StackPanel>
                         </ToggleButton>
                     </StackPanel>
-                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="Muovi" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding ModifyCut_IsChecked}"
@@ -492,7 +492,25 @@
                             </Button>
                         </StackPanel>
 
-                        <StackPanel Visibility="{Binding OutCenEndBtnVisibility}" Margin="1,0,0,0">
+                        <StackPanel Margin="1,0,0,0">
+                            <Button ToolTip="{Binding ModifStartMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding ModifStartCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                            
+                        </StackPanel>
+
+                    </UniformGrid>
+
+                    <UniformGrid Columns="4" Margin="0,0,0,1">
+                        <StackPanel Margin="1,0,0,0" Visibility="{Binding OutCenEndBtnVisibility}">
                             <Button ToolTip="{Binding OutCenEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding OutCenEndCommand}"
@@ -506,10 +524,6 @@
                             </Button>
                         </StackPanel>
 
-                    </UniformGrid>
-
-                    <UniformGrid Columns="4" Margin="0,0,0,1">
-
                         <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
                             <Button ToolTip="{Binding AllOutEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
@@ -538,20 +552,7 @@
                             </Button>
                         </StackPanel>
 
-                        <StackPanel Margin="1,0,0,0">
-                            <Button ToolTip="{Binding ModifStartMsg}"
-                       Style="{StaticResource Split_Button_Img}"
-                       Command="{Binding ModifStartCommand}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
-                            Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </Button>
-                        </StackPanel>
-
+                        
                         <StackPanel Margin="1,0,0,0">
                             <Button ToolTip="{Binding ModifEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
diff --git a/Project/ProjectV.xaml b/Project/ProjectV.xaml
index 25e6a97..311ff96 100644
--- a/Project/ProjectV.xaml
+++ b/Project/ProjectV.xaml
@@ -11,14 +11,40 @@
     </DockPanel>
 
     <DockPanel x:Name="TOPTRAY" DockPanel.Dock="Top" Background="Transparent">
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">
+        <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">-->
+        <!--<DockPanel>
+            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}" DockPanel.Dock="Left"/>
+            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}" />
+            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}" />
+            <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}" DockPanel.Dock="Right"/>
+            <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}" DockPanel.Dock="Right"/>
+            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}" DockPanel.Dock="Right"/>
+        </DockPanel>-->
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="7*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="19.75*"/>
+                <ColumnDefinition Width="7*"/>
+                <ColumnDefinition Width="3*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="0.25*"/>
+            </Grid.ColumnDefinitions>
+            <OmagOFFICE:MachinePanelV Grid.Column="0" DataContext="{StaticResource MachinePanelVM}"/>
+            <OmagOFFICE:VeinMatchPanelV Grid.Column="1" DataContext="{StaticResource VeinMatchPanelVM}"/>
+            <OmagOFFICE:PrintPanelV Grid.Column="2" DataContext="{StaticResource PrintPanelVM}"/>
+            <OmagOFFICE:ShowPanelV Grid.Column="5" DataContext="{StaticResource ShowPanelVM}"/>
+            <OmagOFFICE:ViewPanelV Grid.Column="4" DataContext="{StaticResource ViewPanelVM}"/>
+            <OmagOFFICE:InstrumentPanelV  Grid.Column="6" DataContext="{StaticResource InstrumentPanelVM}"/>
+        </Grid>
+        <!--<OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
+            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
+        <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
             <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
             <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
-            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
-            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
-            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
-            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
-        </StackPanel>
+            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>-->
+        <!--</StackPanel>-->
     </DockPanel>
 
     <DockPanel x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom" Background="Transparent">
@@ -36,5 +62,5 @@
     </DockPanel>
 
     <OmagOFFICE:SceneHostV />
-   
+
 </DockPanel>
diff --git a/Resources/NewIcons/DB-WJ.png b/Resources/NewIcons/DB-WJ.png
new file mode 100644
index 0000000000000000000000000000000000000000..e655ff426b8d661de96a9f99f2924db6f8fbfe50
GIT binary patch
literal 5719
zcmaJ^XH*mG)*gE3Rf-6PP(?xrJ#+|Fn)D`OARz<@p+sqd6saOrqzQruNEPWw2WcW*
zl#WtF<p4*DptLWZb3EVuao3%-X6BteyFB~Zd#`yX?y89%Bi(sA000;b^tH`N_p857
z5H;zV$huPr0CYMyB=V{O5()P9CAi`|F#r%Sn`?o!wD`iQda$^sWf&Xwz>r{m4g@yW
zx);WgA|ft8%W@@FpkU^lSr@C04khnEek?^|VpzgCGYN)xx@nqKfhUQPg|YFkk3I$$
zdc12r_%wW4|6XmqVmG&Tl%^BJ@K9gIOfHO}REwYWLuCJ}zK^St8sT(8-T(`z7A@d+
zB1i@thN`GshIG=j17rb{^dO+qIHyzULd+TSSFNmTWMOy7I*BQYhM+JGKqDwos~FJG
zB@4^V6tMvEDS;b9F3u~!RVZ*n^v<VAAT0MVE0_#$cpz|&EI$PRvtwel0XJo!V$?cb
z2e6d_I9v^1A%JNpAZ1|Vst;5*0-Yl)^fds80gy6_jk*L-1_L(+1O)?tyIBB-?v9Ph
zx64&5>*6G)vT9VCg%CR74j`xxjg5^Yzu1TY*JTcQ6geteL$W(Ci$^+Kmifc(8vw{p
zIY-KN_atD1scK|IKCywx3Hr5z`V8XiymGoWTJEg@03V5=<EIj^+Vf$`)M5D3C&F8l
zZrADaZywxptzp)v2lBtn+U$D&;zp++xp`)0ZFP0}$}24g)N7lNQ*5_Wr_G7yk5HB4
zgZ&Tf%R=GOj^TQghabA%>=_kZ7)_<U>pcG{N$<Fk{_L1<67tHxx!G2nW5tZkCs8{)
zVOP2c5~r1VsaJU7486Q0aYUiEBnMQxtC0n#K%Y6fP<%HOWw9l8E*}8EP79&ytr&<R
z%q{ZcsQ=lv`iWk?Fc9Wykm>^f*R_QtEnnBF_k#dHJ3m~!T9bFLi(8_T`a&1gd>8%k
z4f(rTLa(~DShVQSVHbRFT&jrB5{n+L<`cgGd#k}G+iB(&o#xFX*=^Otr0UK569vla
z5^D{orPLe%v7-cLW67N3Z3PoSTv<_v0$uu)Z1;q~gRvZD5W^HXeYknNCD=-zZ%5Ua
z91(L(_hpLm03aQ49Nnr1e-K_{ruvql9@+d%;rw0QC-h@zB0M{ZGe2j{x9+@Zf_%aH
zSh*YXY?2zXU#jynH;v3IPbta19<3LO60~V9LoXl|4CQ_2tF0?2TH^LyMql_-vW4q(
z(#li%Yk^Vxn)<dzwkFg1&%hUiWLalv6=*5$nstjp(w-UCiM(X}@rv778XjY-FCqAj
zEr}h*5*&+sr69x>hm;m=P9`^a@zipHZ9;d#%Utk_L}`w!{&~T)!CACN4GrRf1o-km
z)N1Z(&#KHS@2bF#16{7OhR@SOi)AtM*X~z%)>zhL*Qha>(wbI<+2#w+3M^UWlI*oA
z3mVLyo5eh1m%W*d7>?vLFf6Kkl0JFfjmzx-_xv;QCF?>uze&cJ&BV|bz0Vn+Dfavs
z7^BZc_QztycyhRDxUoF`+|M(Oig_mQ@$_3tDZn=}*Rz<j2v)Y@4dS=YrM#v~zmhJJ
z&MOYHEG;W8TP&lu+O-<8Oe(!@5mKdVC1bHtO8fR<xm8*2)eQ??3v8+KvzRjMGlHf1
z(@?vUIBL5dqaIV_Q?vXRPAjc_V0ssx+5iaw561H7o8fY=L|zQf+`c8=l6k_{a!<9a
zv;cvWxgujzYrgxyRh?!f)93IJ(S&wgtR!PMG=7m|`_l3y-eOs!W;o`WN7=)ShqmSV
z<!0r28*TDcn<cr$Z8|M>N8wDG{Z~Y<iRxjKMyPVvEoLkhO6W>Bja8NQt0c=jig*iJ
zwEa80O13id+OLP@84*er1KZYrUI>AmSf1d2mh9^>*izRr2vN^5jBu;;%J~pf_+b5W
z-^`GXJsQX&R5~i-<K2|zah1X;-TS)C3Any%D?%&yK73!H2(^fSh@tUU<E?CS<L2T^
z#mYv?M*YKYhMx?-%aY4cg};|x&sooTpR?3>!#==XqTyLX6ULxs)xOwntD)5^${t}?
zWNT&bSgTu^TPggmrLv`jwWQf3&7?f<9k!?XTf<;OX(Lbd+BEfCRRg{u1ci0x!Z!9+
z^=zfJrG>l<xqqTc!x%HeRL*D57wT8%%b{egw3t2eXiGh$ckkgB7}j=_Wpr9*rGb6u
z(koo9Mb4ximJ8eL7r7gIFU~MxNHRlBGKaTsVW4gG3US}Z@ng`$er`@}PWR@sx#wH*
zTez*5`NwZ$A79F|lkpqt89;t8TN_uWf1EDmu~ZRiiZl(!)~^e~Twp0SmG7$?i~P$D
zP}^K;-_?8{uc)o4C@e}Z+Bv;Z=xiKl95U@8<T*txA@2yDq0fTO#(|PBVKOX5T)1Yq
z1NqTm&~1T^M0KS(%=em^P0fV-X3cY&NfDJ1Yh9HBZUcWLR|*`gXO5(d;FzMWhJJoG
zMuYl<y4MrRAQ}}DWfQHQ=pAc&ejJ`5=RZD=^jp&Ysr^uUF$W7bMLdUIkrP)dlXO>^
zRd^};QoT>o)$YxdZLY0>r{M*Jq<EFQmuLIZ@#b#Ka_%zyN-$R@Y{1bwuwbNnFRFyI
zRFX|X>7j;Etcl`-KQ&pzpK&G#@38v|C(;FW^L1k(uyOhE*lFZ7aek8>eR1QU)IU;M
z<pPCzWr`%$n(vC1Cbt?f8ZG1~<#A@;0^_AsmD=EusVT`mT4e&pX${z~*iWvvhAJ>o
zHK)B^_ZngR=`@2LwaFD!c2K$ot>Vv?_G0hFX=<<-8`qBExYvk><$0HfH{aC0o=aAE
zwEg&OldYTWV`@WDw4n`@&-PPWg*&1~#V2r%Zsi=+<!Ec_3YDh#266n9Y5As2MpbB=
zNRY8d`1P*W5nc6U9vk#lbZb!|8}sis9ZhXvc1!iBpV7IzYUkqOt2pMkGS1zZ7Ml-P
z<BcJ_?#P;dP*+<1su?}%I^p`|(;_s_f$3pc#-|J>FUFbKI>sgIy3PIXI&-j$VX?WE
z$OdF{VTVdnE2d;{WLR0<@~P#X<xflbt%-$t)cZrP@h#rq*6*@^OwBp89-OERw$E9S
zSs72cPGOD=j%p9otK!PO96mh4J64+DeKz|kCMZs51eqG%H@}_Yn^3hhPkMKGLyxKd
zV*6?Cwm+0np3&<5qrPQ9Z|%U<F9)<s2mFjmv$qn0D?ZXpUcAMJ<%79vW$$F`=2&DO
zIXFAKG<~Bs{_g8y(6Qd!MdnAcDt3Wab}a{SvtJ@6)37_E3AyRHA)%5#=5NeBX$W3-
z8Ch~?CTzcCA%2|DIlH&6+^RfsZKsL2Q!}^5ZqsCw{ancj|CRVv<uq;5w7=z1OLkTB
zHIL@4ptky8*Ml#-c?u&7du@T=IM3cq<snoT+IE8o2fYXTOPmX#zM>~1LoGA@qFa@%
zrmaqU8k?Fk$c30Gb%)dW>FxPD?w$VmyW{hE2h>rKqo*nRNz6#9q^zW&XvXM`JViAG
zVp-ky<jZjhauhu(lE-!W<aDTtixU=lIJNP9WIS`cAY&&Ztpk6%=;UkX2G8@kzV1H$
z_Q3!d`1L*Oqs=b=d4Im`!X;+Y)!X1ZVrOnYUhG?pl^mt<q@|rvQe^HPZ_7Q1Anhx8
zh&r}J3xX@rALWYyG|>cS4A=mV!eY!ZD0HCDAVviMD57zewnSTFBPACCUJ~_7M=}8K
zO|k|674-mbl#2(32zJI`abBvB?UoJ*7>8Dc*vJ`68G9o!ZaDoQUyMbNiKR=BhYJD?
zQC9=21SpXl;4wrLH~{bI<);*&3i->g5^4QQ41<9GQXzV%LjDG2YkU=qB=};$a+2~;
z7r2ZfSOFmkmqRE@%SwQyrQq@~DFh5I3zdQ^Ng<S^;NX7_2q~H`+EvM1Tlb$>q$gE~
z8<FU(1cUke`%C)END_RpFgOB%fJsTiq@|%G4X9tB7ZDWz_3{(^?Liyk=i-a=CgKQQ
z;9nk5&V-vpRR{^`-zng|jg9|x?B(|lQ6$P>0Vr=6Tv7^#$N$RfFKs`fIp+Ui{8w#1
z%Rp}o%pBuKxasRcs)wuKZ(|a7|2xnxMG_h%Q(qjZC@4>Dg3C=j#*1j6tqLK%kwoLr
zN-_%02t@@&DX6TAEE+0{LMuR>r4^i^2swFaSBx`8M&4QKx1axJFE6hsuc)n{gG3?~
z;BXxhdy2YRIyySK3P?FEd4%k5TLUjYBFf7J^E)<<6kAS5OH*1Fsrf%`m5{y|6p`R-
zNg#Os?t-gs1R}xDjo=L?{R5Gzt^gJ@M!Dd;ehDxAD%9V3Yh!$Iw=ig3UjiQd7t>0(
z|AIma?&>O~C?x|$p)d+iSqxel>MSRPf=WqY(5@IoMYsaS74nZg`ac-_yHiOLQYPNN
z0VyfENW02noY7FYoU}6(4p%@!5%N+9C~1!55C{bs1vyt42#f>~_N#gRqnUn-NFDlX
z`R{0u9{wFJj2CI5d`Y8|82qss06?4u+M1RDvwt|ydvfS-FFxFun^4$8S%H`Z$TiK(
zG_Pv2Qc939#*>-RKJdR35zEoV0*<)CS}4GJTaTO#Y$mIDUz3um7l6du3YfW-l7IKX
z7lbY?s1G+GK1a3`2Is2(kgjc+T*%!%{oz#0SYBCKpCIel%@7`~fy@^eV{v=M;s%nX
zJWqa~o1F14AuCB<O~qzwZ|@!z6XSqFq4KQvr(S$LB1cnJQyj)@7Yed0`!*lndj6;D
zpMoYVZ^)iJDh{{F?kpXv;SGap&{og0OnYa6x?cjj<D!9=!zN7xzg=Nf<k#K@J{8<~
z=aPV;_h|)*VLd>tO$k(*ZQ<B2va)*1tdE>PmSlcD+~f1KM5-TwN#U6-W1k}H%*U06
zHg5&r8TQ`Zj@!Lc$V1~v!F0Gwb-XzfY4E|V_4vdM8<x+eV~xQS-Tc^1Rc=*ooj3T=
zUTs$5+E38un06=7stg1IQ5p5&2(MAmb0&`*e@ykrJi8=KbftKuN%SZCcn4EvginfF
zx#WQ=N8rn5?|8;HWS5xpi+T<%W?JLp={Amk?A{#Wl;&9p@(YZt^ZR^}qPus-)|l#X
z*E&4lyFy?W*jr40pi7%>OucI0G7Q$}?(V)vYuw!w+Uc1pk#@#)$k$X_x@y+)gTehV
zd+q?(XqmNc7aj*u4zyR23vXb}jNcG_P{8HV5u>hU;S@H@#m-*n(d;7Y4TOgD1&tQo
zvBcTi*=1Q-Srzf_eB;)G<|c-woYxy>WjiRiNKagD?$bEY4}aSp<_6aPoJ4D+(E?Je
zm}~v|)!lJ7vz?J@Ctsldt)e@lD9pa+%__&NLzv+G{g<cTo4UZ&u<MWbiSPl%8=|H;
zV?EscbZ;(PJJU%T*UyJ&tSTooH^aZ>+(lZW(N7COt-P>PmchvH7c50_yPnzo$<Ynp
zc#L*pLzd$;jK6<S*~C%v86jzf0>l4&NhZhwQ)LlD9)Jz5ULR|C5WR9pTjvLFM!H9M
zBBHe~kCrZEB(6!!&W(AMC2?FYp^d$N|E9HM0<9#Odss=jNGZ1w8Z=@`%?TXcT(-Pw
zjJJ}%deWx&V1av42a2bX)1}Gf*u+XbeBP1qC&GvbA2I`rFx!^mrol#vTnkj0^NnR%
z#`gt%gc3s9g7D>Dwaz_ZO4J9XWAzUE>3?1~BaN32I2`1{eLNB_LPWa?tp8k5<XU&q
zIO8o6ek-pvs(%}5>I!L6qt<A=Wlv$Dr<YOtEUvcT+~&AbwAww;Zn)!>N&S5L#r@Ti
zg>U|soA2_tt>nGew`Skj*Kl9<)40$kI!2S$!H%zKSJ_CZ;_je3WILGxR=NTex27NI
z@6A<RGcbt5G#Uf<$P|`+FZz(zHS2Ur-hfr5&u$RelqV=F$l7%~G)#NFx3v=-1#fl>
ze+>-!sY{cZo6E;WX>ac}^r(z$jJ;`bXRDKsrd_lk-iW2I$Y}sLFLu@8X;3uT(<etY
z$D4Gjw-_+wH~TfDTgV&fv*4ZZ4+<anKiJHgh9u4Cf?IHPNp84{Hswb&IU4WJN%Kv0
zhQ`r2x+xDxUj#?Jwc!x>xl<uCf8G2Z{FA|js`QABpw7x13Q^^hK7B@S+t?ep4Xc^-
zjbd4Q=Cbr#J%y9)iOC;A6q84C#(VmEd#N_p9IbcLhRyq&AidE@HRo22J*@LJc!rw)
zHx~X}p+O-S9RBUjO@pvti95jKdP?$A)J1a1<T{R+3iGoHN0Z+A+jWmA<_c1b_!=8<
zlf|joS;@)ySb-!8A7=|?PzqsO`tAf<duA(*uY5knecCQ|jXCe$uJZU2(|z7gw^~M@
zmXr_-O-#HpQd6JUgmA0XKjhwF{~%|U*;U|50TU)fJ~Ia7QslSPe)ys;Z^TttmJ}Da
zFTRuutl6UCpE{Li6sup@cF7Mhge2QH@=r@#S`Y)%Wk#vIbR-gq0(GW5tvA`u-+!=@
zTZ7i4ZDvRp=l)VBMlQ$J@gZ8du1fGiUui-@!Z|xTJFgdb8KJu$`Hh&tF<+iaILvlx
z3nXdhF+^$1V#{e>x2x4@f1aR6U15z_U9PLEbAWEE(W+DMFiQDem*g?YlUQP$mFB;s
zc_ePA=0?XuJ|&sGlh+Pfz3F9EGcn(Qcc7kNFx6ka2VDL*FVbYM|I|BJz#_uaRV}@f
zrZX#fOv9?)TKEp9=E};7Y9;>1yA-+{?DOSS5H8AB#rn~(G$QeV3)}74Z_U-S4QS)!
zqx!p$%5dQTPS&RJ5ncj%lQnbjc4j&+k4$2?{5=MNjMv{}<oj@-AgChQWf_@C<PD0!
z!uvz#jGr*B_)m>@+GvR4=apUrTOcDe+;eMu65i|c&xv^ctRAc8nkM&T%Xw!}ruaRu
z_0o0!)D>DwCmt!ou=UnQrck#FN$&k`YuMQ~ex%k<sI9q?<Bn2OQzZsDCG~7?w;`27
zokmnaf3yrNNii9*FmI}m8}Q@#dzjS+O4w4pUD}m9?|+X1IwB6c<Qp!I+5ChVL{D`2
zT(=Fugb{}xAJz4Qc?iq?7~gq#nl41wwJ!AiGFR}lQ+KYvy*8qpf5tb?<CyI`?1LjB
zPh|FheQf3%%7{hCuKT<&gTL*!cJZrzjB@17#1>pXudoyUEm}Pn(A&FF7F&Cal&L`I
z6S>}<hr9kX%i&clg2_wF?PLtBb6g^cu6mtpRJ+XY|L2EyjAhz+Rh^6)*uC$9)k(vz
Q|Js=w=$L3%Y2AqUKbNZlp#T5?

literal 0
HcmV?d00001


From e4a87dc475c0a92eb56c7729a1fbc5d5ba643b12 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 13 Feb 2024 14:37:49 +0100
Subject: [PATCH 06/18] Gestione Style ComboBox Default

---
 Utility/OmagOFFICEDictionary.xaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Utility/OmagOFFICEDictionary.xaml b/Utility/OmagOFFICEDictionary.xaml
index 5493e3a..61a01b7 100644
--- a/Utility/OmagOFFICEDictionary.xaml
+++ b/Utility/OmagOFFICEDictionary.xaml
@@ -1127,11 +1127,13 @@
     </Style>
 
     <Style TargetType="{x:Type ComboBox}">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="Background" Value="{StaticResource ButtonNormalBackground}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}"/>
-        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Height" Value="25" />
+        <Setter Property="Width" Value="Auto" />
+
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="Padding" Value="4,3"/>

From 1f7a918ac233bb84c181813f7dac4f5f1561997c Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Tue, 13 Feb 2024 15:11:27 +0100
Subject: [PATCH 07/18] migliorata gestione textbox

---
 Utility/OmagOFFICEDictionary.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Utility/OmagOFFICEDictionary.xaml b/Utility/OmagOFFICEDictionary.xaml
index 61a01b7..fd9656a 100644
--- a/Utility/OmagOFFICEDictionary.xaml
+++ b/Utility/OmagOFFICEDictionary.xaml
@@ -68,7 +68,7 @@
 
     <!--Colore del contorno quando il Mouse è sopra la TextBox-->
     <LinearGradientBrush x:Key="BrushBorderIsMouseOverTText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
-        <GradientStop Color="#484D55" Offset="0.05"/>
+      <GradientStop Color="#1C1D22" Offset="0.05"/>
         <GradientStop Color="#1C1D22" Offset="0.07"/>
     </LinearGradientBrush>
 

From d7522c4eb89d002ee0567337d1f371e0b2058961 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 13 Feb 2024 15:14:45 +0100
Subject: [PATCH 08/18] Aggiornamento versione

---
 MainWindow/MainWindowM.vb  | 4 ++--
 My Project/AssemblyInfo.vb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 8cd907b..4a549a2 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -223,8 +223,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2601, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2601, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 6fa4394..eeada29 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.1.1")>
-<Assembly: AssemblyFileVersion("2.6.1.1")>
+<Assembly: AssemblyVersion("2.6.2.1")>
+<Assembly: AssemblyFileVersion("2.6.2.1")>
 

From c534b459aeb33e06b2f2f41d6eee978d92ab26b9 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Wed, 14 Feb 2024 13:12:28 +0100
Subject: [PATCH 09/18] Gestione cambio nome lastra nel MachGroup

---
 My Project/AssemblyInfo.vb             |  4 ++--
 OptionPanel/RawPartTab/RawPartTabVM.vb | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index eeada29..8b2b01f 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.2.1")>
-<Assembly: AssemblyFileVersion("2.6.2.1")>
+<Assembly: AssemblyVersion("2.6.2.2")>
+<Assembly: AssemblyFileVersion("2.6.2.2")>
 
diff --git a/OptionPanel/RawPartTab/RawPartTabVM.vb b/OptionPanel/RawPartTab/RawPartTabVM.vb
index d7d8c48..9f42bb8 100644
--- a/OptionPanel/RawPartTab/RawPartTabVM.vb
+++ b/OptionPanel/RawPartTab/RawPartTabVM.vb
@@ -2305,6 +2305,17 @@ Public Class RawPartTabVM
          ' aggiungo la nuova lastra
          OmagOFFICEMap.refMachGroupPanelVM.SlabNameListCurr.Add(sSlabNameDB)
          EgtPHOTOLib.PhotoMap.refOptionPanelVM.SetAssignedSlab(sSlabNameDB)
+
+         ' Provo ad assegnare il nome della macchinata
+         Dim sName As String = LocalSlab.Id
+         EgtGetMachGroupNewName(sName)
+         If sName <> LocalSlab.Id Then
+            EgtOutLog("Nome lastra (Id lastra) già presente nell'elenco delle macchinate correnti!")
+         Else
+            OmagOFFICEMap.refMachGroupPanelVM.SelectedMachGroup.SetName(LocalSlab.Id)
+            EgtChangeMachGroupName(EgtGetCurrMachGroup, LocalSlab.Id)
+         End If
+
       Else
          ' Apro dialogo per scelta immagine
          Dim PhotoDlg As New Microsoft.Win32.OpenFileDialog()

From 0fa0d4e6123c5d07dfcb1c9601f2d968e21484d3 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Wed, 14 Feb 2024 18:57:19 +0100
Subject: [PATCH 10/18] Gestione Engrave in ImportDXF

---
 DxfImportWindow/DxfImportSceneHostV.xaml.vb |   2 +-
 DxfImportWindow/DxfImportWindowV.xaml       | 207 +++++++++++++++++++-
 DxfImportWindow/DxfImportWindowVM.vb        |  64 +++++-
 3 files changed, 259 insertions(+), 14 deletions(-)

diff --git a/DxfImportWindow/DxfImportSceneHostV.xaml.vb b/DxfImportWindow/DxfImportSceneHostV.xaml.vb
index 2057b4b..32b4bae 100644
--- a/DxfImportWindow/DxfImportSceneHostV.xaml.vb
+++ b/DxfImportWindow/DxfImportSceneHostV.xaml.vb
@@ -112,7 +112,7 @@ Public Class DxfImportSceneHostV
 
    Private Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles ImportDxfScene.OnMouseDownScene
       ' Solo se in modalità angoli o gocciolatoio su lati esterni
-      If DxfImportWindowMap.refDxfImportWindowVM.SideAngle_IsChecked Or DxfImportWindowMap.refDxfImportWindowVM.Drip_IsChecked Then
+      If DxfImportWindowMap.refDxfImportWindowVM.SideAngle_IsChecked Or DxfImportWindowMap.refDxfImportWindowVM.Drip_IsChecked Or DxfImportWindowMap.refDxfImportWindowVM.Engrave_IsChecked Then
          OnMouseDownSceneSideAngle(e)
       ElseIf DxfImportWindowMap.refDxfImportWindowVM.FiloTop_IsChecked Then
          OnMouseDownSceneFiloTop(e)
diff --git a/DxfImportWindow/DxfImportWindowV.xaml b/DxfImportWindow/DxfImportWindowV.xaml
index 21a50a7..fd7fa05 100644
--- a/DxfImportWindow/DxfImportWindowV.xaml
+++ b/DxfImportWindow/DxfImportWindowV.xaml
@@ -6,7 +6,193 @@
    Title="{Binding TitleMsg}"
    IsMinimizable="False"
    ShowInTaskbar="False"
-   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" WindowStartupLocation="CenterOwner">
+   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" WindowStartupLocation="CenterOwner"
+    xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+    
+    <EgtWPFLib5:EgtCustomWindow.Resources>
+        <!--gradiente colore-->
+               
+        <!--<Style x:Key="ScrollBarButton" TargetType="{x:Type RepeatButton}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RepeatButton}">
+                        <theme:ScrollChrome x:Name="Chrome" RenderPressed="{TemplateBinding IsPressed}" RenderMouseOver="{TemplateBinding IsMouseOver}" SnapsToDevicePixels="true" theme:ScrollChrome.ScrollGlyph="{TemplateBinding theme:ScrollChrome.ScrollGlyph}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>-->
+        
+        <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Thumb}">
+                        <Border x:Name="Background" CornerRadius="0" Background="Transparent" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                            <Grid Background="Transparent"  Margin="1">
+                                <Border Opacity="0"  x:Name="BackgroundAnimation" Background="Transparent" />
+                                <Rectangle x:Name="BackgroundGradient" RadiusX="8" RadiusY="8" Fill="#FF095CA8" Stroke="#1C1D22" StrokeThickness="0.5">
+                                    <!--<Rectangle.Fill>
+                                        <LinearGradientBrush StartPoint=".7,0" EndPoint=".7,1">
+                                            <GradientStop Color="#1C1D22" Offset="0.375" />
+                                            <GradientStop Color="#1C1D22" Offset="0.625" />
+                                        </LinearGradientBrush>
+                                    </Rectangle.Fill>-->
+                                </Rectangle>
+                            </Grid>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        
+        <!--<Style x:Key="HorizontalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RepeatButton}">
+                        <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>-->
+        
+        <Style x:Key="VerticalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RepeatButton}">
+                        <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        
+        <Style x:Key="ScrollBarStyle1" TargetType="{x:Type ScrollBar}">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+            <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="Width" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+            <Setter Property="MinWidth" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ScrollBar}">
+                        <Grid x:Name="Bg" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                            <Grid.RowDefinitions>
+                                <RowDefinition MaxHeight="1"/>
+                                <RowDefinition Height="0.00001*"/>
+                                <RowDefinition MaxHeight="1"/>
+                            </Grid.RowDefinitions>
+                            <!--<RepeatButton Command="{x:Static ScrollBar.LineUpCommand}" IsEnabled="{TemplateBinding IsMouseOver}" />-->
+                            <Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="1">
+                                <Track.DecreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}"/>
+                                </Track.DecreaseRepeatButton>
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource VerticalScrollBarPageButton}"/>
+                                </Track.IncreaseRepeatButton>
+                                <Track.Thumb>
+                                    <Thumb Style="{StaticResource ScrollBarThumb}"/>
+                                </Track.Thumb>
+                            </Track>
+                            <!--<RepeatButton Command="{x:Static ScrollBar.LineDownCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="2" theme:ScrollChrome.ScrollGlyph="DownArrow"/>-->
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter Property="Background" TargetName="Bg" Value="Transparent"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            
+            <!--<Style.Triggers>
+                <Trigger Property="Orientation" Value="Horizontal">
+                    <Setter Property="Width" Value="Auto"/>
+                    <Setter Property="MinWidth" Value="0"/>
+                    <Setter Property="Height" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+                    <Setter Property="MinHeight" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type ScrollBar}">
+                                <Grid x:Name="Bg" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                        <ColumnDefinition Width="0.00001*"/>
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                    </Grid.ColumnDefinitions>
+                                    <RepeatButton Command="{x:Static ScrollBar.LineLeftCommand}" IsEnabled="{TemplateBinding IsMouseOver}" theme:ScrollChrome.ScrollGlyph="LeftArrow" Style="{StaticResource CustomScrollBarButton}"/>
+                                    <Track x:Name="PART_Track" Grid.Column="1" IsEnabled="{TemplateBinding IsMouseOver}">
+                                        <Track.DecreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource CustomScrollBarButton}"/>
+                                        </Track.DecreaseRepeatButton>
+                                        <Track.IncreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource CustomScrollBarButton}"/>
+                                        </Track.IncreaseRepeatButton>
+                                        <Track.Thumb>
+                                            <Thumb Style="{StaticResource ScrollBarThumb}"/>
+                                        </Track.Thumb>
+                                    </Track>
+                                    <RepeatButton Command="{x:Static ScrollBar.LineRightCommand}" Grid.Column="2" IsEnabled="{TemplateBinding IsMouseOver}" theme:ScrollChrome.ScrollGlyph="RightArrow" Style="{StaticResource CustomScrollBarButton}"/>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsEnabled" Value="false">
+                                        <Setter Property="Background" TargetName="Bg" Value="Transparent"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Trigger>
+            </Style.Triggers>-->
+        </Style>
+        
+        <Style x:Key="ScrollViewerStyle1" TargetType="{x:Type ScrollViewer}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                        <Grid x:Name="Grid" Background="{TemplateBinding Background}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Rectangle x:Name="Corner" Grid.Column="1" Fill="{StaticResource Omag_Black}" Grid.Row="1"/>
+                            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanHorizontallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" CanVerticallyScroll="False" Grid.Column="0" Content="{TemplateBinding Content}" CanContentScroll="{TemplateBinding CanContentScroll}" Margin="{TemplateBinding Padding}" Grid.Row="0"/>
+                            <ScrollBar Style="{DynamicResource ScrollBarStyle1}" x:Name="PART_VerticalScrollBar" 
+                                       AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" 
+                                       Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" 
+                                       Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" 
+                                       Margin="2,0,0,0"/>
+                            <ScrollBar Style="{DynamicResource ScrollBarStyle1}" x:Name="PART_HorizontalScrollBar" 
+                                       AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" 
+                                       Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" 
+                                       Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsEnabled" Value="false">
+                    <Setter Property="Foreground" Value="{DynamicResource Omag_Blue}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </EgtWPFLib5:EgtCustomWindow.Resources>
 
     <DockPanel>
 
@@ -84,7 +270,7 @@
                 </UniformGrid>
             </GroupBox>
 
-            <UniformGrid Columns="4"
+            <UniformGrid Columns="5"
                    DockPanel.Dock="Top"
                    IsEnabled="{Binding SideEntity_IsEnabled}"
                    Margin="0,0,0,5">
@@ -98,6 +284,10 @@
                    IsChecked="{Binding FiloTop_IsChecked}"
                    Style="{StaticResource CompoWindow_WrapToggleButton}"/>
 
+                <ToggleButton Content="{Binding EngraveMsg}"
+                   IsChecked="{Binding Engrave_IsChecked}"
+                   Style="{StaticResource CompoWindow_WrapToggleButton}"/>
+                 
                 <!--Incidi da sotto-->
                 <ToggleButton Content="{Binding DripMsg}"
                       IsChecked="{Binding Drip_IsChecked}"
@@ -122,13 +312,12 @@
                     Style="{StaticResource OptionPanel_TextButton}"/>
             </UniformGrid>
 
-            <GroupBox Header="Dati pezzo"
-                      
+            <GroupBox Header="Dati pezzo"                     
                       BorderThickness="{StaticResource BorderGpBx_Thickness}"
                       Foreground="{StaticResource Omag_White}"
                       Margin="0">
-
-                <StackPanel>
+                <ScrollViewer Style="{DynamicResource ScrollViewerStyle1}" VerticalScrollBarVisibility="Auto" Focusable="False">
+                    <StackPanel>
                     <Grid Visibility="{Binding PartData_Visibility}"
                          Margin="0,0,0,10">
                         <Grid.ColumnDefinitions>
@@ -178,10 +367,12 @@
                                 TextWrapping="Wrap"
                                 TextAlignment="Center"
                                 Margin="0,0,0,20"/>
-
+                    
                     <ContentControl VerticalAlignment="Center"
-                         Content="{Binding SideEntityControl}"/>
+                         Content="{Binding SideEntityControl}" ScrollViewer.VerticalScrollBarVisibility="Visible"/>
+                    
                 </StackPanel>
+                </ScrollViewer>
             </GroupBox>
 
         </DockPanel>
diff --git a/DxfImportWindow/DxfImportWindowVM.vb b/DxfImportWindow/DxfImportWindowVM.vb
index b428d92..7c0710f 100644
--- a/DxfImportWindow/DxfImportWindowVM.vb
+++ b/DxfImportWindow/DxfImportWindowVM.vb
@@ -142,7 +142,7 @@ Public Class DxfImportWindowVM
          Return m_SideAngle_IsChecked
       End Get
       Set(value As Boolean)
-         If m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Then Return
+         If m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Or m_Engrave_IsChecked Then Return
          m_SideAngle_IsChecked = value
          If value Then
             ' Aggiungo regioni per percorsi interni
@@ -190,7 +190,7 @@ Public Class DxfImportWindowVM
          Return m_FiloTop_IsChecked
       End Get
       Set(value As Boolean)
-         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_UnderDrill_IsChecked Then Return
+         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_Engrave_IsChecked Then Return
          m_FiloTop_IsChecked = value
          If value Then
             ' Aggiungo regioni per percorsi interni
@@ -233,13 +233,61 @@ Public Class DxfImportWindowVM
       End Set
    End Property
 
+   Private m_Engrave_IsChecked As Boolean
+   Public Property Engrave_IsChecked As Boolean
+      Get
+         Return m_Engrave_IsChecked
+      End Get
+      Set(value As Boolean)
+         If m_Drip_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Or m_SideAngle_IsChecked Then Return
+         m_Engrave_IsChecked = value
+         If value Then
+            ' Aggiungo regioni per percorsi interni
+            AdjustSelectRegions()
+            ' Messaggio di selezione contorno
+            SetOutputMessage(EgtMsg(MSG_DRAWPAGEUC + 6), MSG_TYPE.INFO)     ' Selezionare un contorno
+            ' Imposto modalità sideangle
+            m_SideEntityControlVM = New SideEntityControlVM(SideEntityControlVM.CallingWindowOpt.DXFIMPORT,
+                                                            DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene,
+                                                            SideEntityControlVM.ModeOpt.ENGRAVE)
+            SideEntityControl = New SideEntityControlV(m_SideEntityControlVM)
+            Open_IsEnabled = False
+            Type_IsEnabled = False
+            Measure_IsEnabled = False
+            PartData_Visibility = Visibility.Collapsed
+            OrderList_Visibility = Visibility.Collapsed
+            OkIsEnabled = False
+         Else
+            ' Rimuovo regioni per percorsi interni
+            RemoveSelectRegions()
+            m_SideEntityControlVM.Close()
+            Open_IsEnabled = True
+            Type_IsEnabled = True
+            Measure_IsEnabled = True
+            PartData_Visibility = Visibility.Visible
+            OrderList_Visibility = Visibility.Visible
+            OkIsEnabled = True
+            m_SideEntityControlVM = Nothing
+            SideEntityControl = Nothing
+            ' Elimino scritte angoli per input e inserisco quelle definitive
+            SideEntityControlVM.WriteSideAngleForNest(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
+            ' Deseleziono tutto
+            DxfImportWindowMap.refDxfImportSceneHostV.Deselect()
+            ' Pulisco area messaggi
+            ClearOutputMessage()
+         End If
+         NotifyPropertyChanged("EngraveIsChecked")
+         EgtZoom(ZM.ALL)
+      End Set
+   End Property
+
    Private m_Drip_IsChecked As Boolean
    Public Property Drip_IsChecked As Boolean
       Get
          Return m_Drip_IsChecked
       End Get
       Set(value As Boolean)
-         If m_SideAngle_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Then Return
+         If m_SideAngle_IsChecked Or m_UnderDrill_IsChecked Or m_FiloTop_IsChecked Or m_Engrave_IsChecked Then Return
          m_Drip_IsChecked = value
          If value Then
             ' Messaggio di selezione contorno
@@ -283,7 +331,7 @@ Public Class DxfImportWindowVM
          Return m_UnderDrill_IsChecked
       End Get
       Set(value As Boolean)
-         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_FiloTop_IsChecked Then Return
+         If m_SideAngle_IsChecked Or m_Drip_IsChecked Or m_FiloTop_IsChecked Or m_Engrave_IsChecked Then Return
          m_UnderDrill_IsChecked = value
          If value Then
             ' Aggiungo regioni di selezione per percorsi interni
@@ -493,6 +541,12 @@ Public Class DxfImportWindowVM
       End Get
    End Property
 
+   Public ReadOnly Property EngraveMsg As String
+      Get
+         Return EgtMsg(90397)
+      End Get
+   End Property
+
    Public ReadOnly Property DripMsg As String
       Get
          Return EgtMsg(MSG_IMPORTPAGEUC + 8)
@@ -844,7 +898,7 @@ Public Class DxfImportWindowVM
 
    Friend Sub SelectedPartChanged()
       ' Se sono in modalità inclinazioni o gocciolatoio calcolo lati inclinabili e creo testi
-      If SideAngle_IsChecked() Or Drip_IsChecked() Or FiloTop_IsChecked Then
+      If SideAngle_IsChecked() Or Drip_IsChecked() Or FiloTop_IsChecked Or Engrave_IsChecked Then
          m_SideEntityControlVM.ReLoadSideAnglePage(SideEntityControlVM.CallingWindowOpt.DXFIMPORT)
       End If
    End Sub

From 349a1429c12a249966201c56b23c13fb08a79d51 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Fri, 1 Mar 2024 14:46:41 +0100
Subject: [PATCH 11/18] =?UTF-8?q?Gestione=20colore=20entit=C3=A0=20e=20cam?=
 =?UTF-8?q?bio=20versione?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Constants/ConstIni.vb                    |  1 +
 MainWindow/MainWindowM.vb                |  4 ++--
 My Project/AssemblyInfo.vb               |  4 ++--
 SideEntityControl/SideEntityControlVM.vb | 18 +++++++++++-------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index ec1270e..13e0357 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -114,6 +114,7 @@ Module ConstIni
    Public Const K_FILOTOPOFFSET As String = "FiloTopOffset"
    Public Const K_FILOTOPDEPTH As String = "FiloTopDepth"
    Public Const K_FILOTOPROUNDOFF As String = "FiloTopRoundOff"
+   Public Const K_TEXTCOLORENT As String = "TextColorEnt"
 
    Public Const S_NEST As String = "Nest"
    Public Const K_DIRECT As String = "Direct"
diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 4a549a2..6303e25 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -223,8 +223,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2603, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2603, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 8b2b01f..08a0f9d 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.2.2")>
-<Assembly: AssemblyFileVersion("2.6.2.2")>
+<Assembly: AssemblyVersion("2.6.3.1")>
+<Assembly: AssemblyFileVersion("2.6.3.1")>
 
diff --git a/SideEntityControl/SideEntityControlVM.vb b/SideEntityControl/SideEntityControlVM.vb
index 2aae857..30890d4 100644
--- a/SideEntityControl/SideEntityControlVM.vb
+++ b/SideEntityControl/SideEntityControlVM.vb
@@ -7,6 +7,8 @@ Public Class SideEntityControlVM
 
    Private Const INFO_ALZFRONT As String = "AF"
 
+   Private ColorText As New Color3d(0, 0, 0)
+
    Public Enum ModeOpt As Integer
       SIDEANGLE = 0   ' inclina lato
       DRIP = 1        ' incidi da sotto
@@ -543,7 +545,7 @@ Public Class SideEntityControlVM
       NotifyPropertyChanged("SideEntityList")
       m_SideAngleCheck = If(GetMainPrivateProfileInt(S_COMPO, K_SIDEMODE, 0) = 0, True, False)
       SideAngleEntity.dMaxSideAng = GetMainPrivateProfileDouble(S_SIDES, K_MAXSIDEANGLE, SideAngleEntity.STD_MAXSIDEANG)
-
+      GetMainPrivateProfileColor(S_SIDES, K_TEXTCOLORENT, ColorText)
       '------------------ DEFINIZIONE LISTA LATI
       ' creo la lista dei parametri 
       If CallingWindow = CallingWindowOpt.COMPO Then
@@ -704,7 +706,7 @@ Public Class SideEntityControlVM
       Else
          TextLayer = EgtCreateGroup(PartId)
          EgtSetName(TextLayer, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayer, New Color3d(0, 0, 0))
+         EgtSetColor(TextLayer, ColorText)
       End If
 
       ' Se modalità angoli di inclinazione...
@@ -773,7 +775,7 @@ Public Class SideEntityControlVM
       If TextLayer = GDB_ID.NULL Then
          TextLayer = EgtCreateGroup(PartId)
          EgtSetName(TextLayer, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayer, New Color3d(0, 0, 0))
+         EgtSetColor(TextLayer, ColorText)
       End If
 
       Dim PrevLine As Integer = EgtGetLastInGroup(LoopId)
@@ -1515,20 +1517,22 @@ Public Class SideEntityControlVM
    End Sub
 
    Shared Sub WriteSideAngleForNest(nCtx As Integer)
+      Dim LocalColor As New Color3d(0, 0, 0)
+      GetMainPrivateProfileColor(S_SIDES, K_TEXTCOLORENT, LocalColor)
       ' Imposto contesto corrente
       EgtSetCurrentContext(nCtx)
       Dim PartId As Integer = EgtGetFirstPart()
       While PartId <> GDB_ID.NULL
          ' Se richiesti lati paralleli con misura sul top come in TRF, verifico e aggiusto
-         If GetMainPrivateProfileInt( S_SIDES, K_PARSIDE_AS_TRF, 0) <> 0 Then
-            AdjustAsTrfParSides( PartId)
-         End If 
+         If GetMainPrivateProfileInt(S_SIDES, K_PARSIDE_AS_TRF, 0) <> 0 Then
+            AdjustAsTrfParSides(PartId)
+         End If
          ' Elimino eventuale precedente layer per testi
          EgtErase(EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER))
          ' Creo layer per testi nesting
          Dim TextLayId As Integer = EgtCreateGroup(PartId)
          EgtSetName(TextLayId, SIDE_ANGLE_LAYER)
-         EgtSetColor(TextLayId, New Color3d(0, 0, 128))
+         EgtSetColor(TextLayId, LocalColor)
          ' Opero su geometria esterna pezzo
          WriteSideAngleOnLoop(EgtGetFirstNameInGroup(PartId, NAME_OUTLOOP), TextLayId)
          ' Ciclo su geometria interna pezzo

From 9be2a9d1c3d6c9d8b673a35d39d724c1b3bb28bc Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Wed, 3 Apr 2024 08:25:47 +0200
Subject: [PATCH 12/18] Salvataggio Info progetto nei MachGroup

---
 MySceneHost/MySceneHostVM.vb     |  2 +
 TopCommandBar/TopCommandBarVM.vb | 68 +++++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/MySceneHost/MySceneHostVM.vb b/MySceneHost/MySceneHostVM.vb
index 208292f..5d70245 100644
--- a/MySceneHost/MySceneHostVM.vb
+++ b/MySceneHost/MySceneHostVM.vb
@@ -719,6 +719,8 @@ Public Class MySceneHostVM
    End Sub
 
    Private Sub OnSavingProject(ByVal sender As Object, sFile As String)
+      ' Salvo le info del progetto
+      TopCommandBarVM.SetInfoProj(sFile)
       ' Recupero tutti i file di texture associabili ai gruppi di lavoro del progetto
       Dim sDirToSearch As String = Path.GetDirectoryName(sFile)
       Dim sFileToSearch As String = Path.GetFileNameWithoutExtension(sFile) & "." & PHOTO_NAME & "*"
diff --git a/TopCommandBar/TopCommandBarVM.vb b/TopCommandBar/TopCommandBarVM.vb
index 4b7e595..c332d60 100644
--- a/TopCommandBar/TopCommandBarVM.vb
+++ b/TopCommandBar/TopCommandBarVM.vb
@@ -74,12 +74,12 @@ Public Class TopCommandBarVM
    End Property
    Public ReadOnly Property ExportToolTip As String
       Get
-         Return EgtMsg( 91505)               'Esporta in macchina
+         Return EgtMsg(91505)               'Esporta in macchina
       End Get
    End Property
    Public ReadOnly Property DxfOutToolTip As String
       Get
-         Return EgtMsg( 91506)               'Esporta DXF
+         Return EgtMsg(91506)               'Esporta DXF
       End Get
    End Property
    Public ReadOnly Property OptionsToolTip As String
@@ -226,8 +226,20 @@ Public Class TopCommandBarVM
    ''' Execute the SaveAs.  This method is invoked by the SaveAsCommand.
    ''' </summary>
    Public Sub SaveAs(ByVal param As Object)
+      'Dim SaveFileDialog As New System.Windows.Forms.SaveFileDialog()
+      'SaveFileDialog.Filter = "(*.nge) |*.nge"
+      'SaveFileDialog.FilterIndex = 2
+      '' avvio la ricerca nell'ultimo direttorio aperto
+      'Dim sFilePath As String = String.Empty
+      'EgtGetCurrFilePath(sFilePath)
+      'SaveFileDialog.InitialDirectory = Path.GetExtension(sFilePath)
+      'SaveFileDialog.FileName = Path.GetFileName(sFilePath)
+      '' apro la finestra di dialogo
+      'Dim bChangeProject As Boolean = True
+      'If SaveFileDialog.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
+      'Dim sNewFilePath As String = SaveFileDialog.FileName
       ' non posso avere la stessa lastra in due progetti -> gestita da DataBase
-      OmagOFFICEMap.refSceneHostVM.SaveAsProject()
+      OmagOFFICEMap.refSceneHostVM.SaveAsProject_1()
    End Sub
 
 #End Region ' SaveAsCommand
@@ -238,12 +250,12 @@ Public Class TopCommandBarVM
    ''' Returns a command that do Export.
    ''' </summary>
    Public ReadOnly Property ExportCommand As ICommand
-         Get
-            If m_cmdExport Is Nothing Then
-               m_cmdExport = New Command(AddressOf Export)
-            End If
-            Return m_cmdExport
-         End Get
+      Get
+         If m_cmdExport Is Nothing Then
+            m_cmdExport = New Command(AddressOf Export)
+         End If
+         Return m_cmdExport
+      End Get
    End Property
 
    ''' <summary>
@@ -436,4 +448,42 @@ Public Class TopCommandBarVM
 
 #End Region    ' Commands
 
+   Public Shared Sub SetInfoProj(Optional sFilePath As String = "")
+      EgtOutLog(" *** SAVE PROJECT ***")
+      ' Recupero l'ID della macchinata corrente
+      Dim CurrGrpId As Integer = EgtGetCurrMachGroup()
+      ' Path completa del progetto corrente
+      If String.IsNullOrEmpty(sFilePath) Then EgtGetCurrFilePath(sFilePath)
+      Dim nPartInRawsProj As Integer = 0
+      Dim nGrpId = EgtGetFirstMachGroup()
+
+      While nGrpId <> GDB_ID.NULL
+         ' Imposto la macchinata corrente
+         EgtSetCurrMachGroup(nGrpId)
+         ' recupero il primo grezzo della macchinata corrente
+         Dim nRawId As Integer = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            nPartInRawsProj += EgtGetPartInRawPartCount(nRawId)
+            nRawId = EgtGetNextRawPart(nRawId)
+         End While
+         nGrpId = EgtGetNextMachGroup(nGrpId)
+      End While
+
+      nGrpId = EgtGetFirstMachGroup()
+      While nGrpId <> GDB_ID.NULL
+         ' percorso progetto
+         EgtSetInfo(nGrpId, "ProjPath", sFilePath)
+         ' Anno/Mese/Giorno/Ora/min di salvataggio
+         EgtSetInfo(nGrpId, "Released", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"))
+         ' numero di pezzi presenti nel progetto
+         EgtSetInfo(nGrpId, "NbrProjParts", nPartInRawsProj.ToString)
+         nGrpId = EgtGetNextMachGroup(nGrpId)
+      End While
+      EgtOutLog("     ProjPath:" & sFilePath)
+      EgtOutLog("     Released:" & DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"))
+      EgtOutLog("     NbrProjParts:" & nPartInRawsProj.ToString)
+      ' Reimposto la macchina corrente
+      EgtSetCurrMachGroup(CurrGrpId)
+   End Sub
+
 End Class

From e726416853c242fc3d6def105f5741600ef5d39d Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 9 Apr 2024 16:43:13 +0200
Subject: [PATCH 13/18] Migliorata lettura errori per chiave di rete

---
 MySceneHost/MySceneHostVM.vb | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/MySceneHost/MySceneHostVM.vb b/MySceneHost/MySceneHostVM.vb
index 5d70245..cf8f8d7 100644
--- a/MySceneHost/MySceneHostVM.vb
+++ b/MySceneHost/MySceneHostVM.vb
@@ -47,12 +47,27 @@ Public Class MySceneHostVM
       ' Problemi
       ' Se manca la chiave
       If OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -1 Or OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -2 Then
-         EgtOutLog("Missing Dongle")
-         ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         If Not EgtGetNetHwKey() Then
+            EgtOutLog("Missing Dongle")
+            ' Box di avviso chiave mancante : "Chiave non presente. \nInserirla e riavviare il programma."  "Errore"
+            Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            EgtOutLog("NetDongle is full")
+            ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC." "Errore"
+            Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         End If
+         ' Se altrimenti manca il collegamento con la chiave di rete
+      ElseIf OmagOFFICEMap.refMainWindowVM.MainWindowM.nKeyLevel = -9 Then
+         EgtOutLog("Missing Link with Net Dongle")
+         ' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione." "Errore"
+         Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109)
+         Dim sTitle As String = EgtMsg(10101)
          MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-      ' Altrimenti manca la licenza
+         ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"

From c9b4d679bd4159aa92b4cdf16024c4b31fcee1c2 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 9 Apr 2024 16:44:49 +0200
Subject: [PATCH 14/18] Aggiornata versione 2.6d1

---
 MainWindow/MainWindowM.vb  | 4 ++--
 My Project/AssemblyInfo.vb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 6303e25..aded562 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -223,8 +223,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2603, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2603, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2604, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2604, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 08a0f9d..a1fd22a 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.3.1")>
-<Assembly: AssemblyFileVersion("2.6.3.1")>
+<Assembly: AssemblyVersion("2.6.4.1")>
+<Assembly: AssemblyFileVersion("2.6.4.1")>
 

From dc787f2596a8d84b51792a907aaba1eb22fdd61f Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Mon, 15 Apr 2024 09:40:39 +0200
Subject: [PATCH 15/18] Migliorata gestione VirtualKey, correzione salvataggio
 Proj

---
 Constants/ConstGen.vb            | 1 +
 MainWindow/MainWindowM.vb        | 7 ++++++-
 TopCommandBar/TopCommandBarVM.vb | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Constants/ConstGen.vb b/Constants/ConstGen.vb
index 6161835..4ddf146 100644
--- a/Constants/ConstGen.vb
+++ b/Constants/ConstGen.vb
@@ -21,6 +21,7 @@ Module ConstGen
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "OmagOFFICE.lic"
    Public Const S_LICENCE As String = "Licence"
+   Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
 
diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index aded562..f9a646c 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -219,7 +219,12 @@ Public Class MainWindowM
       EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey( sNestKey)
       Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
-      EgtSetNetHwKey( bNetHwKey)
+      EgtSetNetHwKey(bNetHwKey)
+      Dim sLockId As String = ""
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_LOCKID, "", sLockId, sLicFile)
+      If Not String.IsNullOrEmpty(sLockId) Then
+         EgtSetLockId(sLockId)
+      End If
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
diff --git a/TopCommandBar/TopCommandBarVM.vb b/TopCommandBar/TopCommandBarVM.vb
index c332d60..0a8e616 100644
--- a/TopCommandBar/TopCommandBarVM.vb
+++ b/TopCommandBar/TopCommandBarVM.vb
@@ -239,7 +239,7 @@ Public Class TopCommandBarVM
       'If SaveFileDialog.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
       'Dim sNewFilePath As String = SaveFileDialog.FileName
       ' non posso avere la stessa lastra in due progetti -> gestita da DataBase
-      OmagOFFICEMap.refSceneHostVM.SaveAsProject_1()
+      OmagOFFICEMap.refSceneHostVM.SaveAsProject()
    End Sub
 
 #End Region ' SaveAsCommand

From 6f526dca456cb8037516dc3d20fb1a3fe3bd0af7 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 18 Jun 2024 18:14:42 +0200
Subject: [PATCH 16/18] Cambio versione 2.6f3

---
 MainWindow/MainWindowM.vb  | 4 ++--
 My Project/AssemblyInfo.vb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index f9a646c..3af2696 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -228,8 +228,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2604, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2604, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2606, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2606, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index a1fd22a..53f78eb 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.4.1")>
-<Assembly: AssemblyFileVersion("2.6.4.1")>
+<Assembly: AssemblyVersion("2.6.6.3")>
+<Assembly: AssemblyFileVersion("2.6.6.3")>
 

From 6224b1e40b1fff6198cca46d1af17afe1d62dacc Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Wed, 31 Jul 2024 10:05:03 +0200
Subject: [PATCH 17/18] Gestione On/Off tagli con doppio click

---
 MainWindow/MainWindowM.vb                  |  4 ++--
 My Project/AssemblyInfo.vb                 |  4 ++--
 MySceneHost/MySceneHostVM.vb               |  9 +++++++++
 OptionPanel/MachiningTab/MachiningTabVM.vb |  6 ++++++
 OptionPanel/MachiningTab/SplitModeV.xaml   | 13 +++++++++----
 OptionPanel/MachiningTab/SplitModeVM.vb    |  6 ++++++
 6 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index 3af2696..ff1e5d7 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -228,8 +228,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2606, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2606, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2607, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2607, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 53f78eb..67f0dc9 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.6.3")>
-<Assembly: AssemblyFileVersion("2.6.6.3")>
+<Assembly: AssemblyVersion("2.6.8.1")>
+<Assembly: AssemblyFileVersion("2.6.8.1")>
 
diff --git a/MySceneHost/MySceneHostVM.vb b/MySceneHost/MySceneHostVM.vb
index cf8f8d7..64c92bd 100644
--- a/MySceneHost/MySceneHostVM.vb
+++ b/MySceneHost/MySceneHostVM.vb
@@ -102,12 +102,14 @@ Public Class MySceneHostVM
 
    Public Overrides Sub InitSceneEvents()
       AddHandler MainScene.OnMouseDownScene, AddressOf OnMouseDownScene
+      'AddHandler OnMouseDownScene_DoubleClick_1, AddressOf OnMouseDownScene_DoubleClick
       AddHandler MainScene.OnMouseMoveScene, AddressOf OnMouseMoveScene
       AddHandler MainScene.OnMouseUpScene, AddressOf OnMouseUpScene
       AddHandler MainScene.KeyDown, AddressOf OnKeyDownScene
       AddHandler MainScene.OnCursorPos, AddressOf OnCursorPos
       AddHandler MainScene.OnShowDistance, AddressOf OnShowDistance
       AddHandler MainScene.OnChangedSnapPointType, AddressOf OnChangedSnapPointType
+
    End Sub
 
    Private Sub PreInitializeScene()
@@ -809,6 +811,13 @@ Public Class MySceneHostVM
    Private Sub OnMouseDownScene(sender As Object, e As Windows.Forms.MouseEventArgs)
       ' Si può selezionare solo con il tasto sinistro e se stato NULL
       If e.Button <> Windows.Forms.MouseButtons.Left Or Not MainScene.IsStatusNull() Then Return
+      If e.Clicks > 1 Then
+         Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
+            Case OptionPanelVM.Tabs.MACHINING
+               OmagOFFICEMap.refMachiningTabVM.OnMouseDownScene_DoubleClick(sender, e)
+            Case OptionPanelVM.Tabs.SIMUL
+         End Select
+      End If
       ' Chiamo l'opportuno gestore
       Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
          Case OptionPanelVM.Tabs.RAWPART
diff --git a/OptionPanel/MachiningTab/MachiningTabVM.vb b/OptionPanel/MachiningTab/MachiningTabVM.vb
index 850b0b8..460596c 100644
--- a/OptionPanel/MachiningTab/MachiningTabVM.vb
+++ b/OptionPanel/MachiningTab/MachiningTabVM.vb
@@ -334,6 +334,12 @@ Public Class MachiningTabVM
       End If
    End Sub
 
+   Friend Sub OnMouseDownScene_DoubleClick(sender As Object, e As Windows.Forms.MouseEventArgs)
+      If m_MachiningMode = MachiningModeOpt.SPLIT Then
+         OmagOFFICEMap.refSplitModeVM.OnMouseDownScene_DoubleClick(sender, e)
+      End If
+   End Sub
+
 #End Region    ' EVENTS
 
 End Class
diff --git a/OptionPanel/MachiningTab/SplitModeV.xaml b/OptionPanel/MachiningTab/SplitModeV.xaml
index 001bde6..ba1fbcf 100644
--- a/OptionPanel/MachiningTab/SplitModeV.xaml
+++ b/OptionPanel/MachiningTab/SplitModeV.xaml
@@ -21,8 +21,12 @@
                             <Image Margin="1" Height="20" Width="20"
                                    Source="{Binding SourceImg}">
                             </Image>
-                            <TextBlock Margin="1" Text="{Binding Name}">
-                            </TextBlock>
+                            <TextBlock Margin="1" Text="{Binding Name}"/>
+                            <StackPanel.InputBindings>
+                                <MouseBinding MouseAction="LeftDoubleClick" 
+                                   Command="{Binding Path=DataContext.OnOffCommand,
+                                                     RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor }}"/>
+                            </StackPanel.InputBindings>
                         </StackPanel>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
@@ -40,6 +44,7 @@
                             </DataTrigger>
                         </Style.Triggers>
                         <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                     </Style>
                 </ListBox.ItemContainerStyle>
             </ListBox>
@@ -504,7 +509,7 @@
                             Style="{StaticResource ImgButton}"/>
                                 </StackPanel>
                             </Button>
-                            
+
                         </StackPanel>
 
                     </UniformGrid>
@@ -552,7 +557,7 @@
                             </Button>
                         </StackPanel>
 
-                        
+
                         <StackPanel Margin="1,0,0,0">
                             <Button ToolTip="{Binding ModifEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
diff --git a/OptionPanel/MachiningTab/SplitModeVM.vb b/OptionPanel/MachiningTab/SplitModeVM.vb
index 859a1e3..873ee74 100644
--- a/OptionPanel/MachiningTab/SplitModeVM.vb
+++ b/OptionPanel/MachiningTab/SplitModeVM.vb
@@ -3040,6 +3040,12 @@ Public Class SplitModeVM
       Return bOk
    End Function
 
+   Friend Sub OnMouseDownScene_DoubleClick(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      OnMouseDownScene(sender, e)
+      If m_nSelected = GDB_ID.NULL Then Return
+      OnOff(Nothing)
+   End Sub
+
    Friend Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Se tasto premuoto allora attivo la selezione multipla da Scena
       Dim bKeyCtrlPressed = (Keyboard.Modifiers And ModifierKeys.Control) > 0

From 5792664da8738ed38d800dd372c5311e6ae85005 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Wed, 31 Jul 2024 10:23:07 +0200
Subject: [PATCH 18/18] Correzione numero di versione 2.6g7

---
 My Project/AssemblyInfo.vb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 67f0dc9..e5bdb7a 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.8.1")>
-<Assembly: AssemblyFileVersion("2.6.8.1")>
+<Assembly: AssemblyVersion("2.6.7.7")>
+<Assembly: AssemblyFileVersion("2.6.7.7")>