修复主题系统带来的颜色

AboutForm.cs

@@ -1,141 +1,144 @@
-using System;
+using System;
-using System.Drawing;
+using System.Drawing;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+
-namespace AppStore
+namespace AppStore
-{
+{
-    public class AboutUserControl : UserControl
+    public class AboutUserControl : UserControl
-    {
+    {
-        private PictureBox logo = null!;
+        private PictureBox logo = null!;
-        private Label infoLabel = null!;
+        private Label infoLabel = null!;
-
+
-        public AboutUserControl()
+        public AboutUserControl()
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-        }
+        }
-
+
-        private void InitializeComponent()
+        private void InitializeComponent()
-        {
+        {
-            this.Dock = DockStyle.Fill;
+            this.Dock = DockStyle.Fill;
-            this.BackColor = Color.White;
+            this.BackColor = ThemeManager.BackgroundColor;
-            this.Padding = new Padding(20);
+            this.Padding = new Padding(20);
-
+
-            // 创建主布局面板
+            // 创建主布局面板
-            TableLayoutPanel mainLayout = new TableLayoutPanel();
+            TableLayoutPanel mainLayout = new TableLayoutPanel();
-            mainLayout.Dock = DockStyle.Fill;
+            mainLayout.Dock = DockStyle.Fill;
-            mainLayout.ColumnCount = 1;
+            mainLayout.BackColor = ThemeManager.BackgroundColor;
-            mainLayout.RowCount = 2;
+            mainLayout.ColumnCount = 1;
-            mainLayout.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
+            mainLayout.RowCount = 2;
-            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            mainLayout.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
-            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
-            mainLayout.Padding = new Padding(0, 20, 0, 20);
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
-
+            mainLayout.Padding = new Padding(0, 20, 0, 20);
-            // 初始化并添加应用图标
+
-            logo = new PictureBox();
+            // 初始化并添加应用图标
-            try
+            logo = new PictureBox();
-            {
+            try
-                logo.Image = Image.FromFile("img/png/kortapp-z.png");
+            {
-            }
+                logo.Image = Image.FromFile("img/png/kortapp-z.png");
-            catch (Exception ex)
+            }
-            {
+            catch (Exception ex)
-                Logger.LogError($"无法加载应用图标: {ex.Message}");
+            {
-                logo.Image = SystemIcons.Application.ToBitmap();
+                Logger.LogError($"无法加载应用图标: {ex.Message}");
-            }
+                logo.Image = SystemIcons.Application.ToBitmap();
-            logo.SizeMode = PictureBoxSizeMode.Zoom;
+            }
-            logo.Width = 200;
+            logo.SizeMode = PictureBoxSizeMode.Zoom;
-            logo.Height = 200;
+            logo.Width = 200;
-            logo.Anchor = AnchorStyles.None;
+            logo.Height = 200;
-            logo.Margin = new Padding(0, 0, 0, 20);
+            logo.Anchor = AnchorStyles.None;
-            mainLayout.Controls.Add(logo, 0, 0);
+            logo.Margin = new Padding(0, 0, 0, 20);
-
+            mainLayout.Controls.Add(logo, 0, 0);
-            // 初始化并添加应用信息
+
-            infoLabel = new Label();
+            // 初始化并添加应用信息
-            infoLabel.Text = "kortapp-z\n版本: 1.0.9\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
+            infoLabel = new Label();
-            infoLabel.Font = new Font("Microsoft YaHei", 12);
+            infoLabel.Text = "kortapp-z\n版本: 1.1.1\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
-            infoLabel.AutoSize = false;
+            infoLabel.Font = new Font("Microsoft YaHei", 12);
-            infoLabel.Width = 300;
+            infoLabel.AutoSize = false;
-            infoLabel.Height = 130;  // 增加高度确保文字完整显示
+            infoLabel.Width = 300;
-            infoLabel.TextAlign = ContentAlignment.MiddleCenter;
+            infoLabel.Height = 130;  // 增加高度确保文字完整显示
-            infoLabel.Anchor = AnchorStyles.None;
+            infoLabel.TextAlign = ContentAlignment.MiddleCenter;
-            mainLayout.Controls.Add(infoLabel, 0, 1);
+            infoLabel.Anchor = AnchorStyles.None;
-
+            mainLayout.Controls.Add(infoLabel, 0, 1);
-            // 调整主布局为3行
+
-            mainLayout.RowCount = 3;
+            // 调整主布局为3行
-            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            mainLayout.RowCount = 3;
-            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
-            mainLayout.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.AutoSize));
-
+            mainLayout.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
-            // 在底部添加GitHub链接区域
+
-            TableLayoutPanel githubPanel = new TableLayoutPanel();
+            // 在底部添加GitHub链接区域
-            githubPanel.Dock = DockStyle.Bottom;
+            TableLayoutPanel githubPanel = new TableLayoutPanel();
-            githubPanel.Height = 60;
+            githubPanel.Dock = DockStyle.Bottom;
-            githubPanel.ColumnCount = 3;
+            githubPanel.BackColor = ThemeManager.BackgroundColor;
-            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
+            githubPanel.Height = 60;
-            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.AutoSize));
+            githubPanel.ColumnCount = 3;
-            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
+            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
-            githubPanel.RowCount = 1;
+            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.AutoSize));
-            githubPanel.Padding = new Padding(10);
+            githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
-            
+            githubPanel.RowCount = 1;
-            // 添加GitHub图标
+            githubPanel.Padding = new Padding(10);
-            PictureBox githubIcon = new PictureBox();
+            
-            try
+            // 添加GitHub图标
-            {
+            PictureBox githubIcon = new PictureBox();
-                githubIcon.Image = Image.FromFile("img/jpg/github.jpg");
+            try
-            }
+            {
-            catch (Exception ex)
+                githubIcon.Image = Image.FromFile("img/jpg/github.jpg");
-            {
+            }
-                Logger.LogError($"无法加载GitHub图标: {ex.Message}");
+            catch (Exception ex)
-                githubIcon.Image = SystemIcons.Application.ToBitmap();
+            {
-            }
+                Logger.LogError($"无法加载GitHub图标: {ex.Message}");
-            githubIcon.SizeMode = PictureBoxSizeMode.Zoom;
+                githubIcon.Image = SystemIcons.Application.ToBitmap();
-            githubIcon.Width = 30;
+            }
-            githubIcon.Height = 30;
+            githubIcon.SizeMode = PictureBoxSizeMode.Zoom;
-            githubIcon.Cursor = Cursors.Hand;
+            githubIcon.Width = 30;
-            githubIcon.Click += (s, e) => {
+            githubIcon.Height = 30;
-                System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
+            githubIcon.Cursor = Cursors.Hand;
-                {
+            githubIcon.Click += (s, e) => {
-                    FileName = "https://github.com/zs-yg/kortapp-z",
+                System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
-                    UseShellExecute = true
+                {
-                });
+                    FileName = "https://github.com/zs-yg/kortapp-z",
-            };
+                    UseShellExecute = true
-            
+                });
-            // 添加文字说明
+            };
-            Label githubLabel = new Label();
+            
-            githubLabel.Text = "🤗🤗🤗开源地址 🌟 欢迎点star和提交pr 🚀";
+            // 添加文字说明
-            githubLabel.Font = new Font("Microsoft YaHei", 10);
+            Label githubLabel = new Label();
-            githubLabel.AutoSize = true;
+            githubLabel.Text = "🤗🤗🤗开源地址 🌟 欢迎点star和提交pr 🚀";
-            githubLabel.Margin = new Padding(10, 0, 0, 0);
+            githubLabel.Font = new Font("Microsoft YaHei", 10);
-            
+            githubLabel.AutoSize = true;
-            // 创建包含图标和文字的面板
+            githubLabel.Margin = new Padding(10, 0, 0, 0);
-            Panel linkPanel = new Panel();
+            
-            linkPanel.AutoSize = true;
+            // 创建包含图标和文字的面板
-            linkPanel.Controls.Add(githubIcon);
+            Panel linkPanel = new Panel();
-            linkPanel.Controls.Add(githubLabel);
+            linkPanel.AutoSize = true;
-            githubIcon.Location = new Point(0, 0);
+            linkPanel.BackColor = ThemeManager.BackgroundColor;
-            githubLabel.Location = new Point(githubIcon.Width + 10, 5);
+            linkPanel.Controls.Add(githubIcon);
-            
+            linkPanel.Controls.Add(githubLabel);
-            // 将链接面板添加到中间列
+            githubIcon.Location = new Point(0, 0);
-            githubPanel.Controls.Add(linkPanel, 1, 0);
+            githubLabel.Location = new Point(githubIcon.Width + 10, 5);
-            
+            
-            this.Controls.Add(mainLayout);
+            // 将链接面板添加到中间列
-            this.Controls.Add(githubPanel);
+            githubPanel.Controls.Add(linkPanel, 1, 0);
-        }
+            
-    }
+            this.Controls.Add(mainLayout);
-
+            this.Controls.Add(githubPanel);
-    // 保留原AboutForm作为容器(可选)
+        }
-    public class AboutForm : Form
+    }
-    {
+
-        public AboutForm()
+    // 保留原AboutForm作为容器(可选)
-        {
+    public class AboutForm : Form
-            this.Text = "关于 kortapp-z";
+    {
-            this.Size = new Size(500, 400);
+        public AboutForm()
-            this.StartPosition = FormStartPosition.CenterScreen;
+        {
-            this.FormBorderStyle = FormBorderStyle.FixedDialog;
+            this.Text = "关于 kortapp-z";
-            this.MaximizeBox = false;
+            this.Size = new Size(500, 400);
-            this.MinimizeBox = false;
+            this.StartPosition = FormStartPosition.CenterScreen;
-            
+            this.FormBorderStyle = FormBorderStyle.FixedDialog;
-            var aboutControl = new AboutUserControl();
+            this.MaximizeBox = false;
-            this.Controls.Add(aboutControl);
+            this.MinimizeBox = false;
-        }
+            
-    }
+            var aboutControl = new AboutUserControl();
-}
+            this.Controls.Add(aboutControl);
+        }
+    }
+}

