修复主题系统带来的颜色

AboutForm.cs

@@ -17,12 +17,13 @@ namespace AppStore
         private void InitializeComponent()
         {
             this.Dock = DockStyle.Fill;
-            this.BackColor = Color.White;
+            this.BackColor = ThemeManager.BackgroundColor;
             this.Padding = new Padding(20);
 
             // 创建主布局面板
             TableLayoutPanel mainLayout = new TableLayoutPanel();
             mainLayout.Dock = DockStyle.Fill;
+            mainLayout.BackColor = ThemeManager.BackgroundColor;
             mainLayout.ColumnCount = 1;
             mainLayout.RowCount = 2;
             mainLayout.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
@@ -50,7 +51,7 @@ namespace AppStore
 
             // 初始化并添加应用信息
             infoLabel = new Label();
-            infoLabel.Text = "kortapp-z\n版本: 1.0.7\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;
@@ -68,6 +69,7 @@ namespace AppStore
             // 在底部添加GitHub链接区域
             TableLayoutPanel githubPanel = new TableLayoutPanel();
             githubPanel.Dock = DockStyle.Bottom;
+            githubPanel.BackColor = ThemeManager.BackgroundColor;
             githubPanel.Height = 60;
             githubPanel.ColumnCount = 3;
             githubPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
@@ -109,6 +111,7 @@ namespace AppStore
             // 创建包含图标和文字的面板
             Panel linkPanel = new Panel();
             linkPanel.AutoSize = true;
+            linkPanel.BackColor = ThemeManager.BackgroundColor;
             linkPanel.Controls.Add(githubIcon);
             linkPanel.Controls.Add(githubLabel);
             githubIcon.Location = new Point(0, 0);

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);
         }

MainForm.cs

@@ -140,11 +140,19 @@ namespace AppStore
             this.StartPosition = FormStartPosition.CenterScreen;
             this.Icon = new Icon("img/ico/icon.ico"); // 设置窗体图标
 
+            // 注册主题变更事件
+            ThemeManager.ThemeChanged += (theme) => 
+            {
+                this.Invoke((MethodInvoker)delegate {
+                    AnimateThemeChange();
+                });
+            };
+
             // 现代化顶部导航栏
             Panel buttonPanel = new Panel();
             buttonPanel.Dock = DockStyle.Top;
             buttonPanel.Height = 70;
-            buttonPanel.BackColor = Color.FromArgb(240, 240, 240);
+            buttonPanel.BackColor = ThemeManager.ControlBackgroundColor;
             buttonPanel.Padding = new Padding(10, 15, 10, 0);
             buttonPanel.AutoScroll = true;
             buttonPanel.AutoSize = true;
@@ -154,11 +162,13 @@ namespace AppStore
             Action<Button> styleButton = (Button btn) => {
                 btn.FlatStyle = FlatStyle.Flat;
                 btn.FlatAppearance.BorderSize = 0;
-                btn.BackColor = Color.Transparent;
+                btn.BackColor = ThemeManager.ControlBackgroundColor;
-                btn.ForeColor = Color.FromArgb(64, 64, 64);
+                btn.ForeColor = ThemeManager.TextColor;
                 btn.Font = new Font("Microsoft YaHei", 10, FontStyle.Regular);
                 btn.Size = new Size(120, 40);
                 btn.Cursor = Cursors.Hand;
+                btn.FlatAppearance.MouseOverBackColor = ThemeManager.ButtonHoverColor;
+                btn.FlatAppearance.MouseDownBackColor = ThemeManager.ButtonActiveColor;
                 
                 // 悬停效果
                 btn.MouseEnter += (s, e) => {
@@ -167,7 +177,7 @@ namespace AppStore
                 };
                 
                 btn.MouseLeave += (s, e) => {
-                    btn.ForeColor = Color.FromArgb(64, 64, 64);
+                    btn.ForeColor = ThemeManager.TextColor;
                     btn.Font = new Font(btn.Font, FontStyle.Regular);
                 };
             };
@@ -230,7 +240,7 @@ namespace AppStore
             // 现代化内容区域
             contentPanel = new Panel();
             contentPanel.Dock = DockStyle.Fill;
