-modifica grafica gradiente colore

Merge remote-tracking branch 'origin/HEAD' into feature/Manage_Color_Style
Merge commit 'dc787f2596a8d84b51792a907aaba1eb22fdd61f'
2024-04-15 16:06:30 +02:00 · 2024-04-15 09:41:59 +02:00 · 2024-04-15 09:40:54 +02:00 · 2024-04-15 09:40:39 +02:00 · 2024-04-09 16:45:16 +02:00 · 2024-04-09 16:44:49 +02:00
23 changed files with 616 additions and 175 deletions
@@ -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"

@@ -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"
@@ -13,10 +13,10 @@
   MaxWidth="500"                         
   ResizeMode="NoResize">

-    <DockPanel Margin="5,5,5,0" Background="{StaticResource Omag_DarkGray}">
+   <DockPanel Margin="5,5,5,0" Background="{StaticResource Gradient_Gray}">
+      <!--Background="{StaticResource Omag_DarkGray}"-->

-       
-        <UniformGrid Columns="15"
+      <UniformGrid Columns="15"
                   DockPanel.Dock="Top"
                   Margin="0,0,0,5">
            <Button Command="{Binding NewCommand}"
@@ -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)
@@ -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>
@@ -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
@@ -135,32 +135,44 @@ Public Class MyMachinePanelVM
      ToolDbWindowVM.MyForegroundGrbColor = Brushes.White

      ' Definisco lo stile della pagina
-      ToolDbWindowVM.BorderBrushIsMouseOver = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.GeneralBorderBrush = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.BorderBrushIsFocused = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.BackgroundBrdEnable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.BackgroundBrdDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.BackgroundTxBlDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BorderBrushIsMouseOver = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.GeneralBorderBrush = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BorderBrushIsFocused = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BackgroundBrdEnable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BackgroundBrdDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BackgroundTxBlDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BorderBrushIsMouseOver = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      ToolDbWindowVM.GeneralBorderBrush = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      ToolDbWindowVM.BorderBrushIsFocused = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      ToolDbWindowVM.BackgroundBrdEnable = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      ToolDbWindowVM.BackgroundBrdDisable = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      ToolDbWindowVM.BackgroundTxBlDisable = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      ToolDbWindowVM.ForegroundTxBlEnable = Brushes.White
      ToolDbWindowVM.ForegroundTxBlDisable = Brushes.White
      ToolDbWindowVM.GeneralForeground = Brushes.White
-      ToolDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.GeneralBackground = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))

      ' 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.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BackgroundCmBxTxBl = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      ToolDbWindowVM.BackgroundListCmBxTxBl = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      ToolDbWindowVM.ForegroundCmBxTxBl = Brushes.White
      ToolDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
      ToolDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
      ToolDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
-      ToolDbWindowVM.HeightCmBxTxBl = "25"
+      'ToolDbWindowVM.HeightCmBxTxBl = "25"
+      ToolDbWindowVM.HeightCmBxTxBl = "22"
      ToolDbWindowVM.WidthCmBxTxBl = "Auto"
      ToolDbWindowVM.ForegroundTextBoxCmBxTxBl = Brushes.White

      'Definisco lo stile del Button
-      ToolDbWindowVM.BackgroundButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BackgroundButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BackgroundButton = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      ToolDbWindowVM.ForegroundButton = Brushes.White
-      ToolDbWindowVM.BorderBrushButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BorderBrushButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BorderBrushButton = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      ToolDbWindowVM.BorderThicknessButton = New Thickness(1)

      ''Definisco lo stile della DataGrid
@@ -228,46 +240,64 @@ Public Class MyMachinePanelVM
      MachDbWindowVM.MyForegroundGrbColor = Brushes.White

      ' Definisco lo stile della pagina
