Merge branch 'sourcegit-scm:develop' into develop

README.md

@@ -114,6 +114,7 @@ This app supports open repository in external tools listed in the table below.
 | Color.DecoratorIcon | Foreground color for commit ref icon |
 | Color.DecoratorBranch | Background color for commit branch ref name |
 | Color.DecoratorTag | Background color for commit tag ref name |
+| Color.DecoratorFG | Foreground color for commit ref name |
 | Color.Border0 | Border color used in some controls, like Window, Tab, Toolbar, etc. |
 | Color.Border1 | Border color used in inputs, like TextBox, ComboBox, etc. |
 | Color.Border2 | Border color used in visual lines, like seperators, Rectange, etc. |

src/Resources/Themes.axaml

@@ -17,6 +17,7 @@
       <Color x:Key="Color.DecoratorIcon">#FFF8F8F8</Color>
       <Color x:Key="Color.DecoratorBranch">#FFFFB835</Color>
       <Color x:Key="Color.DecoratorTag">#FF02C302</Color>
+      <Color x:Key="Color.DecoratorFG">Black</Color>
       <Color x:Key="Color.Conflict">#FF836C2E</Color>
       <Color x:Key="Color.ConflictForeground">#FFFFFFFF</Color>
       <Color x:Key="Color.Border0">#FFCFCFCF</Color>
@@ -49,6 +50,7 @@
       <Color x:Key="Color.DecoratorIcon">#FFF8F8F8</Color>
       <Color x:Key="Color.DecoratorBranch">#FFFFB835</Color>
       <Color x:Key="Color.DecoratorTag">#FF02C302</Color>
+      <Color x:Key="Color.DecoratorFG">Black</Color>
       <Color x:Key="Color.Conflict">#FFFAFAD2</Color>
       <Color x:Key="Color.ConflictForeground">#FF252525</Color>
       <Color x:Key="Color.Border0">#FF181818</Color>
@@ -81,6 +83,7 @@
   <SolidColorBrush x:Key="Brush.DecoratorIcon" Color="{DynamicResource Color.DecoratorIcon}"/>
   <SolidColorBrush x:Key="Brush.DecoratorBranch" Color="{DynamicResource Color.DecoratorBranch}"/>
   <SolidColorBrush x:Key="Brush.DecoratorTag" Color="{DynamicResource Color.DecoratorTag}"/>
+  <SolidColorBrush x:Key="Brush.DecoratorFG" Color="{DynamicResource Color.DecoratorFG}"/>
   <SolidColorBrush x:Key="Brush.Conflict" Color="{DynamicResource Color.Conflict}"/>
   <SolidColorBrush x:Key="Brush.ConflictForeground" Color="{DynamicResource Color.ConflictForeground}"/>
   <SolidColorBrush x:Key="Brush.Border0" Color="{DynamicResource Color.Border0}"/>

src/Views/CommitBaseInfo.axaml

@@ -94,7 +94,7 @@
                       <Path Width="8" Height="8" Data="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToIcon}}" Fill="{DynamicResource Brush.DecoratorIcon}"/>
                     </Border>
                     <Border Background="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToBackground}}">
-                      <TextBlock Classes="monospace" Text="{Binding Name}" FontSize="10" Margin="4,0" Foreground="Black"/>
+                      <TextBlock Classes="monospace" Text="{Binding Name}" FontSize="10" Margin="4,0" Foreground="{DynamicResource Brush.DecoratorFG}"/>
                     </Border>
                   </StackPanel>
                 </Border>

src/Views/Fetch.axaml

@@ -38,12 +38,12 @@
                 IsChecked="{Binding FetchAllRemotes, Mode=TwoWay}"/>
 
       <CheckBox Grid.Row="2" Grid.Column="1"
-                Content="{DynamicResource Text.Fetch.NoTags}"
-                IsChecked="{Binding NoTags, Mode=TwoWay}"/>
-
-      <CheckBox Grid.Row="3" Grid.Column="1"
                 Content="{DynamicResource Text.Fetch.Prune}"
                 IsChecked="{Binding Prune, Mode=TwoWay}"/>
+
+      <CheckBox Grid.Row="3" Grid.Column="1"
+                Content="{DynamicResource Text.Fetch.NoTags}"
+                IsChecked="{Binding NoTags, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>

src/Views/Histories.axaml

@@ -58,7 +58,7 @@
                                            Text="{Binding Name}" 
                                            FontSize="10" 
                                            Margin="4,0" 
-                                           Foreground="Black"
+                                           Foreground="{DynamicResource Brush.DecoratorFG}"
                                            FontWeight="{Binding Type, Converter={x:Static c:DecoratorTypeConverters.ToFontWeight}}"/>
                               </Border>
                             </StackPanel>

src/Views/Pull.axaml

@@ -86,12 +86,12 @@
       </StackPanel>
 
       <CheckBox Grid.Row="4" Grid.Column="1"
-                Content="{DynamicResource Text.Pull.NoTags}"
-                IsChecked="{Binding NoTags, Mode=TwoWay}"/>
-
-      <CheckBox Grid.Row="5" Grid.Column="1"
                 Content="{DynamicResource Text.Pull.UseRebase}"
                 IsChecked="{Binding UseRebase, Mode=TwoWay}"/>
+
+      <CheckBox Grid.Row="5" Grid.Column="1"
+                Content="{DynamicResource Text.Pull.NoTags}"
+                IsChecked="{Binding NoTags, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>