|
163 | 163 | <Grid Grid.Row="2" x:Name="LeftSidebarGroups" Margin="0,4,0,0" RowDefinitions="28,Auto,28,Auto,28,Auto,28,Auto,28,Auto" SizeChanged="OnLeftSidebarSizeChanged"> |
164 | 164 | <!-- Local Branches --> |
165 | 165 | <ToggleButton Grid.Row="0" Classes="group_expander" IsChecked="{Binding IsLocalBranchGroupExpanded, Mode=TwoWay}"> |
166 | | - <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.LocalBranches}"/> |
| 166 | + <Grid ColumnDefinitions="16,*"> |
| 167 | + <Path Grid.Column="0" Width="11" Height="11" HorizontalAlignment="Left" Data="{StaticResource Icons.Local}" Fill="{DynamicResource Brush.FG2}"/> |
| 168 | + <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.LocalBranches}"/> |
| 169 | + </Grid> |
167 | 170 | </ToggleButton> |
168 | 171 | <v:BranchTree Grid.Row="1" |
169 | 172 | x:Name="LocalBranchTree" |
|
176 | 179 |
|
177 | 180 | <!-- Remotes --> |
178 | 181 | <ToggleButton Grid.Row="2" Classes="group_expander" IsChecked="{Binding IsRemoteGroupExpanded, Mode=TwoWay}"> |
179 | | - <Grid ColumnDefinitions="*,Auto"> |
180 | | - <TextBlock Grid.Column="0" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Remotes}"/> |
181 | | - <Button Grid.Column="1" Classes="icon_button" Width="14" Margin="8,0" Command="{Binding AddRemote}" ToolTip.Tip="{DynamicResource Text.Repository.Remotes.Add}"> |
| 182 | + <Grid ColumnDefinitions="16,*,Auto"> |
| 183 | + <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Data="{StaticResource Icons.Remotes}" Fill="{DynamicResource Brush.FG2}"/> |
| 184 | + <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Remotes}"/> |
| 185 | + <Button Grid.Column="2" Classes="icon_button" Width="14" Margin="8,0" Command="{Binding AddRemote}" ToolTip.Tip="{DynamicResource Text.Repository.Remotes.Add}"> |
182 | 186 | <Path Width="12" Height="12" Data="{StaticResource Icons.Remote.Add}"/> |
183 | 187 | </Button> |
184 | 188 | </Grid> |
|
194 | 198 |
|
195 | 199 | <!-- Tags --> |
196 | 200 | <ToggleButton Grid.Row="4" Classes="group_expander" IsChecked="{Binding IsTagGroupExpanded, Mode=TwoWay}"> |
197 | | - <Grid ColumnDefinitions="Auto,*,Auto,Auto"> |
198 | | - <TextBlock Grid.Column="0" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Tags}"/> |
199 | | - <TextBlock Grid.Column="1" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/> |
200 | | - <ToggleButton Grid.Column="2" |
| 201 | + <Grid ColumnDefinitions="16,Auto,*,Auto,Auto"> |
| 202 | + <Path Grid.Column="0" Width="11" Height="11" Margin="2,1,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Tags}" Fill="{DynamicResource Brush.FG2}"/> |
| 203 | + <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Tags}"/> |
| 204 | + <TextBlock Grid.Column="2" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/> |
| 205 | + <ToggleButton Grid.Column="3" |
201 | 206 | Classes="tag_display_mode" |
202 | 207 | Width="14" |
203 | 208 | IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowTagsAsTree, Mode=TwoWay}" |
204 | 209 | ToolTip.Tip="{DynamicResource Text.Repository.ShowTagsAsTree}"/> |
205 | | - <Button Grid.Column="3" |
| 210 | + <Button Grid.Column="4" |
206 | 211 | Classes="icon_button" |
207 | 212 | Width="14" |
208 | 213 | Margin="8,0" |
|
226 | 231 |
|
227 | 232 | <!-- Submodules --> |
228 | 233 | <ToggleButton Grid.Row="6" Classes="group_expander" IsChecked="{Binding IsSubmoduleGroupExpanded, Mode=TwoWay}"> |
229 | | - <Grid ColumnDefinitions="Auto,*,Auto,Auto"> |
230 | | - <TextBlock Grid.Column="0" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Submodules}"/> |
231 | | - <TextBlock Grid.Column="1" Text="{Binding Submodules, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/> |
232 | | - <Button Grid.Column="2" |
| 234 | + <Grid ColumnDefinitions="16,Auto,*,Auto,Auto"> |
| 235 | + <Path Grid.Column="0" Width="10" Height="10" Margin="2,0,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Submodules}" Fill="{DynamicResource Brush.FG2}"/> |
| 236 | + <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Submodules}"/> |
| 237 | + <TextBlock Grid.Column="2" Text="{Binding Submodules, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/> |
| 238 | + <Button Grid.Column="3" |
233 | 239 | Classes="icon_button" |
234 | 240 | Width="14" |
235 | 241 | Margin="8,0" |
|
238 | 244 | ToolTip.Tip="{DynamicResource Text.Repository.Submodules.Update}"> |
239 | 245 | <Path Width="12" Height="12" Data="{StaticResource Icons.Loading}"/> |
240 | 246 | </Button> |
241 | | - <Button Grid.Column="3" |
| 247 | + <Button Grid.Column="4" |
242 | 248 | Classes="icon_button" |
243 | 249 | Width="14" |
244 | 250 | Margin="0,0,8,0" |
|
281 | 287 |
|
282 | 288 | <!-- Worktrees --> |
283 | 289 | <ToggleButton Grid.Row="8" Classes="group_expander" IsChecked="{Binding IsWorktreeGroupExpanded, Mode=TwoWay}"> |
284 | | - <Grid ColumnDefinitions="Auto,*,Auto,Auto"> |
285 | | - <TextBlock Grid.Column="0" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Worktrees}"/> |
286 | | - <TextBlock Grid.Column="1" Text="{Binding Worktrees, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/> |
287 | | - <Button Grid.Column="2" |
| 290 | + <Grid ColumnDefinitions="16,Auto,*,Auto,Auto"> |
| 291 | + <Path Grid.Column="0" Width="11" Height="11" Margin="1,0,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Worktrees}" Fill="{DynamicResource Brush.FG2}"/> |
| 292 | + <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Worktrees}"/> |
| 293 | + <TextBlock Grid.Column="2" Text="{Binding Worktrees, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/> |
| 294 | + <Button Grid.Column="3" |
288 | 295 | Classes="icon_button" |
289 | 296 | Width="14" |
290 | 297 | Margin="8,0" |
|
293 | 300 | ToolTip.Tip="{DynamicResource Text.Repository.Worktrees.Prune}"> |
294 | 301 | <Path Width="12" Height="12" Data="{StaticResource Icons.Loading}"/> |
295 | 302 | </Button> |
296 | | - <Button Grid.Column="3" |
| 303 | + <Button Grid.Column="4" |
297 | 304 | Classes="icon_button" |
298 | 305 | Width="14" |
299 | | - Margin="0,0,8,0" |
| 306 | + Margin="0,0,9,0" |
300 | 307 | Command="{Binding AddWorktree}" |
301 | 308 | ToolTip.Tip="{DynamicResource Text.Repository.Worktrees.Add}"> |
302 | | - <Path Width="12" Height="12" Data="{StaticResource Icons.Worktree.Add}"/> |
| 309 | + <Path Width="11" Height="11" Data="{StaticResource Icons.Worktree.Add}"/> |
303 | 310 | </Button> |
304 | 311 | </Grid> |
305 | 312 | </ToggleButton> |
|
0 commit comments