|
86 | 86 | <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto">
|
87 | 87 | <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Histories}"/>
|
88 | 88 | <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Histories}"/>
|
89 |
| - |
| 89 | + |
90 | 90 | <ToggleButton Grid.Column="2"
|
91 | 91 | Classes="line_path"
|
92 | 92 | Width="26" Height="26"
|
|
160 | 160 | </ListBox>
|
161 | 161 | </Border>
|
162 | 162 | </Border>
|
163 |
| - |
| 163 | + |
164 | 164 | <!-- Filter Branches/Tags/Submodules -->
|
165 | 165 | <TextBox Grid.Row="1"
|
166 | 166 | Height="26"
|
|
170 | 170 | BorderBrush="{DynamicResource Brush.Border2}"
|
171 | 171 | Watermark="{DynamicResource Text.Repository.Filter}"
|
172 | 172 | Text="{Binding Filter, Mode=TwoWay}"
|
173 |
| - VerticalContentAlignment="Center"> |
| 173 | + VerticalContentAlignment="Center"> |
174 | 174 | <TextBox.InnerLeftContent>
|
175 | 175 | <Path Width="14" Height="14"
|
176 | 176 | Margin="6,0,0,0"
|
|
235 | 235 | <Path Grid.Column="0" Width="11" Height="11" Margin="2,1,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Tags}" Fill="{DynamicResource Brush.FG2}"/>
|
236 | 236 | <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Tags}"/>
|
237 | 237 | <TextBlock Grid.Column="2" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
|
238 |
| - <ToggleButton Grid.Column="3" |
239 |
| - Classes="tag_display_mode" |
240 |
| - Width="14" |
| 238 | + <ToggleButton Grid.Column="3" |
| 239 | + Classes="tag_display_mode" |
| 240 | + Width="14" |
241 | 241 | IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsAsTree, Mode=TwoWay}"
|
242 | 242 | ToolTip.Tip="{DynamicResource Text.Repository.ShowTagsAsTree}"/>
|
243 | 243 | <Button Grid.Column="4"
|
|
252 | 252 | Classes="icon_button"
|
253 | 253 | Width="14"
|
254 | 254 | Margin="8,0"
|
255 |
| - Command="{Binding CreateNewTag}" |
| 255 | + Command="{Binding CreateNewTag}" |
256 | 256 | ToolTip.Tip="{DynamicResource Text.Repository.Tags.Add}">
|
257 | 257 | <Path Width="12" Height="12" Data="{StaticResource Icons.Tag.Add}"/>
|
258 | 258 | </Button>
|
|
428 | 428 | <Binding Path="$parent[Window].IsActive"/>
|
429 | 429 | </MultiBinding>
|
430 | 430 | </Popup.IsOpen>
|
431 |
| - |
| 431 | + |
432 | 432 | <Border Margin="8" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #80000000)">
|
433 | 433 | <Border Background="{DynamicResource Brush.Popup}" CornerRadius="4" Padding="4" BorderThickness="0.65" BorderBrush="{DynamicResource Brush.Accent}">
|
434 | 434 | <ListBox x:Name="SearchSuggestionBox"
|
|
482 | 482 | Padding="4,0"
|
483 | 483 | Background="Transparent"
|
484 | 484 | BorderThickness="0"
|
485 |
| - SelectedIndex="{Binding SearchCommitFilterType, Mode=TwoWay}"> |
| 485 | + SelectedIndex="{Binding SearchCommitFilterType, Mode=TwoWay}"> |
486 | 486 | <ComboBox.Items>
|
487 | 487 | <TextBlock Text="{DynamicResource Text.Repository.Search.BySHA}"/>
|
488 | 488 | <TextBlock Text="{DynamicResource Text.Repository.Search.ByAuthor}"/>
|
|
562 | 562 | </MultiBinding>
|
563 | 563 | </Path.IsVisible>
|
564 | 564 | </Path>
|
565 |
| - |
| 565 | + |
566 | 566 | <v:LoadingIcon Grid.Row="2"
|
567 | 567 | Width="48" Height="48"
|
568 | 568 | HorizontalAlignment="Center" VerticalAlignment="Center"
|
|
594 | 594 | <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
|
595 | 595 | </StackPanel>
|
596 | 596 | </DataTemplate>
|
597 |
| - |
| 597 | + |
598 | 598 | <DataTemplate DataType="vm:CherryPickInProgress">
|
599 | 599 | <Grid ColumnDefinitions="*,Auto">
|
600 | 600 | <StackPanel Grid.Column="0" Orientation="Horizontal">
|
|
649 | 649 | </DataTemplate>
|
650 | 650 | </ContentControl.DataTemplates>
|
651 | 651 | </ContentControl>
|
652 |
| - |
| 652 | + |
653 | 653 | <Button Grid.Column="1"
|
654 | 654 | Classes="flat"
|
655 | 655 | FontWeight="Regular"
|
|
680 | 680 | Data="{StaticResource Icons.EyeClose}"
|
681 | 681 | Fill="{DynamicResource Brush.FG2}"
|
682 | 682 | IsVisible="{Binding HistoriesFilterMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:FilterMode.Excluded}}"/>
|
683 |
| - |
| 683 | + |
684 | 684 | <ItemsControl Grid.Column="1" Margin="8,0,0,0" ItemsSource="{Binding Settings.HistoriesFilters}">
|
685 | 685 | <ItemsControl.ItemsPanel>
|
686 | 686 | <ItemsPanelTemplate>
|
687 | 687 | <VirtualizingStackPanel Orientation="Horizontal" VerticalAlignment="Center"/>
|
688 | 688 | </ItemsPanelTemplate>
|
689 | 689 | </ItemsControl.ItemsPanel>
|
690 |
| - |
| 690 | + |
691 | 691 | <ItemsControl.ItemTemplate>
|
692 | 692 | <DataTemplate DataType="m:Filter">
|
693 | 693 | <Border Height="20"
|
|
708 | 708 | </DataTemplate>
|
709 | 709 | </ItemsControl.ItemTemplate>
|
710 | 710 | </ItemsControl>
|
711 |
| - |
| 711 | + |
712 | 712 | <Button Grid.Column="2" Classes="icon_button" Command="{Binding ClearHistoriesFilter}" ToolTip.Tip="{DynamicResource Text.Repository.ClearAllCommitsFilter}">
|
713 | 713 | <Path Width="14" Height="14" Margin="16,0,8,0" Data="{StaticResource Icons.RemoveAll}"/>
|
714 | 714 | </Button>
|
|
0 commit comments