修正收藏栏bug

EdgeVoyager.csproj

@@ -8,8 +8,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <ApplicationIcon>Resources\icons8_connection_status_on.ico</ApplicationIcon>
     <PackageIcon>icons8_connection_status_on_128.png</PackageIcon>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
+    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <FileVersion>1.1.0.0</FileVersion>
     <Copyright>©2025 LYKNS Corp. 保留部分权利。</Copyright>
     <Company>LYKNS Corporation</Company>
     <Description>LYKNS EdgeVoyager是一个新的个性化的浏览器。访问https://dev.lykns.com.cn/EdgeVoyager_Project/EdgeVoyager获取更多信息。
@@ -19,22 +19,10 @@
     <Platforms>AnyCPU;ARM32;ARM64;x64;x86</Platforms>
   </PropertyGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Remove="favoritesMenuItem.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Remove="index.html" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="favoritesMenuItem.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>favoritesMenuItem.Designer.cs</LastGenOutput>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="Resources\icons8_connection_status_on.ico" />
   </ItemGroup>
@@ -44,11 +32,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="favoritesMenuItem.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>favoritesMenuItem.resx</DependentUpon>
-    </Compile>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>

Form1.cs

@@ -16,6 +16,76 @@ namespace EdgeVoyager
         {
             InitializeComponent();
             InitializeAsync();
+            string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            string filePath = Path.Combine(docPath, @"EdgeVoyager\favoritesMenuItem.resx");
+            string edgeVoyagerPath = Path.Combine(docPath, "EdgeVoyager");
+            if (!Directory.Exists(edgeVoyagerPath))
+                Directory.CreateDirectory(edgeVoyagerPath);
+            if (!File.Exists(filePath))
+            {
+                using (StreamWriter sw = File.CreateText(filePath))
+                {
+                    sw.WriteLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+                    sw.WriteLine("<root>");
+                    sw.WriteLine("  <!-- ");
+                    sw.WriteLine("    Microsoft ResX Schema ");
+                    sw.WriteLine("    ");
+                    sw.WriteLine("    Version 2.0");
+                    sw.WriteLine("    ");
+                    sw.WriteLine("    The primary goals of this format is to allow a simple XML info path, ");
+                    sw.WriteLine("    yet also allow others to add their own info beyond the main info ");
+                    sw.WriteLine("    needed for a form without breaking any existing code. ");
+                    sw.WriteLine("    ");
+                    sw.WriteLine("    -->");
+                    sw.WriteLine("  <xsd:schema id=\"root\" xmlns=\"\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:msdata=\"urn:schemas-microsoft-com:xml-msdata\">");
+                    sw.WriteLine("    <xsd:import namespace=\"http://www.w3.org/XML/1998/namespace\" />");
+                    sw.WriteLine("    <xsd:element name=\"root\" msdata:IsDataSet=\"true\">");
+                    sw.WriteLine("      <xsd:complexType>");
+                    sw.WriteLine("        <xsd:choice maxOccurs=\"unbounded\">");
+                    sw.WriteLine("          <xsd:element name=\"metadata\">");
+                    sw.WriteLine("            <xsd:complexType>");
+                    sw.WriteLine("              <xsd:attribute name=\"name\" type=\"xsd:string\" />");
+                    sw.WriteLine("              <xsd:attribute name=\"value\" type=\"xsd:string\" />");
+                    sw.WriteLine("            </xsd:complexType>");
+                    sw.WriteLine("          </xsd:element>");
+                    sw.WriteLine("          <xsd:element name=\"assembly\">");
+                    sw.WriteLine("            <xsd:complexType>");
+                    sw.WriteLine("              <xsd:attribute name=\"alias\" type=\"xsd:string\" />");
+                    sw.WriteLine("              <xsd:attribute name=\"name\" type=\"xsd:string\" />");
+                    sw.WriteLine("            </xsd:complexType>");
+                    sw.WriteLine("          </xsd:element>");
+                    sw.WriteLine("          <xsd:element name=\"data\">");
+                    sw.WriteLine("            <xsd:complexType>");
+                    sw.WriteLine("              <xsd:attribute name=\"name\" type=\"xsd:string\" />");
+                    sw.WriteLine("              <xsd:attribute name=\"type\" type=\"xsd:string\" />");
+                    sw.WriteLine("              <xsd:attribute name=\"mimetype\" type=\"xsd:string\" />");
+                    sw.WriteLine("              <xsd:attribute name=\"xml:space\" type=\"xsd:string\" />");
+                    sw.WriteLine("            </xsd:complexType>");
+                    sw.WriteLine("          </xsd:element>");
+                    sw.WriteLine("          <xsd:element name=\"resheader\">");
+                    sw.WriteLine("            <xsd:complexType>");
+                    sw.WriteLine("              <xsd:attribute name=\"name\" type=\"xsd:string\" />");
+                    sw.WriteLine("            </xsd:complexType>");
+                    sw.WriteLine("          </xsd:element>");
+                    sw.WriteLine("        </xsd:choice>");
+                    sw.WriteLine("      </xsd:complexType>");
+                    sw.WriteLine("    </xsd:element>");
+                    sw.WriteLine("  </xsd:schema>");
+                    sw.WriteLine("  <resheader name=\"resmimetype\">");
+                    sw.WriteLine("    <value>text/microsoft-resx</value>");
+                    sw.WriteLine("  </resheader>");
+                    sw.WriteLine("  <resheader name=\"version\">");
+                    sw.WriteLine("    <value>2.0</value>");
+                    sw.WriteLine("  </resheader>");
+                    sw.WriteLine("  <resheader name=\"reader\">");
+                    sw.WriteLine("    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>");
+                    sw.WriteLine("  </resheader>");
+                    sw.WriteLine("  <resheader name=\"writer\">");
+                    sw.WriteLine("    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>");
+                    sw.WriteLine("  </resheader>");
+                    sw.WriteLine("</root>");
+                }
+            }
         }
 
         private void CoreWebView2_NewWindowRequested(object sender, CoreWebView2NewWindowRequestedEventArgs e)
