Skip to content

Commit a7fb690

Browse files
committed
ux: change the icon of Apply Patch
Signed-off-by: leo <longshuang@msn.cn>
1 parent 9635b83 commit a7fb690

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/Resources/Icons.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
22
<StreamGeometry x:Key="Icons.Action">M41 512c0-128 46-241 138-333C271 87 384 41 512 41s241 46 333 138c92 92 138 205 138 333s-46 241-138 333c-92 92-205 138-333 138s-241-46-333-138C87 753 41 640 41 512zm87 0c0 108 36 195 113 271s164 113 271 113c108 0 195-36 271-113s113-164 113-271-36-195-113-271c-77-77-164-113-271-113-108 0-195 36-271 113C164 317 128 404 128 512zm256 148V292l195 113L768 512l-195 113-195 113v-77zm148-113-61 36V440l61 36 61 36-61 36z</StreamGeometry>
33
<StreamGeometry x:Key="Icons.AIAssist">M304 464a128 128 0 01128-128c71 0 128 57 128 128v224a32 32 0 01-64 0V592h-128v95a32 32 0 01-64 0v-224zm64 1v64h128v-64a64 64 0 00-64-64c-35 0-64 29-64 64zM688 337c18 0 32 14 32 32v319a32 32 0 01-32 32c-18 0-32-14-32-32v-319a32 32 0 0132-32zM84 911l60-143A446 446 0 0164 512C64 265 265 64 512 64s448 201 448 448-201 448-448 448c-54 0-105-9-153-27l-242 22a32 32 0 01-32-44zm133-150-53 126 203-18 13 5c41 15 85 23 131 23 212 0 384-172 384-384S724 128 512 128 128 300 128 512c0 82 26 157 69 220l20 29z</StreamGeometry>
4+
<StreamGeometry x:Key="Icons.ApplyPatch">M233 163h560c11 0 20-9 20-20V63h-226c-6-36-37-63-74-63s-68 27-74 63h-226v80c0 11 9 20 20 20zM883 63h-10v112c0 33-27 60-60 60h-600c-33 0-60-27-60-60V63h-10c-44 0-80 36-80 80v801c0 44 36 80 80 80h740c44 0 80-36 80-80V143c0-44-36-80-80-80zm-720 469c0-24 20-44 44-44h62v-72c0-24 20-44 44-44s44 20 44 44v72h62c24 0 44 20 44 44s-20 44-44 44h-62v72c0 24-20 44-44 44s-44-20-44-44v-72h-62c-24 0-44-20-44-44zm700 307c0 24-20 44-44 44h-612c-24 0-44-20-44-44s20-44 44-44h612c24 0 44 20 44 44zm0-191c0 24-20 44-44 44h-232c-24 0-44-20-44-44s20-44 44-44h232c24 0 44 20 44 44zm0-191c0 24-20 44-44 44h-162c-24 0-44-20-44-44s20-44 44-44h162c24 0 44 20 44 44z</StreamGeometry>
45
<StreamGeometry x:Key="Icons.Archive">M366 146l293 0 0-73-293 0 0 73zm658 366 0 274q0 38-27 65t-65 27l-841 0q-38 0-65-27t-27-65l0-274 384 0 0 91q0 15 11 26t26 11l183 0q15 0 26-11t11-26l0-91 384 0zm-439 0 0 73-146 0 0-73 146 0zm439-274 0 219-1024 0 0-219q0-38 27-65t65-27l201 0 0-91q0-23 16-39t39-16l329 0q23 0 39 16t16 39l0 91 201 0q38 0 65 27t27 65z</StreamGeometry>
56
<StreamGeometry x:Key="Icons.AutoFetch">M567 192C385 192 238 335 238 512H128l142 138 3 5L421 512H311c0-138 114-249 256-249s256 111 256 249c0 138-114 249-256 249a258 258 0 01-181-73l-52 51A332 332 0 00567 832C749 832 896 689 896 512S749 192 567 192zm-37 178v178l155 90 28-46-129-74v-148H530z</StreamGeometry>
67
<StreamGeometry x:Key="Icons.Bad">M851 755q0 23-16 39l-78 78q-16 16-39 16t-39-16l-168-168-168 168q-16 16-39 16t-39-16l-78-78q-16-16-16-39t16-39l168-168-168-168q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 168 168-168q16-16 39-16t39 16l78 78q16 16 16 39t-16 39l-168 168 168 168q16 16 16 39z</StreamGeometry>

src/Resources/Locales/en_US.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<x:String x:Key="Text.App.Hide" xml:space="preserve">Hide SourceGit</x:String>
2727
<x:String x:Key="Text.App.HideOthers" xml:space="preserve">Hide Others</x:String>
2828
<x:String x:Key="Text.App.ShowAll" xml:space="preserve">Show All</x:String>
29-
<x:String x:Key="Text.Apply" xml:space="preserve">Patch</x:String>
3029
<x:String x:Key="Text.Apply.3Way" xml:space="preserve">3-Way Merge</x:String>
3130
<x:String x:Key="Text.Apply.File" xml:space="preserve">Patch File:</x:String>
3231
<x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Select .patch file to apply</x:String>

src/ViewModels/RepositoryCommandPalette.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public RepositoryCommandPalette(Repository repo)
7272
_cmds.Add(new("Pull.Title", "pull", "Pull", async () => await repo.PullAsync(false)));
7373
_cmds.Add(new("Push", "push", "Push", async () => await repo.PushAsync(false)));
7474
_cmds.Add(new("Stash.Title", "stash", "Stashes.Add", async () => await repo.StashAllAsync(false)));
75-
_cmds.Add(new("Apply.Title", "apply", "Diff", () => repo.ApplyPatch()));
75+
_cmds.Add(new("Apply.Title", "apply", "ApplyPatch", () => repo.ApplyPatch()));
7676

7777
_cmds.Sort((l, r) => l.Label.CompareTo(r.Label));
7878
_visibleCmds = _cmds;

src/Views/Apply.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<StackPanel Orientation="Vertical" Margin="8,0">
1111
<StackPanel Orientation="Horizontal">
1212
<Path Width="16" Height="16"
13-
Data="{StaticResource Icons.Diff}"/>
13+
Data="{StaticResource Icons.ApplyPatch}"/>
1414

1515
<TextBlock FontSize="18"
1616
Margin="8,0,0,0"

src/Views/RepositoryToolbar.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<Path Width="14" Height="14" Data="{StaticResource Icons.Stashes.Add}"/>
7272
</Button>
7373

74-
<Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding ApplyPatch}" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Apply}">
75-
<Path Width="14" Height="14" Data="{StaticResource Icons.Diff}"/>
74+
<Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding ApplyPatch}" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Apply.Title}">
75+
<Path Width="14" Height="14" Data="{StaticResource Icons.ApplyPatch}"/>
7676
</Button>
7777

7878
<Rectangle Width="1" Height="16"

0 commit comments

Comments
 (0)