Revision 368e06fd trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml

b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
3 3
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org" 
4 4
        xmlns:cnv="clr-namespace:Pithos.Client.WPF.Converters"
5 5
        xmlns:model="clr-namespace:Pithos.Client.WPF.FileProperties"
6
        Title="Conflicts" Height="500" Width="500" x:Name="This" xmlns:my="clr-namespace:Microsoft.Windows.Controls.Core.Converters;assembly=WPFToolkit.Extended" Icon="/PithosPlus;component/Images/Pithos.ico">
6
        Title="Conflicts" Height="500" Width="600" x:Name="This" xmlns:my="clr-namespace:Microsoft.Windows.Controls.Core.Converters;assembly=WPFToolkit.Extended" Icon="/PithosPlus;component/Images/Pithos.ico">
7 7
    <Window.Resources>
8 8
        <ResourceDictionary>
9 9
            <ContextMenu  x:Key="RowMenu" DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
......
32 32
            <RowDefinition />
33 33
            <RowDefinition Height="Auto"/>
34 34
        </Grid.RowDefinitions>
35
        
36
        <DataGrid x:Name="Conflicts" HorizontalContentAlignment="Stretch" Grid.Row="0" 
35

  
36
        <ListBox x:Name="Conflicts" HorizontalContentAlignment="Stretch" Grid.Row="0">
37
            <ListBox.ItemTemplate>
38
                <DataTemplate>
39
                    <Grid  >
40
                        <Grid.ColumnDefinitions>
41
                            <ColumnDefinition />
42
                            <ColumnDefinition Width="150"/>
43
                        </Grid.ColumnDefinitions>
44
                        <StackPanel Grid.Column="0" Margin="0,5">
45
                            <TextBlock x:Name="FilePath" Text="{Binding FilePath}" Margin="5,0"/>
46
                            <StackPanel Orientation="Horizontal">
47
                                <TextBlock x:Name="Reason" FontStyle="Italic" Text="{Binding Reason}" Margin="5,0"/>
48
                                <TextBlock FontStyle="Italic" Margin="5,0">Local Date:<TextBlock x:Name="LocalModified" FontStyle="Italic"  Text="{Binding LocalModified}" Margin="5,0"/> </TextBlock>
49
                            </StackPanel>
50
                        </StackPanel>
51
                        <ComboBox Grid.Column="1"  x:Name="Action" Margin="5"
52
                                  ItemsSource="{Binding Source={StaticResource ActionsList}}"                                                                                 
53
                                    SelectedValue="{Binding Action}" VerticalAlignment="Top"
54
                                  />
55
                    </Grid>
56

  
57
                </DataTemplate>
58
            </ListBox.ItemTemplate>
59
        </ListBox>
60
        <!--<DataGrid x:Name="Conflicts" HorizontalContentAlignment="Stretch" Grid.Row="0" 
37 61
                  AutoGenerateColumns="false" 
38 62
                  RowStyle="{StaticResource DefaultRowStyle}"
39 63
                  Visibility="{Binding Converter={StaticResource BoolToVisible}, Path=HasConflicts}"
......
45 69
                <DataGridComboBoxColumn x:Name="Action"  Header="Action" Width="Auto" 
46 70
                                    ItemsSource="{Binding Source={StaticResource ActionsList}}"                                                                                 
47 71
                                    SelectedValueBinding="{Binding Action}" >
48
                 <!--   <DataGridComboBoxColumn.CellStyle>
72
                 ~1~   <DataGridComboBoxColumn.CellStyle>
49 73
                        <Style  TargetType="{x:Type DataGridCell}">
50 74
                            <Style.Triggers>
51 75
                                <Trigger Property="IsSelected" Value="True">
......
53 77
                                </Trigger>
54 78
                            </Style.Triggers>
55 79
                        </Style>
56
                    </DataGridComboBoxColumn.CellStyle>-->
80
                    </DataGridComboBoxColumn.CellStyle>@1@
57 81
                </DataGridComboBoxColumn>
58 82
            </DataGrid.Columns>
59
        </DataGrid>
83
        </DataGrid>-->
60 84
        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" 
61 85
                   Visibility="{Binding Converter={StaticResource BoolToVisible}, Path=HasNoConflicts}"
62 86
                   FontWeight="Bold">There are no conflicts.</TextBlock>
63 87
        <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Right">
88
            <Button Name="Refresh" Content="Refresh" Margin="5,5,80,5" Style="{StaticResource ButtonStyle}" IsDefault="False" />
64 89
            <Button Name="Apply" Content="OK" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}" IsDefault="False" />
65 90
            <Button Name="Cancel" Content="Cancel" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}" IsCancel="True" />
66 91
        </StackPanel>

Also available in: Unified diff