-      MachDbWindowVM.BorderBrushIsMouseOver = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.GeneralBorderBrush = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BorderBrushIsFocused = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BackgroundBrdEnable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BackgroundBrdDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BackgroundTxBlDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BorderBrushIsMouseOver = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.GeneralBorderBrush = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BorderBrushIsFocused = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BackgroundBrdEnable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BackgroundBrdDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BackgroundTxBlDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderBrushIsMouseOver = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      MachDbWindowVM.GeneralBorderBrush = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      MachDbWindowVM.BorderBrushIsFocused = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      MachDbWindowVM.BackgroundBrdEnable = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      MachDbWindowVM.BackgroundBrdDisable = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      MachDbWindowVM.BackgroundTxBlDisable = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.ForegroundTxBlEnable = Brushes.White
      MachDbWindowVM.ForegroundTxBlDisable = Brushes.White
      MachDbWindowVM.GeneralForeground = Brushes.White
-      MachDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.GeneralBackground = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.MyForegroundChColor = Brushes.White

      ' 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.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundCmBxTxBl = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      'MachDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundListCmBxTxBl = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.ForegroundCmBxTxBl = Brushes.White
-      MachDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
+      'MachDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
+      MachDbWindowVM.BorderBrushCmBxTxBl = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
      MachDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
-      MachDbWindowVM.HeightCmBxTxBl = "25"
+      'MachDbWindowVM.HeightCmBxTxBl = "25"
+      MachDbWindowVM.HeightCmBxTxBl = "22"
      MachDbWindowVM.WidthCmBxTxBl = "Auto"
      MachDbWindowVM.ForegroundTextBoxCmBxTxBl = Brushes.White

      'Definisco lo stile del ToggleButton
-      MachDbWindowVM.BackgroundIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BackgroundIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundIsChecked = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.ForegroundIsChecked = Brushes.White
-      MachDbWindowVM.BorderBrushIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BorderBrushIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderBrushIsChecked = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.BorderThicknessIsChecked = New Thickness(1)
      MachDbWindowVM.OpacityIsChecked = 0.25

      'Definisco lo stile della DataGrid
      MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
-      MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
-      MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      'MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      'MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      MachDbWindowVM.BackgroundDataGrid = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#696969"), Color), CType(ColorConverter.ConvertFromString("#787878"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      MachDbWindowVM.BackGroundHeader = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#696969"), Color), CType(ColorConverter.ConvertFromString("#787878"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.ForegroundHeader = Brushes.White
-      MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderBrushHeader = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.BorderThicknessHeader = New Thickness(0)
      MachDbWindowVM.FontWeightHeader = FontWeights.Bold
-      MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderBrushDataGrid = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
+      MachDbWindowVM.BackgroundDataGridRow = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      MachDbWindowVM.ForegroundDataGridRow = Brushes.White
      MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
      MachDbWindowVM.BorderThicknessDataGridRow = New Thickness(0, 0, 0, 1)
@@ -348,7 +378,8 @@ Public Class MyMachinePanelVM
         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = Brushes.Red
      Else
         OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
-         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+         'OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      End If
   End Sub

@@ -219,12 +219,17 @@ 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
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2602, 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
@@ -5,11 +5,12 @@
   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
   DataContext="{StaticResource MainWindowVM}"
   Style="{DynamicResource MainWindowStyle}"
-   Title="{Binding Title}" Icon="/Resources/OmagOFFICE.ico"
+   Title="{Binding Title}" Icon="/Resources/Egalware.ico"
   MinHeight="600" MinWidth="800"
   AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
   CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                            Background="{StaticResource Omag_DarkGray}">
+   Background="{StaticResource Gradient_Gray}">
+   <!--Background="{StaticResource Omag_DarkGray}"-->
   <EgtWPFLib5:EgtCustomWindow.TitlePanel>
      <OmagOFFICE:TopCommandBarV DataContext="{StaticResource TopCommandBarVM}"/>
   </EgtWPFLib5:EgtCustomWindow.TitlePanel>
@@ -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.4.1")>
+<Assembly: AssemblyFileVersion("2.6.4.1")>

@@ -92,17 +92,19 @@
        </ListBox>

        <Button Content="+" Height="20" Width="20" VerticalAlignment="Center" Focusable="False"
-                Background="{StaticResource Omag_Black}"
+                Background="{StaticResource Gradient_Gray_Button}"
                Foreground="{StaticResource Omag_White}"
                Padding="0,0,0,5"
              Margin="3,0,5,0" Command="{Binding AddMachGroupCommand}" Grid.Column="1"
              IsEnabled="{Binding IsEnabledAddRemove}"/>