-            contentPanel.BackColor = Color.White;
+            contentPanel.BackColor = ThemeManager.BackgroundColor;
             contentPanel.Padding = new Padding(20);
             this.Controls.Add(contentPanel);
 
@@ -238,11 +248,13 @@ namespace AppStore
             Panel separator = new Panel();
             separator.Dock = DockStyle.Top;
             separator.Height = 1;
-            separator.BackColor = Color.FromArgb(230, 230, 230);
+            separator.BackColor = ThemeManager.CurrentTheme == ThemeManager.ThemeMode.Light 
+                ? Color.FromArgb(230, 230, 230) 
+                : Color.FromArgb(60, 60, 60);
             contentPanel.Controls.Add(separator);
 
             this.Controls.Add(buttonPanel);
-            this.BackColor = Color.White;
+            this.BackColor = ThemeManager.BackgroundColor;
 
             // 默认显示软件下载视图
             ShowAppsView();
@@ -484,6 +496,76 @@ namespace AppStore
             };
             flowPanel.Controls.Add(videoCompressorCard);
 
+            // 计算器工具卡片
+            var calculatorCard = new CalculatorToolCard();
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "Calculator.png");
+                if (File.Exists(iconPath))
+                {
+                    calculatorCard.ToolIcon = Image.FromFile(iconPath);
+                }
+                calculatorCard.UpdateDisplay();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("加载计算器图标失败", ex);
+            }
+            flowPanel.Controls.Add(calculatorCard);
+
+            // 图片查看工具卡片
+            var imageViewerCard = new KortAppZ.Tools.Viewer.ImageViewerToolCard();
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "ImageCompressor.png");
+                if (File.Exists(iconPath))
+                {
+                    imageViewerCard.ToolIcon = Image.FromFile(iconPath);
+                }
+                imageViewerCard.UpdateDisplay();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("加载图片查看器图标失败", ex);
+            }
+            flowPanel.Controls.Add(imageViewerCard);
+
+            // 密码生成器工具卡片
+            var passwordGeneratorCard = new ToolCard();
+            passwordGeneratorCard.ToolName = "密码生成器";
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "password_generator.png");
+                if (File.Exists(iconPath))
+                {
+                    passwordGeneratorCard.ToolIcon = Image.FromFile(iconPath);
+                }
+                else
+                {
+                    passwordGeneratorCard.ToolIcon = SystemIcons.Shield.ToBitmap();
+                }
+            }
+            catch
+            {
+                passwordGeneratorCard.ToolIcon = SystemIcons.Shield.ToBitmap();
+            }
+            passwordGeneratorCard.ToolCardClicked += (s, e) => {
+                try {
+                    string toolPath = Path.Combine(Application.StartupPath, "resource", "password_generator.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);
+                }
+            };
+            passwordGeneratorCard.UpdateDisplay();
+            flowPanel.Controls.Add(passwordGeneratorCard);
+
             }
             catch (Exception ex)
             {
@@ -1201,6 +1283,9 @@ namespace AppStore
             // 初始化窗体组件
             InitializeComponent();
             
+            // 应用主题
+            ThemeManager.ApplyTheme(this);
+            
             // 订阅下载管理器事件
             DownloadManager.Instance.DownloadAdded += OnDownloadAdded; // 下载添加事件
             DownloadManager.Instance.DownloadProgressChanged += OnDownloadProgressChanged; // 下载进度变化事件
@@ -1282,5 +1367,69 @@ namespace AppStore
             Logger.Log($"下载完成: {item.FileName}, 状态: {item.Status}"); // 记录日志
             item.UpdateDisplay(); // 更新UI显示
         }
+
+        /// <summary>
+        /// 主题切换动画效果
+        /// </summary>
+        private void AnimateThemeChange()
+        {
+            const int animationSteps = 10;
+            const int animationInterval = 30;
+            
+            var timer = new System.Windows.Forms.Timer { Interval = animationInterval };
+            int step = 0;
+            
+            // 保存当前和目标颜色
+            var originalBackColor = this.BackColor;
+            var targetBackColor = ThemeManager.BackgroundColor;
+            var originalForeColor = this.ForeColor;
+            var targetForeColor = ThemeManager.TextColor;
+            
+            timer.Tick += (s, e) => {
+                if (step >= animationSteps)
+                {
+                    timer.Stop();
+                    timer.Dispose();
+                    // 确保最终颜色准确
+                    ThemeManager.ApplyTheme(this);
+                    return;
+                }
+                
+                // 计算插值比例
+                float ratio = (float)step / animationSteps;
+                step++;
+                
+                // 插值计算新颜色
+                var newBackColor = Color.FromArgb(
+                    (int)(originalBackColor.R + (targetBackColor.R - originalBackColor.R) * ratio),
+                    (int)(originalBackColor.G + (targetBackColor.G - originalBackColor.G) * ratio),
+                    (int)(originalBackColor.B + (targetBackColor.B - originalBackColor.B) * ratio));
+                    
+                var newForeColor = Color.FromArgb(
+                    (int)(originalForeColor.R + (targetForeColor.R - originalForeColor.R) * ratio),
+                    (int)(originalForeColor.G + (targetForeColor.G - originalForeColor.G) * ratio),
+                    (int)(originalForeColor.B + (targetForeColor.B - originalForeColor.B) * ratio));
+                
+                // 应用新颜色
+                this.Invoke((MethodInvoker)delegate {
+                    this.BackColor = newBackColor;
+                    this.ForeColor = newForeColor;
+                    foreach (Control control in this.Controls)
+                    {
+                        control.BackColor = newBackColor;
+                        control.ForeColor = newForeColor;
+                        
+                        // 特殊处理按钮的悬停状态
+                        if (control is Button button)
+                        {
+                            button.FlatAppearance.MouseOverBackColor = ThemeManager.ButtonHoverColor;
+                            button.FlatAppearance.MouseDownBackColor = ThemeManager.ButtonActiveColor;
+                        }
+                    }
+                });
+            };
+            
+            timer.Start();
+        }
     }
 }

README.md

@@ -35,14 +35,15 @@
 
 ### 打包指令
 
+
 #### 32位版本
 ```bash
-dotnet publish -c Release -r win-x86 -p:PublishSingleFile=true
+dotnet publish AppStore.csproj -c Release -r win-x86 --self-contained false /p:Optimize=true /p:DebugType=None
 ```
 
 #### 64位版本
 ```bash
-dotnet publish -c Release -r win-x64 -p:PublishSingleFile=true
+dotnet publish AppStore.csproj -c Release -r win-x64 --self-contained false /p:Optimize=true /p:DebugType=None
 ```
 
 打包后的可执行文件将包含指定的应用程序图标，输出路径为：
