Added Reason column

Added Conflict filter

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
index dccb7ac..233b4b9 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
@@ -28,6 +28,7 @@
             <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>

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
index dcb8356..3380d1a 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
@@ -100,8 +100,8 @@ namespace Pithos.Client.WPF.FileProperties
         {
                        this.DisplayName="Conflicts";
             var conflicts = from state in FileState.Queryable
-                            /*where state.FileStatus == FileStatus.Conflict ||
-                                  state.OverlayStatus == FileOverlayStatus.Conflict*/
+                            where state.FileStatus == FileStatus.Conflict ||
+                                  state.OverlayStatus == FileOverlayStatus.Conflict
                             let info=FileInfoExtensions.FromPath(state.FilePath)
                             select new ConflictFile {FilePath = state.FilePath,Reason=state.ConflictReason,LocalModified = info.LastWriteTime};          
             _conflicts = new ObservableCollection<ConflictFile>(conflicts.ToList());