+                <!--Background="{StaticResource Omag_DarkGray}"-->
        <Button Content="-" Height="20" Width="20" VerticalAlignment="Center" Focusable="False"
-                Background="{StaticResource Omag_Black}"
+                Background="{StaticResource Gradient_Gray_Button}"
                Foreground="{StaticResource Omag_White}"
                Padding="0,0,0,5"
              Margin="0,0,5,0" Command="{Binding RemoveMachGroupCommand}" Grid.Column="2"
              IsEnabled="{Binding IsEnabledAddRemove}"/>
+                <!--Background="{StaticResource Omag_DarkGray}"-->

    </Grid>

@@ -246,11 +246,13 @@ Public Class MyMachGroupPanelVM
            OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = Brushes.Red
         Else
            OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
-            OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+            'OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+            OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
         End If
      Else
         OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
-         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+         'OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      End If

      ' Se non esiste il grezzo vado subito alla sua definizione
@@ -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"
@@ -719,6 +734,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 & "*"
@@ -963,6 +963,9 @@
  <ItemGroup>
    <Resource Include="Resources\NewIcons\DB-WJ.png" />
  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Egalware.ico" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe
@@ -7,14 +7,14 @@
        <Button Style="{StaticResource MachiningTab_Button}"
              Command="{Binding PrevCommand}"
              IsEnabled="{Binding PrevIsEnabled}"
-                Background="{StaticResource Omag_Black}"
+                Background="{StaticResource Gradient_Gray_Button}"
              Margin="0,0,1,0">
            <Image Source="/Resources/MachiningTab/BackArrow.png"/>
      </Button>
        <Button Style="{StaticResource MachiningTab_Button}"
              Command="{Binding NextCommand}"
              IsEnabled="{Binding NextIsEnabled}"
-                Background="{StaticResource Omag_Black}"
+                Background="{StaticResource Gradient_Gray_Button}"
              Margin="0,0,0,0">
            <Image Source="/Resources/MachiningTab/ForwardArrow.png"/>
        </Button>
@@ -22,14 +22,14 @@
              Content="{Binding ModifyMsg}"
              Command="{Binding ModifyCommand}"
              IsEnabled="{Binding ModifyIsEnabled}"
-                Background="{StaticResource Omag_Black}"
+                Background="{StaticResource Gradient_Gray_Button}"
                Foreground="{StaticResource Omag_White}"
              Margin="1,0,1,0"/>
        <Button Style="{StaticResource MachiningTab_Button}"
              Content="{Binding AutoMsg}"
              Command="{Binding AutoCommand}"
              Visibility="{Binding AutoVisibility}"
-                Background="{StaticResource Omag_Black}"
+                Background="{StaticResource Gradient_Gray_Button}"
                Foreground="{StaticResource Omag_White}"
              Margin="1,0,1,0"/>
   </UniformGrid>
@@ -44,7 +44,7 @@
                                Text="{Binding MoveStep}"
                                HorizontalAlignment="Center"
                                HorizontalContentAlignment="right"
-                                Background="{StaticResource Omag_Black}"
+                                Background="{StaticResource Gradient_Gray}"
                                Foreground="{StaticResource Omag_White}"
                                VerticalAlignment="Center"/>

@@ -64,7 +64,7 @@
                </Button>

                <Button Grid.Column="0" Grid.Row="6"
-                 Style="{StaticResource OptionPanel_MoveButton}"
+                 Style="{StaticResource OptionPanel_MoveButton2}"
                 Command="{Binding CcwRotCommand}"
                 Visibility="{Binding RotationVisibility}">
                    <Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
@@ -82,14 +82,15 @@
                    <TextBox Text="{Binding RotationStep}"  Width="40" Height="20"
                             HorizontalAlignment="center"
                             HorizontalContentAlignment="right"
-                             Background="{StaticResource Omag_Black}"
+                             Background="{StaticResource Gradient_Gray}"
                             Foreground="{StaticResource Omag_White}"/>
-                    <TextBlock Grid.Column="1" FontSize="25" Margin="2,-5,0,0"
+               <!--Background="{StaticResource Omag_Black}"-->
+               <TextBlock Grid.Column="1" FontSize="25" Margin="2,-5,0,0"
                       Foreground="{StaticResource Omag_White}" Text="°"/>
                </Grid>

                <Button Grid.Column="4" Grid.Row="6"
