From a39cfeb4dd45892180ee4f920f278aaad471dd54 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Fri, 22 Sep 2023 19:15:31 +0200
Subject: [PATCH] Gestione pagina DB waterjet

---
 DxfImportWindow/DxfImportWindowV.xaml         | 171 ++++++-----
 DxfImportWindow/DxfImportWindowVM.vb          |   4 +-
 MachinePanel/MyMachinePanelVM.vb              |   3 +-
 My Project/AssemblyInfo.vb                    |   4 +-
 MyMachGroupPanel/MyMachGroupPanelV.xaml       | 109 +++++++
 MyMachGroupPanel/MyMachGroupPanelV.xaml.vb    |   3 +
 MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml   | 278 ++++++++++++++++++
 .../MyWaterjetDbWindowV.xaml.vb               |  20 ++
 OmagOFFICE.vbproj                             |  17 ++
 OptionPanel/MachiningTab/SplitModeVM.vb       |   3 +
 Project/ProjectV.xaml                         |   5 +-
 Resources/TopCommandBar/Modify.png            | Bin 0 -> 1349 bytes
 Utility/OmagOFFICEDictionary.xaml             |  73 ++++-
 13 files changed, 594 insertions(+), 96 deletions(-)
 create mode 100644 MyMachGroupPanel/MyMachGroupPanelV.xaml
 create mode 100644 MyMachGroupPanel/MyMachGroupPanelV.xaml.vb
 create mode 100644 MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml
 create mode 100644 MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb
 create mode 100644 Resources/TopCommandBar/Modify.png

diff --git a/DxfImportWindow/DxfImportWindowV.xaml b/DxfImportWindow/DxfImportWindowV.xaml
index 5ae581e..21a50a7 100644
--- a/DxfImportWindow/DxfImportWindowV.xaml
+++ b/DxfImportWindow/DxfImportWindowV.xaml
@@ -8,12 +8,12 @@
    ShowInTaskbar="False"
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" WindowStartupLocation="CenterOwner">
 
-   <DockPanel>
+    <DockPanel>
 
-      <DockPanel DockPanel.Dock="Left"
+        <DockPanel DockPanel.Dock="Left"
                  Width="200"
                  Margin="5,5,5,0">
-          
+
             <UniformGrid Columns="{Binding nButton}" Rows="1"
                          Margin="0,0,0,5"
                          DockPanel.Dock="Top">
@@ -40,145 +40,154 @@
                 </Button>
 
             </UniformGrid>
-        
 
-         <GroupBox Header="{Binding TypeMsg}"
+
+            <GroupBox Header="{Binding TypeMsg}"
                    DockPanel.Dock="Top"
                    IsEnabled="{Binding Type_IsEnabled}"
+                   BorderThickness="{StaticResource BorderGpBx_Thickness}"
+                   Foreground="{StaticResource Omag_White}"
                    Margin="0,0,0,5">
-            <UniformGrid Columns="2" Rows="2">
-               <Button Content="{Binding UseRegionMsg}"
+                <UniformGrid Columns="2" Rows="2">
+                    <Button Content="{Binding UseRegionMsg}"
                        IsEnabled="{Binding UseRegionIsEnabled}"
                        Command="{Binding UseRegionCommand}"
                        Style="{StaticResource OptionPanel_TextButton}"/>
-               <Button Content="{Binding UseLayerMsg}"
+                    <Button Content="{Binding UseLayerMsg}"
                        IsEnabled="{Binding UseLayerIsEnabled}"
                        Command="{Binding UseLayerCommand}"
                        Style="{StaticResource OptionPanel_TextButton}"/>
-               <Button Content="{Binding UseClosedCurveMsg}"
+                    <Button Content="{Binding UseClosedCurveMsg}"
                        IsEnabled="{Binding UseClosedCurveIsEnabled}"
                        Command="{Binding UseClosedCurveCommand}"
                        Style="{StaticResource OptionPanel_TextButton}"/>
-               <Button Content="{Binding ResetMsg}"
+                    <Button Content="{Binding ResetMsg}"
                        IsEnabled="{Binding ResetIsEnabled}"
                        Command="{Binding ResetCommand}"
                        Style="{StaticResource OptionPanel_TextButton}"/>
-            </UniformGrid>
-         </GroupBox>
+                </UniformGrid>
+            </GroupBox>
 
-         <GroupBox Header="{Binding MeasureUnitMsg}"
+            <GroupBox Header="{Binding MeasureUnitMsg}"
                    IsEnabled="{Binding Measure_IsEnabled}"
                    DockPanel.Dock="Top"
+                   BorderThickness="{StaticResource BorderGpBx_Thickness}"
+                   Foreground="{StaticResource Omag_White}"
                    Margin="0,0,0,5">
