Skip to content

Commit

Permalink
Add note to context resolver saying to use shift/control
Browse files Browse the repository at this point in the history 
Fixes #359
  • Loading branch information
@canton7
canton7 committed Feb 28, 2018
1 parent 35a54cf commit e29d55f
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 76 deletions.
151 changes: 77 additions & 74 deletions src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,80 +72,83 @@
Visibility="{Binding IsSyncthingStopped, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"
Text="{l:Loc ConflictResolutionView_Status_SyncthingNotRunning}"/>

<ListView Visibility="{Binding Conflicts, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"
ItemsSource="{Binding Source={StaticResource ConflictsItemsSource}}"
SelectionMode="Extended"
SelectionChanged="{s:Action SelectionChanged}"
MouseDoubleClick="{s:Action ListViewDoubleClick}"
BorderThickness="0"
MinHeight="10">
<i:Interaction.Behaviors>
<xaml:GridViewSortByBehaviour/>
</i:Interaction.Behaviors>
<ListView.Resources>
<Style TargetType="GridViewColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="Padding" Value="5,0"/>
</Style>
<Style TargetType="ListViewItem">
<Setter Property="IsSelected" Value="{Binding IsSelected}"/>
</Style>
</ListView.Resources>
<ListView.View>
<GridView>
<GridViewColumn xaml:GridViewSortBy.SortByKey="FileName"
xaml:GridViewSortBy.IsInitiallySorted="True">
<!-- Need a proper header for this, for the initial sort -->
<GridViewColumnHeader>
<TextBlock Text="{l:Loc ConflictResolutionView_Header_File}"/>
</GridViewColumnHeader>
<GridViewColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Image Width="15" Height="15" Margin="5,0,5,0"
Source="{Binding Icon}"/>
<TextBlock Text="{Binding FileName}"/>
</StackPanel>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Header="{l:Loc ConflictResolutionView_Header_LastModified}"
DisplayMemberBinding="{Binding LastModified}"
xaml:GridViewSortBy.SortByKey="LastModified"/>
<GridViewColumn Header="{l:Loc ConflictResolutionView_Header_Folder}"
xaml:GridViewSortBy.SortByKey="InnerFolder">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock>
<TextBlock Text="{Binding InnerFolder}"/>
(<TextBlock Text="{Binding Folder}"/>)
</TextBlock>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
</GridView>
</ListView.View>
<ListView.GroupStyle>
<GroupStyle>
<GroupStyle.ContainerStyle>
<Style TargetType="{x:Type GroupItem}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Expander IsExpanded="True">
<Expander.Header>
<TextBlock Text="{Binding Name}" FontWeight="Bold"/>
</Expander.Header>
<ItemsPresenter />
</Expander>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</GroupStyle.ContainerStyle>
</GroupStyle>
</ListView.GroupStyle>
</ListView>
<DockPanel Visibility="{Binding Conflicts, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
<TextBlock DockPanel.Dock="Bottom" Margin="5,3" Text="{l:Loc ConflictResolutionView_SelectMultiple}"/>

<ListView ItemsSource="{Binding Source={StaticResource ConflictsItemsSource}}"
SelectionMode="Extended"
SelectionChanged="{s:Action SelectionChanged}"
MouseDoubleClick="{s:Action ListViewDoubleClick}"
BorderThickness="0"
MinHeight="10">
<i:Interaction.Behaviors>
<xaml:GridViewSortByBehaviour/>
</i:Interaction.Behaviors>
<ListView.Resources>
<Style TargetType="GridViewColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="Padding" Value="5,0"/>
</Style>
<Style TargetType="ListViewItem">
<Setter Property="IsSelected" Value="{Binding IsSelected}"/>
</Style>
</ListView.Resources>
<ListView.View>
<GridView>
<GridViewColumn xaml:GridViewSortBy.SortByKey="FileName"
xaml:GridViewSortBy.IsInitiallySorted="True">
<!-- Need a proper header for this, for the initial sort -->
<GridViewColumnHeader>
<TextBlock Text="{l:Loc ConflictResolutionView_Header_File}"/>
</GridViewColumnHeader>
<GridViewColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Image Width="15" Height="15" Margin="5,0,5,0"
Source="{Binding Icon}"/>
<TextBlock Text="{Binding FileName}"/>
</StackPanel>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Header="{l:Loc ConflictResolutionView_Header_LastModified}"
DisplayMemberBinding="{Binding LastModified}"
xaml:GridViewSortBy.SortByKey="LastModified"/>
<GridViewColumn Header="{l:Loc ConflictResolutionView_Header_Folder}"
xaml:GridViewSortBy.SortByKey="InnerFolder">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock>
<TextBlock Text="{Binding InnerFolder}"/>
(<TextBlock Text="{Binding Folder}"/>)
</TextBlock>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
</GridView>
</ListView.View>
<ListView.GroupStyle>
<GroupStyle>
<GroupStyle.ContainerStyle>
<Style TargetType="{x:Type GroupItem}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Expander IsExpanded="True">
<Expander.Header>
<TextBlock Text="{Binding Name}" FontWeight="Bold"/>
</Expander.Header>
<ItemsPresenter />
</Expander>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</GroupStyle.ContainerStyle>
</GroupStyle>
</ListView.GroupStyle>
</ListView>
</DockPanel>
</Grid>
</Border>
</DockPanel>
Expand Down
11 changes: 10 additions & 1 deletion src/SyncTrayzor/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/SyncTrayzor/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ Please donate to my charity fundraising campaign.</value>
<value>Choose Newest Conflict</value>
</data>
<data name="ConflictResolutionView_ChooseNewestConflict_Text" xml:space="preserve">
<value>Chooses the conflict which was created most recently&lt;</value>
<value>Chooses the conflict which was created most recently</value>
</data>
<data name="ConflictResolutionView_ChooseNewest_Button" xml:space="preserve">
<value>Choose Newest</value>
Expand Down Expand Up @@ -985,6 +985,9 @@ Please donate to my charity fundraising campaign.</value>
<value>Note:</value>
<comment>Text shown in bold just before SettingsView_WatchedFolderEnabledInSyncthing</comment>
</data>
<data name="ConflictResolutionView_SelectMultiple" xml:space="preserve">
<value>Use shift / control to select multiple items</value>
</data>
<data name="SettingsView_CannotSetAutoStart_Message" xml:space="preserve">
<value>Unable to set your auto-start settings. This is probably due to anti-virus software.</value>
</data>
Expand Down

0 comments on commit e29d55f

Please sign in to comment.