AppCard.cs

@@ -13,7 +13,9 @@ namespace AppStore
     {
         private PictureBox iconBox;
         private Label nameLabel;
+        private Panel namePanel;
         private Button downloadBtn;
+        private Color borderColor = SystemColors.ControlDark;
         private static readonly ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath> PathCache = 
             new ConcurrentDictionary<string, System.Drawing.Drawing2D.GraphicsPath>();
 
@@ -27,6 +29,7 @@ namespace AppStore
             // 确保关键对象不为null
             iconBox = new PictureBox() { SizeMode = PictureBoxSizeMode.StretchImage };
             nameLabel = new Label() { Text = string.Empty };
+            namePanel = new Panel();
             downloadBtn = new Button() { Text = "下载" };
             
             // 确保DownloadManager已初始化
@@ -57,14 +60,29 @@ namespace AppStore
             iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
             this.Controls.Add(iconBox);
 
-            // 应用名称
+            // 应用名称 - 使用Panel包裹Label实现边框颜色
+            // namePanel已在构造函数中初始化
+            namePanel.Size = new Size(Width - 20, 40);
+            namePanel.Location = new Point(10, 100);
+            namePanel.Paint += (sender, e) => {
+                ControlPaint.DrawBorder(e.Graphics, namePanel.ClientRectangle, 
+                    borderColor, ButtonBorderStyle.Solid);
+            };
+            
             nameLabel = new Label();
-            nameLabel.AutoSize = false;
+            nameLabel.Dock = DockStyle.Fill;
-            nameLabel.Size = new Size(Width - 20, 40);
-            nameLabel.Location = new Point(10, 100);
             nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
             nameLabel.TextAlign = ContentAlignment.MiddleCenter;
-            this.Controls.Add(nameLabel);
+            
+            namePanel.Controls.Add(nameLabel);
+            
+            // 初始主题设置
+            UpdateLabelTheme();
+            
+            // 订阅主题变化事件
+            ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme();
+            
+            this.Controls.Add(namePanel);
 
             // 下载按钮
             downloadBtn = new Button();
@@ -92,6 +110,25 @@ namespace AppStore
             downloadBtn.Visible = ShowDownloadButton;
         }
 