-                 Style="{StaticResource OptionPanel_MoveButton}"
+                 Style="{StaticResource OptionPanel_MoveButton2}"
                 Command="{Binding CwRotCommand}"
                 Visibility="{Binding RotationVisibility}">
                    <Image Source="/Resources/NestingTab/ClockwiseRotate.png"
@@ -39,19 +39,19 @@

        <Grid HorizontalAlignment="Center"
         VerticalAlignment="Center"
-         Margin="0,0,0,0">
+         Margin="0,0,0,5">
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="0.5"/>
                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="0.5"/>
                <ColumnDefinition Width="Auto"/>
            </Grid.ColumnDefinitions>
            <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="5"/>
+                <RowDefinition Height="0.5"/>
                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="5"/>
+                <RowDefinition Height="0.5"/>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="5"/>
                <RowDefinition Height="Auto"/>
@@ -60,7 +60,7 @@
            <!--<TextBlock Name="PositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
            HorizontalAlignment="Center" FontSize="15" />-->
            <Button Grid.Column="0" Grid.Row="0"
-            Style="{StaticResource OptionPanel_NestingButton}" Width="48" Height="48"
+            Style="{StaticResource OptionPanel_NestingButton2}" Width="48" Height="48"
            Command="{Binding PartRotOnCommand}">
                <Image Source="/Resources/NestingTab/PartRotOn.png" Stretch="Uniform"/>
            </Button>
@@ -71,7 +71,7 @@
                       Width="40"/>
            </Button>
            <Button Grid.Column="4" Grid.Row="0"
-            Style="{StaticResource OptionPanel_NestingButton}" Width="48" Height="48"
+            Style="{StaticResource OptionPanel_NestingButton2}" Width="48" Height="48"
            Command="{Binding PartRotOffCommand}">
                <Image Source="/Resources/NestingTab/PartRotOff.png" Stretch="Uniform"/>
            </Button>
@@ -93,10 +93,12 @@
                       Width="40"/>
            </Button>

-            <EgtWPFLib5:EgtTextBox Grid.Column="0" Grid.Row="4" Width="40"
+         <TextBox Grid.Column="0" Grid.Row="4" Width="40" Height="20" 
                             Text="{Binding StepMove}"
                             VerticalAlignment="Center"
-                             HorizontalContentAlignment="Right"/>
+                             HorizontalContentAlignment="Right"
+                             Background="{StaticResource Gradient_Gray}"
+                     Foreground="{StaticResource Omag_White}"/>

            <Button Grid.Column="2" Grid.Row="4"
              Style="{StaticResource OptionPanel_NestingButton}"
@@ -111,15 +113,18 @@
                    <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>

-                <EgtWPFLib5:EgtTextBox Text="{Binding RotationAngle}" Width="40"
+            <TextBox Text="{Binding RotationAngle}" Width="40" Height="20"
                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Left"/>
+                                HorizontalContentAlignment="Left"
+                     Margin="1.5,0,0,0"
+                     Background="{StaticResource Gradient_Gray}"
+                     Foreground="{StaticResource Omag_White}"/>
                <TextBlock Grid.Column="1" Margin="2,0,0,0"
-                    FontSize="20" Text="°"/>
+                    FontSize="20" Text="°" Foreground="{StaticResource Omag_White}"/>
            </Grid>

            <Button Grid.Column="0" Grid.Row="6"
-              Style="{StaticResource OptionPanel_NestingButton}"
+              Style="{StaticResource OptionPanel_NestingButton2}"
              Command="{Binding CClockwiseRotCommand}">
                <Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
                Width="64" Height="65" HorizontalAlignment="Center"
@@ -133,7 +138,7 @@
                VerticalAlignment="Center" />
            </ToggleButton>
            <Button Grid.Column="4" Grid.Row="6"
-              Style="{StaticResource OptionPanel_NestingButton}"
+              Style="{StaticResource OptionPanel_NestingButton2}"
              Command="{Binding ClockwiseRotCommand}">
                <Image Source="/Resources/NestingTab/ClockwiseRotate.png"
                Width="65" Height="65" HorizontalAlignment="Center"