-            <UniformGrid Columns="2">
-               <RadioButton Content="{Binding MmMsg}"
+                <UniformGrid Columns="2">
+                    <RadioButton Content="{Binding MmMsg}"
                        IsChecked="{Binding MmIsChecked}"
                        Style="{StaticResource OptionPanel_ToggleButton}"/>
-               <RadioButton Content="{Binding InchMsg}"
+                    <RadioButton Content="{Binding InchMsg}"
                        IsChecked="{Binding InchIsChecked, Mode=OneWay}"
                        Style="{StaticResource OptionPanel_ToggleButton}"/>
-            </UniformGrid>
-         </GroupBox>
+                </UniformGrid>
+            </GroupBox>
 
-         <UniformGrid Columns="4"
+            <UniformGrid Columns="4"
                    DockPanel.Dock="Top"
                    IsEnabled="{Binding SideEntity_IsEnabled}"
-                   Margin="0,0,0,5">             
-            <!--Inclina lati-->
-            <ToggleButton Content="{Binding SideAngleMsg}"
+                   Margin="0,0,0,5">
+                <!--Inclina lati-->
+                <ToggleButton Content="{Binding SideAngleMsg}"
                        IsChecked="{Binding SideAngle_IsChecked}"
                        Style="{StaticResource CompoWindow_WrapToggleButton}"/>
 
-            <!--Filo Top-->
-            <ToggleButton Content="{Binding FiloTopMsg}"
+                <!--Filo Top-->
+                <ToggleButton Content="{Binding FiloTopMsg}"
                    IsChecked="{Binding FiloTop_IsChecked}"
                    Style="{StaticResource CompoWindow_WrapToggleButton}"/>
 
                 <!--Incidi da sotto-->
-            <ToggleButton Content="{Binding DripMsg}"
+                <ToggleButton Content="{Binding DripMsg}"
                       IsChecked="{Binding Drip_IsChecked}"
                       Style="{StaticResource CompoWindow_WrapToggleButton}"
                       IsEnabled="{Binding Drip_IsEnabled}"/>
-            <!--Fora da sotto-->
-            <ToggleButton Content="{Binding UnderDrillMsg}"
+                <!--Fora da sotto-->
+                <ToggleButton Content="{Binding UnderDrillMsg}"
                        IsChecked="{Binding UnderDrill_IsChecked}"
                        Style="{StaticResource CompoWindow_WrapToggleButton}"
                        IsEnabled="{Binding Drip_IsEnabled}"/>
-         </UniformGrid>
+            </UniformGrid>
 
-         <UniformGrid DockPanel.Dock="Bottom"
+            <UniformGrid DockPanel.Dock="Bottom"
                       Columns="2"
                       Margin="0,0,0,5">
-            <Button x:Name="OkBtn"
+                <Button x:Name="OkBtn"
                     Content="{Binding OkMsg}"
                     IsEnabled="{Binding OkIsEnabled}"
                     Style="{StaticResource OptionPanel_TextButton}"/>
-            <Button x:Name="CancelBtn"
+                <Button x:Name="CancelBtn"
                     Content="{Binding CancelMsg}"
                     Style="{StaticResource OptionPanel_TextButton}"/>
-         </UniformGrid>
+            </UniformGrid>
 
-         <Grid DockPanel.Dock="Bottom"
-               Visibility="{Binding PartData_Visibility}"
-               Margin="0,0,0,10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1.8*"/>
-               <ColumnDefinition Width="1.2*"/>
-            </Grid.ColumnDefinitions>
+            <GroupBox Header="Dati pezzo"
+                      
+                      BorderThickness="{StaticResource BorderGpBx_Thickness}"
+                      Foreground="{StaticResource Omag_White}"
+                      Margin="0">
 
-            <TextBlock Text="{Binding PartNumMsg}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding PartNum}"
+                <StackPanel>
+                    <Grid Visibility="{Binding PartData_Visibility}"
+                         Margin="0,0,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.8*"/>
+                            <ColumnDefinition Width="1.2*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="{Binding PartNumMsg}"/>
+                        <EgtWPFLib5:EgtTextBox Text="{Binding PartNum}"
                                    Grid.Column="1"/>
-         </Grid>
+                    </Grid>
 
