Skip to content

Commit bab1a57

Browse files
committed
refactor: using x:Int32 and x:String instead of custom types
1 parent 81331d1 commit bab1a57

File tree

4 files changed

+23
-29
lines changed

4 files changed

+23
-29
lines changed

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
<x:String x:Key="Text.DiffWithMerger" xml:space="preserve">使用外部比对工具查看</x:String>
198198
<x:String x:Key="Text.Discard" xml:space="preserve">放弃更改确认</x:String>
199199
<x:String x:Key="Text.Discard.All" xml:space="preserve">所有本地址未提交的修改。</x:String>
200-
<x:String x:Key="Text.Discard.Changes" xml:space="preserve">需要放弃的变更 :</x:String>
200+
<x:String x:Key="Text.Discard.Changes" xml:space="preserve">变更 :</x:String>
201201
<x:String x:Key="Text.Discard.Total" xml:space="preserve">总计{0}项选中更改</x:String>
202202
<x:String x:Key="Text.Discard.Warning" xml:space="preserve">本操作不支持回退,请确认后继续!!!</x:String>
203203
<x:String x:Key="Text.EditRepositoryNode.Bookmark" xml:space="preserve">书签 :</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
<x:String x:Key="Text.DiffWithMerger" xml:space="preserve">使用外部比對工具檢視</x:String>
198198
<x:String x:Key="Text.Discard" xml:space="preserve">放棄更改確認</x:String>
199199
<x:String x:Key="Text.Discard.All" xml:space="preserve">所有本地址未提交的修改。</x:String>
200-
<x:String x:Key="Text.Discard.Changes" xml:space="preserve">需要放棄的變更 :</x:String>
200+
<x:String x:Key="Text.Discard.Changes" xml:space="preserve">變更 :</x:String>
201201
<x:String x:Key="Text.Discard.Total" xml:space="preserve">總計{0}項選中更改</x:String>
202202
<x:String x:Key="Text.Discard.Warning" xml:space="preserve">本操作不支援回退,請確認後繼續!!!</x:String>
203203
<x:String x:Key="Text.EditRepositoryNode.Bookmark" xml:space="preserve">書籤 :</x:String>

src/ViewModels/Discard.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
namespace SourceGit.ViewModels
55
{
6-
public class DiscardModeAll { }
7-
public class DiscardModeSingle { public string File { get; set; } }
8-
public class DiscardModeMulti { public int Count { get; set; } }
9-
106
public class Discard : Popup
117
{
128
public object Mode
@@ -19,7 +15,7 @@ public Discard(Repository repo)
1915
{
2016
_repo = repo;
2117

22-
Mode = new DiscardModeAll();
18+
Mode = null;
2319
View = new Views.Discard { DataContext = this };
2420
}
2521

@@ -30,17 +26,11 @@ public Discard(Repository repo, List<Models.Change> changes, bool isUnstaged)
3026
_isUnstaged = isUnstaged;
3127

3228
if (_changes == null)
33-
{
34-
Mode = new DiscardModeAll();
35-
}
29+
Mode = null;
3630
else if (_changes.Count == 1)
37-
{
38-
Mode = new DiscardModeSingle() { File = _changes[0].Path };
39-
}
31+
Mode = _changes[0].Path;
4032
else
41-
{
42-
Mode = new DiscardModeMulti() { Count = _changes.Count };
43-
}
33+
Mode = _changes.Count;
4434

4535
View = new Views.Discard() { DataContext = this };
4636
}

src/Views/Discard.axaml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,32 @@
1212
Classes="bold"
1313
Text="{DynamicResource Text.Discard}"/>
1414

15-
<Grid Margin="0,16,0,8" RowDefinitions="32,32" ColumnDefinitions="150,*">
15+
<Grid Margin="0,16,0,8" RowDefinitions="32,32" ColumnDefinitions="120,*">
1616
<TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,8,0" HorizontalAlignment="Right" Text="{DynamicResource Text.Discard.Changes}"/>
17-
<ContentControl Grid.Row="0" Grid.Column="1" Content="{Binding Mode}">
18-
<ContentControl.DataTemplates>
19-
<DataTemplate DataType="vm:DiscardModeAll">
20-
<StackPanel Orientation="Horizontal">
21-
<Path Width="12" Height="12" Margin="0,2,0,0" Data="{StaticResource Icons.Folder.Open}"/>
22-
<TextBlock Text="{DynamicResource Text.Discard.All}" Margin="4,0,0,0"/>
23-
</StackPanel>
24-
</DataTemplate>
17+
<ContentControl Grid.Row="0" Grid.Column="1">
18+
<ContentControl.Content>
19+
<Binding Path="Mode">
20+
<Binding.TargetNullValue>
21+
<StackPanel Orientation="Horizontal">
22+
<Path Width="12" Height="12" Margin="0,2,0,0" Data="{StaticResource Icons.Folder.Open}"/>
23+
<TextBlock Text="{DynamicResource Text.Discard.All}" Margin="4,0,0,0"/>
24+
</StackPanel>
25+
</Binding.TargetNullValue>
26+
</Binding>
27+
</ContentControl.Content>
2528

26-
<DataTemplate DataType="vm:DiscardModeSingle">
29+
<ContentControl.DataTemplates>
30+
<DataTemplate DataType="x:String">
2731
<StackPanel Orientation="Horizontal">
2832
<Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
29-
<TextBlock Text="{Binding File}" Margin="4,0,0,0"/>
33+
<TextBlock Text="{Binding}" Margin="4,0,0,0"/>
3034
</StackPanel>
3135
</DataTemplate>
3236

33-
<DataTemplate DataType="vm:DiscardModeMulti">
37+
<DataTemplate DataType="x:Int32">
3438
<StackPanel Orientation="Horizontal">
3539
<Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
36-
<TextBlock Text="{Binding Count, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Discard.Total'}" Margin="4,0,0,0"/>
40+
<TextBlock Text="{Binding, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Discard.Total'}" Margin="4,0,0,0"/>
3741
</StackPanel>
3842
</DataTemplate>
3943
</ContentControl.DataTemplates>

0 commit comments

Comments
 (0)