dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-21 10:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ux: move some buttons to page switcher (#1370)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-28 10:18:34 +08:00
parent 2aac6779a5
commit 40bf69bff3
No known key found for this signature in database
16 changed files with 48 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Views/Repository.axaml
View file

@ -129,7 +129,7 @@
</ListBoxItem>
<ListBoxItem IsVisible="{Binding !IsBare}">
<Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto">
<Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
<Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Changes}"/>
<TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.WorkingCopy}"/>
<v:CounterPresenter Grid.Column="2"
@ -146,11 +146,18 @@
Data="{StaticResource Icons.Info}"
Fill="DarkOrange"
IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"/>
<Button Grid.Column="4"
Classes="icon_button"
Width="26" Height="26"
Command="{Binding DiscardAllChanges}"
ToolTip.Tip="{DynamicResource Text.Repository.DiscardAll}">
<Path Width="12" Height="12" Data="{StaticResource Icons.Undo}"/>
</Button>
</Grid>
</ListBoxItem>
<ListBoxItem IsVisible="{Binding !IsBare}">
<Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto">
<Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto">
<Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Stashes}"/>
<TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Stashes}"/>
<v:CounterPresenter Grid.Column="2"
@ -161,6 +168,14 @@
FontSize="10"
Foreground="{DynamicResource Brush.BadgeFG}"
Background="{DynamicResource Brush.Badge}"/>
<Button Grid.Column="3"
Classes="icon_button"
Width="26" Height="26"
Command="{Binding ClearStashes}"
IsEnabled="{Binding StashesCount, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"
ToolTip.Tip="{DynamicResource Text.Repository.ClearStashes}">
<Path Width="12" Height="12" Data="{StaticResource Icons.RemoveAll}"/>
</Button>
</Grid>
</ListBoxItem>
</ListBox>

10
src/Views/StashesPage.axaml
View file

@ -19,20 +19,12 @@
<!-- Left -->
<Grid Grid.Column="0" RowDefinitions="28,36,*,28,*">
<!-- Stash Bar -->
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto">
<Grid Grid.Row="0" ColumnDefinitions="Auto,*">
<Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Stashes}"/>
<TextBlock Grid.Column="1" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0">
<Run Text="{DynamicResource Text.Stashes.Stashes}"/>
<Run Text="{Binding Stashes, Converter={x:Static c:ListConverters.ToCount}, Mode=OneWay}"/>
</TextBlock>
<Button Grid.Column="2"
Classes="icon_button"
Width="26" Height="14"
Padding="0"
Command="{Binding Clear}"
IsEnabled="{Binding Stashes.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
<Path Width="14" Height="14" Data="{StaticResource Icons.RemoveAll}"/>
</Button>
</Grid>
<!-- Search Bar -->