-         <Grid DockPanel.Dock="Bottom"
-               Visibility="{Binding PartData_Visibility}"
-               Margin="0,0,0,10">
-            <TextBlock Text="{Binding TopMsg}"/>
-            <CheckBox IsChecked="{Binding TopIsChecked}"
-               HorizontalAlignment="Right" Margin="6,0,6,0"/>
-         </Grid>
+                    <Grid Visibility="{Binding PartData_Visibility}"
+                          Margin="0,0,0,10">
+                        <TextBlock Text="{Binding TopMsg}"/>
+                        <CheckBox IsChecked="{Binding TopIsChecked}"
+                                  HorizontalAlignment="Right" Margin="6,0,6,0"/>
+                    </Grid>
 
-         <Grid DockPanel.Dock="Bottom"
-               Visibility="{Binding OrderList_Visibility}"
-               Margin="0,0,0,10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1.8*"/>
-               <ColumnDefinition Width="1.2*"/>
-            </Grid.ColumnDefinitions>
+                    <Grid Visibility="{Binding OrderList_Visibility}"
+                          Margin="0,0,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.8*"/>
+                            <ColumnDefinition Width="1.2*"/>
+                        </Grid.ColumnDefinitions>
 
-            <TextBlock Text="{Binding ListMsg}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding List}"
+                        <TextBlock Text="{Binding ListMsg}"/>
+                        <EgtWPFLib5:EgtTextBox Text="{Binding List}"
                                    Grid.Column="1"/>
-         </Grid>
+                    </Grid>
 
-         <Grid DockPanel.Dock="Bottom"
-               Visibility="{Binding OrderList_Visibility}"
-               Margin="0,0,0,10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1.8*"/>
-               <ColumnDefinition Width="1.2*"/>
-            </Grid.ColumnDefinitions>
+                    <Grid Visibility="{Binding OrderList_Visibility}"
+                          Margin="0,0,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.8*"/>
+                            <ColumnDefinition Width="1.2*"/>
+                        </Grid.ColumnDefinitions>
 
-            <TextBlock Text="{Binding OrderMsg}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding Order}"
+                        <TextBlock Text="{Binding OrderMsg}"/>
+                        <EgtWPFLib5:EgtTextBox Text="{Binding Order}"
                                    Grid.Column="1"/>
-         </Grid>
+                    </Grid>
 
-         <TextBlock Text="{Binding OutputMessage}"
-                 Foreground="{Binding MsgColor}"
-                 DockPanel.Dock="Bottom"
-                 TextWrapping="Wrap"
-                 TextAlignment="Center"
-                 Margin="0,0,0,20"/>
+                    <TextBlock Text="{Binding OutputMessage}"
+                                Foreground="{Binding MsgColor}"
+                                DockPanel.Dock="Bottom"
+                                TextWrapping="Wrap"
+                                TextAlignment="Center"
+                                Margin="0,0,0,20"/>
 
-         <ContentControl VerticalAlignment="Center"
+                    <ContentControl VerticalAlignment="Center"
                          Content="{Binding SideEntityControl}"/>
+                </StackPanel>
+            </GroupBox>
 
-      </DockPanel>
+        </DockPanel>
+
+        <OmagOFFICE:DxfImportSceneHostV/>
+
+    </DockPanel>
 
-      <OmagOFFICE:DxfImportSceneHostV/>
-      
-   </DockPanel>
-   
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/DxfImportWindow/DxfImportWindowVM.vb b/DxfImportWindow/DxfImportWindowVM.vb
index 45b6018..afb75e6 100644
--- a/DxfImportWindow/DxfImportWindowVM.vb
+++ b/DxfImportWindow/DxfImportWindowVM.vb
@@ -925,9 +925,9 @@ Public Class DxfImportWindowVM
    Private Sub SetMsgColor(nMsgType As MSG_TYPE)
       Select Case nMsgType
          Case MSG_TYPE.INFO
-            m_MsgColor = Brushes.Black
+            m_MsgColor = Brushes.White
          Case MSG_TYPE.WARNING
-            m_MsgColor = Brushes.SaddleBrown
+            m_MsgColor = Brushes.Gold
          Case MSG_TYPE.ERROR_
             m_MsgColor = Brushes.Red
       End Select
diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index 374fc84..d2d4b61 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -451,7 +451,8 @@ Public Class MyMachinePanelVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Sub WaterjetDb(ByVal param As Object)
-      Dim WaterjetDbWindow As New WaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
+      ' Dim WaterjetDbWindow As New WaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
+      Dim WaterjetDbWindow As New MyWaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
       WaterjetDbWindow.Height = 546
       WaterjetDbWindow.Width = 846
       WaterjetDbWindow.ShowDialog()
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index f790d27..8118fba 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.9.1")>
-<Assembly: AssemblyFileVersion("2.5.9.1")>
+<Assembly: AssemblyVersion("2.5.9.5")>
+<Assembly: AssemblyFileVersion("2.5.9.5")>
 
