Add files via upload

AboutForm.cs

@@ -4,14 +4,69 @@ using System.Windows.Forms;
 
 namespace AppStore
 {
-    public class AboutForm : Form
+    public class AboutUserControl : UserControl
     {
-        public AboutForm()
+        private PictureBox logo = null!;
+        private Label infoLabel = null!;
+
+        public AboutUserControl()
         {
             InitializeComponent();
         }
 
         private void InitializeComponent()
+        {
+            this.Dock = DockStyle.Fill;
+            this.BackColor = Color.White;
+            this.Padding = new Padding(20);
+
+            // 创建主布局面板
+            TableLayoutPanel mainLayout = new TableLayoutPanel();
+            mainLayout.Dock = DockStyle.Fill;
+            mainLayout.ColumnCount = 1;
+            mainLayout.RowCount = 2;
+            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);
+
+            // 初始化并添加应用图标
+            logo = new PictureBox();
+            try
+            {
+                logo.Image = Image.FromFile("img/png/kortapp-z.png");
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"无法加载应用图标: {ex.Message}");
+                logo.Image = SystemIcons.Application.ToBitmap();
+            }
+            logo.SizeMode = PictureBoxSizeMode.Zoom;
+            logo.Width = 200;
+            logo.Height = 200;
+            logo.Anchor = AnchorStyles.None;
+            logo.Margin = new Padding(0, 0, 0, 20);
+            mainLayout.Controls.Add(logo, 0, 0);
+
+            // 初始化并添加应用信息
+            infoLabel = new Label();
+            infoLabel.Text = "kortapp-z\n版本: 0.9.8\n一个简单、开源的应用商店\nkortapp-z是完全免费的基于.NET8和C++的软件";
+            infoLabel.Font = new Font("Microsoft YaHei", 12);
+            infoLabel.AutoSize = false;
+            infoLabel.Width = 300;
+            infoLabel.Height = 100;
+            infoLabel.TextAlign = ContentAlignment.MiddleCenter;
+            infoLabel.Anchor = AnchorStyles.None;
+            mainLayout.Controls.Add(infoLabel, 0, 1);
+
+            this.Controls.Add(mainLayout);
+        }
+    }
+
+    // 保留原AboutForm作为容器(可选)
+    public class AboutForm : Form
+    {
+        public AboutForm()
         {
             this.Text = "关于 kortapp-z";
             this.Size = new Size(500, 400);
@@ -19,48 +74,9 @@ namespace AppStore
             this.FormBorderStyle = FormBorderStyle.FixedDialog;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-
-            // 添加应用图标
-            PictureBox logo = new PictureBox();
-            try
-            {
-                logo.Image = Image.FromFile("img/png/kortapp-z.png");
-                logo.SizeMode = PictureBoxSizeMode.Zoom;
-                logo.Width = 200;
-                logo.Height = 200;
-                logo.Location = new Point((this.Width - logo.Width) / 2, 30);
-                this.Controls.Add(logo);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"无法加载应用图标: {ex.Message}");
-            }
-
-            // 添加应用信息
-            Label infoLabel = new Label();
-            infoLabel.Text = "kortapp-z\n版本: 0.9.5\n一个简单、开源的应用商店\nkortapp-z是完全免费的基于.NET8和C++的软件";
-            infoLabel.Font = new Font("Microsoft YaHei", 12);
-            infoLabel.AutoSize = false;
-            infoLabel.Width = this.ClientSize.Width - 40;
-            infoLabel.Height = 100;
-            infoLabel.TextAlign = ContentAlignment.MiddleCenter;
-            infoLabel.Location = new Point(
-                20,
-                logo.Bottom + 20
-            );
-            this.Controls.Add(infoLabel);
-
-            // 添加关闭按钮
-            Button closeButton = new Button();
-            closeButton.Text = "关闭";
-            closeButton.Width = 100;
-            closeButton.Height = 40;
-            closeButton.Location = new Point(
-                (this.Width - closeButton.Width) / 2,
-                infoLabel.Bottom + 30
-            );
-            closeButton.Click += (s, e) => this.Close();
-            this.Controls.Add(closeButton);
+            
+            var aboutControl = new AboutUserControl();
+            this.Controls.Add(aboutControl);
         }
     }
 }

