Add files via upload

.github/workflows/dotnet-desktop.yml

@@ -1,115 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow will build, test, sign and package a WPF or Windows Forms desktop application
-# built on .NET Core.
-# To learn how to migrate your existing application to .NET Core,
-# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework
-#
-# To configure this workflow:
-#
-# 1. Configure environment variables
-# GitHub sets default environment variables for every workflow run.
-# Replace the variables relative to your project in the "env" section below.
-#
-# 2. Signing
-# Generate a signing certificate in the Windows Application
-# Packaging Project or add an existing signing certificate to the project.
-# Next, use PowerShell to encode the .pfx file using Base64 encoding
-# by running the following Powershell script to generate the output string:
-#
-# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte
-# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt'
-#
-# Open the output file, SigningCertificate_Encoded.txt, and copy the
-# string inside. Then, add the string to the repo as a GitHub secret
-# and name it "Base64_Encoded_Pfx."
-# For more information on how to configure your signing certificate for
-# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing
-#
-# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key".
-# See "Build the Windows Application Packaging project" below to see how the secret is used.
-#
-# For more information on GitHub Actions, refer to https://github.com/features/actions
-# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
-# refer to https://github.com/microsoft/github-actions-for-desktop-apps
-
-name: .NET Core Desktop
-
-on:
-  push:
-分支: [ "main" ]
-  pull_request:
-分支: [ "main" ]
-
-jobs:
-
-  build:
-
-    strategy:
-      matrix:
-        configuration: [Debug, Release]
-
-    runs-on: windows-latest  # For a list of available runner types, refer to
-                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
-
-    env:
-      Solution_Name: your-solution-name                         # Replace with your solution name, i.e. MyWpfApp.sln.
-      Test_Project_Path: your-test-project-path                 # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj.
-      Wap_Project_Directory: your-wap-project-directory-name    # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package.
-      Wap_Project_Path: your-wap-project-path                   # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj.
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    # Install the .NET Core workload
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
-
-    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-    - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v2
-
-    # Execute all unit tests in the solution
-    - name: Execute unit tests
-      run: dotnet test
-
-    # Restore the application to populate the obj folder with RuntimeIdentifiers
-    - name: Restore the application
-      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
-      env:
-        Configuration: ${{ matrix.configuration }}
-
-    # Decode the base 64 encoded pfx and save the Signing_Certificate
-    - name: Decode the pfx
-      run: |
-        $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
-        $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx
-        [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
-
-    # Create the app package by building and packaging the Windows Application Packaging project
-    - name: Create the app package
-      run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
-      env:
-        Appx_Bundle: Always
-        Appx_Bundle_Platforms: x86|x64
-        Appx_Package_Build_Mode: StoreUpload
-        Configuration: ${{ matrix.configuration }}
-
-    # Remove the pfx
-    - name: Remove the pfx
-      run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx
-
-    # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: MSIX Package
-        path: ${{ env.Wap_Project_Directory }}\AppPackages

.github/workflows/dotnet.yml

@@ -1,28 +0,0 @@
-# This workflow will build a .NET project
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
-
-name: .NET
-
-on:
-  push:
-分支: [ "main" ]
-  pull_request:
-分支: [ "main" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --no-restore
-    - name: Test
-      run: dotnet test --no-build --verbosity normal

AboutForm.cs

@@ -51,7 +51,7 @@ namespace AppStore
 
             // 初始化并添加应用信息
             infoLabel = new Label();
-            infoLabel.Text = "kortapp-z\n版本: 1.3.3\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
+            infoLabel.Text = "kortapp-z\n版本: 1.1.1\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
             infoLabel.Font = new Font("Microsoft YaHei", 12);
             infoLabel.AutoSize = false;
             infoLabel.Width = 300;

AppCard.cs

@@ -48,72 +48,33 @@ namespace AppStore
             this.Padding = new Padding(10);
             
             // 异步初始化卡片路径和边框
-            // 预加载边框路径
             Task.Run(() => {
                 InitializeCardPath();
                 InitializeBorder();
-                
-                // 确保在主线程注册事件
-                this.Invoke((MethodInvoker)(() => {
-                    this.Paint += (sender, e) => {
-                        if (BorderCache.IsEmpty) 
-                        {
-                            Task.Run(() => {
-                                InitializeBorder();
-                                this.Invoke((MethodInvoker)(() => this.Invalidate()));
-                            });
-                        }
-                    };
-                }));
             });
 
-            // 应用图标 - 添加null检查
+            // 应用图标
-            if (iconBox != null && this != null && this.Controls != null)
+            iconBox = new PictureBox();
-            {
+            iconBox.Size = new Size(80, 80);
-                iconBox.Size = new Size(80, 80);
+            iconBox.Location = new Point((Width - 80) / 2, 15);
-                iconBox.Location = new Point((Width - 80) / 2, 15);
+            iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
-                iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
+            this.Controls.Add(iconBox);
-                this.Controls.Add(iconBox);
-            }
-            else
-            {
-                Logger.LogWarning("iconBox或Controls为null");
-            }
 
             // 应用名称 - 使用Panel包裹Label实现边框颜色
-            if (namePanel != null)
+            // namePanel已在构造函数中初始化
-            {
+            namePanel.Size = new Size(Width - 20, 40);
-                namePanel.Size = new Size(Width - 20, 40);
+            namePanel.Location = new Point(10, 100);
-                namePanel.Location = new Point(10, 100);
+            namePanel.Paint += (sender, e) => {
-                namePanel.Paint += (sender, e) => {
+                ControlPaint.DrawBorder(e.Graphics, namePanel.ClientRectangle, 
-                    try
+                    borderColor, ButtonBorderStyle.Solid);
-                    {
+            };
-                        if (e != null && e.Graphics != null && namePanel != null)
-                        {
-                            var rect = namePanel.ClientRectangle;
-                            if (rect.Width > 0 && rect.Height > 0)
-                            {
-                                ControlPaint.DrawBorder(e.Graphics, rect, 
-                                    borderColor, ButtonBorderStyle.Solid);
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogWarning($"绘制namePanel边框失败: {ex.Message}");
-                    }
-                };
-            }
             
             nameLabel = new Label();
             nameLabel.Dock = DockStyle.Fill;
             nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
             nameLabel.TextAlign = ContentAlignment.MiddleCenter;
             
-            if (namePanel != null && nameLabel != null)
+            namePanel.Controls.Add(nameLabel);
-            {
-                namePanel.Controls.Add(nameLabel);
-            }
             
             // 初始主题设置
             UpdateLabelTheme();
@@ -121,43 +82,32 @@ namespace AppStore
             // 订阅主题变化事件
             ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme();
             
-            if (this != null && this.Controls != null && namePanel != null)
+            this.Controls.Add(namePanel);
-            {
-                this.Controls.Add(namePanel);
-            }
 
-            // 下载按钮 - 添加null检查
+            // 下载按钮
-            if (downloadBtn != null)
+            downloadBtn = new Button();
-            {
+            downloadBtn.Text = "下载";
-                downloadBtn.Text = "下载";
+            downloadBtn.Size = new Size(100, 32);
-                downloadBtn.Size = new Size(100, 32);
+            downloadBtn.Location = new Point((Width - 100) / 2, 150);
-                downloadBtn.Location = new Point((Width - 100) / 2, 150);
+            downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
+            downloadBtn.ForeColor = Color.White;
+            downloadBtn.FlatStyle = FlatStyle.Flat;
+            downloadBtn.FlatAppearance.BorderSize = 0;
+            downloadBtn.Cursor = Cursors.Hand;
+            downloadBtn.Font = new Font("Microsoft YaHei", 9);
+            
+            // 按钮悬停效果
+            downloadBtn.MouseEnter += (s, e) => {
+                downloadBtn.BackColor = Color.FromArgb(0, 150, 255);
+            };
+            
+            downloadBtn.MouseLeave += (s, e) => {
                 downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
-                downloadBtn.ForeColor = Color.White;
+            };
-                downloadBtn.FlatStyle = FlatStyle.Flat;
-                downloadBtn.FlatAppearance.BorderSize = 0;
-                downloadBtn.Cursor = Cursors.Hand;
-                downloadBtn.Font = new Font("Microsoft YaHei", 9);
             
-                // 按钮悬停效果 - 添加null检查
+            downloadBtn.Click += DownloadBtn_Click;
-                downloadBtn.MouseEnter += (s, e) => {
+            this.Controls.Add(downloadBtn);
-                    if (downloadBtn != null)
+            downloadBtn.Visible = ShowDownloadButton;
-                    {
-                        downloadBtn.BackColor = Color.FromArgb(0, 150, 255);
-                    }
-                };
-                
-                downloadBtn.MouseLeave += (s, e) => {
-                    if (downloadBtn != null)
-                    {
-                        downloadBtn.BackColor = Color.FromArgb(0, 120, 215);
-                    }
-                };
-                
-                downloadBtn.Click += DownloadBtn_Click;
-                this.Controls.Add(downloadBtn);
-                downloadBtn.Visible = ShowDownloadButton;
-            }
         }
 
         private void UpdateLabelTheme()
@@ -176,14 +126,7 @@ namespace AppStore
                 namePanel.BackColor = Color.White;
                 borderColor = SystemColors.ControlDark;
             }
-            if (namePanel != null && !namePanel.IsDisposed)
+            namePanel.Invalidate(); // 触发重绘
-            {
-                namePanel.Invalidate(); // 触发重绘
-            }
-            else
-            {
-                Logger.LogWarning("namePanel为null或已释放");
-            }
         }
 
         /// <summary>
@@ -195,60 +138,54 @@ namespace AppStore
             // 使用卡片尺寸作为缓存键
             string cacheKey = $"{Width}_{Height}_10";
             
-            // 双重检查锁模式确保线程安全
+            // 检查缓存中是否已有路径
             if (!BorderCache.TryGetValue(cacheKey, out var borderPath))
             {
-                lock (BorderCache)
+                // 创建临时文件存储路径数据
+                string tempFile = Path.GetTempFileName();
+                try 
                 {
-                    if (!BorderCache.TryGetValue(cacheKey, out borderPath))
+                    // 配置C++程序启动参数
+                    ProcessStartInfo startInfo = new ProcessStartInfo 
                     {
-                        // 创建临时文件存储路径数据
+                        FileName = Path.Combine(Application.StartupPath, "resource", "border_renderer.exe"),
-                        string tempFile = Path.GetTempFileName();
+                        Arguments = $"{Width} {Height} 10 \"{tempFile}\"", // 传递宽高和圆角半径
-                        try 
+                        UseShellExecute = false, // 不显示命令行窗口
+                        CreateNoWindow = true    // 静默运行
+                    };
+
+                    // 启动C++程序计算路径
+                    using (var process = Process.Start(startInfo)) 
+                    {
+                        process.WaitForExit();
+                        
+                        // 检查计算结果
+                        if (process.ExitCode == 0 && File.Exists(tempFile)) 
                         {
-                            // 配置C++程序启动参数
+                            // 读取C++程序生成的路径点
-                            ProcessStartInfo startInfo = new ProcessStartInfo 
+                            var lines = File.ReadAllLines(tempFile);
-                            {
+                            PointF[] points = lines.Select(line => {
-                                FileName = Path.Combine(Application.StartupPath, "resource", "border_renderer.exe"),
+                                var parts = line.Split(','); // 解析坐标点
-                                Arguments = $"{Width} {Height} 10 \"{tempFile}\"", // 传递宽高和圆角半径
+                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
-                                UseShellExecute = false, // 不显示命令行窗口
+                            }).ToArray();
-                                CreateNoWindow = true    // 静默运行
-                            };
                             
-                            // 启动C++程序计算路径
+                            // 创建GraphicsPath对象
-                            using (var process = Process.Start(startInfo)) 
+                            borderPath = new System.Drawing.Drawing2D.GraphicsPath();
-                            {
+                            borderPath.AddLines(points); // 添加路径点
-                                process.WaitForExit();
                             
-                                // 检查计算结果
+                            // 缓存路径对象
-                                if (process.ExitCode == 0 && File.Exists(tempFile)) 
+                            BorderCache.TryAdd(cacheKey, borderPath);
-                                {
-                                    // 读取C++程序生成的路径点
-                                    var lines = File.ReadAllLines(tempFile);
-                                    PointF[] points = lines.Select(line => {
-                                        var parts = line.Split(','); // 解析坐标点
-                                        return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
-                                    }).ToArray();
-                                    
-                                    // 创建GraphicsPath对象
-                                    borderPath = new System.Drawing.Drawing2D.GraphicsPath();
-                                    borderPath.AddLines(points); // 添加路径点
-                                    
-                                    // 缓存路径对象
-                                    BorderCache.TryAdd(cacheKey, borderPath);
-                                }
-                            }
-                        }
-                        finally 
-                        {
-                            // 确保临时文件被删除
-                            if (File.Exists(tempFile)) 
-                            {
-                                File.Delete(tempFile);
-                            }
                         }
                     }
                 }
+                finally 
+                {
+                    // 确保临时文件被删除
+                    if (File.Exists(tempFile)) 
+                    {
+                        File.Delete(tempFile);
+                    }
+                }
             }
         }
 