+        private void UpdateLabelTheme()
+        {
+            if (ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Dark)
+            {
+                nameLabel.BackColor = Color.Black;
+                nameLabel.ForeColor = Color.White;
+                namePanel.BackColor = Color.Black;
+                borderColor = Color.White;
+            }
+            else
+            {
+                nameLabel.BackColor = Color.White;
+                nameLabel.ForeColor = Color.Black;
+                namePanel.BackColor = Color.White;
+                borderColor = SystemColors.ControlDark;
+            }
+            namePanel.Invalidate(); // 触发重绘
+        }
+
         /// <summary>
         /// 初始化卡片边框路径
         /// 使用C++程序计算高性能边框路径并缓存结果

DownloadItem.cs

@@ -23,13 +23,40 @@ namespace AppStore
             cancelBtn = new Button();
             
             InitializeComponent();
+            
+            // 监听主题变化
+            ThemeManager.ThemeChanged += (theme) => {
+                this.Invoke((MethodInvoker)delegate {
+                    ApplyTheme();
+                });
+            };
+        }
+
+        private void ApplyTheme()
+        {
+            this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.White 
+                : Color.Black;
+            this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.Black 
+                : Color.White;
+            
+            cancelBtn.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? SystemColors.Control 
+                : Color.FromArgb(70, 70, 70);
+            cancelBtn.ForeColor = ThemeManager.TextColor;
         }
 
         private void InitializeComponent()
         {
             this.Size = new Size(400, 60);
-            this.BackColor = Color.White;
+            this.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.White 
+                : Color.Black;
             this.BorderStyle = BorderStyle.FixedSingle;
+            this.ForeColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.Black 
+                : Color.White;
 
             // 文件名标签
             nameLabel = new Label();
@@ -56,6 +83,12 @@ namespace AppStore
             cancelBtn.Text = "取消";
             cancelBtn.Size = new Size(60, 25);
             cancelBtn.Location = new Point(320, 30);
+            cancelBtn.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? SystemColors.Control 
+                : Color.FromArgb(70, 70, 70);
+            cancelBtn.ForeColor = ThemeManager.TextColor;
+            cancelBtn.FlatStyle = FlatStyle.Flat;
+            cancelBtn.FlatAppearance.BorderSize = 0;
             cancelBtn.Click += CancelBtn_Click;
             this.Controls.Add(cancelBtn);
         }