MainForm.cs

@@ -104,8 +104,7 @@ namespace AppStore
             styleButton(btnAbout);
             btnAbout.Click += (s, e) => {
                 Logger.Log("用户点击了'关于'按钮");
-                var aboutForm = new AboutForm();
-                aboutForm.ShowDialog();
+                ShowAboutView();
             };
             buttonPanel.Controls.Add(btnAbout);
             
@@ -135,8 +134,16 @@ namespace AppStore
         /// </summary>
         private void ShowSettingsView()
         {
-            var settingsForm = new SettingsForm();
-            settingsForm.ShowDialog(); // 以模态对话框形式显示设置窗口
+            contentPanel.Controls.Clear();
+            var settingsControl = new SettingsUserControl();
+            contentPanel.Controls.Add(settingsControl);
+        }
+
+        private void ShowAboutView()
+        {
+            contentPanel.Controls.Clear();
+            var aboutControl = new AboutUserControl();
+            contentPanel.Controls.Add(aboutControl);
         }
 
         /// <summary>
@@ -216,6 +223,11 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/amir1376/ab-download-manager/releases/download/v1.6.4/ABDownloadManager_1.6.4_windows_x64.exe",
                 "img/png/ABDM.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "NDM",
+                "https://ghproxy.net/https://github.com/zs-yg/package/releases/download/v0.7/NeatDM_setup.exe",
+                "img/jpg/NDM.jpg"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "python3.8",
                 "https://www.python.org/ftp/python/3.8.0/python-3.8.0-amd64.exe",
@@ -306,6 +318,11 @@ namespace AppStore
                 "https://visualstudio.microsoft.com/zh-hans/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false",
                 "img/jpg/vs.jpg"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "VSCodium",
+                "https://visualstudio.microsoft.com/zh-hans/thank-you-downloading-visual-studio/?sku=Community&channel=Release&version=VS2022&source=VSLandingPage&cid=2030&passive=false",
+                "img/png/codium_cnl.png"));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "7-Zip",
                 "https://objects.githubusercontent.com/github-production-release-asset-2e65be/466446150/1645817e-3677-4207-93ff-e62de7e147be?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250613%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250613T035936Z&X-Amz-Expires=300&X-Amz-Signature=5e02d5fc34f45bd8308029c9fc78052007e9475ce0e32775619921cb8f3b83ea&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3D7z2409-x64.exe&response-content-type=application%2Foctet-stream",

SettingsForm.cs

@@ -1,50 +1,53 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Windows.Forms;
-
-namespace AppStore
-{
-    public class SettingsForm : Form
-    {
-        private Button btnCleanLogs;
-
-        public SettingsForm()
-        {
-            this.Text = "设置";
-            this.Size = new Size(400, 300);
-            this.StartPosition = FormStartPosition.CenterParent;
-
-            btnCleanLogs = new Button();
-            btnCleanLogs.Text = "清理日志";
-            btnCleanLogs.Size = new Size(150, 40);
-            btnCleanLogs.Location = new Point(120, 100);
-            btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
-            btnCleanLogs.Click += (s, e) => CleanLogs();
-            this.Controls.Add(btnCleanLogs);
-        }
-
-        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);
-            }
-        }
-    }
-}
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Forms;
+
+namespace AppStore
+{
+    public class SettingsUserControl : UserControl
+    {
+        private Button btnCleanLogs;
+
+        public SettingsUserControl()
+        {
+            this.Dock = DockStyle.Fill;
+            this.BackColor = Color.White;
+            
+            // 设置顶部内边距
+            this.Padding = new Padding(0, 30, 0, 0);
+            
+            btnCleanLogs = new Button();
+            btnCleanLogs.Text = "清理日志";
+            btnCleanLogs.Size = new Size(150, 40);
+            btnCleanLogs.Location = new Point((this.Width - 150) / 2, 50); // 调整Y坐标为50靠近顶部
+            btnCleanLogs.Font = new Font("Microsoft YaHei", 10);
+            btnCleanLogs.Anchor = AnchorStyles.Top; // 添加顶部锚点
+            btnCleanLogs.Click += (s, e) => CleanLogs();
+            this.Controls.Add(btnCleanLogs);
+        }
+
+        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);
+            }
+        }
+    }
+}