-aggiunto onlyprodconfiguration, OnlyProdFeatureInPartInRawPartListV, OnlyProdMachCommandMessagePanelV

2024-06-07 17:28:51 +02:00
parent 651c1e32af
commit 316a22d4bb
31 changed files with 1033 additions and 634 deletions
@@ -441,25 +441,25 @@ Public Class ConfigurationPageVM

   Public ReadOnly Property General_Msg As String
      Get
-         Return EgtMsg(62535)
+         Return EgtMsg(62535).ToUpper()
      End Get
   End Property

   Public ReadOnly Property ParameterQ_Msg As String
      Get
-         Return EgtMsg(62536)
+         Return EgtMsg(62536).ToUpper()
      End Get
   End Property

   Public ReadOnly Property Machine_Msg As String
      Get
-         Return EgtMsg(62537)
+         Return EgtMsg(62537).ToUpper()
      End Get
   End Property

   Public ReadOnly Property PDFEditor_Msg As String
      Get
-         Return EgtMsg(62538)
+         Return EgtMsg(62538).ToUpper()
      End Get
   End Property

@@ -18,9 +18,9 @@
                  Style="{StaticResource OnlyProd_TabControl}">
         <TabItem>
            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
+               <StackPanel Orientation="Horizontal" Margin="5">
                  <TextBlock Text="{Binding General_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             FontSize="15"/>
                  <Button Command="{Binding SaveCommand}"
                          ToolTip="{Binding SaveToolTip}"
                          Visibility="{Binding General_Visibility}"
@@ -35,9 +35,9 @@
         </TabItem>
         <TabItem>
            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
+               <StackPanel Orientation="Horizontal" Margin="5">
                  <TextBlock Text="{Binding ParameterQ_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             FontSize="15"/>
                  <Button Command="{Binding SaveCommand}"
                          ToolTip="{Binding SaveToolTip}"
                          Visibility="{Binding ParameterQ_Visibility}"
@@ -52,9 +52,9 @@
         </TabItem>
         <TabItem>
            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
+               <StackPanel Orientation="Horizontal" Margin="5">
                  <TextBlock Text="{Binding Machine_Msg}"
-                             Style="{StaticResource Machine_TextBlock}"/>
+                             FontSize="15"/>
               </StackPanel>
            </TabItem.Header>
            <TabItem.Content>
@@ -63,9 +63,9 @@
         </TabItem>
         <TabItem>
            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
+               <StackPanel Orientation="Horizontal" Margin="5">
                  <TextBlock Text="{Binding PDFEditor_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             FontSize="15"/>
                  <Button Command="{Binding SaveCommand}"
                          ToolTip="{Binding SaveToolTip}"
                          Visibility="{Binding PDFEditor_Visibility}"
@@ -22,7 +22,8 @@
      <ListBox ItemsSource="{Binding Tag.SIDEList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
               SelectedItem="{Binding Tag.nSelSIDE, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
               IsEnabled="{Binding FeatureManager_IsEnabled}"
-               Style="{StaticResource FeatureManager_ListBox}"/>
+               Style="{StaticResource FeatureManager_ListBox}"
+               ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
   </Expander>
   <Expander Grid.Column="1"
             Header="{Binding Group_Msg}"
@@ -31,7 +32,8 @@
      <ListBox ItemsSource="{Binding Tag.GRPList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
               SelectedItem="{Binding Tag.nSelGRP, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
               IsEnabled="{Binding FeatureManager_IsEnabled}"
-               Style="{StaticResource FeatureManager_ListBox}"/>
+               Style="{StaticResource FeatureManager_ListBox}"
+               ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
   </Expander>
   <TextBlock Grid.Column="2"
              Text="{Binding Priority_Msg}"
@@ -23,28 +23,31 @@
                  SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
                  DisplayMemberPath="sSectionXMaterial"
                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"
-                  ItemContainerStyle="{StaticResource AlternatingWithTriggers}"/>
+                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
      </Expander>
      <Expander Grid.Column="1" 
                Header="{Binding Group_Msg}"
                Margin="-2,0,0,0">
         <ListBox ItemsSource="{Binding Tag.GroupList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
                  SelectedItem="{Binding Tag.SelGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
-                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"/>
+                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"
+                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
      </Expander>
      <Expander Grid.Column="2" 
                Header="{Binding SubGroup_Msg}"
                Margin="-2,0,0,0">
         <ListBox ItemsSource="{Binding Tag.SubGroupList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
                  SelectedItem="{Binding Tag.SelSubGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
-                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"/>
+                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"
+                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
      </Expander>
      <Expander Grid.Column="3" 
                Header="{Binding ParType_Msg}"
                Margin="-2,0,0,0">
         <ListBox ItemsSource="{Binding Tag.SearchParamList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
                  SelectedItem="{Binding Tag.SelSearchParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"             
-                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"/>
+                  Style="{StaticResource OnlyProdLeftPanel_ListBox}"
+                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
      </Expander>
      <Expander Grid.Column="4" 
                Header="{Binding ParValue_Msg}"
@@ -1,8 +1,14 @@
 <UserControl x:Class="PdfViewer"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <ScrollViewer PanningMode="Both"
-                 Background="DarkGray">
+   <ScrollViewer PanningMode="Both">
+      <ScrollViewer.Background>
+         <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+            <GradientStop Color="#CCCCCC" Offset="0"/>
+            <GradientStop Color="#D9D9D9" Offset="0.45"/>
+            <GradientStop Color="#E6E6E6" Offset="1"/>
+         </LinearGradientBrush>
+      </ScrollViewer.Background>
      <!--<ItemsControl ItemsSource="{Binding Items}"/>-->
      <ItemsControl x:Name="PagesContainer"/>
   </ScrollViewer>
@@ -49,7 +49,8 @@
                  <Expander Style="{StaticResource Expander_PDF}">
                     <Expander.Header>
                        <TextBlock Text="{Binding sNameCategory}"
-                                   Style="{StaticResource Category_TextBlock}"/>
+                                   Style="{StaticResource Category_TextBlock}"
+                                   Foreground="{StaticResource BeamWall_White}"/>
                     </Expander.Header>
                     <ItemsControl ItemsSource="{Binding ExpanderElementList}"
                                   Style="{StaticResource ItemsControl_ExpanderElementList}">
@@ -64,13 +65,14 @@
                                 <CheckBox IsChecked="{Binding bParameter_IsChecked, UpdateSourceTrigger=PropertyChanged}"
                                           Style="{StaticResource OptionCheckBox}"/>
                                 <TextBlock Text="{Binding sNameParameter}"
-                                            Style="{StaticResource OptionTextBlock}"/>
+                                            Style="{StaticResource OptionTextBlock}"
+                                            Foreground="{StaticResource BeamWall_Corduroy}"/>
                              </StackPanel>
                           </DataTemplate>
                           <DataTemplate DataType="{x:Type EgtBEAMWALL:ExpanderTable}">
                              <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="1*"/>
                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
                                 <Grid.RowDefinitions>
@@ -79,10 +81,11 @@
                                 </Grid.RowDefinitions>
                                 <ListBox ItemsSource="{Binding RawPartColumns}"
                                          SelectedItem="{Binding SelColumns}"
-                                          Style="{StaticResource ListBox_PDF}">
+                                          Style="{StaticResource ListBox_PDF}"
+                                          ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
                                    <ListBox.ItemTemplate>
                                       <DataTemplate>
-                                          <StackPanel Style="{StaticResource StackPanel_List}">
+                                          <StackPanel Style="{StaticResource StackPanel_List}" Margin="0,-0.5,0,5">
                                             <CheckBox IsChecked="{Binding bIsChecked}" 
                                                       Style="{StaticResource OptionCheckBox}"/>
                                             <TextBlock Text="{Binding Name, Converter={StaticResource ColumnNameConverter}}"
@@ -98,13 +101,15 @@
                                       <CheckBox IsChecked="{Binding bSection_IsChecked}" 
                                                 Style="{StaticResource OptionCheckBox}"/>
                                       <TextBlock Text="{Binding Section_Msg}"
-                                                  Style="{StaticResource OptionTextBlock}"/>
+                                                  Style="{StaticResource OptionTextBlock}"
+                                                  Foreground="{StaticResource BeamWall_Corduroy}"/>
                                    </StackPanel>
                                    <StackPanel Style="{StaticResource StackPanel_List}">
                                       <CheckBox IsChecked="{Binding bImage_IsChecked}" 
                                                 Style="{StaticResource OptionCheckBox}"/>
                                       <TextBlock Text="{Binding Image_Msg}"
-                                                  Style="{StaticResource OptionTextBlock}"/>
+                                                  Style="{StaticResource OptionTextBlock}"
+                                                  Foreground="{StaticResource BeamWall_Corduroy}"/>
                                    </StackPanel>
                                 </UniformGrid>
                                 <StackPanel Grid.Column="1"
@@ -1291,8 +1291,38 @@
   <!--#region DatePicker-->

   <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
-      <Setter Property="Height" Value="22" />
+      <Setter Property="Height" Value="25" />
      <Setter Property="Width" Value="100" />
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type DatePickerTextBox}">
+            <Setter Property="Background" Value="Transparent"/>
+         </Style>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="Filter_Calendar" TargetType="{x:Type Calendar}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0.16"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.75"/>
+               <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1"/>
   </Style>

   <!--#endregion DatePicker-->
@@ -1672,7 +1702,7 @@

   <!--#endregion PasswordBox-->

-   <!--#region Tab Item Style-->
+   <!--#region TabItem Style-->

   <!--<LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
         <GradientStop Color="#F0F0F0" Offset="0.0"/>
@@ -2154,6 +2184,7 @@
      <Setter Property="Margin" Value="2.5"/>
      <Setter Property="Width" Value="Auto"/>
      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_RegentStBlue}"/>
   </Style>

   <!--#endregion GroupBox-->
@@ -2302,6 +2333,7 @@
      <Setter Property="BorderThickness" Value="0"/>
      <Setter Property="Margin" Value="0"/>
      <Setter Property="Padding" Value="0"/>
+      <Setter Property="AlternationCount" Value="2"/>
   </Style>

   <Style x:Key="ItemsControl_ExpanderElementList" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
@@ -2336,7 +2368,7 @@
   
   <!--#region Expander-->

-   <Style x:Key="Expander_PDF" TargetType="{x:Type Expander}">
+   <Style x:Key="Expander_PDF" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
      <Setter Property="IsExpanded" Value="True"/>
      <Setter Property="VerticalContentAlignment" Value="Top"/>
      <Setter Property="HorizontalContentAlignment" Value="Left"/>
@@ -2346,14 +2378,15 @@
   <!--#endregion Expander-->

   <!--#region ListBox-->
-   
-   <Style x:Key="ListBox_PDF" TargetType="{x:Type ListBox}" BasedOn="{x:Null}">
+
+   <Style x:Key="ListBox_PDF" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
      <Setter Property="BorderThickness" Value="0"/>
      <Setter Property="Padding" Value="0"/>
      <Setter Property="Margin" Value="0"/>
      <Setter Property="VerticalContentAlignment" Value="Top"/>
      <Setter Property="HorizontalContentAlignment" Value="Left"/>
      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="AlternationCount" Value="2"/>
   </Style>

   <!--#endregion ListBox-->
@@ -2695,6 +2728,15 @@
      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
      <Setter Property="TitleBarForeground" Value="{StaticResource BeamWall_White}"/>
      <Setter Property="ShowInTaskbar" Value="False"/>
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
   </Style>

   <!--#endregion EgtCustomWindow-->
@@ -3016,6 +3058,8 @@
      <Setter Property="HorizontalContentAlignment" Value="Center"/>
      <Setter Property="Height" Value="82"/>
      <Setter Property="Width" Value="80"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="AlternationCount" Value="2"/>
   </Style>

   <Style x:Key="OnlyProdLeftPanel_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
@@ -3030,18 +3074,43 @@
      </Style.Resources>
   </Style>

-   <Style x:Key="AlternatingWithTriggers" TargetType="{x:Type ListBoxItem}">
-      <Style.Triggers>
-         <Trigger Property="ListBox.AlternationIndex" Value="1">
-            <Setter Property="Background" Value="{StaticResource BeamWall_LinkWater}"/>
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-         </Trigger>
-         <!--<Trigger Property="IsSelected" Value="True">
-            <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
-            <Setter Property="FontWeight" Value="Bold"/>
-            <Setter Property="FontSize" Value="14"/>
-         </Trigger>-->
-      </Style.Triggers>
+   <Style x:Key="AlternationIndex_ListBoxItem" TargetType="{x:Type ListBoxItem}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Border Name="_itemContainer"
+                       Padding="0"
+                       BorderBrush="Transparent"
+                       BorderThickness="1"
+                       SnapsToDevicePixels="True">
+                  <ContentPresenter />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="ItemsControl.AlternationIndex" Value="0">
+                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                     <Setter Property="TextBlock.FontSize" Value="13"/>
+                  </Trigger>
+                  <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                     <Setter Property="Foreground" Value="{StaticResource BeamWall_LinkWater}" />
+                     <Setter TargetName="_itemContainer" Property="BorderBrush" Value="{StaticResource BeamWall_LinkWater}" />
+                     <Setter TargetName="_itemContainer" Property="Background" Value="{StaticResource BeamWall_LinkWater}" />
+                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                     <Setter Property="TextBlock.FontSize" Value="13"/>
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="_itemContainer" Property="BorderBrush" Value="{StaticResource BeamWall_FountainBlue}" />
+                     <Setter TargetName="_itemContainer" Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
+                     <Setter Property="TextBlock.Foreground" Value="{StaticResource BeamWall_White}"/>
+                     <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                     <Setter Property="FontWeight" Value="Bold"/>
+                     <Setter Property="TextBlock.FontSize" Value="14"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
   </Style>

   <Style x:Key="OnlyProdWarehouseWndV_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">