|
69 | 69 | </Button>
|
70 | 70 | </StackPanel>
|
71 | 71 |
|
72 |
| - <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0"> |
| 72 | + <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0"> |
73 | 73 | <ToggleButton Classes="layout_direction"
|
74 | 74 | Width="32" Height="26"
|
75 | 75 | IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseTwoColumnsLayoutInHistories, Mode=TwoWay}"
|
76 | 76 | IsVisible="{Binding SelectedViewIndex, Converter={x:Static c:IntConverters.IsZero}}"
|
77 | 77 | ToolTip.Tip="{DynamicResource Text.Histories.DisplayMode}"/>
|
78 | 78 |
|
| 79 | + <Button Classes="icon_button" Width="32" Command="{Binding NavigateToCurrentHead}" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}"> |
| 80 | + <Path Width="14" Height="14" Data="{StaticResource Icons.Target}"/> |
| 81 | + </Button> |
| 82 | + |
79 | 83 | <Button Classes="icon_button" Width="32" Command="{Binding Cleanup}" ToolTip.Tip="{DynamicResource Text.Repository.Clean}">
|
80 | 84 | <Path Width="14" Height="14" Data="{StaticResource Icons.Clean}"/>
|
81 | 85 | </Button>
|
|
111 | 115 | </ListBox.ItemsPanel>
|
112 | 116 |
|
113 | 117 | <ListBoxItem Height="28" Padding="0">
|
114 |
| - <Grid Margin="16,0,0,0" Height="28" ColumnDefinitions="Auto,*,Auto"> |
115 |
| - <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Histories}"/> |
116 |
| - <TextBlock Grid.Column="1" Margin="8,0,0,0" Classes="monospace" Text="{DynamicResource Text.Histories}"/> |
117 |
| - <Button Grid.Column="2" Classes="icon_button" Width="14" Margin="8,0" Command="{Binding NavigateToCurrentHead}" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}"> |
118 |
| - <Path Width="14" Height="14" Data="{StaticResource Icons.Target}"/> |
119 |
| - </Button> |
| 118 | + <Grid Margin="16,0,0,0" Height="28" ColumnDefinitions="20,*"> |
| 119 | + <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Data="{StaticResource Icons.Histories}"/> |
| 120 | + <TextBlock Grid.Column="1" Classes="monospace" Text="{DynamicResource Text.Histories}"/> |
120 | 121 | </Grid>
|
121 | 122 | </ListBoxItem>
|
122 | 123 |
|
123 | 124 | <ListBoxItem Height="28" Padding="0">
|
124 |
| - <Grid Margin="16,0,0,0" Height="28" ColumnDefinitions="Auto,*,Auto"> |
125 |
| - <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Send}"/> |
126 |
| - <TextBlock Grid.Column="1" Classes="monospace" Margin="8,0,0,0" Text="{DynamicResource Text.WorkingCopy}"/> |
| 125 | + <Grid Margin="16,0,0,0" Height="28" ColumnDefinitions="20,*,Auto"> |
| 126 | + <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Data="{StaticResource Icons.Send}"/> |
| 127 | + <TextBlock Grid.Column="1" Classes="monospace" Text="{DynamicResource Text.WorkingCopy}"/> |
127 | 128 | <Border Grid.Column="2"
|
128 | 129 | Margin="6,0"
|
129 | 130 | Height="18"
|
|
137 | 138 | </ListBoxItem>
|
138 | 139 |
|
139 | 140 | <ListBoxItem Height="28" Padding="0">
|
140 |
| - <Grid Margin="16,0,0,0" Height="28" ColumnDefinitions="Auto,*,Auto"> |
141 |
| - <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Stashes}"/> |
142 |
| - <TextBlock Grid.Column="1" Classes="monospace" Margin="8,0,0,0" Text="{DynamicResource Text.Stashes}"/> |
| 141 | + <Grid Margin="16,0,0,0" Height="28" ColumnDefinitions="20,*,Auto"> |
| 142 | + <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Data="{StaticResource Icons.Stashes}"/> |
| 143 | + <TextBlock Grid.Column="1" Classes="monospace" Text="{DynamicResource Text.Stashes}"/> |
143 | 144 | <Border Grid.Column="2"
|
144 | 145 | Margin="6,0"
|
145 | 146 | Height="18"
|
|
170 | 171 | </TreeView.Styles>
|
171 | 172 | <TreeView.ItemTemplate>
|
172 | 173 | <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type m:BranchTreeNode}">
|
173 |
| - <Grid Height="24" ColumnDefinitions="Auto,*,Auto,Auto" Background="Transparent" ContextRequested="OnLocalBranchContextMenuRequested" DoubleTapped="OnDoubleTappedLocalBranchNode"> |
174 |
| - <Path Grid.Column="0" Classes="folder_icon" Width="10" Height="10" Margin="0,1,0,0" IsVisible="{Binding IsFolder}"/> |
175 |
| - <Path Grid.Column="0" Width="10" Height="10" Margin="0,2,0,0" Data="{StaticResource Icons.Check}" IsVisible="{Binding IsCurrent}" VerticalAlignment="Center"/> |
176 |
| - <Path Grid.Column="0" Width="10" Height="10" Data="{StaticResource Icons.Branch}" VerticalAlignment="Center"> |
| 174 | + <Grid Height="24" ColumnDefinitions="20,*,Auto,Auto" Background="Transparent" ContextRequested="OnLocalBranchContextMenuRequested" DoubleTapped="OnDoubleTappedLocalBranchNode"> |
| 175 | + <Path Grid.Column="0" Classes="folder_icon" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,1,0,0" IsVisible="{Binding IsFolder}"/> |
| 176 | + <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,2,0,0" Data="{StaticResource Icons.Check}" IsVisible="{Binding IsCurrent}" VerticalAlignment="Center"/> |
| 177 | + <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="2,0,0,0" Data="{StaticResource Icons.Branch}" VerticalAlignment="Center"> |
177 | 178 | <Path.IsVisible>
|
178 | 179 | <MultiBinding Converter="{x:Static BoolConverters.And}">
|
179 | 180 | <Binding Path="!IsFolder"/>
|
180 | 181 | <Binding Path="!IsCurrent"/>
|
181 | 182 | </MultiBinding>
|
182 | 183 | </Path.IsVisible>
|
183 | 184 | </Path>
|
184 |
| - <TextBlock Grid.Column="1" Text="{Binding Name}" Classes="monospace" FontWeight="Bold" Margin="8,0,4,0" IsVisible="{Binding IsCurrent}"/> |
185 |
| - <TextBlock Grid.Column="1" Text="{Binding Name}" Classes="monospace" Margin="8,0,4,0" IsVisible="{Binding !IsCurrent}"/> |
| 185 | + |
| 186 | + <TextBlock Grid.Column="1" Text="{Binding Name}" Classes="monospace" FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.BoldIfTrue}}"/> |
186 | 187 |
|
187 | 188 | <Border Grid.Column="2" Margin="8,0" Height="18" CornerRadius="9" VerticalAlignment="Center" Background="{DynamicResource Brush.Badge}" IsVisible="{Binding IsUpstreamTrackStatusVisible}">
|
188 | 189 | <TextBlock Classes="monospace" FontSize="10" HorizontalAlignment="Center" Margin="9,0" Text="{Binding UpstreamTrackStatus}"/>
|
|
223 | 224 |
|
224 | 225 | <TreeView.ItemTemplate>
|
225 | 226 | <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type m:BranchTreeNode}">
|
226 |
| - <Grid Height="24" ColumnDefinitions="Auto,*,Auto" Background="Transparent" ContextRequested="OnRemoteBranchContextMenuRequested"> |
227 |
| - <Path Grid.Column="0" Classes="folder_icon" Width="10" Height="10" Margin="0,2,0,0" IsVisible="{Binding IsFolder}" VerticalAlignment="Center"/> |
228 |
| - <Path Grid.Column="0" Width="10" Height="10" Margin="0,4,0,0" Data="{StaticResource Icons.Remote}" IsVisible="{Binding IsRemote}" VerticalAlignment="Center"/> |
229 |
| - <Path Grid.Column="0" Width="10" Height="10" Data="{StaticResource Icons.Branch}" IsVisible="{Binding IsBranch}" VerticalAlignment="Center"/> |
| 227 | + <Grid Height="24" ColumnDefinitions="20,*,Auto" Background="Transparent" ContextRequested="OnRemoteBranchContextMenuRequested"> |
| 228 | + <Path Grid.Column="0" Classes="folder_icon" Width="10" Height="10" HorizontalAlignment="Left" Margin="0,2,0,0" IsVisible="{Binding IsFolder}" VerticalAlignment="Center"/> |
| 229 | + <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,2,0,0" Data="{StaticResource Icons.Remote}" IsVisible="{Binding IsRemote}" VerticalAlignment="Center"/> |
| 230 | + <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="2,0,0,0" Data="{StaticResource Icons.Branch}" IsVisible="{Binding IsBranch}" VerticalAlignment="Center"/> |
230 | 231 |
|
231 |
| - <TextBlock Grid.Column="1" Text="{Binding Name}" Classes="monospace" Margin="8,0,4,0"/> |
| 232 | + <TextBlock Grid.Column="1" Text="{Binding Name}" Classes="monospace"/> |
232 | 233 |
|
233 | 234 | <ToggleButton Grid.Column="2"
|
234 | 235 | Classes="filter"
|
|
0 commit comments