Skip to content

Commit 76fd488

Browse files
committed
Update
1. 修复文本框内容的清空与显示 2. 标注或生词本为空时不显示全选
1 parent 37ed361 commit 76fd488

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

KindleMate2/FrmMain.cs

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -378,16 +378,19 @@ private void UpdateFrequency() {
378378

379379
private void RefreshData(bool isReQuery = true) {
380380
try {
381+
label1.Text = string.Empty;
382+
label2.Text = string.Empty;
383+
label3.Text = string.Empty;
381384
lblBook.Text = string.Empty;
382385
lblAuthor.Text = string.Empty;
383386
lblLocation.Text = string.Empty;
384387
lblContent.Text = string.Empty;
385-
if (isReQuery) {
386-
DisplayData();
387-
}
388388
SetDataGridView();
389389
SetSelection();
390390
CountRows();
391+
if (isReQuery) {
392+
DisplayData();
393+
}
391394
} catch (Exception) {
392395
// ignored
393396
}
@@ -445,12 +448,14 @@ private void DisplayData() {
445448

446449
treeViewBooks.Nodes.Add(rootNodeBooks);
447450

448-
foreach (var book in books) {
449-
var bookNode = new TreeNode(book.BookName) {
450-
ToolTipText = book.BookName
451-
};
451+
if (books.Any()) {
452+
foreach (var book in books) {
453+
var bookNode = new TreeNode(book.BookName) {
454+
ToolTipText = book.BookName
455+
};
452456

453-
treeViewBooks.Nodes.Add(bookNode);
457+
treeViewBooks.Nodes.Add(bookNode);
458+
}
454459
}
455460

456461
treeViewBooks.ExpandAll();
@@ -466,17 +471,19 @@ private void DisplayData() {
466471

467472
treeViewWords.Nodes.Clear();
468473

469-
treeViewWords.Nodes.Add(rootNodeWords);
474+
if (words.Any()) {
475+
treeViewWords.Nodes.Add(rootNodeWords);
470476

471-
foreach (var word in words) {
472-
var wordNode = new TreeNode(word.Word) {
473-
ToolTipText = word.Word
474-
};
477+
foreach (var word in words) {
478+
var wordNode = new TreeNode(word.Word) {
479+
ToolTipText = word.Word
480+
};
475481

476-
treeViewWords.Nodes.Add(wordNode);
477-
}
482+
treeViewWords.Nodes.Add(wordNode);
483+
}
478484

479-
treeViewWords.ExpandAll();
485+
treeViewWords.ExpandAll();
486+
}
480487
}
481488

482489
private void SetDataGridView() {

KindleMate2/FrmMain.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
139139
LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
140140
SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAA2B8AAAJNU0Z0AUkBTAIBAQMB
141-
AAHYAQ4B2AEOARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
141+
AAHoAQ4B6AEOARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
142142
GRYAAlYBVQGuAZkBZgEiAf8BmQFmASIB/wHmAaYBUAH/Ae4BrAFVAf8B7gGsAVUB/wHuAawBVQH/Ae4B
143143
rAFVAf8B7gGsAVUB/wHuAawBVQH/Ae4BrAFVAf8B7gGsAVUB/wHuAawBVQH/Ae4BrAFVAf8B7gGsAVUB
144144
/wHDAYgBOwH/AwMBBGAAAzYBWQFCAUEBQgFyAUIBQQFCAXIDQgFyA0IBcwNCAXIDQgFyA0IBcgNCAXID
@@ -284,7 +284,7 @@
284284
AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
285285
LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
286286
SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAxiIAAAJNU0Z0AUkBTAIBAQMB
287-
AAHQAQ4B0AEOARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
287+
AAHgAQ4B4AEOARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
288288
GRIAAycBOgJjAV8B2gHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB
289289
/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMB
290290
iAE7Af8BwwGIATsB/wHDAYgBOwH/AmMBXwHaAycBOgMnAToCYwFfAdoBwwGIATsB/wHDAYgBOwH/AcMB

0 commit comments

Comments
 (0)