Optimizer 2.7.10.6

-Sistemato merge errato
-Pulizia Core

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -2,9 +2,9 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
                             Title="{Binding Title}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
                             WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
                             MinHeight="500" MinWidth="500"
@@ -23,7 +23,8 @@
 
       <GroupBox Header="Filters"
                 Margin="5"
-                Visibility="{Binding Filters_Visibility}">
+                Visibility="{Binding Filters_Visibility}"
+                BorderBrush="{StaticResource BeamWall_RegentStBlue}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -38,22 +39,26 @@
                          SelectedIndex="{Binding SelBTLDateType}"
                          Width="105"
                          Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
+                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                <StackPanel Grid.Column="1" Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
                             Width="105"
                             Margin="0,0,2.5,0"
-                            Style="{StaticResource PartParam_ComboBox}"/>
+                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                   <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
+                                Style="{StaticResource Filter_TextBlock}"
+                                Foreground="{StaticResource BeamWall_Corduroy}"/>
                      <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
+                                 Style="{StaticResource Filter_DatePicker}"
+                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
                      <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
+                                Style="{StaticResource Filter_TextBlock}"
+                                Foreground="{StaticResource BeamWall_Corduroy}"/>
                      <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
+                                 Style="{StaticResource Filter_DatePicker}"
+                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
                   </StackPanel>
                </StackPanel>
             </Grid>
@@ -67,41 +72,51 @@
                          SelectedItem="{Binding SelFilterType}"
                          Width="105"
                          Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
+                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"/>
+                                      Visibility="{Binding SearchText_Visibility}"
+                                      Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
                            Orientation="Horizontal">
                   <TextBlock Text="Rows"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             Style="{StaticResource OptionTextBlock}"
+                             Foreground="{StaticResource BeamWall_Corduroy}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource FeatureComboBox}"/>
+                            Width="55"
+                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
-                               ItemsSource="{Binding ProjectList}" 
-                               SelectedItem="{Binding SelProject}"
-                               CanUserAddRows="False"
-                               AutoGenerateColumns="False"
-                               CanUserResizeRows="False"
-                               SelectionMode="Single"
-                               ScrollViewer.CanContentScroll="True" 
-                               ScrollViewer.VerticalScrollBarVisibility="Auto"
-                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                               Margin="5"
-                               BindingColumns="{Binding ProjectColumns}">
+      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
+
+      <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
+                                   ItemsSource="{Binding ProjectList}" 
+                                   SelectedItem="{Binding SelProject}"
+                                   SelectionMode="Single"
+                                   Margin="5"
+                                   BindingColumns="{Binding ProjectColumns}"
+                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                                   AlternationCount="2"
+                                   ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
+                                   Style="{StaticResource DataGrid_OnlyProd}"
+                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
+         <DataGrid.RowStyle>
+            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
+               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
+            </Style>
+         </DataGrid.RowStyle>
          <DataGrid.Resources>
             <!-- ProjId -->
             <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -109,7 +124,7 @@
             <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -117,7 +132,7 @@
             <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -125,7 +140,7 @@
             <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -133,7 +148,7 @@
             <DataGridTextColumn x:Key="colLISTNAME" Binding="{Binding sListName}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -141,46 +156,41 @@
             <DataGridTextColumn x:Key="colEXPDATE" Binding="{Binding dtExportDate}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
             <!-- Creation date -->
             <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Machine -->
             <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Name (per Prod) -->
             <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
          </DataGrid.Resources>
-         <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
-               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
-               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
-            </Style>
-         </DataGrid.RowStyle>
-      </EgtBEAMWALL:EgtDataGrid>
+      </EgtBEAMWALLCORE:EgtDataGrid>
 
       <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
          <Button IsDefault="True" Name="OpenBtn"
-                 Content="{Binding Open_Msg}" Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Content="{Binding Open_Msg}" 
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button IsCancel="True"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
 
    </Grid>