Skip to content

Commit d5d0f23

Browse files
committed
ux: add icons for popups
Signed-off-by: leo <[email protected]>
1 parent 2e8e5e9 commit d5d0f23

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+674
-226
lines changed

src/Views/AddRemote.axaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@
88
x:Class="SourceGit.Views.AddRemote"
99
x:DataType="vm:AddRemote">
1010
<StackPanel Orientation="Vertical" Margin="8,0">
11-
<TextBlock FontSize="18"
12-
Classes="bold"
13-
Text="{DynamicResource Text.Remote.AddTitle}"/>
14-
11+
<StackPanel Orientation="Horizontal">
12+
<Path Width="16" Height="16"
13+
Margin="0,2,0,0"
14+
Data="{StaticResource Icons.Remote.Add}"/>
15+
16+
<TextBlock FontSize="18"
17+
Margin="8,0,0,0"
18+
Classes="bold"
19+
Text="{DynamicResource Text.Remote.AddTitle}"/>
20+
</StackPanel>
21+
1522
<Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="120,*">
1623
<TextBlock Grid.Row="0" Grid.Column="0"
1724
HorizontalAlignment="Right" VerticalAlignment="Center"

src/Views/AddSubmodule.axaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,16 @@
88
x:Class="SourceGit.Views.AddSubmodule"
99
x:DataType="vm:AddSubmodule">
1010
<StackPanel Orientation="Vertical" Margin="8,0">
11-
<TextBlock FontSize="18"
12-
Classes="bold"
13-
Text="{DynamicResource Text.Submodule.Add}"/>
11+
<StackPanel Orientation="Horizontal">
12+
<Path Width="16" Height="16"
13+
Data="{StaticResource Icons.Submodule.Add}"/>
14+
15+
<TextBlock FontSize="18"
16+
Margin="8,0,0,0"
17+
Classes="bold"
18+
Text="{DynamicResource Text.Submodule.Add}"/>
19+
</StackPanel>
20+
1421
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
1522
<TextBlock Grid.Row="0" Grid.Column="0"
1623
HorizontalAlignment="Right" VerticalAlignment="Center"

src/Views/AddToIgnore.axaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@
99
x:Class="SourceGit.Views.AddToIgnore"
1010
x:DataType="vm:AddToIgnore">
1111
<StackPanel Orientation="Vertical" Margin="8,0">
12-
<TextBlock FontSize="18"
13-
Classes="bold"
14-
Text="{DynamicResource Text.AddToIgnore}"/>
12+
<StackPanel Orientation="Horizontal">
13+
<Path Width="16" Height="16"
14+
Data="{StaticResource Icons.GitIgnore}"/>
15+
16+
<TextBlock FontSize="18"
17+
Margin="8,0,0,0"
18+
Classes="bold"
19+
Text="{DynamicResource Text.AddToIgnore}"/>
20+
</StackPanel>
21+
1522
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
1623
<TextBlock Grid.Row="0" Grid.Column="0"
1724
HorizontalAlignment="Right" VerticalAlignment="Center"

src/Views/AddWorktree.axaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@
77
x:Class="SourceGit.Views.AddWorktree"
88
x:DataType="vm:AddWorktree">
99
<StackPanel Orientation="Vertical" Margin="8,0">
10-
<TextBlock FontSize="18"
11-
Classes="bold"
12-
Text="{DynamicResource Text.AddWorktree}"/>
10+
<StackPanel Orientation="Horizontal">
11+
<Path Width="16" Height="16"
12+
Data="{StaticResource Icons.Worktree.Add}"/>
13+
14+
<TextBlock FontSize="18"
15+
Margin="8,0,0,0"
16+
Classes="bold"
17+
Text="{DynamicResource Text.AddWorktree}"/>
18+
</StackPanel>
19+
1320
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,32" ColumnDefinitions="150,*">
1421
<TextBlock Grid.Row="0" Grid.Column="0"
1522
HorizontalAlignment="Right" VerticalAlignment="Center"

src/Views/Apply.axaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@
99
x:Class="SourceGit.Views.Apply"
1010
x:DataType="vm:Apply">
1111
<StackPanel Orientation="Vertical" Margin="8,0">
12-
<TextBlock FontSize="18"
13-
Classes="bold"
14-
Text="{DynamicResource Text.Apply.Title}"/>
12+
<StackPanel Orientation="Horizontal">
13+
<Path Width="16" Height="16"
14+
Data="{StaticResource Icons.Diff}"/>
15+
16+
<TextBlock FontSize="18"
17+
Margin="8,0,0,0"
18+
Classes="bold"
19+
Text="{DynamicResource Text.Apply.Title}"/>
20+
</StackPanel>
1521

1622
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
1723
<TextBlock Grid.Column="0"

src/Views/ApplyStash.axaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@
77
x:Class="SourceGit.Views.ApplyStash"
88
x:DataType="vm:ApplyStash">
99
<StackPanel Orientation="Vertical" Margin="8,0,0,0">
10-
<TextBlock FontSize="18"
11-
Classes="bold"
12-
Text="{DynamicResource Text.ApplyStash}"/>
10+
<StackPanel Orientation="Horizontal">
11+
<Path Width="16" Height="16"
12+
Data="{StaticResource Icons.CheckCircled}"/>
13+
14+
<TextBlock FontSize="18"
15+
Margin="8,0,0,0"
16+
Classes="bold"
17+
Text="{DynamicResource Text.ApplyStash}"/>
18+
</StackPanel>
19+
1320
<Grid Margin="0,16,8,0" RowDefinitions="32,32,32" ColumnDefinitions="100,*">
1421
<TextBlock Grid.Row="0" Grid.Column="0"
1522
HorizontalAlignment="Right" VerticalAlignment="Center"

src/Views/Archive.axaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@
1010
x:Class="SourceGit.Views.Archive"
1111
x:DataType="vm:Archive">
1212
<StackPanel Orientation="Vertical" Margin="8,0">
13-
<TextBlock FontSize="18"
14-
Classes="bold"
15-
Text="{DynamicResource Text.Archive.Title}"/>
13+
<StackPanel Orientation="Horizontal">
14+
<Path Width="16" Height="16"
15+
Data="{StaticResource Icons.Archive}"/>
16+
17+
<TextBlock FontSize="18"
18+
Margin="8,0,0,0"
19+
Classes="bold"
20+
Text="{DynamicResource Text.Archive.Title}"/>
21+
</StackPanel>
22+
1623
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
1724
<TextBlock Grid.Row="0" Grid.Column="0"
1825
HorizontalAlignment="Right" VerticalAlignment="Center"

src/Views/ChangeSubmoduleUrl.axaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@
77
x:Class="SourceGit.Views.ChangeSubmoduleUrl"
88
x:DataType="vm:ChangeSubmoduleUrl">
99
<StackPanel Orientation="Vertical" Margin="8,0">
10-
<TextBlock FontSize="18"
11-
Classes="bold"
12-
Text="{DynamicResource Text.ChangeSubmoduleUrl}"/>
10+
<StackPanel Orientation="Horizontal">
11+
<Path Width="16" Height="16"
12+
Data="{StaticResource Icons.Edit}"/>
13+
14+
<TextBlock FontSize="18"
15+
Margin="8,0,0,0"
16+
Classes="bold"
17+
Text="{DynamicResource Text.ChangeSubmoduleUrl}"/>
18+
</StackPanel>
19+
1320
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
1421
<TextBlock Grid.Row="0" Grid.Column="0"
1522
HorizontalAlignment="Right" VerticalAlignment="Center"

src/Views/Checkout.axaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@
77
x:Class="SourceGit.Views.Checkout"
88
x:DataType="vm:Checkout">
99
<StackPanel Orientation="Vertical" Margin="8,0">
10-
<TextBlock FontSize="18"
11-
Classes="bold"
12-
Text="{DynamicResource Text.Checkout}"/>
10+
<StackPanel Orientation="Horizontal">
11+
<Path Width="16" Height="16"
12+
Margin="0,4,0,0"
13+
Data="{StaticResource Icons.Check}"/>
14+
15+
<TextBlock FontSize="18"
16+
Margin="8,0,0,0"
17+
Classes="bold"
18+
Text="{DynamicResource Text.Checkout}"/>
19+
</StackPanel>
1320

1421
<Grid Margin="0,16,0,0" ColumnDefinitions="140,*">
1522
<Grid.RowDefinitions>

src/Views/CheckoutAndFastForward.axaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@
77
x:Class="SourceGit.Views.CheckoutAndFastForward"
88
x:DataType="vm:CheckoutAndFastForward">
99
<StackPanel Orientation="Vertical" Margin="8,0">
10-
<TextBlock FontSize="18"
11-
Classes="bold"
12-
Text="{DynamicResource Text.Checkout.WithFastForward}"/>
10+
<StackPanel Orientation="Horizontal">
11+
<Path Width="16" Height="16"
12+
Margin="0,4,0,0"
13+
Data="{StaticResource Icons.Check}"/>
14+
15+
<TextBlock FontSize="18"
16+
Margin="8,0,0,0"
17+
Classes="bold"
18+
Text="{DynamicResource Text.Checkout.WithFastForward}"/>
19+
</StackPanel>
1320

1421
<Grid Margin="0,16,0,0" ColumnDefinitions="140,*">
1522
<Grid.RowDefinitions>

0 commit comments

Comments
 (0)