Added Clear Conflict action to resolver

[pithos-ms-client] / trunk / Pithos.Client.WPF / FileProperties / ConflictsView.xaml

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
index acd9509..4cacf2a 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
@@ -7,18 +7,26 @@
     <Window.Resources>
         <ResourceDictionary>
             <ContextMenu  x:Key="RowMenu" DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
-            <MenuItem Header="{Binding FilePath}" cal:Message.Attach="GoToFile"/>
-        </ContextMenu>
-        <Style x:Key="DefaultRowStyle" TargetType="{x:Type DataGridRow}">
-            <Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
-        </Style>
+                <MenuItem Header="{Binding FilePath}" cal:Message.Attach="GoToFile"/>
+            </ContextMenu>
+            <ObjectDataProvider x:Key="ActionsList" MethodName="GetValues" ObjectType="{x:Type model:ConflictAction}">
+                <ObjectDataProvider.MethodParameters>
+                    <x:Type TypeName="model:ConflictAction"/>
+                </ObjectDataProvider.MethodParameters>
+            </ObjectDataProvider>
+
+            <Style x:Key="DefaultRowStyle" TargetType="{x:Type DataGridRow}">
+                <Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
+            </Style>
             <BooleanToVisibilityConverter x:Key="BoolToVisible" />
             <my:InverseBoolConverter x:Key="BoolToInvisible" />
             <ResourceDictionary.MergedDictionaries>
                     <ResourceDictionary Source="..\PithosStyles.xaml" />
                 </ResourceDictionary.MergedDictionaries>
-            </ResourceDictionary>
+
+        </ResourceDictionary>
     </Window.Resources>
+    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
@@ -31,21 +39,22 @@
                   Visibility="{Binding Converter={StaticResource BoolToVisible}, Path=HasConflicts}"
                   >
             <DataGrid.Columns>
-                <DataGridTextColumn x:Name="FilePath" Binding="{Binding FilePath}" Header="File" Width="*" />
-                <DataGridTextColumn x:Name="LocalModified" Binding="{Binding LocalModified}" Header="Local Date" Width="Auto" />
-                <DataGridTextColumn x:Name="Reason" Binding="{Binding Reason}" Header="Reason" Width="Auto" />
-                <DataGridTemplateColumn x:Name="Action" Header="Action" Width="Auto">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                        <ComboBox x:Name="Action" ItemsSource="{cnv:EnumValues model:ConflictAction}" 
-                                  SelectedValue="{Binding Action}" Grid.Column="2" 
-                                  HorizontalAlignment="Right" 
-                                  HorizontalContentAlignment="Left"
-                                  Width="110" Margin="5" Padding="5,2"
-                                  />
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+                <DataGridTextColumn x:Name="FilePath" Binding="{Binding FilePath}" Header="File" Width="*" IsReadOnly="True" />
+                <DataGridTextColumn x:Name="LocalModified" Binding="{Binding LocalModified}" Header="Local Date" Width="Auto" IsReadOnly="True"/>
+                <DataGridTextColumn x:Name="Reason" Binding="{Binding Reason}" Header="Reason" Width="Auto" IsReadOnly="True"/>
+                <DataGridComboBoxColumn x:Name="Action"  Header="Action" Width="Auto" 
+                                    ItemsSource="{Binding Source={StaticResource ActionsList}}"                                                                                 
+                                    SelectedValueBinding="{Binding Action}" >
+                 <!--   <DataGridComboBoxColumn.CellStyle>
+                        <Style  TargetType="{x:Type DataGridCell}">
+                            <Style.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="IsEditing" Value="True" />
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGridComboBoxColumn.CellStyle>-->
+                </DataGridComboBoxColumn>
             </DataGrid.Columns>
         </DataGrid>
         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center"