update<Icons>: update icons

This commit is contained in:
leo 2021-05-14 10:20:49 +08:00
parent b9b2dbac7c
commit dce61bf4bb
5 changed files with 24 additions and 17 deletions

View file

@ -9,12 +9,9 @@
<Geometry x:Key="Icon.NewTab">M490.7 85.3l42.7 0 0 853.3-42.7 0 0-853.3zM85.3 490.7l853.3 0 0 42.7-853.3 0 0-42.7z</Geometry>
<Geometry x:Key="Icon.Copy">M682.7 42.7H85.3v682.7h85.3V128h512V42.7zM256 213.3l4.5 768H896V213.3H256zm554.7 682.7H341.3V298.7h469.3v597.3z</Geometry>
<Geometry x:Key="Icon.ScrollLeft">M75 100 27 51 76 3z</Geometry>
<Geometry x:Key="Icon.ScrollRight">M27 3 L 75 51 L 27 100z</Geometry>
<Geometry x:Key="Icon.Minimize">M256 811h512v85H256z</Geometry>
<Geometry x:Key="Icon.Maximize">M832 832H192V192h640v640zm50-690H142v740h740V142z</Geometry>
<Geometry x:Key="Icon.Close">M964 27l46 46-425 424 425 425-46 46-425-425-424 425-46-46 425-425L69 74l46-46L540 452l425-424z</Geometry>
<Geometry x:Key="Icon.Maximize">M922 205v614H154V205h768zm-51 51H205v512h666V256z</Geometry>
<Geometry x:Key="Icon.Close">M899 203 821 125 512 434 203 125 125 203 434 512 125 821 203 899 512 590 821 899 899 821 590 512z</Geometry>
<Geometry x:Key="Icon.Check">M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z</Geometry>
<Geometry x:Key="Icon.Loading">M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z</Geometry>
<Geometry x:Key="Icon.Search">M702 677 590 565a148 148 0 10-25 27L676 703zm-346-200a115 115 0 11115 115A115 115 0 01355 478z</Geometry>
@ -30,9 +27,9 @@
<Geometry x:Key="Icon.DoubleDown">M256 224l0 115L512 544l256-205 0-115-256 205L256 224zM512 685l-256-205L256 595 512 800 768 595l0-115L512 685z</Geometry>
<Geometry x:Key="Icon.Up">M170 831l343-342L855 831l105-105-448-448L64 726 170 831z</Geometry>
<Geometry x:Key="Icon.DoubleUp">M768 800V685L512 480 256 685V800l256-205L768 800zM512 339 768 544V429L512 224 256 429V544l256-205z</Geometry>
<Geometry x:Key="Icon.SplitHorizontal">M73 1024H1024V658h-73v293H73V658H0V1024h73zM0 0v366h73V73H951V0H0zm951 366V0H1024v366h-73zM0 549v-73h1024v73H0z</Geometry>
<Geometry x:Key="Icon.SplitVertical">M0 73V1024h366v-73H73V73h293V0H0v73zM1024 0H658v73h293V951H1024V0zM658 951H1024V1024H658v-73zM475 0h73v1024h-73V0z</Geometry>
<Geometry x:Key="Icon.Orientation">M1231 0v372H120V0zM1352 484v56H0v-56zM1147 939H205V737h942v203M1231 1024V652H120V1024z</Geometry>
<Geometry x:Key="Icon.ScrollLeft">M75 100 27 51 76 3z</Geometry>
<Geometry x:Key="Icon.ScrollRight">M27 3 L 75 51 L 27 100z</Geometry>
<Geometry x:Key="Icon.Preference">M716.3 383.1c0 38.4-6.5 76-19.4 111.8l-10.7 29.7 229.6 229.5c44.5 44.6 44.5 117.1 0 161.6a113.6 113.6 0 01-80.8 33.5a113.6 113.6 0 01-80.8-33.5L529 694l-32 13a331.6 331.6 0 01-111.9 19.4A333.5 333.5 0 0150 383.1c0-39 6.8-77.2 20-113.6L285 482l194-195-214-210A331 331 0 01383.1 50A333.5 333.5 0 01716.3 383.1zM231.6 31.6l-22.9 9.9a22.2 22.2 0 00-5.9 4.2a19.5 19.5 0 000 27.5l215 215.2L288.4 417.8 77.8 207.1a26 26 0 00-17.2-7.1a22.8 22.8 0 00-21.5 15a400.5 400.5 0 00-7.5 16.6A381.6 381.6 0 000 384c0 211.7 172.2 384 384 384c44.3 0 87.6-7.5 129-22.3L743.1 975.8A163.5 163.5 0 00859.5 1024c43.9 0 85.3-17.1 116.4-48.2a164.8 164.8 0 000-233L745.5 513C760.5 471.5 768 428 768 384C768 172 596 0 384 0c-53 0-104 10.5-152.5 31.5z</Geometry>
<Geometry x:Key="Icon.Setting">M925.9 1023.9H308.5L0 511.6 308.5 0h617.3L1234.1 511.6 925.9 1023.9zM867.7 102.5H366.8L120 511.6l246.8 409.9h500.8l246.5-409.8-246.5-409.2zM617.1 717.3c-113.6 0-205.6-91.7-205.6-204.9c0-113.2 92.1-205 205.6-205h.1c113.6 0 205.7 91.8 205.6 205c0 113.2-92.1 204.9-205.7 204.9zm0-333h-.1c-71 0-128.5 57.4-128.5 128.2c0 70.7 57.6 128.1 128.6 128c70.9 0 128.5-57.3 128.5-128c0-70.8-57.5-128.1-128.5-128.2z</Geometry>
@ -54,7 +51,7 @@
<Geometry x:Key="Icon.Flow">M509 556l93 149h124l-80-79 49-50 165 164-165 163-49-50 79-79h-163l-96-153 41-65zm187-395 165 164-165 163-49-50L726 360H530l-136 224H140v-70h215l136-224h236l-80-79 49-50z</Geometry>
<Geometry x:Key="Icon.Commit">M796 471A292 292 0 00512 256a293 293 0 00-284 215H0v144h228A293 293 0 00512 832a291 291 0 00284-217H1024V471h-228M512 688A146 146 0 01366 544A145 145 0 01512 400c80 0 146 63 146 144A146 146 0 01512 688</Geometry>
<Geometry x:Key="Icon.WorkingCopy">M0 586l404 119 498-410-386 441-2 251 155-205 279 83L1170 37z</Geometry>
<Geometry x:Key="Icon.Send">M0 586l404 119 498-410-386 441-2 251 155-205 279 83L1170 37z</Geometry>
<Geometry x:Key="Icon.Histories">M24 512A488 488 0 01512 24A488 488 0 011000 512A488 488 0 01512 1000A488 488 0 0124 512zm447-325v327L243 619l51 111 300-138V187H471z</Geometry>
<Geometry x:Key="Icon.Stashes">M715 254h-405l-58 57h520zm-492 86v201h578V340zm405 143h-29v-29H425v29h-29v-57h231v57zm-405 295h578V559H223zm174-133h231v57h-29v-29H425v29h-29v-57z</Geometry>
<Geometry x:Key="Icon.Branch">M869 145a145 145 0 10-289 0c0 56 33 107 83 131c-5 96-77 128-201 175c-52 20-110 42-160 74V276A144 144 0 00242 0a145 145 0 00-145 145c0 58 35 108 84 131v461a144 144 0 00-84 131a145 145 0 10289 0a144 144 0 00-84-131c5-95 77-128 201-175c122-46 274-103 280-287a145 145 0 0085-132zM242 61a83 83 0 110 167a83 83 0 010-167zm0 891a84 84 0 110-167a84 84 0 010 167zM724 228a84 84 0 110-167a84 84 0 010 167z</Geometry>