@@ -904,7 +904,8 @@ Public Class RawPartTabVM
      End Set
   End Property

-   Private m_CurrMach_Background As Brush = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+   'Private m_CurrMach_Background As Brush = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+   Private m_CurrMach_Background As Brush = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
   Public Property CurrMach_Background As Brush
      Get
         Return m_CurrMach_Background
@@ -2100,7 +2101,8 @@ Public Class RawPartTabVM
         OmagOFFICEMap.refOptionPanelVM.MachTabIsEnabled = True
         OmagOFFICEMap.refOptionPanelVM.SimulTabIsEnabled = True
         OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
-         CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+         'CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
+         CurrMach_Background = New LinearGradientBrush(CType(ColorConverter.ConvertFromString("#808080"), Color), CType(ColorConverter.ConvertFromString("#909090"), Color), New Point(0.0, 0.0), New Point(0.0, 1.1))
      Else
         OmagOFFICEMap.refOptionPanelVM.NestTabIsEnabled = False
         OmagOFFICEMap.refOptionPanelVM.MachTabIsEnabled = False
@@ -3,7 +3,8 @@
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
   xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
-   Background="{StaticResource Omag_DarkGray}">
+   Background="{StaticResource Gradient_Gray}">
+   <!--Background="{StaticResource Omag_DarkGray}"-->

    <DockPanel x:Name="LEFTTRAY" DockPanel.Dock="Left" Background="Transparent">
        <OmagOFFICE:OptionPanelV DataContext="{StaticResource OptionPanelVM}"
@@ -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
@@ -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,6 +226,18 @@ 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()
   End Sub
@@ -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
@@ -45,12 +45,29 @@
    <SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
    <SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
    <SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
-    <SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
-    <SolidColorBrush x:Key="Omag_DarkGray" Color="#484D55" />
+   <SolidColorBrush x:Key="Omag_Gray" Color="#808080" />
+   <SolidColorBrush x:Key="Omag_DarkGray" Color="#484D55" />
    <SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
    <SolidColorBrush x:Key="Omag_Black" Color="#1C1D22" />

-    <Thickness x:Key="BorderBtn_Thickness">0</Thickness>
+   <LinearGradientBrush x:Key="Gradient_Gray" StartPoint="0,0" EndPoint="1500,1500" MappingMode="Absolute">
+      <GradientStop Color="#808080" Offset="0.7"/>
+      <GradientStop Color="#505050" Offset="0.3"/>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="Gradient_Gray_Button" StartPoint="0,0" EndPoint="1,1">
+      <GradientStop Color="#808080" Offset="0"/>
+      <GradientStop Color="#909090" Offset="0.5"/>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="Combo_Gradient">
+      <GradientStop Color="#808080" Offset="0"/>
+      <GradientStop Color="#909090" Offset="1"/>
+      <GradientStop Color="#909090" Offset="0.50"/>
+      <GradientStop Color="#808080" Offset="0.95"/>
+   </LinearGradientBrush>
+
+   <Thickness x:Key="BorderBtn_Thickness">0.25</Thickness>
    <Thickness x:Key="BorderGpBx_Thickness">0.25</Thickness>
    <Thickness x:Key="BorderBrd_Thickness">0.5</Thickness>

@@ -68,7 +85,8 @@

    <!--Colore del contorno quando il Mouse è sopra la TextBox-->
    <LinearGradientBrush x:Key="BrushBorderIsMouseOverTText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
-      <GradientStop Color="#1C1D22" Offset="0.05"/>
+      <!--<GradientStop Color="#1C1D22" Offset="0.05"/>-->
+      <GradientStop Color="#484D55" Offset="0.05"/>
        <GradientStop Color="#1C1D22" Offset="0.07"/>
    </LinearGradientBrush>

@@ -128,8 +146,9 @@
    <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
    <Style TargetType="{x:Type Button}">
        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-        <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -297,15 +316,17 @@
    <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="30"/>
        <Setter Property="Width" Value="80"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
    </Style>
    <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="40"/>
        <Setter Property="Width" Value="40"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="Template">
            <Setter.Value>
                <ControlTemplate TargetType="{x:Type Button}">
