Merge branch 'develop'

AboutBox/AboutBoxWD.xaml

@@ -36,7 +36,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1">
-                    <Image Source="../Resources/NewIcons/Logo-Egalware (3).png" Stretch="Uniform"/>
+               <Image Source="../Resources/AboutBoxImage.png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"

CadCuts/NestPageUC.xaml.vb

@@ -220,21 +220,17 @@ Public Class NestPageUC
          m_nCountSpot = 0
          m_nCountSpotCUT = 0
       End If
-      EgtOutLog("Numero di SPOT caricati da OFFICE: " & m_nCountSpot.ToString)
       ' Se nel progetto non sono inseriti punti SpotReg disabilito i comandi
       If m_nCountSpot < 1 Then
          UG0_Reg.IsEnabled = False
          UG1_Reg.IsEnabled = False
-         EgtOutLog("   Abilito comandi gestione SPOT")
       Else
          UG0_Reg.IsEnabled = True
          UG1_Reg.IsEnabled = True
-         EgtOutLog("   Disabilito comandi gestione SPOT")
       End If
       ' Se nel progetto non sono inseriti punti SpotRegCUT provvedo ad aggiungerli
       If m_nCountSpotCUT < 1 Then
          InsertSpotRegistration()
-         EgtOutLog("      Creo SPOT_CUT")
       End If
 
       ' Se necessario riabilito impostazione modificato

CadCuts/SplitPageUC.xaml.vb

@@ -571,6 +571,11 @@ Public Class SplitPageUC
          m_nDragInd = -1
          m_nDragType = 0
          m_nSelected = GDB_ID.NULL
+         If Not IsNothing(MachiningLsBx.SelectedItem) Then
+            MarkMachining(MachiningLsBx.SelectedItem.Ind, False)
+            EgtDraw()
+         End If
+         MachiningLsBx.SelectedIndex = -1
       End If
    End Sub
 
@@ -2196,6 +2201,8 @@ Public Class SplitPageUC
          VerifyHomogenousMachining(ItemList)
          ' Abilitazione bottone Next
          EnableButtons()
+      Else
+
       End If
    End Sub
 

MainWindow.xaml

@@ -27,7 +27,7 @@
          </Grid.ColumnDefinitions>
 
          <Border Name="LogoBrd" Background="Transparent">
-                <Image Source="../Resources/NewIcons/Logo-Egalware (2).png" Stretch="Uniform" Margin="1"/>
+                <Image Source="{DynamicResource LogoOmagImg}" Stretch="Uniform" Margin="1"/>
          </Border>
 
          <!-- ** Definizione della Grid delle tab ** -->

OmagCUT.vbproj

@@ -1376,13 +1376,6 @@
     <Resource Include="Resources\NewIcons\Move-Spot-Reg.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\NewIcons\Logo-Egalware.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewIcons\Logo-Egalware %282%29.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewIcons\Logo-Egalware %283%29.png" />
     <Resource Include="Resources\NewIcons\RawHeight.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />