Aggiornata pagina CSV

CsvWindow/CsvWindowV.xaml

@@ -13,47 +13,55 @@
    MaxWidth="500"                         
    ResizeMode="NoResize">
 
-   <DockPanel Margin="5,5,5,0">
+    <DockPanel Margin="5,5,5,0" Background="{StaticResource Omag_DarkGray}">
+
+       
+        <UniformGrid Columns="15"
+                   DockPanel.Dock="Top"
+                   Margin="0,0,0,5">
+            <Button Command="{Binding NewCommand}"
+                 Margin="0,0,2.5,0"               
+                 Style = "{DynamicResource CSV_Button}">
+                <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
+            </Button>
+            <Button Command="{Binding OpenCommand}"
+                 Margin="2.5,0,2.5,0"
+                    Style = "{DynamicResource CSV_Button}">
+                <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
+            </Button>
+            <ToggleButton IsChecked="{Binding Plus_IsChecked}"
+                          Style="{DynamicResource CSV_ToggleButton}"
+                       Margin="2.5,0,2.5,0">
+                <Image Source="/Resources/CsvWindow/CsvPlus - Color.png"/>
+            </ToggleButton>
+            <ToggleButton IsChecked="{Binding Minus_IsChecked}"
+                          Style="{DynamicResource CSV_ToggleButton}"
+                       Margin="2.5,0,0,0">
+                <Image Source="/Resources/CsvWindow/CsvMinus - Color.png"/>
+            </ToggleButton>
+
+            <Button ToolTip="{Binding InsertMsg}"
+                 Command="{Binding InsertCommand}"
+                 Margin="0,0,2.5,0"
+                 Style = "{DynamicResource CSV_Button}">
+                <Image Source="/Resources/CsvWindow/Inserisci-pezzo CSV.png" Stretch="Uniform"/>
+            </Button>
+                <Button ToolTip="{Binding RemoveMsg}"
+                 Command="{Binding RemoveCommand}"
+                 Margin="2.5,0,0,0"
+                 Style = "{DynamicResource CSV_Button}">
+                <Image Source="/Resources/CsvWindow/Parcheggia-pezzo CSV.png" Stretch="Uniform"/>
+            </Button>
+        </UniformGrid>
 
         <TextBlock Text="{Binding CsvPath}"
                  DockPanel.Dock="Top"
+                 Foreground="{StaticResource Omag_White}"
                  Margin="0,0,0,5"/>
         
-      <UniformGrid Columns="2"
-                   DockPanel.Dock="Bottom"
-                   Margin="0,0,0,5">
-         <Button Content="{Binding InsertMsg}"
-                 Command="{Binding InsertCommand}"
-                 Margin="0,0,2.5,0"
-                 Style="{StaticResource CompoWindow_Button}"/>
-         <Button Content="{Binding RemoveMsg}"
-                 Command="{Binding RemoveCommand}"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource CompoWindow_Button}"/>
-      </UniformGrid>
-
-      <UniformGrid Columns="4"
-                   DockPanel.Dock="Bottom"
-                   Margin="0,0,0,5">
-         <Button Command="{Binding NewCommand}"
-                 Margin="0,0,2.5,0">
-            <Image Source="/Resources/CsvWindow/CsvNew.png"/>
-         </Button>
-         <Button Command="{Binding OpenCommand}"
-                 Margin="2.5,0,2.5,0">
-            <Image Source="/Resources/CsvWindow/CsvOpen.png"/>
-         </Button>
-         <ToggleButton IsChecked="{Binding Plus_IsChecked}"
-                       Margin="2.5,0,2.5,0">
-            <Image Source="/Resources/CsvWindow/CsvPlus.png"/>
-         </ToggleButton>
-         <ToggleButton IsChecked="{Binding Minus_IsChecked}"
-                       Margin="2.5,0,0,0">
-            <Image Source="/Resources/CsvWindow/CsvMinus.png"/>
-         </ToggleButton>
-      </UniformGrid>
-
         <TreeView ItemsSource="{Binding CsvTypeList}"
+                Background="Transparent"
+                BorderThickness="0"
                 Margin="0,0,0,5" >
 
             <TreeView.ItemContainerStyle>
@@ -74,13 +82,16 @@
                         </Grid.ColumnDefinitions>
 
                         <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
-                  <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
+                        <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" Foreground="{StaticResource Omag_White}"/>
 
                     </Grid>
                     <HierarchicalDataTemplate.ItemContainerStyle>
                         <Style TargetType="{x:Type TreeViewItem}">
                             <EventSetter Event="MouseUp" Handler="PartItemClick"/>
                             <Style.Triggers>
+                                <DataTrigger Binding="{Binding bIsActive}" Value="true">
+                                    <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                                </DataTrigger>
                                 <DataTrigger Binding="{Binding bIsActive}" Value="False">
                                     <Setter Property="Foreground" Value="{StaticResource Omag_Gray}"/>
                                 </DataTrigger>

OmagOFFICE.vbproj

@@ -939,6 +939,18 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Crea-taglio-parallelo.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\CsvWindow\CsvMinus - Color.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\CsvWindow\CsvPlus - Color.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\CsvWindow\Inserisci-pezzo CSV.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\CsvWindow\Parcheggia-pezzo CSV.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe

Utility/OmagOFFICEDictionary.xaml

@@ -221,6 +221,32 @@
         </Setter>
     </Style>
 
+    <Style x:Key="CSV_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="{StaticResource BorderBtn_Thickness}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="border" CornerRadius="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                        <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="OpacityMask" Value="#54707070"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" Value="#008BFF"/>
+                            <Setter Property="BorderBrush" Value="#008BFF"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
     <Style x:Key="WaterjetDB_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Height" Value="30"/>
         <Setter Property="Width" Value="30"/>
@@ -511,6 +537,12 @@
         <Setter Property="Width" Value="30"/>
     </Style>
 
+    <Style x:Key="CSV_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Width" Value="30"/>
+    </Style>
+
     <Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
         <Setter Property="Height" Value="30"/>
         <Setter Property="Width" Value="70"/>