View file

@ -89,16 +89,25 @@
<Grid Background="Transparent">
<Path
x:Name="Icon"
Style="{DynamicResource Style.Icon}"
Height="{TemplateBinding Width}"
Width="{TemplateBinding Height}"
Style="{DynamicResource Style.Icon}"
Fill="{TemplateBinding Foreground}"
Data="{DynamicResource Icon.SplitVertical}"/>
Data="{DynamicResource Icon.Orientation}"
RenderTransformOrigin=".5,.5">
<Path.RenderTransform>
<RotateTransform Angle="270"/>
</Path.RenderTransform>
</Path>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="Icon" Property="Data" Value="{DynamicResource Icon.SplitHorizontal}"/>
<Setter TargetName="Icon" Property="RenderTransform">
<Setter.Value>
<RotateTransform Angle="0"/>
</Setter.Value>
</Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>

View file

@ -11,7 +11,7 @@ namespace SourceGit.Views.Converters {
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
throw new NotImplementedException();
return !(bool)value;
}
}
}

View file

@ -132,7 +132,7 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Path Grid.Column="0" Width="16" Height="16" Data="{StaticResource Icon.WorkingCopy}"/>
<Path Grid.Column="0" Width="16" Height="16" Data="{StaticResource Icon.Send}"/>
<TextBlock Grid.Column="1" Margin="8,0,0,0" Text="{StaticResource Text.WorkingCopy}"/>
<controls:Badge Grid.Column="2" Margin="4,0" x:Name="badgeLocalChanges"/>
</Grid>

View file

@ -12,6 +12,7 @@
<Grid x:Name="layout">
<Grid.Resources>
<converters:BoolToCollapsed x:Key="BoolToCollapsed"/>
<converters:InverseBool x:Key="InverseBool"/>
</Grid.Resources>
<Border x:Name="commitListPanel" Background="{StaticResource Brush.Contents}">
@ -182,9 +183,9 @@
<ToggleButton
Style="{StaticResource Style.ToggleButton.SplitDirection}"
Foreground="{StaticResource Brush.FG2}"
Width="14" Height="14"
Width="16" Height="16"
ToolTip="{StaticResource Text.Histories.DisplayMode}"
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Window.MoveCommitInfoRight, Mode=TwoWay}"
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Window.MoveCommitInfoRight, Mode=TwoWay, Converter={StaticResource InverseBool}}"
Checked="ChangeOrientation" Unchecked="ChangeOrientation"/>
<controls:IconButton