@@ -360,8 +381,9 @@
    <Style x:Key="Split_Button_Img" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="42"/>
        <Setter Property="Width" Value="42"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="Template">
            <Setter.Value>
                <ControlTemplate TargetType="{x:Type Button}">
@@ -389,8 +411,9 @@
    <Style x:Key="Nest_Button_Img" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="45"/>
        <Setter Property="Width" Value="45"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
    </Style>

    <Style x:Key="Simul_Button_Img" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
@@ -403,8 +426,9 @@
    <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="30"/>
        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="Template">
            <Setter.Value>
                <ControlTemplate TargetType="{x:Type Button}">
@@ -439,8 +463,9 @@
    <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}"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
    </Style>

    <Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
@@ -452,11 +477,20 @@
    <Style x:Key="OptionPanel_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="50"/>
        <Setter Property="Width" Value="50"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
-    </Style>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+   </Style>

-    <Style x:Key="DrawImport_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+   <Style x:Key="OptionPanel_NestingButton2" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="50"/>
+      <Setter Property="Width" Value="50"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+   </Style>
+
+   <Style x:Key="DrawImport_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="50"/>
        <Setter Property="Width" Value="50"/>
        <Setter Property="Background" Value="Transparent"/>
@@ -466,11 +500,20 @@
    <Style x:Key="OptionPanel_MoveButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="55"/>
        <Setter Property="Width" Value="55"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
    </Style>

-    <Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+   <Style x:Key="OptionPanel_MoveButton2" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="55"/>
+      <Setter Property="Width" Value="55"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+   </Style>
+
+   <Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
        <Setter Property="Height" Value="40"/>
        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
        <Setter Property="Background" Value="#636974"/>
@@ -487,8 +530,9 @@

    <Style TargetType="{x:Type ToggleButton}">
        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-        <Setter Property="Background" Value="#636974"/>
-        <Setter Property="BorderBrush" Value="#636974"/>
+      <!--<Setter Property="Background" Value="#636974"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="BorderBrush" Value="#636974"/>
        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
@@ -576,7 +620,8 @@
    <Style x:Key="OptionPanel_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
        <Setter Property="Height" Value="50"/>
        <Setter Property="Width" Value="50"/>
-    </Style>
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+   </Style>

    <Style x:Key="DrawImport_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
        <Setter Property="Height" Value="50"/>
@@ -667,17 +712,23 @@
        <Setter Property="HorizontalContentAlignment" Value="Right"/>
        <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
        <!--Nuovi Parametri-->
-        <Setter Property="BackgroundBrdEnable" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="BackgroundBrdDisable" Value="{StaticResource Omag_Black}"/>
+      <!--<Setter Property="BackgroundBrdEnable" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="BackgroundBrdEnable" Value="{StaticResource Gradient_Gray_Button}"/>
+      <!--<Setter Property="BackgroundBrdDisable" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="BackgroundBrdDisable" Value="{StaticResource Gradient_Gray_Button}"/>
        <Setter Property="BorderBrushIsMouseOver" Value="{StaticResource Omag_Black}"/>
        <Setter Property="BorderBrushIsFocused" Value="{StaticResource Omag_White}"/>
-        <Setter Property="GeneralBorderBrush" Value="{StaticResource BrushBorderIsMouseOverTText}"/>
-        <Setter Property="BackgroundTxBlDisable" Value="{StaticResource BrushBorderIsMouseOverTText}"/>
+      <!--<Setter Property="GeneralBorderBrush" Value="{StaticResource BrushBorderIsMouseOverTText}"/>-->
+      <Setter Property="GeneralBorderBrush" Value="{StaticResource Gradient_Gray_Button}"/>
+      <!--<Setter Property="BackgroundTxBlDisable" Value="{StaticResource BrushBorderIsMouseOverTText}"/>-->
+      <Setter Property="BackgroundTxBlDisable" Value="{StaticResource Gradient_Gray_Button}"/>
        <Setter Property="ForegroundTxBlEnable" Value="{StaticResource Omag_White}"/>
