style: ux improvement (#42)

This commit is contained in:
leo 2024-04-02 09:46:48 +08:00
parent 53bcafa5ed
commit 4dfbb0b2ba
7 changed files with 12 additions and 10 deletions

View file

@ -23,6 +23,7 @@
<StreamGeometry x:Key="Icons.Bookmark">M800 928l-512 0 0-704 224 0 0 292 113-86 111 86 0-292 128 0 0 640c0 35-29 64-64 64zM625 388l-81 64 0-260 160 0 0 260-79-64zM192 160l0 32c0 18 14 32 32 32l32 0 0 704-32 0c-35 0-64-29-64-64l0-704c0-35 29-64 64-64l576 0c24 0 44 13 55 32l-631 0c-18 0-32 14-32 32z</StreamGeometry> <StreamGeometry x:Key="Icons.Bookmark">M800 928l-512 0 0-704 224 0 0 292 113-86 111 86 0-292 128 0 0 640c0 35-29 64-64 64zM625 388l-81 64 0-260 160 0 0 260-79-64zM192 160l0 32c0 18 14 32 32 32l32 0 0 704-32 0c-35 0-64-29-64-64l0-704c0-35 29-64 64-64l576 0c24 0 44 13 55 32l-631 0c-18 0-32 14-32 32z</StreamGeometry>
<StreamGeometry x:Key="Icons.Folder">M64 864h896V288h-396a64 64 0 01-57-35L460 160H64v704zm-64 32V128a32 32 0 0132-32h448a32 32 0 0129 18L564 224H992a32 32 0 0132 32v640a32 32 0 01-32 32H32a32 32 0 01-32-32z</StreamGeometry> <StreamGeometry x:Key="Icons.Folder">M64 864h896V288h-396a64 64 0 01-57-35L460 160H64v704zm-64 32V128a32 32 0 0132-32h448a32 32 0 0129 18L564 224H992a32 32 0 0132 32v640a32 32 0 01-32 32H32a32 32 0 01-32-32z</StreamGeometry>
<StreamGeometry x:Key="Icons.Folder.Add">M1088 227H609L453 78a11 11 0 00-7-3H107a43 43 0 00-43 43v789a43 43 0 0043 43h981a43 43 0 0043-43V270a43 43 0 00-43-43zM757 599c0 5-5 9-10 9h-113v113c0 5-4 9-9 9h-56c-5 0-9-4-9-9V608h-113c-5 0-10-4-10-9V543c0-5 5-9 10-9h113V420c0-5 4-9 9-9h56c5 0 9 4 9 9V533h113c5 0 10 4 10 9v56z</StreamGeometry> <StreamGeometry x:Key="Icons.Folder.Add">M1088 227H609L453 78a11 11 0 00-7-3H107a43 43 0 00-43 43v789a43 43 0 0043 43h981a43 43 0 0043-43V270a43 43 0 00-43-43zM757 599c0 5-5 9-10 9h-113v113c0 5-4 9-9 9h-56c-5 0-9-4-9-9V608h-113c-5 0-10-4-10-9V543c0-5 5-9 10-9h113V420c0-5 4-9 9-9h56c5 0 9 4 9 9V533h113c5 0 10 4 10 9v56z</StreamGeometry>
<StreamGeometry x:Key="Icons.Folder.Add2">M960 784h-48v-48a48 48 0 10-96 0v48h-48a48 48 0 100 96h48v48a48 48 0 1096 0v-48h48a48 48 0 100-96zM0 816a48 48 0 0048 48h630A96 96 0 01672 832a96 96 0 0196-96 96 96 0 11192 0c25 0 47 10 64 25V304H0v512zm976-656H384L288 64H48a48 48 0 00-48 48v144h1024v-48a48 48 0 00-48-48z</StreamGeometry>
<StreamGeometry x:Key="Icons.Folder.Fill">M448 64l128 128h448v768H0V64z</StreamGeometry> <StreamGeometry x:Key="Icons.Folder.Fill">M448 64l128 128h448v768H0V64z</StreamGeometry>
<StreamGeometry x:Key="Icons.Folder.Open">M832 960l192-512H192L0 960zM128 384L0 960V128h288l128 128h416v128z</StreamGeometry> <StreamGeometry x:Key="Icons.Folder.Open">M832 960l192-512H192L0 960zM128 384L0 960V128h288l128 128h416v128z</StreamGeometry>
<StreamGeometry x:Key="Icons.File">M959 320H960v640A64 64 0 01896 1024H192A64 64 0 01128 960V64A64 64 0 01192 0H640v321h320L959 320zM320 544c0 17 14 32 32 32h384A32 32 0 00768 544c0-17-14-32-32-32H352A32 32 0 00320 544zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32z</StreamGeometry> <StreamGeometry x:Key="Icons.File">M959 320H960v640A64 64 0 01896 1024H192A64 64 0 01128 960V64A64 64 0 01192 0H640v321h320L959 320zM320 544c0 17 14 32 32 32h384A32 32 0 00768 544c0-17-14-32-32-32H352A32 32 0 00320 544zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32z</StreamGeometry>

View file

@ -3814,7 +3814,7 @@ namespace SourceGit.Resources {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to DRAG &amp; DROP FOLDER SUPPORTED. /// Looks up a localized string similar to DRAG &amp; DROP FOLDER SUPPORTED. CUSTOM GROUPING SUPPORTED..
/// </summary> /// </summary>
public static string Text_Welcome_DragDropTip { public static string Text_Welcome_DragDropTip {
get { get {

View file

@ -835,7 +835,7 @@
<value>Sort</value> <value>Sort</value>
</data> </data>
<data xml:space="preserve" name="Text.Welcome.DragDropTip"> <data xml:space="preserve" name="Text.Welcome.DragDropTip">
<value>DRAG &amp; DROP FOLDER SUPPORTED</value> <value>DRAG &amp; DROP FOLDER SUPPORTED. CUSTOM GROUPING SUPPORTED.</value>
</data> </data>
<data xml:space="preserve" name="Text.EditRepositoryNode.TitleForGroup"> <data xml:space="preserve" name="Text.EditRepositoryNode.TitleForGroup">
<value>Edit Selected Group</value> <value>Edit Selected Group</value>

View file

@ -835,7 +835,7 @@
<value>Sort</value> <value>Sort</value>
</data> </data>
<data xml:space="preserve" name="Text.Welcome.DragDropTip"> <data xml:space="preserve" name="Text.Welcome.DragDropTip">
<value>DRAG &amp; DROP FOLDER SUPPORTED</value> <value>DRAG &amp; DROP FOLDER SUPPORTED. CUSTOM GROUPING SUPPORTED.</value>
</data> </data>
<data xml:space="preserve" name="Text.EditRepositoryNode.TitleForGroup"> <data xml:space="preserve" name="Text.EditRepositoryNode.TitleForGroup">
<value>Edit Selected Group</value> <value>Edit Selected Group</value>

View file

@ -832,7 +832,7 @@
<value>排序</value> <value>排序</value>
</data> </data>
<data xml:space="preserve" name="Text.Welcome.DragDropTip"> <data xml:space="preserve" name="Text.Welcome.DragDropTip">
<value>支持拖放目录添加</value> <value>支持拖放目录添加。支持自定义分组。</value>
</data> </data>
<data xml:space="preserve" name="Text.EditRepositoryNode.TitleForGroup"> <data xml:space="preserve" name="Text.EditRepositoryNode.TitleForGroup">
<value>编辑分组</value> <value>编辑分组</value>

View file

@ -15,8 +15,9 @@
<Grid ColumnDefinitions="*,Auto,*"> <Grid ColumnDefinitions="*,Auto,*">
<StackPanel Grid.Column="0" Orientation="Horizontal" Margin="4,0,0,0"> <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="4,0,0,0">
<Button Classes="icon_button" Width="32" Command="{Binding OpenInFileManager}" ToolTip.Tip="{DynamicResource Text.Repository.Explore}"> <Button Classes="icon_button" Width="32" Command="{Binding OpenInFileManager}" ToolTip.Tip="{DynamicResource Text.Repository.Explore}">
<Path Width="15" Height="13" Data="{StaticResource Icons.Folder.Open}"/> <Path Width="15" Height="13" Data="{StaticResource Icons.Folder.Open}" Margin="0,1,0,0"/>
</Button> </Button>
<Button Classes="icon_button" Width="32" Command="{Binding OpenInTerminal}" ToolTip.Tip="{DynamicResource Text.Repository.Terminal}"> <Button Classes="icon_button" Width="32" Command="{Binding OpenInTerminal}" ToolTip.Tip="{DynamicResource Text.Repository.Terminal}">
<Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/> <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
</Button> </Button>
@ -38,13 +39,13 @@
</MenuFlyout> </MenuFlyout>
</Button.Flyout> </Button.Flyout>
</Button> </Button>
<ToggleButton Width="32" <ToggleButton Width="32"
Background="Transparent" Background="Transparent"
IsChecked="{Binding IsSearching, Mode=TwoWay}" IsChecked="{Binding IsSearching, Mode=TwoWay}"
ToolTip.Tip="{DynamicResource Text.Repository.Search}"> ToolTip.Tip="{DynamicResource Text.Repository.Search}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/> <Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/>
</ToggleButton> </ToggleButton>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal"> <StackPanel Grid.Column="1" Orientation="Horizontal">

View file

@ -11,14 +11,14 @@
<Grid RowDefinitions="36,*,36" Background="{DynamicResource Brush.Window}"> <Grid RowDefinitions="36,*,36" Background="{DynamicResource Brush.Window}">
<Border Grid.Row="0" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1" Background="{DynamicResource Brush.ToolBar}"> <Border Grid.Row="0" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1" Background="{DynamicResource Brush.ToolBar}">
<StackPanel Orientation="Horizontal" Margin="4,0,0,0"> <StackPanel Orientation="Horizontal" Margin="4,0,0,0">
<Button Classes="icon_button" Width="32" Click="OpenLocalRepository" ToolTip.Tip="{DynamicResource Text.Welcome.OpenOrInit}">
<Path Width="15" Height="13" Data="{StaticResource Icons.Folder.Open}"/>
</Button>
<Button Classes="icon_button" Width="32" Command="{Binding Clone}" CommandParameter="{Binding $parent[v:Launcher].DataContext}" ToolTip.Tip="{DynamicResource Text.Welcome.Clone}"> <Button Classes="icon_button" Width="32" Command="{Binding Clone}" CommandParameter="{Binding $parent[v:Launcher].DataContext}" ToolTip.Tip="{DynamicResource Text.Welcome.Clone}">
<Path Width="13" Height="13" Data="{StaticResource Icons.Pull}"/> <Path Width="13" Height="13" Data="{StaticResource Icons.Pull}"/>
</Button> </Button>
<Button Classes="icon_button" Width="32" Click="OpenLocalRepository" ToolTip.Tip="{DynamicResource Text.Welcome.OpenOrInit}">
<Path Width="16" Height="16" Data="{StaticResource Icons.Folder.Add2}" Margin="0,4,0,0"/>
</Button>
<Button Classes="icon_button" Width="32" Command="{Binding OpenTerminal}" ToolTip.Tip="{DynamicResource Text.Welcome.OpenTerminal}"> <Button Classes="icon_button" Width="32" Command="{Binding OpenTerminal}" ToolTip.Tip="{DynamicResource Text.Welcome.OpenTerminal}">
<Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/> <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
</Button> </Button>