SettingsForm.cs

@@ -1,53 +1,88 @@
-using System;
+using System;
-using System.Diagnostics;
+using System.Diagnostics;
-using System.IO;
+using System.IO;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+using System.Drawing;
-namespace AppStore
+
-{
+namespace AppStore
-    public class SettingsUserControl : UserControl
+{
-    {
+    public class SettingsUserControl : UserControl
-        private Button btnCleanLogs;
+    {
-
+        private Button btnCleanLogs;
-        public SettingsUserControl()
+        private Button btnLightTheme;
-        {
+        private Button btnDarkTheme;
-            this.Dock = DockStyle.Fill;
+
-            this.BackColor = Color.White;
+        public SettingsUserControl()
-            
+        {
-            // 设置顶部内边距
+            this.Dock = DockStyle.Fill;
-            this.Padding = new Padding(0, 30, 0, 0);
+            ThemeManager.ApplyTheme(this);
-            
+            
-            btnCleanLogs = new Button();
+            // 设置顶部内边距
-            btnCleanLogs.Text = "清理日志";
+            this.Padding = new Padding(0, 30, 0, 0);
-            btnCleanLogs.Size = new Size(150, 40);
+            
-            btnCleanLogs.Location = new Point((this.Width - 150) / 2, 50); // 调整Y坐标为50靠近顶部
+            // 主题切换按钮
-            btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
+            btnLightTheme = new Button();
-            btnCleanLogs.Anchor = AnchorStyles.Top; // 添加顶部锚点
+            btnLightTheme.Text = "浅色模式";
-            btnCleanLogs.Click += (s, e) => CleanLogs();
+            btnLightTheme.Size = new Size(150, 40);
-            this.Controls.Add(btnCleanLogs);
+            btnLightTheme.Location = new Point((this.Width - 320) / 2, 50);
-        }
+            btnLightTheme.Font = new Font("Microsoft YaHei", 10);
-
+            btnLightTheme.Anchor = AnchorStyles.Top;
-        private void CleanLogs()
+            btnLightTheme.Click += (s, e) => SwitchTheme(ThemeManager.ThemeMode.Light);
-        {
+            this.Controls.Add(btnLightTheme);
-            try
+
-            {
+            btnDarkTheme = new Button();
-                string logCleanerPath = Path.Combine("resource", "log_cleaner.exe");
+            btnDarkTheme.Text = "深色模式";
-                
+            btnDarkTheme.Size = new Size(150, 40);
-                if (File.Exists(logCleanerPath))
+            btnDarkTheme.Location = new Point(btnLightTheme.Right + 20, 50);
-                {
+            btnDarkTheme.Font = new Font("Microsoft YaHei", 10);
-                    Process.Start(logCleanerPath);
+            btnDarkTheme.Anchor = AnchorStyles.Top;
-                    MessageBox.Show("日志清理程序已启动", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            btnDarkTheme.Click += (s, e) => SwitchTheme(ThemeManager.ThemeMode.Dark);
-                }
+            this.Controls.Add(btnDarkTheme);
-                else
+            
-                {
+            // 清理日志按钮
-                    MessageBox.Show("日志清理程序未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            btnCleanLogs = new Button();
-                }
+            btnCleanLogs.Text = "清理日志";
-            }
+            btnCleanLogs.Size = new Size(150, 40);
-            catch (Exception ex)
+            btnCleanLogs.Location = new Point((this.Width - 150) / 2, 110);
-            {
+            btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
-                Logger.LogError("清理日志时出错", ex);
+            btnCleanLogs.Anchor = AnchorStyles.Top;
-                MessageBox.Show($"清理日志时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            btnCleanLogs.Click += (s, e) => CleanLogs();
-            }
+            this.Controls.Add(btnCleanLogs);
-        }
+
-    }
+            ThemeManager.ThemeChanged += OnThemeChanged;
-}
+        }
+
+        private void SwitchTheme(ThemeManager.ThemeMode theme)
+        {
+            ThemeManager.CurrentTheme = theme;
+        }
+
+        private void OnThemeChanged(ThemeManager.ThemeMode theme)
+        {
+            ThemeManager.ApplyTheme(this);
+        }
+
+        private void CleanLogs()
+        {
+            try
+            {
+                string logCleanerPath = Path.Combine("resource", "log_cleaner.exe");
+                
+                if (File.Exists(logCleanerPath))
+                {
+                    Process.Start(logCleanerPath);
+                    MessageBox.Show("日志清理程序已启动", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show("日志清理程序未找到", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("清理日志时出错", ex);
+                MessageBox.Show($"清理日志时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+}

TXT/Build.txt

@@ -0,0 +1,12 @@
+首先，如果希望编译程序，那么必须安装.NET8.0 SDK
+下载链接：https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/sdk-8.0.411-windows-x64-installer
+
+使用一下指令编译
+
+x86:
+
+dotnet publish AppStore.csproj -c Release -r win-x86 --self-contained false /p:Optimize=true /p:DebugType=None
+
+x64:
+
+dotnet publish AppStore.csproj -c Release -r win-x64 --self-contained false /p:Optimize=true /p:DebugType=None

TXT/Run.txt

@@ -0,0 +1,7 @@
+如果希望运行，那么必须安装.NET8.0 SDK
+
+下载链接：https://dotnet.microsoft.com/zh-cn/download/dotnet/thank-you/sdk-8.0.411-windows-x64-installer
+
+使用一下指令运行：
+
+dotnet run

ThemeManager.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Text.Json;
+using System.IO;
+
+namespace AppStore
+{
+    public static class ThemeManager
+    {
+        public enum ThemeMode
+        {
+            Light,
+            Dark
+        }
+
+        private static readonly string ThemeConfigPath = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            "zsyg", "kortapp-z", ".date", "theme.json");
+
+        private static ThemeMode _currentTheme = LoadTheme();
+
+        private static ThemeMode LoadTheme()
+        {
+            try
+            {
+                if (File.Exists(ThemeConfigPath))
+                {
+                    var json = File.ReadAllText(ThemeConfigPath);
+                    return JsonSerializer.Deserialize<ThemeMode>(json);
+                }
+            }
+            catch
+            {
+                // 忽略错误，使用默认主题
+            }
+            return ThemeMode.Light;
+        }
+
+        private static void SaveTheme(ThemeMode theme)
+        {
+            try
+            {
+                var dir = Path.GetDirectoryName(ThemeConfigPath);
+                if (!Directory.Exists(dir))
+                {
+                    Directory.CreateDirectory(dir);
+                }
+                var json = JsonSerializer.Serialize(theme);
+                File.WriteAllText(ThemeConfigPath, json);
+            }
+            catch
+            {
+                // 忽略错误
+            }
+        }
+        
+        // 浅色主题颜色
+        private static readonly Color LightBackground = Color.FromArgb(255, 255, 255);
+        private static readonly Color LightControlBackground = Color.FromArgb(240, 240, 240);
+        private static readonly Color LightText = Color.FromArgb(30, 30, 30);
+        private static readonly Color LightButtonHover = Color.FromArgb(230, 230, 230);
+        private static readonly Color LightButtonActive = Color.FromArgb(220, 220, 220);
+        
+        // 深色主题颜色
+        private static readonly Color DarkBackground = Color.FromArgb(30, 30, 30);
+        private static readonly Color DarkControlBackground = Color.FromArgb(45, 45, 45);
+        private static readonly Color DarkText = Color.FromArgb(240, 240, 240);
+        private static readonly Color DarkButtonHover = Color.FromArgb(60, 60, 60);
+        private static readonly Color DarkButtonActive = Color.FromArgb(70, 70, 70);
+
+        public static event Action<ThemeMode> ThemeChanged = delegate {};
+
+        public static ThemeMode CurrentTheme
+        {
+            get => _currentTheme;
+            set
+            {
+                if (_currentTheme != value)
+                {
+                    _currentTheme = value;
+                    ThemeChanged?.Invoke(value);
+                    SaveTheme(value);
+                }
+            }
+        }
+
+        public static Color BackgroundColor => 
+            _currentTheme == ThemeMode.Light ? LightBackground : DarkBackground;
+
+        public static Color ControlBackgroundColor => 
+            _currentTheme == ThemeMode.Light ? LightControlBackground : DarkControlBackground;
+
+        public static Color TextColor => 
+            _currentTheme == ThemeMode.Light ? LightText : DarkText;
+
+        public static Color ButtonHoverColor => 
+            _currentTheme == ThemeMode.Light ? LightButtonHover : DarkButtonHover;
+
+        public static Color ButtonActiveColor => 
+            _currentTheme == ThemeMode.Light ? LightButtonActive : DarkButtonActive;
+
+        public static void ApplyTheme(Control control)
+        {
+            ApplyThemeToControl(control);
+        }
+
+        private static void ApplyThemeToControl(Control control)
+        {
+            control.BackColor = BackgroundColor;
+            control.ForeColor = TextColor;
+
+            if (control is Button button)
+            {
+                button.FlatStyle = FlatStyle.Flat;
+                button.FlatAppearance.BorderSize = 0;
+                button.FlatAppearance.MouseOverBackColor = ButtonHoverColor;
+                button.FlatAppearance.MouseDownBackColor = ButtonActiveColor;
+            }
+
+            foreach (Control childControl in control.Controls)
+            {
+                ApplyThemeToControl(childControl);
+            }
+        }
+    }
+}

ToolCard.cs

@@ -8,6 +8,8 @@ namespace AppStore
     {
         private PictureBox iconBox = new PictureBox();
         private Label nameLabel = new Label();
+        private Panel namePanel = new Panel();
+        private Color borderColor = SystemColors.ControlDark;
         
         public string ToolName { get; set; } = string.Empty;
         public Image ToolIcon { get; set; } = SystemIcons.Shield.ToBitmap();
@@ -37,14 +39,28 @@ namespace AppStore
             iconBox.SizeMode = PictureBoxSizeMode.StretchImage;
             this.Controls.Add(iconBox);
 
-            // 工具名称
+            // 工具名称 - 使用Panel包裹Label实现边框颜色
+            namePanel = new Panel();
+            namePanel.Size = new Size(Width - 20, 30);
+            namePanel.Location = new Point(10, 100);
+            namePanel.Paint += (sender, e) => {
+                ControlPaint.DrawBorder(e.Graphics, namePanel.ClientRectangle, 
+                    borderColor, ButtonBorderStyle.Solid);
+            };
+            
             nameLabel = new Label();
-            nameLabel.AutoSize = false;
+            nameLabel.Dock = DockStyle.Fill;
-            nameLabel.Size = new Size(Width - 20, 30);
-            nameLabel.Location = new Point(10, 100);
             nameLabel.Font = new Font("Microsoft YaHei", 10, FontStyle.Bold);
             nameLabel.TextAlign = ContentAlignment.MiddleCenter;
-            this.Controls.Add(nameLabel);
+            namePanel.Controls.Add(nameLabel);
+            
+            // 初始主题设置
+            UpdateLabelTheme();
+            
+            // 订阅主题变化事件
+            ThemeManager.ThemeChanged += (theme) => UpdateLabelTheme();
+            
+            this.Controls.Add(namePanel);
 
             // 打开按钮
             var openButton = new Button();
@@ -68,10 +84,30 @@ namespace AppStore
             openButton.FlatAppearance.MouseDownBackColor = Color.FromArgb(0, 80, 160);
         }
 
+        private void UpdateLabelTheme()
+        {
+            if (ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Dark)
+            {
+                nameLabel.BackColor = Color.Black;
+                nameLabel.ForeColor = Color.White;
+                namePanel.BackColor = Color.Black;
+                borderColor = Color.White;
+            }
+            else
+            {
+                nameLabel.BackColor = Color.White;
+                nameLabel.ForeColor = Color.Black;
+                namePanel.BackColor = Color.White;
+                borderColor = SystemColors.ControlDark;
+            }
+            namePanel.Invalidate(); // 触发重绘
+        }
+
         public void UpdateDisplay()
         {
             nameLabel.Text = ToolName;
             iconBox.Image = ToolIcon;
+            UpdateLabelTheme();
         }
     }
 }

inno/innosetup_x64.iss

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

inno/innosetup_x86.iss

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

others/C/C++/Makefile

@@ -0,0 +1,20 @@
+CXX = g++
+CXXFLAGS = -std=c++11 -Iinclude
+LDFLAGS = -static -mwindows -lfltk -lole32 -luuid -lcomctl32 -lgdi32 -lwsock32 -lcomdlg32 -lwinspool
+
+SRC = $(wildcard src/*.cpp)
+OBJ = $(patsubst src/%.cpp,obj/%.o,$(SRC))
+TARGET = password_generator
+
+all: $(TARGET)
+
+$(TARGET): $(OBJ)
+	$(CXX) $^ -o $@ $(LDFLAGS)
+
+obj/%.o: src/%.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+clean:
+	rm -f $(OBJ) $(TARGET)
+
+.PHONY: all clean

others/C/C++/include/password_generator.hpp

@@ -0,0 +1,27 @@
+#ifndef PASSWORD_GENERATOR_HPP
+#define PASSWORD_GENERATOR_HPP
+
+#include "string.hpp"
+
+class PasswordGenerator {
+public:
+    enum Mode {
+        DIGITS,         // 纯数字
+        ENGLISH,        // 纯英文
+        SYMBOLS,        // 纯符号
+        DIGITS_ENGLISH, // 数字+英文
+        DIGITS_SYMBOLS, // 数字+符号
+        ENGLISH_SYMBOLS // 英文+符号
+    };
+
+    PasswordGenerator();
+    String generate(int length, Mode mode = DIGITS);
+
+private:
+    String generateDigits(int length);
+    String generateEnglish(int length);
+    String generateSymbols(int length);
+    String generateMixed(int length, const String& charSet);
+};
+
+#endif // PASSWORD_GENERATOR_HPP

others/C/C++/include/password_gui.hpp

@@ -0,0 +1,28 @@
+#ifndef PASSWORD_GUI_HPP
+#define PASSWORD_GUI_HPP
+
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Input.H>
+#include <FL/Fl_Choice.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Output.H>
+#include "password_generator.hpp"
+
+class PasswordGUI {
+public:
+    PasswordGUI();
+    void show();
+
+private:
+    Fl_Window* window;
+    Fl_Input* lengthInput;
+    Fl_Choice* modeChoice;
+    Fl_Button* generateButton;
+    Fl_Output* passwordOutput;
+    PasswordGenerator generator;
+
+    static void onGenerate(Fl_Widget* widget, void* data);
+};
+
+#endif // PASSWORD_GUI_HPP

others/C/C++/include/string.hpp

@@ -0,0 +1,25 @@
+#ifndef STRING_HPP
+#define STRING_HPP
+
+#include <cstddef>
+
+class String {
+public:
+    String();
+    String(const char* str);
+    String(const String& other);
+    ~String();
+
+    size_t length() const;
+    const char* c_str() const;
+    
+    String& operator=(const String& other);
+    String operator+(const String& other) const;
+    bool operator==(const String& other) const;
+
+private:
+    char* data;
+    size_t len;
+};
+
+#endif // STRING_HPP

others/C/C++/src/main.cpp

@@ -0,0 +1,7 @@
+#include "password_gui.hpp"
+
+int main(int argc, char** argv) {
+    PasswordGUI gui;
+    gui.show();
+    return Fl::run();
+}

others/C/C++/src/password_generator.cpp

@@ -0,0 +1,96 @@
+#include "password_generator.hpp"
+#include <cstdlib>
+#include <ctime>
+
+PasswordGenerator::PasswordGenerator() {
+    srand(time(nullptr));
+}
+
+String PasswordGenerator::generate(int length, Mode mode) {
+    if (length < 1 || length > 100) {
+        return String("无效长度(1-100)");
+    }
+
+    switch (mode) {
+        case DIGITS:
+            return generateDigits(length);
+        case ENGLISH:
+            return generateEnglish(length);
+        case SYMBOLS:
+            return generateSymbols(length);
+        case DIGITS_ENGLISH: {
+            String charSet = String("0123456789") + 
+                           String("abcdefghijklmnopqrstuvwxyz") + 
+                           String("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+            return generateMixed(length, charSet);
+        }
+        case DIGITS_SYMBOLS: {
+            String charSet = String("0123456789") + String("!@#$%^&*()_+-=[]{}|;:,.<>?");
+            return generateMixed(length, charSet);
+        }
+        case ENGLISH_SYMBOLS: {
+            String charSet = String("abcdefghijklmnopqrstuvwxyz") + 
+                           String("ABCDEFGHIJKLMNOPQRSTUVWXYZ") + 
+                           String("!@#$%^&*()_+-=[]{}|;:,.<>?");
+            return generateMixed(length, charSet);
+        }
+        default:
+            return String("不支持的模式");
+    }
+}
+
+String PasswordGenerator::generateDigits(int length) {
+    char* buffer = new char[length + 1];
+    for (int i = 0; i < length; ++i) {
+        buffer[i] = '0' + (rand() % 10);
+    }
+    buffer[length] = '\0';
+    
+    String result(buffer);
+    delete[] buffer;
+    return result;
+}
+
+String PasswordGenerator::generateEnglish(int length) {
+    char* buffer = new char[length + 1];
+    for (int i = 0; i < length; ++i) {
+        int choice = rand() % 2;
+        if (choice == 0) {
+            buffer[i] = 'a' + (rand() % 26); // 小写字母
+        } else {
+            buffer[i] = 'A' + (rand() % 26); // 大写字母
+        }
+    }
+    buffer[length] = '\0';
+    
+    String result(buffer);
+    delete[] buffer;
+    return result;
+}
+
+String PasswordGenerator::generateSymbols(int length) {
+    const char symbols[] = "!@#$%^&*()_+-=[]{}|;:,.<>?";
+    const int symbolCount = sizeof(symbols) - 1; // 减去末尾的\0
+    
+    char* buffer = new char[length + 1];
+    for (int i = 0; i < length; ++i) {
+        buffer[i] = symbols[rand() % symbolCount];
+    }
+    buffer[length] = '\0';
+    
+    String result(buffer);
+    delete[] buffer;
+    return result;
+}
+
+String PasswordGenerator::generateMixed(int length, const String& charSet) {
+    char* buffer = new char[length + 1];
+    for (int i = 0; i < length; ++i) {
+        buffer[i] = charSet.c_str()[rand() % charSet.length()];
+    }
+    buffer[length] = '\0';
+    
+    String result(buffer);
+    delete[] buffer;
+    return result;
+}

others/C/C++/src/password_gui.cpp

@@ -0,0 +1,36 @@
+#include "password_gui.hpp"
+#include <cstdlib>
+
+PasswordGUI::PasswordGUI() {
+    window = new Fl_Window(400, 350, "密码生成器");
+    
+    lengthInput = new Fl_Input(150, 50, 200, 30, "密码长度:");
+    modeChoice = new Fl_Choice(150, 90, 200, 30, "密码模式:");
+    modeChoice->add("纯数字");
+    modeChoice->add("纯英文");
+    modeChoice->add("纯符号");
+    modeChoice->add("数字+英文");
+    modeChoice->add("数字+符号");
+    modeChoice->add("英文+符号");
+    modeChoice->value(0); // 默认选择纯数字模式
+    
+    generateButton = new Fl_Button(150, 140, 100, 40, "生成密码");
+    passwordOutput = new Fl_Output(100, 210, 250, 40, "生成结果:");
+
+    generateButton->callback(onGenerate, this);
+    window->end();
+}
+
+void PasswordGUI::show() {
+    window->show();
+}
+
+void PasswordGUI::onGenerate(Fl_Widget* widget, void* data) {
+    PasswordGUI* gui = static_cast<PasswordGUI*>(data);
+    const char* lengthStr = gui->lengthInput->value();
+    int length = atoi(lengthStr);
+    
+    PasswordGenerator::Mode mode = static_cast<PasswordGenerator::Mode>(gui->modeChoice->value());
+    String password = gui->generator.generate(length, mode);
+    gui->passwordOutput->value(password.c_str());
+}

others/C/C++/src/string.cpp

@@ -0,0 +1,51 @@
+#include "string.hpp"
+#include <cstring>
+
+String::String() : data(nullptr), len(0) {}
+
+String::String(const char* str) {
+    len = strlen(str);
+    data = new char[len + 1];
+    strcpy(data, str);
+}
+
+String::String(const String& other) {
+    len = other.len;
+    data = new char[len + 1];
+    strcpy(data, other.data);
+}
+
+String::~String() {
+    delete[] data;
+}
+
+size_t String::length() const {
+    return len;
+}
+
+const char* String::c_str() const {
+    return data;
+}
+
+String& String::operator=(const String& other) {
+    if (this != &other) {
+        delete[] data;
+        len = other.len;
+        data = new char[len + 1];
+        strcpy(data, other.data);
+    }
+    return *this;
+}
+
+String String::operator+(const String& other) const {
+    String result;
+    result.len = len + other.len;
+    result.data = new char[result.len + 1];
+    strcpy(result.data, data);
+    strcat(result.data, other.data);
+    return result;
+}
+
+bool String::operator==(const String& other) const {
+    return strcmp(data, other.data) == 0;
+}