-        <Setter Property="ForegroundTxBlDisable" Value="{StaticResource Omag_Gray}"/>
-        <Setter Property="GeneralForeground" Value="{StaticResource Omag_White}"/>
-        <Setter Property="GeneralBackground" Value="{StaticResource Omag_Black}"/>
-    </Style>
+      <!--<Setter Property="ForegroundTxBlDisable" Value="{StaticResource Omag_Gray}"/>-->
+      <Setter Property="ForegroundTxBlDisable" Value="{StaticResource Omag_White}"/>
+      <Setter Property="GeneralForeground" Value="{StaticResource Omag_White}"/>
+      <!--<Setter Property="GeneralBackground" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="GeneralBackground" Value="{StaticResource Gradient_Gray_Button}"/>
+   </Style>

    <Style x:Key="ToolsTextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
        <Setter Property="Margin" Value="0,0,5,0"/>
@@ -705,8 +756,9 @@
    </Style>

    <Style x:Key="AxisTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-        <Setter Property="Background" Value="#2D3036"/>
-        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+      <!--<Setter Property="Background" Value="#2D3036"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
        <Setter Property="IsReadOnly" Value="True"/>
        <Setter Property="IsEnabled" Value="False"/>
        <Setter Property="TextAlignment" Value="Right"/>
@@ -794,10 +846,11 @@

    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
        <Setter Property="TitleBarHeight" Value="32"/>
-        <!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
-        <Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>
-        <Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
+        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
+        <!--<Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray}"/>
+      <!--<Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>-->
+      <Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
        <Setter Property="TitleBarBrush" Value="{StaticResource BrushBorderIsMouseOverTText}" />
        <Setter Property="BorderBrush" Value="Transparent" />
    </Style>
@@ -806,10 +859,13 @@
        <Setter Property="TitleBarHeight" Value="32"/>
        <!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
-        <Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>
-        <Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
-        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_DarkGray}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
+      <!--<Setter Property="Background" Value ="{StaticResource Omag_DarkGray}"/>-->
+      <Setter Property="Background" Value ="{StaticResource Gradient_Gray}"/>
+      <Setter Property="TitleBarForeground" Value="{StaticResource Omag_White}" />
+      <!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_DarkGray}" />-->
+      <!--<Setter Property="TitleBarBrush" Value="{StaticResource Omag_Gray}" />-->
+      <Setter Property="TitleBarBrush" Value="{StaticResource Gradient_Gray}"/>
+      <Setter Property="BorderBrush" Value="Transparent" />
    </Style>

    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -820,24 +876,27 @@
        <!--<Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
-        <Setter Property="BorderThickness" Value="0"/>
+      <!--<Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>-->
+      <Setter Property="BorderBrush" Value="{StaticResource Gradient_Gray}"/>
+      <Setter Property="BorderThickness" Value="0"/>
    </Style>

    <Style x:Key="Machine_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
        <!--<Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>-->
        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
-        <Setter Property="BorderThickness" Value="0"/>
+        <!--<Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>-->
+      <Setter Property="BorderBrush" Value="{StaticResource Gradient_Gray}"/>
+      <Setter Property="BorderThickness" Value="0"/>
    </Style>

    <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
        <Setter Property="IsToolBar" Value="False"/>
        <Setter Property="TitleBarOrientation" Value="Vertical"/>
        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
-        <Setter Property="BorderThickness" Value="0"/>
+        <!--<Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>-->
+      <Setter Property="BorderBrush" Value="{StaticResource Gradient_Gray}"/>
+      <Setter Property="BorderThickness" Value="0"/>
    </Style>

    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -1127,8 +1186,9 @@
    </Style>

    <Style TargetType="{x:Type ComboBox}">
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="VerticalContentAlignment" Value="Center"/>
        <Setter Property="Height" Value="25" />
@@ -1188,17 +1248,21 @@
    </Style>

    <Style x:Key="Raw_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Combo_Gradient}"/>
+      <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" />
    </Style>
+   
+   

    <Style x:Key="OptionWnd_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="VerticalContentAlignment" Value="Center"/>
        <Setter Property="Height" Value="25" />
@@ -1206,8 +1270,9 @@
    </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}"/>
+        <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="VerticalContentAlignment" Value="Center"/>
        <Setter Property="Height" Value="25" />
@@ -1216,8 +1281,9 @@
    </Style>

    <Style x:Key="MachiningsToolComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
-        <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
-        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+        <!--<Setter Property="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
        <Setter Property="VerticalContentAlignment" Value="Center"/>
        <Setter Property="Height" Value="25" />
