Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

DosingSystem/View/CommParSetView.xaml

@@ -40,7 +40,7 @@
             FontSize="20"
             Style="{StaticResource ImageButtonStyle}" />
 
-        <WrapPanel  Grid.Row="1" Grid.ColumnSpan="4">
+        <WrapPanel Grid.Row="1" Grid.ColumnSpan="4">
 
             <Grid Width="350" Margin="5">
                 <Grid.ColumnDefinitions>
@@ -126,7 +126,7 @@
                     Text="{Binding CommBaseParModel.BlockCylinderCount, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
 
-            <Grid Width="350" Margin="5">
+            <Grid Background="Transparent" Width="350" Margin="5">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition />
                     <ColumnDefinition />
@@ -147,7 +147,7 @@
                     Text="{Binding CommBaseParModel.PalletCylinderCount, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
 
-            <Grid Width="350" Margin="5">
+            <Grid Background="Transparent" Width="350" Margin="5">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition />
                     <ColumnDefinition />
@@ -170,8 +170,9 @@
 
         </WrapPanel>
 
-        <Grid Background="Red" Grid.Row="2" Grid.ColumnSpan="4">
+        <Grid Grid.Row="2" Grid.ColumnSpan="4">
             <ListView
+               
                 Grid.Column="1"
                 Background="Transparent"
                 BorderBrush="#00BEFA"
@@ -183,21 +184,19 @@
                         <WrapPanel Orientation="Horizontal" />
                     </ItemsPanelTemplate>
                 </ListView.ItemsPanel>
-
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <Grid Width="350" Margin="5">
+                        <Grid
+                            Width="350"
+                            Margin="5"
+                            Background="Transparent">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
 
                             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,2,0"
-                                    Style="{StaticResource TextBlockStyle}"
-                                    Text="{Binding Name}" />
-
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding Name}" />
                                 <TextBlock
                                     Margin="0,0,2,0"
                                     Style="{StaticResource TextBlockStyle}"