@@ -51,7 +52,9 @@ bin\Release\net8.0-windows\[platform]\publish
 ```
 
 ### 高级选项
-- 添加`--self-contained true`可生成独立包（体积较大）
+- 使用`--self-contained false`生成框架依赖包（默认）
+- 使用`/p:Optimize=true`启用代码优化（默认）
+- 使用`/p:DebugType=None`禁用调试符号生成（默认）
 - 添加`-p:PublishTrimmed=true`可减小包体积（实验性）
 
 ## 项目结构

SettingsForm.cs

@@ -2,29 +2,64 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
+using System.Drawing;
 
 namespace AppStore
 {
     public class SettingsUserControl : UserControl
     {
         private Button btnCleanLogs;
+        private Button btnLightTheme;
+        private Button btnDarkTheme;
 
         public SettingsUserControl()
         {
             this.Dock = DockStyle.Fill;
-            this.BackColor = Color.White;
+            ThemeManager.ApplyTheme(this);
             
             // 设置顶部内边距
             this.Padding = new Padding(0, 30, 0, 0);
             
+            // 主题切换按钮
+            btnLightTheme = new Button();
+            btnLightTheme.Text = "浅色模式";
+            btnLightTheme.Size = new Size(150, 40);
+            btnLightTheme.Location = new Point((this.Width - 320) / 2, 50);
+            btnLightTheme.Font = new Font("Microsoft YaHei", 10);
+            btnLightTheme.Anchor = AnchorStyles.Top;
+            btnLightTheme.Click += (s, e) => SwitchTheme(ThemeManager.ThemeMode.Light);
+            this.Controls.Add(btnLightTheme);
+
+            btnDarkTheme = new Button();
+            btnDarkTheme.Text = "深色模式";
+            btnDarkTheme.Size = new Size(150, 40);
+            btnDarkTheme.Location = new Point(btnLightTheme.Right + 20, 50);
+            btnDarkTheme.Font = new Font("Microsoft YaHei", 10);
+            btnDarkTheme.Anchor = AnchorStyles.Top;
+            btnDarkTheme.Click += (s, e) => SwitchTheme(ThemeManager.ThemeMode.Dark);
+            this.Controls.Add(btnDarkTheme);
+            
+            // 清理日志按钮
             btnCleanLogs = new Button();
             btnCleanLogs.Text = "清理日志";
             btnCleanLogs.Size = new Size(150, 40);
-            btnCleanLogs.Location = new Point((this.Width - 150) / 2, 50); // 调整Y坐标为50靠近顶部
+            btnCleanLogs.Location = new Point((this.Width - 150) / 2, 110);
             btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
-            btnCleanLogs.Anchor = AnchorStyles.Top; // 添加顶部锚点
+            btnCleanLogs.Anchor = AnchorStyles.Top;
             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()

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

@@ -0,0 +1,64 @@
+; 脚本由 Inno Setup 脚本向导生成。
+; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
+
+#define MyAppName "kortapp-z"
+#define MyAppVersion "1.1.2"
+#define MyAppPublisher "zsyg"
+#define MyAppURL "https://github.com/zs-yg/kortapp-z"
+#define MyAppExeName "kortapp.exe"
+#define MyAppAssocName MyAppName + ""
+#define MyAppAssocExt ".exe"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+
+[Setup]
+; 注意：AppId 的值唯一标识此应用程序。不要在其他应用程序的安装程序中使用相同的 AppId 值。
+; (若要生成新的 GUID，请在 IDE 中单击 "工具|生成 GUID"。)
+AppId={{8020EC01-6133-40BB-8B8B-0EB71E49696C}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+; "ArchitecturesAllowed=x64compatible" 指定安装程序无法运行
+; 除 Arm 上的 x64 和 Windows 11 之外的任何平台上。
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" 要求
+; 安装可以在 x64 或 Arm 上的 Windows 11 上以“64 位模式”完成，
+; 这意味着它应该使用本机 64 位 Program Files 目录和
+; 注册表的 64 位视图。
+ArchitecturesInstallIn64BitMode=x64compatible
+ChangesAssociations=yes
+DisableProgramGroupPage=yes
+LicenseFile=C:\Users\Administrator\Downloads\LICENSE.txt
+; 取消注释以下行以在非管理安装模式下运行 (仅为当前用户安装)。
+;PrivilegesRequired=lowest
+OutputDir=D:\C#\kortapp-z_Release\setup
+OutputBaseFilename=kortapp-z_setup_x64
+SolidCompression=yes
+WizardStyle=modern
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "D:\C#\kortapp-z_Release\x64_inno\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\C#\kortapp-z_Release\x64_inno\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; 注意：不要在任何共享系统文件上使用 "Flags: ignoreversion"
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

inno/innosetup_x86.iss

@@ -0,0 +1,56 @@
+; 脚本由 Inno Setup 脚本向导生成。
+; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
+
+#define MyAppName "kortapp-z"
+#define MyAppVersion "1.1.2"
+#define MyAppPublisher "zsyg"
+#define MyAppURL "https://github.com/zs-yg/kortapp-z"
+#define MyAppExeName "kortapp.exe"
+#define MyAppAssocName MyAppName + ""
+#define MyAppAssocExt ".exe"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+
+[Setup]
+; 注意：AppId 的值唯一标识此应用程序。不要在其他应用程序的安装程序中使用相同的 AppId 值。
+; (若要生成新的 GUID，请在 IDE 中单击 "工具|生成 GUID"。)
+AppId={{BF1944C3-CD0C-4119-A340-49C54961D48B}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+ChangesAssociations=yes
+DisableProgramGroupPage=yes
+LicenseFile=C:\Users\Administrator\Downloads\LICENSE.txt
+; 取消注释以下行以在非管理安装模式下运行 (仅为当前用户安装)。
+;PrivilegesRequired=lowest
+OutputDir=D:\C#\kortapp-z_Release\setup
+OutputBaseFilename=kortapp-z_setup_x86
+SolidCompression=yes
+WizardStyle=modern
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "D:\C#\kortapp-z_Release\x86_inno\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\C#\kortapp-z_Release\x86_inno\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; 注意：不要在任何共享系统文件上使用 "Flags: ignoreversion"
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

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;
+}

tools/Calculator.cs

@@ -0,0 +1,34 @@
+using System;
+
+namespace AppStore
+{
+    /// <summary>
+    /// 提供基本数学运算功能的工具类
+    /// </summary>
+    public static class Calculator
+    {
+        /// <summary>
+        /// 加法运算
+        /// </summary>
+        public static double Add(double a, double b) => a + b;
+
+        /// <summary>
+        /// 减法运算
+        /// </summary>
+        public static double Subtract(double a, double b) => a - b;
+
+        /// <summary>
+        /// 乘法运算
+        /// </summary>
+        public static double Multiply(double a, double b) => a * b;
+
+        /// <summary>
+        /// 除法运算
+        /// </summary>
+        public static double Divide(double a, double b)
+        {
+            if (b == 0) throw new DivideByZeroException("除数不能为零");
+            return a / b;
+        }
+    }
+}

tools/CalculatorForm.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using AppStore;
+
+namespace AppStore
+{
+    public class CalculatorForm : Form
+    {
+        private TextBox display = new TextBox();
+        private double firstNumber = 0;
+        private string operation = "";
+        
+        public CalculatorForm()
+        {
+            this.Text = "计算器";
+            this.Size = new Size(300, 400);
+            this.StartPosition = FormStartPosition.CenterScreen;
+            CreateControls();
+        }
+
+        private void CreateControls()
+        {
+            // 显示框
+            display = new TextBox();
+            display.ReadOnly = true;
+            display.TextAlign = HorizontalAlignment.Right;
+            display.Font = new Font("Microsoft YaHei", 14);
+            display.Size = new Size(260, 40);
+            display.Location = new Point(20, 20);
+            this.Controls.Add(display);
+
+            // 按钮布局
+            string[] buttonLabels = {
+                "7", "8", "9", "/",
+                "4", "5", "6", "*", 
+                "1", "2", "3", "-",
+                "0", ".", "=", "+"
+            };
+
+            for (int i = 0; i < buttonLabels.Length; i++)
+            {
+                var btn = new Button();
+                btn.Text = buttonLabels[i];
+                btn.Size = new Size(60, 50);
+                btn.Location = new Point(20 + (i % 4) * 65, 70 + (i / 4) * 55);
+                btn.Font = new Font("Microsoft YaHei", 12);
+                btn.Click += ButtonClickHandler;
+                this.Controls.Add(btn);
+            }
+
+            // 清除按钮
+            var clearBtn = new Button();
+            clearBtn.Text = "C";
+            clearBtn.Size = new Size(260, 40);
+            clearBtn.Location = new Point(20, 300);
+            clearBtn.Font = new Font("Microsoft YaHei", 12);
+            clearBtn.Click += (s, e) => {
+                display.Text = "";
+                firstNumber = 0;
+                operation = "";
+            };
+            this.Controls.Add(clearBtn);
+        }
+
+        private void ButtonClickHandler(object sender, EventArgs e)
+        {
+            var button = sender as Button;
+            if (button == null) return;
+
+            switch (button.Text)
+            {
+                case "+":
+                case "-":
+                case "*":
+                case "/":
+                    if (!string.IsNullOrEmpty(display.Text))
+                    {
+                        firstNumber = double.Parse(display.Text);
+                        operation = button.Text;
+                        display.Text = "";
+                    }
+                    break;
+                    
+                case "=":
+                    if (!string.IsNullOrEmpty(operation) && !string.IsNullOrEmpty(display.Text))
+                    {
+                        double secondNumber = double.Parse(display.Text);
+                        double result = 0;
+                        
+                        try
+                        {
+                            result = operation switch
+                            {
+                                "+" => AppStore.Calculator.Add(firstNumber, secondNumber),
+                                "-" => AppStore.Calculator.Subtract(firstNumber, secondNumber),
+                                "*" => AppStore.Calculator.Multiply(firstNumber, secondNumber),
+                                "/" => AppStore.Calculator.Divide(firstNumber, secondNumber),
+                                _ => 0
+                            };
+                            
+                            display.Text = result.ToString();
+                        }
+                        catch (DivideByZeroException)
+                        {
+                            MessageBox.Show("除数不能为零", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        }
+                        operation = "";
+                    }
+                    break;
+                    
+                default:
+                    display.Text += button.Text;
+                    break;
+            }
+        }
+    }
+}

tools/CalculatorToolCard.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    public class CalculatorToolCard : ToolCard
+    {
+        public CalculatorToolCard()
+        {
+            ToolName = "计算器";
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "Calculator.png");
+                if (File.Exists(iconPath))
+                {
+                    ToolIcon = Image.FromFile(iconPath);
+                }
+                else
+                {
+                    ToolIcon = SystemIcons.Application.ToBitmap();
+                }
+            }
+            catch
+            {
+                ToolIcon = SystemIcons.Application.ToBitmap();
+            }
+            this.ToolCardClicked += OnCalculatorCardClicked;
+            UpdateDisplay();
+        }
+
+        private void OnCalculatorCardClicked(object sender, EventArgs e)
+        {
+            var calculatorForm = new CalculatorForm();
+            calculatorForm.ShowDialog();
+        }
+    }
+}

tools/viewer/IImageViewer.cs

@@ -0,0 +1,21 @@
+namespace KortAppZ.Tools.Viewer
+{
+    public interface IImageViewer
+    {
+        /// <summary>
+        /// 加载图片文件
+        /// </summary>
+        /// <param name="filePath">图片文件路径</param>
+        void LoadImage(string filePath);
+        
+        /// <summary>
+        /// 显示图片
+        /// </summary>
+        void ShowImage();
+        
+        /// <summary>
+        /// 关闭图片查看器
+        /// </summary>
+        void CloseViewer();
+    }
+}

tools/viewer/ImageDisplayForm.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.IO;
+
+namespace KortAppZ.Tools.Viewer
+{
+    public class ImageDisplayForm : Form
+    {
+        private PictureBox? pictureBox;
+        private Image? currentImage;
+        
+        public ImageDisplayForm()
+        {
+            InitializeComponent();
+        }
+        
+        private void InitializeComponent()
+        {
+            this.pictureBox = new PictureBox();
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Dock = DockStyle.Fill;
+            this.pictureBox.SizeMode = PictureBoxSizeMode.Zoom;
+            this.pictureBox.BackColor = Color.Black;
+            // 
+            // ImageDisplayForm
+            // 
+            this.Text = "图片查看";
+            this.ClientSize = new Size(800, 600);
+            this.MaximizeBox = false;
+            this.MinimizeBox = true;
+            this.FormBorderStyle = FormBorderStyle.FixedDialog;
+            this.ControlBox = true;
+            this.ShowIcon = true;
+            this.MaximizedBounds = Screen.FromHandle(this.Handle).WorkingArea;
+            this.Controls.Add(this.pictureBox);
+            this.FormClosing += new FormClosingEventHandler(ImageDisplayForm_FormClosing);
+        }
+        
+        public void LoadImage(string filePath)
+        {
+            try
+            {
+                if (currentImage != null)
+                {
+                    currentImage.Dispose();
+                    currentImage = null;
+                }
+                
+                currentImage = ImageFileHandler.LoadImage(filePath);
+                pictureBox.Image = currentImage;
+                this.Text = $"图片查看 - {Path.GetFileName(filePath)}";
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"无法加载图片: {ex.Message}", "错误", 
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+        
+        private void ImageDisplayForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (currentImage != null)
+            {
+                currentImage.Dispose();
+                currentImage = null;
+            }
+        }
+    }
+}

tools/viewer/ImageFileHandler.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Drawing;
+using System.IO;
+
+namespace KortAppZ.Tools.Viewer
+{
+    public static class ImageFileHandler
+    {
+        private static readonly string[] SupportedExtensions = 
+        {
+            ".jpg", ".jpeg", ".png", ".bmp", ".gif", ".tiff", ".tif"
+        };
+        
+        public static bool IsImageFile(string filePath)
+        {
+            if (string.IsNullOrEmpty(filePath))
+                return false;
+                
+            string extension = Path.GetExtension(filePath).ToLower();
+            return Array.Exists(SupportedExtensions, ext => ext == extension);
+        }
+        
+        public static Image LoadImage(string filePath)
+        {
+            if (!IsImageFile(filePath))
+                throw new ArgumentException("不支持的图片格式");
+                
+            if (!File.Exists(filePath))
+                throw new FileNotFoundException("图片文件不存在", filePath);
+                
+            try
+            {
+                return Image.FromFile(filePath);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"无法加载图片: {ex.Message}", ex);
+            }
+        }
+    }
+}

tools/viewer/ImageViewerForm.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.IO;
+using KortAppZ.Tools.Viewer;
+
+namespace KortAppZ.Tools.Viewer
+{
+    public class ImageViewerForm : Form
+    {
+        private Button? openButton;
+        
+        public ImageViewerForm()
+        {
+            InitializeComponent();
+        }
+        
+        private void InitializeComponent()
+        {
+            this.openButton = new Button();
+            // 
+            // openButton
+            // 
+            this.openButton.Text = "打开图片";
+            this.openButton.Size = new Size(120, 40);
+            this.openButton.Font = new Font("Microsoft YaHei", 10);
+            this.openButton.Anchor = AnchorStyles.None;
+            this.openButton.Click += new EventHandler(OpenButton_Click);
+            
+            // 初始位置
+            CenterOpenButton();
+            
+            // 窗体大小变化时重新居中按钮
+            this.Resize += (s, e) => CenterOpenButton();
+            
+            // 
+            // ImageViewerForm
+            // 
+            this.Text = "图片查看器";
+            this.ClientSize = new Size(400, 300);
+            this.StartPosition = FormStartPosition.CenterScreen;
+            this.MinimumSize = new Size(300, 200);
+            this.MaximizeBox = false;
+            this.FormBorderStyle = FormBorderStyle.FixedDialog;
+            this.MaximizedBounds = Screen.FromHandle(this.Handle).WorkingArea;
+            this.Controls.Add(this.openButton);
+        }
+        
+        private void CenterOpenButton()
+        {
+            if (openButton != null)
+            {
+                openButton.Location = new Point(
+                    (this.ClientSize.Width - openButton.Width) / 2,
+                    (this.ClientSize.Height - openButton.Height) / 2);
+            }
+        }
+        
+        private void OpenButton_Click(object sender, EventArgs e)
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Filter = "图片文件|*.jpg;*.jpeg;*.png;*.bmp;*.gif;*.tiff;*.tif|所有文件|*.*";
+            
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                string filePath = openFileDialog.FileName;
+                ShowImage(filePath);
+            }
+        }
+        
+        private void ShowImage(string filePath)
+        {
+            try
+            {
+                if (!ImageFileHandler.IsImageFile(filePath))
+                {
+                    MessageBox.Show("不支持的图片格式", "错误", 
+                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+                
+                ImageDisplayForm displayForm = new ImageDisplayForm();
+                displayForm.LoadImage(filePath);
+                displayForm.Show();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"无法加载图片: {ex.Message}", "错误", 
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+}

tools/viewer/ImageViewerToolCard.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.IO;
+using AppStore;
+
+namespace KortAppZ.Tools.Viewer
+{
+    public class ImageViewerToolCard : ToolCard
+    {
+        public ImageViewerToolCard()
+        {
+            this.ToolName = "图片查看";
+            
+            try 
+            {
+                string iconPath = Path.Combine(Application.StartupPath, "img", "resource", "png", "ImageCompressor.png");
+                if (File.Exists(iconPath))
+                {
+                    this.ToolIcon = Image.FromFile(iconPath);
+                }
+                else
+                {
+                    this.ToolIcon = SystemIcons.Application.ToBitmap();
+                }
+            }
+            catch
+            {
+                this.ToolIcon = SystemIcons.Application.ToBitmap();
+            }
+            
+            this.ToolCardClicked += (s, e) => {
+                try
+                {
+                    ImageViewerForm viewerForm = new ImageViewerForm();
+                    viewerForm.Show();
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"打开图片查看器失败: {ex.Message}", "错误", 
+                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            };
+            
+            this.UpdateDisplay();
+        }
+    }
+}