Update

lzcapp · Apr 20, 2024 · cdc2dd9 · cdc2dd9
1 parent a0c9216
commit cdc2dd9
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 197 deletions.
diff --git a/KindleMate2/FrmMain.Designer.cs b/KindleMate2/FrmMain.Designer.cs
diff --git a/KindleMate2/FrmMain.cs b/KindleMate2/FrmMain.cs
@@ -1418,61 +1418,6 @@ private void MenuBookRefresh_Click(object sender, EventArgs e) {
             RefreshData();
         }
 
-        //private void MenuCombine_Click(object sender, EventArgs e) {
-        //ShowCombineDialog();
-        //}
-
-        //private void ShowCombineDialog() {
-        //var index = tabControl.SelectedIndex;
-        //switch (index) {
-        //case 0:
-        //var booksList = new List<string>();
-
-        //var set = new HashSet<string>();
-        //var list = _clippingsDataTable.AsEnumerable().Select(row => row.Field<string>("bookname")).OfType<string>().Where(set.Add).ToList();
-        //booksList.AddRange(list);
-
-        //var booksDialog = new FrmCombine {
-        //BookNames = booksList
-        //};
-
-        //if (booksDialog.ShowDialog() != DialogResult.OK) {
-        //return;
-        //}
-
-        //var bookname = booksDialog.SelectedName;
-
-        //if (string.IsNullOrWhiteSpace(bookname)) {
-        //return;
-        //}
-
-        //if (bookname == _selectedBook) {
-        //MessageBox.Show("不能合并到原书籍", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        //return;
-        //}
-
-        //var resultRows = _clippingsDataTable.Select($"bookname = '{bookname}'");
-        //var authorName = (resultRows.Length > 0 ? resultRows[0]["authorname"].ToString() : string.Empty) ?? string.Empty;
-
-        //_staticData.UpdateLookups(_selectedBook, bookname, authorName);
-
-        //if (!_staticData.UpdateClippings(_selectedBook, bookname, authorName)) {
-        //MessageBox.Show("书籍合并失败", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        //return;
-        //}
-
-        //MessageBox.Show("书籍合并成功", "成功", MessageBoxButtons.OK, MessageBoxIcon.Information);
-
-        //_selectedBook = bookname;
-
-        //break;
-        //case 1:
-        //break;
-        //}
-
-        //RefreshData();
-        //}
-
         private bool BackupOriginClippings() {
             DataTable dataTable = _staticData.GetOriginClippingsDataTable();
             dataTable.DefaultView.Sort = "key ASC";

diff --git a/KindleMate2/FrmMain.resx b/KindleMate2/FrmMain.resx
@@ -132,7 +132,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAKh8AAAJNU0Z0AUkBTAIBAQMB
-        AAE4AQYBOAEGARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
+        AAHYAQYB2AEGARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
         GRIAAxEBFgNKAYkCWAFaAb0DXQHMA10BzANdAcwDXQHMA10BzANdAcwDXQHMA10BzANdAcwDXQHMA10B
         zAJcAV8ByANYAbgDMQFMAw8BFGAAAzYBWQFCAUEBQgFyAUIBQQFCAXIDQgFyA0IBcwNCAXIDQgFyA0IB
         cgNCAXIDQgFyA0IBcgNCAXIDQgFyA0IBcgNCAXIDQgFyA0EBcQMYASFQAAM2AVkCXQFgAc4CUQFvAfcB
@@ -275,7 +275,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAxiIAAAJNU0Z0AUkBTAIBAQMB
-        AAE4AQYBOAEGARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
+        AAHYAQYB2AEGARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
         GRIAAycBOgJjAV8B2gHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB
         /wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMB
         iAE7Af8BwwGIATsB/wHDAYgBOwH/AmMBXwHaAycBOgMnAToCYwFfAdoBwwGIATsB/wHDAYgBOwH/AcMB

diff --git a/KindleMate2/KindleMate2.csproj b/KindleMate2/KindleMate2.csproj
@@ -27,7 +27,6 @@
 		<Deterministic>false</Deterministic>
 		<AssemblyVersion></AssemblyVersion>
 		<FileVersion></FileVersion>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -46,6 +45,10 @@
 		<None Remove="Resources\**" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <AdditionalFiles Remove="app.manifest" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <Compile Remove="StaticData.cs" />
 	</ItemGroup>

diff --git a/KindleMate2/app.manifest b/KindleMate2/app.manifest
diff --git a/KindleMate2_WPF/KM2.dat b/KindleMate2_WPF/KM2.dat
diff --git a/KindleMate2_WPF/KindleMate2_WPF.csproj b/KindleMate2_WPF/KindleMate2_WPF.csproj
@@ -98,6 +98,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="KM2.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>