michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ux: style for squash popup

Browse source
This commit is contained in:
leo 2024-08-25 21:45:37 +08:00
parent 184c89ea1d
commit a42412c732
No known key found for this signature in database
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Resources/Locales/en_US.axaml
View file

@ -533,6 +533,7 @@
<x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">Software Update</x:String> <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">Software Update</x:String>
<x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">There are currently no updates available.</x:String> <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">There are currently no updates available.</x:String>
<x:String x:Key="Text.Squash" xml:space="preserve">Squash Commits</x:String> <x:String x:Key="Text.Squash" xml:space="preserve">Squash Commits</x:String>
<x:String x:Key="Text.Squash.Into" xml:space="preserve">Into:</x:String>
<x:String x:Key="Text.SSHKey" xml:space="preserve">SSH Private Key:</x:String> <x:String x:Key="Text.SSHKey" xml:space="preserve">SSH Private Key:</x:String>
<x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Private SSH key store path</x:String> <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">Private SSH key store path</x:String>
<x:String x:Key="Text.Start" xml:space="preserve">START</x:String> <x:String x:Key="Text.Start" xml:space="preserve">START</x:String>

1
src/Resources/Locales/zh_CN.axaml
View file

@ -535,6 +535,7 @@
<x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">软件更新</x:String> <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">软件更新</x:String>
<x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">当前已是最新版本。</x:String> <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">当前已是最新版本。</x:String>
<x:String x:Key="Text.Squash" xml:space="preserve">压缩为单个提交</x:String> <x:String x:Key="Text.Squash" xml:space="preserve">压缩为单个提交</x:String>
<x:String x:Key="Text.Squash.Into" xml:space="preserve">合并入：</x:String>
<x:String x:Key="Text.SSHKey" xml:space="preserve">SSH密钥 ：</x:String> <x:String x:Key="Text.SSHKey" xml:space="preserve">SSH密钥 ：</x:String>
<x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">SSH密钥文件</x:String> <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">SSH密钥文件</x:String>
<x:String x:Key="Text.Start" xml:space="preserve">开 始</x:String> <x:String x:Key="Text.Start" xml:space="preserve">开 始</x:String>

1
src/Resources/Locales/zh_TW.axaml
View file

@ -536,6 +536,7 @@
<x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">軟體更新</x:String> <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">軟體更新</x:String>
<x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">目前已是最新版本。</x:String> <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">目前已是最新版本。</x:String>
<x:String x:Key="Text.Squash" xml:space="preserve">壓縮為單個提交</x:String> <x:String x:Key="Text.Squash" xml:space="preserve">壓縮為單個提交</x:String>
<x:String x:Key="Text.Squash.Into" xml:space="preserve">合併入:</x:String>
<x:String x:Key="Text.SSHKey" xml:space="preserve">SSH 金鑰:</x:String> <x:String x:Key="Text.SSHKey" xml:space="preserve">SSH 金鑰:</x:String>
<x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">SSH 金鑰檔案</x:String> <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">SSH 金鑰檔案</x:String>
<x:String x:Key="Text.Start" xml:space="preserve">開 始</x:String> <x:String x:Key="Text.Start" xml:space="preserve">開 始</x:String>

12
src/Views/Squash.axaml
View file

@ -13,17 +13,19 @@
Classes="bold" Classes="bold"
Text="{DynamicResource Text.Squash}"/> Text="{DynamicResource Text.Squash}"/>
<Grid Margin="0,18,0,0" ColumnDefinitions="Auto,Auto,*"> <Grid Margin="0,18,0,0" ColumnDefinitions="Auto,Auto,Auto,*">
<Path Grid.Column="0" <TextBlock Grid.Column="0"
Margin="2,6,8,0" Text="{DynamicResource Text.Squash.Into}"/>
<Path Grid.Column="1"
Margin="8,6,8,0"
Width="14" Height="14" Width="14" Height="14"
Fill="{DynamicResource Brush.FG1}" Fill="{DynamicResource Brush.FG1}"
Data="{StaticResource Icons.Commit}"/> Data="{StaticResource Icons.Commit}"/>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="2"
Classes="primary" Classes="primary"
Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
Foreground="DarkOrange"/> Foreground="DarkOrange"/>
<TextBlock Grid.Column="2" Margin="8,0,0,0" Text="{Binding Target.Subject}" TextTrimming="CharacterEllipsis"/> <TextBlock Grid.Column="3" Margin="8,0,0,0" Text="{Binding Target.Subject}" TextTrimming="CharacterEllipsis"/>
</Grid> </Grid>
<v:CommitMessageTextBox Height="120" Margin="0,4,0,0" Text="{Binding Message, Mode=TwoWay}"/> <v:CommitMessageTextBox Height="120" Margin="0,4,0,0" Text="{Binding Message, Mode=TwoWay}"/>