Skip to content

Commit f8bc022

Browse files
committed
ux: clarify Delete operation for tree node in welcome page (#957)
Signed-off-by: leo <[email protected]>
1 parent 12597fd commit f8bc022

File tree

4 files changed

+37
-4
lines changed

4 files changed

+37
-4
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,11 @@
228228
<x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">You are trying to delete multiple branches at one time. Be sure to double-check before taking action!</x:String>
229229
<x:String x:Key="Text.DeleteRemote" xml:space="preserve">Delete Remote</x:String>
230230
<x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">Remote:</x:String>
231+
<x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">Path:</x:String>
231232
<x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Target:</x:String>
233+
<x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">All children will be removed from list.</x:String>
232234
<x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">Confirm Deleting Group</x:String>
235+
<x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">This will only remove it from list, not from disk!</x:String>
233236
<x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">Confirm Deleting Repository</x:String>
234237
<x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">Delete Submodule</x:String>
235238
<x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">Submodule Path:</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,11 @@
231231
<x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">您正在尝试一次性删除多个分支,请务必仔细检查后再执行操作!</x:String>
232232
<x:String x:Key="Text.DeleteRemote" xml:space="preserve">删除远程确认</x:String>
233233
<x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">远程名 :</x:String>
234+
<x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">路径 :</x:String>
234235
<x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">目标 :</x:String>
236+
<x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">所有子节点将被同时从列表中移除。</x:String>
235237
<x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">删除分组确认</x:String>
238+
<x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">仅从列表中移除,不会删除硬盘中的文件!</x:String>
236239
<x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">删除仓库确认</x:String>
237240
<x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">删除子模块确认</x:String>
238241
<x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">子模块路径 :</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,11 @@
231231
<x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">您正在嘗試一次性刪除多個分支,請務必仔細檢查後再刪除!</x:String>
232232
<x:String x:Key="Text.DeleteRemote" xml:space="preserve">刪除遠端確認</x:String>
233233
<x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">遠端名稱:</x:String>
234+
<x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">路徑:</x:String>
234235
<x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">目標:</x:String>
236+
<x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">所有子節點都會從清單中移除。</x:String>
235237
<x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">刪除群組確認</x:String>
238+
<x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">只會從清單中移除,而不會刪除磁碟中的檔案!</x:String>
236239
<x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">刪除存放庫確認</x:String>
237240
<x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">刪除子模組確認</x:String>
238241
<x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">子模組路徑:</x:String>

src/Views/DeleteRepositoryNode.axaml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
Text="{DynamicResource Text.DeleteRepositoryNode.TitleForRepository}"
1818
IsVisible="{Binding Node.IsRepository}"/>
1919

20-
<Grid Margin="0,16,8,0" Height="28" ColumnDefinitions="120,*">
21-
<TextBlock Grid.Column="0"
20+
<Grid Margin="0,16,8,0" RowDefinitions="32,Auto,32" ColumnDefinitions="120,*">
21+
<TextBlock Grid.Row="0" Grid.Column="0"
2222
HorizontalAlignment="Right" VerticalAlignment="Center"
2323
Margin="0,0,8,0"
2424
Text="{DynamicResource Text.DeleteRepositoryNode.Target}"/>
25-
<StackPanel Grid.Column="1" Orientation="Horizontal">
25+
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
2626
<Path Width="12" Height="12" Margin="0,0,8,0"
2727
Fill="{Binding Node.Bookmark, Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
2828
HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -35,8 +35,32 @@
3535
IsVisible="{Binding !Node.IsRepository}"/>
3636

3737
<TextBlock VerticalAlignment="Center" Text="{Binding Node.Name}"/>
38-
<TextBlock Margin="8,0" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Node.Id}" IsVisible="{Binding Node.IsRepository}"/>
3938
</StackPanel>
39+
40+
<TextBlock Grid.Row="1" Grid.Column="0"
41+
HorizontalAlignment="Right" VerticalAlignment="Center"
42+
Margin="0,0,8,0"
43+
Text="{DynamicResource Text.DeleteRepositoryNode.Path}"
44+
IsVisible="{Binding Node.IsRepository}"/>
45+
<StackPanel Grid.Row="1" Grid.Column="1" Height="32" Orientation="Horizontal" IsVisible="{Binding Node.IsRepository}">
46+
<Path Width="12" Height="12"
47+
Margin="0,0,8,0"
48+
Fill="{DynamicResource Brush.FG1}"
49+
HorizontalAlignment="Left" VerticalAlignment="Center"
50+
Data="{StaticResource Icons.Folder}"/>
51+
<TextBlock Text="{Binding Node.Id}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
52+
</StackPanel>
53+
54+
<Grid Grid.Row="2" Grid.Column="1">
55+
<TextBlock Text="{DynamicResource Text.DeleteRepositoryNode.TipForRepository}"
56+
TextWrapping="Wrap"
57+
Foreground="{DynamicResource Brush.FG2}"
58+
IsVisible="{Binding Node.IsRepository}"/>
59+
<TextBlock Text="{DynamicResource Text.DeleteRepositoryNode.TipForGroup}"
60+
TextWrapping="Wrap"
61+
Foreground="{DynamicResource Brush.FG2}"
62+
IsVisible="{Binding !Node.IsRepository}"/>
63+
</Grid>
4064
</Grid>
4165
</StackPanel>
4266
</UserControl>

0 commit comments

Comments
 (0)