Update

lzcapp · Jul 14, 2024 · 9828ecf · 9828ecf
1 parent 532fa54
commit 9828ecf
Show file tree

Hide file tree

Showing 9 changed files with 238 additions and 36 deletions.
diff --git a/KindleMate2/FrmAboutBox.Designer.cs b/KindleMate2/FrmAboutBox.Designer.cs
diff --git a/KindleMate2/FrmAboutBox.cs b/KindleMate2/FrmAboutBox.cs
@@ -11,6 +11,7 @@ public FrmAboutBox() {
 
             if (_staticData.IsDarkTheme()) {
                 _ = new DarkModeCS(this, false);
+                lblPath.LinkColor = Color.White;
             }
         }
 

diff --git a/KindleMate2/FrmBookRename.Designer.cs b/KindleMate2/FrmBookRename.Designer.cs
diff --git a/KindleMate2/FrmMain.Designer.cs b/KindleMate2/FrmMain.Designer.cs
diff --git a/KindleMate2/FrmMain.cs b/KindleMate2/FrmMain.cs
@@ -38,6 +38,8 @@ public partial class FrmMain : Form {
 
         private int _selectedIndex;
 
+        private Form _frmProgress = new frmProgress();
+
         public FrmMain() {
             InitializeComponent();
 
@@ -1294,7 +1296,7 @@ private void SetProgressBar(bool isShow) {
             progressBar.Enabled = isShow;
             progressBar.Visible = isShow;
             Enabled = !isShow;
-        }
+}
 
         private void MenuImportKindleMate_Click(object sender, EventArgs e) {
             var fileDialog = new OpenFileDialog {
@@ -2057,7 +2059,9 @@ private void MenuListRefresh_Click(object sender, EventArgs e) {
         }
 
         private void FrmMain_FormClosing(object sender, FormClosingEventArgs e) {
-            _staticData.CommitTransaction();
+            try {
+                _staticData.CommitTransaction();
+            } catch { }
         }
     }
 }
diff --git a/KindleMate2/FrmMain.resx b/KindleMate2/FrmMain.resx
@@ -124,6 +124,9 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1021, 17</value>
   </metadata>
+  <metadata name="menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>480, 17</value>
+  </metadata>
   <metadata name="menuClippings.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>798, 17</value>
   </metadata>
@@ -135,7 +138,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAKh8AAAJNU0Z0AUkBTAIBAQMB
-        AAGoAQkBqAEJARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
+        AAHgAQkB4AEJARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
         GRIAAxEBFgNKAYkCWAFaAb0DXQHMA10BzANdAcwDXQHMA10BzANdAcwDXQHMA10BzANdAcwDXQHMA10B
         zAJcAV8ByANYAbgDMQFMAw8BFGAAAzYBWQFCAUEBQgFyAUIBQQFCAXIDQgFyA0IBcwNCAXIDQgFyA0IB
         cgNCAXIDQgFyA0IBcgNCAXIDQgFyA0IBcgNCAXIDQgFyA0EBcQMYASFQAAM2AVkCXQFgAc4CUQFvAfcB
@@ -281,7 +284,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAxiIAAAJNU0Z0AUkBTAIBAQMB
-        AAGoAQkBqAEJARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
+        AAHgAQkB4AEJARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
         GRIAAycBOgJjAV8B2gHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB
         /wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMB
         iAE7Af8BwwGIATsB/wHDAYgBOwH/AmMBXwHaAycBOgMnAToCYwFfAdoBwwGIATsB/wHDAYgBOwH/AcMB
@@ -432,9 +435,6 @@
         AAGAAQABMAQACw==
 </value>
   </data>
-  <metadata name="menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>480, 17</value>
-  </metadata>
   <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1376, 17</value>
   </metadata>

diff --git a/KindleMate2/frmProgress.Designer.cs b/KindleMate2/frmProgress.Designer.cs
diff --git a/KindleMate2/frmProgress.cs b/KindleMate2/frmProgress.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace KindleMate2 {
+    public partial class frmProgress : Form {
+        public frmProgress() {
+            InitializeComponent();
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ public FrmAboutBox() { @@
                 if (_staticData.IsDarkTheme()) {
                     _ = new DarkModeCS(this, false);
+                    lblPath.LinkColor = Color.White;
                 }
             }
@@ Expand Down @@