mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-30 08:34:59 +00:00
refactor<*>: use DynamicResource instead of StaticResource for brushes and locales
This commit is contained in:
leo
parent
4a56b47265
commit
afc4eafb6f
73 changed files with 630 additions and 601 deletions
|
|
@ -41,19 +41,19 @@
|
|||
|
||||
<Border
|
||||
Grid.Column="0" Grid.ColumnSpan="2"
|
||||
BorderBrush="{StaticResource Brush.Border2}"
|
||||
BorderBrush="{DynamicResource Brush.Border2}"
|
||||
BorderThickness="1"/>
|
||||
<Path
|
||||
Grid.Column="0"
|
||||
Width="14" Height="14"
|
||||
Fill="{StaticResource Brush.FG2}"
|
||||
Fill="{DynamicResource Brush.FG2}"
|
||||
Data="{StaticResource Icon.Search}"
|
||||
IsHitTestVisible="False"/>
|
||||
<controls:TextEdit
|
||||
Grid.Column="1"
|
||||
Height="24"
|
||||
Margin="0"
|
||||
Placeholder="{StaticResource Text.CommitViewer.Changes.Search}"
|
||||
Placeholder="{DynamicResource Text.CommitViewer.Changes.Search}"
|
||||
BorderThickness="0"
|
||||
TextChanged="SearchFilterChanged"/>
|
||||
|
||||
|
|
@ -67,9 +67,9 @@
|
|||
|
||||
<Border
|
||||
Grid.Row="1"
|
||||
BorderBrush="{StaticResource Brush.Border2}"
|
||||
BorderBrush="{DynamicResource Brush.Border2}"
|
||||
BorderThickness="1"
|
||||
Background="{StaticResource Brush.Contents}">
|
||||
Background="{DynamicResource Brush.Contents}">
|
||||
<Grid x:Name="layerChanges">
|
||||
<controls:Tree
|
||||
x:Name="modeTree"
|
||||
|
|
@ -174,7 +174,7 @@
|
|||
<DataGridTemplateColumn IsReadOnly="True">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock FontFamily="Consolas" Margin="4,0,0,0" Text="{Binding Path, Converter={StaticResource PureFolderName}}" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock FontFamily="Consolas" Margin="4,0,0,0" Text="{Binding Path, Converter={StaticResource PureFolderName}}" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<TabControl x:Name="body">
|
||||
<TabItem Header="{StaticResource Text.CommitViewer.Info}">
|
||||
<TabItem Header="{DynamicResource Text.CommitViewer.Info}">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
|
|
@ -37,12 +37,12 @@
|
|||
|
||||
<!-- Author Info -->
|
||||
<StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
|
||||
<TextBlock FontWeight="Bold" Text="{StaticResource Text.CommitViewer.Info.Author}" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock FontWeight="Bold" Text="{DynamicResource Text.CommitViewer.Info.Author}" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<StackPanel Orientation="Horizontal" Margin="0,12,0,8">
|
||||
<controls:TextEdit x:Name="txtAuthorName" FontFamily="Consolas,Microsoft YaHei UI" FontSize="10pt" IsReadOnly="True" BorderThickness="0"/>
|
||||
<controls:TextEdit x:Name="txtAuthorEmail" FontFamily="Consolas,Microsoft YaHei UI" FontSize="10pt" IsReadOnly="True" BorderThickness="0" Foreground="{StaticResource Brush.FG2}" Margin="4,0,0,0"/>
|
||||
<controls:TextEdit x:Name="txtAuthorEmail" FontFamily="Consolas,Microsoft YaHei UI" FontSize="10pt" IsReadOnly="True" BorderThickness="0" Foreground="{DynamicResource Brush.FG2}" Margin="4,0,0,0"/>
|
||||
</StackPanel>
|
||||
<controls:TextEdit x:Name="txtAuthorTime" FontFamily="Consolas" FontSize="9pt" IsReadOnly="True" BorderThickness="0" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<controls:TextEdit x:Name="txtAuthorTime" FontFamily="Consolas" FontSize="9pt" IsReadOnly="True" BorderThickness="0" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</StackPanel>
|
||||
|
||||
<!-- Committer Avatar -->
|
||||
|
|
@ -54,17 +54,17 @@
|
|||
|
||||
<!-- Committer Info -->
|
||||
<StackPanel x:Name="committerInfoPanel" Grid.Column="3" Margin="16,0,8,0" Orientation="Vertical">
|
||||
<TextBlock FontWeight="Bold" Text="{StaticResource Text.CommitViewer.Info.Committer}" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock FontWeight="Bold" Text="{DynamicResource Text.CommitViewer.Info.Committer}" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<StackPanel Orientation="Horizontal" Margin="0,12,0,8">
|
||||
<controls:TextEdit x:Name="txtCommitterName" FontFamily="Consolas,Microsoft YaHei UI" FontSize="10pt" IsReadOnly="True" BorderThickness="0"/>
|
||||
<controls:TextEdit x:Name="txtCommitterEmail" FontFamily="Consolas,Microsoft YaHei UI" FontSize="10pt" IsReadOnly="True" BorderThickness="0" Foreground="{StaticResource Brush.FG2}" Margin="4,0,0,0"/>
|
||||
<controls:TextEdit x:Name="txtCommitterEmail" FontFamily="Consolas,Microsoft YaHei UI" FontSize="10pt" IsReadOnly="True" BorderThickness="0" Foreground="{DynamicResource Brush.FG2}" Margin="4,0,0,0"/>
|
||||
</StackPanel>
|
||||
<controls:TextEdit x:Name="txtCommitterTime" FontFamily="Consolas" FontSize="9pt" IsReadOnly="True" BorderThickness="0" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<controls:TextEdit x:Name="txtCommitterTime" FontFamily="Consolas" FontSize="9pt" IsReadOnly="True" BorderThickness="0" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
<!-- Line -->
|
||||
<Rectangle Grid.Row="1" Height="1" Margin="8" Fill="{StaticResource Brush.Border2}" VerticalAlignment="Center"/>
|
||||
<Rectangle Grid.Row="1" Height="1" Margin="8" Fill="{DynamicResource Brush.Border2}" VerticalAlignment="Center"/>
|
||||
|
||||
<!-- Base Information -->
|
||||
<Grid Grid.Row="2">
|
||||
|
|
@ -85,8 +85,8 @@
|
|||
Grid.Row="0" Grid.Column="0"
|
||||
HorizontalAlignment="Right"
|
||||
FontWeight="Bold"
|
||||
Text="{StaticResource Text.CommitViewer.Info.SHA}"
|
||||
Foreground="{StaticResource Brush.FG2}"/>
|
||||
Text="{DynamicResource Text.CommitViewer.Info.SHA}"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<controls:TextEdit
|
||||
Grid.Row="0" Grid.Column="1"
|
||||
Height="24"
|
||||
|
|
@ -101,8 +101,8 @@
|
|||
Grid.Row="1" Grid.Column="0"
|
||||
HorizontalAlignment="Right"
|
||||
FontWeight="Bold"
|
||||
Text="{StaticResource Text.CommitViewer.Info.Parents}"
|
||||
Foreground="{StaticResource Brush.FG2}"/>
|
||||
Text="{DynamicResource Text.CommitViewer.Info.Parents}"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<ItemsControl Grid.Row="1" Grid.Column="1" x:Name="listParents" Height="24" Margin="13,0,0,0">
|
||||
<ItemsControl.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock Margin="0,0,8,0" FontFamily="Consolas">
|
||||
<Hyperlink RequestNavigate="OnNavigateParent" NavigateUri="{Binding .}" ToolTip="{StaticResource Text.Goto}">
|
||||
<Hyperlink RequestNavigate="OnNavigateParent" NavigateUri="{Binding .}" ToolTip="{DynamicResource Text.Goto}">
|
||||
<Run Text="{Binding .}"/>
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
|
|
@ -126,8 +126,8 @@
|
|||
Grid.Row="2" Grid.Column="0"
|
||||
HorizontalAlignment="Right"
|
||||
FontWeight="Bold"
|
||||
Text="{StaticResource Text.CommitViewer.Info.Refs}"
|
||||
Foreground="{StaticResource Brush.FG2}"/>
|
||||
Text="{DynamicResource Text.CommitViewer.Info.Refs}"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<ItemsControl Grid.Row="2" Grid.Column="1" x:Name="listRefs" Height="24" Margin="11,0,0,0">
|
||||
<ItemsControl.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
|
|
@ -138,8 +138,8 @@
|
|||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="{x:Type models:Decorator}">
|
||||
<StackPanel Orientation="Horizontal" Height="16" Margin="2,0">
|
||||
<Border Background="{StaticResource Brush.Decorator}">
|
||||
<Path x:Name="Icon" Margin="4,0" Width="8" Height="8" Data="{StaticResource Icon.Branch}" Fill="{StaticResource Brush.DecoratorIcon}"/>
|
||||
<Border Background="{DynamicResource Brush.Decorator}">
|
||||
<Path x:Name="Icon" Margin="4,0" Width="8" Height="8" Data="{StaticResource Icon.Branch}" Fill="{DynamicResource Brush.DecoratorIcon}"/>
|
||||
</Border>
|
||||
|
||||
<Border x:Name="Color" Background="#FFFFB835">
|
||||
|
|
@ -169,8 +169,8 @@
|
|||
Margin="0,4,0,0"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Top"
|
||||
FontWeight="Bold"
|
||||
Text="{StaticResource Text.CommitViewer.Info.Message}"
|
||||
Foreground="{StaticResource Brush.FG2}"/>
|
||||
Text="{DynamicResource Text.CommitViewer.Info.Message}"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<controls:TextEdit
|
||||
Grid.Row="3" Grid.Column="1"
|
||||
x:Name="txtMessage"
|
||||
|
|
@ -184,7 +184,7 @@
|
|||
</Grid>
|
||||
|
||||
<!-- Line -->
|
||||
<Rectangle Grid.Row="3" Height="1" Margin="8" Fill="{StaticResource Brush.Border2}" VerticalAlignment="Center"/>
|
||||
<Rectangle Grid.Row="3" Height="1" Margin="8" Fill="{DynamicResource Brush.Border2}" VerticalAlignment="Center"/>
|
||||
|
||||
<!-- Change List -->
|
||||
<Grid Grid.Row="4">
|
||||
|
|
@ -198,8 +198,8 @@
|
|||
Margin="0,4,0,0"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Top"
|
||||
FontWeight="Bold"
|
||||
Text="{StaticResource Text.CommitViewer.Info.Changed}"
|
||||
Foreground="{StaticResource Brush.FG2}"/>
|
||||
Text="{DynamicResource Text.CommitViewer.Info.Changed}"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
|
||||
<DataGrid
|
||||
Grid.Column="1"
|
||||
|
|
@ -234,12 +234,12 @@
|
|||
</TabItem>
|
||||
|
||||
<!-- Change Details -->
|
||||
<TabItem Header="{StaticResource Text.CommitViewer.Changes}">
|
||||
<TabItem Header="{DynamicResource Text.CommitViewer.Changes}">
|
||||
<widgets:CommitChanges x:Name="changeContainer"/>
|
||||
</TabItem>
|
||||
|
||||
<!-- Revision Files -->
|
||||
<TabItem Header="{StaticResource Text.CommitViewer.Files}">
|
||||
<TabItem Header="{DynamicResource Text.CommitViewer.Files}">
|
||||
<widgets:RevisionFiles x:Name="revisionFiles"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
</Grid.RowDefinitions>
|
||||
|
||||
<!-- Toolbar -->
|
||||
<Border Grid.Row="0" BorderBrush="{StaticResource Brush.Border0}" BorderThickness="0,0,0,1">
|
||||
<Border Grid.Row="0" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
|
|
@ -24,16 +24,16 @@
|
|||
</Grid.ColumnDefinitions>
|
||||
|
||||
<StackPanel Grid.Column="0" Orientation="Horizontal" Margin="6,0">
|
||||
<Button Click="Explore" Margin="6,0" ToolTip="{StaticResource Text.Dashboard.Explore.Tip}" BorderThickness="0">
|
||||
<Button Click="Explore" Margin="6,0" ToolTip="{DynamicResource Text.Dashboard.Explore.Tip}" BorderThickness="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="14" Height="14" Data="{StaticResource Icon.Folder.Open}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Dashboard.Explore}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Dashboard.Explore}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Click="Terminal" Margin="6,0" ToolTip="{StaticResource Text.Dashboard.Terminal.Tip}" BorderThickness="0">
|
||||
<Button Click="Terminal" Margin="6,0" ToolTip="{DynamicResource Text.Dashboard.Terminal.Tip}" BorderThickness="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="13" Height="13" Data="{StaticResource Icon.Terminal}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Dashboard.Terminal}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Dashboard.Terminal}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
|
@ -42,46 +42,46 @@
|
|||
<Button Click="OpenFetch" Margin="8,0" BorderThickness="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="14" Height="14" Data="{StaticResource Icon.Fetch}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Fetch}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Fetch}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Click="OpenPull" Margin="8,0" BorderThickness="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="14" Height="14" Data="{StaticResource Icon.Pull}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Pull}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Pull}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Click="OpenPush" Margin="8,0" BorderThickness="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="14" Height="14" Data="{StaticResource Icon.Push}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Push}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Push}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Click="OpenStash" Margin="8,0" BorderThickness="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="14" Height="14" Data="{StaticResource Icon.SaveStash}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Stash}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Stash}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Click="OpenApply" Margin="8,0" BorderThickness="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="14" Height="14" Data="{StaticResource Icon.Apply}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Apply}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Apply}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||
<Button Click="OpenSearch" Margin="6,0" BorderThickness="0" ToolTip="{StaticResource Text.Dashboard.Search.Tip}">
|
||||
<Button Click="OpenSearch" Margin="6,0" BorderThickness="0" ToolTip="{DynamicResource Text.Dashboard.Search.Tip}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="14" Height="14" Data="{StaticResource Icon.Search}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Dashboard.Search}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Dashboard.Search}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Click="OpenConfigure" Margin="6,0" BorderThickness="0" ToolTip="{StaticResource Text.Dashboard.Configure.Tip}">
|
||||
<Button Click="OpenConfigure" Margin="6,0" BorderThickness="0" ToolTip="{DynamicResource Text.Dashboard.Configure.Tip}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="14" Height="14" Data="{StaticResource Icon.Setting}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Configure}"/>
|
||||
<TextBlock Margin="4,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Configure}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
|
@ -118,12 +118,12 @@
|
|||
</Grid.Resources>
|
||||
|
||||
<!-- Workspace -->
|
||||
<TextBlock Grid.Row="0" Margin="8,0,0,0" Text="{StaticResource Text.Dashboard.Workspace}" FontWeight="DemiBold" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock Grid.Row="0" Margin="8,0,0,0" Text="{DynamicResource Text.Dashboard.Workspace}" FontWeight="DemiBold" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<ListView Grid.Row="1" x:Name="workspace" SelectionMode="Single" SelectionChanged="OnPageSelectionChanged">
|
||||
<ListViewItem IsSelected="True">
|
||||
<StackPanel Margin="16,0,0,0" Height="28" Orientation="Horizontal">
|
||||
<Path Width="16" Height="16" Data="{StaticResource Icon.Histories}"/>
|
||||
<TextBlock Margin="8,0,0,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Histories}"/>
|
||||
<TextBlock Margin="8,0,0,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Histories}"/>
|
||||
</StackPanel>
|
||||
</ListViewItem>
|
||||
<ListViewItem>
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Path Grid.Column="0" Width="16" Height="16" Data="{StaticResource Icon.Send}"/>
|
||||
<TextBlock Grid.Column="1" Margin="8,0,0,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.WorkingCopy}"/>
|
||||
<TextBlock Grid.Column="1" Margin="8,0,0,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy}"/>
|
||||
<controls:Badge Grid.Column="2" Margin="4,0" x:Name="badgeLocalChanges"/>
|
||||
</Grid>
|
||||
</ListViewItem>
|
||||
|
|
@ -146,7 +146,7 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Path Grid.Column="0" Width="16" Height="16" Data="{StaticResource Icon.Stashes}"/>
|
||||
<TextBlock Grid.Column="1" Margin="8,0,0,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{StaticResource Text.Stashes}"/>
|
||||
<TextBlock Grid.Column="1" Margin="8,0,0,0" FontFamily="Consolas,Microsoft YaHei UI" FontWeight="Bold" Text="{DynamicResource Text.Stashes}"/>
|
||||
<controls:Badge Grid.Column="2" Margin="4,0" x:Name="badgeStashes"/>
|
||||
</Grid>
|
||||
</ListViewItem>
|
||||
|
|
@ -160,9 +160,9 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{StaticResource Text.Dashboard.LocalBranches}" FontWeight="DemiBold" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="1" Click="OpenGitFlowPanel" Width="14" Height="14" Margin="8,0" Icon="{StaticResource Icon.Flow}" ToolTip="{StaticResource Text.GitFlow}"/>
|
||||
<controls:IconButton Grid.Column="2" Click="OpenNewBranch" Width="14" Height="14" Margin="0,0,2,0" Icon="{StaticResource Icon.Branch.Add}" ToolTip="{StaticResource Text.Dashboard.NewBranch}"/>
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{DynamicResource Text.Dashboard.LocalBranches}" FontWeight="DemiBold" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="1" Click="OpenGitFlowPanel" Width="14" Height="14" Margin="8,0" Icon="{StaticResource Icon.Flow}" ToolTip="{DynamicResource Text.GitFlow}"/>
|
||||
<controls:IconButton Grid.Column="2" Click="OpenNewBranch" Width="14" Height="14" Margin="0,0,2,0" Icon="{StaticResource Icon.Branch.Add}" ToolTip="{DynamicResource Text.Dashboard.NewBranch}"/>
|
||||
</Grid>
|
||||
<controls:Tree
|
||||
Grid.Row="3"
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
Margin="4,0"
|
||||
IsChecked="{Binding IsFiltered}"
|
||||
Style="{StaticResource Style.ToggleButton.Filter}"
|
||||
ToolTip="{StaticResource Text.Filter}"
|
||||
ToolTip="{DynamicResource Text.Filter}"
|
||||
Checked="OnFilterChanged" Unchecked="OnFilterChanged"/>
|
||||
</Grid>
|
||||
|
||||
|
|
@ -237,8 +237,8 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{StaticResource Text.Dashboard.Remotes}" FontWeight="DemiBold" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="1" Click="OpenAddRemote" Width="14" Height="14" Margin="0,0,4,0" Icon="{StaticResource Icon.Remote.Add}" ToolTip="{StaticResource Text.Dashboard.Remotes.Add}"/>
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{DynamicResource Text.Dashboard.Remotes}" FontWeight="DemiBold" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="1" Click="OpenAddRemote" Width="14" Height="14" Margin="0,0,4,0" Icon="{StaticResource Icon.Remote.Add}" ToolTip="{DynamicResource Text.Dashboard.Remotes.Add}"/>
|
||||
</Grid>
|
||||
<controls:Tree
|
||||
Grid.Row="5"
|
||||
|
|
@ -272,7 +272,7 @@
|
|||
Margin="4,0"
|
||||
IsChecked="{Binding IsFiltered}"
|
||||
Style="{StaticResource Style.ToggleButton.Filter}"
|
||||
ToolTip="{StaticResource Text.Filter}"
|
||||
ToolTip="{DynamicResource Text.Filter}"
|
||||
Checked="OnFilterChanged" Unchecked="OnFilterChanged"/>
|
||||
</Grid>
|
||||
|
||||
|
|
@ -319,9 +319,9 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{StaticResource Text.Dashboard.Tags}" FontWeight="DemiBold" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtTagCount" FontWeight="DemiBold" Margin="4,0,0,0" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="2" Click="OpenNewTag" Width="14" Height="14" Margin="0,0,4,0" Icon="{StaticResource Icon.Tag.Add}" ToolTip="{StaticResource Text.Dashboard.Tags.Add}"/>
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{DynamicResource Text.Dashboard.Tags}" FontWeight="DemiBold" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtTagCount" FontWeight="DemiBold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="2" Click="OpenNewTag" Width="14" Height="14" Margin="0,0,4,0" Icon="{StaticResource Icon.Tag.Add}" ToolTip="{DynamicResource Text.Dashboard.Tags.Add}"/>
|
||||
</Grid>
|
||||
</ToggleButton>
|
||||
<DataGrid
|
||||
|
|
@ -354,7 +354,7 @@
|
|||
IsChecked="{Binding IsFiltered, Mode=TwoWay}"
|
||||
Margin="0,0,4,0"
|
||||
Style="{StaticResource Style.ToggleButton.Filter}"
|
||||
ToolTip="{StaticResource Text.Filter}"
|
||||
ToolTip="{DynamicResource Text.Filter}"
|
||||
Checked="OnFilterChanged" Unchecked="OnFilterChanged"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
|
|
@ -376,10 +376,10 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{StaticResource Text.Dashboard.Submodules}" FontWeight="DemiBold" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtSubmoduleCount" FontWeight="DemiBold" Margin="4,0,0,0" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="2" Click="OpenAddSubmodule" Width="14" Height="14" Margin="8,0" Icon="{StaticResource Icon.Submodule}" ToolTip="{StaticResource Text.Dashboard.Remotes.Add}"/>
|
||||
<Button Grid.Column="3" Click="UpdateSubmodules" Background="Transparent" Margin="0,0,4,0" BorderThickness="0" ToolTip="{StaticResource Text.Dashboard.Submodules.Update}">
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{DynamicResource Text.Dashboard.Submodules}" FontWeight="DemiBold" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtSubmoduleCount" FontWeight="DemiBold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="2" Click="OpenAddSubmodule" Width="14" Height="14" Margin="8,0" Icon="{StaticResource Icon.Submodule}" ToolTip="{DynamicResource Text.Dashboard.Remotes.Add}"/>
|
||||
<Button Grid.Column="3" Click="UpdateSubmodules" Background="Transparent" Margin="0,0,4,0" BorderThickness="0" ToolTip="{DynamicResource Text.Dashboard.Submodules.Update}">
|
||||
<controls:Loading x:Name="iconUpdateSubmodule" Width="14" Height="14" />
|
||||
</Button>
|
||||
</Grid>
|
||||
|
|
@ -426,9 +426,9 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{StaticResource Text.Dashboard.SubTrees}" FontWeight="DemiBold" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtSubTreeCount" FontWeight="DemiBold" Margin="4,0,0,0" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="2" Click="OpenAddSubTree" Width="14" Height="14" Margin="0,0,4,0" Icon="{StaticResource Icon.TreeAddNode}" ToolTip="{StaticResource Text.Dashboard.SubTrees.Add}"/>
|
||||
<TextBlock Grid.Column="0" Margin="8,0,0,0" Text="{DynamicResource Text.Dashboard.SubTrees}" FontWeight="DemiBold" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtSubTreeCount" FontWeight="DemiBold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<controls:IconButton Grid.Column="2" Click="OpenAddSubTree" Width="14" Height="14" Margin="0,0,4,0" Icon="{StaticResource Icon.TreeAddNode}" ToolTip="{DynamicResource Text.Dashboard.SubTrees.Add}"/>
|
||||
</Grid>
|
||||
</ToggleButton>
|
||||
<DataGrid
|
||||
|
|
@ -466,7 +466,7 @@
|
|||
Grid.Column="1"
|
||||
Width="1"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Stretch"
|
||||
Background="{StaticResource Brush.Border0}"/>
|
||||
Background="{DynamicResource Brush.Border0}"/>
|
||||
|
||||
<!-- Right -->
|
||||
<Grid Grid.Column="2">
|
||||
|
|
@ -475,7 +475,7 @@
|
|||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Grid Grid.Row="0" x:Name="mergeNavigator" Height="24" Background="{StaticResource Brush.Conflict}" Visibility="Collapsed">
|
||||
<Grid Grid.Row="0" x:Name="mergeNavigator" Height="24" Background="{DynamicResource Brush.Conflict}" Visibility="Collapsed">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
|
|
@ -488,33 +488,33 @@
|
|||
x:Name="txtConflictTip"
|
||||
Margin="4,0"
|
||||
FontWeight="DemiBold"
|
||||
Foreground="{StaticResource Brush.FG3}"/>
|
||||
Foreground="{DynamicResource Brush.FG3}"/>
|
||||
<Button
|
||||
Grid.Column="1"
|
||||
x:Name="btnResolve"
|
||||
Click="GotoResolve"
|
||||
Width="80"
|
||||
Margin="2"
|
||||
Content="{StaticResource Text.Dashboard.Resolve}"
|
||||
Background="{StaticResource Brush.Window}"
|
||||
BorderBrush="{StaticResource Brush.FG1}"/>
|
||||
Content="{DynamicResource Text.Dashboard.Resolve}"
|
||||
Background="{DynamicResource Brush.Window}"
|
||||
BorderBrush="{DynamicResource Brush.FG1}"/>
|
||||
<Button
|
||||
Grid.Column="2"
|
||||
x:Name="btnContinue"
|
||||
Click="ContinueMerge"
|
||||
Width="80"
|
||||
Margin="2"
|
||||
Content="{StaticResource Text.Dashboard.Continue}"
|
||||
Background="{StaticResource Brush.Accent1}"
|
||||
BorderBrush="{StaticResource Brush.FG1}"/>
|
||||
Content="{DynamicResource Text.Dashboard.Continue}"
|
||||
Background="{DynamicResource Brush.Accent1}"
|
||||
BorderBrush="{DynamicResource Brush.FG1}"/>
|
||||
<Button
|
||||
Grid.Column="3"
|
||||
Click="AbortMerge"
|
||||
Width="80"
|
||||
Margin="2,2,4,2"
|
||||
Content="{StaticResource Text.Dashboard.Abort}"
|
||||
Background="{StaticResource Brush.Window}"
|
||||
BorderBrush="{StaticResource Brush.FG1}"/>
|
||||
Content="{DynamicResource Text.Dashboard.Abort}"
|
||||
Background="{DynamicResource Brush.Window}"
|
||||
BorderBrush="{DynamicResource Brush.FG1}"/>
|
||||
</Grid>
|
||||
|
||||
<controls:PageContainer Grid.Row="1" x:Name="pages"/>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
</Style>
|
||||
</UserControl.Resources>
|
||||
|
||||
<Border BorderBrush="{StaticResource Brush.Border2}" BorderThickness="1">
|
||||
<Border BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="26"/>
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
</Grid.RowDefinitions>
|
||||
|
||||
<!-- Tool Bar -->
|
||||
<Border x:Name="toolbar" Grid.Row="0" BorderBrush="{StaticResource Brush.Border2}" BorderThickness="0,0,0,1">
|
||||
<Border x:Name="toolbar" Grid.Row="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="0,0,0,1">
|
||||
<Grid Margin="8,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
|
|
@ -46,22 +46,22 @@
|
|||
Width="14" Height="14"
|
||||
Margin="4,0"
|
||||
Icon="{StaticResource Icon.Down}"
|
||||
ToolTip="{StaticResource Text.Diff.Next}"
|
||||
ToolTip="{DynamicResource Text.Diff.Next}"
|
||||
Click="GotoNextChange"/>
|
||||
|
||||
<controls:IconButton
|
||||
Width="14" Height="14"
|
||||
Margin="4,0"
|
||||
Icon="{StaticResource Icon.Up}"
|
||||
ToolTip="{StaticResource Text.Diff.Prev}"
|
||||
ToolTip="{DynamicResource Text.Diff.Prev}"
|
||||
Click="GotoPrevChange"/>
|
||||
|
||||
<ToggleButton
|
||||
Width="14" Height="14"
|
||||
Margin="4,0"
|
||||
Style="{StaticResource Style.ToggleButton.SplitDirection}"
|
||||
Foreground="{StaticResource Brush.FG1}"
|
||||
ToolTip="{StaticResource Text.Diff.Mode}"
|
||||
Foreground="{DynamicResource Brush.FG1}"
|
||||
ToolTip="{DynamicResource Text.Diff.Mode}"
|
||||
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Window.UseCombinedDiff, Mode=TwoWay}"
|
||||
Checked="OnDiffViewModeChanged" Unchecked="OnDiffViewModeChanged"/>
|
||||
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
Width="14" Height="14"
|
||||
Margin="4,0,0,0"
|
||||
Icon="{StaticResource Icon.DiffWith}"
|
||||
ToolTip="{StaticResource Text.Diff.UseMerger}"
|
||||
ToolTip="{DynamicResource Text.Diff.UseMerger}"
|
||||
Click="OpenWithMerger"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
|
@ -82,21 +82,21 @@
|
|||
</Grid.ColumnDefinitions>
|
||||
</Grid>
|
||||
|
||||
<Border x:Name="sizeChange" Grid.Row="1" Background="{StaticResource Brush.Window}">
|
||||
<Border x:Name="sizeChange" Grid.Row="1" Background="{DynamicResource Brush.Window}">
|
||||
<StackPanel Orientation="Vertical" VerticalAlignment="Center" TextElement.FontFamily="Consolas">
|
||||
<TextBlock
|
||||
x:Name="txtSizeChangeTitle"
|
||||
Text="{StaticResource Text.Diff.Binary}"
|
||||
Text="{DynamicResource Text.Diff.Binary}"
|
||||
Margin="0,0,0,32"
|
||||
FontSize="18" FontWeight="UltraBold"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
HorizontalAlignment="Center"/>
|
||||
|
||||
<Path
|
||||
x:Name="iconSizeChange"
|
||||
Width="64" Height="64"
|
||||
Data="{StaticResource Icon.Binary}"
|
||||
Fill="{StaticResource Brush.FG2}"/>
|
||||
Fill="{DynamicResource Brush.FG2}"/>
|
||||
|
||||
<Grid Margin="0,16,0,0" HorizontalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
|
|
@ -110,34 +110,34 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Row="0" Grid.Column="0" Text="{StaticResource Text.Diff.Binary.Old}" Foreground="{StaticResource Brush.FG2}" TextElement.FontSize="18" TextElement.FontWeight="UltraBold"/>
|
||||
<TextBlock Grid.Row="0" Grid.Column="2" x:Name="txtOldSize" Foreground="{StaticResource Brush.FG2}" HorizontalAlignment="Right" TextElement.FontSize="18" TextElement.FontWeight="UltraBold"/>
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Text="{StaticResource Text.Diff.Binary.New}" Foreground="{StaticResource Brush.FG2}" TextElement.FontSize="18" TextElement.FontWeight="UltraBold"/>
|
||||
<TextBlock Grid.Row="1" Grid.Column="2" x:Name="txtNewSize" Foreground="{StaticResource Brush.FG2}" HorizontalAlignment="Right" TextElement.FontSize="18" TextElement.FontWeight="UltraBold"/>
|
||||
<TextBlock Grid.Row="0" Grid.Column="0" Text="{DynamicResource Text.Diff.Binary.Old}" Foreground="{DynamicResource Brush.FG2}" TextElement.FontSize="18" TextElement.FontWeight="UltraBold"/>
|
||||
<TextBlock Grid.Row="0" Grid.Column="2" x:Name="txtOldSize" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" TextElement.FontSize="18" TextElement.FontWeight="UltraBold"/>
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource Text.Diff.Binary.New}" Foreground="{DynamicResource Brush.FG2}" TextElement.FontSize="18" TextElement.FontWeight="UltraBold"/>
|
||||
<TextBlock Grid.Row="1" Grid.Column="2" x:Name="txtNewSize" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" TextElement.FontSize="18" TextElement.FontWeight="UltraBold"/>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<Border x:Name="noChange" Grid.Row="1" Background="{StaticResource Brush.Window}">
|
||||
<Border x:Name="noChange" Grid.Row="1" Background="{DynamicResource Brush.Window}">
|
||||
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
|
||||
<Path Width="64" Height="64" Data="{StaticResource Icon.Check}" Fill="{StaticResource Brush.FG2}"/>
|
||||
<Path Width="64" Height="64" Data="{StaticResource Icon.Check}" Fill="{DynamicResource Brush.FG2}"/>
|
||||
<TextBlock
|
||||
Margin="0,16,0,0"
|
||||
Text="{StaticResource Text.Diff.NoChange}"
|
||||
Text="{DynamicResource Text.Diff.NoChange}"
|
||||
FontSize="18" FontWeight="UltraBold"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<Border x:Name="mask" Grid.Row="0" Grid.RowSpan="2" Background="{StaticResource Brush.Window}">
|
||||
<Border x:Name="mask" Grid.Row="0" Grid.RowSpan="2" Background="{DynamicResource Brush.Window}">
|
||||
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
|
||||
<Path Width="64" Height="64" Data="{StaticResource Icon.Diff}" Fill="{StaticResource Brush.FG2}"/>
|
||||
<Path Width="64" Height="64" Data="{StaticResource Icon.Diff}" Fill="{DynamicResource Brush.FG2}"/>
|
||||
<TextBlock
|
||||
Margin="0,16,0,0"
|
||||
Text="{StaticResource Text.Diff.Welcome}"
|
||||
Text="{DynamicResource Text.Diff.Welcome}"
|
||||
FontSize="18" FontWeight="UltraBold" TextOptions.TextFormattingMode="Ideal"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ namespace SourceGit.Views.Widgets {
|
|||
private List<Rectangle> splitters = new List<Rectangle>();
|
||||
|
||||
public DiffViewer() {
|
||||
Models.Theme.AddListener(this, Reload);
|
||||
InitializeComponent();
|
||||
Reset();
|
||||
}
|
||||
|
|
@ -223,6 +224,7 @@ namespace SourceGit.Views.Widgets {
|
|||
block.OldLine = line.OldLine;
|
||||
block.NewLine = line.NewLine;
|
||||
|
||||
|
||||
if (line.OldLine.Length > 0) lastOldLine = line.OldLine;
|
||||
if (line.NewLine.Length > 0) lastNewLine = line.NewLine;
|
||||
|
||||
|
|
@ -402,10 +404,10 @@ namespace SourceGit.Views.Widgets {
|
|||
private void AddSplitter(int column, double offset) {
|
||||
var split = new Rectangle();
|
||||
split.Width = 1;
|
||||
split.Fill = FindResource("Brush.Border2") as Brush;
|
||||
split.HorizontalAlignment = HorizontalAlignment.Left;
|
||||
split.Margin = new Thickness(offset, 0, 0, 0);
|
||||
split.SetValue(Grid.ColumnProperty, column);
|
||||
split.SetResourceReference(Rectangle.FillProperty, "Brush.Border2");
|
||||
|
||||
textDiff.Children.Add(split);
|
||||
splitters.Add(split);
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid Height="Auto" Width="300" Margin="8">
|
||||
<Border Background="{StaticResource Brush.Window}" BorderBrush="{StaticResource Brush.Border0}" BorderThickness="1">
|
||||
<Border Background="{DynamicResource Brush.Window}" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="1">
|
||||
<Border.Effect>
|
||||
<DropShadowEffect ShadowDepth="0" Opacity=".5"/>
|
||||
</Border.Effect>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Grid.Row="0" Text="{StaticResource Text.Launcher.Error}" FontWeight="Bold"/>
|
||||
<TextBlock Grid.Row="0" Text="{DynamicResource Text.Launcher.Error}" FontWeight="Bold"/>
|
||||
<controls:TextEdit
|
||||
Grid.Row="1"
|
||||
Text="{Binding Path=., Mode=OneWay}"
|
||||
|
|
@ -41,9 +41,9 @@
|
|||
Height="25"
|
||||
Margin="4,0" Padding="8,0"
|
||||
Click="Dismiss"
|
||||
Content="{StaticResource Text.Close}"
|
||||
Background="{StaticResource Brush.Accent1}"
|
||||
BorderBrush="{StaticResource Brush.FG1}"
|
||||
Content="{DynamicResource Text.Close}"
|
||||
Background="{DynamicResource Brush.Accent1}"
|
||||
BorderBrush="{DynamicResource Brush.FG1}"
|
||||
BorderThickness="1"
|
||||
HorizontalAlignment="Right"/>
|
||||
</Grid>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<converters:InverseBool x:Key="InverseBool"/>
|
||||
</Grid.Resources>
|
||||
|
||||
<Border x:Name="commitListPanel" Background="{StaticResource Brush.Contents}">
|
||||
<Border x:Name="commitListPanel" Background="{DynamicResource Brush.Contents}">
|
||||
<Grid ClipToBounds="True">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
|
|
@ -28,21 +28,21 @@
|
|||
x:Name="txtSearch"
|
||||
Margin="4" Padding="0,0,22,0"
|
||||
Height="24"
|
||||
Placeholder="{StaticResource Text.Histories.Search}"
|
||||
Placeholder="{DynamicResource Text.Histories.Search}"
|
||||
PreviewKeyDown="OnSearchPreviewKeyDown"/>
|
||||
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="8,0">
|
||||
<controls:IconButton
|
||||
Click="ClearSearch"
|
||||
Width="14" Height="14"
|
||||
Icon="{StaticResource Icon.Clear}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
ToolTip="{StaticResource Text.Histories.SearchClear}"/>
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
ToolTip="{DynamicResource Text.Histories.SearchClear}"/>
|
||||
<controls:IconButton
|
||||
Click="HideSearch"
|
||||
Width="14" Height="14" Margin="6,0,0,0"
|
||||
Icon="{StaticResource Icon.Up}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
ToolTip="{StaticResource Text.Close}"/>
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
ToolTip="{DynamicResource Text.Close}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
|
|
@ -72,8 +72,8 @@
|
|||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="{x:Type models:Decorator}">
|
||||
<StackPanel Orientation="Horizontal" Height="16" Margin="2,0">
|
||||
<Border Background="{StaticResource Brush.Decorator}">
|
||||
<Path x:Name="Icon" Margin="4,0" Width="8" Height="8" Data="{StaticResource Icon.Branch}" Fill="{StaticResource Brush.DecoratorIcon}"/>
|
||||
<Border Background="{DynamicResource Brush.Decorator}">
|
||||
<Path x:Name="Icon" Margin="4,0" Width="8" Height="8" Data="{StaticResource Icon.Branch}" Fill="{DynamicResource Brush.DecoratorIcon}"/>
|
||||
</Border>
|
||||
|
||||
<Border x:Name="Color" Background="#FFFFB835">
|
||||
|
|
@ -160,7 +160,7 @@
|
|||
</Grid>
|
||||
</Border>
|
||||
|
||||
<GridSplitter x:Name="splitter" Background="{StaticResource Brush.Border0}"/>
|
||||
<GridSplitter x:Name="splitter" Background="{DynamicResource Brush.Border0}"/>
|
||||
|
||||
<Grid x:Name="inspector">
|
||||
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
<widgets:RevisionCompare x:Name="revisionCompare"/>
|
||||
|
||||
<!-- Mask -->
|
||||
<Border x:Name="mask" Background="{StaticResource Brush.Window}">
|
||||
<Border x:Name="mask" Background="{DynamicResource Brush.Window}">
|
||||
<StackPanel Orientation="Vertical" VerticalAlignment="Center" Opacity=".25">
|
||||
<Path Width="128" Height="128" Data="{StaticResource Icon.Detail}"/>
|
||||
|
||||
|
|
@ -181,13 +181,13 @@
|
|||
FontFamily="Consolas" FontSize="24" FontWeight="UltraBold"
|
||||
HorizontalAlignment="Center"
|
||||
TextOptions.TextFormattingMode="Ideal"
|
||||
Text="{StaticResource Text.Histories.Guide}"/>
|
||||
Text="{DynamicResource Text.Histories.Guide}"/>
|
||||
|
||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" TextBlock.FontFamily="Consolas,Microsoft YaHei UI">
|
||||
<TextBlock Text="{StaticResource Text.Histories.Guide_1}" FontSize="14" Margin="0,2"/>
|
||||
<TextBlock Text="{StaticResource Text.Histories.Guide_2}" FontSize="14" Margin="0,2"/>
|
||||
<TextBlock Text="{StaticResource Text.Histories.Guide_3}" FontSize="14" Margin="0,2"/>
|
||||
<TextBlock Text="{StaticResource Text.Histories.Guide_4}" FontSize="14" Margin="0,2"/>
|
||||
<TextBlock Text="{DynamicResource Text.Histories.Guide_1}" FontSize="14" Margin="0,2"/>
|
||||
<TextBlock Text="{DynamicResource Text.Histories.Guide_2}" FontSize="14" Margin="0,2"/>
|
||||
<TextBlock Text="{DynamicResource Text.Histories.Guide_3}" FontSize="14" Margin="0,2"/>
|
||||
<TextBlock Text="{DynamicResource Text.Histories.Guide_4}" FontSize="14" Margin="0,2"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
|
@ -196,18 +196,18 @@
|
|||
<StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,6,8,0" Orientation="Horizontal">
|
||||
<ToggleButton
|
||||
Style="{StaticResource Style.ToggleButton.CommitGraphMode}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
Width="16" Height="16"
|
||||
ToolTip="{StaticResource Text.Histories.GraphMode}"
|
||||
ToolTip="{DynamicResource Text.Histories.GraphMode}"
|
||||
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Window.UsePolylineInGraph, Mode=TwoWay}"
|
||||
Checked="ChangeGraphMode" Unchecked="ChangeGraphMode"/>
|
||||
|
||||
<ToggleButton
|
||||
Style="{StaticResource Style.ToggleButton.SplitDirection}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
Width="16" Height="16"
|
||||
Margin="8,0,0,0"
|
||||
ToolTip="{StaticResource Text.Histories.DisplayMode}"
|
||||
ToolTip="{DynamicResource Text.Histories.DisplayMode}"
|
||||
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Window.MoveCommitInfoRight, Mode=TwoWay, Converter={StaticResource InverseBool}}"
|
||||
Checked="ChangeOrientation" Unchecked="ChangeOrientation"/>
|
||||
</StackPanel>
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
x:Name="leftScroller"
|
||||
Click="ScrollLeft"
|
||||
Width="18" Padding="5"
|
||||
HoverBackground="{StaticResource Brush.Accent1}"
|
||||
BorderBrush="{StaticResource Brush.Border0}"
|
||||
HoverBackground="{DynamicResource Brush.Accent1}"
|
||||
BorderBrush="{DynamicResource Brush.Border0}"
|
||||
BorderThickness="0,0,1,0"
|
||||
Icon="{StaticResource Icon.ScrollLeft}"
|
||||
WindowChrome.IsHitTestVisibleInChrome="True"
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ListBoxItem}">
|
||||
<Border x:Name="Border" Background="Transparent" BorderBrush="{StaticResource Brush.Border0}" BorderThickness="0,0,1,0">
|
||||
<Border x:Name="Border" Background="Transparent" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,1,0">
|
||||
<StackPanel Margin="8,0" x:Name="Contents" Orientation="Horizontal" VerticalAlignment="Center" Opacity=".5" ToolTip="{Binding Tooltip}">
|
||||
<controls:Bookmark
|
||||
Width="14" Height="14"
|
||||
|
|
@ -72,15 +72,15 @@
|
|||
Click="CloseTab"
|
||||
Width="16" Height="16"
|
||||
Margin="4,0,0,0" Padding="4"
|
||||
ToolTip="{StaticResource Text.Close}"
|
||||
ToolTip="{DynamicResource Text.Close}"
|
||||
Icon="{StaticResource Icon.Close}"
|
||||
HoverBackground="{StaticResource Brush.NewPageHover}"/>
|
||||
HoverBackground="{DynamicResource Brush.NewPageHover}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter TargetName="Border" Property="Background" Value="{StaticResource Brush.Window}"/>
|
||||
<Setter TargetName="Border" Property="Background" Value="{DynamicResource Brush.Window}"/>
|
||||
<Setter TargetName="Contents" Property="Opacity" Value="1"/>
|
||||
</Trigger>
|
||||
<MultiTrigger>
|
||||
|
|
@ -105,8 +105,8 @@
|
|||
Width="20" Height="20"
|
||||
Margin="4,0" Padding="4"
|
||||
Icon="{StaticResource Icon.NewTab}"
|
||||
HoverBackground="{StaticResource Brush.NewPageHover}"
|
||||
ToolTip="{StaticResource Text.PageSwitcher.New}"
|
||||
HoverBackground="{DynamicResource Brush.NewPageHover}"
|
||||
ToolTip="{DynamicResource Text.PageSwitcher.New}"
|
||||
Click="NewTab"
|
||||
WindowChrome.IsHitTestVisibleInChrome="True"/>
|
||||
</StackPanel>
|
||||
|
|
@ -118,8 +118,8 @@
|
|||
x:Name="rightScroller"
|
||||
Click="ScrollRight"
|
||||
Width="18" Padding="5"
|
||||
HoverBackground="{StaticResource Brush.Accent1}"
|
||||
BorderBrush="{StaticResource Brush.Border0}"
|
||||
HoverBackground="{DynamicResource Brush.Accent1}"
|
||||
BorderBrush="{DynamicResource Brush.Border0}"
|
||||
BorderThickness="1,0"
|
||||
Icon="{StaticResource Icon.ScrollRight}"
|
||||
WindowChrome.IsHitTestVisibleInChrome="True"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
<!-- Popup panel -->
|
||||
<Border
|
||||
Background="{StaticResource Brush.Window}"
|
||||
Background="{DynamicResource Brush.Window}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
Width="500"
|
||||
|
|
@ -27,15 +27,15 @@
|
|||
<TextBlock Margin="8,8,0,18" x:Name="txtTitle" FontSize="18" FontWeight="DemiBold" TextOptions.TextFormattingMode="Ideal"/>
|
||||
<ContentControl x:Name="container"/>
|
||||
<StackPanel Margin="0,16,0,0" Height="32" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||
<Button Click="Sure" Width="80" Content="{StaticResource Text.Sure}" BorderBrush="{StaticResource Brush.FG1}" Background="{StaticResource Brush.Accent1}"/>
|
||||
<Button Click="Cancel" Width="80" Margin="8,0,0,0" Content="{StaticResource Text.Cancel}"/>
|
||||
<Button Click="Sure" Width="80" Content="{DynamicResource Text.Sure}" BorderBrush="{DynamicResource Brush.FG1}" Background="{DynamicResource Brush.Accent1}"/>
|
||||
<Button Click="Cancel" Width="80" Margin="8,0,0,0" Content="{DynamicResource Text.Cancel}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
|
||||
<!-- Progress mask -->
|
||||
<Border x:Name="mask" Visibility="Collapsed" Background="{StaticResource Brush.Popup}" Opacity=".9">
|
||||
<Border x:Name="mask" Visibility="Collapsed" Background="{DynamicResource Brush.Popup}" Opacity=".9">
|
||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<controls:Loading x:Name="processing" Width="48" Height="48"/>
|
||||
<TextBlock x:Name="txtMsg" Margin="0,16,0,0"/>
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@
|
|||
|
||||
<Border
|
||||
Grid.Column="1"
|
||||
BorderBrush="{StaticResource Brush.Border2}"
|
||||
BorderBrush="{DynamicResource Brush.Border2}"
|
||||
BorderThickness="1"
|
||||
Background="{StaticResource Brush.Contents}"
|
||||
Background="{DynamicResource Brush.Contents}"
|
||||
CornerRadius="4">
|
||||
<Grid Margin="4">
|
||||
<Grid.ColumnDefinitions>
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Column="0" x:Name="txtStartSHA" Foreground="DarkOrange"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtStartTime" Foreground="{StaticResource Brush.FG2}" HorizontalAlignment="Right"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtStartTime" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
|
||||
</Grid>
|
||||
|
||||
<TextBlock Grid.Row="1" x:Name="txtStartSubject" FontSize="10pt" FontFamily="Consolas,Microsoft YaHei UI" VerticalAlignment="Bottom"/>
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
<Path
|
||||
Grid.Column="2"
|
||||
Width="16" Height="16"
|
||||
Fill="{StaticResource Brush.FG2}"
|
||||
Fill="{DynamicResource Brush.FG2}"
|
||||
Data="{StaticResource Icon.Down}"
|
||||
RenderTransformOrigin=".5,.5">
|
||||
<Path.RenderTransform>
|
||||
|
|
@ -70,9 +70,9 @@
|
|||
|
||||
<Border
|
||||
Grid.Column="3"
|
||||
BorderBrush="{StaticResource Brush.Border2}"
|
||||
BorderBrush="{DynamicResource Brush.Border2}"
|
||||
BorderThickness="1"
|
||||
Background="{StaticResource Brush.Contents}"
|
||||
Background="{DynamicResource Brush.Contents}"
|
||||
CornerRadius="4">
|
||||
<Grid Margin="4">
|
||||
<Grid.ColumnDefinitions>
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Column="0" x:Name="txtEndSHA" Foreground="DarkOrange"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtEndTime" Foreground="{StaticResource Brush.FG2}" HorizontalAlignment="Right"/>
|
||||
<TextBlock Grid.Column="1" x:Name="txtEndTime" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
|
||||
</Grid>
|
||||
|
||||
<TextBlock Grid.Row="1" x:Name="txtEndSubject" FontSize="10pt" FontFamily="Consolas,Microsoft YaHei UI" VerticalAlignment="Bottom"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border Grid.Column="0" Background="{StaticResource Brush.Contents}" BorderBrush="{StaticResource Brush.Border2}" BorderThickness="1">
|
||||
<Border Grid.Column="0" Background="{DynamicResource Brush.Contents}" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1">
|
||||
<controls:Tree
|
||||
x:Name="treeFiles"
|
||||
FontFamily="Consolas"
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
<GridSplitter Grid.Column="1" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch" Background="Transparent"/>
|
||||
|
||||
<Border Grid.Column="2" BorderBrush="{StaticResource Brush.Border2}" BorderThickness="1" Margin="2,0">
|
||||
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Margin="2,0">
|
||||
<Grid>
|
||||
<Grid x:Name="layerTextPreview" Visibility="Collapsed" SizeChanged="OnTextPreviewSizeChanged">
|
||||
<DataGrid
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
|
||||
<Rectangle x:Name="txtPreviewSplitter" Width="1" Fill="{StaticResource Brush.Border2}" HorizontalAlignment="Left"/>
|
||||
<Rectangle x:Name="txtPreviewSplitter" Width="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Left"/>
|
||||
</Grid>
|
||||
|
||||
<ScrollViewer
|
||||
|
|
@ -97,8 +97,8 @@
|
|||
Orientation="Vertical"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||
Visibility="Collapsed">
|
||||
<Path x:Name="iconRevisionPreview" Width="64" Height="64" Data="{StaticResource Icon.Submodule}" Fill="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock x:Name="txtRevisionPreview" Margin="0,16,0,0" FontFamily="Consolas" FontSize="18" FontWeight="UltraBold" HorizontalAlignment="Center" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<Path x:Name="iconRevisionPreview" Width="64" Height="64" Data="{StaticResource Icon.Submodule}" Fill="{DynamicResource Brush.FG2}"/>
|
||||
<TextBlock x:Name="txtRevisionPreview" Margin="0,16,0,0" FontFamily="Consolas" FontSize="18" FontWeight="UltraBold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel
|
||||
|
|
@ -106,8 +106,8 @@
|
|||
Orientation="Vertical"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||
Visibility="Collapsed">
|
||||
<Path Width="64" Height="64" Data="{StaticResource Icon.Error}" Fill="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock Margin="0,16,0,0" Text="{StaticResource Text.BinaryNotSupported}" FontFamily="Consolas" FontSize="18" FontWeight="UltraBold" HorizontalAlignment="Center" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<Path Width="64" Height="64" Data="{StaticResource Icon.Error}" Fill="{DynamicResource Brush.FG2}"/>
|
||||
<TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.BinaryNotSupported}" FontFamily="Consolas" FontSize="18" FontWeight="UltraBold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
|
|
|||
|
|
@ -25,18 +25,18 @@
|
|||
</Grid.RowDefinitions>
|
||||
|
||||
<!-- Stashes List Group -->
|
||||
<Border Grid.Row="0" BorderBrush="{StaticResource Brush.Border0}" BorderThickness="0,0,0,1">
|
||||
<Border Grid.Row="0" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path
|
||||
Margin="4,0"
|
||||
Width="12" Height="12"
|
||||
Fill="{StaticResource Brush.FG2}"
|
||||
Fill="{DynamicResource Brush.FG2}"
|
||||
Data="{StaticResource Icon.Stashes}"/>
|
||||
|
||||
<TextBlock
|
||||
Margin="4,0,0,0"
|
||||
Text="{StaticResource Text.Stashes.Stashes}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Text="{DynamicResource Text.Stashes.Stashes}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
FontWeight="Bold"/>
|
||||
|
||||
<controls:Loading
|
||||
|
|
@ -51,22 +51,22 @@
|
|||
<ListView
|
||||
Grid.Row="1"
|
||||
x:Name="stashList"
|
||||
Background="{StaticResource Brush.Contents}"
|
||||
Background="{DynamicResource Brush.Contents}"
|
||||
BorderThickness="0"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
SelectionChanged="OnStashSelectionChanged">
|
||||
<ListView.ItemTemplate>
|
||||
<DataTemplate DataType="{x:Type models:Stash}">
|
||||
<Border BorderBrush="{StaticResource Brush.Border3}" BorderThickness="0,0,0,1" Background="Transparent" Padding="6" ContextMenuOpening="OnStashContextMenuOpening">
|
||||
<Border BorderBrush="{DynamicResource Brush.Border3}" BorderThickness="0,0,0,1" Background="Transparent" Padding="6" ContextMenuOpening="OnStashContextMenuOpening">
|
||||
<StackPanel Orientation="Vertical" TextElement.FontFamily="Consolas">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Column="0" Text="{Binding SHA}" Foreground="{StaticResource Brush.FG2}" FontSize="11"/>
|
||||
<TextBlock Grid.Column="1" Text="{Binding Author.Time}" Foreground="{StaticResource Brush.FG2}" FontSize="11"/>
|
||||
<TextBlock Grid.Column="0" Text="{Binding SHA}" Foreground="{DynamicResource Brush.FG2}" FontSize="11"/>
|
||||
<TextBlock Grid.Column="1" Text="{Binding Author.Time}" Foreground="{DynamicResource Brush.FG2}" FontSize="11"/>
|
||||
</Grid>
|
||||
<TextBlock Text="{Binding Message}" Margin="0,8,0,0"/>
|
||||
</StackPanel>
|
||||
|
|
@ -76,18 +76,18 @@
|
|||
</ListView>
|
||||
|
||||
<!-- Change List Group -->
|
||||
<Border Grid.Row="2" BorderBrush="{StaticResource Brush.Border0}" BorderThickness="0,1">
|
||||
<Border Grid.Row="2" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,1">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path
|
||||
Margin="4,0"
|
||||
Width="12" Height="12"
|
||||
Fill="{StaticResource Brush.FG2}"
|
||||
Fill="{DynamicResource Brush.FG2}"
|
||||
Data="{StaticResource Icon.File}"/>
|
||||
|
||||
<TextBlock
|
||||
Margin="4,0,0,0"
|
||||
Text="{StaticResource Text.Stashes.Changes}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Text="{DynamicResource Text.Stashes.Changes}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
FontWeight="Bold"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
<DataGrid
|
||||
Grid.Row="3"
|
||||
x:Name="changeList"
|
||||
Background="{StaticResource Brush.Contents}"
|
||||
Background="{DynamicResource Brush.Contents}"
|
||||
RowHeight="24"
|
||||
SelectionMode="Single"
|
||||
SelectionUnit="FullRow"
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
</Grid>
|
||||
|
||||
<!-- Splitter -->
|
||||
<GridSplitter Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Stretch" Width="1" Background="{StaticResource Brush.Border0}"/>
|
||||
<GridSplitter Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Stretch" Width="1" Background="{DynamicResource Brush.Border0}"/>
|
||||
|
||||
<!-- Right -->
|
||||
<widgets:DiffViewer Grid.Column="2" x:Name="diffViewer" Margin="4"/>
|
||||
|
|
|
|||
|
|
@ -20,18 +20,18 @@
|
|||
Margin="0,48,0,0"
|
||||
Width="100" Height="100"
|
||||
Data="{StaticResource Icon.Git}"
|
||||
Fill="{StaticResource Brush.Logo}"/>
|
||||
Fill="{DynamicResource Brush.Logo}"/>
|
||||
|
||||
<!-- Welcome -->
|
||||
<TextBlock
|
||||
Margin="0,16"
|
||||
HorizontalAlignment="Center"
|
||||
Text="{StaticResource Text.Welcome.Title}"
|
||||
Text="{DynamicResource Text.Welcome.Title}"
|
||||
FontSize="24pt"
|
||||
FontWeight="ExtraBold"
|
||||
TextOptions.TextFormattingMode="Ideal"
|
||||
TextOptions.TextRenderingMode="ClearType"
|
||||
Foreground="{StaticResource Brush.FG2}"/>
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
|
||||
<!-- Options -->
|
||||
<Grid>
|
||||
|
|
@ -44,20 +44,20 @@
|
|||
<Button Grid.Column="0" Click="OnOpenClicked" Height="28">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="16" Height="16" Data="{StaticResource Icon.Folder.Open}"/>
|
||||
<TextBlock Margin="12,0,0,0" Text="{StaticResource Text.Welcome.OpenOrInit}"/>
|
||||
<TextBlock Margin="12,0,0,0" Text="{DynamicResource Text.Welcome.OpenOrInit}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
|
||||
<Button Grid.Column="2" Click="OnCloneClicked" Height="28">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Path Width="16" Height="16" Data="{StaticResource Icon.Pull}"/>
|
||||
<TextBlock Margin="12,0,0,0" Text="{StaticResource Text.Welcome.Clone}"/>
|
||||
<TextBlock Margin="12,0,0,0" Text="{DynamicResource Text.Welcome.Clone}"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
</Grid>
|
||||
|
||||
<!-- Horizontal line -->
|
||||
<Rectangle Height="1" Margin="0,36,0,8" Fill="{StaticResource Brush.Border1}"/>
|
||||
<Rectangle Height="1" Margin="0,36,0,8" Fill="{DynamicResource Brush.Border1}"/>
|
||||
|
||||
<!-- Labels -->
|
||||
<Grid>
|
||||
|
|
@ -69,15 +69,15 @@
|
|||
|
||||
<TextBlock
|
||||
Grid.Column="0"
|
||||
Text="{StaticResource Text.Welcome.Repositories}"
|
||||
Text="{DynamicResource Text.Welcome.Repositories}"
|
||||
FontSize="13pt" FontWeight="ExtraBold" FontFamily="Consolas,Microsoft YaHei UI"
|
||||
Foreground="{StaticResource Brush.FG2}"/>
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
|
||||
<TextBlock
|
||||
Grid.Column="2"
|
||||
Text="{StaticResource Text.Welcome.DragDrop}"
|
||||
Text="{DynamicResource Text.Welcome.DragDrop}"
|
||||
FontSize="10pt" FontFamily="Consolas,Microsoft YaHei UI"
|
||||
Foreground="{StaticResource Brush.FG2}"/>
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
Grid.Row="1"
|
||||
x:Name="dropArea"
|
||||
Margin="0,2"
|
||||
Stroke="{StaticResource Brush.Border1}"
|
||||
Stroke="{DynamicResource Brush.Border1}"
|
||||
StrokeThickness="2"
|
||||
StrokeDashArray="4,4"
|
||||
SnapsToDevicePixels="True"
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
|
||||
<StackPanel Grid.Column="1" x:Name="Contents" Orientation="Horizontal">
|
||||
<TextBlock Margin="8,0" FontSize="9pt" FontFamily="Consolas,Microsoft YaHei UI" Text="{Binding Name}"/>
|
||||
<TextBlock x:Name="Path" Text="{Binding Id}" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock x:Name="Path" Text="{Binding Id}" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</StackPanel>
|
||||
|
||||
<controls:TextEdit
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
</Grid.RowDefinitions>
|
||||
|
||||
<!-- Unstaged Toolbar -->
|
||||
<Border Grid.Row="0" BorderBrush="{StaticResource Brush.Border0}" BorderThickness="0,0,0,1">
|
||||
<Border Grid.Row="0" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
|
|
@ -51,8 +51,8 @@
|
|||
<TextBlock
|
||||
Grid.Column="1"
|
||||
Margin="6,0"
|
||||
Text="{StaticResource Text.WorkingCopy.Unstaged}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Text="{DynamicResource Text.WorkingCopy.Unstaged}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
FontWeight="Bold"/>
|
||||
<controls:Loading
|
||||
Grid.Column="2"
|
||||
|
|
@ -66,19 +66,19 @@
|
|||
Width="14" Height="14"
|
||||
Margin="4,0"
|
||||
Icon="{StaticResource Icon.Down}"
|
||||
ToolTip="{StaticResource Text.WorkingCopy.Unstaged.Stage}"/>
|
||||
ToolTip="{DynamicResource Text.WorkingCopy.Unstaged.Stage}"/>
|
||||
<controls:IconButton
|
||||
Grid.Column="5"
|
||||
Click="StageAll"
|
||||
Width="14" Height="14"
|
||||
Margin="4,0"
|
||||
Icon="{StaticResource Icon.DoubleDown}"
|
||||
ToolTip="{StaticResource Text.WorkingCopy.Unstaged.StageAll}"/>
|
||||
ToolTip="{DynamicResource Text.WorkingCopy.Unstaged.StageAll}"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- Unstaged Changes -->
|
||||
<Border Grid.Row="1" Background="{StaticResource Brush.Contents}">
|
||||
<Border Grid.Row="1" Background="{DynamicResource Brush.Contents}">
|
||||
<widgets:WorkingCopyChanges
|
||||
x:Name="unstagedContainer"
|
||||
IsUnstaged="True"
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
</Border>
|
||||
|
||||
<!-- Staged Toolbar -->
|
||||
<Border Grid.Row="2" BorderBrush="{StaticResource Brush.Border0}" BorderThickness="0,1">
|
||||
<Border Grid.Row="2" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,1">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
|
|
@ -105,8 +105,8 @@
|
|||
<TextBlock
|
||||
Grid.Column="1"
|
||||
Margin="6,0"
|
||||
Text="{StaticResource Text.WorkingCopy.Staged}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Text="{DynamicResource Text.WorkingCopy.Staged}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
FontWeight="Bold"/>
|
||||
|
||||
<controls:IconButton
|
||||
|
|
@ -115,19 +115,19 @@
|
|||
Width="14" Height="14"
|
||||
Margin="4,0"
|
||||
Icon="{StaticResource Icon.Up}"
|
||||
ToolTip="{StaticResource Text.WorkingCopy.Staged.Unstage}"/>
|
||||
ToolTip="{DynamicResource Text.WorkingCopy.Staged.Unstage}"/>
|
||||
<controls:IconButton
|
||||
Grid.Column="3"
|
||||
Click="UnstageAll"
|
||||
Width="14" Height="14"
|
||||
Margin="4,0"
|
||||
Icon="{StaticResource Icon.DoubleUp}"
|
||||
ToolTip="{StaticResource Text.WorkingCopy.Staged.UnstageAll}"/>
|
||||
ToolTip="{DynamicResource Text.WorkingCopy.Staged.UnstageAll}"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- Staged Changes -->
|
||||
<Border Grid.Row="3" Background="{StaticResource Brush.Contents}">
|
||||
<Border Grid.Row="3" Background="{DynamicResource Brush.Contents}">
|
||||
<widgets:WorkingCopyChanges
|
||||
x:Name="stagedContainer"
|
||||
IsUnstaged="False"
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
</Border>
|
||||
</Grid>
|
||||
|
||||
<GridSplitter Grid.Column="1" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch" Background="{StaticResource Brush.Border0}"/>
|
||||
<GridSplitter Grid.Column="1" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch" Background="{DynamicResource Brush.Border0}"/>
|
||||
|
||||
<!-- Right -->
|
||||
<Grid Grid.Column="2" Margin="4">
|
||||
|
|
@ -150,22 +150,22 @@
|
|||
<widgets:DiffViewer Grid.Row="0" x:Name="diffViewer"/>
|
||||
|
||||
<!-- Merge Option Panel -->
|
||||
<Grid Grid.Row="0" x:Name="mergePanel" Background="{StaticResource Brush.Window}" Visibility="Collapsed">
|
||||
<Grid Grid.Row="0" x:Name="mergePanel" Background="{DynamicResource Brush.Window}" Visibility="Collapsed">
|
||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Path
|
||||
Width="64" Height="64"
|
||||
Data="{StaticResource Icon.Conflict}"
|
||||
Fill="{StaticResource Brush.FG2}"/>
|
||||
Fill="{DynamicResource Brush.FG2}"/>
|
||||
<TextBlock
|
||||
Margin="0,16,0,28"
|
||||
FontSize="20" FontWeight="DemiBold"
|
||||
Text="{StaticResource Text.WorkingCopy.Conflicts}"
|
||||
Foreground="{StaticResource Brush.FG2}"
|
||||
Text="{DynamicResource Text.WorkingCopy.Conflicts}"
|
||||
Foreground="{DynamicResource Brush.FG2}"
|
||||
HorizontalAlignment="Center"/>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<Button Click="UseTheirs" Content="{StaticResource Text.WorkingCopy.UseTheirs}" Height="24" Padding="8,0"/>
|
||||
<Button Click="UseMine" Content="{StaticResource Text.WorkingCopy.UseMine}" Height="24" Margin="8,0" Padding="8,0"/>
|
||||
<Button Click="UseMergeTool" Content="{StaticResource Text.WorkingCopy.OpenMerger}" Height="24" Padding="8,0"/>
|
||||
<Button Click="UseTheirs" Content="{DynamicResource Text.WorkingCopy.UseTheirs}" Height="24" Padding="8,0"/>
|
||||
<Button Click="UseMine" Content="{DynamicResource Text.WorkingCopy.UseMine}" Height="24" Margin="8,0" Padding="8,0"/>
|
||||
<Button Click="UseMergeTool" Content="{DynamicResource Text.WorkingCopy.OpenMerger}" Height="24" Padding="8,0"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
TextWrapping="Wrap"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
Placeholder="{StaticResource Text.WorkingCopy.CommitMessageTip}"
|
||||
Placeholder="{DynamicResource Text.WorkingCopy.CommitMessageTip}"
|
||||
PlaceholderBaseline="Top">
|
||||
<TextBox.Text>
|
||||
<Binding ElementName="me" Path="CommitMessage" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
|
||||
|
|
@ -207,7 +207,7 @@
|
|||
Grid.Column="0"
|
||||
Width="14" Height="14"
|
||||
Click="OpenCommitMessageRecorder"
|
||||
ToolTip="{StaticResource Text.WorkingCopy.MessageHistories}"
|
||||
ToolTip="{DynamicResource Text.WorkingCopy.MessageHistories}"
|
||||
Icon="{StaticResource Icon.List}"
|
||||
Opacity=".5"/>
|
||||
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
x:Name="chkAmend"
|
||||
Margin="8,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{StaticResource Text.WorkingCopy.Amend}"
|
||||
Content="{DynamicResource Text.WorkingCopy.Amend}"
|
||||
Checked="StartAmend" Unchecked="EndAmend"/>
|
||||
|
||||
<controls:Loading
|
||||
|
|
@ -231,9 +231,9 @@
|
|||
Height="26"
|
||||
Padding="8,0"
|
||||
Click="Commit"
|
||||
Background="{StaticResource Brush.Accent1}"
|
||||
BorderBrush="{StaticResource Brush.FG1}"
|
||||
Content="{StaticResource Text.WorkingCopy.Commit}"/>
|
||||
Background="{DynamicResource Brush.Accent1}"
|
||||
BorderBrush="{DynamicResource Brush.FG1}"
|
||||
Content="{DynamicResource Text.WorkingCopy.Commit}"/>
|
||||
|
||||
<Button
|
||||
Grid.Column="5"
|
||||
|
|
@ -241,7 +241,7 @@
|
|||
Height="26"
|
||||
Padding="8,0"
|
||||
Click="CommitAndPush"
|
||||
Content="{StaticResource Text.WorkingCopy.CommitAndPush}"
|
||||
Content="{DynamicResource Text.WorkingCopy.CommitAndPush}"
|
||||
Margin="8,0,0,0"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@
|
|||
<DataGridTemplateColumn IsReadOnly="True" Width="SizeToCells">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock FontFamily="Consolas" Margin="8,0,0,0" Text="{Binding Path, Converter={StaticResource PureFolderName}}" Foreground="{StaticResource Brush.FG2}"/>
|
||||
<TextBlock FontFamily="Consolas" Margin="8,0,0,0" Text="{Binding Path, Converter={StaticResource PureFolderName}}" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue