Merge branch 'develop'

CadCuts/CSVPage.xaml

@@ -27,7 +27,7 @@
          </Grid.ColumnDefinitions>
 
          <!--Griglia per oscurare i bottoni della pagina sottostante-->
-         <Grid Background="{DynamicResource OmagCut_Gray}">
+            <Grid Background="{DynamicResource OmagCut_Gray}">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -49,7 +49,7 @@
 
          <Label Name="CsvPathTxBl" Grid.Row="1" Background="White" FontSize="16" VerticalAlignment="Center" Padding="2,5,0,5"/>
 
-         <TreeView Name="PartsTreeView" Grid.Row="2" Background="{StaticResource OmagCut_TreeViewGradientGray}">
+            <TreeView Name="PartsTreeView" Grid.Row="2" Background="{DynamicResource OmagCut_TreeViewBackGroundColor}">
             <TreeView.Resources>
                <!--Modifico HierarchicalDataTemplate del CathegoryItem per poter inserire immagine e testo e per -->
                <!--renderlo apribile con un solo click -->
@@ -62,7 +62,7 @@
                      </Grid.ColumnDefinitions>
 
                      <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
-                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" Foreground="Black" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
 
                   </Grid>
 
@@ -123,10 +123,7 @@
                         </Setter>
                         <Style.Triggers>
                            <DataTrigger Binding="{Binding bIsActive}" Value="False">
-                              <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding bIsActive}" Value="True">
-                              <Setter Property="Foreground" Value="Black"/>
+                              <Setter Property="Foreground" Value="{StaticResource OmagCut_LightGray}"/>
                            </DataTrigger>
                         </Style.Triggers>
                      </Style>
@@ -134,25 +131,18 @@
                </HierarchicalDataTemplate>
                <!--Modifico DataTemplate del ToolItem per poter inserire immagine e testo-->
                <DataTemplate DataType="{x:Type self:PartCustomItem}">
-                  <Grid Width="234.8" Margin="0,5,0,5" HorizontalAlignment="Right">
+                  <Grid Width="246" Margin="0,5,0,5" HorizontalAlignment="Right">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="1*"/>
                      </Grid.ColumnDefinitions>
 
-                     <TextBlock x:Name="TbName"  Grid.Column="0" Text="{Binding Name}" Height="18" FontSize="14" HorizontalAlignment="Right"/>
-                     <TextBlock x:Name="TbText1" Grid.Column="1" Text="{Binding sText1}" Height="18" FontSize="14" HorizontalAlignment="Center"/>
-                     <TextBlock x:Name="TbText2" Grid.Column="2" Text="{Binding sText2}" Height="18" FontSize="14" HorizontalAlignment="Left"/>
+                     <TextBlock Grid.Column="0" Text="{Binding Name}" Height="18" FontSize="14" HorizontalAlignment="Right"/>
+                     <TextBlock Grid.Column="1" Text="{Binding sText1}" Height="18" FontSize="14" HorizontalAlignment="Center"/>
+                     <TextBlock Grid.Column="2" Text="{Binding sText2}" Height="18" FontSize="14" HorizontalAlignment="Left"/>
 
                   </Grid>
-                  <DataTemplate.Triggers>
-                     <DataTrigger Binding="{Binding bIsActive}" Value="False">
-                        <Setter TargetName="TbName" Property="TextDecorations" Value="Strikethrough" />
-                        <Setter TargetName="TbText1" Property="TextDecorations" Value="Strikethrough" />
-                        <Setter TargetName="TbText2" Property="TextDecorations" Value="Strikethrough" />
-                     </DataTrigger>
-                  </DataTemplate.Triggers>
                </DataTemplate>
             </TreeView.Resources>
 

CadCuts/SplitPageUC.xaml.vb

@@ -705,11 +705,6 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub MachiningLsBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles MachiningLsBx.SelectionChanged
-      ' se non attiva la modifica allora esco
-      If m_bShow Then
-         MachiningLsBx.SelectedIndex = -1
-         Return
-      End If
       If MachiningLsBx.SelectedItems.Count = 0 Then Return
       If MachiningLsBx.SelectedItems.Count = 1 Then m_bAreHomogeneous = True
       ' creo lista ordinata dei selezionati
@@ -751,8 +746,6 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub MachiningLsBx_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles MachiningLsBx.MouseDoubleClick
-      ' se disabilitata la modifica allora esco
-      If m_bShow Then Return
       If m_IsCtrlKeyDown Or m_IsShiftKeyDown Then Return
       OnOffCut()
    End Sub
@@ -1958,22 +1951,22 @@ Public Class SplitPageUC
          NumberDirectionMachining(nI)
       Next
 
-      ' -------------------- Recupero le lavorazioni indicate come attive -- INIZIO --------------------
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
       Dim ActiveMachLst As New List(Of Integer)
       For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
-         If ItemSplitMach.bIsActive Then ActiveMachLst.Add(ItemSplitMach.Ind)
+         ActiveMachLst.Add(ItemSplitMach.Ind)
       Next
-      ' -------------------- Recupero le lavorazioni indicate come attive --  FINE  --------------------
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
 
       ' Preparo la lista degli Item
       ShowMachiningList()
 
-      ' -------------------- Riattivo le lavorazioni precedenti -- INIZIO --------------------
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
+
       For Each Item As SplitMach In m_MachiningList
-         ' spengo tutte le lavorazioni disponibili
          EgtSetInfo(Item.m_nId, INFO_MCH_USER_OFF, True)
       Next
-      ' riattivo solo quelle indicate come attive
+
       For nIndex As Integer = 0 To ActiveMachLst.Count - 1
          For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
             If ItemSplitMach.Ind = ActiveMachLst(nIndex) Then
@@ -1986,7 +1979,7 @@ Public Class SplitPageUC
             End If
          Next
       Next
-      ' -------------------- Riattivo le lavorazioni precedenti --  FINE  --------------------
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
 
       ' Aggiorno visualizzazione
       EgtDraw()