Skip to content

Commit 90c0a7c

Browse files
committed
refactor: Mac icon
--story=1
1 parent abd9b1f commit 90c0a7c

File tree

6 files changed

+39
-13
lines changed

6 files changed

+39
-13
lines changed

src/ImeWlConverterMac/AppIcon.icns

469 KB
Binary file not shown.

src/ImeWlConverterMac/Views/ChineseConverterSelectWindow.axaml.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ public partial class ChineseConverterSelectWindow : Window
1010
public ChineseTranslate SelectedTranslate { get; private set; }
1111
public IChineseConverter? SelectedConverter { get; private set; }
1212

13+
public ChineseConverterSelectWindow()
14+
{
15+
InitializeComponent();
16+
SelectedTranslate = ChineseTranslate.NotTrans;
17+
LoadConfig();
18+
}
19+
1320
public ChineseConverterSelectWindow(ChineseTranslate currentTranslate, IChineseConverter? currentConverter)
1421
{
1522
InitializeComponent();

src/ImeWlConverterMac/Views/FilterConfigWindow.axaml.cs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ public partial class FilterConfigWindow : Window
88
{
99
public FilterConfig FilterConfig { get; private set; }
1010

11+
public FilterConfigWindow()
12+
{
13+
InitializeComponent();
14+
FilterConfig = new FilterConfig();
15+
LoadConfig();
16+
}
17+
1118
public FilterConfigWindow(FilterConfig filterConfig)
1219
{
1320
InitializeComponent();
@@ -52,11 +59,11 @@ private void LoadConfig()
5259

5360
private void BtnOK_Click(object? sender, RoutedEventArgs e)
5461
{
55-
FilterConfig.WordLengthFrom = (int)numWordLengthFrom.Value;
56-
FilterConfig.WordLengthTo = (int)numWordLengthTo.Value;
57-
FilterConfig.WordRankFrom = (int)numWordRankFrom.Value;
58-
FilterConfig.WordRankTo = (int)numWordRankTo.Value;
59-
FilterConfig.WordRankPercentage = (int)numWordRankPercentage.Value;
62+
FilterConfig.WordLengthFrom = (int)(numWordLengthFrom.Value ?? 0);
63+
FilterConfig.WordLengthTo = (int)(numWordLengthTo.Value ?? 0);
64+
FilterConfig.WordRankFrom = (int)(numWordRankFrom.Value ?? 0);
65+
FilterConfig.WordRankTo = (int)(numWordRankTo.Value ?? 0);
66+
FilterConfig.WordRankPercentage = (int)(numWordRankPercentage.Value ?? 0);
6067

6168
FilterConfig.IgnoreEnglish = cbxFilterEnglish.IsChecked ?? false;
6269
FilterConfig.IgnoreSpace = cbxFilterSpace.IsChecked ?? false;

src/ImeWlConverterMac/Views/MergeWLWindow.axaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private async void PerformMerge()
103103
{
104104
var mainWL = FileOperationHelper.ReadFile(txbMainWLFile.Text);
105105
var mainDict = ConvertTxt2Dictionary(mainWL);
106-
var userFiles = txbUserWLFiles.Text.Split('|');
106+
var userFiles = (txbUserWLFiles.Text ?? "").Split('|');
107107

108108
foreach (var userFile in userFiles)
109109
{

src/ImeWlConverterMac/Views/SplitFileWindow.axaml.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ private async void BtnSplit_Click(object? sender, RoutedEventArgs e)
6161
await Task.Run(() =>
6262
{
6363
if (rbtnSplitByLine.IsChecked == true)
64-
SplitFileByLine((int)numdMaxLine.Value);
64+
SplitFileByLine((int)(numdMaxLine.Value ?? 0));
6565
else if (rbtnSplitBySize.IsChecked == true)
66-
SplitFileBySize((int)numdMaxSize.Value);
66+
SplitFileBySize((int)(numdMaxSize.Value ?? 0));
6767
else
68-
SplitFileByLength((int)numdMaxLength.Value);
68+
SplitFileByLength((int)(numdMaxLength.Value ?? 0));
6969
});
7070

7171
await ShowMessage("恭喜你,文件分割完成!", "分割");
@@ -131,12 +131,17 @@ private void SplitFileBySize(int maxSize)
131131
var fileIndex = 1;
132132
var size = (maxSize - 10) * 1024; // 10K的Buffer
133133

134-
using var inFile = new FileStream(txbFilePath.Text, FileMode.Open, FileAccess.Read);
134+
using var inFile = new FileStream(txbFilePath.Text!, FileMode.Open, FileAccess.Read);
135135

136136
do
137137
{
138138
var newFile = GetWriteFilePath(fileIndex++);
139-
using var outFile = new FileStream(newFile, FileMode.OpenOrCreate, FileAccess.Write);
139+
if (string.IsNullOrEmpty(newFile))
140+
{
141+
AppendLog("无法生成有效的文件路径");
142+
return;
143+
}
144+
using var outFile = new FileStream(newFile!, FileMode.OpenOrCreate, FileAccess.Write);
140145

141146
if (fileIndex != 2) // 不是第一个文件,那么就要写文件头
142147
FileOperationHelper.WriteFileHeader(outFile, encoding);

src/ImeWlConverterMac/Views/WordRankGenerateWindow.axaml.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ public partial class WordRankGenerateWindow : Window
88
{
99
public IWordRankGenerater WordRankGenerater { get; private set; }
1010

11+
public WordRankGenerateWindow()
12+
{
13+
InitializeComponent();
14+
WordRankGenerater = new DefaultWordRankGenerater();
15+
LoadConfig();
16+
}
17+
1118
public WordRankGenerateWindow(IWordRankGenerater currentGenerater)
1219
{
1320
InitializeComponent();
@@ -20,7 +27,7 @@ private void LoadConfig()
2027
if (WordRankGenerater is DefaultWordRankGenerater defaultGen)
2128
{
2229
rbtnDefault.IsChecked = true;
23-
numRank.Value = defaultGen.Rank;
30+
numRank.Value = (int)defaultGen.Rank;
2431
}
2532
else if (WordRankGenerater is GoogleWordRankGenerater)
2633
{
@@ -42,7 +49,7 @@ private void BtnOK_Click(object? sender, RoutedEventArgs e)
4249
{
4350
if (rbtnDefault.IsChecked == true)
4451
{
45-
WordRankGenerater = new DefaultWordRankGenerater { Rank = (int)numRank.Value };
52+
WordRankGenerater = new DefaultWordRankGenerater { Rank = (int)(numRank.Value ?? 0) };
4653
}
4754
else if (rbtnGoogle.IsChecked == true)
4855
{

0 commit comments

Comments
 (0)