diff --git a/MyMachGroupPanel/MyMachGroupPanelV.xaml b/MyMachGroupPanel/MyMachGroupPanelV.xaml
new file mode 100644
index 0000000..a107553
--- /dev/null
+++ b/MyMachGroupPanel/MyMachGroupPanelV.xaml
@@ -0,0 +1,109 @@
+<UserControl x:Class="MyMachGroupPanelV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+             Visibility="{Binding MachGroupPanel_Visibility}">
+
+    <!--<EgtFloating:EgtFloatingPanel.Resources>
+        <SolidColorBrush x:Key="ListBox.Static.Background" Color="#FFFFFFFF"/>
+        <SolidColorBrush x:Key="ListBox.Static.Border" Color="#FFABADB3"/>
+        <SolidColorBrush x:Key="ListBox.Disabled.Background" Color="#FFFFFFFF"/>
+        <SolidColorBrush x:Key="ListBox.Disabled.Border" Color="#FFD9D9D9"/>
+        <Style x:Key="MachiningGroupListBox" TargetType="{x:Type ListBox}">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden"/>
+            <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+            <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+            <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+        </Style>
+    </EgtFloating:EgtFloatingPanel.Resources>-->
+
+    <Grid Margin="5">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+
+        <ListBox ItemsSource="{Binding MachGroupList}" SelectedItem="{Binding SelectedMachGroup}" 
+                 Background="Transparent" BorderThickness="0"> 
+            <ListBox.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <VirtualizingStackPanel IsItemsHost="True" Orientation="Horizontal"/>
+                </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="ListBoxItem">
+                                <ContentPresenter/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </ListBox.ItemContainerStyle>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <RadioButton GroupName="MachiningGroups"
+                                 Height="30" MaxWidth="150" MinWidth="50" Padding="5,0,5,0"
+                                 ToolTip="{Binding MachGroupToolTip}"
+                                 IsChecked="{Binding Path=IsSelected,
+                                      RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}},
+                                                      Mode=TwoWay}"
+                                 IsEnabled="{Binding IsEnabled, Mode=TwoWay}"
+                                 VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
+                                 Style="{StaticResource ToolBar_TextToggleButton}">
+                        <RadioButton.Content>
+                            <TextBlock Text="{Binding Name}" Foreground="white"/>
+                        </RadioButton.Content>
+
+                    </RadioButton>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+            <ListBox.Template>
+                <ControlTemplate TargetType="{x:Type ListBox}">
+                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="0" SnapsToDevicePixels="true">
+                        <EgtWPFLib5:EgtScrollViewer IsPageSlideCommand="True" Focusable="false" Padding="{TemplateBinding Padding}" IsCustom="True" Orientation="Horizontal" RepeatButtonDimension="20">
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </EgtWPFLib5:EgtScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" TargetName="Bd" Value="DeepPink"/>
+                            <Setter Property="BorderBrush" TargetName="Bd" Value="LightPink"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsGrouping" Value="true"/>
+                                <!--<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>-->
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </ListBox.Template>
+        </ListBox>
+
+        <Button Content="+" Height="20" Width="20" VerticalAlignment="Center" Focusable="False"
+                Background="{StaticResource Omag_Black}"
+                Foreground="{StaticResource Omag_White}"
+                Padding="0,0,0,5"
+              Margin="3,0,5,0" Command="{Binding AddMachGroupCommand}" Grid.Column="1"
+              IsEnabled="{Binding IsEnabledAddRemove}"/>
+        <Button Content="-" Height="20" Width="20" VerticalAlignment="Center" Focusable="False"
+                Background="{StaticResource Omag_Black}"
+                Foreground="{StaticResource Omag_White}"
+                Padding="0,0,0,5"
+              Margin="0,0,5,0" Command="{Binding RemoveMachGroupCommand}" Grid.Column="2"
+              IsEnabled="{Binding IsEnabledAddRemove}"/>
+
+    </Grid>
+
+</UserControl>
diff --git a/MyMachGroupPanel/MyMachGroupPanelV.xaml.vb b/MyMachGroupPanel/MyMachGroupPanelV.xaml.vb
new file mode 100644
index 0000000..38ed845
--- /dev/null
+++ b/MyMachGroupPanel/MyMachGroupPanelV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class MyMachGroupPanelV
+
+End Class
diff --git a/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml
new file mode 100644
index 0000000..86a74c2
--- /dev/null
+++ b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml
@@ -0,0 +1,278 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="MyWaterjetDbWindowV"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   Title="{Binding Title}"
+   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+   CloseCommand="{Binding CloseToolsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+   Height="900" Width="1100">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.75*"/>
+            <RowDefinition Height="11*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="1" Grid.RowSpan="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="3*"/>
+            </Grid.ColumnDefinitions>
+
+            <ListBox x:Name="MaterialListBox"  
+                     Background="Transparent"
+                     Foreground="{StaticResource Omag_White}"
+                     BorderThickness="0"
+                 ItemsSource="{Binding MaterialList}" 
+                 DisplayMemberPath="Name" 
+                 SelectedItem="{Binding SelMaterial}" 
+                 Grid.Column="0">
+                <ListBox.ItemContainerStyle>
+                    <Style TargetType="ListBoxItem">
+                        <Style.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Opacity" Value="1"/>
+                            </Trigger>
+                            <Trigger Property="IsSelected" Value="false">
+                                <Setter Property="Opacity" Value="0.6"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </ListBox.ItemContainerStyle>
+            </ListBox>
+
+            <ListBox x:Name="SubMaterialListBox"
+                     Background="Transparent"
+                     Foreground="{StaticResource Omag_White}"
+                     BorderThickness="0"
+                 ItemsSource="{Binding Path=SelectedItem.SubMaterialList, ElementName=MaterialListBox}" 
+                 DisplayMemberPath="Name" 
+                 SelectedItem="{Binding Path=SelectedItem.SelSubMaterial, ElementName=MaterialListBox}" 
+                 Grid.Column="1">
+                <ListBox.ItemContainerStyle>
+                    <Style TargetType="ListBoxItem">
+                        <Style.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Opacity" Value="1"/>
+                            </Trigger>
+                            <Trigger Property="IsSelected" Value="false">
+                                <Setter Property="Opacity" Value="0.6"/>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </ListBox.ItemContainerStyle>
+            </ListBox>
+
+            <DataGrid ItemsSource="{Binding Path=SelectedItem.ParamList, ElementName=SubMaterialListBox}" 
+                      SelectedItem="{Binding Path=SelectedItem.SelWjParam, ElementName=SubMaterialListBox}"
+                      Grid.Column="2"
+                      Background="Transparent"
+                      BorderThickness="0"
+                      Margin="2.5,0,2.5,0"
+                      HeadersVisibility="Column"
+                      AutoGenerateColumns="False">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+                        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+                        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
+                        <Setter Property="BorderThickness" Value="0.25"/>
+                        <Setter Property="FontWeight" Value="Bold"/>
+                        <Setter Property="Margin" Value="0"/>
+                        <Setter Property="Opacity" Value="0.7"/>
+                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridRow}">
+                        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+                        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
+                        <Setter Property="BorderThickness" Value="0.25"/>
+                    </Style>
+                    <Style TargetType="{x:Type DataGridCell}">
+                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
+                        <Setter Property="BorderThickness" Value="0.25"/>
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <!--Thickness-->
+                    <DataGridTextColumn Binding="{Binding Thickness}"
+                            Width="*">
+                        <DataGridTextColumn.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DataContext.Thickness_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                            </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                    </DataGridTextColumn>
+                    <!--Q1-->
+                    <DataGridTextColumn Binding="{Binding Q1}"
+                            Width="*">
+                        <DataGridTextColumn.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DataContext.Q1_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                            </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                    </DataGridTextColumn>
+                    <!--Q2-->
+                    <DataGridTextColumn Binding="{Binding Q2}"
+                            Width="*">
+                        <DataGridTextColumn.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DataContext.Q2_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                            </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                    </DataGridTextColumn>
+                    <!--Q3-->
+                    <DataGridTextColumn Binding="{Binding Q3}"
+                            Width="*">
+                        <DataGridTextColumn.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DataContext.Q3_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                            </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                    </DataGridTextColumn>
+                    <!--Q4-->
+                    <DataGridTextColumn Binding="{Binding Q4}"
+                            Width="*">
+                        <DataGridTextColumn.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DataContext.Q4_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                            </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                    </DataGridTextColumn>
+                    <!--Q5-->
+                    <DataGridTextColumn Binding="{Binding Q5}"
+                            Width="*">
+                        <DataGridTextColumn.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DataContext.Q5_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                            </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                    </DataGridTextColumn>
+                    <!--QExtra-->
+                    <DataGridTextColumn Binding="{Binding QExtra}"
+                            Width="*">
+                        <DataGridTextColumn.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DataContext.QExtra_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                            </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                    </DataGridTextColumn>
+                    <!--AngComp-->
+                    <DataGridTextColumn Binding="{Binding dAngComp}"
+                            Width="*">
+                        <DataGridTextColumn.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DataContext.AngComp_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                            </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+
+        </Grid>
+
+        <Grid Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="3*"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBox Grid.Column="0" Text="{Binding sNewMaterial, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding NewMaterial_Visibility}" Height="20" Margin="10,0">
+                <TextBox.InputBindings>
+                    <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
+                    <KeyBinding Key="Esc" Command="{Binding CancelCommand}"/>
+                </TextBox.InputBindings>
+            </TextBox>
+            <TextBox Grid.Column="1" Text="{Binding sNewSubMaterial, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding NewSubMaterial_Visibility}" Height="20" Margin="10,0">
+                <TextBox.InputBindings>
+                    <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
+                    <KeyBinding Key="Esc" Command="{Binding CancelCommand}"/>
+                </TextBox.InputBindings>
+            </TextBox>
+
+            <!--<Grid DockPanel.Dock="Bottom" Visibility="{Binding NewMaterial_Visibility}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="4*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <EgtWPFLib5:EgtTextBox Text="{Binding sNewMaterial}"
+                                DockPanel.Dock="Bottom"          
+                                Margin="0,0,0,5"/>
+                <Button Content="{Binding OkMsg}" Grid.Column="1"
+                            Command="{Binding DoneCommand}"
+                            IsEnabled="{Binding EnableOkNewMat}"
+                            Style="{StaticResource OptionPanel_TextButton}"
+                            Margin="2.5,0,0,2.5"/>
+                <Button Content="{Binding CancelMsg}" Grid.Column="2"
+                            Command="{Binding CamcelCommand}"
+                            Style="{StaticResource OptionPanel_TextButton}"
+                            Margin="2.5,0,0,2.5"/>
+            </Grid>-->
+
+        </Grid>
+
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="3*"/>
+            </Grid.ColumnDefinitions>
+
+            <UniformGrid Grid.Column="0" Columns="3" HorizontalAlignment="left">
+                <Button Command="{Binding NewMaterialCommand}" ToolTip="{Binding New_Msg}" 
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+                </Button>
+
+                <Button Command="{Binding ModifyMaterialCommand}" ToolTip="{Binding Modify_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Modify.png" Stretch="Uniform"/>
+                </Button>
+                <Button Command="{Binding DeleteMaterialCommand}" ToolTip="{Binding Delete_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+                </Button>
+            </UniformGrid>
+
+            <UniformGrid Grid.Column="1" Columns="3" HorizontalAlignment="left">
+                <Button Command="{Binding NewSubMaterialCommand}" ToolTip="{Binding New_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+                </Button>
+                <Button Command="{Binding ModifySubMaterialCommand}" ToolTip="{Binding Modify_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Modify.png" Stretch="Uniform"/>
+                </Button>
+                <Button Command="{Binding DeleteSubMaterialCommand}" ToolTip="{Binding Delete_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+                </Button>
+            </UniformGrid>
+
+            <UniformGrid Grid.Column="2" Columns="3" HorizontalAlignment="Right">
+                <Button Command="{Binding NewWjParamCommand}" ToolTip="{Binding New_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+                </Button>
+                <Button Command="{Binding DeleteWjParamCommand}" ToolTip="{Binding Delete_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+                </Button>
+                <Button Command="{Binding SaveCommand}" ToolTip="{Binding Save_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
+                </Button>
+            </UniformGrid>
+        </Grid>
+
+    </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>
\ No newline at end of file
diff --git a/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb
new file mode 100644
index 0000000..6c36591
--- /dev/null
+++ b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb
@@ -0,0 +1,20 @@
+Imports EgtWPFLib5
+
+Public Class MyWaterjetDbWindowV
+
+   Private WithEvents m_WaterjetDbWindowVM As WaterjetDbWindowVM
+
+   Sub New(Owner As Window, WaterjetDbWindowVM As WaterjetDbWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = WaterjetDbWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_WaterjetDbWindowVM = WaterjetDbWindowVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_WaterjetDbWindowVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class
diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj
index e78f9d7..e750610 100644
--- a/OmagOFFICE.vbproj
+++ b/OmagOFFICE.vbproj
@@ -238,6 +238,9 @@
     <Compile Include="InstrumentPanel\MyInstrumentPanelVM.vb" />
     <Compile Include="InstrumentPanel\PrintPanelVM.vb" />
     <Compile Include="MachinePanel\MyMachinePanelVM.vb" />
+    <Compile Include="MyMachGroupPanel\MyMachGroupPanelV.xaml.vb">
+      <DependentUpon>MyMachGroupPanelV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MyMachGroupPanel\MyMachGroupPanelVM.vb" />
     <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
       <DependentUpon>MachinePanelV.xaml</DependentUpon>
@@ -261,6 +264,9 @@
       <DependentUpon>MyToolDbWindowV.xaml</DependentUpon>
     </Compile>
     <Compile Include="MyToolDbWindow\MyToolDbWindowVM.vb" />
+    <Compile Include="MyWaterjetDbWindow\MyWaterjetDbWindowV.xaml.vb">
+      <DependentUpon>MyWaterjetDbWindowV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="OptionPanel\MachiningTab\MachiningTabV.xaml.vb">
       <DependentUpon>MachiningTabV.xaml</DependentUpon>
     </Compile>
@@ -431,6 +437,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MyMachGroupPanel\MyMachGroupPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MyMachiningDbWindow\MyMachiningDbWindowV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -459,6 +469,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="MyWaterjetDbWindow\MyWaterjetDbWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="OptionPanel\MachiningTab\MachiningTabV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -906,6 +920,9 @@
   <ItemGroup>
     <Resource Include="Resources\TopCommandBar\Automatic.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Modify.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/SplitModeVM.vb b/OptionPanel/MachiningTab/SplitModeVM.vb
index 5ee9a9e..d4b1771 100644
--- a/OptionPanel/MachiningTab/SplitModeVM.vb
+++ b/OptionPanel/MachiningTab/SplitModeVM.vb
@@ -1984,6 +1984,9 @@ Public Class SplitModeVM
                ModifStartWindow.DataContext = ModifStartWindowVM
                ModifStartWindow.Owner = Application.Current.MainWindow
                ModifStartWindowVM.SetVal(dOrigUsal)
+               ' Il posizionamento è forzato nel codice xaml: WindowStartupLocation="CenterOwner"
+               ModifStartWindow.Left = 190
+               ModifStartWindow.Top = 600
                If Not ModifStartWindow.ShowDialog() Then Return
                ' Modifica della lavorazione
                dUsal = ModifStartWindowVM.GetVal()
diff --git a/Project/ProjectV.xaml b/Project/ProjectV.xaml
index 06f8444..25e6a97 100644
--- a/Project/ProjectV.xaml
+++ b/Project/ProjectV.xaml
@@ -23,14 +23,15 @@
 
     <DockPanel x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom" Background="Transparent">
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="{Binding}">
-            <EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelVM}"
+            <OmagOFFICE:MyMachGroupPanelV DataContext="{StaticResource MachGroupPanelVM}"/>
+            <!--<EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelVM}"
                                      Background="Transparent"
                                      BorderBrush="Transparent"
                                      RepaetButtonStyle="{StaticResource CustomScrollBarButton}"
                                      MachGroupButtonStyle="{StaticResource {x:Type ToggleButton}}"
                                      IsToolBar="False"
                                      IsTopDockable="False" IsBottomDockable="false" IsLeftDockable="False"