@@ -257,12 +194,6 @@ namespace AppStore
         {
             base.OnPaint(e);
             
-            // 确保边框已初始化
-            if (BorderCache.IsEmpty) 
-            {
-                InitializeBorder();
-            }
-            
             // 绘制背景
             using (var brush = new SolidBrush(this.BackColor)) {
                 e.Graphics.FillRectangle(brush, this.ClientRectangle);
@@ -325,37 +256,22 @@ namespace AppStore
                     };
 
                     // 启动C++程序计算路径
-                    if (startInfo != null)
+                    using (var process = Process.Start(startInfo)) {
-                    {
+                        process.WaitForExit();
-                        using (var process = Process.Start(startInfo)) 
-                        {
-                            if (process != null)
-                            {
-                                process.WaitForExit();
                         
-                                // 检查计算结果
+                        // 检查计算结果
-                                if (process.ExitCode == 0 && File.Exists(tempFile)) 
+                        if (process.ExitCode == 0 && File.Exists(tempFile)) {
-                                {
+                            // 读取生成的路径点
-                                    try
+                            var lines = File.ReadAllLines(tempFile);
-                                    {
+                            PointF[] points = lines.Select(line => {
-                                        // 读取生成的路径点
+                                var parts = line.Split(','); // 解析坐标
-                                        var lines = File.ReadAllLines(tempFile);
+                                return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
-                                        PointF[] points = lines.Select(line => {
+                            }).ToArray();
-                                            var parts = line.Split(','); // 解析坐标
-                                            return new PointF(float.Parse(parts[0]), float.Parse(parts[1]));
-                                        }).ToArray();
                             
-                                        // 创建并缓存路径对象
+                            // 创建并缓存路径对象
-                                        path = new System.Drawing.Drawing2D.GraphicsPath();
+                            path = new System.Drawing.Drawing2D.GraphicsPath();
-                                        path.AddLines(points);
+                            path.AddLines(points);
-                                        PathCache.TryAdd(cacheKey, path);
+                            PathCache.TryAdd(cacheKey, path);
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        Logger.LogWarning($"读取路径点失败: {ex.Message}");
-                                    }
-                                }
-                            }
                         }
                     }
                 } catch {
@@ -431,18 +347,8 @@ namespace AppStore
 
         public void UpdateDisplay()
         {
-            if (nameLabel != null && AppName != null)
+            nameLabel.Text = AppName;
-            {
+            iconBox.Image = AppIcon;
-                nameLabel.Text = AppName;
-            }
-            else
-            {
-                Logger.LogWarning("nameLabel或AppName为null");
-            }
-            if (iconBox != null && AppIcon != null)
-            {
-                iconBox.Image = AppIcon;
-            }
         }
 
         private void DownloadBtn_Click(object sender, EventArgs e)
@@ -452,15 +358,14 @@ namespace AppStore
                 // 更严格的null检查
                 // 更严格的null检查，包括DownloadManager.Instance和其方法
                 // 全面的null和状态检查
-                var downloadManager = DownloadManager.Instance;
                 if (sender == null || e == null || 
                     string.IsNullOrWhiteSpace(DownloadUrl) || 
                     string.IsNullOrWhiteSpace(AppName) ||
                     !this.IsHandleCreated ||
                     this.IsDisposed ||
-                    downloadManager == null ||
+                    DownloadManager.Instance == null ||
-                    downloadManager.DownloadItems == null ||
+                    DownloadManager.Instance.DownloadItems == null ||
-                    downloadManager.StartDownload == null)
+                    DownloadManager.Instance.StartDownload == null)
                 {
                     return;
                 }
@@ -468,7 +373,7 @@ namespace AppStore
                 string safeAppName = AppName ?? "未知应用";
                 string fileName = $"{safeAppName.Replace(" ", "_")}.exe";
                 
-                downloadManager.StartDownload(fileName, DownloadUrl);
+                DownloadManager.Instance.StartDownload(fileName, DownloadUrl);
                 
                 string message = $"已开始下载: {safeAppName}";
                 this.Invoke((MethodInvoker)delegate {

AppSearch.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public static class AppSearch
-    {
-        /// <summary>
-        /// 搜索应用卡片
-        /// </summary>
-        /// <param name="flowPanel">包含应用卡片的FlowLayoutPanel</param>
-        /// <param name="searchText">搜索文本</param>
-        public static void SearchApps(FlowLayoutPanel flowPanel, string searchText)
-        {
-            if (flowPanel == null || string.IsNullOrWhiteSpace(searchText))
-            {
-                ShowAllApps(flowPanel);
-                return;
-            }
-
-            foreach (Control control in flowPanel.Controls)
-            {
-                if (control is AppCard appCard)
-                {
-                    bool isMatch = IsMatchSearch(appCard.AppName, searchText);
-                    control.Visible = isMatch;
-                }
-            }
-        }
-
-        /// <summary>
-        /// 显示所有应用卡片
-        /// </summary>
-        public static void ShowAllApps(FlowLayoutPanel? flowPanel)
-        {
-            if (flowPanel == null) return;
-
-            foreach (Control control in flowPanel.Controls)
-            {
-                control.Visible = true;
-            }
-        }
-
-        /// <summary>
-        /// 检查应用名称是否匹配搜索文本
-        /// </summary>
-        private static bool IsMatchSearch(string appName, string searchText)
-        {
-            if (string.IsNullOrEmpty(appName)) return false;
-
-            // 不区分大小写比较
-            return appName.Contains(searchText, StringComparison.OrdinalIgnoreCase);
-        }
-    }
-}

AppStore.csproj

@@ -12,11 +12,13 @@
     <WarningsAsErrors>CS8618</WarningsAsErrors>
     <ApplicationIcon>img\ico\icon.ico</ApplicationIcon>
     <Platforms>x86;x64</Platforms>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="help.txt" />
+    <None Include="resource\NetWorkManager\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="resource\*.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -35,8 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SunnyUI" Version="3.8.6" />
+    <PackageReference Include="ZXing.Net" Version="0.16.8" />
-    <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
 
 </Project>

DownloadItem.cs

@@ -53,11 +53,10 @@ namespace AppStore
             this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
                 ? Color.White 
                 : Color.Black;
-            this.BorderStyle = BorderStyle.None; // 禁用默认边框
+            this.BorderStyle = BorderStyle.FixedSingle;
             this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
                 ? Color.Black 
                 : Color.White;
-            this.Paint += DownloadItem_Paint; // 添加自定义绘制
 
             // 文件名标签
             nameLabel = new Label();
@@ -99,17 +98,6 @@ namespace AppStore
             nameLabel.Text = FileName;
             progressBar.Value = Progress;
             statusLabel.Text = Status;
-            this.Invalidate(); // 触发重绘
-        }
-
-        private void DownloadItem_Paint(object sender, PaintEventArgs e)
-        {
-            // 自定义边框绘制
-            using (var pen = new Pen(ThemeManager.BorderColor, 1))
-            {
-                e.Graphics.DrawRectangle(pen, 
-                    new Rectangle(0, 0, this.Width - 1, this.Height - 1));
-            }
         }
 
         private void CancelBtn_Click(object sender, EventArgs e)

DownloadManager.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -42,7 +41,7 @@ namespace AppStore
         private ProcessResult GetProcessResult(Process? process)
         {
             var result = new ProcessResult();
-            if (process == null || process.StartInfo == null) return result;
+            if (process == null) return result;
             
             try 
             {
@@ -86,39 +85,36 @@ namespace AppStore
 
         private void DownloadFile(DownloadItem downloadItem, string fileName, string url)
         {
-            string downloadsDir = string.Empty;
             try
             {
-                // 获取并验证下载路径
+                // 设置下载目录为用户文件夹中的Downloads
-                downloadsDir = GetDownloadPath();
+                // 获取系统下载文件夹路径
-                
+                // 获取系统下载文件夹路径
+                string downloadsDir;
+                IntPtr pathPtr = IntPtr.Zero;
                 try
                 {
-                    // 检查路径是否有效
+                    // 使用SHGetKnownFolderPath API获取下载文件夹
-                    if (string.IsNullOrWhiteSpace(downloadsDir))
+                    var downloadsFolderGuid = new Guid("374DE290-123F-4565-9164-39C4925E467B");
+                    if (SHGetKnownFolderPath(downloadsFolderGuid, 0, IntPtr.Zero, out pathPtr) != 0)
                     {
-                        throw new Exception("下载路径为空");
+                        throw new Exception("无法获取下载文件夹路径");
                     }
                     
-                    // 尝试创建目录（如果不存在）
+                    downloadsDir = Marshal.PtrToStringUni(pathPtr);
-                    Directory.CreateDirectory(downloadsDir);
-
-                    // 验证目录是否可写
-                    string testFile = Path.Combine(downloadsDir, "write_test.tmp");
-                    File.WriteAllText(testFile, "test");
-                    File.Delete(testFile);
                 }
-                catch (Exception ex)
+                catch 
                 {
-                    // 回退到默认下载路径
+                    throw new Exception("无法确定下载文件夹位置，请手动指定下载路径");
-                    string defaultPath = Path.Combine(
-                        Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), 
-                        "Downloads");
-                    
-                    Logger.LogError($"下载路径{downloadsDir}不可用，将使用默认路径: {defaultPath}", ex);
-                    downloadsDir = defaultPath;
-                    Directory.CreateDirectory(downloadsDir);
                 }
+                finally
+                {
+                    if (pathPtr != IntPtr.Zero)
+                    {
+                        Marshal.FreeCoTaskMem(pathPtr);
+                    }
+                }
+                Directory.CreateDirectory(downloadsDir);
                 
 
 
@@ -313,20 +309,12 @@ namespace AppStore
                 currentProcess.BeginErrorReadLine();
                 progressTimer.Start();
             }
-                catch (Exception ex)
+            catch (Exception ex)
-                {
+            {
-                    string errorDetails = $"下载错误: {ex.Message}\n";
+                downloadItem.Status = $"下载错误: {ex.Message}";
-                    errorDetails += $"目标路径: {downloadsDir}\n";
+                DownloadCompleted?.Invoke(downloadItem);
-                    errorDetails += $"URL: {url}";
 
-                    downloadItem.Status = $"下载失败: {ex.Message}";
+            }
-                    Logger.LogError(errorDetails, ex);
-                    
-                    MessageBox.Show($"下载失败:\n{errorDetails}", "错误", 
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    
-                    DownloadCompleted?.Invoke(downloadItem);
-                }
         }
 
         public void CancelDownload(DownloadItem item)
@@ -334,7 +322,7 @@ namespace AppStore
             try
             {
                 var process = currentProcess;
-                if (process?.StartInfo == null || process.HasExited)
+                if (process == null || process.HasExited || process.StartInfo == null)
                 {
                     item.Status = "已取消";
                     DownloadProgressChanged?.Invoke(item);
@@ -354,155 +342,5 @@ namespace AppStore
                 DownloadProgressChanged?.Invoke(item);
             }
         }
-
-        private string GetDownloadPath()
-        {
-            string fallbackPath = string.Empty;
-            // 1. 优先读取用户设置的下载路径
-            try
-            {
-                string jsonPath = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                    "zsyg", "kortapp-z", ".date", "dl_path", "download_path.json");
-                
-                Logger.Log($"尝试读取下载路径配置文件: {jsonPath}");
-                
-                if (File.Exists(jsonPath))
-                {
-                    string jsonString = File.ReadAllText(jsonPath);
-                    Logger.Log($"配置文件内容: {jsonString}");
-                    
-                    var jsonData = JsonSerializer.Deserialize<JsonElement>(jsonString);
-                    string customPath = jsonData.GetProperty("DownloadPath").GetString()?.Trim();
-                    
-                    if (!string.IsNullOrWhiteSpace(customPath))
-                    {
-                        Logger.Log($"读取到自定义路径: {customPath}");
-                        
-                        // 处理路径格式
-                        customPath = customPath.Replace(@"\\", @"\");
-                        try 
-                        {
-                            // 处理路径中的环境变量和特殊字符
-                            customPath = Environment.ExpandEnvironmentVariables(customPath);
-                            customPath = Path.GetFullPath(customPath);
-                            Logger.Log($"标准化后的路径: {customPath}");
-                            
-                            // 确保路径以目录分隔符结尾
-                            if (!customPath.EndsWith(Path.DirectorySeparatorChar.ToString()))
-                            {
-                                customPath += Path.DirectorySeparatorChar;
-                            }
-
-                            // 验证驱动器是否存在
-                            string drive = Path.GetPathRoot(customPath);
-                            if (!Directory.Exists(drive))
-                            {
-                                Logger.LogError($"驱动器不存在: {drive}");
-                                throw new Exception($"驱动器 {drive} 不存在");
-                            }
-
-                            // 验证路径
-                            if (!Directory.Exists(customPath))
-                            {
-                                Logger.Log($"创建目录: {customPath}");
-                                Directory.CreateDirectory(customPath);
-                            }
-                            
-                            // 更严格的路径可写性测试
-                            string testFile = Path.Combine(customPath, $"write_test_{Guid.NewGuid()}.tmp");
-                            Logger.Log($"测试路径可写性: {testFile}");
-                            try
-                            {
-                                File.WriteAllText(testFile, DateTime.Now.ToString());
-                                string content = File.ReadAllText(testFile);
-                                File.Delete(testFile);
-                                Logger.Log($"路径验证成功: {customPath}");
-                                return customPath.TrimEnd(Path.DirectorySeparatorChar);
-                            }
-                            catch (Exception ex)
-                            {
-                                Logger.LogError($"路径不可写: {customPath}", ex);
-                                throw new Exception($"路径不可写: {customPath}");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.LogError($"路径处理失败: {customPath}", ex);
-                            throw;
-                        }
-                    }
-                }
-                else
-                {
-                    Logger.Log("未找到下载路径配置文件");
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("读取自定义下载路径失败", ex);
-            }
-
-            // 2. 回退到系统默认下载路径
-            IntPtr pathPtr = IntPtr.Zero;
-            try
-            {
-                var downloadsFolderGuid = new Guid("374DE290-123F-4565-9164-39C4925E467B");
-                if (SHGetKnownFolderPath(downloadsFolderGuid, 0, IntPtr.Zero, out pathPtr) == 0)
-                {
-                    string? defaultPath = Marshal.PtrToStringUni(pathPtr);
-                    if (!string.IsNullOrEmpty(defaultPath))
-                    {
-                        Directory.CreateDirectory(defaultPath);
-                        return defaultPath;
-                    }
-                    else
-                    {
-                        Logger.LogWarning("获取到的系统下载路径为空");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("获取系统下载路径失败", ex);
-            }
-            finally
-            {
-                if (pathPtr != IntPtr.Zero)
-                {
-                    Marshal.FreeCoTaskMem(pathPtr);
-                }
-            }
-
-            // 3. 最终回退到相对路径 ~/Downloads
-            string relativePath = "~/Downloads";
-            string userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) ?? 
-                Environment.GetFolderPath(Environment.SpecialFolder.Desktop) ?? 
-                AppDomain.CurrentDomain.BaseDirectory;
-            
-            if (!string.IsNullOrEmpty(userProfile))
-            {
-                fallbackPath = relativePath.Replace("~", userProfile);
-                if (!string.IsNullOrEmpty(fallbackPath))
-                {
-                    fallbackPath = Path.GetFullPath(fallbackPath);
-                }
-            }
-            
-            try {
-                Directory.CreateDirectory(fallbackPath);
-                // 测试路径可写性
-                string testFile = Path.Combine(fallbackPath, "write_test.tmp");
-                if (!string.IsNullOrEmpty(testFile))
-                {
-                    File.WriteAllText(testFile, "test");
-                    File.Delete(testFile);
-                }
-                return fallbackPath;
-            }
-            catch {
-                throw new Exception($"无法使用默认下载路径: {fallbackPath}");
-            }
-        }
     }
 }

MainForm.cs

@@ -8,43 +8,14 @@ using System.Text;
 using System.Text.Json;
 using System.Diagnostics;
 using AppStore;
-using Sunny.UI;
-using System.Runtime.InteropServices;
 
 namespace AppStore
 {
-    public class MainForm : UIForm
+    /// <summary>
+    /// 主窗体类，负责应用程序的主界面显示和交互
+    /// </summary>
+    public class MainForm : Form
     {
-        [DllImport("Gdi32.dll", EntryPoint = "CreateRoundRectRgn")]
-        private static extern IntPtr CreateRoundRectRgn(
-            int nLeftRect,
-            int nTopRect,
-            int nRightRect,
-            int nBottomRect,
-            int nWidthEllipse,
-            int nHeightEllipse
-        );
-
-        [DllImport("dwmapi.dll")]
-        private static extern int DwmExtendFrameIntoClientArea(IntPtr hWnd, ref MARGINS pMarInset);
-
-        [DllImport("dwmapi.dll")]
-        private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize);
-
-        [DllImport("dwmapi.dll")]
-        private static extern int DwmIsCompositionEnabled(ref int pfEnabled);
-
-        private struct MARGINS
-        {
-            public int leftWidth;
-            public int rightWidth;
-            public int topHeight;
-            public int bottomHeight;
-        }
-
-        private const int DWMWA_WINDOW_CORNER_PREFERENCE = 33;
-        private const int DWMWCP_ROUND = 2;
-
         private static readonly string CacheDir = Path.Combine(
             Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
             "zsyg", "kortapp-z", ".cache");
@@ -155,10 +126,6 @@ namespace AppStore
         private Button btnAbout = null!;
         // 内容显示面板
         private Panel contentPanel = null!;
-        // 系统托盘图标
-        private NotifyIcon trayIcon = null!;
-        // 托盘右键菜单
-        private ContextMenuStrip trayMenu = null!;
 
         /// <summary>
         /// 初始化窗体组件
@@ -168,67 +135,10 @@ namespace AppStore
             // 设置窗体基本属性
             // 窗体基本设置
             this.Text = "kortapp-z";
-            this.Size = new Size(1430, 1050);
+            this.Size = new Size(1430, 1050); // 增加窗体高度
-            this.MinimumSize = new Size(600, 600);
+            this.MinimumSize = new Size(600, 600); // 设置最小尺寸
             this.StartPosition = FormStartPosition.CenterScreen;
-            this.Icon = new Icon("img/ico/icon.ico");
+            this.Icon = new Icon("img/ico/icon.ico"); // 设置窗体图标
-            this.Style = UIStyle.Custom;
-            this.FormBorderStyle = FormBorderStyle.None;
-            
-            // 应用现代化圆角
-            this.Region = Region.FromHrgn(CreateRoundRectRgn(0, 0, Width, Height, 
-                ThemeManager.FormRadius, ThemeManager.FormRadius));
-
-            // 启用窗口阴影
-            if (Environment.OSVersion.Version.Major >= 6)
-            {
-                int val = DWMWCP_ROUND;
-                DwmSetWindowAttribute(this.Handle, DWMWA_WINDOW_CORNER_PREFERENCE, ref val, sizeof(int));
-
-                MARGINS margins = new MARGINS()
-                {
-                    leftWidth = 1,
-                    rightWidth = 1,
-                    topHeight = 1,
-                    bottomHeight = 1
-                };
-                DwmExtendFrameIntoClientArea(this.Handle, ref margins);
-            }
-
-            // 初始化系统托盘
-            trayMenu = new ContextMenuStrip();
-            trayMenu.Items.Add("打开", null, (s, e) => {
-                this.Show();
-                this.WindowState = FormWindowState.Normal;
-            });
-            trayMenu.Items.Add("退出", null, (s, e) => Application.Exit());
-
-            trayIcon = new NotifyIcon();
-            trayIcon.Text = "kortapp-z";
-            trayIcon.Icon = new Icon("img/ico/icon.ico");
-            trayIcon.ContextMenuStrip = trayMenu;
-            trayIcon.Visible = true;
-            trayIcon.DoubleClick += (s, e) => {
-                this.Show();
-                this.WindowState = FormWindowState.Normal;
-            };
-
-            // 窗体最小化到托盘处理
-            this.Resize += (s, e) => {
-                if (this.WindowState == FormWindowState.Minimized)
-                {
-                    this.Hide();
-                }
-            };
-
-            // 窗体关闭按钮处理 - 隐藏到托盘而不是退出
-            this.FormClosing += (s, e) => {
-                if (e.CloseReason == CloseReason.UserClosing)
-                {
-                    e.Cancel = true;
-                    this.Hide();
-                }
-            };
 
             // 注册主题变更事件
             ThemeManager.ThemeChanged += (theme) => 
@@ -241,69 +151,13 @@ namespace AppStore
             // 现代化顶部导航栏
             Panel buttonPanel = new Panel();
             buttonPanel.Dock = DockStyle.Top;
-            buttonPanel.Height = 80;
+            buttonPanel.Height = 70;
             buttonPanel.BackColor = ThemeManager.ControlBackgroundColor;
-            buttonPanel.Padding = new Padding(15, 20, 15, 5);
+            buttonPanel.Padding = new Padding(10, 15, 10, 0);
             buttonPanel.AutoScroll = true;
             buttonPanel.AutoSize = true;
             buttonPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
             
-            // 添加支持作者按钮
-            UIButton btnSupport = new UIButton();
-            btnSupport.Text = "支持作者";
-            btnSupport.Font = new Font("微软雅黑", 10F, FontStyle.Bold);
-            btnSupport.Size = new Size(120, 45);
-            btnSupport.Location = new Point(buttonPanel.Width - 140, 15);
-            btnSupport.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            btnSupport.Style = UIStyle.Custom;
-            btnSupport.FillColor = ThemeManager.AccentColor;
-            btnSupport.ForeColor = Color.White;
-            btnSupport.Click += (s, e) => {
-                // 使用SunnyUI的现代化MessageBox
-                var form = new UIForm();
-                form.Style = UIStyle.Custom;
-                form.Text = "支持作者";
-                form.Size = new Size(400, 200);
-                form.StartPosition = FormStartPosition.CenterParent;
-
-                var label = new Label();
-                label.Text = "您确定要前往GitHub支持作者吗？";
-                label.Font = new Font("Microsoft YaHei", 10);
-                label.AutoSize = false;
-                label.Size = new Size(300, 40);
-                label.TextAlign = ContentAlignment.MiddleCenter;
-                label.Location = new Point(50, 40);
-                form.Controls.Add(label);
-
-                var btnOK = new UIButton();
-                btnOK.Text = "确定";
-                btnOK.Style = UIStyle.Custom;
-                btnOK.Size = new Size(80, 30);
-                btnOK.Location = new Point(120, 100);
-                btnOK.Click += (s, e) => {
-                    form.DialogResult = DialogResult.OK;
-                    form.Close();
-                };
-                form.Controls.Add(btnOK);
-
-                var btnCancel = new UIButton();
-                btnCancel.Text = "取消";
-                btnCancel.Style = UIStyle.Custom;
-                btnCancel.Size = new Size(80, 30);
-                btnCancel.Location = new Point(220, 100);
-                btnCancel.Click += (s, e) => {
-                    form.DialogResult = DialogResult.Cancel;
-                    form.Close();
-                };
-                form.Controls.Add(btnCancel);
-
-                if (form.ShowDialog(this) == DialogResult.OK)
-                {
-                    Process.Start(new ProcessStartInfo("https://github.com/zs-yg/kortapp-z") { UseShellExecute = true });
-                }
-            };
-            buttonPanel.Controls.Add(btnSupport);
-            
             // 导航按钮样式
             Action<Button> styleButton = (Button btn) => {
                 btn.FlatStyle = FlatStyle.Flat;
@@ -388,7 +242,6 @@ namespace AppStore
             contentPanel.Dock = DockStyle.Fill;
             contentPanel.BackColor = ThemeManager.BackgroundColor;
             contentPanel.Padding = new Padding(20);
-            contentPanel.AutoScroll = true;
             this.Controls.Add(contentPanel);
 
             // 添加分隔线
@@ -605,6 +458,44 @@ namespace AppStore
             };
             flowPanel.Controls.Add(systemInfoCard);
 
+            // 视频压缩工具卡片
+            var videoCompressorCard = new ToolCard();
+            videoCompressorCard.ToolName = "视频压缩工具";
+            
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "video_compressor.png");
+                if (File.Exists(iconPath))
+                {
+                    videoCompressorCard.ToolIcon = Image.FromFile(iconPath);
+                }
+                else
+                {
+                    videoCompressorCard.ToolIcon = SystemIcons.Shield.ToBitmap();
+                }
+            }
+            catch
+            {
+                videoCompressorCard.ToolIcon = SystemIcons.Shield.ToBitmap();
+            }
+            
+            videoCompressorCard.UpdateDisplay();
+            videoCompressorCard.ToolCardClicked += (s, e) => {
+                try {
+                    string toolPath = Path.Combine(Application.StartupPath, "resource", "video_compressor.exe");
+                    if (File.Exists(toolPath)) {
+                        Process.Start(toolPath);
+                    } else {
+                        MessageBox.Show("视频压缩工具未找到，请确保已正确安装", "错误", 
+                            MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                } catch (Exception ex) {
+                    MessageBox.Show($"启动视频压缩工具失败: {ex.Message}", "错误", 
+                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            };
+            flowPanel.Controls.Add(videoCompressorCard);
+
             // 计算器工具卡片
             var calculatorCard = new CalculatorToolCard();
             try 
@@ -675,113 +566,45 @@ namespace AppStore
             passwordGeneratorCard.UpdateDisplay();
             flowPanel.Controls.Add(passwordGeneratorCard);
 
-            // 自启动管理工具卡片
+            // 端口检测工具卡片
-            var selfStartingManagerCard = new SelfStartingManagerToolCard();
+            var portCheckerCard = new ToolCard();
+            portCheckerCard.ToolName = "端口检测";
             try 
             {
-                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "Self_starting_management.png");
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "system_info.png");
                 if (File.Exists(iconPath))
                 {
-                    selfStartingManagerCard.ToolIcon = Image.FromFile(iconPath);
+                    portCheckerCard.ToolIcon = Image.FromFile(iconPath);
-                }
-                selfStartingManagerCard.UpdateDisplay();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("加载自启动管理工具图标失败", ex);
-            }
-            flowPanel.Controls.Add(selfStartingManagerCard);
-
-            // 图标提取器工具卡片
-            var iconExtractorCard = new AppStore.Tools.IconExtractor.IconExtractorToolCard();
-            try 
-            {
-                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "ico_extractor.png");
-                if (File.Exists(iconPath))
-                {
-                    iconExtractorCard.ToolIcon = Image.FromFile(iconPath);
-                }
-                iconExtractorCard.UpdateDisplay();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("加载图标提取器图标失败", ex);
-            }
-            flowPanel.Controls.Add(iconExtractorCard);
-
-            // 文本转换器工具卡片
-            var textConverterCard = new ToolCard();
-            textConverterCard.ToolName = "文本转换器";
-            try 
-            {
-                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "text converter.png");
-                if (File.Exists(iconPath))
-                {
-                    textConverterCard.ToolIcon = Image.FromFile(iconPath);
                 }
                 else
                 {
-                    textConverterCard.ToolIcon = SystemIcons.Shield.ToBitmap();
+                    portCheckerCard.ToolIcon = SystemIcons.Shield.ToBitmap();
                 }
             }
             catch
             {
-                textConverterCard.ToolIcon = SystemIcons.Shield.ToBitmap();
+                portCheckerCard.ToolIcon = SystemIcons.Shield.ToBitmap();
             }
-            
+            portCheckerCard.ToolCardClicked += (s, e) => {
-            textConverterCard.UpdateDisplay();
-            textConverterCard.ToolCardClicked += (s, e) => {
                 try {
-                    string toolPath = Path.Combine(Application.StartupPath, "resource", "text_converter.exe");
+                    string toolPath = Path.Combine(Application.StartupPath, "resource", "NetWorkManager", "NetWorkManager.exe");
-                    if (File.Exists(toolPath)) {
+                    string absolutePath = Path.GetFullPath(toolPath);
-                        Process.Start(toolPath);
+                    if (File.Exists(absolutePath)) {
+                        Process.Start(new ProcessStartInfo {
+                            FileName = absolutePath,
+                            WorkingDirectory = Path.GetDirectoryName(absolutePath)
+                        });
                     } else {
-                        MessageBox.Show("文本转换器工具未找到，请确保已正确安装", "错误", 
+                        MessageBox.Show($"端口检测工具未找到，请确保已正确安装。路径: {absolutePath}", "错误", 
                             MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 } catch (Exception ex) {
-                    MessageBox.Show($"启动文本转换器失败: {ex.Message}", "错误", 
+                    MessageBox.Show($"启动端口检测工具失败: {ex.Message}", "错误", 
                         MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             };
-            flowPanel.Controls.Add(textConverterCard);
+            portCheckerCard.UpdateDisplay();
-
+            flowPanel.Controls.Add(portCheckerCard);
-            // 图片转换器工具卡片
-            var imageConverterCard = new ToolCard();
-            imageConverterCard.ToolName = "图片转换器";
-            try 
-            {
-                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "Image_format_converter.png");
-                if (File.Exists(iconPath))
-                {
-                    imageConverterCard.ToolIcon = Image.FromFile(iconPath);
-                }
-                else
-                {
-                    imageConverterCard.ToolIcon = SystemIcons.Shield.ToBitmap();
-                }
-            }
-            catch
-            {
-                imageConverterCard.ToolIcon = SystemIcons.Shield.ToBitmap();
-            }
-            
-            imageConverterCard.UpdateDisplay();
-            imageConverterCard.ToolCardClicked += (s, e) => {
-                try {
-                    string toolPath = Path.Combine(Application.StartupPath, "resource", "image_converter.exe");
-                    if (File.Exists(toolPath)) {
-                        Process.Start(toolPath);
-                    } else {
-                        MessageBox.Show("图片转换器工具未找到，请确保已正确安装", "错误", 
-                            MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                } catch (Exception ex) {
-                    MessageBox.Show($"启动图片转换器失败: {ex.Message}", "错误", 
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            };
-            flowPanel.Controls.Add(imageConverterCard);
 
             }
             catch (Exception ex)
@@ -850,11 +673,11 @@ namespace AppStore
             flowPanel.Dock = DockStyle.Fill;
             flowPanel.AutoScroll = true;
             flowPanel.Padding = new Padding(15, 15, 15, 15);
-            flowPanel.WrapContents = false;
+            flowPanel.WrapContents = true;
             flowPanel.Margin = new Padding(0);
             flowPanel.AutoSize = true;
             flowPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            flowPanel.AutoScrollMinSize = new Size(0, 5000);
+            flowPanel.AutoScrollMinSize = new Size(0, 3350);
 
             // 创建搜索框
             TextBox searchBox = new TextBox();
@@ -882,11 +705,11 @@ namespace AppStore
             flowPanel.Dock = DockStyle.Fill;
             flowPanel.AutoScroll = true;
             flowPanel.Padding = new Padding(15, 60, 15, 15);
-            flowPanel.WrapContents = false;
+            flowPanel.WrapContents = true;
             flowPanel.Margin = new Padding(0);
             flowPanel.AutoSize = true;
             flowPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            flowPanel.AutoScrollMinSize = new Size(0, 5000);
+            flowPanel.AutoScrollMinSize = new Size(0, 3350);
             contentPanel.Controls.Add(flowPanel);
 
             // 添加窗体关闭事件处理
@@ -924,7 +747,7 @@ namespace AppStore
             flowPanel.Margin = new Padding(0);
             flowPanel.AutoSize = true;
             flowPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            flowPanel.AutoScrollMinSize = new Size(0, 4050);//大概一行250像素
+            flowPanel.AutoScrollMinSize = new Size(0, 3350);
             contentPanel.Controls.Add(flowPanel);
 
             // 添加所有应用卡片并恢复位置
@@ -932,7 +755,7 @@ namespace AppStore
 
             flowPanel.Controls.Add(CreateAppCard(
                 "XDM",
-                "https://ghproxy.net/https://github.com/subhra74/xdm/releases/download/7.2.11/xdm-setup.msi",
+                "https://hub.gitmirror.com/https://github.com/subhra74/xdm/releases/download/7.2.11/xdm-setup.msi",
                 "img/png/XDM.png"));
 
             flowPanel.Controls.Add(CreateAppCard(
@@ -997,14 +820,9 @@ namespace AppStore
 
             flowPanel.Controls.Add(CreateAppCard(
                 "Msys2",
-                "https://ghproxy.net/https://github.com/msys2/msys2-installer/releases/download/2025-02-21/msys2-x86_64-20250221.exe",
+                "https://hub.gitmirror.com/https://github.com/msys2/msys2-installer/releases/download/2025-02-21/msys2-x86_64-20250221.exe",
                 "img/png/MSYS2.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "OpenJDK by Azul JDKs",
-                "https://cdn.azul.com/zulu/bin/zulu21.42.19-ca-jdk21.0.7-win_x64.msi",
-                "img/png/Azul_JDKs.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 ".NET SDK 8.0",
                 "https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/sdk-8.0.411-windows-x64-installer",
@@ -1040,16 +858,6 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/game1024/OpenSpeedy/releases/download/v1.7.1/OpenSpeedy-v1.7.1.zip",
                 "img/png/openspeedy.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "Final2x",
-                "https://ghproxy.net/https://github.com/Tohrusky/Final2x/releases/download/2024-12-14/Final2x-windows-x64-setup.exe",
-                "img/png/Final2x.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "Pixpin",
-                "https://download.pixpin.cn/PixPin_2.0.0.3.exe",
-                "img/png/pixpin.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "QuickLook",
                 "https://ghproxy.net/https://github.com/QL-Win/QuickLook/releases/download/4.0.2/QuickLook-4.0.2.exe",
@@ -1065,31 +873,11 @@ namespace AppStore
                 "https://visualstudio.microsoft.com/zh-hans/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false",
                 "img/jpg/vs.jpg"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "vs build tools 2019",
-                "https://download.visualstudio.microsoft.com/download/pr/8918edd5-ae24-4ac8-b90a-5e30583f8261/df275a4c77916fe65e39d24e85eafb369c4ee458cc3dd627b920fe18a4606ce0/vs_BuildTools.exe",
-                "img/jpg/vs.jpg"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "vs build tools 2022",
-                "https://download.visualstudio.microsoft.com/download/pr/13907dbe-8bb3-4cfe-b0ae-147e70f8b2f3/a3193e6e6135ef7f598d6a9e429b010d77260dba33dddbee343a47494b5335a3/vs_BuildTools.exe",
-                "img/jpg/vs.jpg"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "VSCodium",
                 "https://visualstudio.microsoft.com/zh-hans/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false",
                 "img/png/codium_cnl.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "Dev-C++",
-                "https://down.wsyhn.com/23_355739",
-                "img/png/Dev-C++.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "Code::Blocks",
-                "https://down.wsyhn.com/23_277571",
-                "img/png/CodeBlocks.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "7-Zip",
                 "https://objects.githubusercontent.com/github-production-release-asset-2e65be/466446150/1645817e-3677-4207-93ff-e62de7e147be?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250613%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250613T035936Z&X-Amz-Expires=300&X-Amz-Signature=5e02d5fc34f45bd8308029c9fc78052007e9475ce0e32775619921cb8f3b83ea&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3D7z2409-x64.exe&response-content-type=application%2Foctet-stream",
@@ -1130,14 +918,9 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/hiroi-sora/Umi-OCR/releases/download/v2.1.5/Umi-OCR_Paddle_v2.1.5.7z.exe",
                 "img/png/Umi-OCR.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "pocketbase",
-                "https://ghproxy.net/https://github.com/pocketbase/pocketbase/releases/download/v0.28.4/pocketbase_0.28.4_windows_amd64.zip",
-                "img/png/pocketbase.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "frp",
-                "https://ghproxy.net/https://github.com/fatedier/frp/releases/download/v0.62.1/frp_0.62.1_windows_amd64.zip",
+                "https://hub.gitmirror.com/https://github.com/fatedier/frp/releases/download/v0.62.1/frp_0.62.1_windows_amd64.zip",
                 ""));
 
             flowPanel.Controls.Add(CreateAppCard(
@@ -1251,31 +1034,6 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/vladelaina/Catime/releases/download/v1.1.1/catime_1.1.1.exe",
                 "img/png/catime_resize.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "Cataclysm-DDA",
-                "https://ghproxy.cn/https://github.com/CleverRaven/Cataclysm-DDA/releases/download/0.H-RELEASE/cdda-windows-with-graphics-and-sounds-x64-2024-11-23-1857.zip",
-                "img/png/Cataclysm-DDA.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "gophish",
-                "https://ghproxy.cn/https://github.com/gophish/gophish/releases/download/v0.12.1/gophish-v0.12.1-windows-64bit.zip",
-                "img/png/gophish.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "NoteGen",
-                "https://ghproxy.cn/https://github.com/codexu/note-gen/releases/download/note-gen-v0.19.3/NoteGen_0.19.3_x64-setup.exe",
-                "img/png/NoteGen.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "hashcat",
-                "https://ghproxy.cn/https://github.com/hashcat/hashcat/releases/download/v6.2.6/hashcat-6.2.6.7z",
-                "img/png/hashcat.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "rpg-cli",
-                "https://gh-proxy.com/https://github.com/facundoolano/rpg-cli/releases/download/1.2.0/rpg-cli-1.2.0-windows.exe",
-                ""));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "fluxy",
                 "https://ghproxy.net/https://github.com/alley-rs/fluxy/releases/download/v0.1.17/fluxy_0.1.17_x64-setup.exe",
@@ -1286,56 +1044,16 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/vnotex/vnote/releases/download/v3.19.2/VNote-3.19.2-win64.zip",
                 "img/png/vnote.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "notepad--",
-                "https://www.ghproxy.cn/https://github.com/cxasm/notepad--/releases/download/notepad-v3.3/Notepad--v3.3-plugin-Installer.exe",
-                "img/png/notepad--.png"));
-                
-            flowPanel.Controls.Add(CreateAppCard(
-                "chatlog",
-                "https://www.ghproxy.cn/https://github.com/sjzar/chatlog/releases/download/v0.0.15/chatlog_0.0.15_windows_amd64.zip",
-                "img/jpg/github.jpg"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "PowerToys",
                 "https://ghproxy.net/https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysSetup-0.91.1-x64.exe",
                 "img/png/PowerToys.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "Powershell",
-                "https://ghproxy.net/https://github.com/Powershell/Powershell/releases/download/v7.5.2/Powershell-7.5.2-win-x64.exe",
-                "img/png/powershell.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "terminal",
                 "https://ghproxy.net/https://github.com/microsoft/terminal/releases/download/v1.22.11141.0/Microsoft.WindowsTerminal_1.22.11141.0_x64.zip",
                 "img/png/terminal.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "edit",
-                "https://ghproxy.net/https://github.com/microsoft/edit/releases/download/v1.2.0/edit-1.2.0-x86_64-windows.zip",
-                "img/png/edit.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "github_cli",
-                "https://ghproxy.cn/https://github.com/cli/cli/releases/download/v2.74.2/gh_2.74.2_windows_arm64.msi",
-                "img/png/github_cli.png"));
-                
-            flowPanel.Controls.Add(CreateAppCard(
-                "VideoCaptioner",
-                "https://ghproxy.cn/https://github.com/WEIFENG2333/VideoCaptioner/releases/download/v1.3.3/VideoCaptioner-Setup-win64-v1.3.3.exe",
-                "img/png/VideoCaptioner.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "ReactOS",
-                "https://ghproxy.cn/https://github.com/reactos/reactos/releases/download/0.4.15-release/ReactOS-0.4.15-release-1-gdbb43bbaeb2-x86-iso.zip",
-                "img/png/ReactOS.png"));
-
-            flowPanel.Controls.Add(CreateAppCard(
-                "Ubuntu桌面发行版",
-                "https://releases.ubuntu.com/24.04/ubuntu-24.04.2-desktop-amd64.iso",
-                "img/png/Ubuntu.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "typescript",
                 "https://ghproxy.net/https://github.com/microsoft/TypeScript/releases/download/v5.8.3/typescript-5.8.3.tgz",
@@ -1346,11 +1064,6 @@ namespace AppStore
                 "https://mirror.nju.edu.cn/gimp/gimp/v3.0/windows/gimp-3.0.4-setup.exe",
                 "img/jpg/Gimp.jpg"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "ClamAV",
-                "https://www.clamav.net/downloads/production/clamav-1.4.3.win.x64.msi",
-                "img/png/ClamAV.png"));
-
             flowPanel.Controls.Add(CreateAppCard(
                 "Shotcut",
                 "https://sourceforge.net/projects/shotcut/files/v25.05.11/shotcut-win64-250511.exe/download",
@@ -1506,11 +1219,6 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/cloudreve/cloudreve/releases/download/3.8.3/cloudreve_3.8.3_windows_amd64.zip",
                 "img/png/cloudreve.png"));
 
-            flowPanel.Controls.Add(CreateAppCard(
-                "ollama",
-                "https://www.ghproxy.cn/https://github.com/ollama/ollama/releases/download/v0.9.5/OllamaSetup.exe",
-                "img/png/ollama.png"));
-	
             flowPanel.Controls.Add(CreateAppCard(
                 "SeelenUI",
                 "https://ghproxy.net/https://github.com/eythaann/Seelen-UI/releases/download/v2.3.8/Seelen.UI_2.3.8_x64-setup.exe",

SettingsForm.cs

@@ -3,7 +3,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
 using System.Drawing;
-using System.Text.Json;
 
 namespace AppStore
 {
@@ -50,43 +49,7 @@ namespace AppStore
             btnCleanLogs.Click += (s, e) => CleanLogs();
             this.Controls.Add(btnCleanLogs);
 
-            // 下载路径设置
-            Label lblDownloadPath = new Label();
-            lblDownloadPath.Text = "下载路径:";
-            lblDownloadPath.AutoSize = true;
-            lblDownloadPath.Location = new Point((this.Width - 300) / 2, 170);
-            lblDownloadPath.Font = new Font("Microsoft YaHei", 10);
-            lblDownloadPath.Anchor = AnchorStyles.Top;
-            this.Controls.Add(lblDownloadPath);
-
-            TextBox txtDownloadPath = new TextBox();
-            txtDownloadPath.Size = new Size(300, 30);
-            txtDownloadPath.Location = new Point((this.Width - 300) / 2, 200);
-            txtDownloadPath.Font = new Font("Microsoft YaHei", 10);
-            txtDownloadPath.Anchor = AnchorStyles.Top;
-            txtDownloadPath.ReadOnly = true;
-            this.Controls.Add(txtDownloadPath);
-
-            Button btnBrowse = new Button();
-            btnBrowse.Text = "浏览...";
-            btnBrowse.Size = new Size(80, 30);
-            btnBrowse.Location = new Point(txtDownloadPath.Right + 10, 200);
-            btnBrowse.Font = new Font("Microsoft YaHei", 10);
-            btnBrowse.Anchor = AnchorStyles.Top;
-            btnBrowse.Click += (s, e) => BrowseDownloadPath(txtDownloadPath);
-            this.Controls.Add(btnBrowse);
-
-            Button btnSavePath = new Button();
-            btnSavePath.Text = "保存路径";
-            btnSavePath.Size = new Size(100, 30);
-            btnSavePath.Location = new Point((this.Width - 100) / 2, 240);
-            btnSavePath.Font = new Font("Microsoft YaHei", 10);
-            btnSavePath.Anchor = AnchorStyles.Top;
-            btnSavePath.Click += (s, e) => SaveDownloadPath(txtDownloadPath.Text);
-            this.Controls.Add(btnSavePath);
-
             ThemeManager.ThemeChanged += OnThemeChanged;
-            LoadDownloadPath(txtDownloadPath);
         }
 
         private void SwitchTheme(ThemeManager.ThemeMode theme)
@@ -121,103 +84,5 @@ namespace AppStore
                 MessageBox.Show($"清理日志时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
-
-        private void BrowseDownloadPath(TextBox txtBox)
-        {
-            using (FolderBrowserDialog dialog = new FolderBrowserDialog())
-            {
-                dialog.Description = "选择下载路径";
-                if (dialog.ShowDialog() == DialogResult.OK)
-                {
-                    txtBox.Text = dialog.SelectedPath;
-                }
-            }
-        }
-
-        private void SaveDownloadPath(string path)
-        {
-            try
-            {
-                // 验证路径
-                if (string.IsNullOrWhiteSpace(path))
-                {
-                    MessageBox.Show("下载路径不能为空", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                // 尝试创建目录（如果不存在）
-                try
-                {
-                    Directory.CreateDirectory(path);
-                    
-                    // 验证目录是否可写
-                    string testFile = Path.Combine(path, "write_test.tmp");
-                    File.WriteAllText(testFile, "test");
-                    File.Delete(testFile);
-                }
-                catch
-                {
-                    MessageBox.Show($"无法访问路径: {path}\n请确保路径存在且有写入权限", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                // 保存路径
-                string dlPathDir = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                    "zsyg", "kortapp-z", ".date", "dl_path");
-                
-                if (!Directory.Exists(dlPathDir))
-                {
-                    Directory.CreateDirectory(dlPathDir);
-                }
-
-                string jsonPath = Path.Combine(dlPathDir, "download_path.json");
-                var jsonData = new { DownloadPath = path };
-                string jsonString = JsonSerializer.Serialize(jsonData);
-                
-                File.WriteAllText(jsonPath, jsonString);
-                
-                MessageBox.Show($"下载路径已保存到:\n{path}", "成功", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("保存下载路径时出错", ex);
-                MessageBox.Show($"保存下载路径时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void LoadDownloadPath(TextBox txtBox)
-        {
-            // 默认下载路径为用户文件夹下的Downloads
-            string defaultPath = Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), 
-                "Downloads");
-
-            try
-            {
-                string jsonPath = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                    "zsyg", "kortapp-z", ".date", "dl_path", "download_path.json");
-                
-                if (File.Exists(jsonPath))
-                {
-                    string jsonString = File.ReadAllText(jsonPath);
-                    var jsonData = JsonSerializer.Deserialize<JsonElement>(jsonString);
-                    string customPath = jsonData.GetProperty("DownloadPath").GetString() ?? "";
-                    
-                    // 如果自定义路径有效则显示，否则显示默认路径
-                    txtBox.Text = !string.IsNullOrWhiteSpace(customPath) ? customPath : defaultPath;
-                }
-                else
-                {
-                    txtBox.Text = defaultPath;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("加载下载路径时出错", ex);
-                txtBox.Text = defaultPath;
-            }
-        }
     }
 }

ThemeManager.cs

@@ -42,8 +42,6 @@ namespace AppStore
             try
             {
                 var dir = Path.GetDirectoryName(ThemeConfigPath);
-                if (dir == null) return;
-                
                 if (!Directory.Exists(dir))
                 {
                     Directory.CreateDirectory(dir);
@@ -58,26 +56,18 @@ namespace AppStore
         }
         
         // 浅色主题颜色
-        private static readonly Color LightBackground = Color.FromArgb(250, 250, 250);
+        private static readonly Color LightBackground = Color.FromArgb(255, 255, 255);
-        private static readonly Color LightControlBackground = Color.FromArgb(245, 245, 245);
+        private static readonly Color LightControlBackground = Color.FromArgb(240, 240, 240);
-        private static readonly Color LightText = Color.FromArgb(40, 40, 40);
+        private static readonly Color LightText = Color.FromArgb(30, 30, 30);
-        private static readonly Color LightButtonHover = Color.FromArgb(235, 235, 235);
+        private static readonly Color LightButtonHover = Color.FromArgb(230, 230, 230);
-        private static readonly Color LightButtonActive = Color.FromArgb(225, 225, 225);
+        private static readonly Color LightButtonActive = Color.FromArgb(220, 220, 220);
-        private static readonly Color LightAccent = Color.FromArgb(0, 120, 215);
-        private static readonly Color LightAccentLight = Color.FromArgb(0, 150, 245);
         
         // 深色主题颜色
-        private static readonly Color DarkBackground = Color.FromArgb(25, 25, 25);
+        private static readonly Color DarkBackground = Color.FromArgb(30, 30, 30);
-        private static readonly Color DarkControlBackground = Color.FromArgb(40, 40, 40);
+        private static readonly Color DarkControlBackground = Color.FromArgb(45, 45, 45);
-        private static readonly Color DarkText = Color.FromArgb(245, 245, 245);
+        private static readonly Color DarkText = Color.FromArgb(240, 240, 240);
-        private static readonly Color DarkButtonHover = Color.FromArgb(55, 55, 55);
+        private static readonly Color DarkButtonHover = Color.FromArgb(60, 60, 60);
-        private static readonly Color DarkButtonActive = Color.FromArgb(65, 65, 65);
+        private static readonly Color DarkButtonActive = Color.FromArgb(70, 70, 70);
-        private static readonly Color DarkBorder = Color.FromArgb(70, 70, 70);
-        private static readonly Color DarkAccent = Color.FromArgb(0, 150, 245);
-        private static readonly Color DarkAccentLight = Color.FromArgb(0, 180, 255);
-        
-        // 浅色主题边框颜色
-        private static readonly Color LightBorder = Color.FromArgb(200, 200, 200);
 
         public static event Action<ThemeMode> ThemeChanged = delegate {};
 
@@ -110,19 +100,6 @@ namespace AppStore
         public static Color ButtonActiveColor => 
             _currentTheme == ThemeMode.Light ? LightButtonActive : DarkButtonActive;
 
-        public static Color BorderColor => 
-            _currentTheme == ThemeMode.Light ? LightBorder : DarkBorder;
-
-        public static Color AccentColor =>
-            _currentTheme == ThemeMode.Light ? LightAccent : DarkAccent;
-
-        public static Color AccentLightColor =>
-            _currentTheme == ThemeMode.Light ? LightAccentLight : DarkAccentLight;
-
-        public static int ControlRadius => 8;
-
-        public static int FormRadius => 12;
-
         public static void ApplyTheme(Control control)
         {
             ApplyThemeToControl(control);
@@ -139,9 +116,6 @@ namespace AppStore
                 button.FlatAppearance.BorderSize = 0;
                 button.FlatAppearance.MouseOverBackColor = ButtonHoverColor;
                 button.FlatAppearance.MouseDownBackColor = ButtonActiveColor;
-                button.BackColor = ControlBackgroundColor;
-                button.Font = new Font(button.Font, FontStyle.Bold);
-                button.Padding = new Padding(10, 5, 10, 5);
             }
 
             foreach (Control childControl in control.Controls)

docs/features.html

@@ -17,7 +17,21 @@
             <h2>核心功能</h2>
             
             <article class="feature">
-                <h3>目前没有什么东西，别看了，害羞(✿◡‿◡)
+                <h3>应用程序管理</h3>
+                <p>批量安装、卸载(目前没有)和更新应用程序（目前没有），管理启动项（目前没有）。</p>
+                <p>优势：集中管理所有应用，节省时间，避免系统臃肿。</p>
+            </article>
+            
+            <article class="feature">
+                <h3>资源监控（之后可能在内置工具里有）</h3>
+                <p>实时监控CPU、内存、磁盘和网络使用情况。</p>
+                <p>优势：直观的图表展示，及时发现资源瓶颈。</p>
+            </article>
+            
+            <article class="feature">
+                <h3>文件管理（之后可能在内置工具里有）</h3>
+                <p>高级文件搜索、批量重命名和快速文件分类。</p>
+                <p>优势：提升文件管理效率，支持正则表达式搜索。</p>
             </article>
         </section>
     </main>

inno/innosetup_x64.iss

@@ -2,10 +2,10 @@
 ; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
 
 #define MyAppName "kortapp-z"
-#define MyAppVersion "1.3.3"
+#define MyAppVersion "1.1.2"
 #define MyAppPublisher "zsyg"
 #define MyAppURL "https://github.com/zs-yg/kortapp-z"
-#define MyAppExeName "kortapp-z.exe"
+#define MyAppExeName "kortapp.exe"
 #define MyAppAssocName MyAppName + ""
 #define MyAppAssocExt ".exe"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt

inno/innosetup_x86.iss

@@ -2,10 +2,10 @@
 ; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
 
 #define MyAppName "kortapp-z"
-#define MyAppVersion "1.3.3"
+#define MyAppVersion "1.1.2"
 #define MyAppPublisher "zsyg"
 #define MyAppURL "https://github.com/zs-yg/kortapp-z"
-#define MyAppExeName "kortapp-z.exe"
+#define MyAppExeName "kortapp.exe"
 #define MyAppAssocName MyAppName + ""
 #define MyAppAssocExt ".exe"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt

logger.cs

@@ -59,35 +59,5 @@ namespace AppStore
             }
             Log(errorMessage);
         }
-
-        public static void LogWarning(string message, Exception? ex = null)
-        {
-            string warningMessage = $"WARNING: {message}";
-            if (ex != null)
-            {
-                warningMessage += $"\nException: {ex}\nStackTrace: {ex.StackTrace}";
-            }
-            Log(warningMessage);
-        }
-
-        public static void LogDebug(string message, Exception? ex = null)
-        {
-            string debugMessage = $"DEBUG: {message}";
-            if (ex != null)
-            {
-                debugMessage += $"\nException: {ex}\nStackTrace: {ex.StackTrace}";
-            }
-            Log(debugMessage);
-        }
-
-        public static void LogTip(string message, Exception? ex = null)
-        {
-            string tipMessage = $"TIP: {message}";
-            if (ex != null)
-            {
-                tipMessage += $"\nException: {ex}\nStackTrace: {ex.StackTrace}";
-            }
-            Log(tipMessage);
-        }
     }
 }

others/C++/Image_format_converter/CMakeLists.txt

@@ -1,77 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(ImageFormatConverter)
-
-# 设置静态编译
-set(CMAKE_EXE_LINKER_FLAGS "-static")
-set(BUILD_SHARED_LIBS OFF)
-set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-
-# 设置C++标准
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# 设置MSYS2库搜索路径
-set(MSYS2_LIB_DIR "C:/msys64/ucrt64/lib")
-
-# 查找依赖库(静态版本)
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(TIFF REQUIRED libtiff-4)
-find_library(TIFF_STATIC_LIB NAMES libtiff.a PATHS ${TIFF_LIBRARY_DIRS})
-
-pkg_check_modules(WEBP REQUIRED libwebp)
-find_library(WEBP_STATIC_LIB NAMES libwebp.a PATHS ${WEBP_LIBRARY_DIRS})
-
-pkg_check_modules(AVIF REQUIRED libavif)
-find_library(AVIF_STATIC_LIB NAMES libavif.a PATHS ${AVIF_LIBRARY_DIRS})
-
-# 使用find_package查找FLTK(静态版本)
-find_package(FLTK REQUIRED)
-find_library(FLTK_STATIC_LIB NAMES libfltk.a PATHS ${FLTK_LIBRARY_DIRS})
-
-# 查找其他依赖库
-find_library(JPEG_STATIC_LIB NAMES libjpeg.a PATHS ${MSYS2_LIB_DIR})
-find_library(ZLIB_STATIC_LIB NAMES libz.a PATHS ${MSYS2_LIB_DIR})
-find_library(ZSTD_STATIC_LIB NAMES libzstd.a PATHS ${MSYS2_LIB_DIR})
-find_library(SHARPYUV_STATIC_LIB NAMES libsharpyuv.a PATHS ${MSYS2_LIB_DIR})
-find_library(JBIG_STATIC_LIB NAMES libjbig.a PATHS ${MSYS2_LIB_DIR})
-find_library(LZMA_STATIC_LIB NAMES liblzma.a PATHS ${MSYS2_LIB_DIR})
-find_library(LIBDEFLATE_STATIC_LIB NAMES libdeflate.a PATHS ${MSYS2_LIB_DIR})
-find_library(LERC_STATIC_LIB NAMES liblerc.a PATHS ${MSYS2_LIB_DIR})
-find_library(AOM_STATIC_LIB NAMES libaom.a PATHS ${MSYS2_LIB_DIR})
-find_library(YUV_STATIC_LIB NAMES libyuv.a PATHS ${MSYS2_LIB_DIR})
-find_library(SVTAV1_ENC_STATIC_LIB NAMES libSvtAv1Enc.a PATHS ${MSYS2_LIB_DIR})
-find_library(RAV1E_STATIC_LIB NAMES librav1e.a PATHS ${MSYS2_LIB_DIR})
-find_library(DAV1D_STATIC_LIB NAMES libdav1d.a PATHS ${MSYS2_LIB_DIR})
-
-# 包含头文件目录
-include_directories(include ${TIFF_INCLUDE_DIRS} ${WEBP_INCLUDE_DIRS} ${FLTK_INCLUDE_DIRS} ${AVIF_INCLUDE_DIRS})
-
-# 收集所有源文件
-file(GLOB SOURCES "src/*.cpp")
-
-# 创建可执行文件(设置为WIN32应用程序避免控制台窗口)
-add_executable(ImageFormatConverter WIN32 ${SOURCES})
-
-# 链接静态库
-target_link_libraries(ImageFormatConverter 
-    ${TIFF_STATIC_LIB} 
-    ${WEBP_STATIC_LIB} 
-    ${FLTK_STATIC_LIB}
-    ${JPEG_STATIC_LIB}
-    ${ZLIB_STATIC_LIB}
-    ${ZSTD_STATIC_LIB}
-    ${SHARPYUV_STATIC_LIB}
-    ${JBIG_STATIC_LIB}
-    ${LZMA_STATIC_LIB}
-    ${LIBDEFLATE_STATIC_LIB}
-    ${LERC_STATIC_LIB}
-    ${AVIF_STATIC_LIB}
-    ${AOM_STATIC_LIB}
-    ${YUV_STATIC_LIB}
-    ${SVTAV1_ENC_STATIC_LIB}
-    ${RAV1E_STATIC_LIB}
-    ${DAV1D_STATIC_LIB}
-    -lstdc++ -lgcc -lwinpthread -lcomctl32 -lole32 -luuid -lws2_32 -lntdll)
-
-# 设置输出目录
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)

others/C++/Image_format_converter/include/avif_to_bmp.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToBmpConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_jpeg.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToJpegConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_jpg.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToJpgConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_png.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToPngConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_tiff.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToTiffConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/avif_to_webp.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class AvifToWebpConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/bmp_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class BmpToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/bmp_to_jpeg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToJpegConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/bmp_to_jpg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToJpgConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/bmp_to_png.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int compression_level = 6);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/bmp_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/bmp_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class BmpToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/common.hpp

@@ -1,25 +0,0 @@
-#pragma once
-#include <vector>
-#include <string>
-#include <memory>
-#include <stb/stb_image.h>
-
-struct ImageData {
-    int width;
-    int height;
-    int channels;
-    std::unique_ptr<unsigned char, void(*)(void*)> pixels;
-    
-    ImageData() : pixels(nullptr, stbi_image_free) {}
-};
-
-enum class ImageFormat {
-    PNG,
-    JPG,
-    TIFF,
-    WEBP,
-    AVIF,
-    UNKNOWN
-};
-
-ImageFormat get_format_from_extension(const std::string& path);

others/C++/Image_format_converter/include/converter_base.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class ConverterBase {
-public:
-    virtual ~ConverterBase() = default;
-    virtual bool convert(const std::string& input, 
-                       const std::string& output) = 0;
-    
-protected:
-    virtual bool validate(const ImageData& data) = 0;
-};

others/C++/Image_format_converter/include/gui_interface.hpp

@@ -1,23 +0,0 @@
-#pragma once
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Input.H>
-#include <FL/Fl_Output.H>
-#include <FL/Fl_Choice.H>
-#include <string>
-
-class MainWindow : public Fl_Window {
-public:
-    MainWindow(int w, int h, const char* title);
-    
-private:
-    Fl_Input* input_path;
-    Fl_Output* output_path;
-    Fl_Choice* format_choice;
-    Fl_Button* convert_btn;
-    
-    static void input_file_cb(Fl_Widget* w, void* data);
-    static void output_file_cb(Fl_Widget* w, void* data);
-    static void convert_cb(Fl_Widget* w, void* data);
-};

others/C++/Image_format_converter/include/image_loader.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include "common.hpp"
-#include <string>
-
-class ImageLoader {
-public:
-    static ImageData load(const std::string& path);
-    static bool save_png(const std::string& path, const ImageData& data);
-    static bool save_jpg(const std::string& path, const ImageData& data, int quality = 90);
-    static void validate_image(const unsigned char* data, int width, int height);
-    
-private:
-};

others/C++/Image_format_converter/include/jpeg_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class JpegToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/jpeg_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpegToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpeg_to_png.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpegToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpeg_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpegToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpeg_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpegToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpg_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class JpgToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/jpg_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpgToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpg_to_png.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpgToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int compression_level = 6);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpg_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpgToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/jpg_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class JpgToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class PngToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/png_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_jpeg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToJpegConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_jpg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToJpgConverter {
-public:
-    static bool convert(const std::string& input_path, 
-                       const std::string& output_path,
-                       int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/png_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class PngToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class TiffToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/tiff_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_jpeg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToJpegConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_jpg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToJpgConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_png.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int compression_level = 6);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/tiff_to_webp.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class TiffToWebpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_avif.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include "converter_base.hpp"
-#include "common.hpp"
-
-class WebpToAvifConverter : public ConverterBase {
-public:
-    bool convert(const std::string& input, const std::string& output) override;
-    
-protected:
-    bool validate(const ImageData& data) override;
-};

others/C++/Image_format_converter/include/webp_to_bmp.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToBmpConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_jpeg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToJpegConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_jpg.hpp

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToJpgConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path,
-                      int quality = 90);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_png.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToPngConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/include/webp_to_tiff.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include "common.hpp"
-
-class WebpToTiffConverter {
-public:
-    static bool convert(const std::string& input_path,
-                      const std::string& output_path);
-    
-private:
-    static bool validate_input(const ImageData& data);
-};

others/C++/Image_format_converter/src/avif_to_bmp.cpp

@@ -1,31 +0,0 @@
-#include "avif_to_bmp.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <avif/avif.h>
-#include <stb/stb_image_write.h>
-
-bool AvifToBmpConverter::convert(const std::string& input_path,
-                              const std::string& output_path) {
-    // 加载AVIF图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate(data)) {
-        return false;
-    }
-
-    // 保存为BMP
-    return stbi_write_bmp(output_path.c_str(),
-                        data.width,
-                        data.height,
-                        data.channels,
-                        data.pixels.get());
-}
-
-bool AvifToBmpConverter::validate(const ImageData& data) {
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/avif_to_jpeg.cpp

@@ -1,32 +0,0 @@
-#include "avif_to_jpeg.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <avif/avif.h>
-#include <stb/stb_image_write.h>
-
-bool AvifToJpegConverter::convert(const std::string& input_path,
-                              const std::string& output_path) {
-    // 加载AVIF图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate(data)) {
-        return false;
-    }
-
-    // 保存为JPEG(默认质量90)
-    return stbi_write_jpg(output_path.c_str(),
-                        data.width,
-                        data.height,
-                        data.channels,
-                        data.pixels.get(),
-                        90);
-}
-
-bool AvifToJpegConverter::validate(const ImageData& data) {
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/avif_to_jpg.cpp

@@ -1,32 +0,0 @@
-#include "avif_to_jpg.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <avif/avif.h>
-#include <stb/stb_image_write.h>
-
-bool AvifToJpgConverter::convert(const std::string& input_path,
-                              const std::string& output_path) {
-    // 加载AVIF图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate(data)) {
-        return false;
-    }
-
-    // 保存为JPG(默认质量90)
-    return stbi_write_jpg(output_path.c_str(),
-                        data.width,
-                        data.height,
-                        data.channels,
-                        data.pixels.get(),
-                        90);
-}
-
-bool AvifToJpgConverter::validate(const ImageData& data) {
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/avif_to_png.cpp

@@ -1,33 +0,0 @@
-#include "avif_to_png.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <avif/avif.h>
-#include <stb/stb_image_write.h>
-
-bool AvifToPngConverter::convert(const std::string& input_path,
-                              const std::string& output_path) {
-    // 加载AVIF图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate(data)) {
-        return false;
-    }
-
-    // 保存为PNG
-    return stbi_write_png(output_path.c_str(),
-                        data.width,
-                        data.height,
-                        data.channels,
-                        data.pixels.get(),
-                        data.width * data.channels);
-}
-
-bool AvifToPngConverter::validate(const ImageData& data) {
-    // 确保是有效的图像数据
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/avif_to_tiff.cpp

@@ -1,65 +0,0 @@
-#include "avif_to_tiff.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <avif/avif.h>
-#include <tiffio.h>
-
-bool AvifToTiffConverter::convert(const std::string& input_path,
-                              const std::string& output_path) {
-    // 加载AVIF图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate(data)) {
-        return false;
-    }
-
-    // 创建TIFF文件
-    TIFF* tif = TIFFOpen(output_path.c_str(), "w");
-    if (!tif) {
-        return false;
-    }
-
-    // 设置TIFF标签
-    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, data.width);
-    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, data.height);
-    TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, data.channels);
-    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
-    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
-    TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-    TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, 
-                (data.channels == 1) ? PHOTOMETRIC_MINISBLACK : 
-                (data.channels == 3) ? PHOTOMETRIC_RGB : PHOTOMETRIC_RGB);
-    TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW);
-
-    // 写入图像数据
-    tsize_t linebytes = data.width * data.channels;
-    unsigned char* buf = nullptr;
-    if (TIFFScanlineSize(tif) == linebytes) {
-        buf = (unsigned char*)_TIFFmalloc(linebytes);
-    } else {
-        buf = (unsigned char*)_TIFFmalloc(TIFFScanlineSize(tif));
-    }
-
-    for (uint32_t row = 0; row < data.height; row++) {
-        memcpy(buf, &data.pixels.get()[row * linebytes], linebytes);
-        if (TIFFWriteScanline(tif, buf, row, 0) < 0) {
-            _TIFFfree(buf);
-            TIFFClose(tif);
-            return false;
-        }
-    }
-
-    // 清理资源
-    _TIFFfree(buf);
-    TIFFClose(tif);
-    return true;
-}
-
-bool AvifToTiffConverter::validate(const ImageData& data) {
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 1 || data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/avif_to_webp.cpp

@@ -1,50 +0,0 @@
-#include "avif_to_webp.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <avif/avif.h>
-#include <webp/encode.h>
-
-bool AvifToWebpConverter::convert(const std::string& input_path,
-                              const std::string& output_path) {
-    // 加载AVIF图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate(data)) {
-        return false;
-    }
-
-    // 保存为WEBP
-    FILE* f = fopen(output_path.c_str(), "wb");
-    if (!f) {
-        return false;
-    }
-
-    uint8_t* output = nullptr;
-    size_t size = 0;
-    if (data.channels == 3) {
-        size = WebPEncodeRGB(data.pixels.get(), data.width, data.height,
-                            data.width * 3, 90, &output);
-    } else if (data.channels == 4) {
-        size = WebPEncodeRGBA(data.pixels.get(), data.width, data.height,
-                            data.width * 4, 90, &output);
-    }
-
-    if (size == 0 || !output) {
-        fclose(f);
-        return false;
-    }
-
-    fwrite(output, 1, size, f);
-    fclose(f);
-    WebPFree(output);
-    return true;
-}
-
-bool AvifToWebpConverter::validate(const ImageData& data) {
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/bmp_to_avif.cpp

@@ -1,71 +0,0 @@
-#include "bmp_to_avif.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <avif/avif.h>
-#include <stb/stb_image.h>
-
-bool BmpToAvifConverter::convert(const std::string& input_path,
-                              const std::string& output_path) {
-    // 加载BMP图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate(data)) {
-        return false;
-    }
-
-    // 创建AVIF编码器
-    avifEncoder* encoder = avifEncoderCreate();
-    encoder->maxThreads = 4;
-    encoder->minQuantizer = 20;
-    encoder->maxQuantizer = 20;
-    encoder->speed = 6;
-
-    // 创建AVIF图像
-    avifImage* image = avifImageCreate(data.width, data.height, 8, AVIF_PIXEL_FORMAT_YUV420);
-    avifRGBImage rgbImage;
-    avifRGBImageSetDefaults(&rgbImage, image);
-    rgbImage.pixels = data.pixels.get();
-    rgbImage.rowBytes = data.width * data.channels;
-    rgbImage.format = (data.channels == 3) ? AVIF_RGB_FORMAT_RGB : AVIF_RGB_FORMAT_RGBA;
-    
-    // 转换RGB到YUV
-    if (avifImageRGBToYUV(image, &rgbImage) != AVIF_RESULT_OK) {
-        avifEncoderDestroy(encoder);
-        avifImageDestroy(image);
-        return false;
-    }
-
-    // 编码AVIF图像
-    avifRWData output = AVIF_DATA_EMPTY;
-    if (avifEncoderWrite(encoder, image, &output) != AVIF_RESULT_OK) {
-        avifEncoderDestroy(encoder);
-        avifImageDestroy(image);
-        return false;
-    }
-
-    // 保存AVIF文件
-    FILE* f = fopen(output_path.c_str(), "wb");
-    if (!f) {
-        avifRWDataFree(&output);
-        avifEncoderDestroy(encoder);
-        avifImageDestroy(image);
-        return false;
-    }
-    fwrite(output.data, 1, output.size, f);
-    fclose(f);
-
-    // 清理资源
-    avifRWDataFree(&output);
-    avifEncoderDestroy(encoder);
-    avifImageDestroy(image);
-    return true;
-}
-
-bool BmpToAvifConverter::validate(const ImageData& data) {
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/bmp_to_jpeg.cpp

@@ -1,35 +0,0 @@
-#include "bmp_to_jpeg.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <stb/stb_image.h>
-#include <stb/stb_image_write.h>
-#include <string>
-
-bool BmpToJpegConverter::convert(const std::string& input_path,
-                              const std::string& output_path,
-                              int quality) {
-    // 加载BMP图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate_input(data)) {
-        return false;
-    }
-
-    // 保存为JPEG
-    return stbi_write_jpg(output_path.c_str(),
-                        data.width,
-                        data.height,
-                        data.channels,
-                        data.pixels.get(),
-                        quality);
-}
-
-bool BmpToJpegConverter::validate_input(const ImageData& data) {
-    // 确保是有效的图像数据
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/bmp_to_jpg.cpp

@@ -1,35 +0,0 @@
-#include "bmp_to_jpg.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <stb/stb_image.h>
-#include <stb/stb_image_write.h>
-#include <string>
-
-bool BmpToJpgConverter::convert(const std::string& input_path,
-                              const std::string& output_path,
-                              int quality) {
-    // 加载BMP图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate_input(data)) {
-        return false;
-    }
-
-    // 保存为JPG
-    return stbi_write_jpg(output_path.c_str(),
-                        data.width,
-                        data.height,
-                        data.channels,
-                        data.pixels.get(),
-                        quality);
-}
-
-bool BmpToJpgConverter::validate_input(const ImageData& data) {
-    // 确保是有效的图像数据
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/bmp_to_png.cpp

@@ -1,35 +0,0 @@
-#include "bmp_to_png.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <stb/stb_image.h>
-#include <stb/stb_image_write.h>
-#include <string>
-
-bool BmpToPngConverter::convert(const std::string& input_path,
-                              const std::string& output_path,
-                              int compression_level) {
-    // 加载BMP图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate_input(data)) {
-        return false;
-    }
-
-    // 保存为PNG
-    return stbi_write_png(output_path.c_str(),
-                        data.width,
-                        data.height,
-                        data.channels,
-                        data.pixels.get(),
-                        data.width * data.channels);
-}
-
-bool BmpToPngConverter::validate_input(const ImageData& data) {
-    // 确保是有效的图像数据
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 1 || data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/bmp_to_tiff.cpp

@@ -1,61 +0,0 @@
-#include "bmp_to_tiff.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <tiffio.h>
-#include <stb/stb_image.h>
-#include <string>
-
-bool BmpToTiffConverter::convert(const std::string& input_path,
-                               const std::string& output_path) {
-    // 加载BMP图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入
-    if (!validate_input(data)) {
-        return false;
-    }
-
-    // 创建TIFF文件
-    TIFF* tif = TIFFOpen(output_path.c_str(), "w");
-    if (!tif) {
-        return false;
-    }
-
-    // 设置TIFF标签
-    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, data.width);
-    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, data.height);
-    TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, data.channels);
-    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
-    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
-    TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-    
-    // 根据通道数设置PhotometricInterpretation
-    if (data.channels == 1) {
-        TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
-    } else if (data.channels == 3 || data.channels == 4) {
-        TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
-    } else {
-        TIFFClose(tif);
-        return false;
-    }
-
-    // 写入图像数据
-    tsize_t linebytes = data.width * data.channels;
-    unsigned char* buf = (unsigned char*)_TIFFmalloc(linebytes);
-    for (int y = 0; y < data.height; y++) {
-        memcpy(buf, &data.pixels.get()[y * linebytes], linebytes);
-        TIFFWriteScanline(tif, buf, y, 0);
-    }
-
-    _TIFFfree(buf);
-    TIFFClose(tif);
-    return true;
-}
-
-bool BmpToTiffConverter::validate_input(const ImageData& data) {
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 1 || data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/bmp_to_webp.cpp

@@ -1,61 +0,0 @@
-#include "bmp_to_webp.hpp"
-#include "common.hpp"
-#include "image_loader.hpp"
-#include <webp/encode.h>
-#include <string>
-
-bool BmpToWebpConverter::convert(const std::string& input_path,
-                               const std::string& output_path,
-                               int quality) {
-    // 加载BMP图像
-    ImageData data = ImageLoader::load(input_path);
-    if (!data.pixels) {
-        return false;
-    }
-
-    // 验证输入格式
-    if (!validate_input(data)) {
-        return false;
-    }
-
-    // 编码为WebP
-    uint8_t* output = nullptr;
-    size_t output_size;
-    if (data.channels == 3) {
-        output_size = WebPEncodeRGB(data.pixels.get(),
-                                  data.width,
-                                  data.height,
-                                  data.width * data.channels,
-                                  quality,
-                                  &output);
-    } else {
-        output_size = WebPEncodeRGBA(data.pixels.get(),
-                                   data.width,
-                                   data.height,
-                                   data.width * data.channels,
-                                   quality,
-                                   &output);
-    }
-
-    if (output_size == 0) {
-        return false;
-    }
-
-    // 保存WebP文件
-    FILE* file = fopen(output_path.c_str(), "wb");
-    if (!file) {
-        WebPFree(output);
-        return false;
-    }
-
-    fwrite(output, 1, output_size, file);
-    fclose(file);
-    WebPFree(output);
-    return true;
-}
-
-bool BmpToWebpConverter::validate_input(const ImageData& data) {
-    // 确保是有效的图像数据
-    return data.width > 0 && data.height > 0 && 
-          (data.channels == 3 || data.channels == 4);
-}

others/C++/Image_format_converter/src/gui.cpp

@@ -1,277 +0,0 @@
-#include <locale.h>
-#include "gui_interface.hpp"
-#include "png_to_jpg.hpp"
-#include "jpg_to_png.hpp"
-#include "bmp_to_png.hpp"
-#include "bmp_to_jpg.hpp"
-#include "png_to_bmp.hpp"
-#include "jpg_to_bmp.hpp"
-#include "tiff_to_bmp.hpp"
-#include "bmp_to_tiff.hpp"
-#include "tiff_to_png.hpp"
-#include "png_to_tiff.hpp"
-#include "tiff_to_jpg.hpp"
-#include "jpg_to_tiff.hpp"
-#include "webp_to_jpg.hpp"
-#include "webp_to_png.hpp"
-#include "webp_to_bmp.hpp"
-#include "webp_to_tiff.hpp"
-#include "jpg_to_webp.hpp"
-#include "png_to_webp.hpp"
-#include "bmp_to_webp.hpp"
-#include "tiff_to_webp.hpp"
-#include "jpeg_to_png.hpp"
-#include "jpeg_to_bmp.hpp"
-#include "jpeg_to_tiff.hpp"
-#include "jpeg_to_webp.hpp"
-#include "png_to_jpeg.hpp"
-#include "bmp_to_jpeg.hpp"
-#include "tiff_to_jpeg.hpp"
-#include "webp_to_jpeg.hpp"
-#include "avif_to_png.hpp"
-#include "avif_to_jpg.hpp"
-#include "avif_to_jpeg.hpp"
-#include "avif_to_bmp.hpp"
-#include "avif_to_tiff.hpp"
-#include "avif_to_webp.hpp"
-#include "png_to_avif.hpp"
-#include "jpg_to_avif.hpp"
-#include "jpeg_to_avif.hpp"
-#include "bmp_to_avif.hpp"
-#include "tiff_to_avif.hpp"
-#include "webp_to_avif.hpp"
-#include <FL/Fl_File_Chooser.H>
-#include <FL/fl_ask.H>
-#include <stdexcept>
-
-static void init_locale() {
-    setlocale(LC_ALL, "chs");
-}
-
-MainWindow::MainWindow(int w, int h, const char* title) 
-    : Fl_Window(w, h, "图像格式转换器") {
-    init_locale();
-    
-    input_path = new Fl_Input(100, 20, 250, 25, "输入文件:");
-    Fl_Button* input_btn = new Fl_Button(360, 20, 30, 25, "...");
-    input_btn->callback(input_file_cb, this);
-    
-    output_path = new Fl_Output(100, 60, 250, 25, "输出文件:");
-    Fl_Button* output_btn = new Fl_Button(360, 60, 30, 25, "...");
-    output_btn->callback(output_file_cb, this);
-    
-    format_choice = new Fl_Choice(100, 100, 150, 25, "转换格式:");
-    format_choice->add("PNG to JPG");
-    format_choice->add("JPG to PNG");
-    format_choice->add("BMP to PNG");
-    format_choice->add("BMP to JPG");
-    format_choice->add("PNG to BMP");
-    format_choice->add("JPG to BMP");
-    format_choice->add("TIFF to BMP");
-    format_choice->add("BMP to TIFF");
-    format_choice->add("TIFF to PNG");
-    format_choice->add("PNG to TIFF");
-    format_choice->add("TIFF to JPG");
-    format_choice->add("JPG to TIFF");
-    format_choice->add("WEBP to JPG");
-    format_choice->add("WEBP to PNG");
-    format_choice->add("WEBP to BMP");
-    format_choice->add("WEBP to TIFF");
-    format_choice->add("JPG to WEBP");
-    format_choice->add("PNG to WEBP");
-    format_choice->add("BMP to WEBP");
-    format_choice->add("TIFF to WEBP");
-    format_choice->add("JPEG to PNG");
-    format_choice->add("JPEG to BMP");
-    format_choice->add("JPEG to TIFF");
-    format_choice->add("JPEG to WEBP");
-    format_choice->add("PNG to JPEG");
-    format_choice->add("BMP to JPEG");
-    format_choice->add("TIFF to JPEG");
-    format_choice->add("WEBP to JPEG");
-    format_choice->add("AVIF to PNG");
-    format_choice->add("AVIF to JPG");
-    format_choice->add("AVIF to JPEG");
-    format_choice->add("AVIF to BMP");
-    format_choice->add("AVIF to TIFF");
-    format_choice->add("AVIF to WEBP");
-    format_choice->add("PNG to AVIF");
-    format_choice->add("JPG to AVIF");
-    format_choice->add("JPEG to AVIF");
-    format_choice->add("BMP to AVIF");
-    format_choice->add("TIFF to AVIF");
-    format_choice->add("WEBP to AVIF");
-    format_choice->value(0);
-    
-    convert_btn = new Fl_Button(150, 150, 100, 30, "转换");
-    convert_btn->callback(convert_cb, this);
-    
-    end();
-}
-
-void MainWindow::input_file_cb(Fl_Widget* w, void* data) {
-    MainWindow* win = static_cast<MainWindow*>(data);
-    Fl_File_Chooser chooser(".", "*.*", Fl_File_Chooser::SINGLE, "选择输入文件");
-    chooser.show();
-    while(chooser.shown()) Fl::wait();
-    if(chooser.value()) {
-        win->input_path->value(chooser.value());
-    }
-}
-
-void MainWindow::output_file_cb(Fl_Widget* w, void* data) {
-    MainWindow* win = static_cast<MainWindow*>(data);
-    Fl_File_Chooser chooser(".", "*.*", Fl_File_Chooser::CREATE, "选择输出文件");
-    chooser.show();
-    while(chooser.shown()) Fl::wait();
-    if(chooser.value()) {
-        win->output_path->value(chooser.value());
-    }
-}
-
-void MainWindow::convert_cb(Fl_Widget* w, void* data) {
-    MainWindow* win = static_cast<MainWindow*>(data);
-    std::string input = win->input_path->value();
-    std::string output = win->output_path->value();
-    
-    if (input.empty() || output.empty()) {
-        fl_alert("请输入有效的文件路径!");
-        return;
-    }
-    
-    bool success = false;
-    try {
-        switch(win->format_choice->value()) {
-            case 0: // PNG to JPG
-                success = PngToJpgConverter::convert(input, output);
-                break;
-            case 1: // JPG to PNG
-                success = JpgToPngConverter::convert(input, output);
-                break;
-            case 2: // BMP to PNG
-                success = BmpToPngConverter::convert(input, output);
-                break;
-            case 3: // BMP to JPG
-                success = BmpToJpgConverter::convert(input, output);
-                break;
-            case 4: // PNG to BMP
-                success = PngToBmpConverter::convert(input, output);
-                break;
-            case 5: // JPG to BMP
-                success = JpgToBmpConverter::convert(input, output);
-                break;
-            case 6: // TIFF to BMP
-                success = TiffToBmpConverter::convert(input, output);
-                break;
-            case 7: // BMP to TIFF
-                success = BmpToTiffConverter::convert(input, output);
-                break;
-            case 8: // TIFF to PNG
-                success = TiffToPngConverter::convert(input, output);
-                break;
-            case 9: // PNG to TIFF
-                success = PngToTiffConverter::convert(input, output);
-                break;
-            case 10: // TIFF to JPG
-                success = TiffToJpgConverter::convert(input, output);
-                break;
-            case 11: // JPG to TIFF
-                success = JpgToTiffConverter::convert(input, output);
-                break;
-            case 12: // WEBP to JPG
-                success = WebpToJpgConverter::convert(input, output);
-                break;
-            case 13: // WEBP to PNG
-                success = WebpToPngConverter::convert(input, output);
-                break;
-            case 14: // WEBP to BMP
-                success = WebpToBmpConverter::convert(input, output);
-                break;
-            case 15: // WEBP to TIFF
-                success = WebpToTiffConverter::convert(input, output);
-                break;
-            case 16: // JPG to WEBP
-                success = JpgToWebpConverter::convert(input, output);
-                break;
-            case 17: // PNG to WEBP
-                success = PngToWebpConverter::convert(input, output);
-                break;
-            case 18: // BMP to WEBP
-                success = BmpToWebpConverter::convert(input, output);
-                break;
-            case 19: // TIFF to WEBP
-                success = TiffToWebpConverter::convert(input, output);
-                break;
-            case 20: // JPEG to PNG
-                success = JpegToPngConverter::convert(input, output);
-                break;
-            case 21: // JPEG to BMP
-                success = JpegToBmpConverter::convert(input, output);
-                break;
-            case 22: // JPEG to TIFF
-                success = JpegToTiffConverter::convert(input, output);
-                break;
-            case 23: // JPEG to WEBP
-                success = JpegToWebpConverter::convert(input, output);
-                break;
-            case 24: // PNG to JPEG
-                success = PngToJpegConverter::convert(input, output);
-                break;
-            case 25: // BMP to JPEG
-                success = BmpToJpegConverter::convert(input, output);
-                break;
-            case 26: // TIFF to JPEG
-                success = TiffToJpegConverter::convert(input, output);
-                break;
-            case 27: // WEBP to JPEG
-                success = WebpToJpegConverter::convert(input, output);
-                break;
-            case 28: // AVIF to PNG
-                success = AvifToPngConverter().convert(input, output);
-                break;
-            case 29: // AVIF to JPG
-                success = AvifToJpgConverter().convert(input, output);
-                break;
-            case 30: // AVIF to JPEG
-                success = AvifToJpegConverter().convert(input, output);
-                break;
-            case 31: // AVIF to BMP
-                success = AvifToBmpConverter().convert(input, output);
-                break;
-            case 32: // AVIF to TIFF
-                success = AvifToTiffConverter().convert(input, output);
-                break;
-            case 33: // AVIF to WEBP
-                success = AvifToWebpConverter().convert(input, output);
-                break;
-            case 34: // PNG to AVIF
-                success = PngToAvifConverter().convert(input, output);
-                break;
-            case 35: // JPG to AVIF
-                success = JpgToAvifConverter().convert(input, output);
-                break;
-            case 36: // JPEG to AVIF
-                success = JpegToAvifConverter().convert(input, output);
-                break;
-            case 37: // BMP to AVIF
-                success = BmpToAvifConverter().convert(input, output);
-                break;
-            case 38: // TIFF to AVIF
-                success = TiffToAvifConverter().convert(input, output);
-                break;
-            case 39: // WEBP to AVIF
-                success = WebpToAvifConverter().convert(input, output);
-                break;
-        }
-        if (!success) throw std::runtime_error("转换失败");
-    } catch (const std::exception& e) {
-        fl_alert("转换错误: %s", e.what());
-        return;
-    }
-    
-    if (success) {
-        fl_message("转换成功!");
-    } else {
-        fl_alert("转换失败，请检查输入文件!");
-    }
-}

others/C++/Image_format_converter/src/image_loader.cpp

@@ -1,215 +0,0 @@
-#include "image_loader.hpp"
-#include "common.hpp"
-#include <stb/stb_image.h>
-#include <stb/stb_image_write.h>
-#include <webp/decode.h>
-#include <avif/avif.h>
-#include <fstream>
-#include <stdexcept>
-#include <iostream>
-#include <cstring>
-
-
-
-static bool is_avif_file(const std::string& path) {
-    std::ifstream file(path, std::ios::binary);
-    if (!file) return false;
-    
-    char header[12];
-    if (!file.read(header, 12)) return false;
-    
-    return !memcmp(header, "\0\0\0 ftypavif", 12) || 
-           !memcmp(header, "\0\0\0 ftypavis", 12);
-}
-
-static bool is_webp_file(const std::string& path) {
-    std::ifstream file(path, std::ios::binary);
-    if (!file) return false;
-    
-    char header[12];
-    if (!file.read(header, 12)) return false;
-    
-    return !memcmp(header, "RIFF", 4) && !memcmp(header + 8, "WEBP", 4);
-}
-
-static ImageData load_avif(const std::string& path) {
-    ImageData data;
-    
-    avifDecoder* decoder = avifDecoderCreate();
-    if (!decoder) {
-        throw std::runtime_error("无法创建AVIF解码器");
-    }
-    
-    avifResult result = avifDecoderSetIOFile(decoder, path.c_str());
-    if (result != AVIF_RESULT_OK) {
-        avifDecoderDestroy(decoder);
-        throw std::runtime_error("无法读取AVIF文件");
-    }
-    
-    result = avifDecoderParse(decoder);
-    if (result != AVIF_RESULT_OK) {
-        avifDecoderDestroy(decoder);
-        throw std::runtime_error("无效的AVIF图像");
-    }
-    
-    result = avifDecoderNextImage(decoder);
-    if (result != AVIF_RESULT_OK) {
-        avifDecoderDestroy(decoder);
-        throw std::runtime_error("无法解码AVIF图像");
-    }
-    
-    data.width = decoder->image->width;
-    data.height = decoder->image->height;
-    data.channels = 4; // AVIF解码为RGBA
-    
-    // 分配内存并转换图像数据
-    uint8_t* rgba_pixels = new uint8_t[data.width * data.height * 4];
-    avifRGBImage rgb;
-    avifRGBImageSetDefaults(&rgb, decoder->image);
-    rgb.format = AVIF_RGB_FORMAT_RGBA;
-    rgb.depth = 8;
-    rgb.pixels = rgba_pixels;
-    rgb.rowBytes = data.width * 4;
-    
-    if (avifImageYUVToRGB(decoder->image, &rgb) != AVIF_RESULT_OK) {
-        delete[] rgba_pixels;
-        avifDecoderDestroy(decoder);
-        throw std::runtime_error("AVIF颜色空间转换失败");
-    }
-    
-    avifDecoderDestroy(decoder);
-    
-    // 验证图像数据
-    try {
-        ImageLoader::validate_image(rgba_pixels, data.width, data.height);
-    } catch (...) {
-        delete[] rgba_pixels;
-        throw;
-    }
-    
-    data.pixels = std::unique_ptr<unsigned char, void(*)(void*)>(rgba_pixels, [](void* p) { delete[] static_cast<uint8_t*>(p); });
-    return data;
-}
-
-ImageData ImageLoader::load(const std::string& path) {
-    ImageData data;
-    
-    // 检查是否为AVIF格式
-    if (is_avif_file(path)) {
-        return load_avif(path);
-    }
-    // 检查是否为WebP格式
-    else if (is_webp_file(path)) {
-        // 读取WebP文件数据
-        std::ifstream file(path, std::ios::binary | std::ios::ate);
-        if (!file) {
-            throw std::runtime_error("无法打开WebP文件");
-        }
-        
-        size_t size = file.tellg();
-        file.seekg(0, std::ios::beg);
-        
-        std::vector<uint8_t> webp_data(size);
-        if (!file.read(reinterpret_cast<char*>(webp_data.data()), size)) {
-            throw std::runtime_error("无法读取WebP文件");
-        }
-        
-        // 解码WebP图像
-        WebPBitstreamFeatures features;
-        if (WebPGetFeatures(webp_data.data(), webp_data.size(), &features) != VP8_STATUS_OK) {
-            throw std::runtime_error("无效的WebP图像");
-        }
-        
-        data.width = features.width;
-        data.height = features.height;
-        data.channels = features.has_alpha ? 4 : 3;
-        
-        // 解码WebP图像为RGBA格式
-        uint8_t* rgba_pixels = WebPDecodeRGBA(webp_data.data(), webp_data.size(), &data.width, &data.height);
-        if (!rgba_pixels) {
-            throw std::runtime_error("无法解码WebP图像");
-        }
-        
-        // 如果没有alpha通道，转换为RGB格式
-        if (data.channels == 3) {
-            uint8_t* rgb_pixels = new uint8_t[data.width * data.height * 3];
-            for (int i = 0; i < data.width * data.height; ++i) {
-                rgb_pixels[i*3] = rgba_pixels[i*4];
-                rgb_pixels[i*3+1] = rgba_pixels[i*4+1];
-                rgb_pixels[i*3+2] = rgba_pixels[i*4+2];
-            }
-            WebPFree(rgba_pixels);
-            
-            // 验证图像数据
-            try {
-        ImageLoader::validate_image(rgb_pixels, data.width, data.height);
-            } catch (...) {
-                delete[] rgb_pixels;
-                throw;
-            }
-            
-            data.pixels = std::unique_ptr<unsigned char, void(*)(void*)>(rgb_pixels, [](void* p) { delete[] static_cast<uint8_t*>(p); });
-        } else {
-            // 验证图像数据
-            try {
-        ImageLoader::validate_image(rgba_pixels, data.width, data.height);
-            } catch (...) {
-                WebPFree(rgba_pixels);
-                throw;
-            }
-            
-            data.pixels = std::unique_ptr<unsigned char, void(*)(void*)>(rgba_pixels, WebPFree);
-        }
-    } else {
-        // 使用STB加载其他格式图像
-        unsigned char* pixels = stbi_load(path.c_str(), 
-                                         &data.width, 
-                                         &data.height, 
-                                         &data.channels, 
-                                         0);
-        if (!pixels) {
-            throw std::runtime_error("无法加载图像: " + std::string(stbi_failure_reason()));
-        }
-        
-        // 验证图像数据
-        try {
-        ImageLoader::validate_image(pixels, data.width, data.height);
-        } catch (...) {
-            stbi_image_free(pixels);
-            throw;
-        }
-        
-        data.pixels = std::unique_ptr<unsigned char, void(*)(void*)>(pixels, stbi_image_free);
-    }
-    return data;
-}
-
-bool ImageLoader::save_png(const std::string& path, const ImageData& data) {
-    if (!data.pixels || data.width <= 0 || data.height <= 0) {
-        return false;
-    }
-    return stbi_write_png(path.c_str(),
-                         data.width,
-                         data.height,
-                         data.channels,
-                         data.pixels.get(),
-                         data.width * data.channels);
-}
-
-bool ImageLoader::save_jpg(const std::string& path, const ImageData& data, int quality) {
-    if (!data.pixels || data.width <= 0 || data.height <= 0) {
-        return false;
-    }
-    return stbi_write_jpg(path.c_str(),
-                         data.width,
-                         data.height,
-                         data.channels,
-                         data.pixels.get(),
-                         quality);
-}
-
-void ImageLoader::validate_image(const unsigned char* data, int width, int height) {
-    if (!data || width <= 0 || height <= 0) {
-        throw std::runtime_error("无效的图像数据");
-    }
-}