@@ -30,7 +100,8 @@ namespace EdgeVoyager
         async void InitializeAsync()
         {
             await webView21.EnsureCoreWebView2Async(null);
-            string resxFilePath = "favoritesMenuItem.resx";
+            string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            string resxFilePath = Path.Combine(docPath, @"EdgeVoyager\favoritesMenuItem.resx");
             using (ResXResourceReader reader = new ResXResourceReader(resxFilePath))
             {
                 foreach (DictionaryEntry entry in reader)
@@ -770,7 +841,8 @@ background-position: right top;
 
         private async void 添加到收藏夹ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            string resxFilePath = "favoritesMenuItem.resx";
+            string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            string resxFilePath = Path.Combine(docPath, @"EdgeVoyager\favoritesMenuItem.resx");
             string title = await webView21.CoreWebView2.ExecuteScriptAsync("document.title;");
             string pageTitle = title.Trim('"');
             string pageUrl = webView21.CoreWebView2.Source.ToString();
@@ -839,20 +911,7 @@ background-position: right top;
                 }
             }
         }
-        private async Task<byte[]> DownloadFaviconAsync(string faviconUrl)
-        {
-            using (HttpClient client = new HttpClient())
-            {
-                try
-                {
-                    return await client.GetByteArrayAsync(faviconUrl);
-                }
-                catch (Exception ex)
-                {
-                    return null;
-                }
-            }
-        }
+
         private void MenuItem_Click(object sender, EventArgs e)
         {
             ToolStripMenuItem menuItem = (ToolStripMenuItem)sender;
@@ -864,19 +923,18 @@ background-position: right top;
         {
             Form2 form2 = new Form2();
             form2.ShowDialog();
-            string resxFilePath = "favoritesMenuItem.resx";
+            string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            string resxFilePath = Path.Combine(docPath, @"EdgeVoyager\favoritesMenuItem.resx");
             for (int i = 0; i < 收藏夹AToolStripMenuItem.DropDownItems.Count; i++)
             {
-                // 如果找到了toolStripSeparator10
                 if (收藏夹AToolStripMenuItem.DropDownItems[i] is ToolStripSeparator &&
                     收藏夹AToolStripMenuItem.DropDownItems[i].Name == "toolStripSeparator10")
                 {
-                    // 从toolStripSeparator10下方开始，删除所有按钮
                     for (int j = 收藏夹AToolStripMenuItem.DropDownItems.Count - 1; j > i; j--)
                     {
                         收藏夹AToolStripMenuItem.DropDownItems.RemoveAt(j);
                     }
-                    break; // 找到并处理完毕后退出循环
+                    break;
                 }
             }
             using (ResXResourceReader reader1 = new ResXResourceReader(resxFilePath))
@@ -898,19 +956,18 @@ background-position: right top;
 
         private void Form1_Activated(object sender, EventArgs e)
         {
-            string resxFilePath = "favoritesMenuItem.resx";
+            string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            string resxFilePath = Path.Combine(docPath, @"EdgeVoyager\favoritesMenuItem.resx");
             for (int i = 0; i < 收藏夹AToolStripMenuItem.DropDownItems.Count; i++)
             {
-                // 如果找到了toolStripSeparator10
                 if (收藏夹AToolStripMenuItem.DropDownItems[i] is ToolStripSeparator &&
                     收藏夹AToolStripMenuItem.DropDownItems[i].Name == "toolStripSeparator10")
                 {
-                    // 从toolStripSeparator10下方开始，删除所有按钮
                     for (int j = 收藏夹AToolStripMenuItem.DropDownItems.Count - 1; j > i; j--)
                     {
                         收藏夹AToolStripMenuItem.DropDownItems.RemoveAt(j);
                     }
-                    break; // 找到并处理完毕后退出循环
+                    break;
                 }
             }
             using (ResXResourceReader reader1 = new ResXResourceReader(resxFilePath))

Form2.cs

@@ -19,7 +19,9 @@ namespace EdgeVoyager
         public Form2()
         {
             InitializeComponent();
-            ResXResourceReader rsxr = new ResXResourceReader("favoritesMenuItem.resx");
+            string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            string resxFilePath = Path.Combine(docPath, @"EdgeVoyager\favoritesMenuItem.resx");
+            ResXResourceReader rsxr = new ResXResourceReader(resxFilePath);
             foreach (DictionaryEntry d in rsxr)
             {
                 ListViewItem item = new ListViewItem(d.Key.ToString());
@@ -45,7 +47,9 @@ namespace EdgeVoyager
             {
                 ListViewItem selectedItem = listView1.SelectedItems[0];
                 string key = selectedItem.SubItems[0].Text;
-                ResXResourceReader rsxr = new ResXResourceReader("favoritesMenuItem.resx");
+                string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+                string resxFilePath = Path.Combine(docPath, @"EdgeVoyager\favoritesMenuItem.resx");
+                ResXResourceReader rsxr = new ResXResourceReader(resxFilePath);
                 Dictionary<string, object> resources = new Dictionary<string, object>();
                 foreach (DictionaryEntry d in rsxr)
                 {
@@ -55,7 +59,7 @@ namespace EdgeVoyager
                     }
                 }
                 rsxr.Close();
-                ResXResourceWriter rsxw = new ResXResourceWriter("favoritesMenuItem.resx");
+                ResXResourceWriter rsxw = new ResXResourceWriter(resxFilePath);
                 foreach (var kvp in resources)
                 {
                     rsxw.AddResource(kvp.Key, kvp.Value);
@@ -63,7 +67,7 @@ namespace EdgeVoyager
                 rsxw.Generate();
                 rsxw.Close();
                 listView1.Items.Clear();
-                ResXResourceReader rsxr2 = new ResXResourceReader("favoritesMenuItem.resx");
+                ResXResourceReader rsxr2 = new ResXResourceReader(resxFilePath);
                 foreach (DictionaryEntry d in rsxr2)
                 {
                     ListViewItem item = new ListViewItem(d.Key.ToString());

favoritesMenuItem.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace EdgeVoyager {
-    using System;
-    
-    
-    /// <summary>
-    ///   一个强类型的资源类，用于查找本地化的字符串等。
-    /// </summary>
-    // 此类是由 StronglyTypedResourceBuilder
-    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
-    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class favoritesMenuItem {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal favoritesMenuItem() {
-        }
-        
-        /// <summary>
-        ///   返回此类使用的缓存的 ResourceManager 实例。
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("EdgeVoyager.favoritesMenuItem", typeof(favoritesMenuItem).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性，对
-        ///   使用此强类型资源类的所有资源查找执行重写。
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

favoritesMenuItem.resx

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-	<!-- 
-		Microsoft ResX Schema
-
-		Version 1.3
-
-		The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
-		associated with the data types.
-
-		Example:
-
-		... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
-		</data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
-		</data>
-
-		There are any number of "resheader" rows that contain simple 
-		name/value pairs.
-
-		Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
-		mimetype set.
-
-		The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
-
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
-
-		mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
-	-->
-	
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>1.3</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-</root>