-                                     IsRightDockable="False"/>
+                                     IsRightDockable="False"/>-->
         </StackPanel>
     </DockPanel>
 
diff --git a/Resources/TopCommandBar/Modify.png b/Resources/TopCommandBar/Modify.png
new file mode 100644
index 0000000000000000000000000000000000000000..597d9934a5f978d03fdc812ba8c7f4d74031c7ab
GIT binary patch
literal 1349
zcmV-L1-kl)P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkvmAkKpe)urb>O(2UtYJAwzYtAS&W0RV;#q(pG5I!Q|2xG-*gu
zTpR`0f`gC6s)LKOt`4q(Aou`rb#YR3krMxx6k5c3aNLjY?)$j=4iKtErkZUNfT~$W
zJQ5aD=~dD9icSoo7v1QWn5jn-i%GN`U-$6v^)AG-TA%xK^e7pV0UnWfj_HO)yg@v(
zY3ZEzi32PzDa7Z*;|5)j_>t?f%Ws@>4huXpU?k)7!~tS4*TixYv%H}aPZI|fRik_%
z<+8$gi?doRv-&;x3;h{wCBb!?BZy!LQN$oZMi~VZVIf4TMv93z?T1_VhaG>6Tr#-|
zVB}ap2`VJV5B>+gyEU^@lWvkf479)4_QxpT+XZSB+x|Yb?b-?8eFm<yhQCw=W<N=<
zG_>Fm(6<d-TsJg%54hX`hMsiEkQ~WNQ^;n4_cQvYG%#=rbgj9))%S7w03@la<s0DO
z5E#o*_IitVcQp6*@0ogkKSl>~m30ATPXGV_24YJ`L;!>UXaJ9f=BWe#000SaNLh0L
z01FcU01FcV0GgZ_00007bV*G`2j>YE4jC<LwlmKF00TiuL_t(o!|j+~Xj4}l$3G{=
z-uQ2&sO?&Hmetr=ovBRR6x1|h55lC1FOrAeyzF5Vw93@6hguZ`H~*Bu$cv!%;rgh8
z;Lt4w=1?=y2I`-9Bh(@hwWzVy-85~^9=x%&lxxUx^Rj&5zMOOJxu5g>eb2d<3ni8G
zKajBM)O4d32;?#EOTXLIHNK&|{X*?e>YCqX%~ZDf-L4+1o1IpjXD-DKZ~nS|OFpaB
zbfd}db_KGFi$oKfX3bRU0k5VTSb<qW{gX;B0*Kyu!i{^6bAnmfP>rXt3P3d<9*9H}
z;Z>fRh31fBgRfIDpdl})tUQfX`wq1%?EKKU^7aefx_K3s0aC*wC}mDn(+$4+^>X0E
zl~_}-t@&6an%HsTO6;uFJPy0Udgk}oo2So)0MuYxa{%axL=z8Jd1}rkyEgRYovHt#
zrJv5-e)Qa}BRgAGd{jAih8k>Z#_x93=5nuXPJPx;8BeCt>yMth^(yO_rW+?Gj+02I
z<mmwk(`|<W0>QTCO}n;ye)?e|nKIi{O*h6J6;inhzd+?~pi9COTgwNi0JAHmF}q^g
z`1YnO5O8oc-8H~pKr4`x@I#@YUfzg5xt@47=$hD(9?g8Lwk)qQfu;caCEa!S)M3&L
z@F#x*J3;mr6e`)Zq30%id2{mPqEm&vBWWDKAxUU4UezE2Oa(ak9Mt1L(9TRv1n%^^
z6=!Rs5|JFP!~2!-t}}G1OrXXEY!iqPCq<J~-j*!181Jqzpzt3qf$uKR0U~Ah?wbg7
zP|{uho<rfErwV-cfgiI#cJDqW4Rz){hwhsWjTYtbG=Zj@p<aU51abi3Q)On!_JDX(
zv=e>Ip~*ts`d~7LY%X8!p)L}XRDcf2;|7aRj~4rdyiW3{&qwvWp|CMy%%SfsOJ*aK
zEL#fe_+-J0kWXCSh|)_qp$L3;%eP+~()84jrW@g6f4Vqs!&>^kP>ACQ@hC2+?gcs!
z8JY7WHk7YiaP8Y={n8_t-v{is3Uv{JE)0;X0d7ME#Be^d<O=20bfYu3q2o;%+kAKQ
z0dJw9)|*$}YIM&jj8po+;8pE>Z$S&}|7KZx>BmG#B?12e70f#(7+AG=00000NkvXX
Hu0mjf_@ILg

literal 0
HcmV?d00001

diff --git a/Utility/OmagOFFICEDictionary.xaml b/Utility/OmagOFFICEDictionary.xaml
index 927a549..97483d1 100644
--- a/Utility/OmagOFFICEDictionary.xaml
+++ b/Utility/OmagOFFICEDictionary.xaml
@@ -28,6 +28,7 @@
     <OmagOFFICE:MachiningTabVM x:Key="MachiningTabVM"/>
     <OmagOFFICE:SimulTabVM x:Key="SimulTabVM"/>
     <OmagOFFICE:MyMachGroupPanelVM x:Key="MachGroupPanelVM"/>
+    <OmagOFFICE:MyMachGroupPanelV x:Key="MachGroupPanelV"/>
 
     <EgtPHOTOLib:ProjectSlabVM x:Key="ProjectSlabVM"/>
     <EgtPHOTOLib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
@@ -220,6 +221,33 @@
         </Setter>
     </Style>
 
+    <Style x:Key="WaterjetDB_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="OpacityMask" Value="#54707070"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" Value="#008BFF"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
     <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Height" Value="30"/>
         <Setter Property="Width" Value="30"/>
@@ -351,8 +379,37 @@
         <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
         <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
         <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="OpacityMask" Value="#54707070"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="#008BFF"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="#E1B957"/>
+                            <Setter Property="BorderBrush" Value="#E1B957"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
+    <Style x:Key="OptionPanel_ImgButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+    
     <Style x:Key="SimulPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Height" Value="30"/>
         <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
@@ -1009,7 +1066,7 @@
         <Setter Property="Height" Value="25" />
         <Setter Property="Width" Value="Auto" />
     </Style>
-    
+
     <Style x:Key="MachiningsComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
         <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
         <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
@@ -1116,13 +1173,13 @@
         <Setter Property="Margin" Value="0,0,0,0"/>
     </Style>
 
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- ListBox -->
-   <Style x:Key="OptionWnd_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
-      <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
-      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
-   </Style>
+    <!-- ListBox -->
+    <Style x:Key="OptionWnd_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+    </Style>
 
 </ResourceDictionary>