@@ -1251,11 +1317,12 @@
                <ControlTemplate TargetType="{x:Type TabItem}">
                    <Grid>
                        <Border Name="border" Margin="1,0,0,0" BorderThickness="0" CornerRadius="0" 
-                                Background="{StaticResource Omag_DarkGray}"
-                                BorderBrush="{StaticResource Omag_Gray}">
+                                Background="{StaticResource Gradient_Gray_Button}"
+                                BorderBrush="{StaticResource Gradient_Gray_Button}">
                            <ContentPresenter x:Name="contentPresenter" VerticalAlignment="Center" HorizontalAlignment="Center" 
                                              ContentSource="Header" RecognizesAccessKey="True"/>
-                        </Border>
+                    <!--Background="{StaticResource Omag_DarkGray}"-->
+                  </Border>
                    </Grid>
                    <ControlTemplate.Triggers>
                        <Trigger Property="IsEnabled" Value="False">
@@ -1263,9 +1330,11 @@
                            <Setter Property="BorderBrush" TargetName="border" Value="#FFADB2B5"/>
                        </Trigger>
                        <Trigger Property="IsEnabled" Value="True">
-                            <Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Black}"/>
-                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Omag_Black}"/>
-                        </Trigger>
+                            <!--<Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Black}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Omag_Black}"/>-->
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource Gradient_Gray_Button}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Gradient_Gray_Button}"/>
+                  </Trigger>
                        <Trigger Property="IsSelected" Value="True">
                            <Setter Property="Background" TargetName="border" Value="{StaticResource Omag_Blue}"/>
                            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Omag_Gray}"/>
@@ -1315,8 +1384,9 @@

    <!-- 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="Background" Value="{StaticResource Omag_Black}"/>-->
+      <Setter Property="Background" Value="{StaticResource Gradient_Gray_Button}"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
    </Style>
Author	SHA1	Message	Date
Demetrio Cassarino	9f91bafd59	-modifica grafica gradiente colore	2024-04-15 16:06:30 +02:00
Demetrio Cassarino	38fbdc08dc	Merge remote-tracking branch 'origin/HEAD' into feature/Manage_Color_Style	2024-04-15 09:41:59 +02:00
Nicola Pievani	b3a359e257	Merge commit 'dc787f2596a8d84b51792a907aaba1eb22fdd61f'	2024-04-15 09:40:54 +02:00
Nicola Pievani	dc787f2596	Migliorata gestione VirtualKey, correzione salvataggio Proj	2024-04-15 09:40:39 +02:00
Nicola Pievani	d0cb48b31d	Merge branch 'develop'	2024-04-09 16:45:16 +02:00
Nicola Pievani	c9b4d679bd	Aggiornata versione 2.6d1	2024-04-09 16:44:49 +02:00
Nicola Pievani	e726416853	Migliorata lettura errori per chiave di rete	2024-04-09 16:43:13 +02:00
Nicola Pievani	9be2a9d1c3	Salvataggio Info progetto nei MachGroup	2024-04-03 08:25:47 +02:00
Nicola Pievani	aed8483ede	Merge commit '349a1429c12a249966201c56b23c13fb08a79d51'	2024-03-01 14:47:08 +01:00
Nicola Pievani	349a1429c1	Gestione colore entità e cambio versione	2024-03-01 14:46:41 +01:00
Nicola Pievani	29c528fa0e	Merge commit '0fa0d4e6123c5d07dfcb1c9601f2d968e21484d3' into develop	2024-02-14 18:57:33 +01:00
Nicola Pievani	0fa0d4e612	Gestione Engrave in ImportDXF	2024-02-14 18:57:19 +01:00
Nicola Pievani	600da701b1	Merge commit 'c534b459aeb33e06b2f2f41d6eee978d92ab26b9' into develop	2024-02-14 13:12:40 +01:00
Nicola Pievani	86e6a21d63	Merge commit 'd7522c4eb89d002ee0567337d1f371e0b2058961'	2024-02-13 15:15:15 +01:00
Nicola Pievani	7a26984f95	Merge commit '3a76d6c91a771f8644e33d5b7d2c46d1e0905e4c'	2024-01-24 11:56:09 +01:00