Merge pull request #106 from InkCanvasForClass/beta

ICC CE 1.7.4.0
更新版本号
2025-07-27 16:20:53 +08:00 · 2025-07-27 16:15:36 +08:00 · 2025-07-27 16:05:38 +08:00 · 2025-07-27 00:13:41 +08:00 · 2025-07-26 19:42:27 +08:00 · 2025-07-26 19:38:22 +08:00
477 changed files with 23077 additions and 147231 deletions
@@ -0,0 +1,84 @@
+{
+  "projectName": "community",
+  "projectOwner": "InkCanvasForClass",
+  "files": [
+    "README.md"
+  ],
+  "commitType": "docs",
+  "commitConvention": "angular",
+  "contributorsPerLine": 7,
+  "contributors": [
+    {
+      "login": "CJKmkp",
+      "name": "CJK_mkp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/113243675?v=4",
+      "profile": "https://github.com/CJKmkp",
+      "contributions": [
+        "maintenance",
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "Hydro11451",
+      "name": "Hydrogen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/214308559?v=4",
+      "profile": "http://hydro11451.qzz.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CreeperAWA",
+      "name": "CreeperAWA",
+      "avatar_url": "https://avatars.githubusercontent.com/u/134939494?v=4",
+      "profile": "https://github.com/CreeperAWA",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "2-2-3-trimethylpentane",
+      "name": "2,2,3-三甲基戊烷",
+      "avatar_url": "https://avatars.githubusercontent.com/u/141403762?v=4",
+      "profile": "https://github.com/2-2-3-trimethylpentane",
+      "contributions": [
+        "blog",
+        "doc",
+        "design"
+      ]
+    },
+    {
+      "login": "Alan-CRL",
+      "name": "Alan-CRL",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92425617?v=4",
+      "profile": "https://github.com/Alan-CRL",
+      "contributions": [
+        "code",
+        "infra",
+        "doc",
+        "financial"
+      ]
+    },
+    {
+      "login": "MKStoler1024",
+      "name": "MKStoler1024",
+      "avatar_url": "https://avatars.githubusercontent.com/u/158786854?v=4",
+      "profile": "https://github.com/MKStoler1024",
+      "contributions": [
+        "doc",
+        "code",
+        "design"
+      ]
+    },
+    {
+      "login": "awesome-iwb",
+      "name": "Awesome Iwb",
+      "avatar_url": "https://avatars.githubusercontent.com/u/184760810?v=4",
+      "profile": "https://github.com/awesome-iwb",
+      "contributions": [
+        "doc"
+      ]
+    }
+  ]
+}
@@ -1,22 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
---
-
-## Description
-
-
-## Reproduction
-
-
-## Expected behavior
-
-
-## Screenshots
-
-
-## Additional context
@@ -0,0 +1,56 @@
+name: Bug 报告 | Bug Report
+description: 反馈软件缺陷或异常 | Report a bug to help us improve
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢你的反馈！请详细填写以下内容，便于我们定位问题。
+        Thank you for your feedback! Please fill out the following information to help us locate the issue.
+  - type: input
+    id: version
+    attributes:
+      label: 软件版本 | App Version
+      description: 可在设置中的“关于”界面查看 | You can find it on the "About" interface in the settings
+      placeholder: 例如 v1.2.3 | e.g. v1.2.3
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: 操作系统及版本 | OS & Version
+      placeholder: 例如 Windows 10 22H2 64位 | e.g. Windows 10 22H2 64bit
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: 问题描述 | Description
+      description: 简要描述遇到的问题 | Briefly describe the problem
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: 复现步骤 | Steps to Reproduce
+      description: 如何复现该问题？如有必要可附截图/录屏 | How to reproduce this bug? Screenshots/recordings if needed
+      placeholder: |
+        1. 
+        2. 
+        3. 
+    validations:
+      required: false
+  - type: textarea
+    id: expected
+    attributes:
+      label: 期望结果 | Expected Behavior
+      description: 你期望的正确行为或结果 | What did you expect to happen?
+    validations:
+      required: false
+  - type: textarea
+    id: extra
+    attributes:
+      label: 其他补充信息 | Additional Info
+      description: 其他相关信息（如日志、配置、特殊环境等）| Any other context, logs, configs, special environment, etc.
+    validations:
+      required: false
@@ -0,0 +1 @@
+blank_issues_enabled: false
@@ -1,10 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
---
-
-## Description
@@ -0,0 +1,37 @@
+name: 功能请求 | Feature Request
+description: 提出你对本项目的功能建议 | Suggest an idea for this project
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢你的建议！请详细描述你的需求。
+        Thank you for your suggestion! Please describe your needs in detail.
+  - type: textarea
+    id: description
+    attributes:
+      label: 功能描述 | Description
+      description: 请描述你希望添加的功能 | Describe the feature you want
+    validations:
+      required: true
+  - type: textarea
+    id: motivation
+    attributes:
+      label: 需求动机 | Motivation
+      description: 为什么需要这个功能？| Why do you need this feature?
+    validations:
+      required: false
+  - type: textarea
+    id: design
+    attributes:
+      label: 期望设计 | Expected Design
+      description: （可选）描述或画出你期望的界面或交互 | (Optional) Describe or sketch the expected UI/UX
+    validations:
+      required: false
+  - type: textarea
+    id: extra
+    attributes:
+      label: 其他补充信息 | Additional Info
+      description: 其他补充说明或建议 | Any other context or suggestions
+    validations:
+      required: false
@@ -2,9 +2,9 @@ name: .NET Build

 on:
  push:
-    branches: [ master ]
+    branches: [ main,beta ]
  pull_request:
-    branches: [ master ]
+    branches: [ main ]

 jobs:

@@ -1,3 +1,3 @@
-/Ink Canvas/obj
-/Ink Canvas/bin
-/.vs
+obj/
+bin/
+.vs
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="UserContentModel">
-    <attachedFolders />
+    <attachedFolders>
+      <Path>../../ICC CE main</Path>
+    </attachedFolders>
    <explicitIncludes />
    <explicitExcludes />
  </component>
@@ -1,12 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE main\\ICC-CE\\",
-  "Documents": [],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": []
-    }
-  ]
-}
@@ -1,29 +1,37 @@
 {
  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\",
+  "WorkspaceRootPath": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\",
  "Documents": [
    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
+      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow_cs\\mw_floatingbaricons.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow_cs\\mw_floatingbaricons.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}",
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}",
      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\administrator\\desktop\\icc ce\\icc ce 1.2.3\\ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\administrator\\desktop\\icc ce\\icc ce 1.2.3\\ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
+      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
    },
    {
@@ -39,23 +47,240 @@
      "VerticalTabListWidth": 256,
      "DocumentGroups": [
        {
-          "DockedWidth": 200,
-          "SelectedChildIndex": 4,
+          "DockedWidth": 210,
+          "SelectedChildIndex": 48,
          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{387cb18d-6153-4156-9257-9ac3f9207bbe}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{e8b06f52-6d01-11d2-aa7d-00c04f990343}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{46c87f81-5a06-43a8-9e25-85d33bac49f8}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{269a02dc-6af8-11d3-bdc4-00c04f688e50}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{99b8fa2f-ab90-4f57-9c32-949f146f1914}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{c79b74ff-f1d7-4c94-aefa-4d22bfe1b1f9}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:2:0:{34c7837f-3b3a-449c-bdf0-bdad86cbaf4a}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{37aba9be-445a-11d3-9949-00c04f68fd0a}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{dcc4ea97-1c0c-482b-b205-e541c0df9728}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{75188d03-9892-4ae2-abf1-207126247ce5}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{4a9b7e51-aa16-11d0-a8c5-00a0c921a4d2}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:132:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:3:0:{34c7837f-3b3a-449c-bdf0-bdad86cbaf4a}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:153:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:154:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:152:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:151:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:150:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:148:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:149:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:136:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:144:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:147:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:145:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:146:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:143:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:142:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:141:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:140:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:139:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:138:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:137:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:135:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:130:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{75188d03-9892-4ae2-abf1-207126247ce5}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
+            },
            {
              "$type": "Document",
-              "DocumentIndex": 5,
+              "DocumentIndex": 0,
+              "Title": "MW_FloatingBarIcons.cs",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
+              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
+              "RelativeToolTip": "Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
+              "ViewState": "AgIAAOgCAAAAAAAAAAAuwEoGAAAIAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-05-31T10:49:24.719Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
+              "Title": "README.md",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md",
+              "RelativeDocumentMoniker": "README.md",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md",
+              "RelativeToolTip": "README.md",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
+              "WhenOpened": "2025-05-31T10:48:22.883Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 7,
              "Title": "MainWindow.xaml",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas\\MainWindow.xaml",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow.xaml",
              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow.xaml",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas\\MainWindow.xaml",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow.xaml",
              "RelativeToolTip": "Ink Canvas\\MainWindow.xaml",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
              "WhenOpened": "2025-05-24T13:22:56.715Z"
            },
            {
              "$type": "Document",
-              "DocumentIndex": 7,
+              "DocumentIndex": 9,
              "Title": "Microsoft.Common.CurrentVersion.targets",
              "DocumentMoniker": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
              "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
@@ -67,11 +292,11 @@
            },
            {
              "$type": "Document",
-              "DocumentIndex": 4,
+              "DocumentIndex": 6,
              "Title": "MW_PPT.cs",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
              "RelativeToolTip": "Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
              "ViewState": "AgIAAFgAAAAAAAAAAAAUwHQAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
@@ -79,71 +304,91 @@
            },
            {
              "$type": "Document",
-              "DocumentIndex": 6,
+              "DocumentIndex": 8,
              "Title": "README.md",
              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "RelativeDocumentMoniker": "..\\icc-0610.2.3\\README.md",
+              "RelativeDocumentMoniker": "..\\..\\..\\..\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "RelativeToolTip": "..\\icc-0610.2.3\\README.md",
+              "RelativeToolTip": "..\\..\\..\\..\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
              "WhenOpened": "2025-05-24T13:04:01.407Z"
            },
            {
              "$type": "Document",
-              "DocumentIndex": 0,
+              "DocumentIndex": 2,
              "Title": "privacy.txt",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\privacy.txt",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt",
              "RelativeDocumentMoniker": "privacy.txt",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\privacy.txt",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt",
              "RelativeToolTip": "privacy.txt",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
-              "WhenOpened": "2025-05-24T13:04:01.337Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "Manual.md",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Manual.md",
-              "RelativeDocumentMoniker": "Manual.md",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Manual.md",
-              "RelativeToolTip": "Manual.md",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
-              "WhenOpened": "2025-05-24T13:04:00.986Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "LICENSE",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\LICENSE",
-              "RelativeDocumentMoniker": "LICENSE",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\LICENSE",
-              "RelativeToolTip": "LICENSE",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
-              "WhenOpened": "2025-05-24T13:04:00.902Z",
-              "EditorCaption": ""
+              "WhenOpened": "2025-05-24T13:04:01.337Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
+              "Title": "Manual.md",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md",
+              "RelativeDocumentMoniker": "Manual.md",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md",
+              "RelativeToolTip": "Manual.md",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
+              "WhenOpened": "2025-05-24T13:04:00.986Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 4,
+              "Title": "LICENSE",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE",
+              "RelativeDocumentMoniker": "LICENSE",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE",
+              "RelativeToolTip": "LICENSE",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
+              "WhenOpened": "2025-05-24T13:04:00.902Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 5,
              "Title": "Ink Canvas.sln.DotSettings.user",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas.sln.DotSettings.user",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user",
              "RelativeDocumentMoniker": "Ink Canvas.sln.DotSettings.user",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas.sln.DotSettings.user",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user",
              "RelativeToolTip": "Ink Canvas.sln.DotSettings.user",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003464|",
-              "WhenOpened": "2025-05-24T13:04:00.792Z",
-              "EditorCaption": ""
+              "WhenOpened": "2025-05-24T13:04:00.792Z"
            },
            {
              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+              "Name": "ST:0:0:{d84ee353-0bef-5a41-a649-8f89aca5d84d}"
+            }
+          ]
+        },
+        {
+          "DockedWidth": 204,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:1:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{590a070c-4fcd-52d9-87da-dfaa11710261}"
+            }
+          ]
+        },
+        {
+          "DockedWidth": 190,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{f4fc5ff1-28ef-4b04-ad02-6b298310ccc7}"
            }
          ]
        }
@@ -1,29 +1,37 @@
 {
  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\",
+  "WorkspaceRootPath": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\",
  "Documents": [
    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
+      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow_cs\\mw_floatingbaricons.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow_cs\\mw_floatingbaricons.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:privacy.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Manual.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}",
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}",
      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:LICENSE||{8B382828-6202-11D1-8870-0000F87579D2}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Ink Canvas.sln.DotSettings.user||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\administrator\\desktop\\icc ce\\icc ce 1.2.3\\ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow_cs\\mw_ppt.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
-      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\administrator\\desktop\\icc ce\\icc ce 1.2.3\\ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
+      "AbsoluteMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|c:\\users\\dubi906w\\source\\repos\\icc-ce\\ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
      "RelativeMoniker": "D:0:0:{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}|Ink Canvas\\InkCanvasForClass.csproj|solutionrelative:ink canvas\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
    },
    {
@@ -39,23 +47,240 @@
      "VerticalTabListWidth": 256,
      "DocumentGroups": [
        {
-          "DockedWidth": 200,
-          "SelectedChildIndex": 4,
+          "DockedWidth": 210,
+          "SelectedChildIndex": 48,
          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{387cb18d-6153-4156-9257-9ac3f9207bbe}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{e8b06f52-6d01-11d2-aa7d-00c04f990343}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{46c87f81-5a06-43a8-9e25-85d33bac49f8}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{269a02dc-6af8-11d3-bdc4-00c04f688e50}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{99b8fa2f-ab90-4f57-9c32-949f146f1914}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{c79b74ff-f1d7-4c94-aefa-4d22bfe1b1f9}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:2:0:{34c7837f-3b3a-449c-bdf0-bdad86cbaf4a}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{37aba9be-445a-11d3-9949-00c04f68fd0a}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{dcc4ea97-1c0c-482b-b205-e541c0df9728}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{75188d03-9892-4ae2-abf1-207126247ce5}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{4a9b7e51-aa16-11d0-a8c5-00a0c921a4d2}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:132:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:3:0:{34c7837f-3b3a-449c-bdf0-bdad86cbaf4a}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:153:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:154:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:152:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:151:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:150:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:148:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:149:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:136:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:144:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:147:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:145:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:146:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:143:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:142:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:141:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:140:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:139:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:138:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:137:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:135:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:130:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{75188d03-9892-4ae2-abf1-207126247ce5}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
+            },
            {
              "$type": "Document",
-              "DocumentIndex": 5,
+              "DocumentIndex": 0,
+              "Title": "MW_FloatingBarIcons.cs",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
+              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
+              "RelativeToolTip": "Ink Canvas\\MainWindow_cs\\MW_FloatingBarIcons.cs",
+              "ViewState": "AgIAAOgCAAAAAAAAAAAuwEoGAAAIAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-05-31T10:49:24.719Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
+              "Title": "README.md",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md",
+              "RelativeDocumentMoniker": "README.md",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\README.md",
+              "RelativeToolTip": "README.md",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
+              "WhenOpened": "2025-05-31T10:48:22.883Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 7,
              "Title": "MainWindow.xaml",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas\\MainWindow.xaml",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow.xaml",
              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow.xaml",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas\\MainWindow.xaml",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow.xaml",
              "RelativeToolTip": "Ink Canvas\\MainWindow.xaml",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
              "WhenOpened": "2025-05-24T13:22:56.715Z"
            },
            {
              "$type": "Document",
-              "DocumentIndex": 7,
+              "DocumentIndex": 9,
              "Title": "Microsoft.Common.CurrentVersion.targets",
              "DocumentMoniker": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
              "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
@@ -67,11 +292,11 @@
            },
            {
              "$type": "Document",
-              "DocumentIndex": 4,
+              "DocumentIndex": 6,
              "Title": "MW_PPT.cs",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
              "RelativeDocumentMoniker": "Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
              "RelativeToolTip": "Ink Canvas\\MainWindow_cs\\MW_PPT.cs",
              "ViewState": "AgIAAFgAAAAAAAAAAAAUwHQAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
@@ -79,71 +304,91 @@
            },
            {
              "$type": "Document",
-              "DocumentIndex": 6,
+              "DocumentIndex": 8,
              "Title": "README.md",
              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "RelativeDocumentMoniker": "..\\icc-0610.2.3\\README.md",
+              "RelativeDocumentMoniker": "..\\..\\..\\..\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
-              "RelativeToolTip": "..\\icc-0610.2.3\\README.md",
+              "RelativeToolTip": "..\\..\\..\\..\\Administrator\\Desktop\\ICC CE\\icc-0610.2.3\\README.md",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
              "WhenOpened": "2025-05-24T13:04:01.407Z"
            },
            {
              "$type": "Document",
-              "DocumentIndex": 0,
+              "DocumentIndex": 2,
              "Title": "privacy.txt",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\privacy.txt",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt",
              "RelativeDocumentMoniker": "privacy.txt",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\privacy.txt",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\privacy.txt",
              "RelativeToolTip": "privacy.txt",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
-              "WhenOpened": "2025-05-24T13:04:01.337Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "Manual.md",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Manual.md",
-              "RelativeDocumentMoniker": "Manual.md",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Manual.md",
-              "RelativeToolTip": "Manual.md",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
-              "WhenOpened": "2025-05-24T13:04:00.986Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "LICENSE",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\LICENSE",
-              "RelativeDocumentMoniker": "LICENSE",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\LICENSE",
-              "RelativeToolTip": "LICENSE",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
-              "WhenOpened": "2025-05-24T13:04:00.902Z",
-              "EditorCaption": ""
+              "WhenOpened": "2025-05-24T13:04:01.337Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
+              "Title": "Manual.md",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md",
+              "RelativeDocumentMoniker": "Manual.md",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Manual.md",
+              "RelativeToolTip": "Manual.md",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
+              "WhenOpened": "2025-05-24T13:04:00.986Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 4,
+              "Title": "LICENSE",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE",
+              "RelativeDocumentMoniker": "LICENSE",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\LICENSE",
+              "RelativeToolTip": "LICENSE",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
+              "WhenOpened": "2025-05-24T13:04:00.902Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 5,
              "Title": "Ink Canvas.sln.DotSettings.user",
-              "DocumentMoniker": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas.sln.DotSettings.user",
+              "DocumentMoniker": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user",
              "RelativeDocumentMoniker": "Ink Canvas.sln.DotSettings.user",
-              "ToolTip": "C:\\Users\\Administrator\\Desktop\\ICC CE\\ICC CE 1.2.3\\Ink Canvas.sln.DotSettings.user",
+              "ToolTip": "C:\\Users\\dubi906w\\source\\repos\\icc-ce\\Ink Canvas.sln.DotSettings.user",
              "RelativeToolTip": "Ink Canvas.sln.DotSettings.user",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003464|",
-              "WhenOpened": "2025-05-24T13:04:00.792Z",
-              "EditorCaption": ""
+              "WhenOpened": "2025-05-24T13:04:00.792Z"
            },
            {
              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+              "Name": "ST:0:0:{d84ee353-0bef-5a41-a649-8f89aca5d84d}"
+            }
+          ]
+        },
+        {
+          "DockedWidth": 204,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:1:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{590a070c-4fcd-52d9-87da-dfaa11710261}"
+            }
+          ]
+        },
+        {
+          "DockedWidth": 190,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{f4fc5ff1-28ef-4b04-ad02-6b298310ccc7}"
            }
          ]
        }
@@ -2,5 +2,6 @@
  "ExpandedNodes": [
    ""
  ],
+  "SelectedNode": "\\Ink Canvas.sln",
  "PreviewInSolutionExplorer": false
 }
@@ -1 +1 @@
-5.0.1
+1.7.4.0
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+QQ:2564608840.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;

@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.2.0")]
-[assembly: AssemblyFileVersion("5.0.2.0")]
+[assembly: AssemblyVersion("1.7.4.0")]
+[assembly: AssemblyFileVersion("1.7.4.0")]
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura />
+</Weavers>
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="Costura" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:all>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX86Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX64Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinArm64Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:all>
+            <xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="DisableCompression" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="DisableCleanup" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="DisableEventSubscription" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>The attach method no longer subscribes to the `AppDomain.AssemblyResolve` (.NET 4.x) and `AssemblyLoadContext.Resolving` (.NET 6.0+) events.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="LoadAtModuleInit" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ExcludeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UnmanagedWinX86Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Unmanaged64Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UnmanagedWinX64Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UnmanagedWinArm64Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="PreloadOrder" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
@@ -0,0 +1,562 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 异步硬件加速的墨迹平滑处理器
+    /// </summary>
+    public class AsyncAdvancedBezierSmoothing
+    {
+        private readonly SemaphoreSlim _processingSemaphore;
+        private readonly ConcurrentDictionary<Stroke, CancellationTokenSource> _processingTasks;
+        private readonly Dispatcher _uiDispatcher;
+
+        public AsyncAdvancedBezierSmoothing(Dispatcher uiDispatcher)
+        {
+            _uiDispatcher = uiDispatcher;
+            _processingSemaphore = new SemaphoreSlim(Environment.ProcessorCount, Environment.ProcessorCount);
+            _processingTasks = new ConcurrentDictionary<Stroke, CancellationTokenSource>();
+        }
+
+        public double SmoothingStrength { get; set; } = 0.3; // 大幅降低强度
+        public double ResampleInterval { get; set; } = 3.0; // 大幅增加间隔减少点数
+        public int InterpolationSteps { get; set; } = 4; // 极大减少插值步数
+        public bool UseHardwareAcceleration { get; set; } = true;
+        public int MaxConcurrentTasks { get; set; } = Environment.ProcessorCount;
+
+        /// <summary>
+        /// 异步平滑笔画
+        /// </summary>
+        public async Task<Stroke> SmoothStrokeAsync(Stroke originalStroke,
+            Action<Stroke, Stroke> onCompleted = null,
+            CancellationToken cancellationToken = default)
+        {
+            if (originalStroke == null || originalStroke.StylusPoints.Count < 2)
+                return originalStroke;
+
+            // 取消之前对同一笔画的处理
+            if (_processingTasks.TryGetValue(originalStroke, out var existingCts))
+            {
+                existingCts.Cancel();
+                _processingTasks.TryRemove(originalStroke, out _);
+            }
+
+            var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+            _processingTasks[originalStroke] = cts;
+
+            try
+            {
+                await _processingSemaphore.WaitAsync(cts.Token);
+
+                var smoothedStroke = await Task.Run(() =>
+                    ProcessStrokeInternal(originalStroke, cts.Token), cts.Token);
+
+                // 在UI线程上执行回调
+                if (onCompleted != null && !cts.Token.IsCancellationRequested)
+                {
+                    await _uiDispatcher.InvokeAsync(() => onCompleted(originalStroke, smoothedStroke));
+                }
+
+                return smoothedStroke;
+            }
+            catch (OperationCanceledException)
+            {
+                return originalStroke;
+            }
+            finally
+            {
+                _processingSemaphore.Release();
+                _processingTasks.TryRemove(originalStroke, out _);
+                cts.Dispose();
+            }
+        }
+
+        private Stroke ProcessStrokeInternal(Stroke stroke, CancellationToken cancellationToken)
+        {
+            var originalPoints = stroke.StylusPoints.ToArray();
+
+            // 如果点数太少，直接返回原始笔画
+            if (originalPoints.Length < 3)
+                return stroke;
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // 简化处理：只进行轻度平滑，避免点数爆炸
+            var smoothedPoints = ApplyLightSmoothing(originalPoints);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // 确保点数不会过多
+            if (smoothedPoints.Length > originalPoints.Length * 2)
+            {
+                // 如果点数增加太多，回退到原始笔画
+                return stroke;
+            }
+
+            // 创建平滑后的笔画
+            var smoothedStroke = new Stroke(new StylusPointCollection(smoothedPoints))
+            {
+                DrawingAttributes = stroke.DrawingAttributes.Clone()
+            };
+
+            return smoothedStroke;
+        }
+
+        /// <summary>
+        /// 轻度平滑处理，避免点数爆炸
+        /// </summary>
+        private StylusPoint[] ApplyLightSmoothing(StylusPoint[] points)
+        {
+            if (points.Length < 3) return points;
+
+            var result = new List<StylusPoint>();
+            result.Add(points[0]); // 保持第一个点
+
+            // 简单的3点平均平滑
+            for (int i = 1; i < points.Length - 1; i++)
+            {
+                var prev = points[i - 1];
+                var curr = points[i];
+                var next = points[i + 1];
+
+                // 3点平均
+                double x = (prev.X + curr.X + next.X) / 3.0;
+                double y = (prev.Y + curr.Y + next.Y) / 3.0;
+                float pressure = (prev.PressureFactor + curr.PressureFactor + next.PressureFactor) / 3.0f;
+
+                result.Add(new StylusPoint(x, y, Math.Max(pressure, 0.1f)));
+            }
+
+            result.Add(points[points.Length - 1]); // 保持最后一个点
+
+            return result.ToArray();
+        }
+        /// <summary>
+        /// 硬件加速的向量化指数平滑
+        /// </summary>
+        private StylusPoint[] ApplyExponentialSmoothingVectorized(StylusPoint[] points, double alpha)
+        {
+            if (points.Length == 0) return points;
+
+            var result = new StylusPoint[points.Length];
+            result[0] = points[0];
+
+            double lastX = points[0].X;
+            double lastY = points[0].Y;
+            float lastPressure = points[0].PressureFactor;
+            double oneMinusAlpha = 1.0 - alpha;
+
+            // 向量化处理，减少分支预测失败
+            for (int i = 1; i < points.Length; i++)
+            {
+                var p = points[i];
+                lastX = alpha * p.X + oneMinusAlpha * lastX;
+                lastY = alpha * p.Y + oneMinusAlpha * lastY;
+                lastPressure = (float)(alpha * p.PressureFactor + oneMinusAlpha * lastPressure);
+                lastPressure = Math.Max(lastPressure, 0.1f); // 避免分支
+                result[i] = new StylusPoint(lastX, lastY, lastPressure);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 优化的等距重采样
+        /// </summary>
+        private StylusPoint[] ResampleEquidistantOptimized(StylusPoint[] points, double interval)
+        {
+            if (points.Length == 0) return points;
+
+            var result = new List<StylusPoint>(points.Length) { points[0] };
+            double accumulated = 0;
+
+            for (int i = 1; i < points.Length; i++)
+            {
+                var prev = result[result.Count - 1];
+                var curr = points[i];
+                double dx = curr.X - prev.X;
+                double dy = curr.Y - prev.Y;
+                double dist = Math.Sqrt(dx * dx + dy * dy);
+
+                if (dist + accumulated >= interval)
+                {
+                    double t = (interval - accumulated) / dist;
+                    double x = prev.X + t * dx;
+                    double y = prev.Y + t * dy;
+                    float pressure = (float)(prev.PressureFactor * (1 - t) + curr.PressureFactor * t);
+                    pressure = Math.Max(pressure, 0.1f);
+
+                    result.Add(new StylusPoint(x, y, pressure));
+                    accumulated = 0;
+                    i--; // 重新处理当前点
+                }
+                else
+                {
+                    accumulated += dist;
+                }
+            }
+            return result.ToArray();
+        }
+
+        /// <summary>
+        /// 硬件加速的贝塞尔曲线拟合
+        /// </summary>
+        private StylusPoint[] SlidingBezierFitHardwareAccelerated(StylusPoint[] points, int window, int steps)
+        {
+            if (points.Length < window) return points;
+
+            var result = new List<StylusPoint>(points.Length * steps / window);
+
+            // 使用并行处理加速计算
+            var segments = new List<StylusPoint[]>();
+
+            Parallel.For(0, points.Length - window + 1, i =>
+            {
+                var segmentPoints = new StylusPoint[steps];
+                var p0 = points[i];
+                var p1 = points[i + 1];
+                var p2 = points[i + 2];
+                var p3 = points[i + 3];
+
+                for (int j = 0; j < steps; j++)
+                {
+                    double t = (double)j / steps;
+                    segmentPoints[j] = CubicBezierOptimized(p0, p1, p2, p3, t);
+                }
+
+                lock (segments)
+                {
+                    segments.Add(segmentPoints);
+                }
+            });
+
+            // 合并结果
+            foreach (var segment in segments)
+            {
+                result.AddRange(segment);
+            }
+
+            result.Add(points[points.Length - 1]);
+            return result.ToArray();
+        }
+
+        /// <summary>
+        /// 优化的单线程贝塞尔拟合
+        /// </summary>
+        private StylusPoint[] SlidingBezierFitOptimized(StylusPoint[] points, int window, int steps)
+        {
+            if (points.Length < window) return points;
+
+            var result = new List<StylusPoint>(points.Length * steps / window);
+
+            for (int i = 0; i <= points.Length - window; i++)
+            {
+                var p0 = points[i];
+                var p1 = points[i + 1];
+                var p2 = points[i + 2];
+                var p3 = points[i + 3];
+
+                for (int j = 0; j < steps; j++)
+                {
+                    double t = (double)j / steps;
+                    result.Add(CubicBezierOptimized(p0, p1, p2, p3, t));
+                }
+            }
+
+            result.Add(points[points.Length - 1]);
+            return result.ToArray();
+        }
+
+        /// <summary>
+        /// 优化的三次贝塞尔曲线计算
+        /// </summary>
+        private StylusPoint CubicBezierOptimized(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3, double t)
+        {
+            double u = 1 - t;
+            double tt = t * t;
+            double uu = u * u;
+            double uuu = uu * u;
+            double ttt = tt * t;
+
+            // 预计算系数
+            double c0 = uuu;
+            double c1 = 3 * uu * t;
+            double c2 = 3 * u * tt;
+            double c3 = ttt;
+
+            double x = c0 * p0.X + c1 * p1.X + c2 * p2.X + c3 * p3.X;
+            double y = c0 * p0.Y + c1 * p1.Y + c2 * p2.Y + c3 * p3.Y;
+            float pressure = (float)(p1.PressureFactor * u + p2.PressureFactor * t);
+            pressure = Math.Max(pressure, 0.1f);
+
+            return new StylusPoint(x, y, pressure);
+        }
+
+        /// <summary>
+        /// 兼容性方法：传统指数平滑
+        /// </summary>
+        private StylusPoint[] ApplyExponentialSmoothing(StylusPoint[] points, double alpha)
+        {
+            if (points.Length == 0) return points;
+
+            var result = new StylusPoint[points.Length];
+            result[0] = points[0];
+
+            double lastX = points[0].X;
+            double lastY = points[0].Y;
+            float lastPressure = points[0].PressureFactor;
+
+            for (int i = 1; i < points.Length; i++)
+            {
+                var p = points[i];
+                lastX = alpha * p.X + (1 - alpha) * lastX;
+                lastY = alpha * p.Y + (1 - alpha) * lastY;
+                lastPressure = (float)(alpha * p.PressureFactor + (1 - alpha) * lastPressure);
+                lastPressure = Math.Max(lastPressure, 0.1f);
+                result[i] = new StylusPoint(lastX, lastY, lastPressure);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 取消所有正在进行的处理任务
+        /// </summary>
+        public void CancelAllTasks()
+        {
+            foreach (var kvp in _processingTasks)
+            {
+                kvp.Value.Cancel();
+            }
+            _processingTasks.Clear();
+        }
+
+        /// <summary>
+        /// 释放资源
+        /// </summary>
+        public void Dispose()
+        {
+            CancelAllTasks();
+            _processingSemaphore?.Dispose();
+        }
+    }
+
+    /// <summary>
+    /// 原有的同步版本（保持向后兼容）
+    /// </summary>
+    public class AdvancedBezierSmoothing
+    {
+        public double SmoothingStrength { get; set; } = 0.3;
+        public double ResampleInterval { get; set; } = 3.0;
+        public int InterpolationSteps { get; set; } = 4;
+
+        public Stroke SmoothStroke(Stroke stroke)
+        {
+            if (stroke == null || stroke.StylusPoints.Count < 3)
+                return stroke;
+
+            var originalPoints = stroke.StylusPoints.ToList();
+
+            // 简化处理：只进行轻度平滑
+            var smoothedPoints = ApplyLightExponentialSmoothing(originalPoints, 0.2); // 很轻的平滑
+
+            // 检查点数是否合理
+            if (smoothedPoints.Count > originalPoints.Count * 1.5)
+            {
+                return stroke; // 如果点数增加太多，返回原始笔画
+            }
+
+            var smoothedStroke = new Stroke(new StylusPointCollection(smoothedPoints))
+            {
+                DrawingAttributes = stroke.DrawingAttributes.Clone()
+            };
+            return smoothedStroke;
+        }
+
+        /// <summary>
+        /// 轻度指数平滑
+        /// </summary>
+        private List<StylusPoint> ApplyLightExponentialSmoothing(List<StylusPoint> points, double alpha)
+        {
+            var result = new List<StylusPoint>();
+            if (points.Count == 0) return result;
+
+            result.Add(points[0]);
+
+            for (int i = 1; i < points.Count; i++)
+            {
+                var prev = result[result.Count - 1];
+                var curr = points[i];
+
+                double x = alpha * curr.X + (1 - alpha) * prev.X;
+                double y = alpha * curr.Y + (1 - alpha) * prev.Y;
+                float pressure = (float)(alpha * curr.PressureFactor + (1 - alpha) * prev.PressureFactor);
+                pressure = Math.Max(pressure, 0.1f);
+
+                result.Add(new StylusPoint(x, y, pressure));
+            }
+            return result;
+        }
+
+        private List<StylusPoint> ApplyExponentialSmoothing(List<StylusPoint> points, double alpha)
+        {
+            var result = new List<StylusPoint>();
+            if (points.Count == 0) return result;
+            result.Add(points[0]);
+            double lastX = points[0].X;
+            double lastY = points[0].Y;
+            float lastPressure = points[0].PressureFactor;
+            for (int i = 1; i < points.Count; i++)
+            {
+                var p = points[i];
+                lastX = alpha * p.X + (1 - alpha) * lastX;
+                lastY = alpha * p.Y + (1 - alpha) * lastY;
+                lastPressure = (float)(alpha * p.PressureFactor + (1 - alpha) * lastPressure);
+                if (lastPressure < 0.1f) lastPressure = 0.1f;
+                result.Add(new StylusPoint(lastX, lastY, lastPressure));
+            }
+            return result;
+        }
+
+        private List<StylusPoint> ResampleEquidistant(List<StylusPoint> points, double interval = 2.0)
+        {
+            var result = new List<StylusPoint>();
+            if (points.Count == 0) return result;
+            result.Add(points[0]);
+            double accumulated = 0;
+            for (int i = 1; i < points.Count; i++)
+            {
+                var prev = result.Last();
+                var curr = points[i];
+                double dx = curr.X - prev.X;
+                double dy = curr.Y - prev.Y;
+                double dist = Math.Sqrt(dx * dx + dy * dy);
+                if (dist + accumulated >= interval)
+                {
+                    double t = (interval - accumulated) / dist;
+                    double x = prev.X + t * dx;
+                    double y = prev.Y + t * dy;
+                    float pressure = (float)(prev.PressureFactor * (1 - t) + curr.PressureFactor * t);
+                    if (pressure < 0.1f) pressure = 0.1f;
+                    var newPoint = new StylusPoint(x, y, pressure);
+                    result.Add(newPoint);
+                    accumulated = 0;
+                    i--; // 重新处理当前点
+                }
+                else
+                {
+                    accumulated += dist;
+                }
+            }
+            return result;
+        }
+
+        private List<StylusPoint> SlidingBezierFit(List<StylusPoint> points, int window = 4, int steps = 24)
+        {
+            var result = new List<StylusPoint>();
+            if (points.Count < window) return points;
+            for (int i = 0; i <= points.Count - window; i++)
+            {
+                var p0 = points[i];
+                var p1 = points[i + 1];
+                var p2 = points[i + 2];
+                var p3 = points[i + 3];
+                for (int j = 0; j < steps; j++)
+                {
+                    double t = (double)j / steps;
+                    var pt = CubicBezier(p0, p1, p2, p3, t);
+                    result.Add(pt);
+                }
+            }
+            // 保证最后一个点被包含
+            result.Add(points.Last());
+            return result;
+        }
+
+        private StylusPoint CubicBezier(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3, double t)
+        {
+            double u = 1 - t;
+            double tt = t * t;
+            double uu = u * u;
+            double uuu = uu * u;
+            double ttt = tt * t;
+            double x = uuu * p0.X + 3 * uu * t * p1.X + 3 * u * tt * p2.X + ttt * p3.X;
+            double y = uuu * p0.Y + 3 * uu * t * p1.Y + 3 * u * tt * p2.Y + ttt * p3.Y;
+            float pressure = (float)(p1.PressureFactor * (1 - t) + p2.PressureFactor * t);
+            if (pressure < 0.1f) pressure = 0.1f;
+            return new StylusPoint(x, y, pressure);
+        }
+
+        private List<StylusPoint> SlidingWindowSmooth(List<StylusPoint> points, int window = 5)
+        {
+            var result = new List<StylusPoint>();
+            int half = window / 2;
+            for (int i = 0; i < points.Count; i++)
+            {
+                double sumX = 0, sumY = 0, sumP = 0;
+                int count = 0;
+                for (int j = Math.Max(0, i - half); j <= Math.Min(points.Count - 1, i + half); j++)
+                {
+                    sumX += points[j].X;
+                    sumY += points[j].Y;
+                    sumP += points[j].PressureFactor;
+                    count++;
+                }
+                result.Add(new StylusPoint(sumX / count, sumY / count, (float)(sumP / count)));
+            }
+            return result;
+        }
+    }
+
+    /// <summary>
+    /// 性能监控器
+    /// </summary>
+    public class InkSmoothingPerformanceMonitor
+    {
+        private readonly Queue<TimeSpan> _processingTimes = new Queue<TimeSpan>();
+        private readonly object _lock = new object();
+        private const int MaxSamples = 100;
+
+        public void RecordProcessingTime(TimeSpan time)
+        {
+            lock (_lock)
+            {
+                _processingTimes.Enqueue(time);
+                if (_processingTimes.Count > MaxSamples)
+                    _processingTimes.Dequeue();
+            }
+        }
+
+        public double GetAverageProcessingTimeMs()
+        {
+            lock (_lock)
+            {
+                return _processingTimes.Count > 0 ?
+                    _processingTimes.Average(t => t.TotalMilliseconds) : 0;
+            }
+        }
+
+        public double GetMaxProcessingTimeMs()
+        {
+            lock (_lock)
+            {
+                return _processingTimes.Count > 0 ?
+                    _processingTimes.Max(t => t.TotalMilliseconds) : 0;
+            }
+        }
+
+        public int GetSampleCount()
+        {
+            lock (_lock)
+            {
+                return _processingTimes.Count;
+            }
+        }
+    }
+}
@@ -0,0 +1,208 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Interop;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 防止窗口进入全屏状态的辅助类
+    /// </summary>
+    public static partial class AvoidFullScreenHelper
+    {
+        private static readonly DependencyProperty IsAvoidFullScreenEnabledProperty =
+            DependencyProperty.RegisterAttached(
+                "IsAvoidFullScreenEnabled", 
+                typeof(bool), 
+                typeof(AvoidFullScreenHelper));
+
+        private static bool _isBoardMode = false;
+        public static void SetBoardMode(bool isBoardMode)
+        {
+            _isBoardMode = isBoardMode;
+        }
+
+        public static void StartAvoidFullScreen(Window window)
+        {
+            if (window == null)
+                throw new ArgumentNullException(nameof(window));
+
+            if (!(bool)window.GetValue(IsAvoidFullScreenEnabledProperty))
+            {
+                var hwndSource = PresentationSource.FromVisual(window) as HwndSource;
+                if (hwndSource != null)
+                {
+                    hwndSource.AddHook(KeepInWorkingAreaHook);
+                    window.SetValue(IsAvoidFullScreenEnabledProperty, true);
+                }
+            }
+        }
+
+        public static void StopAvoidFullScreen(Window window)
+        {
+            if (window == null)
+                throw new ArgumentNullException(nameof(window));
+
+            if ((bool)window.GetValue(IsAvoidFullScreenEnabledProperty))
+            {
+                var hwndSource = PresentationSource.FromVisual(window) as HwndSource;
+                if (hwndSource != null)
+                {
+                    hwndSource.RemoveHook(KeepInWorkingAreaHook);
+                    window.ClearValue(IsAvoidFullScreenEnabledProperty);
+                }
+            }
+        }
+
+        public static bool GetIsAvoidFullScreenEnabled(DependencyObject obj) => (bool)obj.GetValue(IsAvoidFullScreenEnabledProperty);
+        public static void SetIsAvoidFullScreenEnabled(DependencyObject obj, bool value) => obj.SetValue(IsAvoidFullScreenEnabledProperty, value);
+
+        private static IntPtr KeepInWorkingAreaHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            // 只拦截主画布窗口的全屏（最大化）操作
+            var window = HwndSource.FromHwnd(hwnd)?.RootVisual as Window;
+            if (window == null) return IntPtr.Zero;
+            // 这里假设主画布窗口类名为MainWindow（如有不同请调整）
+            if (window.GetType().Name != "MainWindow") return IntPtr.Zero;
+
+            if (_isBoardMode)
+            {
+                // 画板模式下允许全屏/最大化，不拦截
+                return IntPtr.Zero;
+            }
+            const int WM_WINDOWPOSCHANGING = 0x0046;
+            const int WM_SYSCOMMAND = 0x0112;
+            const int SC_MAXIMIZE = 0xF030;
+            if (msg == WM_SYSCOMMAND && wParam.ToInt32() == SC_MAXIMIZE)
+            {
+                // 拦截最大化命令，强制还原窗口并调整到工作区
+                window.WindowState = WindowState.Normal;
+                var workingArea = GetWorkingArea(new Rect(window.Left, window.Top, window.Width, window.Height));
+                window.Left = workingArea.Left;
+                window.Top = workingArea.Top;
+                window.Width = workingArea.Width;
+                window.Height = workingArea.Height;
+                handled = true;
+                return IntPtr.Zero;
+            }
+            if (msg != WM_WINDOWPOSCHANGING)
+                return IntPtr.Zero;
+
+            try
+            {
+                var pos = (WindowPosition)Marshal.PtrToStructure(lParam, typeof(WindowPosition));
+                if ((pos.Flags & (WindowPositionFlags.SWP_NOMOVE | WindowPositionFlags.SWP_NOSIZE)) != 0)
+                    return IntPtr.Zero;
+                // 只处理主画布窗口
+                // 计算目标矩形
+                var targetRect = new Rect(
+                    (pos.Flags & WindowPositionFlags.SWP_NOMOVE) == 0 ? pos.X : window.Left,
+                    (pos.Flags & WindowPositionFlags.SWP_NOMOVE) == 0 ? pos.Y : window.Top,
+                    (pos.Flags & WindowPositionFlags.SWP_NOSIZE) == 0 ? pos.Width : window.Width,
+                    (pos.Flags & WindowPositionFlags.SWP_NOSIZE) == 0 ? pos.Height : window.Height);
+                var workingArea = GetWorkingArea(targetRect);
+                var adjustedRect = AdjustRectToWorkingArea(targetRect, workingArea);
+                pos.X = (int)adjustedRect.Left;
+                pos.Y = (int)adjustedRect.Top;
+                pos.Width = (int)adjustedRect.Width;
+                pos.Height = (int)adjustedRect.Height;
+                pos.Flags &= ~(WindowPositionFlags.SWP_NOSIZE | WindowPositionFlags.SWP_NOMOVE | WindowPositionFlags.SWP_NOREDRAW);
+                pos.Flags |= WindowPositionFlags.SWP_NOCOPYBITS;
+                Marshal.StructureToPtr(pos, lParam, false);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"窗口位置调整失败: {ex.Message}");
+            }
+            return IntPtr.Zero;
+        }
+
+        private static Rect GetWorkingArea(Rect windowRect)
+        {
+            // 获取所有显示器
+            var screens = System.Windows.Forms.Screen.AllScreens;
+            
+            // 确定窗口主要位于哪个显示器上
+            System.Windows.Forms.Screen targetScreen = null;
+            double maxIntersection = 0;
+            
+            foreach (var screen in screens)
+            {
+                var screenRect = new Rect(
+                    screen.WorkingArea.X, 
+                    screen.WorkingArea.Y, 
+                    screen.WorkingArea.Width, 
+                    screen.WorkingArea.Height);
+                    
+                var intersection = Rect.Intersect(windowRect, screenRect);
+                if (intersection.Width * intersection.Height > maxIntersection)
+                {
+                    maxIntersection = intersection.Width * intersection.Height;
+                    targetScreen = screen;
+                }
+            }
+            
+            // 如果没找到，使用主显示器
+            if (targetScreen == null)
+                targetScreen = System.Windows.Forms.Screen.PrimaryScreen;
+                
+            return new Rect(
+                targetScreen.WorkingArea.X,
+                targetScreen.WorkingArea.Y,
+                targetScreen.WorkingArea.Width,
+                targetScreen.WorkingArea.Height);
+        }
+
+        private static Rect AdjustRectToWorkingArea(Rect windowRect, Rect workingArea)
+        {
+            // 调整尺寸以适应工作区域
+            if (windowRect.Width > workingArea.Width)
+                windowRect.Width = workingArea.Width;
+                
+            if (windowRect.Height > workingArea.Height)
+                windowRect.Height = workingArea.Height;
+                
+            // 调整位置以确保窗口完全在工作区域内
+            if (windowRect.Left < workingArea.Left)
+                windowRect.X = workingArea.Left;
+            else if (windowRect.Right > workingArea.Right)
+                windowRect.X = workingArea.Right - windowRect.Width;
+                
+            if (windowRect.Top < workingArea.Top)
+                windowRect.Y = workingArea.Top;
+            else if (windowRect.Bottom > workingArea.Bottom)
+                windowRect.Y = workingArea.Bottom - windowRect.Height;
+                
+            return windowRect;
+        }
+    }
+
+    // 使用WPF原生类型替代Win32结构
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct WindowPosition
+    {
+        public IntPtr Hwnd;
+        public IntPtr HwndInsertAfter;
+        public int X;
+        public int Y;
+        public int Width;
+        public int Height;
+        public WindowPositionFlags Flags;
+    }
+
+    [Flags]
+    internal enum WindowPositionFlags : uint
+    {
+        SWP_NOSIZE = 0x0001,
+        SWP_NOMOVE = 0x0002,
+        SWP_NOZORDER = 0x0004,
+        SWP_NOREDRAW = 0x0008,
+        SWP_NOACTIVATE = 0x0010,
+        SWP_FRAMECHANGED = 0x0020,
+        SWP_SHOWWINDOW = 0x0040,
+        SWP_HIDEWINDOW = 0x0080,
+        SWP_NOCOPYBITS = 0x0100,
+        SWP_NOOWNERZORDER = 0x0200,
+        SWP_NOSENDCHANGING = 0x0400,
+    }
+}
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Windows;

 namespace Ink_Canvas.Helpers {
    internal class DelAutoSavedFiles {
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Timers;

 namespace Ink_Canvas.Helpers
@@ -1,17 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualBasic;
-using System.Collections;
-using System.Data;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;

@@ -93,5 +93,15 @@ namespace Ink_Canvas.Helpers
                return "Unknown";
            }
        }
+
+        public static double GetTaskbarHeight(System.Windows.Forms.Screen screen, double dpiScaleY)
+        {
+            // 获取工作区和屏幕高度的差值
+            var workingArea = screen.WorkingArea;
+            var bounds = screen.Bounds;
+            int taskbarHeight = bounds.Height - workingArea.Height;
+            // 考虑 DPI 缩放
+            return taskbarHeight / dpiScaleY;
+        }
    }
 }
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;

 // 由衷感謝 lindexi 提供的 《WPF 稳定的全屏化窗口方法》
 // 文章鏈接：https://blog.lindexi.com/post/WPF-%E7%A8%B3%E5%AE%9A%E7%9A%84%E5%85%A8%E5%B1%8F%E5%8C%96%E7%AA%97%E5%8F%A3%E6%96%B9%E6%B3%95.html
@@ -0,0 +1,259 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 硬件加速的墨迹处理器，利用WPF的GPU渲染能力
+    /// </summary>
+    public class HardwareAcceleratedInkProcessor
+    {
+        private readonly RenderTargetBitmap _renderTarget;
+        private readonly DrawingVisual _drawingVisual;
+        private readonly DrawingContext _drawingContext;
+        private bool _isInitialized = false;
+
+        public HardwareAcceleratedInkProcessor(int width = 1920, int height = 1080)
+        {
+            // 创建硬件加速的渲染目标
+            _renderTarget = new RenderTargetBitmap(width, height, 96, 96, PixelFormats.Pbgra32);
+            _drawingVisual = new DrawingVisual();
+            
+            // 启用硬件加速
+            RenderOptions.SetBitmapScalingMode(_drawingVisual, BitmapScalingMode.HighQuality);
+            RenderOptions.SetEdgeMode(_drawingVisual, EdgeMode.Aliased);
+            
+            _isInitialized = true;
+        }
+
+        /// <summary>
+        /// 使用GPU加速的贝塞尔曲线平滑
+        /// </summary>
+        public async Task<Stroke> SmoothStrokeWithGPU(Stroke originalStroke)
+        {
+            if (!_isInitialized || originalStroke == null || originalStroke.StylusPoints.Count < 2)
+                return originalStroke;
+
+            return await Task.Run(() =>
+            {
+                try
+                {
+                    // 使用PathGeometry进行硬件加速的曲线拟合
+                    var pathGeometry = CreateSmoothPathGeometry(originalStroke.StylusPoints);
+                    
+                    // 将PathGeometry转换回StylusPoint集合
+                    var smoothedPoints = ConvertPathGeometryToStylusPoints(pathGeometry, originalStroke.StylusPoints);
+                    
+                    return new Stroke(new StylusPointCollection(smoothedPoints))
+                    {
+                        DrawingAttributes = originalStroke.DrawingAttributes.Clone()
+                    };
+                }
+                catch
+                {
+                    return originalStroke;
+                }
+            });
+        }
+
+        /// <summary>
+        /// 创建平滑的路径几何体
+        /// </summary>
+        private PathGeometry CreateSmoothPathGeometry(StylusPointCollection points)
+        {
+            var pathGeometry = new PathGeometry();
+            var pathFigure = new PathFigure();
+            
+            if (points.Count < 2) return pathGeometry;
+            
+            pathFigure.StartPoint = new Point(points[0].X, points[0].Y);
+            
+            // 使用贝塞尔曲线段创建平滑路径
+            for (int i = 0; i < points.Count - 1; i += 3)
+            {
+                var p1 = i + 1 < points.Count ? new Point(points[i + 1].X, points[i + 1].Y) : pathFigure.StartPoint;
+                var p2 = i + 2 < points.Count ? new Point(points[i + 2].X, points[i + 2].Y) : p1;
+                var p3 = i + 3 < points.Count ? new Point(points[i + 3].X, points[i + 3].Y) : p2;
+                
+                var bezierSegment = new BezierSegment(p1, p2, p3, true);
+                pathFigure.Segments.Add(bezierSegment);
+            }
+            
+            pathGeometry.Figures.Add(pathFigure);
+            return pathGeometry;
+        }
+
+        /// <summary>
+        /// 将PathGeometry转换为StylusPoint集合
+        /// </summary>
+        private List<StylusPoint> ConvertPathGeometryToStylusPoints(PathGeometry pathGeometry, StylusPointCollection originalPoints)
+        {
+            var result = new List<StylusPoint>();
+            var flattened = pathGeometry.GetFlattenedPathGeometry();
+            
+            foreach (var figure in flattened.Figures)
+            {
+                result.Add(new StylusPoint(figure.StartPoint.X, figure.StartPoint.Y, 0.5f));
+                
+                foreach (var segment in figure.Segments)
+                {
+                    if (segment is LineSegment lineSegment)
+                    {
+                        result.Add(new StylusPoint(lineSegment.Point.X, lineSegment.Point.Y, 0.5f));
+                    }
+                    else if (segment is PolyLineSegment polyLineSegment)
+                    {
+                        foreach (var point in polyLineSegment.Points)
+                        {
+                            result.Add(new StylusPoint(point.X, point.Y, 0.5f));
+                        }
+                    }
+                }
+            }
+            
+            // 保持原始压感信息
+            InterpolatePressure(result, originalPoints);
+            
+            return result;
+        }
+
+        /// <summary>
+        /// 插值压感信息
+        /// </summary>
+        private void InterpolatePressure(List<StylusPoint> smoothedPoints, StylusPointCollection originalPoints)
+        {
+            if (originalPoints.Count == 0 || smoothedPoints.Count == 0) return;
+            
+            for (int i = 0; i < smoothedPoints.Count; i++)
+            {
+                double ratio = (double)i / (smoothedPoints.Count - 1);
+                int originalIndex = (int)(ratio * (originalPoints.Count - 1));
+                originalIndex = Math.Max(0, Math.Min(originalIndex, originalPoints.Count - 1));
+                
+                var point = smoothedPoints[i];
+                float pressure = originalPoints[originalIndex].PressureFactor;
+                smoothedPoints[i] = new StylusPoint(point.X, point.Y, Math.Max(pressure, 0.1f));
+            }
+        }
+
+        /// <summary>
+        /// 使用GPU加速的并行贝塞尔计算
+        /// </summary>
+        public static StylusPoint[] ParallelBezierInterpolation(StylusPoint[] controlPoints, int segments = 16)
+        {
+            if (controlPoints.Length < 4) return controlPoints;
+            
+            var result = new StylusPoint[segments * (controlPoints.Length / 4)];
+            
+            Parallel.For(0, controlPoints.Length / 4, segmentIndex =>
+            {
+                var p0 = controlPoints[segmentIndex * 4];
+                var p1 = controlPoints[segmentIndex * 4 + 1];
+                var p2 = controlPoints[segmentIndex * 4 + 2];
+                var p3 = controlPoints[segmentIndex * 4 + 3];
+                
+                for (int i = 0; i < segments; i++)
+                {
+                    double t = (double)i / (segments - 1);
+                    result[segmentIndex * segments + i] = CubicBezierFast(p0, p1, p2, p3, t);
+                }
+            });
+            
+            return result;
+        }
+
+        /// <summary>
+        /// 优化的三次贝塞尔曲线计算
+        /// </summary>
+        private static StylusPoint CubicBezierFast(StylusPoint p0, StylusPoint p1, StylusPoint p2, StylusPoint p3, double t)
+        {
+            double u = 1 - t;
+            double tt = t * t;
+            double uu = u * u;
+            double uuu = uu * u;
+            double ttt = tt * t;
+            
+            double x = uuu * p0.X + 3 * uu * t * p1.X + 3 * u * tt * p2.X + ttt * p3.X;
+            double y = uuu * p0.Y + 3 * uu * t * p1.Y + 3 * u * tt * p2.Y + ttt * p3.Y;
+            float pressure = (float)(p1.PressureFactor * u + p2.PressureFactor * t);
+            
+            return new StylusPoint(x, y, Math.Max(pressure, 0.1f));
+        }
+
+        /// <summary>
+        /// 释放GPU资源
+        /// </summary>
+        public void Dispose()
+        {
+            _drawingContext?.Close();
+            _renderTarget?.Clear();
+            _isInitialized = false;
+        }
+    }
+
+    /// <summary>
+    /// 质量配置枚举
+    /// </summary>
+    public enum InkSmoothingQuality
+    {
+        HighPerformance = 0,  // 高性能低质量
+        Balanced = 1,         // 平衡
+        HighQuality = 2       // 高质量低性能
+    }
+
+    /// <summary>
+    /// 墨迹平滑配置
+    /// </summary>
+    public class InkSmoothingConfig
+    {
+        public InkSmoothingQuality Quality { get; set; } = InkSmoothingQuality.Balanced;
+        public bool UseHardwareAcceleration { get; set; } = true;
+        public bool UseAsyncProcessing { get; set; } = true;
+        public int MaxConcurrentTasks { get; set; } = Environment.ProcessorCount;
+        public double SmoothingStrength { get; set; } = 0.6;
+        public double ResampleInterval { get; set; } = 1.2;
+        public int InterpolationSteps { get; set; } = 16;
+
+        public static InkSmoothingConfig FromSettings()
+        {
+            return new InkSmoothingConfig
+            {
+                Quality = (InkSmoothingQuality)MainWindow.Settings.Canvas.InkSmoothingQuality,
+                UseHardwareAcceleration = MainWindow.Settings.Canvas.UseHardwareAcceleration,
+                UseAsyncProcessing = MainWindow.Settings.Canvas.UseAsyncInkSmoothing,
+                MaxConcurrentTasks = MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks > 0 ?
+                    MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks : Environment.ProcessorCount
+            };
+        }
+
+        public void ApplyQualitySettings()
+        {
+            switch (Quality)
+            {
+                case InkSmoothingQuality.HighPerformance:
+                    SmoothingStrength = 0.4;
+                    ResampleInterval = 2.0;
+                    InterpolationSteps = 8;
+                    break;
+                case InkSmoothingQuality.Balanced:
+                    SmoothingStrength = 0.6;
+                    ResampleInterval = 1.2;
+                    InterpolationSteps = 16;
+                    break;
+                case InkSmoothingQuality.HighQuality:
+                    SmoothingStrength = 0.8;
+                    ResampleInterval = 0.8;
+                    InterpolationSteps = 32;
+                    break;
+            }
+        }
+    }
+}
@@ -0,0 +1,258 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Ink;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 统一的墨迹平滑管理器，整合异步处理和硬件加速
+    /// </summary>
+    public class InkSmoothingManager : IDisposable
+    {
+        private readonly AsyncAdvancedBezierSmoothing _asyncSmoothing;
+        private readonly HardwareAcceleratedInkProcessor _hardwareProcessor;
+        private readonly InkSmoothingPerformanceMonitor _performanceMonitor;
+        private readonly InkSmoothingConfig _config;
+        private readonly Dispatcher _uiDispatcher;
+        private bool _disposed = false;
+
+        public InkSmoothingManager(Dispatcher uiDispatcher)
+        {
+            _uiDispatcher = uiDispatcher;
+            _config = InkSmoothingConfig.FromSettings();
+            _config.ApplyQualitySettings();
+            
+            _asyncSmoothing = new AsyncAdvancedBezierSmoothing(uiDispatcher)
+            {
+                SmoothingStrength = _config.SmoothingStrength,
+                ResampleInterval = _config.ResampleInterval,
+                InterpolationSteps = _config.InterpolationSteps,
+                UseHardwareAcceleration = _config.UseHardwareAcceleration,
+                MaxConcurrentTasks = _config.MaxConcurrentTasks
+            };
+            
+            _hardwareProcessor = new HardwareAcceleratedInkProcessor();
+            _performanceMonitor = new InkSmoothingPerformanceMonitor();
+        }
+
+        /// <summary>
+        /// 平滑笔画（自动选择最佳方法）
+        /// </summary>
+        public async Task<Stroke> SmoothStrokeAsync(Stroke originalStroke, 
+            Action<Stroke, Stroke> onCompleted = null,
+            CancellationToken cancellationToken = default)
+        {
+            if (originalStroke == null || originalStroke.StylusPoints.Count < 2)
+                return originalStroke;
+
+            var stopwatch = Stopwatch.StartNew();
+            Stroke result = originalStroke;
+
+            try
+            {
+                if (_config.UseAsyncProcessing)
+                {
+                    // 使用异步处理
+                    result = await _asyncSmoothing.SmoothStrokeAsync(originalStroke, onCompleted, cancellationToken);
+                }
+                else if (_config.UseHardwareAcceleration)
+                {
+                    // 使用硬件加速但同步处理
+                    result = await _hardwareProcessor.SmoothStrokeWithGPU(originalStroke);
+                    onCompleted?.Invoke(originalStroke, result);
+                }
+                else
+                {
+                    // 回退到传统同步处理
+                    result = await Task.Run(() =>
+                    {
+                        var traditionalSmoothing = new AdvancedBezierSmoothing();
+                        return traditionalSmoothing.SmoothStroke(originalStroke);
+                    }, cancellationToken);
+                    onCompleted?.Invoke(originalStroke, result);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                result = originalStroke;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"墨迹平滑失败: {ex.Message}");
+                result = originalStroke;
+            }
+            finally
+            {
+                stopwatch.Stop();
+                _performanceMonitor.RecordProcessingTime(stopwatch.Elapsed);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 同步平滑笔画（用于向后兼容）
+        /// </summary>
+        public Stroke SmoothStroke(Stroke originalStroke)
+        {
+            if (originalStroke == null || originalStroke.StylusPoints.Count < 2)
+                return originalStroke;
+
+            var stopwatch = Stopwatch.StartNew();
+            Stroke result;
+
+            try
+            {
+                if (_config.UseHardwareAcceleration)
+                {
+                    // 使用硬件加速的同步版本
+                    var task = _hardwareProcessor.SmoothStrokeWithGPU(originalStroke);
+                    task.Wait(5000); // 5秒超时
+                    result = task.Status == TaskStatus.RanToCompletion ? task.Result : originalStroke;
+                }
+                else
+                {
+                    // 传统同步处理
+                    var traditionalSmoothing = new AdvancedBezierSmoothing();
+                    result = traditionalSmoothing.SmoothStroke(originalStroke);
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"同步墨迹平滑失败: {ex.Message}");
+                result = originalStroke;
+            }
+            finally
+            {
+                stopwatch.Stop();
+                _performanceMonitor.RecordProcessingTime(stopwatch.Elapsed);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 更新配置
+        /// </summary>
+        public void UpdateConfig()
+        {
+            var newConfig = InkSmoothingConfig.FromSettings();
+            newConfig.ApplyQualitySettings();
+            
+            _asyncSmoothing.SmoothingStrength = newConfig.SmoothingStrength;
+            _asyncSmoothing.ResampleInterval = newConfig.ResampleInterval;
+            _asyncSmoothing.InterpolationSteps = newConfig.InterpolationSteps;
+            _asyncSmoothing.UseHardwareAcceleration = newConfig.UseHardwareAcceleration;
+            _asyncSmoothing.MaxConcurrentTasks = newConfig.MaxConcurrentTasks;
+        }
+
+        /// <summary>
+        /// 获取性能统计信息
+        /// </summary>
+        public string GetPerformanceStats()
+        {
+            return $"平均处理时间: {_performanceMonitor.GetAverageProcessingTimeMs():F2}ms, " +
+                   $"最大处理时间: {_performanceMonitor.GetMaxProcessingTimeMs():F2}ms, " +
+                   $"样本数: {_performanceMonitor.GetSampleCount()}";
+        }
+
+        /// <summary>
+        /// 取消所有正在进行的任务
+        /// </summary>
+        public void CancelAllTasks()
+        {
+            _asyncSmoothing?.CancelAllTasks();
+        }
+
+        /// <summary>
+        /// 检查系统是否支持硬件加速
+        /// </summary>
+        public static bool IsHardwareAccelerationSupported()
+        {
+            try
+            {
+                return System.Windows.Media.RenderCapability.Tier >= 0x00020000;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 获取推荐的配置
+        /// </summary>
+        public static InkSmoothingConfig GetRecommendedConfig()
+        {
+            var config = new InkSmoothingConfig();
+            
+            // 根据系统性能调整配置
+            var processorCount = Environment.ProcessorCount;
+            var isHardwareAccelerated = IsHardwareAccelerationSupported();
+            
+            if (processorCount >= 8 && isHardwareAccelerated)
+            {
+                config.Quality = InkSmoothingQuality.HighQuality;
+                config.UseHardwareAcceleration = true;
+                config.UseAsyncProcessing = true;
+                config.MaxConcurrentTasks = Math.Min(processorCount, 8);
+            }
+            else if (processorCount >= 4)
+            {
+                config.Quality = InkSmoothingQuality.Balanced;
+                config.UseHardwareAcceleration = isHardwareAccelerated;
+                config.UseAsyncProcessing = true;
+                config.MaxConcurrentTasks = Math.Min(processorCount, 4);
+            }
+            else
+            {
+                config.Quality = InkSmoothingQuality.HighPerformance;
+                config.UseHardwareAcceleration = false;
+                config.UseAsyncProcessing = false;
+                config.MaxConcurrentTasks = 1;
+            }
+            
+            config.ApplyQualitySettings();
+            return config;
+        }
+
+        /// <summary>
+        /// 应用推荐配置到设置
+        /// </summary>
+        public static void ApplyRecommendedSettings()
+        {
+            var config = GetRecommendedConfig();
+
+            MainWindow.Settings.Canvas.InkSmoothingQuality = (int)config.Quality;
+            MainWindow.Settings.Canvas.UseHardwareAcceleration = config.UseHardwareAcceleration;
+            MainWindow.Settings.Canvas.UseAsyncInkSmoothing = config.UseAsyncProcessing;
+            MainWindow.Settings.Canvas.MaxConcurrentSmoothingTasks = config.MaxConcurrentTasks;
+        }
+
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                CancelAllTasks();
+                _asyncSmoothing?.Dispose();
+                _hardwareProcessor?.Dispose();
+                _disposed = true;
+            }
+        }
+    }
+
+    /// <summary>
+    /// 墨迹平滑事件参数
+    /// </summary>
+    public class InkSmoothingEventArgs : EventArgs
+    {
+        public Stroke OriginalStroke { get; set; }
+        public Stroke SmoothedStroke { get; set; }
+        public TimeSpan ProcessingTime { get; set; }
+        public bool WasAsync { get; set; }
+        public bool UsedHardwareAcceleration { get; set; }
+    }
+}
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 using System.Windows.Interop;
 using System.Windows;

@@ -1,11 +1,16 @@
 using System;
+using System.Diagnostics;
 using System.IO;
+using System.Threading;

 namespace Ink_Canvas.Helpers
 {
    class LogHelper
    {
        public static string LogFile = "Log.txt";
+        private static string LogsFolder = "Logs";
+        private static string AppStartTime = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
+        private static readonly long MaxLogsFolderSizeBytes = 5 * 1024 * 1024; // 5MB

        public static void NewLog(string str)
        {
@@ -14,41 +19,115 @@ namespace Ink_Canvas.Helpers

        public static void NewLog(Exception ex)
        {
-
+            if (ex == null) return;
+            var stackTrace = ex.StackTrace ?? "<no stack trace>";
+            var msg = $"[Exception] Type: {ex.GetType().FullName}\nMessage: {ex.Message}\nStackTrace: {stackTrace}";
+            if (ex.InnerException != null)
+            {
+                msg += $"\nInnerException: {ex.InnerException.GetType().FullName} - {ex.InnerException.Message}\n{ex.InnerException.StackTrace}";
+            }
+            WriteLogToFile(msg, LogType.Error);
        }

        public static void WriteLogToFile(string str, LogType logType = LogType.Info)
        {
-            string strLogType = "Info";
-            switch (logType)
-            {
-                case LogType.Event:
-                    strLogType = "Event";
-                    break;
-                case LogType.Trace:
-                    strLogType = "Trace";
-                    break;
-                case LogType.Error:
-                    strLogType = "Error";
-                    break;
-            }
+            // 检查日志是否启用
+            if (MainWindow.Settings != null && MainWindow.Settings.Advanced != null && !MainWindow.Settings.Advanced.IsLogEnabled) return;
+            
+            string strLogType = logType.ToString();
            try
            {
-                var file = App.RootPath + LogFile;
+                string file;
+                
+                // 检查是否启用了日期保存功能
+                if (MainWindow.Settings != null && MainWindow.Settings.Advanced != null && MainWindow.Settings.Advanced.IsSaveLogByDate)
+                {
+                    // 确保Logs文件夹存在
+                    string logsPath = Path.Combine(App.RootPath, LogsFolder);
+                    if (!Directory.Exists(logsPath))
+                    {
+                        Directory.CreateDirectory(logsPath);
+                    }
+                    
+                    // 检查Logs文件夹大小，如果超过5MB则清空
+                    CheckAndCleanLogsFolder(logsPath);
+                    
+                    // 使用软件启动时间作为日志文件名
+                    file = Path.Combine(logsPath, $"Log_{AppStartTime}.txt");
+                }
+                else
+                {
+                    file = App.RootPath + LogFile;
+                }
+                
                if (!Directory.Exists(App.RootPath))
                {
                    Directory.CreateDirectory(App.RootPath);
                }
-                StreamWriter sw = new StreamWriter(file, true);
-                sw.WriteLine(string.Format("{0} [{1}] {2}", DateTime.Now.ToString("O"), strLogType, str));
-                sw.Close();
+                
+                var threadId = Thread.CurrentThread.ManagedThreadId;
+                var callingMethod = new StackTrace(2, true).GetFrame(0);
+                string callerInfo = "<unknown>";
+                if (callingMethod != null)
+                {
+                    var method = callingMethod.GetMethod();
+                    if (method != null)
+                    {
+                        var className = method.DeclaringType != null ? method.DeclaringType.FullName : "<no class>";
+                        callerInfo = $"{className}.{method.Name}";
+                    }
+                }
+                string logLine = string.Format("{0} [T{1}] [{2}] [{3}] {4}", DateTime.Now.ToString("O"), threadId, strLogType, callerInfo, str);
+                using (StreamWriter sw = new StreamWriter(file, true))
+                {
+                    sw.WriteLine(logLine);
+                }
+            }
+            catch { }
+        }
+
+        private static void CheckAndCleanLogsFolder(string logsPath)
+        {
+            try
+            {
+                long totalSize = 0;
+                DirectoryInfo dirInfo = new DirectoryInfo(logsPath);
+                
+                // 如果目录不存在，直接返回
+                if (!dirInfo.Exists) return;
+                
+                // 计算文件夹大小
+                foreach (FileInfo file in dirInfo.GetFiles())
+                {
+                    totalSize += file.Length;
+                }
+                
+                // 如果超过5MB，清空文件夹
+                if (totalSize > MaxLogsFolderSizeBytes)
+                {
+                    foreach (FileInfo file in dirInfo.GetFiles())
+                    {
+                        try
+                        {
+                            file.Delete();
+                        }
+                        catch { }
+                    }
+                    
+                    // 记录清理操作
+                    string cleanupMessage = $"Logs folder exceeded size limit ({totalSize / 1024.0 / 1024.0:F2} MB > {MaxLogsFolderSizeBytes / 1024.0 / 1024.0:F2} MB). Folder cleaned.";
+                    using (StreamWriter sw = new StreamWriter(Path.Combine(logsPath, $"Log_{AppStartTime}.txt"), true))
+                    {
+                        sw.WriteLine($"{DateTime.Now:O} [Cleanup] {cleanupMessage}");
+                    }
+                }
            }
            catch { }
        }

        internal static void WriteLogToFile(string v, object warning)
        {
-            throw new NotImplementedException();
+            WriteLogToFile($"[Warning] {v}", LogType.Warning);
        }

        public enum LogType
@@ -0,0 +1,275 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using iNKORE.UI.WPF.Modern.Controls;
+
+namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
+{
+    /// <summary>
+    /// 启动台按钮控件
+    /// </summary>
+    public class LauncherButton
+    {
+        /// <summary>
+        /// 父插件
+        /// </summary>
+        private readonly SuperLauncherPlugin _plugin;
+        
+        /// <summary>
+        /// 实际按钮控件
+        /// </summary>
+        private readonly SimpleStackPanel _panel;
+        
+        /// <summary>
+        /// 获取按钮UI元素
+        /// </summary>
+        public UIElement Element => _panel;
+        
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="plugin">父插件</param>
+        public LauncherButton(SuperLauncherPlugin plugin)
+        {
+            try
+            {
+                _plugin = plugin;
+                LogHelper.WriteLogToFile("开始创建启动台按钮", LogHelper.LogType.Info);
+                
+                // 创建SimpleStackPanel
+                _panel = new SimpleStackPanel
+                {
+                    Name = "Launcher_Icon",
+                    Orientation = Orientation.Vertical,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    Width = 28,
+                    Margin = new Thickness(0, -2, 0, 0),
+                    Background = Brushes.Transparent
+                };
+                
+                LogHelper.WriteLogToFile("创建SimpleStackPanel完成", LogHelper.LogType.Info);
+                
+                // 添加图标
+                var image = CreateIconImage();
+                _panel.Children.Add(image);
+                
+                // 添加文本
+                TextBlock textBlock = new TextBlock
+                {
+                    Text = "启动台",
+                    Foreground = Brushes.Black,
+                    FontSize = 8,
+                    Margin = new Thickness(0, 1, 0, 0),
+                    TextAlignment = TextAlignment.Center
+                };
+                _panel.Children.Add(textBlock);
+                
+                // 设置鼠标事件
+                _panel.MouseDown += Panel_MouseDown;
+                _panel.MouseUp += Panel_MouseUp;
+                _panel.MouseLeave += Panel_MouseLeave;
+                
+                // 右键菜单支持
+                _panel.ContextMenu = CreateContextMenu();
+                
+                // 设置工具提示
+                _panel.ToolTip = "启动台";
+                
+                LogHelper.WriteLogToFile("启动台按钮创建完成", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"创建启动台按钮时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+            }
+        }
+        
+        /// <summary>
+        /// 创建右键菜单
+        /// </summary>
+        private ContextMenu CreateContextMenu()
+        {
+            try
+            {
+                // 创建菜单
+                ContextMenu menu = new ContextMenu();
+                
+                // 创建位置切换菜单项
+                MenuItem positionMenuItem = new MenuItem();
+                positionMenuItem.Header = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ? 
+                    "移至右侧" : "移至左侧";
+                positionMenuItem.Click += (s, e) => 
+                {
+                    // 切换位置
+                    _plugin.Config.ButtonPosition = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ? 
+                        LauncherButtonPosition.Right : LauncherButtonPosition.Left;
+                    
+                    // 更新按钮位置
+                    _plugin.UpdateButtonPosition();
+                    
+                    // 保存配置
+                    _plugin.SaveConfig();
+                    
+                    LogHelper.WriteLogToFile($"通过右键菜单切换启动台按钮位置为: {_plugin.Config.ButtonPosition}", 
+                        LogHelper.LogType.Info);
+                };
+                menu.Items.Add(positionMenuItem);
+                
+                // 添加设置菜单项
+                MenuItem settingsMenuItem = new MenuItem();
+                settingsMenuItem.Header = "打开设置";
+                settingsMenuItem.Click += (s, e) => 
+                {
+                    // 打开插件设置窗口
+                    var mainWindow = Application.Current.MainWindow;
+                    if (mainWindow != null)
+                    {
+                        try
+                        {
+                            // 使用反射调用主窗口的ShowPluginSettings方法
+                            var method = mainWindow.GetType().GetMethod("ShowPluginSettings");
+                            if (method != null)
+                            {
+                                method.Invoke(mainWindow, null);
+                                LogHelper.WriteLogToFile("已打开插件设置窗口", LogHelper.LogType.Info);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"打开插件设置窗口失败: {ex.Message}", LogHelper.LogType.Error);
+                        }
+                    }
+                };
+                menu.Items.Add(settingsMenuItem);
+                
+                return menu;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"创建右键菜单时出错: {ex.Message}", LogHelper.LogType.Error);
+                return null;
+            }
+        }
+        
+        /// <summary>
+        /// 获取实际的UI元素
+        /// </summary>
+        [Obsolete("使用Element属性代替")]
+        public UIElement GetUIElement()
+        {
+            return _panel;
+        }
+        
+        /// <summary>
+        /// 创建图标图像
+        /// </summary>
+        private Image CreateIconImage()
+        {
+            try
+            {
+                // 创建图像
+                Image image = new Image
+                {
+                    Height = 17,
+                    Margin = new Thickness(0, 3, 0, 0)
+                };
+                
+                // 设置位图缩放模式
+                RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.HighQuality);
+                
+                // 创建绘图图像
+                DrawingImage drawingImage = new DrawingImage();
+                DrawingGroup drawingGroup = new DrawingGroup();
+                drawingGroup.ClipGeometry = Geometry.Parse("M0,0 V24 H24 V0 H0 Z");
+                
+                // 使用提供的应用网格图标
+                GeometryDrawing geometryDrawing = new GeometryDrawing
+                {
+                    Brush = new SolidColorBrush(Color.FromRgb(0x1B, 0x1B, 0x1B)),
+                    Geometry = Geometry.Parse("F0 M24,24z M0,0z M4.41721,4.29873C4.35178,4.29873,4.29873,4.35178,4.29873,4.41721L4.29873,9.15646C4.29873,9.22189,4.35178,9.27494,4.41721,9.27494L9.15646,9.27494C9.22189,9.27494,9.27494,9.22189,9.27494,9.15646L9.27494,4.41721C9.27494,4.35178,9.22189,4.29873,9.15646,4.29873L4.41721,4.29873z M2.64,4.41721C2.64,3.43569,3.43569,2.64,4.41721,2.64L9.15646,2.64C10.138,2.64,10.9337,3.43569,10.9337,4.41721L10.9337,9.15646C10.9337,10.138,10.138,10.9337,9.15646,10.9337L4.41721,10.9337C3.43569,10.9337,2.64,10.138,2.64,9.15646L2.64,4.41721z M14.8435,4.29873C14.7781,4.29873,14.7251,4.35178,14.7251,4.41721L14.7251,9.15646C14.7251,9.22189,14.7781,9.27494,14.8435,9.27494L19.5828,9.27494C19.6482,9.27494,19.7013,9.22189,19.7013,9.15646L19.7013,4.41721C19.7013,4.35178,19.6482,4.29873,19.5828,4.29873L14.8435,4.29873z M13.0663,4.41721C13.0663,3.43569,13.862,2.64,14.8435,2.64L19.5828,2.64C20.5643,2.64,21.36,3.43569,21.36,4.41721L21.36,9.15646C21.36,10.138,20.5643,10.9337,19.5828,10.9337L14.8435,10.9337C13.862,10.9337,13.0663,10.138,13.0663,9.15646L13.0663,4.41721z M14.8435,14.7251C14.7781,14.7251,14.7251,14.7781,14.7251,14.8435L14.7251,19.5828C14.7251,19.6482,14.7781,19.7013,14.8435,19.7013L19.5828,19.7013C19.6482,19.7013,19.7013,19.6482,19.7013,19.5828L19.7013,14.8435C19.7013,14.7781,19.6482,14.7251,19.5828,14.7251L14.8435,14.7251z M13.0663,14.8435C13.0663,13.862,13.862,13.0663,14.8435,13.0663L19.5828,13.0663C20.5643,13.0663,21.36,13.862,21.36,14.8435L21.36,19.5828C21.36,20.5643,20.5643,21.36,19.5828,21.36L14.8435,21.36C13.862,21.36,13.0663,20.5643,13.0663,19.5828L13.0663,14.8435z M4.41721,14.7251C4.35178,14.7251,4.29873,14.7781,4.29873,14.8435L4.29873,19.5828C4.29873,19.6482,4.35178,19.7013,4.41721,19.7013L9.15646,19.7013C9.22189,19.7013,9.27494,19.6482,9.27494,19.5828L9.27494,14.8435C9.27494,14.7781,9.22189,14.7251,9.15646,14.7251L4.41721,14.7251z M2.64,14.8435C2.64,13.862,3.43569,13.0663,4.41721,13.0663L9.15646,13.0663C10.138,13.0663,10.9337,13.862,10.9337,14.8435L10.9337,19.5828C10.9337,20.5643,10.138,21.36,9.15646,21.36L4.41721,21.36C3.43569,21.36,2.64,20.5643,2.64,19.5828L2.64,14.8435z")
+                };
+                
+                drawingGroup.Children.Add(geometryDrawing);
+                
+                // 设置图像源
+                drawingImage.Drawing = drawingGroup;
+                image.Source = drawingImage;
+                
+                return image;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"创建图标图像时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+                
+                // 返回一个空图像
+                return new Image();
+            }
+        }
+        
+        /// <summary>
+        /// 鼠标按下事件
+        /// </summary>
+        private void Panel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                // 提供反馈
+                _panel.Background = new SolidColorBrush(Color.FromArgb(40, 0, 0, 0));
+                LogHelper.WriteLogToFile("启动台按钮鼠标按下", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动台按钮鼠标按下事件出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 鼠标抬起事件
+        /// </summary>
+        private void Panel_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                // 只有左键点击才显示启动台窗口
+                if (e.ChangedButton != MouseButton.Left)
+                {
+                    return;
+                }
+                
+                // 恢复背景
+                _panel.Background = Brushes.Transparent;
+                LogHelper.WriteLogToFile("启动台按钮鼠标抬起，准备显示启动台窗口", LogHelper.LogType.Info);
+                
+                // 获取按钮在屏幕上的位置
+                Point buttonPosition = _panel.PointToScreen(new Point(_panel.ActualWidth / 2, 0));
+                
+                // 显示启动台窗口
+                _plugin.ShowLauncherWindow(buttonPosition);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动台按钮鼠标抬起事件出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+            }
+        }
+        
+        /// <summary>
+        /// 鼠标离开事件
+        /// </summary>
+        private void Panel_MouseLeave(object sender, MouseEventArgs e)
+        {
+            try
+            {
+                // 恢复背景
+                _panel.Background = Brushes.Transparent;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动台按钮鼠标离开事件出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+    }
+} 
@@ -0,0 +1,329 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Windows;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using Microsoft.Win32;
+
+namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
+{
+    /// <summary>
+    /// 启动台按钮位置
+    /// </summary>
+    public enum LauncherButtonPosition
+    {
+        /// <summary>
+        /// 左侧
+        /// </summary>
+        Left,
+        
+        /// <summary>
+        /// 右侧
+        /// </summary>
+        Right
+    }
+    
+    /// <summary>
+    /// 启动台配置
+    /// </summary>
+    public class LauncherConfig
+    {
+        /// <summary>
+        /// 启动台按钮位置
+        /// </summary>
+        public LauncherButtonPosition ButtonPosition { get; set; } = LauncherButtonPosition.Right;
+        
+        /// <summary>
+        /// 启动台应用程序列表
+        /// </summary>
+        public List<LauncherItem> Items { get; set; } = new List<LauncherItem>();
+    }
+    
+    /// <summary>
+    /// 启动台应用项
+    /// </summary>
+    public class LauncherItem
+    {
+        /// <summary>
+        /// 应用程序名称
+        /// </summary>
+        public string Name { get; set; }
+        
+        /// <summary>
+        /// 应用程序路径
+        /// </summary>
+        public string Path { get; set; }
+        
+        /// <summary>
+        /// 是否可见
+        /// </summary>
+        public bool IsVisible { get; set; } = true;
+        
+        /// <summary>
+        /// 在启动台中的位置（0-39）
+        /// </summary>
+        public int Position { get; set; } = -1;
+        
+        /// <summary>
+        /// 是否已固定位置
+        /// </summary>
+        public bool IsPositionFixed { get; set; } = false;
+        
+        /// <summary>
+        /// 图标缓存
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        private ImageSource _iconCache;
+        
+        /// <summary>
+        /// 获取应用程序图标
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public ImageSource Icon
+        {
+            get
+            {
+                if (_iconCache != null)
+                {
+                    return _iconCache;
+                }
+                
+                try
+                {
+                    if (File.Exists(Path))
+                    {
+                        // 从文件中获取图标
+                        Icon icon = System.Drawing.Icon.ExtractAssociatedIcon(Path);
+                        if (icon != null)
+                        {
+                            _iconCache = Imaging.CreateBitmapSourceFromHIcon(
+                                icon.Handle,
+                                Int32Rect.Empty,
+                                BitmapSizeOptions.FromEmptyOptions());
+                            
+                            icon.Dispose();
+                            return _iconCache;
+                        }
+                    }
+                    else
+                    {
+                        // 从注册表中获取文件类型关联图标
+                        string extension = System.IO.Path.GetExtension(Path);
+                        if (!string.IsNullOrEmpty(extension))
+                        {
+                            string fileType = Registry.ClassesRoot.OpenSubKey(extension)?.GetValue(string.Empty) as string;
+                            if (!string.IsNullOrEmpty(fileType))
+                            {
+                                string iconPath = Registry.ClassesRoot.OpenSubKey(fileType + "\\DefaultIcon")?.GetValue(string.Empty) as string;
+                                if (!string.IsNullOrEmpty(iconPath))
+                                {
+                                    string[] parts = iconPath.Split(',');
+                                    string iconFile = parts[0].Trim('"');
+                                    int iconIndex = parts.Length > 1 ? Convert.ToInt32(parts[1]) : 0;
+                                    
+                                    if (File.Exists(iconFile))
+                                    {
+                                        Icon icon = IconExtractor.Extract(iconFile, iconIndex, true);
+                                        if (icon != null)
+                                        {
+                                            _iconCache = Imaging.CreateBitmapSourceFromHIcon(
+                                                icon.Handle,
+                                                Int32Rect.Empty,
+                                                BitmapSizeOptions.FromEmptyOptions());
+                                            
+                                            icon.Dispose();
+                                            return _iconCache;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"获取应用图标时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+                
+                // 返回默认图标
+                return GetDefaultIcon();
+            }
+        }
+        
+        /// <summary>
+        /// 获取默认图标
+        /// </summary>
+        private ImageSource GetDefaultIcon()
+        {
+            try
+            {
+                // 对于资源管理器，使用特定图标
+                if (Path.EndsWith("explorer.exe", StringComparison.OrdinalIgnoreCase))
+                {
+                    try
+                    {
+                        // 直接从C:\Windows\explorer.exe获取图标
+                        string explorerPath = @"C:\Windows\explorer.exe";
+                        if (File.Exists(explorerPath))
+                        {
+                            Icon icon = System.Drawing.Icon.ExtractAssociatedIcon(explorerPath);
+                            if (icon != null)
+                            {
+                                _iconCache = Imaging.CreateBitmapSourceFromHIcon(
+                                    icon.Handle,
+                                    Int32Rect.Empty,
+                                    BitmapSizeOptions.FromEmptyOptions());
+                                
+                                icon.Dispose();
+                                return _iconCache;
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"获取资源管理器图标时出错: {ex.Message}", LogHelper.LogType.Warning);
+                        // 如果获取Windows图标失败，回退到默认图标
+                    }
+                    
+                    // 回退到备用图标
+                    string explorerIconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-Fluent", "ic_fluent_folder_24_regular.png");
+                    if (File.Exists(explorerIconPath))
+                    {
+                        Uri uri = new Uri(explorerIconPath);
+                        BitmapImage image = new BitmapImage(uri);
+                        _iconCache = image;
+                        return _iconCache;
+                    }
+                }
+                
+                // 返回一个简单的默认图标
+                string iconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-png", "icc.png");
+                if (File.Exists(iconPath))
+                {
+                    Uri uri = new Uri(iconPath);
+                    BitmapImage image = new BitmapImage(uri);
+                    _iconCache = image;
+                    return _iconCache;
+                }
+                
+                // 如果还是没有找到，尝试使用应用程序图标
+                string appIconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-Fluent", "ic_fluent_apps_24_regular.png");
+                if (File.Exists(appIconPath))
+                {
+                    Uri uri = new Uri(appIconPath);
+                    BitmapImage image = new BitmapImage(uri);
+                    _iconCache = image;
+                    return _iconCache;
+                }
+            }
+            catch (Exception ex) 
+            {
+                LogHelper.WriteLogToFile($"获取默认图标时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+            
+            return null;
+        }
+        
+        /// <summary>
+        /// 启动应用程序
+        /// </summary>
+        public void Launch()
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(Path))
+                {
+                    LogHelper.WriteLogToFile("无法启动应用程序：路径为空", LogHelper.LogType.Error);
+                    return;
+                }
+                
+                // 检查文件是否存在
+                if (!System.IO.File.Exists(Path) && !Path.Contains(":\\"))
+                {
+                    // 可能是系统命令，如explorer.exe
+                    System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo
+                    {
+                        FileName = Path,
+                        UseShellExecute = true
+                    };
+                    System.Diagnostics.Process.Start(psi);
+                }
+                else
+                {
+                    // 使用Process.Start启动应用程序
+                    System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo
+                    {
+                        FileName = Path,
+                        UseShellExecute = true
+                    };
+                    System.Diagnostics.Process.Start(psi);
+                }
+                
+                LogHelper.WriteLogToFile($"已启动应用程序: {Path}", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启动应用程序时出错: {ex.Message}", LogHelper.LogType.Error);
+                MessageBox.Show($"启动应用程序时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+    }
+    
+    /// <summary>
+    /// 图标提取工具类
+    /// </summary>
+    public static class IconExtractor
+    {
+        /// <summary>
+        /// 从文件中提取图标
+        /// </summary>
+        /// <param name="file">文件路径</param>
+        /// <param name="index">图标索引</param>
+        /// <param name="largeIcon">是否提取大图标</param>
+        /// <returns>提取的图标</returns>
+        public static Icon Extract(string file, int index, bool largeIcon)
+        {
+            try
+            {
+                IntPtr large;
+                IntPtr small;
+                ExtractIconEx(file, index, out large, out small, 1);
+                
+                try
+                {
+                    return Icon.FromHandle(largeIcon ? large : small);
+                }
+                catch
+                {
+                    return null;
+                }
+                finally
+                {
+                    if (large != IntPtr.Zero)
+                        DestroyIcon(large);
+                    
+                    if (small != IntPtr.Zero)
+                        DestroyIcon(small);
+                }
+            }
+            catch
+            {
+                return null;
+            }
+        }
+        
+        [System.Runtime.InteropServices.DllImport("Shell32.dll", EntryPoint = "ExtractIconEx")]
+        private static extern int ExtractIconEx(
+            [System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.LPStr)] string lpszFile,
+            int nIconIndex,
+            out IntPtr phiconLarge,
+            out IntPtr phiconSmall,
+            int nIcons);
+        
+        [System.Runtime.InteropServices.DllImport("User32.dll")]
+        private static extern int DestroyIcon(IntPtr hIcon);
+    }
+} 
@@ -0,0 +1,143 @@
+<UserControl x:Class="Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher.LauncherSettingsControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher"
+             mc:Ignorable="d"
+             d:DesignHeight="500" d:DesignWidth="600">
+
+    <UserControl.Resources>
+        <!-- 自定义按钮样式 -->
+        <Style x:Key="DefaultButtonStyle" TargetType="Button">
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="4"
+                                Padding="{TemplateBinding Padding}">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            TextElement.Foreground="{TemplateBinding Foreground}"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="border" Property="Opacity" Value="0.8"/>
+                                <Setter Property="Effect">
+                                    <Setter.Value>
+                                        <DropShadowEffect Color="Black" Direction="270" ShadowDepth="2" Opacity="0.3" BlurRadius="4"/>
+                                    </Setter.Value>
+                                </Setter>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="border" Property="Opacity" Value="0.6"/>
+                                <Setter Property="RenderTransform">
+                                    <Setter.Value>
+                                        <ScaleTransform ScaleX="0.95" ScaleY="0.95"/>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="border" Property="Opacity" Value="0.4"/>
+                                <Setter Property="Cursor" Value="Arrow"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        
+        <!-- 标题 -->
+        <TextBlock Grid.Row="0" Text="超级启动台设置" FontSize="16" FontWeight="Bold" Margin="0,0,0,15" Foreground="Black"/>
+
+        <!-- 基本设置 -->
+        <StackPanel Grid.Row="1" Margin="0,0,0,15">
+            <TextBlock Text="基本设置" FontSize="14" FontWeight="SemiBold" Margin="0,0,0,10" Foreground="Black"/>
+
+            <Grid Margin="10,0,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="120"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <!-- 按钮位置 -->
+                <TextBlock Grid.Row="0" Grid.Column="0" Text="按钮位置:" VerticalAlignment="Center" Foreground="Black"/>
+                <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Margin="0,5">
+                    <RadioButton x:Name="RbtnLeft" Content="浮动栏左侧" Margin="0,0,20,0" Checked="RbtnPosition_Checked" Foreground="Black"/>
+                    <RadioButton x:Name="RbtnRight" Content="浮动栏右侧" IsChecked="True" Checked="RbtnPosition_Checked" Foreground="Black"/>
+                </StackPanel>
+            </Grid>
+        </StackPanel>
+        
+        <!-- 应用管理 -->
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            
+            <TextBlock Grid.Row="0" Text="应用管理" FontSize="14" FontWeight="SemiBold" Margin="0,0,0,10" Foreground="Black"/>
+            
+            <Border Grid.Row="1" BorderThickness="1" BorderBrush="#CCCCCC" CornerRadius="5">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    
+                    <!-- 应用列表 -->
+                    <DataGrid Grid.Row="0" x:Name="DgApps" AutoGenerateColumns="False" Margin="5"
+                              CanUserAddRows="False" CanUserDeleteRows="False" 
+                              HeadersVisibility="Column" SelectionMode="Single"
+                              SelectionChanged="DgApps_SelectionChanged">
+                        <DataGrid.Columns>
+                            <DataGridCheckBoxColumn Header="显示" Binding="{Binding IsVisible}" Width="50"/>
+                            <DataGridTextColumn Header="名称" Binding="{Binding Name}" Width="150"/>
+                            <DataGridTextColumn Header="路径" Binding="{Binding Path}" Width="*"/>
+                            <DataGridTextColumn Header="位置" Binding="{Binding Position}" Width="50"/>
+                        </DataGrid.Columns>
+                    </DataGrid>
+                    
+                    <!-- 操作按钮 -->
+                    <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="5">
+                        <Button x:Name="BtnAdd" Content="添加" Padding="10,5" Margin="0,5,5,5" Click="BtnAdd_Click"
+                                Background="#FF007ACC" Foreground="White" BorderBrush="#FF005A9B" BorderThickness="1"
+                                Style="{StaticResource DefaultButtonStyle}"/>
+                        <Button x:Name="BtnEdit" Content="编辑" Padding="10,5" Margin="5" Click="BtnEdit_Click"
+                                Background="#FF6C757D" Foreground="White" BorderBrush="#FF5A6268" BorderThickness="1"
+                                Style="{StaticResource DefaultButtonStyle}"/>
+                        <Button x:Name="BtnDelete" Content="删除" Padding="10,5" Margin="5" Click="BtnDelete_Click"
+                                Background="#FFDC3545" Foreground="White" BorderBrush="#FFBD2130" BorderThickness="1"
+                                Style="{StaticResource DefaultButtonStyle}"/>
+                    </StackPanel>
+                </Grid>
+            </Border>
+        </Grid>
+        
+        <!-- 底部按钮 -->
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0">
+            <Button x:Name="BtnSave" Content="保存设置" Padding="15,5" Click="BtnSave_Click"
+                    Background="#FF28A745" Foreground="White" BorderBrush="#FF1E7E34" BorderThickness="1"
+                    Style="{StaticResource DefaultButtonStyle}"/>
+        </StackPanel>
+    </Grid>
+</UserControl> 
@@ -0,0 +1,395 @@
+using Microsoft.Win32;
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using Ink_Canvas.Windows;
+
+namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
+{
+    /// <summary>
+    /// LauncherSettingsControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class LauncherSettingsControl : UserControl
+    {
+        /// <summary>
+        /// 父插件
+        /// </summary>
+        private readonly SuperLauncherPlugin _plugin;
+        
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="plugin">父插件</param>
+        public LauncherSettingsControl(SuperLauncherPlugin plugin)
+        {
+            InitializeComponent();
+            
+            _plugin = plugin;
+            
+            // 设置按钮位置
+            RbtnLeft.IsChecked = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left;
+            RbtnRight.IsChecked = _plugin.Config.ButtonPosition == LauncherButtonPosition.Right;
+            
+            // 绑定应用列表
+            DgApps.ItemsSource = _plugin.LauncherItems;
+            
+            // 初始化按钮状态
+            UpdateButtonStates();
+        }
+        
+        /// <summary>
+        /// 更新按钮状态
+        /// </summary>
+        private void UpdateButtonStates()
+        {
+            bool hasSelection = DgApps.SelectedItem != null;
+            BtnEdit.IsEnabled = hasSelection;
+            BtnDelete.IsEnabled = hasSelection;
+        }
+        
+        /// <summary>
+        /// 位置单选按钮选择事件
+        /// </summary>
+        private void RbtnPosition_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!IsLoaded) return;
+            
+            LauncherButtonPosition oldPosition = _plugin.Config.ButtonPosition;
+            
+            if (sender == RbtnLeft)
+            {
+                _plugin.Config.ButtonPosition = LauncherButtonPosition.Left;
+            }
+            else if (sender == RbtnRight)
+            {
+                _plugin.Config.ButtonPosition = LauncherButtonPosition.Right;
+            }
+            
+            // 如果位置发生变化，更新按钮位置
+            if (oldPosition != _plugin.Config.ButtonPosition)
+            {
+                try
+                {
+                    // 更新按钮位置
+                    _plugin.UpdateButtonPosition();
+                    
+                    // 保存配置
+                    _plugin.SaveConfig();
+                    
+                    LogHelper.WriteLogToFile($"启动台按钮位置已更改为: {_plugin.Config.ButtonPosition}", LogHelper.LogType.Info);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"更新启动台按钮位置时出错: {ex.Message}", LogHelper.LogType.Error);
+                    MessageBox.Show($"更新启动台按钮位置时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+        }
+        
+        /// <summary>
+        /// 添加按钮点击事件
+        /// </summary>
+        private void BtnAdd_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                // 创建新的启动项
+                LauncherItem item = new LauncherItem
+                {
+                    Name = "",
+                    Path = "",
+                    IsVisible = true,
+                    Position = -1 // 让插件管理器分配位置
+                };
+                
+                // 直接显示编辑对话框
+                EditLauncherItem(item, true);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"添加启动项时出错: {ex.Message}", LogHelper.LogType.Error);
+                MessageBox.Show($"添加启动项时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 编辑应用按钮点击事件
+        /// </summary>
+        private void BtnEdit_Click(object sender, RoutedEventArgs e)
+        {
+            if (DgApps.SelectedItem is LauncherItem item)
+            {
+                EditLauncherItem(item, false);
+            }
+        }
+        
+        /// <summary>
+        /// 删除应用按钮点击事件
+        /// </summary>
+        private void BtnDelete_Click(object sender, RoutedEventArgs e)
+        {
+            if (DgApps.SelectedItem is LauncherItem item)
+            {
+                // 确认删除
+                MessageBoxResult result = MessageBox.Show(
+                    $"确定要删除 {item.Name} 吗？", 
+                    "删除确认", 
+                    MessageBoxButton.YesNo, 
+                    MessageBoxImage.Question);
+                
+                if (result == MessageBoxResult.Yes)
+                {
+                    // 从集合中移除
+                    _plugin.LauncherItems.Remove(item);
+                    
+                    // 保存配置
+                    _plugin.SaveConfig();
+                }
+            }
+        }
+        
+        /// <summary>
+        /// 保存设置按钮点击事件
+        /// </summary>
+        private void BtnSave_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                // 保存配置
+                _plugin.SaveConfig();
+                
+                // 如果插件已启用，重新加载启动台按钮
+                if (_plugin.IsEnabled)
+                {
+                    _plugin.Disable();
+                    _plugin.Enable();
+                }
+                else
+                {
+                    // 如果插件未启用，则启用它
+                    _plugin.Enable();
+                    
+                    // 通知PluginSettingsWindow刷新插件列表
+                    var window = Window.GetWindow(this);
+                    if (window is PluginSettingsWindow pluginSettingsWindow)
+                    {
+                        // 触发刷新
+                        pluginSettingsWindow.RefreshPluginList();
+                    }
+                }
+                
+                MessageBox.Show("设置已保存并应用！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存设置时出错: {ex.Message}", LogHelper.LogType.Error);
+                MessageBox.Show($"保存设置时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 应用项选择变更事件
+        /// </summary>
+        private void DgApps_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            UpdateButtonStates();
+        }
+        
+        /// <summary>
+        /// 编辑启动项
+        /// </summary>
+        /// <param name="item">启动项</param>
+        /// <param name="isNew">是否为新建</param>
+        private void EditLauncherItem(LauncherItem item, bool isNew)
+        {
+            // 创建简单的编辑窗口
+            Window editWindow = new Window
+            {
+                Title = isNew ? "添加" : "编辑应用",
+                Width = 400,
+                Height = 200,
+                WindowStartupLocation = WindowStartupLocation.CenterScreen,
+                ResizeMode = ResizeMode.NoResize
+            };
+            
+            // 创建编辑表单
+            Grid grid = new Grid
+            {
+                Margin = new Thickness(20)
+            };
+            
+            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+            grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
+            
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(80) });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            
+            // 名称输入框
+            TextBlock nameLabel = new TextBlock 
+            { 
+                Text = "名称:", 
+                VerticalAlignment = VerticalAlignment.Center 
+            };
+            TextBox nameTextBox = new TextBox 
+            { 
+                Text = item.Name, 
+                Margin = new Thickness(0, 5, 0, 5) 
+            };
+            
+            Grid.SetRow(nameLabel, 0);
+            Grid.SetColumn(nameLabel, 0);
+            Grid.SetRow(nameTextBox, 0);
+            Grid.SetColumn(nameTextBox, 1);
+            
+            grid.Children.Add(nameLabel);
+            grid.Children.Add(nameTextBox);
+            
+            // 路径输入框
+            TextBlock pathLabel = new TextBlock 
+            { 
+                Text = "路径:", 
+                VerticalAlignment = VerticalAlignment.Center 
+            };
+            Grid pathGrid = new Grid();
+            pathGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            pathGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength() });
+            
+            TextBox pathTextBox = new TextBox 
+            { 
+                Text = item.Path, 
+                Margin = new Thickness(0, 5, 5, 5) 
+            };
+            Button browseButton = new Button 
+            { 
+                Content = "浏览", 
+                Padding = new Thickness(5, 0, 5, 0),
+                Margin = new Thickness(0, 5, 0, 5)
+            };
+            
+            browseButton.Click += (s, e) => 
+            {
+                OpenFileDialog dialog = new OpenFileDialog
+                {
+                    Title = "选择应用程序",
+                    Filter = "应用程序 (*.exe)|*.exe|所有文件 (*.*)|*.*",
+                    Multiselect = false,
+                    FileName = pathTextBox.Text
+                };
+                
+                if (dialog.ShowDialog() == true)
+                {
+                    pathTextBox.Text = dialog.FileName;
+                    
+                    // 如果选择的是.exe文件，自动获取文件名填入名称字段
+                    if (System.IO.Path.GetExtension(dialog.FileName).ToLower() == ".exe")
+                    {
+                        string fileName = System.IO.Path.GetFileNameWithoutExtension(dialog.FileName);
+                        // 只有在名称字段为空或者是新建项目时才自动填入
+                        if (string.IsNullOrWhiteSpace(nameTextBox.Text) || isNew)
+                        {
+                            nameTextBox.Text = fileName;
+                        }
+                    }
+                }
+            };
+            
+            Grid.SetColumn(pathTextBox, 0);
+            Grid.SetColumn(browseButton, 1);
+            pathGrid.Children.Add(pathTextBox);
+            pathGrid.Children.Add(browseButton);
+            
+            Grid.SetRow(pathLabel, 1);
+            Grid.SetColumn(pathLabel, 0);
+            Grid.SetRow(pathGrid, 1);
+            Grid.SetColumn(pathGrid, 1);
+            
+            grid.Children.Add(pathLabel);
+            grid.Children.Add(pathGrid);
+            
+            // 确认和取消按钮
+            StackPanel buttonPanel = new StackPanel
+            {
+                Orientation = Orientation.Horizontal,
+                HorizontalAlignment = HorizontalAlignment.Right,
+                Margin = new Thickness(0, 10, 0, 0)
+            };
+            
+            Button okButton = new Button
+            {
+                Content = "确定",
+                Padding = new Thickness(15, 5, 15, 5),
+                Margin = new Thickness(0, 0, 10, 0),
+                IsDefault = true
+            };
+            
+            Button cancelButton = new Button
+            {
+                Content = "取消",
+                Padding = new Thickness(15, 5, 15, 5),
+                IsCancel = true
+            };
+            
+            okButton.Click += (s, e) => 
+            {
+                // 验证输入
+                if (string.IsNullOrWhiteSpace(nameTextBox.Text))
+                {
+                    MessageBox.Show("请输入应用名称！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+                
+                if (string.IsNullOrWhiteSpace(pathTextBox.Text))
+                {
+                    MessageBox.Show("请输入应用路径！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+                
+                // 更新项目
+                item.Name = nameTextBox.Text;
+                item.Path = pathTextBox.Text;
+                
+                // 如果是新建，添加到集合
+                if (isNew)
+                {
+                    _plugin.AddLauncherItem(item);
+                }
+                else
+                {
+                    // 触发属性变更通知，刷新DataGrid
+                    if (DgApps.ItemsSource is ICollectionView view)
+                    {
+                        view.Refresh();
+                    }
+                    
+                    // 保存配置
+                    _plugin.SaveConfig();
+                }
+                
+                editWindow.DialogResult = true;
+                editWindow.Close();
+            };
+            
+            cancelButton.Click += (s, e) => 
+            {
+                editWindow.DialogResult = false;
+                editWindow.Close();
+            };
+            
+            buttonPanel.Children.Add(okButton);
+            buttonPanel.Children.Add(cancelButton);
+            
+            Grid.SetRow(buttonPanel, 2);
+            Grid.SetColumnSpan(buttonPanel, 2);
+            
+            grid.Children.Add(buttonPanel);
+            
+            // 设置窗口内容
+            editWindow.Content = grid;
+            
+            // 显示窗口
+            editWindow.ShowDialog();
+        }
+    }
+} 
@@ -0,0 +1,91 @@
+<Window x:Class="Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher.LauncherWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher"
+        mc:Ignorable="d"
+        Title="启动台" 
+        Width="400" 
+        Height="300" 
+        WindowStyle="None" 
+        AllowsTransparency="True" 
+        Background="#80000000"
+        ResizeMode="NoResize"
+        Topmost="True"
+        Deactivated="Window_Deactivated"
+        ShowInTaskbar="False">
+    
+    <Window.Resources>
+        <!-- 应用项样式 -->
+        <Style x:Key="LauncherItemStyle" TargetType="Button">
+            <Setter Property="Width" Value="80"/>
+            <Setter Property="Height" Value="80"/>
+            <Setter Property="Margin" Value="5"/>
+            <Setter Property="Background" Value="#40FFFFFF"/>
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="border" Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="8">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.Row="0" Source="{Binding Icon}" Width="32" Height="32" Margin="0,10,0,5"/>
+                                <TextBlock Grid.Row="1" Text="{Binding Name}" TextWrapping="Wrap" TextAlignment="Center" 
+                                           Margin="2,0,2,8" FontSize="11" Foreground="White"/>
+                            </Grid>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="#80FFFFFF"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="#C0FFFFFF"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    
+    <Border CornerRadius="15" Background="#80000000" BorderThickness="1" BorderBrush="#40FFFFFF">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            
+            <!-- 标题栏 -->
+            <Grid Grid.Row="0" Height="40">
+                <TextBlock Text="启动台" Foreground="White" FontSize="18" FontWeight="Bold" 
+                           VerticalAlignment="Center" Margin="15,0,0,0"/>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
+                    <Button x:Name="BtnFixMode" Click="BtnFixMode_Click" Width="30" Height="30" 
+                            Margin="5,0" Background="Transparent" BorderThickness="0" 
+                            ToolTip="切换固定模式">
+                        <Path x:Name="FixModeIcon" Data="M7,2V13H10V22L17,10H13L17,2H7Z" Fill="White" Stretch="Uniform" Width="16" Height="16"/>
+                    </Button>
+                    <Button x:Name="BtnClose" Click="BtnClose_Click" Width="30" Height="30" 
+                            Background="Transparent" BorderThickness="0" 
+                            ToolTip="关闭">
+                        <Path Data="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" 
+                              Fill="White" Stretch="Uniform" Width="16" Height="16"/>
+                    </Button>
+                </StackPanel>
+            </Grid>
+            
+            <!-- 应用网格 -->
+            <ScrollViewer Grid.Row="1" Margin="10" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+                <WrapPanel x:Name="AppPanel" Orientation="Horizontal" HorizontalAlignment="Center"/>
+            </ScrollViewer>
+        </Grid>
+    </Border>
+</Window> 
@@ -0,0 +1,460 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
+{
+    /// <summary>
+    /// LauncherWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class LauncherWindow : Window
+    {
+        /// <summary>
+        /// 父插件
+        /// </summary>
+        private readonly SuperLauncherPlugin _plugin;
+        
+        /// <summary>
+        /// 是否处于固定模式
+        /// </summary>
+        private bool _isFixMode = false;
+        
+        /// <summary>
+        /// 应用项按钮列表
+        /// </summary>
+        private readonly Dictionary<Button, LauncherItem> _appButtons = new Dictionary<Button, LauncherItem>();
+        
+        /// <summary>
+        /// 拖拽中的按钮
+        /// </summary>
+        private Button _draggingButton;
+        
+        /// <summary>
+        /// 拖拽开始位置
+        /// </summary>
+        private Point _dragStartPoint;
+        
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public LauncherWindow(SuperLauncherPlugin plugin)
+        {
+            InitializeComponent();
+            
+            _plugin = plugin;
+            
+            // 加载应用项
+            LoadLauncherItems();
+            
+            // 添加鼠标按下事件（用于拖动窗口）
+            this.MouseDown += (s, e) =>
+            {
+                if (e.ChangedButton == MouseButton.Left && e.ButtonState == MouseButtonState.Pressed)
+                {
+                    this.DragMove();
+                }
+            };
+            
+            // 根据应用数量调整窗口大小
+            AdjustWindowSize();
+        }
+        
+        /// <summary>
+        /// 加载启动台应用项
+        /// </summary>
+        private void LoadLauncherItems()
+        {
+            // 清空现有应用项
+            AppPanel.Children.Clear();
+            _appButtons.Clear();
+            
+            // 获取显示的应用项
+            var visibleItems = _plugin.LauncherItems
+                .Where(item => item.IsVisible)
+                .OrderBy(item => item.Position)
+                .ToList();
+            
+            foreach (var item in visibleItems)
+            {
+                // 创建应用按钮
+                Button appButton = new Button
+                {
+                    Style = (Style)FindResource("LauncherItemStyle"),
+                    DataContext = item,
+                    Tag = item.Position
+                };
+                
+                // 添加点击事件
+                appButton.Click += AppButton_Click;
+                
+                // 在固定模式下，添加拖拽事件
+                appButton.PreviewMouseDown += AppButton_PreviewMouseDown;
+                appButton.PreviewMouseMove += AppButton_PreviewMouseMove;
+                appButton.PreviewMouseUp += AppButton_PreviewMouseUp;
+                
+                // 记录按钮和项目的对应关系
+                _appButtons.Add(appButton, item);
+                
+                // 添加到面板
+                AppPanel.Children.Add(appButton);
+            }
+        }
+        
+        /// <summary>
+        /// 根据应用数量调整窗口大小
+        /// </summary>
+        private void AdjustWindowSize()
+        {
+            try
+            {
+                // 每行最多显示4个应用
+                const int appsPerRow = 4;
+                
+                // 计算行数
+                int visibleCount = _appButtons.Count;
+                int rowCount = (int)Math.Ceiling(visibleCount / (double)appsPerRow);
+                
+                // 设置窗口宽度（每个应用90像素宽 = 80 + 5*2）
+                Width = Math.Min(appsPerRow * 90 + 40, 400); // 最大宽度400
+                
+                // 设置窗口高度（每个应用90像素高 = 80 + 5*2）
+                Height = Math.Min(rowCount * 90 + 60, 600); // 最大高度600，标题栏40 + 边距20
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"调整启动台窗口大小时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 应用按钮点击事件
+        /// </summary>
+        private void AppButton_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_isFixMode) return; // 在固定模式下，不响应点击事件
+                
+                if (sender is Button button && _appButtons.TryGetValue(button, out LauncherItem item))
+                {
+                    // 获取应用路径和名称，用于后续启动
+                    string appPath = item.Path;
+                    string appName = item.Name;
+                    
+                    LogHelper.WriteLogToFile($"点击启动应用: {appName}, 路径: {appPath}", LogHelper.LogType.Info);
+                    
+                    // 首先标记窗口正在关闭
+                    IsClosing = true;
+                    
+                    // 创建一个应用启动任务
+                    var launchTask = new System.Threading.Tasks.Task(() =>
+                    {
+                        try
+                        {
+                            // 等待一段时间，确保窗口关闭流程已经开始
+                            System.Threading.Thread.Sleep(200);
+                            
+                            // 使用UI线程启动应用
+                            Application.Current.Dispatcher.Invoke(() => 
+                            {
+                                try
+                                {
+                                    // 检查应用路径是否存在
+                                    if (System.IO.File.Exists(appPath) || !appPath.Contains(":\\"))
+                                    {
+                                        // 创建进程启动信息
+                                        var psi = new System.Diagnostics.ProcessStartInfo
+                                    {
+                                        FileName = appPath,
+                                            UseShellExecute = true,
+                                    };
+                                        
+                                        // 启动应用程序
+                                        var process = System.Diagnostics.Process.Start(psi);
+                                        LogHelper.WriteLogToFile($"应用程序 {appName} 已启动", LogHelper.LogType.Info);
+                                    }
+                                    else
+                                    {
+                                        LogHelper.WriteLogToFile($"应用路径不存在: {appPath}", LogHelper.LogType.Error);
+                                        MessageBox.Show($"找不到应用程序: {appPath}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogHelper.WriteLogToFile($"启动应用程序失败: {ex.Message}", LogHelper.LogType.Error);
+                                    MessageBox.Show($"启动应用程序失败: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                                }
+                            });
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"应用启动任务出错: {ex.Message}", LogHelper.LogType.Error);
+                        }
+                    });
+                    
+                    // 关闭窗口
+                    try
+                    {
+                        Dispatcher.BeginInvoke(new Action(() =>
+                        {
+                            try { Close(); } catch { }
+                            
+                            // 启动应用程序任务
+                            launchTask.Start();
+                        }), System.Windows.Threading.DispatcherPriority.Background);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"关闭窗口或启动任务时出错: {ex.Message}", LogHelper.LogType.Error);
+                        // 如果无法通过UI关闭窗口，直接启动任务
+                        launchTask.Start();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"应用按钮点击事件出错: {ex.Message}", LogHelper.LogType.Error);
+                try { IsClosing = true; Close(); } catch { }
+            }
+        }
+        
+        #region 固定模式拖拽事件
+        
+        /// <summary>
+        /// 应用按钮鼠标按下事件
+        /// </summary>
+        private void AppButton_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (!_isFixMode) return;
+            
+            if (e.ChangedButton == MouseButton.Left && sender is Button button)
+            {
+                _draggingButton = button;
+                _dragStartPoint = e.GetPosition(AppPanel);
+                button.CaptureMouse();
+                button.Opacity = 0.7;
+                
+                // 阻止事件冒泡，以避免触发按钮点击
+                e.Handled = true;
+            }
+        }
+        
+        /// <summary>
+        /// 应用按钮鼠标移动事件
+        /// </summary>
+        private void AppButton_PreviewMouseMove(object sender, MouseEventArgs e)
+        {
+            if (!_isFixMode || _draggingButton == null) return;
+            
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                Point currentPosition = e.GetPosition(AppPanel);
+                
+                // 移动按钮
+                System.Windows.Controls.Canvas.SetLeft(_draggingButton, currentPosition.X - _draggingButton.ActualWidth / 2);
+                System.Windows.Controls.Canvas.SetTop(_draggingButton, currentPosition.Y - _draggingButton.ActualHeight / 2);
+                
+                // 将按钮移到最上层
+                Panel.SetZIndex(_draggingButton, 100);
+                
+                // 阻止事件冒泡
+                e.Handled = true;
+            }
+        }
+        
+        /// <summary>
+        /// 应用按钮鼠标释放事件
+        /// </summary>
+        private void AppButton_PreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (!_isFixMode || _draggingButton == null) return;
+            
+            // 释放鼠标捕获
+            _draggingButton.ReleaseMouseCapture();
+            
+            // 计算新位置
+            Point releasePoint = e.GetPosition(AppPanel);
+            int newPosition = CalculateGridPosition(releasePoint);
+            
+            // 获取当前项目
+            LauncherItem currentItem = _appButtons[_draggingButton];
+            
+            // 重新排序
+            ReorderItems(currentItem, newPosition);
+            
+            // 重新加载应用项
+            LoadLauncherItems();
+            
+            // 保存配置
+            _plugin.SaveConfig();
+            
+            // 清除拖拽状态
+            _draggingButton.Opacity = 1;
+            Panel.SetZIndex(_draggingButton, 0);
+            _draggingButton = null;
+            
+            // 阻止事件冒泡
+            e.Handled = true;
+        }
+        
+        /// <summary>
+        /// 计算网格位置
+        /// </summary>
+        private int CalculateGridPosition(Point point)
+        {
+            // 计算行和列
+            int columnCount = 4; // 每行最多4个应用
+            int columnWidth = 90; // 应用宽度（包括边距）
+            int rowHeight = 90; // 应用高度（包括边距）
+            
+            int column = (int)(point.X / columnWidth);
+            int row = (int)(point.Y / rowHeight);
+            
+            // 确保在有效范围内
+            column = Math.Max(0, Math.Min(column, columnCount - 1));
+            row = Math.Max(0, row);
+            
+            // 计算位置索引
+            return row * columnCount + column;
+        }
+        
+        /// <summary>
+        /// 重新排序应用项
+        /// </summary>
+        private void ReorderItems(LauncherItem item, int newPosition)
+        {
+            try
+            {
+                // 设置项目为固定位置
+                item.IsPositionFixed = true;
+                
+                // 如果位置相同，无需调整
+                if (item.Position == newPosition)
+                {
+                    return;
+                }
+                
+                // 获取所有可见项目
+                var visibleItems = _plugin.LauncherItems
+                    .Where(i => i.IsVisible)
+                    .OrderBy(i => i.Position)
+                    .ToList();
+                
+                // 移除当前项目
+                visibleItems.Remove(item);
+                
+                // 查找插入位置
+                int insertIndex = 0;
+                for (int i = 0; i < visibleItems.Count; i++)
+                {
+                    if (visibleItems[i].Position >= newPosition)
+                    {
+                        insertIndex = i;
+                        break;
+                    }
+                    insertIndex = i + 1;
+                }
+                
+                // 插入项目
+                visibleItems.Insert(insertIndex, item);
+                
+                // 重新分配位置
+                for (int i = 0; i < visibleItems.Count; i++)
+                {
+                    visibleItems[i].Position = i;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"重新排序应用项时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        #endregion
+        
+        #region 窗口事件处理
+        
+        /// <summary>
+        /// 窗口失去焦点事件
+        /// </summary>
+        private void Window_Deactivated(object sender, EventArgs e)
+        {
+            try
+            {
+                // 只有在非固定模式、窗口已加载、未处于关闭状态且IsLoaded=true时关闭窗口
+                if (!_isFixMode && IsLoaded && !IsClosing)
+                {
+                    // 标记为正在关闭
+                    IsClosing = true;
+                    
+                    // 使用Dispatcher.BeginInvoke而不是直接调用Close，避免冲突
+                    Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        try
+                        {
+                            // 再次检查窗口状态
+                            if (IsLoaded && !IsClosing)
+                {
+                    Close();
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"延迟关闭窗口时出错: {ex.Message}", LogHelper.LogType.Error);
+                        }
+                    }), System.Windows.Threading.DispatcherPriority.Background);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"窗口失去焦点关闭时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 窗口是否正在关闭
+        /// </summary>
+        private bool IsClosing { get; set; } = false;
+        
+        /// <summary>
+        /// 重写OnClosing方法，标记窗口正在关闭
+        /// </summary>
+        protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+        {
+            IsClosing = true;
+            base.OnClosing(e);
+        }
+        
+        /// <summary>
+        /// 关闭按钮点击事件
+        /// </summary>
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+        
+        /// <summary>
+        /// 固定模式按钮点击事件
+        /// </summary>
+        private void BtnFixMode_Click(object sender, RoutedEventArgs e)
+        {
+            // 切换固定模式
+            _isFixMode = !_isFixMode;
+            
+            // 更新固定模式按钮图标颜色
+            FixModeIcon.Fill = _isFixMode ? Brushes.Yellow : Brushes.White;
+            
+            // 显示提示
+            if (_isFixMode)
+            {
+                MessageBox.Show("已进入固定模式，您可以拖动应用图标调整位置。", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+        
+        #endregion
+    }
+} 
@@ -0,0 +1,589 @@
+using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Helpers.Plugins.BuiltIn
+{
+    /// <summary>
+    /// 超级启动台插件
+    /// </summary>
+    public class SuperLauncherPlugin : PluginBase
+    {
+        #region 插件基本信息
+        
+        public override string Name => "超级启动台";
+        
+        public override string Description => "在浮动栏添加一个启动台按钮，可快速启动常用应用程序。";
+        
+        public override Version Version => new Version(1, 0, 1);
+        
+        public override string Author => "ICC CE 团队";
+        
+        public override bool IsBuiltIn => true;
+        
+        #endregion
+
+        #region 插件属性和字段
+        
+        /// <summary>
+        /// 启动台配置
+        /// </summary>
+        public LauncherConfig Config { get; private set; }
+        
+        /// <summary>
+        /// 启动台应用程序列表
+        /// </summary>
+        public ObservableCollection<LauncherItem> LauncherItems { get; private set; }
+        
+        /// <summary>
+        /// 启动台按钮
+        /// </summary>
+        private LauncherButton _launcherButton;
+        
+        /// <summary>
+        /// 启动台窗口
+        /// </summary>
+        private LauncherWindow _launcherWindow;
+        
+        /// <summary>
+        /// 配置文件路径
+        /// </summary>
+        private readonly string _configPath = Path.Combine(App.RootPath, "PluginConfigs", "SuperLauncher.json");
+        
+        /// <summary>
+        /// 标记是否已添加到浮动栏
+        /// </summary>
+        private bool _isAddedToFloatingBar = false;
+        
+        #endregion
+
+        #region 插件生命周期
+        
+        public override void Initialize()
+        {
+            try
+            {
+                base.Initialize();
+                
+                // 创建配置目录
+                string configDir = Path.Combine(App.RootPath, "PluginConfigs");
+                if (!Directory.Exists(configDir))
+                {
+                    Directory.CreateDirectory(configDir);
+                }
+                
+                // 加载配置
+                LoadConfig();
+                
+                LogHelper.WriteLogToFile("超级启动台插件已初始化", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+            }
+        }
+        
+        public override void Enable()
+        {
+            try
+            {
+                if (IsEnabled) return; // 防止重复启用
+                
+                // 创建启动台按钮
+                if (_launcherButton == null)
+                {
+                    _launcherButton = new LauncherButton(this);
+                    LogHelper.WriteLogToFile("超级启动台按钮已创建", LogHelper.LogType.Info);
+                }
+                
+                // 添加启动台按钮到浮动栏
+                AddLauncherButtonToFloatingBar();
+                
+                // 设置启用状态
+                base.Enable();
+                
+                // 保存插件配置
+                SavePluginSettings();
+                
+                LogHelper.WriteLogToFile("超级启动台插件已启用", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启用超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+            }
+        }
+        
+        public override void Disable()
+        {
+            try
+            {
+                if (!IsEnabled) return; // 防止重复禁用
+                
+                // 从浮动栏移除启动台按钮
+                RemoveLauncherButtonFromFloatingBar();
+                
+                // 如果启动台窗口打开，则关闭
+                if (_launcherWindow != null && _launcherWindow.IsVisible)
+                {
+                    _launcherWindow.Close();
+                    _launcherWindow = null;
+                }
+                
+                // 设置禁用状态
+                base.Disable();
+                
+                // 保存插件配置
+                SavePluginSettings();
+                
+                LogHelper.WriteLogToFile("超级启动台插件已禁用", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"禁用超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+            }
+        }
+        
+        public override UserControl GetSettingsView()
+        {
+            return new LauncherSettingsControl(this);
+        }
+        
+        public override void Cleanup()
+        {
+            // 保存配置
+            SaveConfig();
+            
+            // 从浮动栏移除启动台按钮
+            RemoveLauncherButtonFromFloatingBar();
+            
+            // 如果启动台窗口打开，则关闭
+            if (_launcherWindow != null && _launcherWindow.IsVisible)
+            {
+                _launcherWindow.Close();
+                _launcherWindow = null;
+            }
+            
+            base.Cleanup();
+        }
+        
+        /// <summary>
+        /// 保存插件设置
+        /// </summary>
+        public override void SavePluginSettings()
+        {
+            try
+            {
+                // 确保配置已加载
+                if (Config == null)
+                {
+                    LoadConfig();
+                }
+                
+                // 更新其他设置，但不更改插件启用状态
+                
+                // 保存配置
+                SaveConfig();
+                
+                LogHelper.WriteLogToFile($"超级启动台插件设置已保存", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存超级启动台插件设置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        #endregion
+
+        #region 配置管理
+        
+        /// <summary>
+        /// 加载配置
+        /// </summary>
+        private void LoadConfig()
+        {
+            try
+            {
+                if (File.Exists(_configPath))
+                {
+                    string json = File.ReadAllText(_configPath);
+                    Config = JsonConvert.DeserializeObject<LauncherConfig>(json) ?? CreateDefaultConfig();
+                    LauncherItems = new ObservableCollection<LauncherItem>(Config.Items ?? new List<LauncherItem>());
+                    
+                    // 注意：不再根据配置更改插件启用状态
+                    // 插件状态由PluginManager统一管理
+                }
+                else
+                {
+                    Config = CreateDefaultConfig();
+                    LauncherItems = new ObservableCollection<LauncherItem>(Config.Items);
+                    SaveConfig();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"加载超级启动台配置时出错: {ex.Message}", LogHelper.LogType.Error);
+                Config = CreateDefaultConfig();
+                LauncherItems = new ObservableCollection<LauncherItem>(Config.Items);
+            }
+        }
+        
+        /// <summary>
+        /// 保存配置
+        /// </summary>
+        public void SaveConfig()
+        {
+            try
+            {
+                // 同步LauncherItems到Config
+                Config.Items = new List<LauncherItem>(LauncherItems);
+                
+                // 序列化并保存配置
+                string json = JsonConvert.SerializeObject(Config, Formatting.Indented);
+                File.WriteAllText(_configPath, json);
+                
+                LogHelper.WriteLogToFile("超级启动台配置已保存", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存超级启动台配置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 创建默认配置
+        /// </summary>
+        private LauncherConfig CreateDefaultConfig()
+        {
+            var config = new LauncherConfig
+            {
+                ButtonPosition = LauncherButtonPosition.Right,
+                // 不再使用IsEnabled，插件状态由PluginManager管理
+                Items = new List<LauncherItem>
+                {
+                    new LauncherItem
+                    {
+                        Name = "资源管理器",
+                        Path = @"C:\Windows\explorer.exe",
+                        IsVisible = true,
+                        Position = 0
+                    }
+                }
+            };
+            
+            return config;
+        }
+        
+        #endregion
+
+        #region 启动台按钮管理
+        
+        /// <summary>
+        /// 将启动台按钮添加到浮动栏
+        /// </summary>
+        private void AddLauncherButtonToFloatingBar()
+        {
+            try
+            {
+                // 如果已经添加，先移除
+                if (_isAddedToFloatingBar)
+                {
+                    RemoveLauncherButtonFromFloatingBar();
+                    _isAddedToFloatingBar = false;
+                }
+                
+                // 获取主窗口实例
+                var mainWindow = Application.Current.MainWindow;
+                if (mainWindow == null)
+                {
+                    LogHelper.WriteLogToFile("未找到主窗口实例，无法添加启动台按钮", LogHelper.LogType.Error);
+                    return;
+                }
+                
+                // 创建启动台按钮
+                _launcherButton = new LauncherButton(this);
+                var buttonElement = _launcherButton.Element;
+                
+                // 查找浮动栏
+                var floatingBar = mainWindow.FindName("StackPanelFloatingBar") as Panel;
+                if (floatingBar == null)
+                {
+                    // 如果直接查找失败，则尝试遍历可视树查找
+                    Panel floatingBarPanelFromTree = null;
+                    FindStackPanelFloatingBar(mainWindow, ref floatingBarPanelFromTree);
+                    floatingBar = floatingBarPanelFromTree;
+                }
+                
+                if (floatingBar == null)
+                {
+                    LogHelper.WriteLogToFile("未找到浮动栏，无法添加启动台按钮", LogHelper.LogType.Error);
+                    return;
+                }
+                
+                // 添加启动台按钮到浮动栏
+                if (Config.ButtonPosition == LauncherButtonPosition.Left)
+                {
+                    floatingBar.Children.Insert(0, buttonElement);
+                    LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏左侧", LogHelper.LogType.Info);
+                }
+                else
+                {
+                    floatingBar.Children.Add(buttonElement);
+                    LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏右侧", LogHelper.LogType.Info);
+                }
+                
+                _isAddedToFloatingBar = true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"添加启动台按钮到浮动栏时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+            }
+        }
+        
+        /// <summary>
+        /// 递归查找StackPanelFloatingBar
+        /// </summary>
+        private void FindStackPanelFloatingBar(DependencyObject parent, ref Panel result)
+        {
+            if (parent == null || result != null) return;
+            
+            try
+            {
+                // 检查当前对象是否为我们要找的面板
+                if (parent is Panel panel && panel.Name == "StackPanelFloatingBar")
+                {
+                    result = panel;
+                    return;
+                }
+                
+                // 获取子元素数量
+                int childCount = VisualTreeHelper.GetChildrenCount(parent);
+                
+                // 遍历所有子元素
+                for (int i = 0; i < childCount; i++)
+                {
+                    DependencyObject child = VisualTreeHelper.GetChild(parent, i);
+                    FindStackPanelFloatingBar(child, ref result);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"查找StackPanelFloatingBar时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 从浮动栏移除启动台按钮
+        /// </summary>
+        private void RemoveLauncherButtonFromFloatingBar()
+        {
+            try
+            {
+                if (!_isAddedToFloatingBar || _launcherButton == null)
+                {
+                    return;
+                }
+                
+                // 获取主窗口实例
+                var mainWindow = Application.Current.MainWindow;
+                if (mainWindow == null)
+                {
+                    LogHelper.WriteLogToFile("未找到主窗口实例，无法移除启动台按钮", LogHelper.LogType.Error);
+                    return;
+                }
+                
+                // 获取按钮元素
+                var buttonElement = _launcherButton.Element;
+                
+                // 查找浮动栏
+                var floatingBar = mainWindow.FindName("StackPanelFloatingBar") as Panel;
+                if (floatingBar == null)
+                {
+                    // 如果直接查找失败，则尝试遍历可视树查找
+                    Panel floatingBarPanelFromTree = null;
+                    FindStackPanelFloatingBar(mainWindow, ref floatingBarPanelFromTree);
+                    floatingBar = floatingBarPanelFromTree;
+                }
+                
+                if (floatingBar == null)
+                {
+                    LogHelper.WriteLogToFile("未找到浮动栏，无法移除启动台按钮", LogHelper.LogType.Error);
+                    return;
+                }
+                
+                // 从浮动栏移除启动台按钮
+                if (floatingBar.Children.Contains(buttonElement))
+                {
+                    floatingBar.Children.Remove(buttonElement);
+                    LogHelper.WriteLogToFile("启动台按钮已从浮动栏移除", LogHelper.LogType.Info);
+                }
+                
+                _isAddedToFloatingBar = false;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"移除启动台按钮时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+            }
+        }
+        
+        /// <summary>
+        /// 更新启动台按钮位置
+        /// </summary>
+        public void UpdateButtonPosition()
+        {
+            try
+            {
+                // 如果按钮已添加到浮动栏，重新添加以更新位置
+                if (_isAddedToFloatingBar)
+                {
+                    RemoveLauncherButtonFromFloatingBar();
+                    AddLauncherButtonToFloatingBar();
+                    LogHelper.WriteLogToFile($"启动台按钮位置已更新为: {Config.ButtonPosition}", LogHelper.LogType.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新启动台按钮位置时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.NewLog(ex);
+            }
+        }
+        
+        #endregion
+
+        #region 启动台功能
+        
+        /// <summary>
+        /// 显示启动台窗口
+        /// </summary>
+        /// <param name="buttonPosition">按钮在屏幕上的位置</param>
+        public void ShowLauncherWindow(Point buttonPosition)
+        {
+            try
+            {
+                // 如果窗口已存在，关闭它
+                if (_launcherWindow != null && _launcherWindow.IsVisible)
+                {
+                    _launcherWindow.Close();
+                    _launcherWindow = null;
+                    return;
+                }
+                
+                // 创建新的启动台窗口
+                _launcherWindow = new LauncherWindow(this);
+                
+                // 计算窗口位置，使其位于按钮上方
+                PositionLauncherWindow(_launcherWindow, buttonPosition);
+                
+                // 显示窗口
+                _launcherWindow.Show();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"显示启动台窗口时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 设置启动台窗口位置
+        /// </summary>
+        /// <param name="window">启动台窗口</param>
+        /// <param name="buttonPosition">按钮在屏幕上的位置</param>
+        private void PositionLauncherWindow(LauncherWindow window, Point buttonPosition)
+        {
+            // 确保窗口已加载
+            if (window.ActualWidth == 0 || window.ActualHeight == 0)
+            {
+                window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+                
+                // 设置窗口加载完成后的位置
+                window.Loaded += (s, e) =>
+                {
+                    // 窗口位于按钮上方居中
+                    double left = buttonPosition.X - (window.ActualWidth / 2);
+                    double top = buttonPosition.Y - window.ActualHeight - 10; // 在按钮上方留出一些间距
+                    
+                    // 确保窗口在屏幕内
+                    left = Math.Max(0, Math.Min(left, SystemParameters.WorkArea.Width - window.ActualWidth));
+                    top = Math.Max(0, Math.Min(top, SystemParameters.WorkArea.Height - window.ActualHeight));
+                    
+                    window.Left = left;
+                    window.Top = top;
+                };
+            }
+            else
+            {
+                // 窗口位于按钮上方居中
+                double left = buttonPosition.X - (window.ActualWidth / 2);
+                double top = buttonPosition.Y - window.ActualHeight - 10; // 在按钮上方留出一些间距
+                
+                // 确保窗口在屏幕内
+                left = Math.Max(0, Math.Min(left, SystemParameters.WorkArea.Width - window.ActualWidth));
+                top = Math.Max(0, Math.Min(top, SystemParameters.WorkArea.Height - window.ActualHeight));
+                
+                window.Left = left;
+                window.Top = top;
+            }
+        }
+        
+        /// <summary>
+        /// 添加应用到启动台
+        /// </summary>
+        /// <param name="item">启动台项</param>
+        public void AddLauncherItem(LauncherItem item)
+        {
+            // 如果项目数量已达上限，则不添加
+            if (LauncherItems.Count >= 40)
+            {
+                MessageBox.Show("启动台项目数量已达上限(40个)！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+            
+            // 寻找合适的位置
+            if (item.Position < 0)
+            {
+                item.Position = FindNextAvailablePosition();
+            }
+            
+            // 添加项目并保存配置
+            LauncherItems.Add(item);
+            SaveConfig();
+        }
+        
+        /// <summary>
+        /// 查找下一个可用位置
+        /// </summary>
+        private int FindNextAvailablePosition()
+        {
+            // 获取已使用的位置列表
+            var usedPositions = new HashSet<int>();
+            foreach (var item in LauncherItems)
+            {
+                usedPositions.Add(item.Position);
+            }
+            
+            // 查找第一个可用位置
+            for (int i = 0; i < 40; i++)
+            {
+                if (!usedPositions.Contains(i))
+                {
+                    return i;
+                }
+            }
+            
+            // 如果所有位置都已使用，则返回0
+            return 0;
+        }
+        
+        #endregion
+    }
+} 
@@ -0,0 +1,178 @@
+using System;
+using System.IO;
+
+namespace Ink_Canvas.Helpers.Plugins
+{
+    /// <summary>
+    /// ICCPP 插件适配器，用于加载和管理 .iccpp 格式的插件
+    /// </summary>
+    public class ICCPPPluginAdapter : PluginBase
+    {
+        private readonly byte[] _pluginData;
+        private readonly string _pluginPath;
+        private readonly string _pluginName;
+        private readonly Version _pluginVersion;
+        private bool _isInitialized = false;
+        
+        /// <summary>
+        /// 创建 ICCPP 插件适配器
+        /// </summary>
+        /// <param name="pluginPath">插件文件路径</param>
+        /// <param name="pluginData">插件文件数据</param>
+        public ICCPPPluginAdapter(string pluginPath, byte[] pluginData)
+        {
+            _pluginPath = pluginPath;
+            _pluginData = pluginData;
+            PluginPath = pluginPath;
+            
+            // 从文件名获取插件名称
+            _pluginName = Path.GetFileNameWithoutExtension(pluginPath);
+            _pluginVersion = new Version(1, 0, 0); // 默认版本
+            
+            // 尝试从插件数据中读取更多信息
+            TryReadPluginMetadata();
+        }
+
+        public ICCPPPluginAdapter()
+        {
+            _pluginPath = string.Empty;
+            _pluginData = new byte[0];
+            PluginPath = string.Empty;
+            _pluginName = "ICCPPPlugin";
+            _pluginVersion = new Version(1, 0, 0);
+            // 可选：初始化其他字段
+        }
+        
+        /// <summary>
+        /// 尝试从插件数据中读取元数据
+        /// </summary>
+        private void TryReadPluginMetadata()
+        {
+            try
+            {
+                // 这里可以根据 .iccpp 文件的实际格式解析元数据
+                // 例如，如果文件有特定的头部结构，可以在这里解析
+                
+                // 示例：如果前100字节包含元数据
+                if (_pluginData.Length > 100)
+                {
+                    // 解析元数据的代码...
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"解析插件 {_pluginName} 元数据时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        #region IPlugin 接口实现
+        
+        /// <summary>
+        /// 插件名称
+        /// </summary>
+        public override string Name => _pluginName;
+        
+        /// <summary>
+        /// 插件描述
+        /// </summary>
+        public override string Description => $"{_pluginName} (ICCPP 格式插件)";
+        
+        /// <summary>
+        /// 插件版本
+        /// </summary>
+        public override Version Version => _pluginVersion;
+        
+        /// <summary>
+        /// 插件作者
+        /// </summary>
+        public override string Author => "未知";
+        
+        /// <summary>
+        /// 是否为内置插件
+        /// </summary>
+        public override bool IsBuiltIn => false;
+        
+        /// <summary>
+        /// 初始化插件
+        /// </summary>
+        public override void Initialize()
+        {
+            if (_isInitialized) return;
+            
+            try
+            {
+                // 这里可以添加 .iccpp 插件的初始化逻辑
+                // 例如，根据文件格式加载特定资源
+                
+                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已初始化", LogHelper.LogType.Info);
+                _isInitialized = true;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"初始化 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 启用插件
+        /// </summary>
+        public override void Enable()
+        {
+            if (IsEnabled) return;
+            
+            try
+            {
+                // 这里可以添加 .iccpp 插件的启用逻辑
+                // 例如，加载动态库、注册事件等
+                
+                base.Enable(); // 设置启用状态并触发事件
+                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已启用", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"启用 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 禁用插件
+        /// </summary>
+        public override void Disable()
+        {
+            if (!IsEnabled) return;
+            
+            try
+            {
+                // 这里可以添加 .iccpp 插件的禁用逻辑
+                // 例如，卸载动态库、注销事件等
+                
+                base.Disable(); // 设置禁用状态并触发事件
+                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已禁用", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"禁用 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        /// <summary>
+        /// 清理插件资源
+        /// </summary>
+        public override void Cleanup()
+        {
+            try
+            {
+                // 这里可以添加 .iccpp 插件的清理逻辑
+                // 例如，释放资源等
+                
+                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已清理资源", LogHelper.LogType.Info);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"清理 ICCPP 插件 {Name} 资源时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+        
+        #endregion
+    }
+} 
@@ -0,0 +1,67 @@
+using System;
+using System.Windows.Controls;
+
+namespace Ink_Canvas.Helpers.Plugins
+{
+    /// <summary>
+    /// 定义插件的基本接口
+    /// </summary>
+    public interface IPlugin
+    {
+        /// <summary>
+        /// 插件名称
+        /// </summary>
+        string Name { get; }
+        
+        /// <summary>
+        /// 插件描述
+        /// </summary>
+        string Description { get; }
+        
+        /// <summary>
+        /// 插件版本
+        /// </summary>
+        Version Version { get; }
+        
+        /// <summary>
+        /// 插件作者
+        /// </summary>
+        string Author { get; }
+        
+        /// <summary>
+        /// 是否为内置插件
+        /// </summary>
+        bool IsBuiltIn { get; }
+        
+        /// <summary>
+        /// 初始化插件
+        /// 此方法在插件加载时被调用，用于执行一些初始化工作
+        /// </summary>
+        void Initialize();
+        
+        /// <summary>
+        /// 启用插件
+        /// 此方法在插件被用户或系统启用时调用，激活插件功能
+        /// </summary>
+        void Enable();
+        
+        /// <summary>
+        /// 禁用插件
+        /// 此方法在插件被用户或系统禁用时调用，停用插件功能
+        /// </summary>
+        void Disable();
+        
+        /// <summary>
+        /// 获取插件设置界面
+        /// 此方法返回插件的设置界面控件，用于展示在设置窗口
+        /// </summary>
+        /// <returns>插件设置界面</returns>
+        UserControl GetSettingsView();
+        
+        /// <summary>
+        /// 插件卸载时的清理工作
+        /// 此方法在插件被卸载前调用，用于释放资源和执行清理
+        /// </summary>
+        void Cleanup();
+    }
+} 
@@ -0,0 +1,161 @@
+using System;
+using System.Windows.Controls;
+
+namespace Ink_Canvas.Helpers.Plugins
+{
+    /// <summary>
+    /// 插件基类，提供基本实现
+    /// </summary>
+    public abstract class PluginBase : IPlugin
+    {
+        /// <summary>
+        /// 插件状态（私有字段）
+        /// </summary>
+        private bool _isEnabled = false;
+        
+        /// <summary>
+        /// 插件状态（公共属性）
+        /// </summary>
+        public bool IsEnabled 
+        {
+            get => _isEnabled;
+            protected set
+            {
+                if (_isEnabled != value)
+                {
+                    _isEnabled = value;
+                    OnEnabledStateChanged(value);
+                }
+            }
+        }
+        
+        /// <summary>
+        /// 插件ID
+        /// </summary>
+        public string Id { get; protected set; }
+        
+        /// <summary>
+        /// 插件路径
+        /// </summary>
+        public string PluginPath { get; set; }
+
+        /// <summary>
+        /// 插件名称
+        /// </summary>
+        public abstract string Name { get; }
+
+        /// <summary>
+        /// 插件描述
+        /// </summary>
+        public abstract string Description { get; }
+
+        /// <summary>
+        /// 插件版本
+        /// </summary>
+        public abstract Version Version { get; }
+
+        /// <summary>
+        /// 插件作者
+        /// </summary>
+        public abstract string Author { get; }
+
+        /// <summary>
+        /// 是否为内置插件
+        /// </summary>
+        public virtual bool IsBuiltIn => false;
+
+        /// <summary>
+        /// 状态变更事件
+        /// </summary>
+        public event EventHandler<bool> EnabledStateChanged;
+
+        /// <summary>
+        /// 初始化插件
+        /// </summary>
+        public virtual void Initialize()
+        {
+            Id = GetType().FullName;
+            
+            // 添加日志，记录插件名称
+            try
+            {
+                string name = Name;
+                LogHelper.WriteLogToFile($"初始化插件: ID={Id}, 名称={name ?? "未命名"}", LogHelper.LogType.Info);
+                
+                if (string.IsNullOrEmpty(name))
+                {
+                    LogHelper.WriteLogToFile($"警告: 插件 {Id} 的名称为空", LogHelper.LogType.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"获取插件名称时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+            
+            LogHelper.WriteLogToFile($"插件 {Name} 已初始化", LogHelper.LogType.Info);
+        }
+
+        /// <summary>
+        /// 启用插件
+        /// </summary>
+        public virtual void Enable()
+        {
+            if (!IsEnabled)
+            {
+                IsEnabled = true;
+                LogHelper.WriteLogToFile($"插件 {Name} 已启用", LogHelper.LogType.Info);
+            }
+        }
+
+        /// <summary>
+        /// 禁用插件
+        /// </summary>
+        public virtual void Disable()
+        {
+            if (IsEnabled)
+            {
+                IsEnabled = false;
+                LogHelper.WriteLogToFile($"插件 {Name} 已禁用", LogHelper.LogType.Info);
+            }
+        }
+
+        /// <summary>
+        /// 获取插件设置界面
+        /// </summary>
+        /// <returns>插件设置界面</returns>
+        public virtual UserControl GetSettingsView()
+        {
+            // 默认返回空设置页面
+            return new UserControl();
+        }
+
+        /// <summary>
+        /// 插件卸载时的清理工作
+        /// </summary>
+        public virtual void Cleanup()
+        {
+            LogHelper.WriteLogToFile($"插件 {Name} 已卸载", LogHelper.LogType.Info);
+        }
+        
+        /// <summary>
+        /// 保存插件自身的设置
+        /// 注意：此方法仅用于保存插件的特定设置，不应影响插件启用/禁用状态
+        /// 插件启用状态由PluginManager统一管理
+        /// </summary>
+        public virtual void SavePluginSettings()
+        {
+            // 默认实现不做任何事情
+            // 子类可以重写此方法，将自身设置保存到配置文件中
+            LogHelper.WriteLogToFile($"插件 {Name} 设置已保存", LogHelper.LogType.Event);
+        }
+        
+        /// <summary>
+        /// 触发状态变更事件
+        /// </summary>
+        /// <param name="isEnabled">是否启用</param>
+        protected virtual void OnEnabledStateChanged(bool isEnabled)
+        {
+            EnabledStateChanged?.Invoke(this, isEnabled);
+        }
+    }
+} 
@@ -0,0 +1,276 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Ink_Canvas.Helpers.Plugins
+{
+    /// <summary>
+    /// 插件模板，用于开发者参考
+    /// 注意：实际开发时，请将此类移到单独的程序集中
+    /// </summary>
+    public class PluginTemplate : PluginBase
+    {
+        #region 插件基本信息
+
+        /// <summary>
+        /// 插件名称
+        /// </summary>
+        public override string Name => "插件模板";
+
+        /// <summary>
+        /// 插件描述
+        /// </summary>
+        public override string Description => "这是一个插件开发模板，用于开发者参考。";
+
+        /// <summary>
+        /// 插件版本
+        /// </summary>
+        public override Version Version => new Version(1, 0, 0);
+
+        /// <summary>
+        /// 插件作者
+        /// </summary>
+        public override string Author => "Your Name";
+
+        /// <summary>
+        /// 是否为内置插件（外部插件请返回false）
+        /// </summary>
+        public override bool IsBuiltIn => false;
+
+        #endregion
+
+        #region 插件生命周期
+
+        /// <summary>
+        /// 插件初始化
+        /// 在这里进行插件的初始化工作，如加载配置、注册事件等
+        /// </summary>
+        public override void Initialize()
+        {
+            // 先调用基类方法，这样会设置插件ID和记录日志
+            base.Initialize();
+            
+            // TODO: 在这里进行插件初始化工作
+            
+            // 示例：记录初始化信息
+            LogHelper.WriteLogToFile($"插件 {Name} 开始初始化", LogHelper.LogType.Info);
+            
+            // 示例：加载配置
+            LoadConfig();
+            
+            // 示例：注册自定义事件
+            // MainWindow.Instance.SomeEvent += OnSomeEvent;
+            
+            LogHelper.WriteLogToFile($"插件 {Name} 初始化完成", LogHelper.LogType.Info);
+        }
+
+        /// <summary>
+        /// 启用插件
+        /// 在这里激活插件功能
+        /// </summary>
+        public override void Enable()
+        {
+            // 先调用基类方法，这样会设置插件状态和记录日志
+            base.Enable();
+            
+            // TODO: 在这里启用插件功能
+            
+            LogHelper.WriteLogToFile($"插件 {Name} 已启用", LogHelper.LogType.Info);
+        }
+
+        /// <summary>
+        /// 禁用插件
+        /// 在这里停用插件功能
+        /// </summary>
+        public override void Disable()
+        {
+            // 先调用基类方法，这样会设置插件状态和记录日志
+            base.Disable();
+            
+            // TODO: 在这里禁用插件功能
+            
+            LogHelper.WriteLogToFile($"插件 {Name} 已禁用", LogHelper.LogType.Info);
+        }
+
+        /// <summary>
+        /// 清理资源
+        /// 在插件卸载时调用，清理资源
+        /// </summary>
+        public override void Cleanup()
+        {
+            // TODO: 在这里清理插件资源
+            
+            // 示例：取消注册事件
+            // MainWindow.Instance.SomeEvent -= OnSomeEvent;
+            
+            // 示例：保存配置
+            SaveConfig();
+            
+            // 最后调用基类方法
+            base.Cleanup();
+        }
+
+        #endregion
+
+        #region 插件配置
+
+        /// <summary>
+        /// 加载插件配置
+        /// </summary>
+        private void LoadConfig()
+        {
+            try
+            {
+                // TODO: 从文件或其他位置加载配置
+                // 示例：
+                // string configPath = Path.Combine(App.RootPath, "PluginConfigs", "YourPluginName.json");
+                // if (File.Exists(configPath))
+                // {
+                //     string json = File.ReadAllText(configPath);
+                //     YourConfig = Newtonsoft.Json.JsonConvert.DeserializeObject<YourConfigClass>(json);
+                // }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"加载插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 保存插件配置
+        /// </summary>
+        private void SaveConfig()
+        {
+            try
+            {
+                // TODO: 保存配置到文件或其他位置
+                // 示例：
+                // string configDir = Path.Combine(App.RootPath, "PluginConfigs");
+                // if (!Directory.Exists(configDir))
+                // {
+                //     Directory.CreateDirectory(configDir);
+                // }
+                // string configPath = Path.Combine(configDir, "YourPluginName.json");
+                // string json = Newtonsoft.Json.JsonConvert.SerializeObject(YourConfig, Newtonsoft.Json.Formatting.Indented);
+                // File.WriteAllText(configPath, json);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        #endregion
+
+        #region 插件设置界面
+
+        /// <summary>
+        /// 获取插件设置界面
+        /// </summary>
+        /// <returns>插件设置界面</returns>
+        public override UserControl GetSettingsView()
+        {
+            // 创建插件设置界面
+            return new PluginTemplateSettingsControl();
+        }
+
+        #endregion
+
+        #region 插件功能方法
+
+        // TODO: 在这里添加插件的具体功能方法
+
+        /// <summary>
+        /// 示例方法：执行一些功能
+        /// </summary>
+        public void DoSomething()
+        {
+            if (!IsEnabled) return;
+            
+            try
+            {
+                // TODO: 实现你的功能
+                MessageBox.Show("插件功能执行示例", "插件模板", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"执行插件功能时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// 插件设置控件
+    /// </summary>
+    public class PluginTemplateSettingsControl : UserControl
+    {
+        public PluginTemplateSettingsControl()
+        {
+            // 创建设置界面布局
+            var panel = new StackPanel
+            {
+                Margin = new Thickness(10)
+            };
+
+            // 添加标题
+            panel.Children.Add(new TextBlock
+            {
+                Text = "插件模板设置",
+                FontSize = 16,
+                FontWeight = FontWeights.Bold,
+                Margin = new Thickness(0, 0, 0, 10)
+            });
+
+            // 添加说明文字
+            panel.Children.Add(new TextBlock
+            {
+                Text = "这是一个示例设置界面，你可以在这里添加自己的设置控件。",
+                TextWrapping = TextWrapping.Wrap,
+                Margin = new Thickness(0, 0, 0, 15)
+            });
+
+            // 添加示例设置选项
+            var checkBox = new CheckBox
+            {
+                Content = "启用某项功能",
+                Margin = new Thickness(0, 0, 0, 10)
+            };
+            panel.Children.Add(checkBox);
+
+            // 添加文本输入框
+            panel.Children.Add(new TextBlock
+            {
+                Text = "设置项:",
+                Margin = new Thickness(0, 5, 0, 5)
+            });
+            
+            panel.Children.Add(new TextBox
+            {
+                Margin = new Thickness(0, 0, 0, 10),
+                Width = 200,
+                HorizontalAlignment = HorizontalAlignment.Left
+            });
+
+            // 添加按钮
+            var button = new Button
+            {
+                Content = "保存设置",
+                Padding = new Thickness(10, 5, 10, 5),
+                Margin = new Thickness(0, 10, 0, 0),
+                HorizontalAlignment = HorizontalAlignment.Left
+            };
+            
+            button.Click += (sender, e) => 
+            {
+                MessageBox.Show("设置已保存！", "插件模板", MessageBoxButton.OK, MessageBoxImage.Information);
+            };
+            
+            panel.Children.Add(button);
+
+            // 设置控件内容
+            this.Content = panel;
+        }
+    }
+} 
@@ -0,0 +1,51 @@
+using System.IO;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class StartupCount
+    {
+        private static readonly string CountFilePath = Path.Combine(App.RootPath, "startup-count");
+        private static readonly object fileLock = new object();
+
+        public static int GetCount()
+        {
+            try
+            {
+                if (File.Exists(CountFilePath))
+                {
+                    var text = File.ReadAllText(CountFilePath).Trim();
+                    if (int.TryParse(text, out int count))
+                        return count;
+                }
+            }
+            catch { }
+            return 0;
+        }
+
+        public static void Increment()
+        {
+            lock (fileLock)
+            {
+                int count = GetCount() + 1;
+                try
+                {
+                    File.WriteAllText(CountFilePath, count.ToString());
+                }
+                catch { }
+            }
+        }
+
+        public static void Reset()
+        {
+            lock (fileLock)
+            {
+                try
+                {
+                    if (File.Exists(CountFilePath))
+                        File.Delete(CountFilePath);
+                }
+                catch { }
+            }
+        }
+    }
+}
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Windows.Ink;
 using System.Windows.Input;
-using System.Windows.Media;
+using System.Windows; // Added for UIElement

 namespace Ink_Canvas.Helpers
 {
-    public class TimeMachine
+    public partial class TimeMachine
    {
        private readonly List<TimeMachineHistory> _currentStrokeHistory = new List<TimeMachineHistory>();

@@ -139,6 +139,7 @@ namespace Ink_Canvas.Helpers
        //这里说一下 Tuple的 Value1 是初始值 ; Value 2 是改变值
        public Dictionary<Stroke, Tuple<StylusPointCollection, StylusPointCollection>> StylusPointDictionary;
        public Dictionary<Stroke, Tuple<DrawingAttributes, DrawingAttributes>> DrawingAttributes;
+        public UIElement InsertedElement; // 新增
        public TimeMachineHistory(StrokeCollection currentStroke, TimeMachineHistoryType commitType, bool strokeHasBeenCleared)
        {
            CommitType = commitType;
@@ -163,6 +164,11 @@ namespace Ink_Canvas.Helpers
            StrokeHasBeenCleared = strokeHasBeenCleared;
            ReplacedStroke = replacedStroke;
        }
+        public TimeMachineHistory(UIElement element, TimeMachineHistoryType commitType) // 新增
+        {
+            CommitType = commitType;
+            InsertedElement = element;
+        }
    }

    public enum TimeMachineHistoryType
@@ -171,6 +177,21 @@ namespace Ink_Canvas.Helpers
        ShapeRecognition,
        Clear,
        Manipulation,
-        DrawingAttributes
+        DrawingAttributes,
+        ElementInsert // 新增
+    }
+
+    public partial class TimeMachine // 新增partial，便于扩展
+    {
+        public void CommitElementInsertHistory(UIElement element)
+        {
+            if (_currentIndex + 1 < _currentStrokeHistory.Count)
+            {
+                _currentStrokeHistory.RemoveRange(_currentIndex + 1, (_currentStrokeHistory.Count - 1) - _currentIndex);
+            }
+            _currentStrokeHistory.Add(new TimeMachineHistory(element, TimeMachineHistoryType.ElementInsert));
+            _currentIndex = _currentStrokeHistory.Count - 1;
+            NotifyUndoRedoState();
+        }
    }
 }
@@ -132,12 +132,18 @@
    <Reference Include="WindowsBase" />
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
    <Reference Include="WindowsFormsIntegration" />
  </ItemGroup>
  <ItemGroup>
    <None Include="app.manifest" />
  </ItemGroup>
  <ItemGroup>
+    <PackageReference Include="Costura.Fody" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.27" />
    <PackageReference Include="MdXaml" Version="1.27.0" />
@@ -0,0 +1,449 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyName>InkCanvasForClass</AssemblyName>
+    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <MSBuildProjectExtensionsPath>C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\</MSBuildProjectExtensionsPath>
+    <_TargetAssemblyProjectName>InkCanvasForClass</_TargetAssemblyProjectName>
+    <RootNamespace>Ink_Canvas</RootNamespace>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+  <PropertyGroup>
+    <RuntimeIdentifiers>win;win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Ink_Canvas</RootNamespace>
+    <TargetFramework>net472</TargetFramework>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>2.0.2.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>false</BootstrapperEnabled>
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+    <Configurations>Debug;Release;x86 Debug</Configurations>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>embedded</DebugType>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <Prefer32Bit>True</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <Prefer32Bit>True</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>embedded</DebugType>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <Prefer32Bit>True</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\icc.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>full</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|x86'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>full</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Title>InkCanvasForClass</Title>
+    <Version>5.0.4</Version>
+    <Authors>Dubi906w</Authors>
+    <Product>InkCanvasForClass</Product>
+    <Copyright>© Copyright HARKOTEK Studio 2024-now</Copyright>
+    <PackageProjectUrl>https://icc.bliemhax.com</PackageProjectUrl>
+    <FileVersion>bundled</FileVersion>
+    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>full</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|ARM64'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>full</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>full</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x86 Debug|x64'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>full</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <LangVersion>7.3</LangVersion>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.manifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.27" />
+    <PackageReference Include="MdXaml" Version="1.27.0" />
+    <PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1018" />
+    <PackageReference Include="MicrosoftOfficeCore" Version="15.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
+    <PackageReference Include="OSVersionExt" Version="3.0.0" />
+    <PackageReference Include="System.IO.Compression" Version="4.3.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="IWshRuntimeLibrary">
+      <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="stdole">
+      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="VBIDE">
+      <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>3</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TimerDownNotice.wav" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="MainWindow.xaml~RF6c3144.TMP" />
+    <None Remove="Resources\Cursors\Cursor.cur" />
+    <None Remove="Resources\Cursors\Pen.cur" />
+    <None Remove="Resources\DeveloperAvatars\aaaaaaccd.jpg" />
+    <None Remove="Resources\DeveloperAvatars\Alan-CRL.png" />
+    <None Remove="Resources\DeveloperAvatars\NetheriteBowl.png" />
+    <None Remove="Resources\DeveloperAvatars\NotYoojun.png" />
+    <None Remove="Resources\DeveloperAvatars\RaspberryKan.jpg" />
+    <None Remove="Resources\DeveloperAvatars\wwei.png" />
+    <None Remove="Resources\DeveloperAvatars\yuwenhui2020.png" />
+    <None Remove="Resources\icc.ico" />
+    <None Remove="Resources\Icons-png\AdmoxBooth.png" />
+    <None Remove="Resources\Icons-png\AdmoxWhiteboard.png" />
+    <None Remove="Resources\Icons-png\Donview.png" />
+    <None Remove="Resources\Icons-png\EasiNote3.png" />
+    <None Remove="Resources\Icons-png\HiteAnnotation.png" />
+    <None Remove="Resources\Icons-png\HiteLightBoard.png" />
+    <None Remove="Resources\Icons-png\ica.png" />
+    <None Remove="Resources\Icons-png\icc-transparent-dark-small.png" />
+    <None Remove="Resources\Icons-png\icc-transparent-dark.png" />
+    <None Remove="Resources\Icons-png\icc-transparent.png" />
+    <None Remove="Resources\Icons-png\icc.png" />
+    <None Remove="Resources\Icons-png\idt.png" />
+    <None Remove="Resources\Icons-png\InkCanvas.png" />
+    <None Remove="Resources\Icons-png\kuanciya.png" />
+    <None Remove="Resources\Icons-png\kuandogeyuanliangwo.png" />
+    <None Remove="Resources\Icons-png\kuandoujiyanhuaji.png" />
+    <None Remove="Resources\Icons-png\kuanneikuhuaji.png" />
+    <None Remove="Resources\Icons-png\kuanshounvhuaji.png" />
+    <None Remove="Resources\Icons-png\MaxHubWhiteboard.png" />
+    <None Remove="Resources\Icons-png\Seewo2Annotation.png" />
+    <None Remove="Resources\Icons-png\tiebahuaji.png" />
+    <None Remove="Resources\Icons-png\transparent-grid.png" />
+    <None Remove="Resources\Icons-png\VComYouJiao.png" />
+    <None Remove="Resources\Icons-png\WenXiang.png" />
+    <None Remove="Resources\Icons-png\YiYunVisualPresenter.png" />
+    <None Remove="Resources\Icons-png\YiYunWhiteboard.png" />
+    <None Remove="Resources\new-icons\chevron-left.png" />
+    <None Remove="Resources\new-icons\end-slides-show.png" />
+    <None Remove="Resources\new-icons\eye.png" />
+    <None Remove="Resources\new-icons\hand-move.png" />
+    <None Remove="Resources\new-icons\highlighter-white.png" />
+    <None Remove="Resources\new-icons\multi-touch.png" />
+    <None Remove="Resources\new-icons\osu-lazer-triangles.png" />
+    <None Remove="Resources\new-icons\pen-white.png" />
+    <None Remove="Resources\new-icons\rotate.png" />
+    <None Remove="Resources\new-icons\unfold-chevron.png" />
+    <None Remove="Resources\new-icons\zoom.png" />
+    <None Remove="Resources\PresentationExample\bottombar-dark.png" />
+    <None Remove="Resources\PresentationExample\bottombar-white.png" />
+    <None Remove="Resources\PresentationExample\page.jpg" />
+    <None Remove="Resources\PresentationExample\sidebar-dark.png" />
+    <None Remove="Resources\PresentationExample\sidebar-white.png" />
+    <None Remove="Resources\PresentationExample\toolbar.png" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\hardcodet.notifyicon.wpf\1.1.0\lib\net472\Hardcodet.NotifyIcon.Wpf.dll" />
+    <ReferencePath Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\IACore.dll" />
+    <ReferencePath Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\IALoader.dll" />
+    <ReferencePath Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\IAWinFX.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\avalonedit\6.3.0.90\lib\net462\ICSharpCode.AvalonEdit.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\inkore.ui.wpf.modern\0.9.27\lib\net452\iNKORE.UI.WPF.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\inkore.ui.wpf.modern\0.9.27\lib\net452\iNKORE.UI.WPF.Modern.Controls.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\inkore.ui.wpf.modern\0.9.27\lib\net452\iNKORE.UI.WPF.Modern.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mdxaml\1.27.0\lib\net462\MdXaml.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\mdxaml.plugins\1.27.0\lib\net462\MdXaml.Plugins.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\Microsoft.CSharp.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\microsoft.office.interop.powerpoint\15.0.4420.1018\lib\net20\Microsoft.Office.Interop.PowerPoint.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\Microsoft.VisualBasic.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\mscorlib.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\Facades\netstandard.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\newtonsoft.json\13.0.3\lib\net45\Newtonsoft.Json.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\nhotkey\3.0.0\lib\net462\NHotkey.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\nhotkey.wpf\3.0.0\lib\net462\NHotkey.Wpf.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\microsoftofficecore\15.0.0\lib\net35\Office.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\osversionext\3.0.0\lib\net462\OSVersionExt.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\PresentationFramework.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Data.DataSetExtensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Data.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Drawing.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.IO.Compression.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.IO.Compression.FileSystem.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Net.Http.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Runtime.Serialization.dll" />
+    <ReferencePath Include="C:\Users\Administrator\.nuget\packages\system.valuetuple\4.5.0\ref\net47\System.ValueTuple.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Windows.Controls.Ribbon.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Windows.Forms.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationClient.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationClientsideProviders.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationProvider.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationTypes.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\WindowsFormsIntegration.dll" />
+    <ReferencePath Include="C:\Windows\assembly\GAC\stdole\7.0.3300.0__b03f5f7f11d50a3a\stdole.dll">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </ReferencePath>
+    <ReferencePath Include="C:\Windows\assembly\GAC_MSIL\Microsoft.Vbe.Interop\15.0.0.0__71e9bce111e9429c\Microsoft.Vbe.Interop.dll">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </ReferencePath>
+    <ReferencePath Include="obj\Debug\net472\Interop.IWshRuntimeLibrary.dll">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </ReferencePath>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\MainWindow.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\Windows\RandWindow.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\App.g.cs" />
+    <Compile Include="C:\Users\Administrator\Desktop\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
+</Project>
@@ -1,7 +1,6 @@
 using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -9,7 +8,6 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;

 namespace Ink_Canvas {
    public partial class MainWindow : Window {
@@ -40,7 +38,7 @@ namespace Ink_Canvas {
            await FoldFloatingBar(sender);
        }

-        public async Task FoldFloatingBar(object sender)
+        public async Task FoldFloatingBar(object sender, bool isAutoFoldCommand = false)
        {
            var isShouldRejectAction = false;

@@ -84,13 +82,14 @@ namespace Ink_Canvas {
                CursorWithDelIcon_Click(sender, null);
            });

-            await Task.Delay(10);
+            await Task.Delay(300);

            await Dispatcher.InvokeAsync(() => {
                LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
                RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
                LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                GridForFloatingBarDraging.Visibility = Visibility.Collapsed;
                ViewboxFloatingBarMarginAnimation(-60);
                HideSubPanels("cursor");
                SidePannelMarginAnimation(-10);
@@ -217,6 +216,13 @@ namespace Ink_Canvas {
            await Task.Delay(0);

            await Dispatcher.InvokeAsync(() => {
+                // 根据设置决定是否自动切换至批注模式
+                if (Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode && currentMode == 0)
+                {
+                    // 切换至批注模式
+                    PenIcon_Click(null, null);
+                }
+                
                if (StackPanelPPTControls.Visibility == Visibility.Visible)
                {
                    var dops = Settings.PowerPointSettings.PPTButtonsDisplayOption.ToString();
@@ -1,6 +1,6 @@
-using IWshRuntimeLibrary;
-using System;
+using System;
 using System.Windows;
+using IWshRuntimeLibrary;

 namespace Ink_Canvas {
    public partial class MainWindow : Window {
@@ -1,17 +1,16 @@
 using Ink_Canvas.Helpers;
 using System;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media.Animation;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Xml.Linq;
 using System.Windows.Controls;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;

 namespace Ink_Canvas {
    public partial class MainWindow : Window {
@@ -23,6 +22,7 @@ namespace Ink_Canvas {
        private int WhiteboardTotalCount = 1;
        private TimeMachineHistory[][] TimeMachineHistories = new TimeMachineHistory[101][]; //最多99页，0用来存储非白板时的墨迹以便还原

+        // 保存每页白板图片信息
        private void SaveStrokes(bool isBackupMain = false) {
            if (isBackupMain) {
                var timeMachineHistory = timeMachine.ExportTimeMachineHistory();
@@ -32,6 +32,26 @@ namespace Ink_Canvas {
                var timeMachineHistory = timeMachine.ExportTimeMachineHistory();
                TimeMachineHistories[CurrentWhiteboardIndex] = timeMachineHistory;
                timeMachine.ClearStrokeHistory();
+                // 保存当前页图片信息
+                var elementInfos = new List<CanvasElementInfo>();
+                foreach (var child in inkCanvas.Children)
+                {
+                    if (child is Image img && img.Source is BitmapImage bmp)
+                    {
+                        elementInfos.Add(new CanvasElementInfo
+                        {
+                            Type = "Image",
+                            SourcePath = bmp.UriSource?.LocalPath ?? "",
+                            Left = InkCanvas.GetLeft(img),
+                            Top = InkCanvas.GetTop(img),
+                            Width = img.Width,
+                            Height = img.Height
+                        });
+                    }
+                }
+                var savePath = Settings.Automation.AutoSavedStrokesLocation;
+                if (!Directory.Exists(savePath)) Directory.CreateDirectory(savePath);
+                File.WriteAllText(System.IO.Path.Combine(savePath, $"elements_page{CurrentWhiteboardIndex}.json"), JsonConvert.SerializeObject(elementInfos, Formatting.Indented));
            }
        }

@@ -42,6 +62,7 @@ namespace Ink_Canvas {
            _currentCommitType = CommitReason.UserInput;
        }

+        // 恢复每页白板图片信息
        private void RestoreStrokes(bool isBackupMain = false) {
            try {
                if (TimeMachineHistories[CurrentWhiteboardIndex] == null) return; //防止白板打开后不居中
@@ -51,6 +72,29 @@ namespace Ink_Canvas {
                } else {
                    timeMachine.ImportTimeMachineHistory(TimeMachineHistories[CurrentWhiteboardIndex]);
                    foreach (var item in TimeMachineHistories[CurrentWhiteboardIndex]) ApplyHistoryToCanvas(item);
+                    // 恢复当前页图片信息
+                    inkCanvas.Children.Clear();
+                    var savePath = Settings.Automation.AutoSavedStrokesLocation;
+                    var elementsFile = System.IO.Path.Combine(savePath, $"elements_page{CurrentWhiteboardIndex}.json");
+                    if (File.Exists(elementsFile))
+                    {
+                        var elementInfos = JsonConvert.DeserializeObject<List<CanvasElementInfo>>(File.ReadAllText(elementsFile));
+                        foreach (var info in elementInfos)
+                        {
+                            if (info.Type == "Image" && File.Exists(info.SourcePath))
+                            {
+                                var img = new Image
+                                {
+                                    Source = new BitmapImage(new Uri(info.SourcePath)),
+                                    Width = info.Width,
+                                    Height = info.Height
+                                };
+                                InkCanvas.SetLeft(img, info.Left);
+                                InkCanvas.SetTop(img, info.Top);
+                                inkCanvas.Children.Add(img);
+                            }
+                        }
+                    }
                }
            }
            catch {
@@ -107,6 +151,7 @@ namespace Ink_Canvas {
            if (Settings.Automation.IsAutoSaveStrokesAtClear &&
                inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);
            if (CurrentWhiteboardIndex >= WhiteboardTotalCount) {
+                // 在最后一页时，点击“新页面”按钮直接新增一页
                BtnWhiteBoardAdd_Click(sender, e);
                return;
            }
@@ -166,64 +211,35 @@ namespace Ink_Canvas {
            TextBlockWhiteBoardIndexInfo.Text =
                $"{CurrentWhiteboardIndex}/{WhiteboardTotalCount}";

-            if (CurrentWhiteboardIndex == WhiteboardTotalCount) {
-                var newImageSource = new BitmapImage();
-                newImageSource.BeginInit();
-                newImageSource.UriSource = new Uri("/Resources/Icons-Fluent/ic_fluent_add_circle_24_regular.png",
-                    UriKind.RelativeOrAbsolute);
-                newImageSource.EndInit();
-                //BoardLeftPannelNextPage.Source = newImageSource;
-                //BoardRightPannelNextPage.Source = newImageSource;
-                //BoardRightPannelNextPageTextBlock.Text = "加页";
-                //BoardLeftPannelNextPageTextBlock.Text = "加页";
-            } else {
-                var newImageSource = new BitmapImage();
-                newImageSource.BeginInit();
-                newImageSource.UriSource =
-                    new Uri("/Resources/Icons-Fluent/ic_fluent_arrow_circle_right_24_regular.png",
-                        UriKind.RelativeOrAbsolute);
-                newImageSource.EndInit();
-                //BoardLeftPannelNextPage.Source = newImageSource;
-                //BoardRightPannelNextPage.Source = newImageSource;
-                //BoardRightPannelNextPageTextBlock.Text = "下一页";
-                //BoardLeftPannelNextPageTextBlock.Text = "下一页";
-            }
+            bool isLastPage = CurrentWhiteboardIndex == WhiteboardTotalCount;
+            bool isMaxPage = WhiteboardTotalCount >= 99;
+
+            // 设置按钮文本
+            BtnLeftWhiteBoardSwitchNextLabel.Text = isLastPage ? "新页面" : "下一页";
+            BtnRightWhiteBoardSwitchNextLabel.Text = isLastPage ? "新页面" : "下一页";
+
+            // 始终允许点击“下一页/新页面”按钮（除非已达最大页数）
+            BtnWhiteBoardSwitchNext.IsEnabled = !isMaxPage;
+
+            // 保持按钮常亮（高亮）
+            BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
+            BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
+            BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
+            BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;

            BtnWhiteBoardSwitchPrevious.IsEnabled = true;
-            BtnWhiteBoardSwitchNext.IsEnabled = true;

            if (CurrentWhiteboardIndex == 1) {
                BtnWhiteBoardSwitchPrevious.IsEnabled = false;
                BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
                BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
-                BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
-                BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
-
                BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
                BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
-                BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
-                BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
            } else {
                BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
                BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 1;
-
                BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
                BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 1;
-
-                if (CurrentWhiteboardIndex == WhiteboardTotalCount) {
-                    BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
-                    BtnLeftWhiteBoardSwitchNextLabel.Opacity = 0.5;
-
-                    BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
-                    BtnRightWhiteBoardSwitchNextLabel.Opacity = 0.5;
-                    BtnWhiteBoardSwitchNext.IsEnabled = false;
-                } else {
-                    BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
-                    BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
-
-                    BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
-                    BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
-                }
            }

            BtnWhiteBoardDelete.IsEnabled = WhiteboardTotalCount != 1;
@@ -1,86 +1,698 @@
 using Ink_Canvas.Helpers;
+using System;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
+using System.Windows.Media;

 namespace Ink_Canvas {
    public partial class MainWindow : Window {
        private void BoardChangeBackgroundColorBtn_MouseUp(object sender, RoutedEventArgs e) {
            if (!isLoaded) return;
+
+            // 创建背景选项面板（如果不存在）
+            if (BackgroundPalette == null)
+            {
+                CreateBackgroundPalette();
+            }
+
+            // 显示或隐藏背景选项面板
+            if (BackgroundPalette != null)
+            {
+                if (BackgroundPalette.Visibility == Visibility.Visible)
+                {
+                    // 如果面板已经显示，则隐藏它
+                    AnimationsHelper.HideWithSlideAndFade(BackgroundPalette);
+                }
+                else
+                {
+                    // 隐藏其他可能显示的面板
+                    AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                    AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                    AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                    AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                    AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                    AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                    AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
+
+                    // 显示背景选项面板
+                    AnimationsHelper.ShowWithSlideFromBottomAndFade(BackgroundPalette);
+                }
+                return;
+            }
+
+            // 原有的背景切换代码
            Settings.Canvas.UsingWhiteboard = !Settings.Canvas.UsingWhiteboard;
            SaveSettingsToFile();
            if (Settings.Canvas.UsingWhiteboard) {
                if (inkColor == 5) lastBoardInkColor = 0;
                ICCWaterMarkDark.Visibility = Visibility.Visible;
                ICCWaterMarkWhite.Visibility = Visibility.Collapsed;
+                
+                // 设置为白板默认背景色
+                Color defaultWhiteboardColor = Color.FromRgb(234, 235, 237);
+                
+                if (currentMode == 1) // 白板模式
+                {
+                    // 设置背景为默认白板背景色
+                    GridBackgroundCover.Background = new SolidColorBrush(defaultWhiteboardColor);
+                    
+                    // 更新RGB滑块的值为默认白板背景色
+                    if (BackgroundPalette != null && BackgroundPalette.Visibility == Visibility.Visible)
+                    {
+                        UpdateRGBSliders(defaultWhiteboardColor);
+                    }
+                    
+                    // 更新自定义背景色为默认白板背景色
+                    CustomBackgroundColor = defaultWhiteboardColor;
+                    
+                    // 保存到设置
+                    string colorHex = $"#{defaultWhiteboardColor.R:X2}{defaultWhiteboardColor.G:X2}{defaultWhiteboardColor.B:X2}";
+                    Settings.Canvas.CustomBackgroundColor = colorHex;
+                    SaveSettingsToFile();
+                }
+                
+                // 设置墨迹颜色为黑色
+                CheckLastColor(0);
+                forceEraser = false;
            }
            else {
                if (inkColor == 0) lastBoardInkColor = 5;
                ICCWaterMarkWhite.Visibility = Visibility.Visible;
                ICCWaterMarkDark.Visibility = Visibility.Collapsed;
+                
+                // 设置为黑板默认背景色
+                Color defaultBlackboardColor = Color.FromRgb(22, 41, 36);
+                
+                if (currentMode == 1) // 黑板模式
+                {
+                    // 设置背景为默认黑板背景色
+                    GridBackgroundCover.Background = new SolidColorBrush(defaultBlackboardColor);
+                    
+                    // 更新RGB滑块的值为默认黑板背景色
+                    if (BackgroundPalette != null && BackgroundPalette.Visibility == Visibility.Visible)
+                    {
+                        UpdateRGBSliders(defaultBlackboardColor);
+                    }
+                    
+                    // 更新自定义背景色为默认黑板背景色
+                    CustomBackgroundColor = defaultBlackboardColor;
+                    
+                    // 保存到设置
+                    string colorHex = $"#{defaultBlackboardColor.R:X2}{defaultBlackboardColor.G:X2}{defaultBlackboardColor.B:X2}";
+                    Settings.Canvas.CustomBackgroundColor = colorHex;
+                    SaveSettingsToFile();
+                }
+                
+                // 设置墨迹颜色为白色
+                CheckLastColor(5);
+                forceEraser = false;
            }

            CheckColorTheme(true);
        }

-        private void BoardEraserIcon_Click(object sender, RoutedEventArgs e) {
-            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint ||
-                inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke) {
-                if (BoardEraserSizePanel.Visibility == Visibility.Collapsed) {
-                    AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardEraserSizePanel);
-                } else {
-                    AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
-                }
-            } else {
-                forceEraser = true;
-                forcePointEraser = true;
-                double k = 1;
-                if (Settings.Canvas.EraserShapeType == 0) {
-                    switch (BoardComboBoxEraserSize.SelectedIndex)
-                    {
-                        case 0:
-                            k = 0.5;
-                            break;
-                        case 1:
-                            k = 0.8;
-                            break;
-                        case 3:
-                            k = 1.25;
-                            break;
-                        case 4:
-                            k = 1.8;
-                            break;
-                    }
-                    inkCanvas.EraserShape = new EllipseStylusShape(k * 90, k * 90);
-                } else if (Settings.Canvas.EraserShapeType == 1) {
-                    switch (BoardComboBoxEraserSize.SelectedIndex)
-                    {
-                        case 0:
-                            k = 0.7;
-                            break;
-                        case 1:
-                            k = 0.9;
-                            break;
-                        case 3:
-                            k = 1.2;
-                            break;
-                        case 4:
-                            k = 1.6;
-                            break;
-                    }
-                    inkCanvas.EraserShape = new RectangleStylusShape(k * 90 * 0.6, k * 90);
-                }
-                inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
-                drawingShapeMode = 0;
+        // 创建背景选项面板
+        private void CreateBackgroundPalette()
+        {
+            // 确保加载自定义背景色
+            LoadCustomBackgroundColor();
+            
+            // 创建一个类似于PenPalette的面板
+            BackgroundPalette = new Border
+            {
+                Name = "BackgroundPalette",
+                Visibility = Visibility.Collapsed,
+                Background = new SolidColorBrush(Colors.White),
+                Opacity = 1,
+                BorderBrush = new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)),
+                BorderThickness = new Thickness(1),
+                CornerRadius = new CornerRadius(8),
+                Width = 300,
+                MaxHeight = 400
+            };
+            
+            // 确保面板显示在顶层
+            System.Windows.Controls.Panel.SetZIndex(BackgroundPalette, 1000);

-                inkCanvas_EditingModeChanged(inkCanvas, null);
-                CancelSingleFingerDragMode();
+            // 创建面板内容
+            var stackPanel = new StackPanel();

-                HideSubPanels("eraser");
+            // 创建标题栏
+            var titleBorder = new Border
+            {
+                BorderBrush = new SolidColorBrush(Color.FromRgb(0x1e, 0x3a, 0x8a)),
+                Height = 32,
+                BorderThickness = new Thickness(0, 0, 0, 1),
+                CornerRadius = new CornerRadius(8, 8, 0, 0),
+                Background = new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)),
+                Margin = new Thickness(-1, -1, -1, 0),
+                Padding = new Thickness(1, 1, 1, 0)
+            };
+
+            var titleCanvas = new System.Windows.Controls.Canvas { Height = 24, ClipToBounds = true };
+            var titleText = new TextBlock
+            {
+                Text = "背景设置",
+                Foreground = new SolidColorBrush(Colors.White),
+                Padding = new Thickness(0, 5, 0, 0),
+                FontSize = 11,
+                FontWeight = FontWeights.Bold,
+                TextAlignment = TextAlignment.Center
+            };
+            System.Windows.Controls.Canvas.SetLeft(titleText, 8);
+            titleCanvas.Children.Add(titleText);
+
+            // 关闭按钮
+            var closeImage = new System.Windows.Controls.Image
+            {
+                Source = new System.Windows.Media.Imaging.BitmapImage(new Uri("/Resources/new-icons/close-white.png", UriKind.Relative)),
+                Height = 16,
+                Width = 16
+            };
+            RenderOptions.SetBitmapScalingMode(closeImage, BitmapScalingMode.HighQuality);
+            closeImage.MouseUp += CloseBordertools_MouseUp;
+            System.Windows.Controls.Canvas.SetRight(closeImage, 8);
+            System.Windows.Controls.Canvas.SetTop(closeImage, 4);
+            titleCanvas.Children.Add(closeImage);
+
+            titleBorder.Child = titleCanvas;
+            stackPanel.Children.Add(titleBorder);
+
+            // 创建背景选项内容区域
+            var contentPanel = new StackPanel { Margin = new Thickness(8) };
+
+            // 黑板/白板选择
+            var modeTitle = new TextBlock
+            {
+                Text = "白板模式",
+                Foreground = new SolidColorBrush(Color.FromRgb(0x17, 0x25, 0x54)),
+                FontSize = 10,
+                FontWeight = FontWeights.Bold,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 4, 0, 8)
+            };
+            contentPanel.Children.Add(modeTitle);
+
+            var modePanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center };
+            
+            // 白板按钮
+            var whiteboardButton = new Border
+            {
+                Width = 60,
+                Height = 30,
+                Background = Settings.Canvas.UsingWhiteboard ? new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) : new SolidColorBrush(Colors.LightGray),
+                CornerRadius = new CornerRadius(4),
+                Margin = new Thickness(0, 0, 8, 0)
+            };
+            var whiteboardText = new TextBlock
+            {
+                Text = "白板",
+                Foreground = Settings.Canvas.UsingWhiteboard ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Colors.Black),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            whiteboardButton.Child = whiteboardText;
+            whiteboardButton.MouseUp += (s, args) => {
+                Settings.Canvas.UsingWhiteboard = true;
+                SaveSettingsToFile();
+                ICCWaterMarkDark.Visibility = Visibility.Visible;
+                ICCWaterMarkWhite.Visibility = Visibility.Collapsed;
+                
+                // 设置为白板默认背景色
+                Color defaultWhiteboardColor = Color.FromRgb(234, 235, 237);
+                
+                if (currentMode == 1) // 白板模式
+                {
+                    // 设置背景为默认白板背景色
+                    GridBackgroundCover.Background = new SolidColorBrush(defaultWhiteboardColor);
+                    
+                    // 更新RGB滑块的值为默认白板背景色
+                    UpdateRGBSliders(defaultWhiteboardColor);
+                    
+                    // 更新自定义背景色为默认白板背景色
+                    CustomBackgroundColor = defaultWhiteboardColor;
+                    
+                    // 保存到设置
+                    string colorHex = $"#{defaultWhiteboardColor.R:X2}{defaultWhiteboardColor.G:X2}{defaultWhiteboardColor.B:X2}";
+                    Settings.Canvas.CustomBackgroundColor = colorHex;
+                    SaveSettingsToFile();
+                }
+                
+                // 设置墨迹颜色为黑色
+                CheckLastColor(0);
+                forceEraser = false;
+                
+                CheckColorTheme(true);
+                UpdateBackgroundButtonsState();
+            };
+            modePanel.Children.Add(whiteboardButton);
+            
+            // 黑板按钮
+            var blackboardButton = new Border
+            {
+                Width = 60,
+                Height = 30,
+                Background = !Settings.Canvas.UsingWhiteboard ? new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) : new SolidColorBrush(Colors.LightGray),
+                CornerRadius = new CornerRadius(4)
+            };
+            var blackboardText = new TextBlock
+            {
+                Text = "黑板",
+                Foreground = !Settings.Canvas.UsingWhiteboard ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Colors.Black),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            blackboardButton.Child = blackboardText;
+            blackboardButton.MouseUp += (s, args) => {
+                Settings.Canvas.UsingWhiteboard = false;
+                SaveSettingsToFile();
+                ICCWaterMarkWhite.Visibility = Visibility.Visible;
+                ICCWaterMarkDark.Visibility = Visibility.Collapsed;
+                
+                // 设置为黑板默认背景色
+                Color defaultBlackboardColor = Color.FromRgb(22, 41, 36);
+                
+                if (currentMode == 1) // 黑板模式
+                {
+                    // 设置背景为默认黑板背景色
+                    GridBackgroundCover.Background = new SolidColorBrush(defaultBlackboardColor);
+                    
+                    // 更新RGB滑块的值为默认黑板背景色
+                    UpdateRGBSliders(defaultBlackboardColor);
+                    
+                    // 更新自定义背景色为默认黑板背景色
+                    CustomBackgroundColor = defaultBlackboardColor;
+                    
+                    // 保存到设置
+                    string colorHex = $"#{defaultBlackboardColor.R:X2}{defaultBlackboardColor.G:X2}{defaultBlackboardColor.B:X2}";
+                    Settings.Canvas.CustomBackgroundColor = colorHex;
+                    SaveSettingsToFile();
+                }
+                
+                // 设置墨迹颜色为白色
+                CheckLastColor(5);
+                forceEraser = false;
+                
+                CheckColorTheme(true);
+                UpdateBackgroundButtonsState();
+            };
+            modePanel.Children.Add(blackboardButton);
+
+            contentPanel.Children.Add(modePanel);
+            
+             // 添加一条分隔线
+             var separator = new Border
+             {
+                 Height = 1,
+                 Background = new SolidColorBrush(Color.FromRgb(0xd4, 0xd4, 0xd8)),
+                 Margin = new Thickness(0, 12, 0, 12)
+             };
+             contentPanel.Children.Add(separator);
+             
+             // 添加RGB颜色选择器部分
+             var colorTitle = new TextBlock
+             {
+                 Text = "背景颜色",
+                 Foreground = new SolidColorBrush(Color.FromRgb(0x17, 0x25, 0x54)),
+                 FontSize = 10,
+                 FontWeight = FontWeights.Bold,
+                 HorizontalAlignment = HorizontalAlignment.Center,
+                 Margin = new Thickness(0, 4, 0, 8)
+             };
+             contentPanel.Children.Add(colorTitle);
+             
+             // 创建颜色预览
+             Border colorPreview = new Border
+             {
+                 Width = 100,
+                 Height = 40,
+                 BorderThickness = new Thickness(1),
+                 BorderBrush = new SolidColorBrush(Color.FromRgb(0xd4, 0xd4, 0xd8)),
+                 Background = new SolidColorBrush(Colors.White),
+                 CornerRadius = new CornerRadius(4),
+                 Margin = new Thickness(0, 0, 0, 10),
+                 HorizontalAlignment = HorizontalAlignment.Center
+             };
+             contentPanel.Children.Add(colorPreview);
+             
+             // 获取当前背景颜色
+             Color currentBackgroundColor;
+             if (currentMode == 1) // 白板或黑板模式
+             {
+                 if (GridBackgroundCover.Background is SolidColorBrush brush)
+                 {
+                     currentBackgroundColor = brush.Color;
+                 }
+                 else
+                 {
+                     // 默认颜色
+                     currentBackgroundColor = Settings.Canvas.UsingWhiteboard ? 
+                         Color.FromRgb(234, 235, 237) : // 白板默认颜色
+                         Color.FromRgb(22, 41, 36);    // 黑板默认颜色
+                 }
+             }
+             else
+             {
+                 // 默认白色
+                 currentBackgroundColor = Colors.White;
+             }
+             
+             // 更新颜色预览
+             colorPreview.Background = new SolidColorBrush(currentBackgroundColor);
+             
+             // 先创建所有滑块控件
+             // R滑块和文本框
+             var rPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
+             var rLabel = new TextBlock { Text = "R:", Width = 20, VerticalAlignment = VerticalAlignment.Center };
+             var rSlider = new System.Windows.Controls.Slider 
+             { 
+                 Minimum = 0, 
+                 Maximum = 255, 
+                 Value = currentBackgroundColor.R, 
+                 Width = 150,
+                 Margin = new Thickness(5, 0, 5, 0),
+                 VerticalAlignment = VerticalAlignment.Center
+             };
+             var rValueText = new TextBlock 
+             { 
+                 Text = currentBackgroundColor.R.ToString(), 
+                 Width = 30, 
+                 VerticalAlignment = VerticalAlignment.Center,
+                 TextAlignment = TextAlignment.Right
+             };
+             
+             // G滑块和文本框
+             var gPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
+             var gLabel = new TextBlock { Text = "G:", Width = 20, VerticalAlignment = VerticalAlignment.Center };
+             var gSlider = new System.Windows.Controls.Slider 
+             { 
+                 Minimum = 0, 
+                 Maximum = 255, 
+                 Value = currentBackgroundColor.G, 
+                 Width = 150,
+                 Margin = new Thickness(5, 0, 5, 0),
+                 VerticalAlignment = VerticalAlignment.Center
+             };
+             var gValueText = new TextBlock 
+             { 
+                 Text = currentBackgroundColor.G.ToString(), 
+                 Width = 30, 
+                 VerticalAlignment = VerticalAlignment.Center,
+                 TextAlignment = TextAlignment.Right
+             };
+             
+             // B滑块和文本框
+             var bPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
+             var bLabel = new TextBlock { Text = "B:", Width = 20, VerticalAlignment = VerticalAlignment.Center };
+             var bSlider = new System.Windows.Controls.Slider 
+             { 
+                 Minimum = 0, 
+                 Maximum = 255, 
+                 Value = currentBackgroundColor.B, 
+                 Width = 150,
+                 Margin = new Thickness(5, 0, 5, 0),
+                 VerticalAlignment = VerticalAlignment.Center
+             };
+             var bValueText = new TextBlock 
+             { 
+                 Text = currentBackgroundColor.B.ToString(), 
+                 Width = 30, 
+                 VerticalAlignment = VerticalAlignment.Center,
+                 TextAlignment = TextAlignment.Right
+             };
+             
+             // 现在添加事件处理程序
+             rSlider.ValueChanged += (s, e) => {
+                 int value = (int)e.NewValue;
+                 rValueText.Text = value.ToString();
+                 UpdateColorPreview(colorPreview, rSlider, gSlider, bSlider);
+             };
+             
+             gSlider.ValueChanged += (s, e) => {
+                 int value = (int)e.NewValue;
+                 gValueText.Text = value.ToString();
+                 UpdateColorPreview(colorPreview, rSlider, gSlider, bSlider);
+             };
+             
+             bSlider.ValueChanged += (s, e) => {
+                 int value = (int)e.NewValue;
+                 bValueText.Text = value.ToString();
+                 UpdateColorPreview(colorPreview, rSlider, gSlider, bSlider);
+             };
+             
+             // 添加控件到面板
+             rPanel.Children.Add(rLabel);
+             rPanel.Children.Add(rSlider);
+             rPanel.Children.Add(rValueText);
+             contentPanel.Children.Add(rPanel);
+             
+             gPanel.Children.Add(gLabel);
+             gPanel.Children.Add(gSlider);
+             gPanel.Children.Add(gValueText);
+             contentPanel.Children.Add(gPanel);
+             
+             bPanel.Children.Add(bLabel);
+             bPanel.Children.Add(bSlider);
+             bPanel.Children.Add(bValueText);
+             contentPanel.Children.Add(bPanel);
+             
+             // 应用按钮
+             var applyButton = new Button
+             {
+                 Content = "应用颜色",
+                 Margin = new Thickness(0, 10, 0, 0),
+                 Padding = new Thickness(10, 5, 10, 5),
+                 Background = new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)),
+                 Foreground = new SolidColorBrush(Colors.White),
+                 BorderThickness = new Thickness(0),
+                 HorizontalAlignment = HorizontalAlignment.Center
+             };
+             
+             applyButton.Click += (s, e) => {
+                 Color selectedColor = Color.FromRgb(
+                     (byte)rSlider.Value,
+                     (byte)gSlider.Value,
+                     (byte)bSlider.Value
+                 );
+                 ApplyCustomBackgroundColor(selectedColor);
+             };
+             
+             contentPanel.Children.Add(applyButton);
+
+            stackPanel.Children.Add(contentPanel);
+
+             // 将面板添加到父容器
+             BackgroundPalette.Child = stackPanel;
+             
+             // 获取主窗口中的根网格，确保面板添加到顶层
+             Grid mainGrid = FindName("Main_Grid") as Grid;
+             if (mainGrid != null)
+             {
+                 // 删除可能已存在的BackgroundPalette
+                 foreach (UIElement element in mainGrid.Children)
+                 {
+                     if (element is Border border && border.Name == "BackgroundPalette")
+                     {
+                         mainGrid.Children.Remove(border);
+                         break;
+                     }
+                 }
+                 
+                 // 重新定位面板
+                 BackgroundPalette.HorizontalAlignment = HorizontalAlignment.Center;
+                 BackgroundPalette.VerticalAlignment = VerticalAlignment.Center;
+                 BackgroundPalette.Margin = new Thickness(0, 0, 0, 0);
+                 
+                 // 添加到主网格
+                 mainGrid.Children.Add(BackgroundPalette);
+                 
+                 // 设置面板位置
+                 var clickElement = FindName("BoardChangeBackgroundColorBtn") as FrameworkElement;
+                 if (clickElement != null)
+                 {
+                     Point position = clickElement.TranslatePoint(new Point(0, 0), mainGrid);
+                     BackgroundPalette.Margin = new Thickness(
+                         position.X - 150, 
+                         position.Y + clickElement.ActualHeight + 5, 
+                         0, 0);
+                     BackgroundPalette.HorizontalAlignment = HorizontalAlignment.Left;
+                     BackgroundPalette.VerticalAlignment = VerticalAlignment.Top;
+                 }
+             }
+        }
+        
+        // 更新背景按钮状态
+        private void UpdateBackgroundButtonsState()
+        {
+            if (BackgroundPalette != null && BackgroundPalette.Child is StackPanel stackPanel)
+            {
+                if (stackPanel.Children.Count > 1 && stackPanel.Children[1] is StackPanel contentPanel)
+                {
+                    if (contentPanel.Children.Count > 1 && contentPanel.Children[1] is StackPanel modePanel)
+                    {
+                        if (modePanel.Children.Count > 1)
+                        {
+                            var whiteboardButton = modePanel.Children[0] as Border;
+                            var blackboardButton = modePanel.Children[1] as Border;
+                            
+                            if (whiteboardButton != null && whiteboardButton.Child is TextBlock whiteboardText)
+                            {
+                                whiteboardButton.Background = Settings.Canvas.UsingWhiteboard ? 
+                                    new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) : 
+                                    new SolidColorBrush(Colors.LightGray);
+                                whiteboardText.Foreground = Settings.Canvas.UsingWhiteboard ?
+                                    new SolidColorBrush(Colors.White) :
+                                    new SolidColorBrush(Colors.Black);
+                            }
+                            
+                            if (blackboardButton != null && blackboardButton.Child is TextBlock blackboardText)
+                            {
+                                blackboardButton.Background = !Settings.Canvas.UsingWhiteboard ?
+                                    new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) :
+                                    new SolidColorBrush(Colors.LightGray);
+                                blackboardText.Foreground = !Settings.Canvas.UsingWhiteboard ?
+                                    new SolidColorBrush(Colors.White) :
+                                    new SolidColorBrush(Colors.Black);
+                            }
+                        }
+                    }
+                }
            }
        }
+        
+                 // 添加成员变量保存背景面板引用
+         private Border BackgroundPalette { get; set; }
+         
+         // 添加成员变量保存当前自定义背景色
+         private Color? CustomBackgroundColor { get; set; }
+         
+         /// <summary>
+         /// 更新颜色预览框的颜色
+         /// </summary>
+         private void UpdateColorPreview(Border colorPreview, System.Windows.Controls.Slider rSlider, System.Windows.Controls.Slider gSlider, System.Windows.Controls.Slider bSlider)
+         {
+             Color previewColor = Color.FromRgb(
+                 (byte)rSlider.Value,
+                 (byte)gSlider.Value,
+                 (byte)bSlider.Value
+             );
+             colorPreview.Background = new SolidColorBrush(previewColor);
+         }
+         
+         /// <summary>
+         /// 应用自定义背景颜色
+         /// </summary>
+         private void ApplyCustomBackgroundColor(Color color)
+         {
+             // 保存当前选择的颜色
+             CustomBackgroundColor = color;
+             
+             // 将颜色转换为十六进制字符串并保存到设置中
+             string colorHex = $"#{color.R:X2}{color.G:X2}{color.B:X2}";
+             Settings.Canvas.CustomBackgroundColor = colorHex;
+             
+             // 只在白板或黑板模式下应用自定义背景色
+             if (currentMode == 1) // 白板或黑板模式
+             {
+                 // 设置白板/黑板模式下的背景
+                 GridBackgroundCover.Background = new SolidColorBrush(color);
+             }
+             
+             // 保存设置
+             SaveSettingsToFile();
+             
+             // 立即更新界面
+             if (BackgroundPalette != null)
+             {
+                 UpdateBackgroundButtonsState();
+                 UpdateRGBSliders(color); // 更新RGB滑块的值
+             }
+             
+             // 显示提示信息
+             ShowNotification($"已应用自定义背景色: {colorHex}");
+         }
+
+        /// <summary>
+        /// 从设置中加载自定义背景色
+        /// </summary>
+        private void LoadCustomBackgroundColor()
+        {
+            if (!string.IsNullOrEmpty(Settings.Canvas.CustomBackgroundColor))
+            {
+                try
+                {
+                    // 解析颜色字符串
+                    string colorHex = Settings.Canvas.CustomBackgroundColor;
+                    if (colorHex.StartsWith("#") && colorHex.Length == 7) // #RRGGBB 格式
+                    {
+                        byte r = Convert.ToByte(colorHex.Substring(1, 2), 16);
+                        byte g = Convert.ToByte(colorHex.Substring(3, 2), 16);
+                        byte b = Convert.ToByte(colorHex.Substring(5, 2), 16);
+                        
+                        // 保存到内存中
+                        CustomBackgroundColor = Color.FromRgb(r, g, b);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // 解析失败，根据当前模式设置默认颜色
+                    if (!Settings.Canvas.UsingWhiteboard)
+                    {
+                        // 黑板模式默认颜色
+                        CustomBackgroundColor = Color.FromRgb(22, 41, 36);
+                    }
+                    else
+                    {
+                        // 白板模式默认颜色
+                        CustomBackgroundColor = Color.FromRgb(234, 235, 237);
+                    }
+                    
+                    // 可以在这里记录日志
+                    Console.WriteLine($"解析自定义背景色失败: {ex.Message}");
+                }
+            }
+            else
+            {
+                // 如果没有设置自定义背景色，根据当前模式设置默认颜色
+                if (!Settings.Canvas.UsingWhiteboard)
+                {
+                    // 黑板模式默认颜色
+                    CustomBackgroundColor = Color.FromRgb(22, 41, 36);
+                }
+                else
+                {
+                    // 白板模式默认颜色
+                    CustomBackgroundColor = Color.FromRgb(234, 235, 237);
+                }
+            }
+            
+            // 只在白板或黑板模式下应用自定义背景色
+            if (currentMode == 1 && CustomBackgroundColor.HasValue) // 白板或黑板模式
+            {
+                // 设置白板/黑板模式下的背景
+                GridBackgroundCover.Background = new SolidColorBrush(CustomBackgroundColor.Value);
+                
+                // 更新RGB滑块的值（如果调色板已经创建）
+                if (BackgroundPalette != null && BackgroundPalette.Visibility == Visibility.Visible)
+                {
+                    UpdateRGBSliders(CustomBackgroundColor.Value);
+                }
+            }
+        }
+
+        private void BoardLassoIcon_Click(object sender, RoutedEventArgs e) {
+            forceEraser = false;
+            forcePointEraser = false;
+            drawingShapeMode = 0;
+            inkCanvas.EditingMode = InkCanvasEditingMode.Select;
+            SetCursorBasedOnEditingMode(inkCanvas);
+        }

        private void BoardEraserIconByStrokes_Click(object sender, RoutedEventArgs e) {
            //if (BoardEraserByStrokes.Background.ToString() == "#FF679CF4") {
@@ -122,5 +734,59 @@ namespace Ink_Canvas {
            ImageBlackboard_MouseUp(null, null);
            Process.Start("https://www.desmos.com/calculator?lang=zh-CN");
        }
+
+        /// <summary>
+        /// 根据当前背景颜色更新RGB滑块的值
+        /// </summary>
+        private void UpdateRGBSliders(Color color)
+        {
+            if (BackgroundPalette != null && BackgroundPalette.Child is StackPanel stackPanel)
+            {
+                if (stackPanel.Children.Count > 1 && stackPanel.Children[1] is StackPanel contentPanel)
+                {
+                    // 查找RGB滑块
+                    System.Windows.Controls.Slider rSlider = null;
+                    System.Windows.Controls.Slider gSlider = null;
+                    System.Windows.Controls.Slider bSlider = null;
+                    
+                    // 遍历面板查找RGB滑块
+                    foreach (var child in contentPanel.Children)
+                    {
+                        if (child is StackPanel panel && panel.Orientation == Orientation.Horizontal)
+                        {
+                            foreach (var panelChild in panel.Children)
+                            {
+                                if (panelChild is System.Windows.Controls.Slider slider)
+                                {
+                                    if (panel.Children.Count > 0 && panel.Children[0] is TextBlock label)
+                                    {
+                                        if (label.Text == "R:")
+                                        {
+                                            rSlider = slider;
+                                        }
+                                        else if (label.Text == "G:")
+                                        {
+                                            gSlider = slider;
+                                        }
+                                        else if (label.Text == "B:")
+                                        {
+                                            bSlider = slider;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    
+                    // 更新滑块值
+                    if (rSlider != null && gSlider != null && bSlider != null)
+                    {
+                        rSlider.Value = color.R;
+                        gSlider.Value = color.G;
+                        bSlider.Value = color.B;
+                    }
+                }
+            }
+        }
    }
 }
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows.Ink;
@@ -54,7 +53,6 @@ namespace Ink_Canvas {
                drawingShapeMode = 0;
                inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                CancelSingleFingerDragMode();
-                forceEraser = false;
                CheckColorTheme();
            }

@@ -70,14 +68,24 @@ namespace Ink_Canvas {
            if (changeColorTheme)
                if (currentMode != 0) {
                    if (Settings.Canvas.UsingWhiteboard) {
-                        GridBackgroundCover.Background = new SolidColorBrush(Color.FromRgb(234, 235, 237));
+                        // 检查是否有自定义背景色，如果有则使用自定义背景色
+                        if (CustomBackgroundColor.HasValue) {
+                            GridBackgroundCover.Background = new SolidColorBrush(CustomBackgroundColor.Value);
+                        } else {
+                            GridBackgroundCover.Background = new SolidColorBrush(Color.FromRgb(234, 235, 237));
+                        }
                        WaterMarkTime.Foreground = new SolidColorBrush(Color.FromRgb(22, 41, 36));
                        WaterMarkDate.Foreground = new SolidColorBrush(Color.FromRgb(22, 41, 36));
                        BlackBoardWaterMark.Foreground = new SolidColorBrush(Color.FromRgb(22, 41, 36));
                        isUselightThemeColor = false;
                    }
                    else {
-                        GridBackgroundCover.Background = new SolidColorBrush(Color.FromRgb(22, 41, 36));
+                        // 黑板模式下，检查是否有自定义背景色
+                        if (CustomBackgroundColor.HasValue) {
+                            GridBackgroundCover.Background = new SolidColorBrush(CustomBackgroundColor.Value);
+                        } else {
+                            GridBackgroundCover.Background = new SolidColorBrush(Color.FromRgb(22, 41, 36));
+                        }
                        WaterMarkTime.Foreground = new SolidColorBrush(Color.FromRgb(234, 235, 237));
                        WaterMarkDate.Foreground = new SolidColorBrush(Color.FromRgb(234, 235, 237));
                        BlackBoardWaterMark.Foreground = new SolidColorBrush(Color.FromRgb(234, 235, 237));
@@ -543,62 +551,52 @@ namespace Ink_Canvas {

        private void BtnColorBlack_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(0);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnColorRed_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(1);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnColorGreen_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(2);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnColorBlue_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(3);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnColorYellow_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(4);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnColorWhite_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(5);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnColorPink_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(6);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnColorOrange_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(8);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnColorTeal_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(7);
-            forceEraser = false;
            ColorSwitchCheck();
        }

        private void BtnHighlighterColorBlack_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(100, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -606,7 +604,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorWhite_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(101, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -614,7 +611,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorRed_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(102, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -622,7 +618,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorYellow_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(103, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -630,7 +625,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorGreen_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(104, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -638,7 +632,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorZinc_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(105, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -646,7 +639,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorBlue_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(106, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -654,7 +646,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorPurple_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(107, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -662,7 +653,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorTeal_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(108, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -670,7 +660,6 @@ namespace Ink_Canvas {
        private void BtnHighlighterColorOrange_Click(object sender, RoutedEventArgs e) {
            CheckLastColor(109, true);
            penType = 1;
-            forceEraser = false;
            CheckPenTypeUIState();
            ColorSwitchCheck();
        }
@@ -0,0 +1,164 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using Microsoft.Win32;
+
+namespace Ink_Canvas
+{
+    public partial class MainWindow : Window
+    {
+        #region Image
+        private async void BtnImageInsert_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Filter = "Image files (*.jpg; *.jpeg; *.png; *.bmp)|*.jpg;*.jpeg;*.png;*.bmp";
+
+            if (openFileDialog.ShowDialog() == true)
+            {
+                string filePath = openFileDialog.FileName;
+
+                Image image = await CreateAndCompressImageAsync(filePath);
+
+                if (image != null)
+                {
+                    string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
+                    image.Name = timestamp;
+
+                    // 新缩放逻辑：最大宽高为画布一半，并居中
+                    double maxWidth = inkCanvas.ActualWidth / 2;
+                    double maxHeight = inkCanvas.ActualHeight / 2;
+                    double scaleX = maxWidth / image.Width;
+                    double scaleY = maxHeight / image.Height;
+                    double scale = Math.Min(1, Math.Min(scaleX, scaleY));
+                    image.Width = image.Width * scale;
+                    image.Height = image.Height * scale;
+                    InkCanvas.SetLeft(image, (inkCanvas.ActualWidth - image.Width) / 2);
+                    InkCanvas.SetTop(image, (inkCanvas.ActualHeight - image.Height) / 2);
+
+                    inkCanvas.Children.Add(image);
+
+                    timeMachine.CommitElementInsertHistory(image);
+                }
+            }
+        }
+
+        private async Task<Image> CreateAndCompressImageAsync(string filePath)
+        {
+            string savePath = Path.Combine(Settings.Automation.AutoSavedStrokesLocation, "File Dependency");
+            if (!Directory.Exists(savePath))
+            {
+                Directory.CreateDirectory(savePath);
+            }
+
+            string fileExtension = Path.GetExtension(filePath);
+            string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
+            string newFilePath = Path.Combine(savePath, timestamp + fileExtension);
+
+            await Task.Run(() => File.Copy(filePath, newFilePath, true));
+
+            return await Dispatcher.InvokeAsync(() =>
+            {
+                BitmapImage bitmapImage = new BitmapImage();
+                bitmapImage.BeginInit();
+                bitmapImage.UriSource = new Uri(newFilePath);
+                bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+                bitmapImage.EndInit();
+
+                int width = bitmapImage.PixelWidth;
+                int height = bitmapImage.PixelHeight;
+
+                Image image = new Image();
+                if (isLoaded && Settings.Canvas.IsCompressPicturesUploaded && (width > 1920 || height > 1080))
+                {
+                    double scaleX = 1920.0 / width;
+                    double scaleY = 1080.0 / height;
+                    double scale = Math.Min(scaleX, scaleY);
+
+                    TransformedBitmap transformedBitmap = new TransformedBitmap(bitmapImage, new ScaleTransform(scale, scale));
+
+                    image.Source = transformedBitmap;
+                    image.Width = transformedBitmap.PixelWidth;
+                    image.Height = transformedBitmap.PixelHeight;
+                }
+                else
+                {
+                    image.Source = bitmapImage;
+                    image.Width = width;
+                    image.Height = height;
+                }
+
+                return image;
+            });
+        }
+        #endregion
+
+        #region Media
+        private async void BtnMediaInsert_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Filter = "Media files (*.mp4; *.avi; *.wmv)|*.mp4;*.avi;*.wmv";
+
+            if (openFileDialog.ShowDialog() == true)
+            {
+                string filePath = openFileDialog.FileName;
+
+                byte[] mediaBytes = await Task.Run(() => File.ReadAllBytes(filePath));
+
+                MediaElement mediaElement = await CreateMediaElementAsync(filePath);
+
+                if (mediaElement != null)
+                {
+                    InkCanvas.SetLeft(mediaElement, 0);
+                    InkCanvas.SetTop(mediaElement, 0);
+                    inkCanvas.Children.Add(mediaElement);
+
+                    mediaElement.LoadedBehavior = MediaState.Manual;
+                    mediaElement.UnloadedBehavior = MediaState.Manual;
+                    mediaElement.Loaded += async (_, args) =>
+                    {
+                        mediaElement.Play();
+                        await Task.Delay(100);
+                        mediaElement.Pause();
+                    };
+
+                    timeMachine.CommitElementInsertHistory(mediaElement);
+                }
+            }
+        }
+
+        private async Task<MediaElement> CreateMediaElementAsync(string filePath)
+        {
+            string savePath = Path.Combine(Settings.Automation.AutoSavedStrokesLocation, "File Dependency");
+            if (!Directory.Exists(savePath))
+            {
+                Directory.CreateDirectory(savePath);
+            }
+            return await Dispatcher.InvokeAsync(() =>
+            {
+                MediaElement mediaElement = new MediaElement();
+                mediaElement.Source = new Uri(filePath);
+                string timestamp = "media_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
+                mediaElement.Name = timestamp;
+                mediaElement.LoadedBehavior = MediaState.Manual;
+                mediaElement.UnloadedBehavior = MediaState.Manual;
+
+                mediaElement.Width = 256;
+                mediaElement.Height = 256;
+
+                string fileExtension = Path.GetExtension(filePath);
+                string newFilePath = Path.Combine(savePath, mediaElement.Name + fileExtension);
+
+                File.Copy(filePath, newFilePath, true);
+
+                mediaElement.Source = new Uri(newFilePath);
+
+                return mediaElement;
+            });
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,734 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using Ink_Canvas.Helpers;
+
+namespace Ink_Canvas {
+    public partial class MainWindow : Window {
+
+        // 新橡皮擦系统的核心变量
+        public bool isUsingAdvancedEraser = false;
+        private IncrementalStrokeHitTester advancedHitTester = null;
+
+        // 橡皮擦配置
+        public double currentEraserSize = 64;
+        public bool isCurrentEraserCircle = false;
+        public bool isUsingStrokeEraser = false;
+
+        // 视觉反馈相关
+        private Matrix eraserTransformMatrix = new Matrix();
+        private Point lastEraserPosition = new Point();
+        private bool isEraserVisible = false;
+
+        // 性能优化相关
+        private DateTime lastEraserUpdate = DateTime.Now;
+        private const double ERASER_UPDATE_INTERVAL = 16.67; // 约60FPS
+
+        // 锁定笔画的GUID（如果不存在则创建一个默认值）
+        private static readonly Guid IsLockGuid = new Guid("12345678-1234-1234-1234-123456789ABC");
+
+        // 橡皮擦视觉反馈控件
+        private DrawingVisual eraserVisual = new DrawingVisual();
+        private VisualCanvas eraserOverlayCanvas = null;
+        private Border eraserVisualBorder = null; // 用于显示橡皮擦视觉反馈的Border
+
+        // 兼容性属性：模拟原有的EraserOverlay_DrawingVisual
+        private VisualCanvas EraserOverlay_DrawingVisual => eraserOverlayCanvas;
+
+        // 兼容性保持
+        [Obsolete("使用 isUsingAdvancedEraser 替代")]
+        public bool isUsingGeometryEraser
+        {
+            get => isUsingAdvancedEraser;
+            set => isUsingAdvancedEraser = value;
+        }
+
+        [Obsolete("使用 currentEraserSize 替代")]
+        public double eraserWidth
+        {
+            get => currentEraserSize;
+            set => currentEraserSize = value;
+        }
+
+        [Obsolete("使用 isCurrentEraserCircle 替代")]
+        public bool isEraserCircleShape
+        {
+            get => isCurrentEraserCircle;
+            set => isCurrentEraserCircle = value;
+        }
+
+        [Obsolete("使用 isUsingStrokeEraser 替代")]
+        public bool isUsingStrokesEraser
+        {
+            get => isUsingStrokeEraser;
+            set => isUsingStrokeEraser = value;
+        }
+
+        [Obsolete("使用 eraserTransformMatrix 替代")]
+        private Matrix scaleMatrix
+        {
+            get => eraserTransformMatrix;
+            set => eraserTransformMatrix = value;
+        }
+
+        /// <summary>
+        /// 新橡皮擦覆盖层加载事件处理
+        /// </summary>
+        private void EraserOverlay_Loaded(object sender, RoutedEventArgs e) {
+            var border = (Border)sender;
+            
+            // 初始化覆盖层
+            InitializeEraserOverlay(border);
+            
+            Trace.WriteLine("Advanced Eraser: Overlay loaded and initialized");
+        }
+
+        /// <summary>
+        /// 开始高级橡皮擦操作
+        /// </summary>
+        private void StartAdvancedEraserOperation(object sender) {
+            if (isUsingAdvancedEraser) return;
+
+            // 设置操作状态
+            isUsingAdvancedEraser = true;
+            isEraserVisible = true;
+
+            // 更新橡皮擦尺寸
+            UpdateEraserSize();
+
+            // 获取inkCanvas引用
+            var inkCanvas = this.FindName("inkCanvas") as InkCanvas;
+            if (inkCanvas == null) return;
+
+            // 根据橡皮擦形状创建碰撞检测器
+            StylusShape eraserShape = CreateEraserShape();
+            advancedHitTester = inkCanvas.Strokes.GetIncrementalStrokeHitTester(eraserShape);
+            advancedHitTester.StrokeHit += OnAdvancedEraserStrokeHit;
+
+            // 初始化变换矩阵
+            InitializeEraserTransform();
+        }
+
+        /// <summary>
+        /// 创建橡皮擦形状
+        /// </summary>
+        private StylusShape CreateEraserShape() {
+            if (isCurrentEraserCircle) {
+                return new EllipseStylusShape(currentEraserSize, currentEraserSize);
+            } else {
+                // 矩形橡皮擦，使用与原来相同的逻辑
+                return new RectangleStylusShape(currentEraserSize, currentEraserSize / 0.6);
+            }
+        }
+
+        /// <summary>
+        /// 初始化橡皮擦变换矩阵
+        /// </summary>
+        private void InitializeEraserTransform() {
+            eraserTransformMatrix = new Matrix();
+
+            if (isCurrentEraserCircle) {
+                // 圆形橡皮擦：等比例缩放
+                var scale = currentEraserSize / 56.0; // 基于56x56的基准尺寸
+                eraserTransformMatrix.ScaleAt(scale, scale, 0, 0);
+            } else {
+                // 矩形橡皮擦：保持传统比例
+                var scaleX = currentEraserSize / 38.0;
+                var scaleY = (currentEraserSize * 56 / 38) / 56.0;
+                eraserTransformMatrix.ScaleAt(scaleX, scaleY, 0, 0);
+            }
+        }
+
+        /// <summary>
+        /// 更新橡皮擦尺寸
+        /// </summary>
+        private void UpdateEraserSize() {
+            // 使用与原来相同的逻辑计算橡皮擦尺寸
+            double k = 1.0;
+            
+            switch (Settings.Canvas.EraserSize) {
+                case 0: k = Settings.Canvas.EraserShapeType == 0 ? 0.5 : 0.7; break;
+                case 1: k = Settings.Canvas.EraserShapeType == 0 ? 0.8 : 0.9; break;
+                case 2: k = 1.0; break;
+                case 3: k = Settings.Canvas.EraserShapeType == 0 ? 1.25 : 1.2; break;
+                case 4: k = Settings.Canvas.EraserShapeType == 0 ? 1.5 : 1.3; break;
+            }
+
+            // 更新形状类型
+            isCurrentEraserCircle = (Settings.Canvas.EraserShapeType == 0);
+            
+            // 根据形状类型设置尺寸
+            if (isCurrentEraserCircle) {
+                currentEraserSize = k * 90; // 圆形橡皮擦
+            } else {
+                currentEraserSize = k * 90 * 0.6; // 矩形橡皮擦宽度
+            }
+        }
+
+        /// <summary>
+        /// 结束高级橡皮擦操作
+        /// </summary>
+        private void EndAdvancedEraserOperation(object sender) {
+            if (!isUsingAdvancedEraser) return;
+
+            // 重置操作状态
+            isUsingAdvancedEraser = false;
+            isEraserVisible = false;
+
+            // 释放鼠标捕获
+            if (sender is Border border) {
+                border.ReleaseMouseCapture();
+            }
+
+            // 隐藏橡皮擦视觉反馈
+            HideEraserFeedback();
+
+            // 结束碰撞检测
+            if (advancedHitTester != null) {
+                advancedHitTester.EndHitTesting();
+                advancedHitTester = null;
+            }
+
+            // 提交橡皮擦历史记录
+            CommitEraserHistory();
+        }
+
+        /// <summary>
+        /// 隐藏橡皮擦视觉反馈
+        /// </summary>
+        private void HideEraserFeedback() {
+            try {
+                if (eraserVisualBorder != null) {
+                    eraserVisualBorder.Visibility = Visibility.Collapsed;
+                }
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error hiding feedback - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 提交橡皮擦历史记录
+        /// </summary>
+        private void CommitEraserHistory() {
+            try {
+                if (ReplacedStroke != null || AddedStroke != null) {
+                    timeMachine.CommitStrokeEraseHistory(ReplacedStroke, AddedStroke);
+                    AddedStroke = null;
+                    ReplacedStroke = null;
+                }
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error committing history - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 高级橡皮擦笔画碰撞事件处理
+        /// </summary>
+        private void OnAdvancedEraserStrokeHit(object sender, StrokeHitEventArgs args) {
+            try {
+                var inkCanvas = this.FindName("inkCanvas") as InkCanvas;
+                if (inkCanvas == null) return;
+
+                var eraseResult = args.GetPointEraseResults();
+                var strokeToReplace = new StrokeCollection { args.HitStroke };
+
+                // 过滤锁定的笔画
+                var filteredToReplace = strokeToReplace.Where(stroke => !stroke.ContainsPropertyData(IsLockGuid));
+                var filteredToReplaceArray = filteredToReplace as Stroke[] ?? filteredToReplace.ToArray();
+
+                if (!filteredToReplaceArray.Any()) return;
+
+                var filteredResult = eraseResult.Where(stroke => !stroke.ContainsPropertyData(IsLockGuid));
+                var filteredResultArray = filteredResult as Stroke[] ?? filteredResult.ToArray();
+
+                // 执行笔画替换或删除
+                if (filteredResultArray.Any()) {
+                    inkCanvas.Strokes.Replace(
+                        new StrokeCollection(filteredToReplaceArray),
+                        new StrokeCollection(filteredResultArray)
+                    );
+                } else {
+                    inkCanvas.Strokes.Remove(new StrokeCollection(filteredToReplaceArray));
+                }
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error in stroke hit - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 更新高级橡皮擦位置
+        /// </summary>
+        private void UpdateAdvancedEraserPosition(object sender, Point position) {
+            // 移除isUsingAdvancedEraser检查，让视觉反馈始终更新
+            // if (!isUsingAdvancedEraser) return;
+
+            // 性能优化：限制更新频率
+            var now = DateTime.Now;
+            if ((now - lastEraserUpdate).TotalMilliseconds < ERASER_UPDATE_INTERVAL) {
+                return;
+            }
+            lastEraserUpdate = now;
+
+            // 更新位置
+            lastEraserPosition = position;
+
+            // 更新视觉反馈（始终执行）
+            UpdateEraserVisualFeedback(position);
+
+            // 只有在实际使用橡皮擦时才处理擦除
+            if (isUsingAdvancedEraser) {
+                // 处理不同的橡皮擦模式
+                if (isUsingStrokeEraser) {
+                    ProcessStrokeEraserAtPosition(position);
+                } else {
+                    ProcessGeometryEraserAtPosition(position);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 在指定位置处理笔画橡皮擦
+        /// </summary>
+        private void ProcessStrokeEraserAtPosition(Point position) {
+            try {
+                var inkCanvas = this.FindName("inkCanvas") as InkCanvas;
+                if (inkCanvas == null) return;
+
+                var hitStrokes = inkCanvas.Strokes.HitTest(position)
+                    .Where(stroke => !stroke.ContainsPropertyData(IsLockGuid));
+                var strokesArray = hitStrokes as Stroke[] ?? hitStrokes.ToArray();
+
+                if (strokesArray.Any()) {
+                    inkCanvas.Strokes.Remove(new StrokeCollection(strokesArray));
+                }
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error in stroke eraser - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 在指定位置处理几何橡皮擦
+        /// </summary>
+        private void ProcessGeometryEraserAtPosition(Point position) {
+            try {
+                if (advancedHitTester != null) {
+                    advancedHitTester.AddPoint(position);
+                }
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error in geometry eraser - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 更新橡皮擦视觉反馈
+        /// </summary>
+        private void UpdateEraserVisualFeedback(Point position) {
+            try {
+                // 获取或创建橡皮擦视觉反馈Border
+                if (eraserVisualBorder == null) {
+                    eraserVisualBorder = new Border {
+                        Background = new SolidColorBrush(Colors.Transparent),
+                        BorderBrush = new SolidColorBrush(Colors.Transparent),
+                        BorderThickness = new Thickness(0),
+                        IsHitTestVisible = false,
+                        HorizontalAlignment = HorizontalAlignment.Left,
+                        VerticalAlignment = VerticalAlignment.Top,
+                        Opacity = 1
+                    };
+                    Panel.SetZIndex(eraserVisualBorder, 1001);
+                    
+                    // 将Border添加到InkCanvasGridForInkReplay中
+                    var inkCanvasGrid = this.FindName("InkCanvasGridForInkReplay") as Grid;
+                    if (inkCanvasGrid != null) {
+                        inkCanvasGrid.Children.Add(eraserVisualBorder);
+                        Trace.WriteLine("Advanced Eraser: Visual feedback border added to grid");
+                    } else {
+                        Trace.WriteLine("Advanced Eraser: Failed to find InkCanvasGridForInkReplay");
+                        return; // 如果找不到Grid，直接返回
+                    }
+                }
+
+                if (eraserVisualBorder != null) {
+                    // 创建橡皮擦视觉反馈
+                    var eraserImage = CreateEraserVisualImage();
+                    
+                    // 清除Border的内容并添加新的图像
+                    eraserVisualBorder.Child = eraserImage;
+                    
+                    // 更新橡皮擦位置和大小
+                    if (isCurrentEraserCircle) {
+                        var radius = currentEraserSize / 2;
+                        eraserVisualBorder.Width = currentEraserSize;
+                        eraserVisualBorder.Height = currentEraserSize;
+                        
+                        // 使用Margin来定位，因为Border在Grid中
+                        eraserVisualBorder.Margin = new Thickness(
+                            position.X - radius, 
+                            position.Y - radius, 
+                            0, 0);
+                    } else {
+                        // 矩形橡皮擦，使用与原来相同的逻辑
+                        var height = currentEraserSize / 0.6;
+                        eraserVisualBorder.Width = currentEraserSize;
+                        eraserVisualBorder.Height = height;
+                        
+                        // 使用Margin来定位，因为Border在Grid中
+                        eraserVisualBorder.Margin = new Thickness(
+                            position.X - currentEraserSize / 2, 
+                            position.Y - height / 2, 
+                            0, 0);
+                    }
+                    
+                    eraserVisualBorder.Visibility = Visibility.Visible;
+                    Trace.WriteLine($"Advanced Eraser: Visual feedback updated to ({position.X:F1}, {position.Y:F1})");
+                }
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error updating visual feedback - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 创建橡皮擦视觉图像
+        /// </summary>
+        private Image CreateEraserVisualImage() {
+            try {
+                // 根据橡皮擦形状选择对应的DrawingGroup资源
+                string resourceKey = isCurrentEraserCircle ? "EraserCircleDrawingGroup" : "EraserDrawingGroup";
+                
+                // 尝试从资源字典中获取DrawingGroup
+                var drawingGroup = this.TryFindResource(resourceKey) as DrawingGroup;
+                if (drawingGroup == null) {
+                    // 如果找不到资源，创建默认的橡皮擦图像
+                    return CreateDefaultEraserImage();
+                }
+
+                // 创建变换后的DrawingGroup
+                var transformedGroup = new DrawingGroup();
+                transformedGroup.Children.Add(drawingGroup);
+                
+                // 应用缩放变换
+                var transform = new ScaleTransform();
+                if (isCurrentEraserCircle) {
+                    var scale = currentEraserSize / 56.0; // 基于56x56的基准尺寸
+                    transform.ScaleX = scale;
+                    transform.ScaleY = scale;
+                } else {
+                    var scaleX = currentEraserSize / 38.0;
+                    var scaleY = (currentEraserSize / 0.6) / 56.0;
+                    transform.ScaleX = scaleX;
+                    transform.ScaleY = scaleY;
+                }
+                transformedGroup.Transform = transform;
+
+                // 创建DrawingImage
+                var drawingImage = new DrawingImage(transformedGroup);
+                
+                // 创建Image控件
+                var image = new Image {
+                    Source = drawingImage,
+                    Stretch = Stretch.None
+                };
+                RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.HighQuality);
+
+                return image;
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error creating eraser visual image - {ex.Message}");
+                return CreateDefaultEraserImage();
+            }
+        }
+
+        /// <summary>
+        /// 创建默认的橡皮擦图像（当资源不可用时）
+        /// </summary>
+        private Image CreateDefaultEraserImage() {
+            try {
+                // 创建一个简单的几何图形作为默认橡皮擦
+                Geometry geometry;
+                if (isCurrentEraserCircle) {
+                    geometry = new EllipseGeometry(new Point(28, 28), 28, 28);
+                } else {
+                    geometry = new RectangleGeometry(new Rect(0, 0, 38, 56));
+                }
+
+                var brush = new SolidColorBrush(Colors.LightGray);
+                var pen = new Pen(new SolidColorBrush(Colors.DarkGray), 1);
+
+                var geometryDrawing = new GeometryDrawing(brush, pen, geometry);
+                var drawingGroup = new DrawingGroup();
+                drawingGroup.Children.Add(geometryDrawing);
+
+                // 应用缩放变换
+                var transform = new ScaleTransform();
+                if (isCurrentEraserCircle) {
+                    var scale = currentEraserSize / 56.0;
+                    transform.ScaleX = scale;
+                    transform.ScaleY = scale;
+                } else {
+                    var scaleX = currentEraserSize / 38.0;
+                    var scaleY = (currentEraserSize / 0.6) / 56.0;
+                    transform.ScaleX = scaleX;
+                    transform.ScaleY = scaleY;
+                }
+                drawingGroup.Transform = transform;
+
+                var drawingImage = new DrawingImage(drawingGroup);
+                var image = new Image {
+                    Source = drawingImage,
+                    Stretch = Stretch.None
+                };
+
+                return image;
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error creating default eraser image - {ex.Message}");
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 兼容性方法：旧版橡皮擦几何碰撞处理
+        /// </summary>
+        [Obsolete("使用 OnAdvancedEraserStrokeHit 替代")]
+        private void EraserGeometry_StrokeHit(object sender, StrokeHitEventArgs args) {
+            OnAdvancedEraserStrokeHit(sender, args);
+        }
+
+        /// <summary>
+        /// 兼容性方法：旧版橡皮擦移动处理
+        /// </summary>
+        [Obsolete("使用 UpdateAdvancedEraserPosition 替代")]
+        private void EraserOverlay_PointerMove(object sender, Point pt) {
+            UpdateAdvancedEraserPosition(sender, pt);
+        }
+
+        /// <summary>
+        /// 兼容性方法：旧版橡皮擦按下处理
+        /// </summary>
+        [Obsolete("使用 StartAdvancedEraserOperation 替代")]
+        private void EraserOverlay_PointerDown(object sender) {
+            StartAdvancedEraserOperation(sender);
+        }
+
+        /// <summary>
+        /// 兼容性方法：旧版橡皮擦抬起处理
+        /// </summary>
+        [Obsolete("使用 EndAdvancedEraserOperation 替代")]
+        private void EraserOverlay_PointerUp(object sender) {
+            EndAdvancedEraserOperation(sender);
+        }
+
+        /// <summary>
+        /// 获取当前橡皮擦状态信息（用于调试）
+        /// </summary>
+        public string GetEraserStatusInfo() {
+            return $"Advanced Eraser Status:\n" +
+                   $"- Active: {isUsingAdvancedEraser}\n" +
+                   $"- Size: {currentEraserSize:F1}\n" +
+                   $"- Shape: {(isCurrentEraserCircle ? "Circle" : "Rectangle")}\n" +
+                   $"- Mode: {(isUsingStrokeEraser ? "Stroke" : "Geometry")}\n" +
+                   $"- Visible: {isEraserVisible}\n" +
+                   $"- Last Position: ({lastEraserPosition.X:F1}, {lastEraserPosition.Y:F1})";
+        }
+
+        /// <summary>
+        /// 重置橡皮擦状态
+        /// </summary>
+        public void ResetEraserState() {
+            isUsingAdvancedEraser = false;
+            isEraserVisible = false;
+            lastEraserPosition = new Point();
+
+            if (advancedHitTester != null) {
+                advancedHitTester.EndHitTesting();
+                advancedHitTester = null;
+            }
+
+            HideEraserFeedback();
+            
+            // 清理视觉反馈Border
+            if (eraserVisualBorder != null) {
+                var inkCanvasGrid = this.FindName("InkCanvasGridForInkReplay") as Grid;
+                if (inkCanvasGrid != null) {
+                    inkCanvasGrid.Children.Remove(eraserVisualBorder);
+                }
+                eraserVisualBorder = null;
+            }
+        }
+
+        /// <summary>
+        /// 应用高级橡皮擦形状到InkCanvas
+        /// </summary>
+        public void ApplyAdvancedEraserShape() {
+            try {
+                var inkCanvas = this.FindName("inkCanvas") as InkCanvas;
+                if (inkCanvas == null) return;
+
+                // 更新橡皮擦尺寸和形状
+                UpdateEraserSize();
+
+                // 创建橡皮擦形状
+                StylusShape eraserShape = CreateEraserShape();
+
+                // 应用到InkCanvas
+                inkCanvas.EraserShape = eraserShape;
+
+                Trace.WriteLine($"Advanced Eraser: Applied shape - Size: {currentEraserSize}, Circle: {isCurrentEraserCircle}");
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error applying shape - {ex.Message}");
+
+                // 回退到传统方法
+                try {
+                    ApplyCurrentEraserShape();
+                } catch (Exception fallbackEx) {
+                    Trace.WriteLine($"Advanced Eraser: Fallback also failed - {fallbackEx.Message}");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 启用高级橡皮擦系统
+        /// </summary>
+        public void EnableAdvancedEraserSystem() {
+            try {
+                // 获取橡皮擦覆盖层
+                var eraserOverlay = this.FindName("AdvancedEraserOverlay") as Border;
+                if (eraserOverlay != null) {
+                    // 启用覆盖层的交互
+                    eraserOverlay.IsHitTestVisible = true;
+                    
+                    // 确保覆盖层在橡皮擦模式下启用
+                    if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                        eraserOverlay.IsHitTestVisible = true;
+                        Trace.WriteLine("Advanced Eraser: Overlay enabled for eraser mode");
+                    }
+                    
+                    // 设置覆盖层的大小以覆盖整个InkCanvas
+                    var inkCanvasControl = this.FindName("inkCanvas") as InkCanvas;
+                    if (inkCanvasControl != null) {
+                        eraserOverlay.Width = inkCanvasControl.ActualWidth;
+                        eraserOverlay.Height = inkCanvasControl.ActualHeight;
+                        Trace.WriteLine($"Advanced Eraser: Overlay size set to {eraserOverlay.Width}x{eraserOverlay.Height}");
+                    }
+                    
+                    Trace.WriteLine("Advanced Eraser: System enabled successfully");
+                } else {
+                    Trace.WriteLine("Advanced Eraser: Failed to find eraser overlay");
+                }
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error enabling system - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 初始化橡皮擦覆盖层
+        /// </summary>
+        private void InitializeEraserOverlay(Border overlay) {
+            try {
+                // 设置覆盖层的基本属性
+                overlay.Background = new SolidColorBrush(Colors.Transparent);
+                overlay.IsHitTestVisible = false; // 默认禁用，只在橡皮擦模式下启用
+                
+                // 绑定事件处理
+                overlay.MouseDown += (sender, e) => {
+                    if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                        overlay.CaptureMouse();
+                        StartAdvancedEraserOperation(sender);
+                    }
+                };
+                
+                overlay.MouseUp += (sender, e) => {
+                    if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                        overlay.ReleaseMouseCapture();
+                        EndAdvancedEraserOperation(sender);
+                    }
+                };
+                
+                overlay.MouseMove += (sender, e) => {
+                    if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                        var position = e.GetPosition((UIElement)this.FindName("inkCanvas"));
+                        Trace.WriteLine($"Advanced Eraser: Mouse move event triggered at ({position.X:F1}, {position.Y:F1})");
+                        UpdateAdvancedEraserPosition(sender, position);
+                    } else {
+                        Trace.WriteLine($"Advanced Eraser: Mouse move ignored - not in eraser mode, current mode: {inkCanvas.EditingMode}");
+                    }
+                };
+                
+                // 触控笔事件
+                overlay.StylusDown += (sender, e) => {
+                    if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                        e.Handled = true;
+                        if (e.StylusDevice.TabletDevice.Type == TabletDeviceType.Stylus) {
+                            overlay.CaptureStylus();
+                        }
+                        StartAdvancedEraserOperation(sender);
+                    }
+                };
+                
+                overlay.StylusUp += (sender, e) => {
+                    if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                        e.Handled = true;
+                        if (e.StylusDevice.TabletDevice.Type == TabletDeviceType.Stylus) {
+                            overlay.ReleaseStylusCapture();
+                        }
+                        EndAdvancedEraserOperation(sender);
+                    }
+                };
+                
+                overlay.StylusMove += (sender, e) => {
+                    if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                        e.Handled = true;
+                        var position = e.GetPosition((UIElement)this.FindName("inkCanvas"));
+                        UpdateAdvancedEraserPosition(sender, position);
+                        Trace.WriteLine($"Advanced Eraser: Stylus move at ({position.X:F1}, {position.Y:F1})");
+                    }
+                };
+                
+                Trace.WriteLine("Advanced Eraser: Overlay initialized successfully");
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error initializing overlay - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 禁用高级橡皮擦系统
+        /// </summary>
+        public void DisableAdvancedEraserSystem() {
+            try {
+                // 重置橡皮擦状态
+                ResetEraserState();
+                
+                // 获取橡皮擦覆盖层并禁用
+                var eraserOverlay = this.FindName("AdvancedEraserOverlay") as Border;
+                if (eraserOverlay != null) {
+                    eraserOverlay.IsHitTestVisible = false;
+                }
+                
+                // 确保视觉反馈被隐藏
+                HideEraserFeedback();
+                
+                Trace.WriteLine("Advanced Eraser: System disabled successfully");
+            } catch (Exception ex) {
+                Trace.WriteLine($"Advanced Eraser: Error disabling system - {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 切换橡皮擦形状（圆形/矩形）
+        /// </summary>
+        public void ToggleEraserShape() {
+            isCurrentEraserCircle = !isCurrentEraserCircle;
+
+            // 更新设置
+            Settings.Canvas.EraserShapeType = isCurrentEraserCircle ? 0 : 1;
+
+            // 应用新形状
+            ApplyAdvancedEraserShape();
+
+            Trace.WriteLine($"Advanced Eraser: Toggled to {(isCurrentEraserCircle ? "Circle" : "Rectangle")}");
+        }       
+    }
+}
@@ -0,0 +1,36 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <DrawingGroup x:Key="EraserDrawingGroup" ClipGeometry="M0,0 V56 H38 V0 H0 Z">
+        <GeometryDrawing Brush="#FFF2EEEB" Geometry="F1 M38,56z M0,0z M0,4C0,1.79086,1.79086,0,4,0L34,0C36.2091,0,38,1.79086,38,4L38,52C38,54.2091,36.2091,56,34,56L4,56C1.79086,56,0,54.2091,0,52L0,4z" />
+        <GeometryDrawing Brush="#FFCDCDCD" Geometry="F0 M38,56z M0,0z M34,1L4,1C2.34315,1,1,2.34315,1,4L1,52C1,53.6569,2.34315,55,4,55L34,55C35.6569,55,37,53.6569,37,52L37,4C37,2.34315,35.6569,1,34,1z M4,0C1.79086,0,0,1.79086,0,4L0,52C0,54.2091,1.79086,56,4,56L34,56C36.2091,56,38,54.2091,38,52L38,4C38,1.79086,36.2091,0,34,0L4,0z" />
+        <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M38,56z M0,0z M12,19.5C12,18.1193,13.1193,17,14.5,17L14.5,17C15.8807,17,17,18.1193,17,19.5L17,36.5C17,37.8807,15.8807,39,14.5,39L14.5,39C13.1193,39,12,37.8807,12,36.5L12,19.5z" />
+        <GeometryDrawing Geometry="F0 M38,56z M0,0z M11.5,19.5C11.5,17.8431 12.8431,16.5 14.5,16.5 16.1569,16.5 17.5,17.8431 17.5,19.5L17.5,36.5C17.5,38.1569 16.1569,39.5 14.5,39.5 12.8431,39.5 11.5,38.1569 11.5,36.5L11.5,19.5z M14.5,17.5C13.3954,17.5,12.5,18.3954,12.5,19.5L12.5,36.5C12.5,37.6046 13.3954,38.5 14.5,38.5 15.6046,38.5 16.5,37.6046 16.5,36.5L16.5,19.5C16.5,18.3954,15.6046,17.5,14.5,17.5z">
+            <GeometryDrawing.Brush>
+                <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
+            </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M38,56z M0,0z M21,19.5C21,18.1193,22.1193,17,23.5,17L23.5,17C24.8807,17,26,18.1193,26,19.5L26,36.5C26,37.8807,24.8807,39,23.5,39L23.5,39C22.1193,39,21,37.8807,21,36.5L21,19.5z" />
+        <GeometryDrawing Geometry="F0 M38,56z M0,0z M20.5,19.5C20.5,17.8431 21.8431,16.5 23.5,16.5 25.1569,16.5 26.5,17.8431 26.5,19.5L26.5,36.5C26.5,38.1569 25.1569,39.5 23.5,39.5 21.8431,39.5 20.5,38.1569 20.5,36.5L20.5,19.5z M23.5,17.5C22.3954,17.5,21.5,18.3954,21.5,19.5L21.5,36.5C21.5,37.6046 22.3954,38.5 23.5,38.5 24.6046,38.5 25.5,37.6046 25.5,36.5L25.5,19.5C25.5,18.3954,24.6046,17.5,23.5,17.5z">
+            <GeometryDrawing.Brush>
+                <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
+            </GeometryDrawing.Brush>
+        </GeometryDrawing>
+    </DrawingGroup>
+
+    <DrawingGroup x:Key="EraserCircleDrawingGroup" ClipGeometry="M0,0 V56 H56 V0 H0 Z">
+        <GeometryDrawing Brush="#FFF2EEEB" Geometry="F1 M56,56z M0,0z M0,28C0,12.536,12.536,0,28,0L28,0C43.464,0,56,12.536,56,28L56,28C56,43.464,43.464,56,28,56L28,56C12.536,56,0,43.464,0,28L0,28z" />
+        <GeometryDrawing Brush="#FFCDCDCD" Geometry="F0 M56,56z M0,0z M1,28C1,42.9117 13.0883,55 28,55 42.9117,55 55,42.9117 55,28 55,13.0883 42.9117,1 28,1 13.0883,1 1,13.0883 1,28z M28,0C12.536,0 0,12.536 0,28 0,43.464 12.536,56 28,56 43.464,56 56,43.464 56,28 56,12.536 43.464,0 28,0z" />
+        <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M56,56z M0,0z M21,19.5C21,18.1193,22.1193,17,23.5,17L23.5,17C24.8807,17,26,18.1193,26,19.5L26,36.5C26,37.8807,24.8807,39,23.5,39L23.5,39C22.1193,39,21,37.8807,21,36.5L21,19.5z" />
+        <GeometryDrawing Geometry="F0 M56,56z M0,0z M20.5,19.5C20.5,17.8431 21.8431,16.5 23.5,16.5 25.1569,16.5 26.5,17.8431 26.5,19.5L26.5,36.5C26.5,38.1569 25.1569,39.5 23.5,39.5 21.8431,39.5 20.5,38.1569 20.5,36.5L20.5,19.5z M23.5,17.5C22.3954,17.5,21.5,18.3954,21.5,19.5L21.5,36.5C21.5,37.6046 22.3954,38.5 23.5,38.5 24.6046,38.5 25.5,37.6046 25.5,36.5L25.5,19.5C25.5,18.3954,24.6046,17.5,23.5,17.5z">
+            <GeometryDrawing.Brush>
+                <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
+            </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Brush="#FFD1CFCD" Geometry="F1 M56,56z M0,0z M30,19.5C30,18.1193,31.1193,17,32.5,17L32.5,17C33.8807,17,35,18.1193,35,19.5L35,36.5C35,37.8807,33.8807,39,32.5,39L32.5,39C31.1193,39,30,37.8807,30,36.5L30,19.5z" />
+        <GeometryDrawing Geometry="F0 M56,56z M0,0z M29.5,19.5C29.5,17.8431 30.8431,16.5 32.5,16.5 34.1569,16.5 35.5,17.8431 35.5,19.5L35.5,36.5C35.5,38.1569 34.1569,39.5 32.5,39.5 30.8431,39.5 29.5,38.1569 29.5,36.5L29.5,19.5z M32.5,17.5C31.3954,17.5,30.5,18.3954,30.5,19.5L30.5,36.5C30.5,37.6046 31.3954,38.5 32.5,38.5 33.6046,38.5 34.5,37.6046 34.5,36.5L34.5,19.5C34.5,18.3954,33.6046,17.5,32.5,17.5z">
+            <GeometryDrawing.Brush>
+                <SolidColorBrush Color="#FF6F6F6F" Opacity="0.25" />
+            </GeometryDrawing.Brush>
+        </GeometryDrawing>
+    </DrawingGroup>
+</ResourceDictionary>
@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Threading.Tasks;
 using System.Windows;
@@ -15,21 +15,16 @@ using System.Threading;
 using Application = System.Windows.Application;
 using Point = System.Windows.Point;
 using System.Diagnostics;
-using iNKORE.UI.WPF.Modern.Controls;
-using System.IO;
-using System.Windows.Media.Effects;
-using static System.Net.Mime.MediaTypeNames;
-using System.Text;
-using System.Globalization;
-using System.Windows.Data;
 using System.Xml.Linq;
+using Image = System.Windows.Controls.Image;
+using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;

 namespace Ink_Canvas {
    public partial class MainWindow : Window {
        #region “手勢”按鈕

        /// <summary>
-        /// 用於浮動工具欄的“手勢”按鈕和白板工具欄的“手勢”按鈕的點擊事件
+        /// 用於浮動工具欄的"手勢"按鈕和白板工具欄的"手勢"按鈕的點擊事件
        /// </summary>
        private void TwoFingerGestureBorder_MouseUp(object sender, RoutedEventArgs e) {
            if (TwoFingerGestureBorder.Visibility == Visibility.Visible) {
@@ -63,7 +58,7 @@ namespace Ink_Canvas {
        }

        /// <summary>
-        /// 用於更新浮動工具欄的“手勢”按鈕和白板工具欄的“手勢”按鈕的樣式（開啟和關閉狀態）
+        /// 用於更新浮動工具欄的"手勢"按鈕和白板工具欄的"手勢"按鈕的樣式（開啟和關閉狀態）
        /// </summary>
        private void CheckEnableTwoFingerGestureBtnColorPrompt() {
            if (ToggleSwitchEnableMultiTouchMode.IsOn) {
@@ -111,7 +106,7 @@ namespace Ink_Canvas {
        }

        /// <summary>
-        /// 控制是否顯示浮動工具欄的“手勢”按鈕
+        /// 控制是否顯示浮動工具欄的"手勢"按鈕
        /// </summary>
        private void CheckEnableTwoFingerGestureBtnVisibility(bool isVisible) {
            if (StackPanelCanvasControls.Visibility != Visibility.Visible
@@ -128,7 +123,7 @@ namespace Ink_Canvas {
            }
        }

-        #endregion “手勢”按鈕
+        #endregion "手勢"按鈕

        #region 浮動工具欄的拖動實現

@@ -217,22 +212,22 @@ namespace Ink_Canvas {
        ///     </para>
        ///     <list type="number">
        ///         <item>
-        ///             隱藏浮動工具欄和白板模式下的“更多功能”面板
+        ///             隱藏浮動工具欄和白板模式下的"更多功能"面板
        ///         </item>
        ///         <item>
        ///             隱藏白板模式下和浮動工具欄的畫筆調色盤
        ///         </item>
        ///         <item>
-        ///             隱藏白板模式下的“清屏”按鈕（已作廢）
+        ///             隱藏白板模式下的"清屏"按鈕（已作廢）
        ///         </item>
        ///         <item>
        ///             負責給Settings設置面板做隱藏動畫
        ///         </item>
        ///         <item>
-        ///             隱藏白板模式下和浮動工具欄的“手勢”面板
+        ///             隱藏白板模式下和浮動工具欄的"手勢"面板
        ///         </item>
        ///         <item>
-        ///             當<c>ToggleSwitchDrawShapeBorderAutoHide</c>開啟時，會自動隱藏白板模式下和浮動工具欄的“形狀”面板
+        ///             當<c>ToggleSwitchDrawShapeBorderAutoHide</c>開啟時，會自動隱藏白板模式下和浮動工具欄的"形狀"面板
        ///         </item>
        ///         <item>
        ///             按需高亮指定的浮動工具欄和白板工具欄中的按鈕，通過param：<paramref name="mode"/> 來指定
@@ -254,16 +249,16 @@ namespace Ink_Canvas {
        ///             當<c><paramref name="mode"/>!="clear"</c>時，會先取消高亮所有工具欄按鈕，然後根據下面的情況進行高亮處理
        ///         </item>
        ///         <item>
-        ///             當<c><paramref name="mode"/>=="color" || <paramref name="mode"/>=="pen"</c>時，會高亮浮動工具欄和白板工具欄中的“批註”，“筆”按鈕
+        ///             當<c><paramref name="mode"/>=="color" || <paramref name="mode"/>=="pen"</c>時，會高亮浮動工具欄和白板工具欄中的"批註"，"筆"按鈕
        ///         </item>
        ///         <item>
-        ///             當<c><paramref name="mode"/>=="eraser"</c>時，會高亮白板工具欄中的“橡皮”和浮動工具欄中的“面積擦”按鈕
+        ///             當<c><paramref name="mode"/>=="eraser"</c>時，會高亮白板工具欄中的"橡皮"和浮動工具欄中的"面積擦"按鈕
        ///         </item>
        ///         <item>
-        ///             當<c><paramref name="mode"/>=="eraserByStrokes"</c>時，會高亮白板工具欄中的“橡皮”和浮動工具欄中的“墨跡擦”按鈕
+        ///             當<c><paramref name="mode"/>=="eraserByStrokes"</c>時，會高亮白板工具欄中的"橡皮"和浮動工具欄中的"墨跡擦"按鈕
        ///         </item>
        ///         <item>
-        ///             當<c><paramref name="mode"/>=="select"</c>時，會高亮浮動工具欄和白板工具欄中的“選擇”，“套索選”按鈕
+        ///             當<c><paramref name="mode"/>=="select"</c>時，會高亮浮動工具欄和白板工具欄中的"選擇"，"套索選"按鈕
        ///         </item>
        ///     </list>
        /// </param>
@@ -280,8 +275,16 @@ namespace Ink_Canvas {
            AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
            AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
            AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView);
+            
+            // 隐藏背景设置面板
+            var bgPalette = LogicalTreeHelper.FindLogicalNode(this, "BackgroundPalette") as Border;
+            if (bgPalette != null)
+            {
+                AnimationsHelper.HideWithSlideAndFade(bgPalette);
+            }

            if (BorderSettings.Visibility == Visibility.Visible) {
+                // 设置蒙版为不可点击，并移除背景
                BorderSettingsMask.IsHitTestVisible = false;
                BorderSettingsMask.Background = null;
                var sb = new Storyboard();
@@ -403,6 +406,11 @@ namespace Ink_Canvas {
                        System.Windows.Controls.Canvas.SetLeft(FloatingbarSelectionBG, 28 * 5);
                            break;
                    }
+                    case "shape": {
+                        // 对图形模式进行特殊处理，不修改按钮UI状态
+                        // 只隐藏相关面板，但保持图形绘制模式
+                        break;
+                    }
                }


@@ -485,7 +493,7 @@ namespace Ink_Canvas {
                RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
                LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                //进入黑板
+                //進入黑板

                /*
                if (Not_Enter_Blackboard_fir_Mouse_Click) {// BUG-Fixed_tmp：程序启动后直接进入白板会导致后续撤销功能、退出白板无法恢复墨迹
@@ -500,8 +508,9 @@ namespace Ink_Canvas {
                    Thread.Sleep(100);
                    Application.Current.Dispatcher.Invoke(() => { ViewboxFloatingBarMarginAnimation(60); });
                })).Start();
-
+                
                HideSubPanels();
+
                if (GridTransparencyFakeBackground.Background == Brushes.Transparent)
                {
                    if (currentMode == 1)
@@ -574,6 +583,15 @@ namespace Ink_Canvas {
                    if (dopsc[2] == '2' && isDisplayingOrHidingBlackboard == false) AnimationsHelper.ShowWithFadeIn(LeftSidePanelForPPTNavigation);
                    if (dopsc[3] == '2' && isDisplayingOrHidingBlackboard == false) AnimationsHelper.ShowWithFadeIn(RightSidePanelForPPTNavigation);
                }
+                // 修复PPT放映时点击白板按钮后翻页按钮不显示的问题
+                if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+                {
+                    // 强制显示PPT翻页按钮
+                    LeftBottomPanelForPPTNavigation.Visibility = Visibility.Visible;
+                    RightBottomPanelForPPTNavigation.Visibility = Visibility.Visible;
+                    LeftSidePanelForPPTNavigation.Visibility = Visibility.Visible;
+                    RightSidePanelForPPTNavigation.Visibility = Visibility.Visible;
+                }

                if (Settings.Automation.IsAutoSaveStrokesAtClear &&
                    inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);
@@ -664,7 +682,7 @@ namespace Ink_Canvas {
        #region 主要的工具按鈕事件

        /// <summary>
-        ///     浮動工具欄的“套索選”按鈕事件，重定向到舊UI的<c>BtnSelect_Click</c>方法
+        ///     浮動工具欄的"套索選"按鈕事件，重定向到舊UI的<c>BtnSelect_Click</c>方法
        /// </summary>
        /// <param name="sender">sender</param>
        /// <param name="e">MouseButtonEventArgs</param>
@@ -727,9 +745,11 @@ namespace Ink_Canvas {
        }

        private void SymbolIconRand_MouseUp(object sender, MouseButtonEventArgs e) {
+            // 如果控件被隐藏，不处理事件
+            if (RandomDrawPanel.Visibility != Visibility.Visible) return;
+
            LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
            RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
-            if (lastBorderMouseDownObject != sender) return;

            AnimationsHelper.HideWithSlideAndFade(BorderTools);
            AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
@@ -795,18 +815,37 @@ namespace Ink_Canvas {
        }

        private void SymbolIconRandOne_MouseUp(object sender, MouseButtonEventArgs e) {
+            // 如果控件被隐藏，不处理事件
+            if (SingleDrawPanel.Visibility != Visibility.Visible) return;
+
            LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
            RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
-            if (lastBorderMouseDownObject != sender) return;

            AnimationsHelper.HideWithSlideAndFade(BorderTools);
            AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);

-            new RandWindow(Settings,true).ShowDialog();
+            // 检查是否启用了直接调用ClassIsland点名功能
+            if (Settings.RandSettings.DirectCallCiRand) {
+                try {
+                    System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo {
+                        FileName = "classisland://plugins/IslandCaller/Run",
+                        UseShellExecute = true
+                    });
+                }
+                catch (Exception ex) {
+                    MessageBox.Show("无法调用ClassIsland点名：" + ex.Message);
+                    
+                    // 调用失败时回退到默认的随机点名窗口
+                    new RandWindow(Settings, true).ShowDialog();
+                }
+            } else {
+                // 使用默认的随机点名窗口
+                new RandWindow(Settings, true).ShowDialog();
+            }
        }

        private void GridInkReplayButton_MouseUp(object sender, MouseButtonEventArgs e) {
-            if (lastBorderMouseDownObject != sender) return;
+            //if (lastBorderMouseDownObject != sender) return;

            AnimationsHelper.HideWithSlideAndFade(BorderTools);
            AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
@@ -1061,15 +1100,38 @@ namespace Ink_Canvas {
                var windowHandle = new WindowInteropHelper(this).Handle;
                var screen = System.Windows.Forms.Screen.FromHandle(windowHandle);
                double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
-                var toolbarHeight = SystemParameters.PrimaryScreenHeight - SystemParameters.FullPrimaryScreenHeight -
-                                    SystemParameters.WindowCaptionHeight;
+                // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
+                var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
                pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;

                if (PosXCaculatedWithTaskbarHeight == false)
-                    pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+                {
+                    // 如果任务栏高度为0(隐藏状态),则使用固定边距
+                    if (toolbarHeight == 0)
+                    {
+                        pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+                        LogHelper.WriteLogToFile($"任务栏隐藏,使用固定边距: {MarginFromEdge}", LogHelper.LogType.Info);
+                    }
+                    else
+                    {
+                        pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+                    }
+                }
                else if (PosXCaculatedWithTaskbarHeight == true)
-                    pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
-                            toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+                {
+                    // 如果任务栏高度为0(隐藏状态),则使用固定高度
+                    if (toolbarHeight == 0)
+                    {
+                        pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY - 
+                               3 * ViewboxFloatingBarScaleTransform.ScaleY;
+                        LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}", LogHelper.LogType.Info);
+                    }
+                    else
+                    {
+                        pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+                               toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+                    }
+                }

                if (MarginFromEdge != -60) {
                    if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) {
@@ -1124,12 +1186,22 @@ namespace Ink_Canvas {
                var windowHandle = new WindowInteropHelper(this).Handle;
                var screen = System.Windows.Forms.Screen.FromHandle(windowHandle);
                double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
-                var toolbarHeight = SystemParameters.PrimaryScreenHeight - SystemParameters.FullPrimaryScreenHeight -
-                                    SystemParameters.WindowCaptionHeight;
+                // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
+                var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
                pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;

-                pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
-                        toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+                // 如果任务栏高度为0(隐藏状态),则使用固定边距
+                if (toolbarHeight == 0)
+                {
+                    pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY - 
+                           3 * ViewboxFloatingBarScaleTransform.ScaleY;
+                    LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}", LogHelper.LogType.Info);
+                }
+                else
+                {
+                    pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+                           toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+                }

                if (pointDesktop.X != -1 || pointDesktop.Y != -1) pointDesktop = pos;

@@ -1167,8 +1239,8 @@ namespace Ink_Canvas {
                var windowHandle = new WindowInteropHelper(this).Handle;
                var screen = System.Windows.Forms.Screen.FromHandle(windowHandle);
                double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
-                var toolbarHeight = SystemParameters.PrimaryScreenHeight - SystemParameters.FullPrimaryScreenHeight -
-                                    SystemParameters.WindowCaptionHeight;
+                // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
+                var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
                pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;

                pos.Y = screenHeight - 55 * ViewboxFloatingBarScaleTransform.ScaleY;
@@ -1199,6 +1271,10 @@ namespace Ink_Canvas {
            if (lastBorderMouseDownObject != null && lastBorderMouseDownObject is Panel)
                ((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
            if (sender==Cursor_Icon && lastBorderMouseDownObject != Cursor_Icon) return;
+            
+            // 禁用高级橡皮擦系统
+            DisableAdvancedEraserSystem();
+            
            // 隱藏高亮
            FloatingbarSelectionBG.Visibility = Visibility.Hidden;
            System.Windows.Controls.Canvas.SetLeft(FloatingbarSelectionBG, 0);
@@ -1277,6 +1353,9 @@ namespace Ink_Canvas {
                ((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
            if (sender == Pen_Icon && lastBorderMouseDownObject != Pen_Icon) return;

+            // 禁用高级橡皮擦系统
+            DisableAdvancedEraserSystem();
+
            FloatingbarSelectionBG.Visibility = Visibility.Visible;
            System.Windows.Controls.Canvas.SetLeft(FloatingbarSelectionBG, 28);

@@ -1348,6 +1427,10 @@ namespace Ink_Canvas {
                    }
                }
                else {
+                    // 切换到批注模式时，确保保存当前图片信息
+                    if (currentMode != 0) {
+                        SaveStrokes();
+                    }
                    inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                    ColorSwitchCheck();
                    HideSubPanels("pen", true);
@@ -1362,94 +1445,75 @@ namespace Ink_Canvas {
        }

        private void EraserIcon_Click(object sender, RoutedEventArgs e) {
-
-            if (lastBorderMouseDownObject != null && lastBorderMouseDownObject is Panel)
-                ((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
-            if (sender == Eraser_Icon && lastBorderMouseDownObject != Eraser_Icon) return;
-
-            FloatingbarSelectionBG.Visibility = Visibility.Visible;
-            System.Windows.Controls.Canvas.SetLeft(FloatingbarSelectionBG, 84);
-
-            forceEraser = true;
+            EnterMultiTouchModeIfNeeded();
+            bool isAlreadyEraser = inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint;
+            forceEraser = false;
            forcePointEraser = true;
-            if (Settings.Canvas.EraserShapeType == 0) {
-                double k = 1;
-                switch (Settings.Canvas.EraserSize) {
-                    case 0:
-                        k = 0.5;
-                        break;
-                    case 1:
-                        k = 0.8;
-                        break;
-                    case 3:
-                        k = 1.25;
-                        break;
-                    case 4:
-                        k = 1.8;
-                        break;
-                }
-
-                inkCanvas.EraserShape = new EllipseStylusShape(k * 90, k * 90);
-            }
-            else if (Settings.Canvas.EraserShapeType == 1) {
-                double k = 1;
-                switch (Settings.Canvas.EraserSize) {
-                    case 0:
-                        k = 0.7;
-                        break;
-                    case 1:
-                        k = 0.9;
-                        break;
-                    case 3:
-                        k = 1.2;
-                        break;
-                    case 4:
-                        k = 1.6;
-                        break;
-                }
-
-                inkCanvas.EraserShape = new RectangleStylusShape(k * 90 * 0.6, k * 90);
-            }
-
-            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
-                if (EraserSizePanel.Visibility == Visibility.Collapsed) {
-                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(PenPalette);
-                    AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
-                    AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
-                    AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
-                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
-                    AnimationsHelper.ShowWithSlideFromBottomAndFade(EraserSizePanel);
-                    AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardEraserSizePanel);
-                } else {
-                    AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
-                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(PenPalette);
-                    AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
-                    AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
-                    AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
-                    AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
-                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
-                    AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
-                }
-            }
-            else {
-                HideSubPanels("eraser");
-            }
-
-            inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
            drawingShapeMode = 0;

-            inkCanvas_EditingModeChanged(inkCanvas, null);
-            CancelSingleFingerDragMode();
+            // 切换到橡皮擦模式时，确保保存当前图片信息
+            if (!isAlreadyEraser && currentMode != 0) {
+                SaveStrokes();
+            }
+
+            // 启用新的高级橡皮擦系统
+            EnableAdvancedEraserSystem();
+
+            // 使用新的高级橡皮擦系统
+            inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+            ApplyAdvancedEraserShape(); // 使用新的橡皮擦形状应用方法
+            SetCursorBasedOnEditingMode(inkCanvas);
+            HideSubPanels("eraser"); // 高亮橡皮按钮
+
+            // 显示橡皮擦视觉反馈（用于测试）
+            // 注意：eraserVisualBorder在MW_Eraser.cs中定义，这里无法直接访问
+            Trace.WriteLine($"Advanced Eraser: Eraser button clicked, current size: {currentEraserSize}, circle: {isCurrentEraserCircle}");
+
+            if (isAlreadyEraser) {
+                // 已是橡皮状态，再次点击才弹出/收起面板
+                if (EraserSizePanel.Visibility == Visibility.Collapsed) {
+                    AnimationsHelper.ShowWithSlideFromBottomAndFade(EraserSizePanel);
+                    if (BoardEraserSizePanel != null)
+                        AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardEraserSizePanel);
+                } else {
+                    AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                    if (BoardEraserSizePanel != null)
+                        AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                }
+            }
+        }
+
+        private void BoardEraserIcon_Click(object sender, RoutedEventArgs e) {
+            EnterMultiTouchModeIfNeeded();
+            bool isAlreadyEraser = inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint;
+            forceEraser = false;
+            forcePointEraser = true;
+            drawingShapeMode = 0;
+
+            // 启用新的高级橡皮擦系统
+            EnableAdvancedEraserSystem();
+            
+            // 使用新的高级橡皮擦系统
+            inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+            ApplyAdvancedEraserShape(); // 使用新的橡皮擦形状应用方法
+            SetCursorBasedOnEditingMode(inkCanvas);
+            HideSubPanels("eraser"); // 高亮橡皮按钮
+
+            if (isAlreadyEraser) {
+                // 已是橡皮状态，再次点击才弹出/收起面板
+                if (BoardEraserSizePanel != null && BoardEraserSizePanel.Visibility == Visibility.Collapsed) {
+                    AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardEraserSizePanel);
+                    AnimationsHelper.ShowWithSlideFromBottomAndFade(EraserSizePanel);
+                } else {
+                    if (BoardEraserSizePanel != null)
+                        AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                    AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                }
+            }
        }

        private void EraserIconByStrokes_Click(object sender, RoutedEventArgs e) {
+            EnterMultiTouchModeIfNeeded();

            if (lastBorderMouseDownObject != null && lastBorderMouseDownObject is Panel)
                ((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
@@ -1482,6 +1546,9 @@ namespace Ink_Canvas {
        }

        private void SelectIcon_MouseUp(object sender, RoutedEvent e) {
+            // 禁用高级橡皮擦系统
+            DisableAdvancedEraserSystem();
+            
            forceEraser = true;
            drawingShapeMode = 0;
            inkCanvas.IsManipulationEnabled = false;
@@ -1499,7 +1566,8 @@ namespace Ink_Canvas {

        private void DrawShapePromptToPen() {
            if (isLongPressSelected == true) {
-                HideSubPanels("pen");
+                // 如果是长按选中的状态，只隐藏面板，不切换到笔模式
+                HideSubPanels("shape");
            }
            else {
                if (StackPanelCanvasControls.Visibility == Visibility.Visible)
@@ -1564,20 +1632,38 @@ namespace Ink_Canvas {
        public static bool CloseIsFromButton = false;

        public void BtnExit_Click(object sender, RoutedEventArgs e) {
-            CloseIsFromButton = true;
-            Close();
+            App.IsAppExitByUser = true;
+            Application.Current.Shutdown();
+            // CloseIsFromButton = true;
+            // Close();
        }

        public void BtnRestart_Click(object sender, RoutedEventArgs e) {
            Process.Start(System.Windows.Forms.Application.ExecutablePath, "-m");
-
+            App.IsAppExitByUser = true;
            CloseIsFromButton = true;
            Application.Current.Shutdown();
        }

        private void SettingsOverlayClick(object sender, MouseButtonEventArgs e) {
            if (isOpeningOrHidingSettingsPane == true) return;
-            BtnSettings_Click(null, null);
+            
+            // 获取点击的位置
+            Point clickPoint = e.GetPosition(BorderSettingsMask);
+            
+            // 获取BorderSettings的位置和大小
+            Point settingsPosition = BorderSettings.TranslatePoint(new Point(0, 0), BorderSettingsMask);
+            Rect settingsRect = new Rect(
+                settingsPosition.X,
+                settingsPosition.Y,
+                BorderSettings.ActualWidth,
+                BorderSettings.ActualHeight
+            );
+            
+            // 如果点击位置不在设置界面内部，才关闭设置界面
+            if (!settingsRect.Contains(clickPoint)) {
+                BtnSettings_Click(null, null);
+            }
        }

        private bool isOpeningOrHidingSettingsPane = false;
@@ -1587,6 +1673,7 @@ namespace Ink_Canvas {
                HideSubPanels();
            }
            else {
+                // 设置蒙版为可点击，并添加半透明背景
                BorderSettingsMask.IsHitTestVisible = true;
                BorderSettingsMask.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));
                SettingsPanelScrollViewer.ScrollToTop();
@@ -1679,6 +1766,9 @@ namespace Ink_Canvas {
                    ClearStrokes(true);
                    RestoreStrokes();

+                    // 退出白板时清空图片
+                    inkCanvas.Children.Clear();
+
                    if (BtnSwitchTheme.Content.ToString() == "浅色") {
                        BtnSwitch.Content = "黑板";
                        BtnExit.Foreground = Brushes.White;
@@ -1687,12 +1777,10 @@ namespace Ink_Canvas {
                        BtnSwitch.Content = "白板";
                        if (isPresentationHaveBlackSpace) {
                            BtnExit.Foreground = Brushes.White;
-                            //SymbolIconBtnColorBlackContent.Foreground = Brushes.White;
                            ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
                        }
                        else {
                            BtnExit.Foreground = Brushes.Black;
-                            //SymbolIconBtnColorBlackContent.Foreground = Brushes.White;
                            ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
                        }
                    }
@@ -1716,22 +1804,22 @@ namespace Ink_Canvas {
                        ClearStrokes(true);
                        RestoreStrokes(true);

+                        // 退出白板时清空图片
+                        inkCanvas.Children.Clear();
+
                        if (BtnSwitchTheme.Content.ToString() == "浅色") {
                            BtnSwitch.Content = "黑板";
                            BtnExit.Foreground = Brushes.White;
-                            //SymbolIconBtnColorBlackContent.Foreground = Brushes.Black;
                            ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
                        }
                        else {
                            BtnSwitch.Content = "白板";
                            if (isPresentationHaveBlackSpace) {
                                BtnExit.Foreground = Brushes.White;
-                                //SymbolIconBtnColorBlackContent.Foreground = Brushes.White;
                                ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
                            }
                            else {
                                BtnExit.Foreground = Brushes.Black;
-                                //SymbolIconBtnColorBlackContent.Foreground = Brushes.White;
                                ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
                            }
                        }
@@ -1753,22 +1841,31 @@ namespace Ink_Canvas {
                        BtnSwitch.Content = "屏幕";
                        if (BtnSwitchTheme.Content.ToString() == "浅色") {
                            BtnExit.Foreground = Brushes.White;
-                            //SymbolIconBtnColorBlackContent.Foreground = Brushes.Black;
                            ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
                        }
                        else {
                            BtnExit.Foreground = Brushes.Black;
-                            //SymbolIconBtnColorBlackContent.Foreground = Brushes.White;
                            ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
                        }

                        if (Settings.Canvas.UsingWhiteboard)
                        {
-                            BtnColorBlack_Click(null, null);
+                            // 如果有自定义背景色并且是白板模式，应用自定义背景色
+                            if (CustomBackgroundColor.HasValue)
+                            {
+                                GridBackgroundCover.Background = new SolidColorBrush(CustomBackgroundColor.Value);
+                            }
+                            // 白板模式下设置墨迹颜色为黑色
+                            CheckLastColor(0);
+                            forceEraser = false;
+                            ColorSwitchCheck();
                        }
                        else
                        {
-                            BtnColorWhite_Click(null, null);
+                            // 黑板模式下设置墨迹颜色为白色
+                            CheckLastColor(5);
+                            forceEraser = false;
+                            ColorSwitchCheck();
                        }

                        StackPanelPPTButtons.Visibility = Visibility.Collapsed;
@@ -1891,5 +1988,38 @@ namespace Ink_Canvas {
        }

        #endregion
+
+        private async void InsertImage_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            var dialog = new Microsoft.Win32.OpenFileDialog
+            {
+                Filter = "图片文件|*.jpg;*.jpeg;*.png;*.bmp;*.gif"
+            };
+            if (dialog.ShowDialog() == true)
+            {
+                string filePath = dialog.FileName;
+                Image image = await CreateAndCompressImageAsync(filePath); // 补充image定义
+                if (image != null)
+                {
+                    string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
+                    image.Name = timestamp;
+
+                    // 新缩放逻辑：最大宽高为画布一半，并居中
+                    double maxWidth = inkCanvas.ActualWidth / 2;
+                    double maxHeight = inkCanvas.ActualHeight / 2;
+                    double scaleX = maxWidth / image.Width;
+                    double scaleY = maxHeight / image.Height;
+                    double scale = Math.Min(1, Math.Min(scaleX, scaleY));
+                    image.Width = image.Width * scale;
+                    image.Height = image.Height * scale;
+                    InkCanvas.SetLeft(image, (inkCanvas.ActualWidth - image.Width) / 2);
+                    InkCanvas.SetTop(image, (inkCanvas.ActualHeight - image.Height) / 2);
+
+                    inkCanvas.Children.Add(image);
+
+                    timeMachine.CommitElementInsertHistory(image);
+                }
+            }
+        }
    }
-}
+}
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Ink_Canvas {
+namespace Ink_Canvas {
    public static class XamlGraphicsIconGeometries {
        public static string LinedCursorIcon =
            "F1 M24,24z M0,0z M5.72106,15.9716L3.71327,3.00395C3.6389,2.6693 3.65747,2.41831 3.76902,2.25099 3.88057,2.08366 4.0479,2 4.271,2 4.4941,2 4.71711,2.07437 4.94021,2.2231 6.72502,3.39438 9.28149,5.10481 12.6094,7.3544 15.677,9.45526 18.1125,11.1285 19.9159,12.3742 20.1204,12.5229 20.2505,12.6995 20.3062,12.904 20.362,13.1085 20.3249,13.2944 20.1947,13.4618 20.0832,13.6105 19.8973,13.6849 19.637,13.6849L13.3902,13.6849 17.6291,19.7365C17.722,19.8666 17.75,20.0153 17.7128,20.1827 17.6942,20.3314 17.6198,20.4522 17.4897,20.5452L15.5654,21.8838C15.4353,21.9768 15.2865,22.0139 15.1192,21.9953 14.9704,21.9582 14.8496,21.8745 14.7566,21.7444L10.2389,15.2745 7.58956,19.9038C7.45942,20.1269 7.30144,20.2756 7.11552,20.35 6.92961,20.4058 6.75292,20.3872 6.5856,20.2942 6.43686,20.2013 6.34392,20.0339 6.30673,19.7922L6.00007,17.8959C5.88852,17.0779,5.79543,16.4364,5.72106,15.9716z";
@@ -1,17 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
+using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Forms;
 using System.Windows.Ink;
 using System.Windows.Input;
-using System.Windows.Media;
 using Ink_Canvas.Helpers;

 namespace Ink_Canvas
@@ -1,13 +1,28 @@
-using Ink_Canvas.Helpers;
-using Microsoft.Win32;
+using Ink_Canvas.Helpers;
 using System;
 using System.IO;
 using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Input;
 using File = System.IO.File;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
+using System.Collections.Generic;
+using System.Windows.Controls;
+using Newtonsoft.Json;

 namespace Ink_Canvas {
+    // 1. 定义元素信息结构
+    public class CanvasElementInfo
+    {
+        public string Type { get; set; } // "Image"
+        public string SourcePath { get; set; }
+        public double Left { get; set; }
+        public double Top { get; set; }
+        public double Width { get; set; }
+        public double Height { get; set; }
+    }
    public partial class MainWindow : Window {
        private void SymbolIconSaveStrokes_MouseUp(object sender, MouseButtonEventArgs e) {
            if (lastBorderMouseDownObject != sender || inkCanvas.Visibility != Visibility.Visible) return;
@@ -33,9 +48,94 @@ namespace Ink_Canvas {
                else
                    //savePathWithName = savePath + @"\" + DateTime.Now.ToString("u").Replace(':', '-') + ".icstk";
                    savePathWithName = savePath + @"\" + DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss-fff") + ".icstk";
-                var fs = new FileStream(savePathWithName, FileMode.Create);
-                inkCanvas.Strokes.Save(fs);
-                if (newNotice) ShowNotification("墨迹成功保存至 " + savePathWithName);
+                
+                if (Settings.Automation.IsSaveFullPageStrokes)
+                {
+                    // 全页面保存模式 - 检查是否存在多页面墨迹
+                    bool hasMultiplePages = false;
+                    List<StrokeCollection> allPageStrokes = new List<StrokeCollection>();
+                    
+                    // 检查PPT放映模式下的多页面墨迹
+                    if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible && pptApplication != null)
+                    {
+                        hasMultiplePages = true;
+                        // 收集PPT放映模式下的所有页面墨迹
+                        for (int i = 1; i <= pptApplication.SlideShowWindows[1].Presentation.Slides.Count; i++)
+                        {
+                            if (memoryStreams[i] != null && memoryStreams[i].Length > 8)
+                            {
+                                memoryStreams[i].Position = 0;
+                                allPageStrokes.Add(new StrokeCollection(memoryStreams[i]));
+                            }
+                            else if (i == previousSlideID && inkCanvas.Strokes.Count > 0)
+                            {
+                                // 当前页面的墨迹
+                                allPageStrokes.Add(inkCanvas.Strokes.Clone());
+                            }
+                            else
+                            {
+                                allPageStrokes.Add(new StrokeCollection()); // 空页面
+                            }
+                        }
+                    }
+                    // 检查白板模式下的多页面墨迹
+                    else if (currentMode != 0 && WhiteboardTotalCount > 1)
+                    {
+                        hasMultiplePages = true;
+                        // 收集白板模式下的所有页面墨迹
+                        for (int i = 1; i <= WhiteboardTotalCount; i++)
+                        {
+                            if (TimeMachineHistories[i] != null)
+                            {
+                                // 从历史记录中恢复墨迹
+                                var strokes = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[i]);
+                                allPageStrokes.Add(strokes);
+                            }
+                            else
+                            {
+                                allPageStrokes.Add(new StrokeCollection()); // 空页面
+                            }
+                        }
+                    }
+                    
+                    if (hasMultiplePages && allPageStrokes.Count > 0)
+                    {
+                        // 多页面墨迹保存为压缩包
+                        string zipFileName = Path.ChangeExtension(savePathWithName, "zip");
+                        SaveMultiPageStrokesAsZip(allPageStrokes, zipFileName, newNotice);
+                    }
+                    else
+                    {
+                        // 单页面墨迹保存为图像
+                        SaveSinglePageStrokesAsImage(savePathWithName, newNotice);
+                    }
+                }
+                else
+                {
+                    // 常规保存模式 - 仅保存墨迹对象
+                    var fs = new FileStream(savePathWithName, FileMode.Create);
+                    inkCanvas.Strokes.Save(fs);
+                    fs.Close();
+                    // 保存元素信息
+                    var elementInfos = new List<CanvasElementInfo>();
+                    foreach (var child in inkCanvas.Children)
+                    {
+                        if (child is Image img && img.Source is BitmapImage bmp)
+                        {
+                            elementInfos.Add(new CanvasElementInfo
+                            {
+                                Type = "Image",
+                                SourcePath = bmp.UriSource?.LocalPath ?? "",
+                                Left = InkCanvas.GetLeft(img),
+                                Top = InkCanvas.GetTop(img),
+                                Width = img.Width,
+                                Height = img.Height
+                            });
+                        }
+                    }
+                    File.WriteAllText(Path.ChangeExtension(savePathWithName, ".elements.json"), JsonConvert.SerializeObject(elementInfos, Formatting.Indented));
+                    if (newNotice) ShowNotification("墨迹成功保存至 " + savePathWithName);
+                }
            }
            catch (Exception ex) {
                ShowNotification("墨迹保存失败");
@@ -43,6 +143,194 @@ namespace Ink_Canvas {
            }
        }

+        /// <summary>
+        /// 将多页面墨迹保存为压缩包
+        /// </summary>
+        private void SaveMultiPageStrokesAsZip(List<StrokeCollection> allPageStrokes, string zipFileName, bool newNotice)
+        {
+            try
+            {
+                // 创建临时目录来存放文件
+                string tempDir = Path.Combine(Path.GetTempPath(), $"InkCanvas_MultiPage_{DateTime.Now:yyyyMMdd_HHmmss}");
+                Directory.CreateDirectory(tempDir);
+                
+                try
+                {
+                    // 保存所有页面的文件到临时目录
+                    for (int i = 0; i < allPageStrokes.Count; i++)
+                    {
+                        var strokes = allPageStrokes[i];
+                        if (strokes.Count > 0)
+                        {
+                            // 保存墨迹文件
+                            string strokeFileName = Path.Combine(tempDir, $"page_{i + 1:D4}.icstk");
+                            using (var fs = new FileStream(strokeFileName, FileMode.Create))
+                            {
+                                strokes.Save(fs);
+                            }
+                            
+                            // 保存页面图像
+                            string imageFileName = Path.Combine(tempDir, $"page_{i + 1:D4}.png");
+                            using (var fs = new FileStream(imageFileName, FileMode.Create))
+                            {
+                                SavePageAsImage(strokes, fs);
+                            }
+                        }
+                    }
+                    
+                    // 保存元数据信息
+                    string metadataFile = Path.Combine(tempDir, "metadata.txt");
+                    using (var writer = new StreamWriter(metadataFile, false, System.Text.Encoding.UTF8))
+                    {
+                        writer.WriteLine($"保存时间: {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
+                        writer.WriteLine($"总页数: {allPageStrokes.Count}");
+                        writer.WriteLine($"模式: {(currentMode == 0 ? "PPT放映" : "白板")}");
+                        if (currentMode != 0)
+                        {
+                            writer.WriteLine($"当前页面: {CurrentWhiteboardIndex}");
+                            writer.WriteLine($"总页面数: {WhiteboardTotalCount}");
+                        }
+                        else if (pptApplication != null)
+                        {
+                            writer.WriteLine($"PPT名称: {pptApplication.SlideShowWindows[1].Presentation.Name}");
+                            writer.WriteLine($"PPT总页数: {pptApplication.SlideShowWindows[1].Presentation.Slides.Count}");
+                            writer.WriteLine($"PPT文件路径: {pptApplication.SlideShowWindows[1].Presentation.FullName}");
+                        }
+                        
+                        for (int i = 0; i < allPageStrokes.Count; i++)
+                        {
+                            writer.WriteLine($"页面 {i + 1}: {allPageStrokes[i].Count} 条墨迹");
+                        }
+                    }
+                    
+                    // 使用.NET Framework内置的压缩功能创建ZIP文件
+                    if (File.Exists(zipFileName))
+                        File.Delete(zipFileName);
+                    
+                    // 使用System.IO.Compression.FileSystem来创建ZIP
+                    System.IO.Compression.ZipFile.CreateFromDirectory(tempDir, zipFileName);
+                    
+                    if (newNotice) ShowNotification($"多页面墨迹成功保存至压缩包 {zipFileName}");
+                }
+                finally
+                {
+                    // 清理临时目录
+                    try
+                    {
+                        if (Directory.Exists(tempDir))
+                            Directory.Delete(tempDir, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"清理临时目录失败: {ex.ToString()}", LogHelper.LogType.Warning);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存多页面墨迹压缩包失败: {ex.ToString()}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 将单页面墨迹保存为图像
+        /// </summary>
+        private void SaveSinglePageStrokesAsImage(string savePathWithName, bool newNotice)
+        {
+            // 全页面保存模式 - 保存整个墨迹页面的图像
+            var bitmap = new System.Drawing.Bitmap(
+                (int)System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width, 
+                (int)System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height);
+            
+            using (var g = System.Drawing.Graphics.FromImage(bitmap))
+            {
+                // 创建黑色或透明背景
+                System.Drawing.Color bgColor = Settings.Canvas.UsingWhiteboard 
+                    ? System.Drawing.Color.White 
+                    : System.Drawing.Color.FromArgb(22, 41, 36); // 黑板背景色
+                g.Clear(bgColor);
+                
+                // 将InkCanvas墨迹渲染到Visual
+                var visual = new DrawingVisual();
+                using (var dc = visual.RenderOpen())
+                {
+                    // 创建一个VisualBrush，使用inkCanvas作为源
+                    var visualBrush = new VisualBrush(inkCanvas);
+                    // 绘制矩形并填充为inkCanvas的内容
+                    dc.DrawRectangle(visualBrush, null, new Rect(0, 0, inkCanvas.ActualWidth, inkCanvas.ActualHeight));
+                }
+                
+                // 创建适合墨迹画布尺寸的渲染位图
+                var rtb = new RenderTargetBitmap(
+                    (int)inkCanvas.ActualWidth, (int)inkCanvas.ActualHeight, 
+                    96, 96, 
+                    PixelFormats.Pbgra32);
+                rtb.Render(visual);
+                
+                // 转换为GDI+ Bitmap并保存
+                var encoder = new PngBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(rtb));
+                
+                using (var ms = new MemoryStream())
+                {
+                    encoder.Save(ms);
+                    ms.Seek(0, SeekOrigin.Begin);
+                    var imgBitmap = new System.Drawing.Bitmap(ms);
+                    
+                    // 将生成的墨迹图像绘制到屏幕截图上
+                    // 居中绘制，确保墨迹位于屏幕中央
+                    int x = (bitmap.Width - imgBitmap.Width) / 2;
+                    int y = (bitmap.Height - imgBitmap.Height) / 2;
+                    g.DrawImage(imgBitmap, x, y);
+                    
+                    // 保存为PNG
+                    string imagePathWithName = Path.ChangeExtension(savePathWithName, "png");
+                    bitmap.Save(imagePathWithName, System.Drawing.Imaging.ImageFormat.Png);
+                    
+                    // 仍然保存墨迹文件以兼容旧版本
+                    var fs = new FileStream(savePathWithName, FileMode.Create);
+                    inkCanvas.Strokes.Save(fs);
+                    fs.Close();
+                }
+            }
+            
+            // 显示提示
+            if (newNotice) ShowNotification("墨迹成功全页面保存至 " + Path.ChangeExtension(savePathWithName, "png"));
+        }
+
+        /// <summary>
+        /// 将指定墨迹集合保存为图像到指定流
+        /// </summary>
+        private void SavePageAsImage(StrokeCollection strokes, Stream outputStream)
+        {
+            try
+            {
+                // 创建临时InkCanvas来渲染墨迹
+                var tempCanvas = new InkCanvas();
+                tempCanvas.Strokes = strokes;
+                tempCanvas.Width = inkCanvas.ActualWidth;
+                tempCanvas.Height = inkCanvas.ActualHeight;
+                
+                // 创建渲染位图
+                var rtb = new RenderTargetBitmap(
+                    (int)tempCanvas.Width, (int)tempCanvas.Height, 
+                    96, 96, 
+                    PixelFormats.Pbgra32);
+                rtb.Render(tempCanvas);
+                
+                // 保存为PNG
+                var encoder = new PngBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(rtb));
+                encoder.Save(outputStream);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"保存页面图像失败: {ex.ToString()}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
        private void SymbolIconOpenStrokes_MouseUp(object sender, MouseButtonEventArgs e) {
            if (lastBorderMouseDownObject != sender) return;
            AnimationsHelper.HideWithSlideAndFade(BorderTools);
@@ -51,13 +339,256 @@ namespace Ink_Canvas {
            var openFileDialog = new OpenFileDialog();
            openFileDialog.InitialDirectory = Settings.Automation.AutoSavedStrokesLocation;
            openFileDialog.Title = "打开墨迹文件";
-            openFileDialog.Filter = "Ink Canvas Strokes File (*.icstk)|*.icstk";
+            openFileDialog.Filter = "Ink Canvas Strokes File (*.icstk)|*.icstk|ICC压缩包 (*.zip)|*.zip";
            if (openFileDialog.ShowDialog() != true) return;
            LogHelper.WriteLogToFile($"Strokes Insert: Name: {openFileDialog.FileName}",
                LogHelper.LogType.Event);
+            
            try {
+                string fileExtension = Path.GetExtension(openFileDialog.FileName).ToLower();
+                
+                if (fileExtension == ".zip") {
+                    // 处理ICC压缩包
+                    OpenICCZipFile(openFileDialog.FileName);
+                } else {
+                    // 处理单个墨迹文件
+                    OpenSingleStrokeFile(openFileDialog.FileName);
+                }
+
+                if (inkCanvas.Visibility != Visibility.Visible) SymbolIconCursor_Click(sender, null);
+            }
+            catch (Exception ex) {
+                ShowNotification("墨迹打开失败");
+                LogHelper.WriteLogToFile($"墨迹打开失败: {ex.ToString()}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 打开ICC创建的.zip压缩包
+        /// </summary>
+        private void OpenICCZipFile(string zipFilePath) {
+            try {
+                // 创建临时目录来解压文件
+                string tempDir = Path.Combine(Path.GetTempPath(), $"InkCanvas_Open_{DateTime.Now:yyyyMMdd_HHmmss}");
+                Directory.CreateDirectory(tempDir);
+                
+                try {
+                    // 解压ZIP文件
+                    System.IO.Compression.ZipFile.ExtractToDirectory(zipFilePath, tempDir);
+                    
+                    // 读取元数据文件
+                    string metadataFile = Path.Combine(tempDir, "metadata.txt");
+                    if (!File.Exists(metadataFile)) {
+                        throw new Exception("压缩包中未找到元数据文件");
+                    }
+                    
+                    var metadata = ReadMetadataFile(metadataFile);
+                    
+                    // 根据元数据信息决定恢复模式
+                    bool isPPTMode = metadata.ContainsKey("模式") && metadata["模式"].Contains("PPT放映");
+                    bool isWhiteboardMode = metadata.ContainsKey("模式") && metadata["模式"].Contains("白板");
+                    
+                    // 检查当前是否处于PPT模式
+                    bool isCurrentlyInPPTMode = BtnPPTSlideShowEnd.Visibility == Visibility.Visible && pptApplication != null;
+                    
+                    // 检查当前是否处于白板模式
+                    bool isCurrentlyInWhiteboardMode = currentMode != 0;
+                    
+                    // 严格模式隔离：只在对应模式下恢复对应墨迹
+                    if (isPPTMode && isCurrentlyInPPTMode) {
+                        // 只在PPT放映模式下恢复PPT墨迹
+                        RestorePPTStrokesFromZip(tempDir, metadata);
+                    } else if (isWhiteboardMode && isCurrentlyInWhiteboardMode) {
+                        // 只在白板模式下恢复白板墨迹
+                        RestoreWhiteboardStrokesFromZip(tempDir, metadata);
+                    } else {
+                        // 模式不匹配时，显示提示信息
+                        string savedMode = isPPTMode ? "PPT放映" : (isWhiteboardMode ? "白板" : "未知");
+                        string currentMode = isCurrentlyInPPTMode ? "PPT放映" : (isCurrentlyInWhiteboardMode ? "白板" : "桌面");
+                        ShowNotification($"墨迹保存模式({savedMode})与当前模式({currentMode})不匹配，无法恢复墨迹");
+                        LogHelper.WriteLogToFile($"模式不匹配：保存模式={savedMode}，当前模式={currentMode}", LogHelper.LogType.Warning);
+                    }
+                    
+                    ShowNotification($"成功打开ICC压缩包，共{(metadata.ContainsKey("总页数") ? metadata["总页数"] : "0")}页");
+                }
+                finally {
+                    // 清理临时目录
+                    try {
+                        if (Directory.Exists(tempDir))
+                            Directory.Delete(tempDir, true);
+                    }
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"清理临时目录失败: {ex.ToString()}", LogHelper.LogType.Warning);
+                    }
+                }
+            }
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"打开ICC压缩包失败: {ex.ToString()}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 读取元数据文件
+        /// </summary>
+        private Dictionary<string, string> ReadMetadataFile(string metadataPath) {
+            var metadata = new Dictionary<string, string>();
+            
+            using (var reader = new StreamReader(metadataPath, System.Text.Encoding.UTF8)) {
+                string line;
+                while ((line = reader.ReadLine()) != null) {
+                    if (line.Contains(":")) {
+                        var parts = line.Split(new[] { ':' }, 2);
+                        if (parts.Length == 2) {
+                            metadata[parts[0].Trim()] = parts[1].Trim();
+                        }
+                    }
+                }
+            }
+            
+            return metadata;
+        }
+
+        /// <summary>
+        /// 从ZIP文件恢复PPT墨迹
+        /// </summary>
+        private void RestorePPTStrokesFromZip(string tempDir, Dictionary<string, string> metadata) {
+            try {
+                // 确保当前处于PPT放映模式
+                if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible || pptApplication == null) {
+                    throw new InvalidOperationException("当前不在PPT放映模式，无法恢复PPT墨迹");
+                }
+                
+                // 检查PPT文件路径是否匹配
+                if (metadata.ContainsKey("PPT文件路径"))
+                {
+                    string savedPptPath = metadata["PPT文件路径"];
+                    string currentPptPath = pptApplication.SlideShowWindows[1].Presentation.FullName;
+                    
+                    if (!string.IsNullOrEmpty(savedPptPath) && !string.IsNullOrEmpty(currentPptPath))
+                    {
+                        // 使用文件路径哈希值进行比较，避免路径格式差异
+                        string savedHash = GetFileHash(savedPptPath);
+                        string currentHash = GetFileHash(currentPptPath);
+                        
+                        if (savedHash != currentHash)
+                        {
+                            throw new InvalidOperationException($"墨迹文件与当前PPT文件不匹配。保存的PPT: {savedPptPath}，当前PPT: {currentPptPath}");
+                        }
+                    }
+                }
+                
+                // 清空当前墨迹
+                ClearStrokes(true);
+                timeMachine.ClearStrokeHistory();
+                
+                // 重置PPT墨迹存储
+                if (memoryStreams == null) {
+                    memoryStreams = new MemoryStream[50];
+                }
+                
+                // 读取所有页面的墨迹文件
+                var files = Directory.GetFiles(tempDir, "page_*.icstk");
+                foreach (var file in files) {
+                    var fileName = Path.GetFileNameWithoutExtension(file);
+                    if (fileName.StartsWith("page_") && int.TryParse(fileName.Substring(5), out int pageNumber)) {
+                        using (var fs = new FileStream(file, FileMode.Open, FileAccess.Read)) {
+                            var strokes = new StrokeCollection(fs);
+                            if (strokes.Count > 0) {
+                                var ms = new MemoryStream();
+                                strokes.Save(ms);
+                                ms.Position = 0;
+                                memoryStreams[pageNumber] = ms;
+                            }
+                        }
+                    }
+                }
+                
+                // 恢复当前页面的墨迹
+                if (pptApplication.SlideShowWindows.Count > 0) {
+                    int currentSlide = pptApplication.SlideShowWindows[1].View.CurrentShowPosition;
+                    if (memoryStreams[currentSlide] != null && memoryStreams[currentSlide].Length > 0) {
+                        memoryStreams[currentSlide].Position = 0;
+                        inkCanvas.Strokes.Add(new StrokeCollection(memoryStreams[currentSlide]));
+                    }
+                    previousSlideID = currentSlide;
+                }
+                
+                LogHelper.WriteLogToFile($"成功恢复PPT墨迹，共{files.Length}页");
+            }
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"恢复PPT墨迹失败: {ex.ToString()}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 从ZIP文件恢复白板墨迹
+        /// </summary>
+        private void RestoreWhiteboardStrokesFromZip(string tempDir, Dictionary<string, string> metadata) {
+            try {
+                // 确保当前处于白板模式
+                if (currentMode == 0) {
+                    throw new InvalidOperationException("当前不在白板模式，无法恢复白板墨迹");
+                }
+                
+                // 清空当前墨迹
+                ClearStrokes(true);
+                timeMachine.ClearStrokeHistory();
+                
+                // 读取总页数
+                int totalPages = 1;
+                if (metadata.ContainsKey("总页数") && int.TryParse(metadata["总页数"], out int parsedPages)) {
+                    totalPages = parsedPages;
+                }
+                
+                // 重置白板状态
+                WhiteboardTotalCount = totalPages;
+                CurrentWhiteboardIndex = 1;
+                
+                // 清空历史记录
+                for (int i = 0; i < TimeMachineHistories.Length; i++) {
+                    TimeMachineHistories[i] = null;
+                }
+                
+                // 读取所有页面的墨迹文件
+                var files = Directory.GetFiles(tempDir, "page_*.icstk");
+                foreach (var file in files) {
+                    var fileName = Path.GetFileNameWithoutExtension(file);
+                    if (fileName.StartsWith("page_") && int.TryParse(fileName.Substring(5), out int pageNumber)) {
+                        using (var fs = new FileStream(file, FileMode.Open, FileAccess.Read)) {
+                            var strokes = new StrokeCollection(fs);
+                            if (strokes.Count > 0) {
+                                // 创建历史记录
+                                var history = new TimeMachineHistory(strokes, TimeMachineHistoryType.UserInput, false);
+                                TimeMachineHistories[pageNumber] = new TimeMachineHistory[] { history };
+                            }
+                        }
+                    }
+                }
+                
+                // 恢复第一页的墨迹
+                if (TimeMachineHistories[1] != null) {
+                    RestoreStrokes();
+                }
+                
+                // 更新UI显示
+                UpdateIndexInfoDisplay();
+                
+                LogHelper.WriteLogToFile($"成功恢复白板墨迹，共{totalPages}页");
+            }
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"恢复白板墨迹失败: {ex.ToString()}", LogHelper.LogType.Error);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 打开单个墨迹文件
+        /// </summary>
+        private void OpenSingleStrokeFile(string filePath) {
                var fileStreamHasNoStroke = false;
-                using (var fs = new FileStream(openFileDialog.FileName, FileMode.Open, FileAccess.Read)) {
+            using (var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read)) {
                    var strokes = new StrokeCollection(fs);
                    fileStreamHasNoStroke = strokes.Count == 0;
                    if (!fileStreamHasNoStroke) {
@@ -68,21 +599,37 @@ namespace Ink_Canvas {
                    }
                }

+                // 恢复元素信息
+                var elementsFile = Path.ChangeExtension(filePath, ".elements.json");
+                if (File.Exists(elementsFile))
+                {
+                    var elementInfos = JsonConvert.DeserializeObject<List<CanvasElementInfo>>(File.ReadAllText(elementsFile));
+                    foreach (var info in elementInfos)
+                    {
+                        if (info.Type == "Image" && File.Exists(info.SourcePath))
+                        {
+                            var img = new Image
+                            {
+                                Source = new BitmapImage(new Uri(info.SourcePath)),
+                                Width = info.Width,
+                                Height = info.Height
+                            };
+                            InkCanvas.SetLeft(img, info.Left);
+                            InkCanvas.SetTop(img, info.Top);
+                            inkCanvas.Children.Add(img);
+                        }
+                    }
+                }
+
                if (fileStreamHasNoStroke)
-                    using (var ms = new MemoryStream(File.ReadAllBytes(openFileDialog.FileName))) {
+                using (var ms = new MemoryStream(File.ReadAllBytes(filePath))) {
                        ms.Seek(0, SeekOrigin.Begin);
                        var strokes = new StrokeCollection(ms);
                        ClearStrokes(true);
                        timeMachine.ClearStrokeHistory();
                        inkCanvas.Strokes.Add(strokes);
                        LogHelper.NewLog($"Strokes Insert (2): Strokes Count: {strokes.Count.ToString()}");
-                    }
-
-                if (inkCanvas.Visibility != Visibility.Visible) SymbolIconCursor_Click(sender, null);
-            }
-            catch {
-                ShowNotification("墨迹打开失败");
            }
        }
    }
-}
+}
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Windows;
@@ -79,4 +79,4 @@ namespace Ink_Canvas {
                $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.png");
        }
    }
-}
+}
@@ -1,13 +1,11 @@
-using iNKORE.UI.WPF.Modern.Controls;
+using iNKORE.UI.WPF.Modern.Controls;
 using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using Point = System.Windows.Point;

 namespace Ink_Canvas {
@@ -17,6 +15,13 @@ namespace Ink_Canvas {
        private object lastBorderMouseDownObject;

        private void Border_MouseDown(object sender, MouseButtonEventArgs e) {
+            // 如果发送者是 RandomDrawPanel 或 SingleDrawPanel，且它们被隐藏，则不处理事件
+            if (sender is SimpleStackPanel panel) {
+                if ((panel == RandomDrawPanel || panel == SingleDrawPanel) && 
+                    panel.Visibility != Visibility.Visible) {
+                    return;
+                }
+            }
            lastBorderMouseDownObject = sender;
        }

@@ -237,6 +242,7 @@ namespace Ink_Canvas {
        }

        private void BtnSelect_Click(object sender, RoutedEventArgs e) {
+            ExitMultiTouchModeIfNeeded();
            forceEraser = true;
            drawingShapeMode = 0;
            inkCanvas.IsManipulationEnabled = false;
@@ -318,6 +324,7 @@ namespace Ink_Canvas {
        private void GridInkCanvasSelectionCover_ManipulationDelta(object sender, ManipulationDeltaEventArgs e) {
            try {
                if (dec.Count >= 1) {
+                    bool disableScale = dec.Count >= 3;
                    var md = e.DeltaManipulation;
                    var trans = md.Translation; // 获得位移矢量
                    var rotate = md.Rotation; // 获得旋转角度
@@ -334,7 +341,8 @@ namespace Ink_Canvas {

                    // Update matrix to reflect translation/rotation
                    m.Translate(trans.X, trans.Y); // 移动
-                    m.ScaleAt(scale.X, scale.Y, center.X, center.Y); // 缩放
+                    if (!disableScale)
+                        m.ScaleAt(scale.X, scale.Y, center.X, center.Y); // 缩放

                    var strokes = inkCanvas.GetSelectedStrokes();
                    if (StrokesSelectionClone.Count != 0)
@@ -380,6 +388,11 @@ namespace Ink_Canvas {
                    isProgramChangeStrokeSelection = false;
                    inkCanvas.Strokes.Add(StrokesSelectionClone);
                }
+                else {
+                    // 新增：启动套索选择模式
+                    inkCanvas.EditingMode = InkCanvasEditingMode.Select;
+                    inkCanvas.Select(new StrokeCollection());
+                }
            }
        }

@@ -404,5 +417,24 @@ namespace Ink_Canvas {
                StrokesSelectionClone = new StrokeCollection();
            }
        }
+
+        private void LassoSelect_Click(object sender, RoutedEventArgs e) {
+            ExitMultiTouchModeIfNeeded();
+            forceEraser = false;
+            forcePointEraser = false;
+            drawingShapeMode = 0;
+            inkCanvas.EditingMode = InkCanvasEditingMode.Select;
+            SetCursorBasedOnEditingMode(inkCanvas);
+        }
+
+        private void BtnLassoSelect_Click(object sender, RoutedEventArgs e) {
+            ExitMultiTouchModeIfNeeded();
+            forceEraser = false;
+            forcePointEraser = false;
+            drawingShapeMode = 0;
+            inkCanvas.EditingMode = InkCanvasEditingMode.Select;
+            inkCanvas.IsManipulationEnabled = true;
+            SetCursorBasedOnEditingMode(inkCanvas);
+        }
    }
 }
@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using Newtonsoft.Json;
 using System;
 using System.Diagnostics;
@@ -8,11 +8,12 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using File = System.IO.File;
 using System.Windows.Media;
-using System.Windows.Ink;
 using System.Windows.Media.Imaging;
 using System.Windows.Interop;
 using Hardcodet.Wpf.TaskbarNotification;
 using OSVersionExtension;
+using Microsoft.Win32;
+using System.IO;

 namespace Ink_Canvas {
    public partial class MainWindow : Window {
@@ -21,16 +22,33 @@ namespace Ink_Canvas {
        private void ToggleSwitchIsAutoUpdate_Toggled(object sender, RoutedEventArgs e) {
            if (!isLoaded) return;
            Settings.Startup.IsAutoUpdate = ToggleSwitchIsAutoUpdate.IsOn;
-            ToggleSwitchIsAutoUpdateWithSilence.Visibility =
+            
+            // 自动更新关闭时隐藏静默更新选项
+            ToggleSwitchIsAutoUpdateWithSilence.Visibility = 
                ToggleSwitchIsAutoUpdate.IsOn ? Visibility.Visible : Visibility.Collapsed;
+                
+            // 如果关闭了自动更新，同时也关闭静默更新
+            if (!ToggleSwitchIsAutoUpdate.IsOn) {
+                Settings.Startup.IsAutoUpdateWithSilence = false;
+                ToggleSwitchIsAutoUpdateWithSilence.IsOn = false;
+            }
+            
+            // 无论如何，静默更新时间区域的显示都要跟随静默更新设置
+            AutoUpdateTimePeriodBlock.Visibility =
+                (Settings.Startup.IsAutoUpdateWithSilence && Settings.Startup.IsAutoUpdate) ? 
+                Visibility.Visible : Visibility.Collapsed;
+                
            SaveSettingsToFile();
        }

        private void ToggleSwitchIsAutoUpdateWithSilence_Toggled(object sender, RoutedEventArgs e) {
            if (!isLoaded) return;
            Settings.Startup.IsAutoUpdateWithSilence = ToggleSwitchIsAutoUpdateWithSilence.IsOn;
+            
+            // 静默更新的时间设置区域只在静默更新开启时显示
            AutoUpdateTimePeriodBlock.Visibility =
                Settings.Startup.IsAutoUpdateWithSilence ? Visibility.Visible : Visibility.Collapsed;
+                
            SaveSettingsToFile();
        }

@@ -226,41 +244,97 @@ namespace Ink_Canvas {
        public void ComboBoxFloatingBarImg_SelectionChanged(object sender, RoutedEventArgs e) {
            if (!isLoaded) return;
            Settings.Appearance.FloatingBarImg = ComboBoxFloatingBarImg.SelectedIndex;
-            if (ComboBoxFloatingBarImg.SelectedIndex == 0) {
+            UpdateFloatingBarIcon();
+            SaveSettingsToFile();
+        }
+        
+        public void UpdateFloatingBarIcon()
+        {
+            int index = Settings.Appearance.FloatingBarImg;
+            
+            if (index == 0) {
                FloatingbarHeadIconImg.Source =
                    new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/icc.png"));
                FloatingbarHeadIconImg.Margin = new Thickness(0.5);
-            } else if (ComboBoxFloatingBarImg.SelectedIndex == 1) {
+            } else if (index == 1) {
                FloatingbarHeadIconImg.Source =
                    new BitmapImage(
                        new Uri("pack://application:,,,/Resources/Icons-png/icc-transparent-dark-small.png"));
                FloatingbarHeadIconImg.Margin = new Thickness(1.2);
-            } else if (ComboBoxFloatingBarImg.SelectedIndex == 2) {
+            } else if (index == 2) {
                FloatingbarHeadIconImg.Source =
                    new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandoujiyanhuaji.png"));
                FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-            } else if (ComboBoxFloatingBarImg.SelectedIndex == 3) {
+            } else if (index == 3) {
                FloatingbarHeadIconImg.Source =
                    new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanshounvhuaji.png"));
                FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-            } else if (ComboBoxFloatingBarImg.SelectedIndex == 4) {
+            } else if (index == 4) {
                FloatingbarHeadIconImg.Source =
                    new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanciya.png"));
                FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-            } else if (ComboBoxFloatingBarImg.SelectedIndex == 5) {
+            } else if (index == 5) {
                FloatingbarHeadIconImg.Source =
                    new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanneikuhuaji.png"));
                FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-            } else if (ComboBoxFloatingBarImg.SelectedIndex == 6) {
+            } else if (index == 6) {
                FloatingbarHeadIconImg.Source =
                    new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandogeyuanliangwo.png"));
                FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-            } else if (ComboBoxFloatingBarImg.SelectedIndex == 7) {
+            } else if (index == 7) {
                FloatingbarHeadIconImg.Source =
                    new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png"));
                FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1);
+            } else if (index >= 8 && index - 8 < Settings.Appearance.CustomFloatingBarImgs.Count) {
+                // 使用自定义图标
+                var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 8];
+                try {
+                    FloatingbarHeadIconImg.Source = new BitmapImage(new Uri(customIcon.FilePath));
+                    FloatingbarHeadIconImg.Margin = new Thickness(2);
+                } catch {
+                    // 如果加载失败，使用默认图标
+                    FloatingbarHeadIconImg.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/icc.png"));
+                    FloatingbarHeadIconImg.Margin = new Thickness(0.5);
+                }
            }
-            SaveSettingsToFile();
+        }
+        
+        public void UpdateCustomIconsInComboBox()
+        {
+            // 保留前8个内置图标选项
+            while (ComboBoxFloatingBarImg.Items.Count > 8)
+            {
+                ComboBoxFloatingBarImg.Items.RemoveAt(ComboBoxFloatingBarImg.Items.Count - 1);
+            }
+            
+            // 添加自定义图标选项
+            foreach (var customIcon in Settings.Appearance.CustomFloatingBarImgs)
+            {
+                ComboBoxItem item = new ComboBoxItem();
+                item.Content = customIcon.Name;
+                item.FontFamily = new System.Windows.Media.FontFamily("Microsoft YaHei UI");
+                ComboBoxFloatingBarImg.Items.Add(item);
+            }
+        }
+        
+        private void ButtonAddCustomIcon_Click(object sender, RoutedEventArgs e)
+        {
+            AddCustomIconWindow dialog = new AddCustomIconWindow(this);
+            dialog.Owner = this;
+            dialog.ShowDialog();
+            
+            if (dialog.IsSuccess)
+            {
+                // 自动选中新添加的图标
+                ComboBoxFloatingBarImg.SelectedIndex = ComboBoxFloatingBarImg.Items.Count - 1;
+            }
+        }
+        
+        private void ButtonManageCustomIcons_Click(object sender, RoutedEventArgs e)
+        {
+            CustomIconWindow dialog = new CustomIconWindow(this);
+            dialog.Owner = this;
+            dialog.ShowDialog();
        }

        private void ToggleSwitchEnableTimeDisplayInWhiteboardMode_Toggled(object sender, RoutedEventArgs e) {
@@ -694,6 +768,86 @@ namespace Ink_Canvas {
            SaveSettingsToFile();
        }

+        private void ToggleSwitchEnablePressureTouchMode_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+
+            Settings.Canvas.EnablePressureTouchMode = ToggleSwitchEnablePressureTouchMode.IsOn;
+            
+            // 如果启用了压感触屏模式，则自动关闭屏蔽压感
+            if (Settings.Canvas.EnablePressureTouchMode && Settings.Canvas.DisablePressure) {
+                Settings.Canvas.DisablePressure = false;
+                ToggleSwitchDisablePressure.IsOn = false;
+            }
+            
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchDisablePressure_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+
+            Settings.Canvas.DisablePressure = ToggleSwitchDisablePressure.IsOn;
+            
+            // 如果启用了屏蔽压感，则自动关闭压感触屏模式
+            if (Settings.Canvas.DisablePressure && Settings.Canvas.EnablePressureTouchMode) {
+                Settings.Canvas.EnablePressureTouchMode = false;
+                ToggleSwitchEnablePressureTouchMode.IsOn = false;
+            }
+            
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchAutoStraightenLine_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            
+            Settings.Canvas.AutoStraightenLine = ToggleSwitchAutoStraightenLine.IsOn;
+            SaveSettingsToFile();
+        }
+        
+        private void AutoStraightenLineThresholdSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            
+            Settings.Canvas.AutoStraightenLineThreshold = (int)e.NewValue;
+            SaveSettingsToFile();
+        }
+        
+        private void ToggleSwitchLineEndpointSnapping_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            
+            Settings.Canvas.LineEndpointSnapping = ToggleSwitchLineEndpointSnapping.IsOn;
+            SaveSettingsToFile();
+        }
+        
+        private void LineEndpointSnappingThresholdSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            
+            Settings.Canvas.LineEndpointSnappingThreshold = (int)e.NewValue;
+            SaveSettingsToFile();
+        }
+        
+        private void LineStraightenSensitivitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            
+            // 记录旧值用于调试
+            double oldValue = Settings.InkToShape.LineStraightenSensitivity;
+            
+            // 确保灵敏度值被正确保存到设置中
+            Settings.InkToShape.LineStraightenSensitivity = e.NewValue;
+            
+            // 输出调试信息，观察值变化
+            System.Diagnostics.Debug.WriteLine($"LineStraightenSensitivity changed: {oldValue} -> {e.NewValue}");
+            
+            // 立即保存设置到文件，确保设置不会丢失
+            SaveSettingsToFile();
+        }
+        
+        private void ToggleSwitchHighPrecisionLineStraighten_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            
+            Settings.Canvas.HighPrecisionLineStraighten = ToggleSwitchHighPrecisionLineStraighten.IsOn;
+            System.Diagnostics.Debug.WriteLine($"HighPrecisionLineStraighten changed: {Settings.Canvas.HighPrecisionLineStraighten}");
+            SaveSettingsToFile();
+        }
+
        #endregion

        #region Canvas
@@ -714,12 +868,19 @@ namespace Ink_Canvas {
        private void ComboBoxEraserSize_SelectionChanged(object sender, SelectionChangedEventArgs e) {
            if (!isLoaded) return;
            Settings.Canvas.EraserSize = ComboBoxEraserSize.SelectedIndex;
+
+            // 使用新的高级橡皮擦形状应用方法
+            ApplyAdvancedEraserShape();
+
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+            }
            SaveSettingsToFile();
        }

        private void ComboBoxEraserSizeFloatingBar_SelectionChanged(object sender, SelectionChangedEventArgs e) {
            if (!isLoaded) return;
-
            ComboBox s = (ComboBox)sender;
            Settings.Canvas.EraserSize = s.SelectedIndex;
            if (s == ComboBoxEraserSizeFloatingBar) {
@@ -729,46 +890,14 @@ namespace Ink_Canvas {
                ComboBoxEraserSizeFloatingBar.SelectedIndex = s.SelectedIndex;
                ComboBoxEraserSize.SelectedIndex = s.SelectedIndex;
            }
-            if (Settings.Canvas.EraserShapeType == 0) {
-                double k = 1;
-                switch (s.SelectedIndex) {
-                    case 0:
-                        k = 0.5;
-                        break;
-                    case 1:
-                        k = 0.8;
-                        break;
-                    case 3:
-                        k = 1.25;
-                        break;
-                    case 4:
-                        k = 1.8;
-                        break;
-                }

-                inkCanvas.EraserShape = new EllipseStylusShape(k * 90, k * 90);
-            } else if (Settings.Canvas.EraserShapeType == 1) {
-                double k = 1;
-                switch (s.SelectedIndex) {
-                    case 0:
-                        k = 0.7;
-                        break;
-                    case 1:
-                        k = 0.9;
-                        break;
-                    case 3:
-                        k = 1.2;
-                        break;
-                    case 4:
-                        k = 1.6;
-                        break;
-                }
+            // 使用新的高级橡皮擦形状应用方法
+            ApplyAdvancedEraserShape();

-                inkCanvas.EraserShape = new RectangleStylusShape(k * 90 * 0.6, k * 90);
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
            }
-
-            inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
-            inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
            SaveSettingsToFile();
        }

@@ -777,23 +906,11 @@ namespace Ink_Canvas {
            Settings.Canvas.EraserShapeType = 0;
            SaveSettingsToFile();
            CheckEraserTypeTab();
-            double k = 1;
-            switch (ComboBoxEraserSizeFloatingBar.SelectedIndex) {
-                case 0:
-                    k = 0.5;
-                    break;
-                case 1:
-                    k = 0.8;
-                    break;
-                case 3:
-                    k = 1.25;
-                    break;
-                case 4:
-                    k = 1.8;
-                    break;
-            }

-            inkCanvas.EraserShape = new EllipseStylusShape(k * 90, k * 90);
+            // 使用新的高级橡皮擦形状应用方法
+            ApplyAdvancedEraserShape();
+
+            // 确保当前处于橡皮擦模式时能立即看到效果
            inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
            inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
        }
@@ -803,23 +920,11 @@ namespace Ink_Canvas {
            Settings.Canvas.EraserShapeType = 1;
            SaveSettingsToFile();
            CheckEraserTypeTab();
-            double k = 1;
-            switch (ComboBoxEraserSizeFloatingBar.SelectedIndex) {
-                case 0:
-                    k = 0.7;
-                    break;
-                case 1:
-                    k = 0.9;
-                    break;
-                case 3:
-                    k = 1.2;
-                    break;
-                case 4:
-                    k = 1.6;
-                    break;
-            }

-            inkCanvas.EraserShape = new RectangleStylusShape(k * 90 * 0.6, k * 90);
+            // 使用新的高级橡皮擦形状应用方法
+            ApplyAdvancedEraserShape();
+
+            // 确保当前处于橡皮擦模式时能立即看到效果
            inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
            inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
        }
@@ -1135,6 +1240,13 @@ namespace Ink_Canvas {
            else
                timerKillProcess.Stop();
        }
+        
+        private void ToggleSwitchAutoEnterAnnotationModeWhenExitFoldMode_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode = ToggleSwitchAutoEnterAnnotationModeWhenExitFoldMode.IsOn;
+            SaveSettingsToFile();
+        }

        private void ToggleSwitchSaveScreenshotsInDateFolders_Toggled(object sender, RoutedEventArgs e) {
            if (!isLoaded) return;
@@ -1172,9 +1284,84 @@ namespace Ink_Canvas {
            if (!isLoaded) return;
            drawingAttributes.FitToCurve = ToggleSwitchFitToCurve.IsOn;
            Settings.Canvas.FitToCurve = ToggleSwitchFitToCurve.IsOn;
+            
+            // 启用原来的FitToCurve时自动禁用高级贝塞尔平滑
+            if (ToggleSwitchFitToCurve.IsOn)
+            {
+                ToggleSwitchAdvancedBezierSmoothing.IsOn = false;
+                Settings.Canvas.UseAdvancedBezierSmoothing = false;
+            }
+            
            SaveSettingsToFile();
        }

+        private void ToggleSwitchAdvancedBezierSmoothing_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Canvas.UseAdvancedBezierSmoothing = ToggleSwitchAdvancedBezierSmoothing.IsOn;
+
+            // 启用高级贝塞尔平滑时自动禁用原来的FitToCurve
+            if (ToggleSwitchAdvancedBezierSmoothing.IsOn)
+            {
+                ToggleSwitchFitToCurve.IsOn = false;
+                Settings.Canvas.FitToCurve = false;
+                drawingAttributes.FitToCurve = false;
+            }
+
+            // 更新墨迹平滑管理器配置
+            _inkSmoothingManager?.UpdateConfig();
+
+            SaveSettingsToFile();
+        }
+
+        // 注释掉这些方法，因为对应的UI控件还没有在XAML中定义
+        /*
+        private void ToggleSwitchAsyncInkSmoothing_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Canvas.UseAsyncInkSmoothing = ToggleSwitchAsyncInkSmoothing.IsOn;
+            _inkSmoothingManager?.UpdateConfig();
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchHardwareAcceleration_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Canvas.UseHardwareAcceleration = ToggleSwitchHardwareAcceleration.IsOn;
+            _inkSmoothingManager?.UpdateConfig();
+            SaveSettingsToFile();
+        }
+
+        private void ComboBoxInkSmoothingQuality_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Canvas.InkSmoothingQuality = ComboBoxInkSmoothingQuality.SelectedIndex;
+            _inkSmoothingManager?.UpdateConfig();
+            SaveSettingsToFile();
+        }
+
+        private void SliderMaxConcurrentTasks_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) {
+            if (!isLoaded) return;
+            Settings.Canvas.MaxConcurrentSmoothingTasks = (int)SliderMaxConcurrentTasks.Value;
+            _inkSmoothingManager?.UpdateConfig();
+            SaveSettingsToFile();
+        }
+
+        private void ButtonApplyRecommendedSettings_Click(object sender, RoutedEventArgs e) {
+            // 应用推荐的性能设置
+            Helpers.InkSmoothingManager.ApplyRecommendedSettings();
+            LoadSettings(false);
+            _inkSmoothingManager?.UpdateConfig();
+            SaveSettingsToFile();
+
+            ShowNotification("已应用推荐的性能设置");
+        }
+
+        private void ButtonShowPerformanceStats_Click(object sender, RoutedEventArgs e) {
+            if (_inkSmoothingManager != null)
+            {
+                var stats = _inkSmoothingManager.GetPerformanceStats();
+                ShowNotification($"性能统计: {stats}");
+            }
+        }
+        */
+        
        private void ToggleSwitchAutoSaveStrokesInPowerPoint_Toggled(object sender, RoutedEventArgs e) {
            if (!isLoaded) return;
            Settings.PowerPointSettings.IsAutoSaveStrokesInPowerPoint = ToggleSwitchAutoSaveStrokesInPowerPoint.IsOn;
@@ -1215,15 +1402,18 @@ namespace Ink_Canvas {
            var folderBrowser = new System.Windows.Forms.FolderBrowserDialog();
            folderBrowser.ShowDialog();
            if (folderBrowser.SelectedPath.Length > 0) AutoSavedStrokesLocation.Text = folderBrowser.SelectedPath;
+            SaveSettingsToFile();
        }

        private void SetAutoSavedStrokesLocationToDiskDButton_Click(object sender, RoutedEventArgs e) {
            AutoSavedStrokesLocation.Text = @"D:\Ink Canvas";
+            SaveSettingsToFile();
        }

        private void SetAutoSavedStrokesLocationToDocumentFolderButton_Click(object sender, RoutedEventArgs e) {
            AutoSavedStrokesLocation.Text =
                Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Ink Canvas";
+            SaveSettingsToFile();
        }

        private void ToggleSwitchAutoDelSavedFiles_Toggled(object sender, RoutedEventArgs e) {
@@ -1246,6 +1436,12 @@ namespace Ink_Canvas {
                ToggleSwitchAutoSaveScreenShotInPowerPoint.IsOn;
            SaveSettingsToFile();
        }
+        
+        private void ToggleSwitchSaveFullPageStrokes_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Automation.IsSaveFullPageStrokes = ToggleSwitchSaveFullPageStrokes.IsOn;
+            SaveSettingsToFile();
+        }

        #endregion

@@ -1281,29 +1477,52 @@ namespace Ink_Canvas {
                BoardToggleSwitchEnableMultiTouchMode.IsOn = ToggleSwitchEnableMultiTouchMode.IsOn;
            else
                ToggleSwitchEnableMultiTouchMode.IsOn = BoardToggleSwitchEnableMultiTouchMode.IsOn;
+                
            if (ToggleSwitchEnableMultiTouchMode.IsOn) {
                if (!isInMultiTouchMode) {
+                    // 保存当前编辑模式和绘图工具状态
+                    InkCanvasEditingMode currentEditingMode = inkCanvas.EditingMode;
+                    int currentDrawingShapeMode = drawingShapeMode;
+                    bool currentForceEraser = forceEraser;
+                    
                    inkCanvas.StylusDown += MainWindow_StylusDown;
                    inkCanvas.StylusMove += MainWindow_StylusMove;
                    inkCanvas.StylusUp += MainWindow_StylusUp;
                    inkCanvas.TouchDown += MainWindow_TouchDown;
                    inkCanvas.TouchDown -= Main_Grid_TouchDown;
+                    
+                    // 先设为None再设回原来的模式，避免可能的事件冲突
                    inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                    inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                    inkCanvas.Children.Clear();
                    isInMultiTouchMode = true;
+                    
+                    // 恢复到之前的编辑状态
+                    inkCanvas.EditingMode = currentEditingMode;
+                    drawingShapeMode = currentDrawingShapeMode;
+                    forceEraser = currentForceEraser;
                }
            } else {
                if (isInMultiTouchMode) {
+                    // 保存当前编辑模式和绘图工具状态
+                    InkCanvasEditingMode currentEditingMode = inkCanvas.EditingMode;
+                    int currentDrawingShapeMode = drawingShapeMode;
+                    bool currentForceEraser = forceEraser;
+                    
                    inkCanvas.StylusDown -= MainWindow_StylusDown;
                    inkCanvas.StylusMove -= MainWindow_StylusMove;
                    inkCanvas.StylusUp -= MainWindow_StylusUp;
                    inkCanvas.TouchDown -= MainWindow_TouchDown;
                    inkCanvas.TouchDown += Main_Grid_TouchDown;
+                    
+                    // 先设为None再设回原来的模式，避免可能的事件冲突
                    inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                    inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                    inkCanvas.Children.Clear();
                    isInMultiTouchMode = false;
+                    
+                    // 恢复到之前的编辑状态
+                    inkCanvas.EditingMode = currentEditingMode;
+                    drawingShapeMode = currentDrawingShapeMode;
+                    forceEraser = currentForceEraser;
                }
            }

@@ -1362,6 +1581,7 @@ namespace Ink_Canvas {
            Settings.Advanced.IsEnableEdgeGestureUtil = false;
            Settings.Advanced.EdgeGestureUtilOnlyAffectBlackboardMode = false;
            Settings.Advanced.IsEnableFullScreenHelper = false;
+            Settings.Advanced.IsEnableAvoidFullScreenHelper = false;    
            Settings.Advanced.IsEnableForceFullScreen = false;
            Settings.Advanced.IsEnableDPIChangeDetection = false;
            Settings.Advanced.IsEnableResolutionChangeDetection = false;
@@ -1408,7 +1628,7 @@ namespace Ink_Canvas {
            Settings.Automation.IsAutoKillVComYouJiao = false;
            Settings.Automation.IsAutoKillInkCanvas = false;
            Settings.Automation.IsAutoKillICA = false;
-            Settings.Automation.IsAutoKillIDT = true;
+            Settings.Automation.IsAutoKillIDT = false;
            Settings.Automation.IsAutoKillSeewoLauncher2DesktopAnnotation = false;
            Settings.Automation.IsSaveScreenshotsInDateFolders = false;
            Settings.Automation.IsAutoSaveStrokesAtScreenshot = true;
@@ -1431,7 +1651,7 @@ namespace Ink_Canvas {
            Settings.PowerPointSettings.IsNotifyHiddenPage = false;
            Settings.PowerPointSettings.IsEnableTwoFingerGestureInPresentationMode = false;
            Settings.PowerPointSettings.IsEnableFingerGestureSlideShowControl = false;
-            Settings.PowerPointSettings.IsSupportWPS = true;
+            Settings.PowerPointSettings.IsSupportWPS = false;

            Settings.Canvas.InkWidth = 2.5;
            Settings.Canvas.IsShowCursor = false;
@@ -1442,7 +1662,14 @@ namespace Ink_Canvas {
            Settings.Canvas.EraserShapeType = 1;
            Settings.Canvas.HideStrokeWhenSelecting = false;
            Settings.Canvas.ClearCanvasAndClearTimeMachine = false;
-            Settings.Canvas.FitToCurve = true;
+            Settings.Canvas.FitToCurve = false;
+            Settings.Canvas.UseAdvancedBezierSmoothing = true;
+            Settings.Canvas.EnablePressureTouchMode = false;
+            Settings.Canvas.DisablePressure = false;
+            Settings.Canvas.AutoStraightenLine = true;
+            Settings.Canvas.AutoStraightenLineThreshold = 80;
+            Settings.Canvas.LineEndpointSnapping = true;
+            Settings.Canvas.LineEndpointSnappingThreshold = 15;
            Settings.Canvas.UsingWhiteboard = false;
            Settings.Canvas.HyperbolaAsymptoteOption = 0;

@@ -1463,8 +1690,8 @@ namespace Ink_Canvas {
            Settings.Startup.IsEnableNibMode = false;
            Settings.Startup.IsAutoUpdate = true;
            Settings.Startup.IsAutoUpdateWithSilence = true;
-            Settings.Startup.AutoUpdateWithSilenceStartTime = "18:20";
-            Settings.Startup.AutoUpdateWithSilenceEndTime = "07:40";
+            Settings.Startup.AutoUpdateWithSilenceStartTime = "06:00";
+            Settings.Startup.AutoUpdateWithSilenceEndTime = "22:00";
            Settings.Startup.IsFoldAtStartup = false;
        }

@@ -1573,6 +1800,20 @@ namespace Ink_Canvas {
            SaveSettingsToFile();
        }

+        private void ToggleSwitchIsEnableAvoidFullScreenHelper_OnToggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Advanced.IsEnableAvoidFullScreenHelper = ToggleSwitchIsEnableAvoidFullScreenHelper.IsOn;
+            SaveSettingsToFile();
+            if (ToggleSwitchIsEnableAvoidFullScreenHelper.IsOn)
+            {
+                AvoidFullScreenHelper.StartAvoidFullScreen(this);
+            }
+            else
+            {
+                AvoidFullScreenHelper.StopAvoidFullScreen(this);
+            }
+        }
+
        private void ToggleSwitchIsEnableEdgeGestureUtil_Toggled(object sender, RoutedEventArgs e) {
            if (!isLoaded) return;
            Settings.Advanced.IsEnableEdgeGestureUtil = ToggleSwitchIsEnableEdgeGestureUtil.IsOn;
@@ -1641,12 +1882,112 @@ namespace Ink_Canvas {
            Settings.Advanced.IsLogEnabled = ToggleSwitchIsLogEnabled.IsOn;
            SaveSettingsToFile();
        }
+        
+        private void ToggleSwitchIsSaveLogByDate_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Advanced.IsSaveLogByDate = ToggleSwitchIsSaveLogByDate.IsOn;
+            SaveSettingsToFile();
+        }

        private void ToggleSwitchIsSecondConfimeWhenShutdownApp_Toggled(object sender, RoutedEventArgs e) {
            if (!isLoaded) return;
            Settings.Advanced.IsSecondConfirmWhenShutdownApp = ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn;
            SaveSettingsToFile();
        }
+        
+        private void ToggleSwitchIsAutoBackupBeforeUpdate_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Advanced.IsAutoBackupBeforeUpdate = ToggleSwitchIsAutoBackupBeforeUpdate.IsOn;
+            SaveSettingsToFile();
+        }
+        
+        private void BtnManualBackup_Click(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            
+            try {
+                // 确保Backups目录存在
+                string backupDir = Path.Combine(App.RootPath, "Backups");
+                if (!Directory.Exists(backupDir)) {
+                    Directory.CreateDirectory(backupDir);
+                    LogHelper.WriteLogToFile($"创建备份目录: {backupDir}", LogHelper.LogType.Info);
+                }
+                
+                // 创建备份文件名（使用当前日期时间）
+                string backupFileName = $"Settings_Backup_{DateTime.Now:yyyyMMdd_HHmmss}.json";
+                string backupPath = Path.Combine(backupDir, backupFileName);
+                
+                // 序列化当前设置并保存到备份文件
+                string settingsJson = JsonConvert.SerializeObject(Settings, Formatting.Indented);
+                File.WriteAllText(backupPath, settingsJson);
+                
+                LogHelper.WriteLogToFile($"成功创建设置备份: {backupPath}", LogHelper.LogType.Info);
+                MessageBox.Show($"设置已成功备份到:\n{backupPath}", "备份成功", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"创建设置备份时出错: {ex.Message}", LogHelper.LogType.Error);
+                MessageBox.Show($"创建备份失败: {ex.Message}", "备份失败", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+        
+        private void BtnRestoreBackup_Click(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            
+            try {
+                // 确保Backups目录存在
+                string backupDir = Path.Combine(App.RootPath, "Backups");
+                if (!Directory.Exists(backupDir)) {
+                    Directory.CreateDirectory(backupDir);
+                    LogHelper.WriteLogToFile($"创建备份目录: {backupDir}", LogHelper.LogType.Info);
+                    MessageBox.Show("没有找到备份文件，请先创建备份", "还原失败", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+                
+                // 打开文件选择对话框
+                OpenFileDialog dlg = new OpenFileDialog();
+                dlg.InitialDirectory = backupDir;
+                dlg.Filter = "设置备份文件|Settings_Backup_*.json|所有JSON文件|*.json";
+                dlg.Title = "选择要还原的备份文件";
+                
+                if (dlg.ShowDialog() == true) {
+                    // 读取备份文件
+                    string backupJson = File.ReadAllText(dlg.FileName);
+                    
+                    // 反序列化备份数据
+                    Settings backupSettings = JsonConvert.DeserializeObject<Settings>(backupJson);
+                    
+                    if (backupSettings != null) {
+                        // 确认是否要还原
+                        if (MessageBox.Show("确定要还原选择的备份文件吗？当前设置将被覆盖。", "确认还原", 
+                                MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes) {
+                            
+                            // 备份当前设置，以防出错
+                            string currentSettingsJson = JsonConvert.SerializeObject(Settings, Formatting.Indented);
+                            string tempBackupPath = Path.Combine(backupDir, $"Settings_Before_Restore_{DateTime.Now:yyyyMMdd_HHmmss}.json");
+                            File.WriteAllText(tempBackupPath, currentSettingsJson);
+                            
+                            // 还原设置
+                            Settings = backupSettings;
+                            
+                            // 保存还原后的设置到文件
+                            SaveSettingsToFile();
+                            
+                            // 重新加载设置到UI
+                            LoadSettings();
+                            
+                            LogHelper.WriteLogToFile($"成功从备份还原设置: {dlg.FileName}", LogHelper.LogType.Info);
+                            MessageBox.Show("设置已成功还原，部分设置可能需要重启软件后生效。", "还原成功", MessageBoxButton.OK, MessageBoxImage.Information);
+                        }
+                    }
+                    else {
+                        MessageBox.Show("无法解析备份文件，文件可能已损坏", "还原失败", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                }
+            }
+            catch (Exception ex) {
+                LogHelper.WriteLogToFile($"还原设置备份时出错: {ex.Message}", LogHelper.LogType.Error);
+                MessageBox.Show($"还原备份失败: {ex.Message}", "还原失败", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }

        #endregion

@@ -1672,6 +2013,31 @@ namespace Ink_Canvas {
            SaveSettingsToFile();
        }

+        private void ToggleSwitchShowRandomAndSingleDraw_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+
+            // 获取开关状态并保存到设置中
+            bool isToggled = ToggleSwitchShowRandomAndSingleDraw.IsOn;
+            Settings.RandSettings.ShowRandomAndSingleDraw = isToggled;
+
+            // 更新UI显示
+            RandomDrawPanel.Visibility = isToggled ? Visibility.Visible : Visibility.Collapsed;
+            SingleDrawPanel.Visibility = isToggled ? Visibility.Visible : Visibility.Collapsed;
+
+            // 保存设置到文件
+            SaveSettingsToFile();
+        }
+        
+        private void ToggleSwitchDirectCallCiRand_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            
+            // 获取开关状态并保存到设置中
+            Settings.RandSettings.DirectCallCiRand = ToggleSwitchDirectCallCiRand.IsOn;
+            
+            // 保存设置到文件
+            SaveSettingsToFile();
+        }
+
        #endregion

        public static void SaveSettingsToFile() {
@@ -1692,13 +2058,194 @@ namespace Ink_Canvas {
        }

        private void HyperlinkSourceToPresentRepository_Click(object sender, RoutedEventArgs e) {
-            Process.Start("https://github.com/ChangSakura/Ink-Canvas");
+            Process.Start("https://bgithub.xyz/ChangSakura/Ink-Canvas");
            HideSubPanels();
        }

        private void HyperlinkSourceToOringinalRepository_Click(object sender, RoutedEventArgs e) {
-            Process.Start("https://github.com/WXRIW/Ink-Canvas");
+            Process.Start("https://bgithub.xyz/WXRIW/Ink-Canvas");
            HideSubPanels();
        }
+
+        private async void UpdateChannelSelector_Checked(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            var radioButton = sender as System.Windows.Controls.RadioButton;
+            if (radioButton != null) {
+                string channel = radioButton.Tag.ToString();
+                UpdateChannel newChannel = channel == "Beta" ? UpdateChannel.Beta : UpdateChannel.Release;
+                
+                // 如果通道没有变化，不需要执行更新检查
+                if (Settings.Startup.UpdateChannel == newChannel) {
+                    return;
+                }
+                
+                Settings.Startup.UpdateChannel = newChannel;
+                LogHelper.WriteLogToFile($"Settings | Update channel changed to {Settings.Startup.UpdateChannel}");
+                SaveSettingsToFile();
+                
+                // 如果启用了自动更新，立即执行完整的检查更新操作
+                if (Settings.Startup.IsAutoUpdate) {
+                    LogHelper.WriteLogToFile($"AutoUpdate | Channel changed to {newChannel}, performing immediate update check");
+                    
+                    // 执行完整的更新检查
+                    await Task.Run(async () => {
+                        try {
+                            // 调用主窗口的AutoUpdate方法，它会自动清除之前的更新状态并使用新通道重新检查
+                            Dispatcher.Invoke(() => {
+                                AutoUpdate();
+                            });
+                        }
+                        catch (Exception ex) {
+                            LogHelper.WriteLogToFile($"AutoUpdate | Error during channel switch update check: {ex.Message}", LogHelper.LogType.Error);
+                        }
+                    });
+                }
+                else {
+                    LogHelper.WriteLogToFile($"AutoUpdate | Channel changed to {newChannel}, but auto-update is disabled");
+                }
+            }
+        }
+        
+        private async void FixVersionButton_Click(object sender, RoutedEventArgs e) {
+            // 显示确认对话框
+            var confirm = MessageBox.Show(
+                "此操作将下载当前选择通道的最新版本并安装，软件将自动关闭并更新。\n\n确定要执行版本修复吗？",
+                "版本修复确认",
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Question);
+                
+            if (confirm == MessageBoxResult.Yes) {
+                // 禁用按钮，避免重复点击
+                FixVersionButton.IsEnabled = false;
+                FixVersionButton.Content = "正在修复...";
+                
+                try {
+                    // 执行版本修复
+                    bool result = await AutoUpdateHelper.FixVersion(Settings.Startup.UpdateChannel);
+                    
+                    if (!result) {
+                        MessageBox.Show(
+                            "版本修复失败，可能是网络问题或当前已是最新版本。",
+                            "修复失败",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Error);
+                            
+                        // 恢复按钮状态
+                        FixVersionButton.IsEnabled = true;
+                        FixVersionButton.Content = "版本修复";
+                    }
+                    // 成功则会自动关闭应用程序并安装
+                }
+                catch (Exception ex) {
+                    LogHelper.WriteLogToFile($"Error in FixVersionButton_Click: {ex.Message}", LogHelper.LogType.Error);
+                    MessageBox.Show(
+                        $"版本修复过程中发生错误: {ex.Message}",
+                        "修复错误",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Error);
+                        
+                    // 恢复按钮状态
+                    FixVersionButton.IsEnabled = true;
+                    FixVersionButton.Content = "版本修复";
+                }
+            }
+        }
+
+        // 自定义点名背景相关方法
+        public void UpdatePickNameBackgroundsInComboBox()
+        {
+            // 清除现有的自定义背景选项
+            if (ComboBoxPickNameBackground != null) 
+            {
+                // 保留第一个默认选项
+                while (ComboBoxPickNameBackground.Items.Count > 1)
+                {
+                    ComboBoxPickNameBackground.Items.RemoveAt(ComboBoxPickNameBackground.Items.Count - 1);
+                }
+                
+                // 添加自定义背景选项
+                foreach (var background in Settings.RandSettings.CustomPickNameBackgrounds)
+                {
+                    ComboBoxItem item = new ComboBoxItem();
+                    item.Content = background.Name;
+                    item.FontFamily = new System.Windows.Media.FontFamily("Microsoft YaHei UI");
+                    ComboBoxPickNameBackground.Items.Add(item);
+                }
+            }
+        }
+
+        public void UpdatePickNameBackgroundDisplay()
+        {
+            // 此方法主要用于在外部窗口更改背景后更新UI
+            if (ComboBoxPickNameBackground != null)
+            {
+                ComboBoxPickNameBackground.SelectedIndex = Settings.RandSettings.SelectedBackgroundIndex;
+            }
+        }
+        
+        private void ComboBoxPickNameBackground_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!isLoaded) return;
+            
+            Settings.RandSettings.SelectedBackgroundIndex = ComboBoxPickNameBackground.SelectedIndex;
+            SaveSettingsToFile();
+        }
+        
+        private void ButtonAddCustomBackground_Click(object sender, RoutedEventArgs e)
+        {
+            AddPickNameBackgroundWindow dialog = new AddPickNameBackgroundWindow(this);
+            dialog.Owner = this;
+            dialog.ShowDialog();
+            
+            if (dialog.IsSuccess)
+            {
+                // 自动选中新添加的背景
+                ComboBoxPickNameBackground.SelectedIndex = ComboBoxPickNameBackground.Items.Count - 1;
+            }
+        }
+        
+        private void ButtonManageBackgrounds_Click(object sender, RoutedEventArgs e)
+        {
+            ManagePickNameBackgroundsWindow dialog = new ManagePickNameBackgroundsWindow(this);
+            dialog.Owner = this;
+            dialog.ShowDialog();
+        }
+
+        private void ToggleSwitchEnableWppProcessKill_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.PowerPointSettings.EnableWppProcessKill = ToggleSwitchEnableWppProcessKill.IsOn;
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchCompressPicturesUploaded_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            Settings.Canvas.IsCompressPicturesUploaded = ToggleSwitchCompressPicturesUploaded.IsOn;
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchAutoFoldAfterPPTSlideShow_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Automation.IsAutoFoldAfterPPTSlideShow = ToggleSwitchAutoFoldAfterPPTSlideShow.IsOn;
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchAlwaysGoToFirstPageOnReenter_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.PowerPointSettings.IsAlwaysGoToFirstPageOnReenter = ToggleSwitchAlwaysGoToFirstPageOnReenter.IsOn;
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchAutoEnterAnnotationAfterKillHite_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Automation.IsAutoEnterAnnotationAfterKillHite = ToggleSwitchAutoEnterAnnotationAfterKillHite.IsOn;
+            SaveSettingsToFile();
+        }
+
+        private void ToggleSwitchEnablePalmEraser_Toggled(object sender, RoutedEventArgs e) {
+            if (!isLoaded) return;
+            Settings.Canvas.EnablePalmEraser = ToggleSwitchEnablePalmEraser.IsOn;
+            SaveSettingsToFile();
+        }
    }
-}
+}
@@ -10,7 +10,6 @@ using System.Windows.Ink;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using File = System.IO.File;
 using OperatingSystem = OSVersionExtension.OperatingSystem;

@@ -70,16 +69,37 @@ namespace Ink_Canvas {
                    BoundsWidth = Settings.Advanced.FingerModeBoundsWidth;
                }

+                // 设置自动更新相关选项
+                ToggleSwitchIsAutoUpdate.IsOn = Settings.Startup.IsAutoUpdate;
+                
+                // 只有在启用了自动更新功能时才检查更新
                if (Settings.Startup.IsAutoUpdate) {
-                    ToggleSwitchIsAutoUpdate.IsOn = true;
+                if (isStartup) {
+                    LogHelper.WriteLogToFile("AutoUpdate | Running auto-update check at startup");
                    AutoUpdate();
                }
+                    // 当设置被修改时也检查更新（非启动时）
+                    else {
+                    LogHelper.WriteLogToFile("AutoUpdate | Running auto-update check after settings change");
+                    AutoUpdate();
+                    }
+                }

                // ToggleSwitchIsAutoUpdateWithSilence.Visibility = Settings.Startup.IsAutoUpdate ? Visibility.Visible : Visibility.Collapsed;
                if (Settings.Startup.IsAutoUpdateWithSilence) {
                    ToggleSwitchIsAutoUpdateWithSilence.IsOn = true;
                }

+                // 初始化更新通道选择
+                foreach (var radioButton in UpdateChannelSelector.Items) {
+                    if (radioButton is System.Windows.Controls.RadioButton rb) {
+                        if (rb.Tag.ToString() == Settings.Startup.UpdateChannel.ToString()) {
+                            rb.IsChecked = true;
+                            break;
+                        }
+                    }
+                }
+
                AutoUpdateTimePeriodBlock.Visibility = Settings.Startup.IsAutoUpdateWithSilence
                    ? Visibility.Visible
                    : Visibility.Collapsed;
@@ -94,6 +114,22 @@ namespace Ink_Canvas {
                Settings.Startup = new Startup();
            }

+            // 恢复崩溃后操作设置
+            if (Settings.Startup != null)
+            {
+                // 恢复崩溃后操作选项
+                if (Settings.Startup.CrashAction == 0)
+                {
+                    App.CrashAction = App.CrashActionType.SilentRestart;
+                    if (RadioCrashSilentRestart != null) RadioCrashSilentRestart.IsChecked = true;
+                }
+                else
+                {
+                    App.CrashAction = App.CrashActionType.NoAction;
+                    if (RadioCrashNoAction != null) RadioCrashNoAction.IsChecked = true;
+                }
+            }
+
            // Appearance
            if (Settings.Appearance != null) {
                if (!Settings.Appearance.IsEnableDisPlayNibModeToggler) {
@@ -210,41 +246,20 @@ namespace Ink_Canvas {
                        new SolidColorBrush(StringToColor("#FF555555"));
                }

-                ComboBoxFloatingBarImg.SelectedIndex = Settings.Appearance.FloatingBarImg;
-                if (ComboBoxFloatingBarImg.SelectedIndex == 0) {
-                    FloatingbarHeadIconImg.Source =
-                        new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/icc.png"));
-                    FloatingbarHeadIconImg.Margin = new Thickness(0.5);
-                } else if (ComboBoxFloatingBarImg.SelectedIndex == 1) {
-                    FloatingbarHeadIconImg.Source =
-                        new BitmapImage(
-                            new Uri("pack://application:,,,/Resources/Icons-png/icc-transparent-dark-small.png"));
-                    FloatingbarHeadIconImg.Margin = new Thickness(1.2);
-                } else if (ComboBoxFloatingBarImg.SelectedIndex == 2) {
-                    FloatingbarHeadIconImg.Source =
-                        new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandoujiyanhuaji.png"));
-                    FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-                } else if (ComboBoxFloatingBarImg.SelectedIndex == 3) {
-                    FloatingbarHeadIconImg.Source =
-                        new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanshounvhuaji.png"));
-                    FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-                } else if (ComboBoxFloatingBarImg.SelectedIndex == 4) {
-                    FloatingbarHeadIconImg.Source =
-                        new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanciya.png"));
-                    FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-                } else if (ComboBoxFloatingBarImg.SelectedIndex == 5) {
-                    FloatingbarHeadIconImg.Source =
-                        new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanneikuhuaji.png"));
-                    FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-                } else if (ComboBoxFloatingBarImg.SelectedIndex == 6) {
-                    FloatingbarHeadIconImg.Source =
-                        new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandogeyuanliangwo.png"));
-                    FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
-                } else if (ComboBoxFloatingBarImg.SelectedIndex == 7) {
-                    FloatingbarHeadIconImg.Source =
-                        new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png"));
-                    FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1);
+                // 更新自定义图标下拉列表
+                UpdateCustomIconsInComboBox();
+                
+                // 设置选中的图标索引
+                // 如果索引超出范围(自定义图标可能已删除)，使用默认图标
+                if (Settings.Appearance.FloatingBarImg >= ComboBoxFloatingBarImg.Items.Count)
+                {
+                    Settings.Appearance.FloatingBarImg = 0;
                }
+                
+                ComboBoxFloatingBarImg.SelectedIndex = Settings.Appearance.FloatingBarImg;
+                
+                // 更新浮动栏图标
+                UpdateFloatingBarIcon();

                ToggleSwitchEnableTimeDisplayInWhiteboardMode.IsOn =
                    Settings.Appearance.EnableTimeDisplayInWhiteboardMode;
@@ -359,6 +374,8 @@ namespace Ink_Canvas {

                ToggleSwitchAutoSaveScreenShotInPowerPoint.IsOn =
                    Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint;
+                ToggleSwitchEnableWppProcessKill.IsOn = Settings.PowerPointSettings.EnableWppProcessKill;
+                ToggleSwitchAlwaysGoToFirstPageOnReenter.IsOn = Settings.PowerPointSettings.IsAlwaysGoToFirstPageOnReenter;
            } else {
                Settings.PowerPointSettings = new PowerPointSettings();
            }
@@ -434,6 +451,12 @@ namespace Ink_Canvas {
                    inkCanvas.ForceCursor = false;
                }

+                // 初始化压感触屏模式开关状态
+                ToggleSwitchEnablePressureTouchMode.IsOn = Settings.Canvas.EnablePressureTouchMode;
+                
+                // 初始化屏蔽压感开关状态
+                ToggleSwitchDisablePressure.IsOn = Settings.Canvas.DisablePressure;
+
                ComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
                BoardComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;

@@ -458,7 +481,7 @@ namespace Ink_Canvas {
                                k = 1.25;
                                break;
                            case 4:
-                                k = 1.8;
+                                k = 1.5;
                                break;
                        }

@@ -479,7 +502,7 @@ namespace Ink_Canvas {
                                k = 1.2;
                                break;
                            case 4:
-                                k = 1.6;
+                                k = 1.5;
                                break;
                        }

@@ -493,52 +516,97 @@ namespace Ink_Canvas {

                ToggleSwitchHideStrokeWhenSelecting.IsOn = Settings.Canvas.HideStrokeWhenSelecting;

-                if (Settings.Canvas.FitToCurve) {
-                    ToggleSwitchFitToCurve.IsOn = true;
-                    drawingAttributes.FitToCurve = true;
-                } else {
+                // 初始化贝塞尔曲线平滑设置
+                if (Settings.Canvas.UseAdvancedBezierSmoothing)
+                {
+                    // 如果启用高级贝塞尔平滑，则禁用原来的FitToCurve
+                    ToggleSwitchAdvancedBezierSmoothing.IsOn = true;
                    ToggleSwitchFitToCurve.IsOn = false;
                    drawingAttributes.FitToCurve = false;
                }
+                else if (Settings.Canvas.FitToCurve)
+                {
+                    // 如果启用原来的FitToCurve，则禁用高级贝塞尔平滑
+                    ToggleSwitchFitToCurve.IsOn = true;
+                    ToggleSwitchAdvancedBezierSmoothing.IsOn = false;
+                    drawingAttributes.FitToCurve = true;
+                }
+                else
+                {
+                    // 两者都禁用
+                    ToggleSwitchFitToCurve.IsOn = false;
+                    ToggleSwitchAdvancedBezierSmoothing.IsOn = false;
+                    drawingAttributes.FitToCurve = false;
+                }
+
+                // 注释掉新的墨迹平滑性能设置，因为UI控件还没有定义
+                /*
+                // 初始化新的墨迹平滑性能设置
+                ToggleSwitchAsyncInkSmoothing.IsOn = Settings.Canvas.UseAsyncInkSmoothing;
+                ToggleSwitchHardwareAcceleration.IsOn = Settings.Canvas.UseHardwareAcceleration;
+                ComboBoxInkSmoothingQuality.SelectedIndex = Settings.Canvas.InkSmoothingQuality;
+                SliderMaxConcurrentTasks.Value = Settings.Canvas.MaxConcurrentSmoothingTasks > 0 ?
+                    Settings.Canvas.MaxConcurrentSmoothingTasks : Environment.ProcessorCount;
+
+                // 检查硬件加速支持
+                if (!Helpers.InkSmoothingManager.IsHardwareAccelerationSupported())
+                {
+                    ToggleSwitchHardwareAcceleration.IsEnabled = false;
+                    // 可以添加提示文本说明硬件加速不可用
+                }
+                */
+                
+                // 初始化直线自动拉直相关设置
+                ToggleSwitchAutoStraightenLine.IsOn = Settings.Canvas.AutoStraightenLine;
+                AutoStraightenLineThresholdSlider.Value = Settings.Canvas.AutoStraightenLineThreshold;
+                // 直线拉直灵敏度也在这里初始化，即使它存储在InkToShape中
+                LineStraightenSensitivitySlider.Value = Settings.InkToShape.LineStraightenSensitivity;
+                // 初始化高精度直线拉直设置
+                ToggleSwitchHighPrecisionLineStraighten.IsOn = Settings.Canvas.HighPrecisionLineStraighten;
+                
+                // 初始化直线端点吸附相关设置
+                ToggleSwitchLineEndpointSnapping.IsOn = Settings.Canvas.LineEndpointSnapping;
+                ToggleSwitchCompressPicturesUploaded.IsOn = Settings.Canvas.IsCompressPicturesUploaded;
            } else {
                Settings.Canvas = new Canvas();
            }

+            // Palm Eraser
+            if (Settings.Canvas != null) {
+                ToggleSwitchEnablePalmEraser.IsOn = Settings.Canvas.EnablePalmEraser;
+            }
+
            // Advanced
            if (Settings.Advanced != null) {
                TouchMultiplierSlider.Value = Settings.Advanced.TouchMultiplier;
                FingerModeBoundsWidthSlider.Value = Settings.Advanced.FingerModeBoundsWidth;
                NibModeBoundsWidthSlider.Value = Settings.Advanced.NibModeBoundsWidth;
                ToggleSwitchIsLogEnabled.IsOn = Settings.Advanced.IsLogEnabled;
-
+                ToggleSwitchIsSaveLogByDate.IsOn = Settings.Advanced.IsSaveLogByDate;
                ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn = Settings.Advanced.IsSecondConfirmWhenShutdownApp;
-
-                ToggleSwitchEraserBindTouchMultiplier.IsOn = Settings.Advanced.EraserBindTouchMultiplier;
-
                ToggleSwitchIsSpecialScreen.IsOn = Settings.Advanced.IsSpecialScreen;
-
-                TouchMultiplierSlider.Visibility =
-                    ToggleSwitchIsSpecialScreen.IsOn ? Visibility.Visible : Visibility.Collapsed;
-
                ToggleSwitchIsQuadIR.IsOn = Settings.Advanced.IsQuadIR;
-
+                ToggleSwitchEraserBindTouchMultiplier.IsOn = Settings.Advanced.EraserBindTouchMultiplier;
                ToggleSwitchIsEnableFullScreenHelper.IsOn = Settings.Advanced.IsEnableFullScreenHelper;
+                ToggleSwitchIsEnableEdgeGestureUtil.IsOn = Settings.Advanced.IsEnableEdgeGestureUtil;
+                ToggleSwitchIsEnableForceFullScreen.IsOn = Settings.Advanced.IsEnableForceFullScreen;
+                ToggleSwitchIsEnableResolutionChangeDetection.IsOn = Settings.Advanced.IsEnableResolutionChangeDetection;
+                ToggleSwitchIsEnableDPIChangeDetection.IsOn = Settings.Advanced.IsEnableDPIChangeDetection;
+                ToggleSwitchIsEnableAvoidFullScreenHelper.IsOn = Settings.Advanced.IsEnableAvoidFullScreenHelper;
+                ToggleSwitchIsAutoBackupBeforeUpdate.IsOn = Settings.Advanced.IsAutoBackupBeforeUpdate;
                if (Settings.Advanced.IsEnableFullScreenHelper) {
                    FullScreenHelper.MarkFullscreenWindowTaskbarList(new WindowInteropHelper(this).Handle, true);
                }
-
-                ToggleSwitchIsEnableEdgeGestureUtil.IsOn = Settings.Advanced.IsEnableEdgeGestureUtil;
+                if (Settings.Advanced.IsEnableAvoidFullScreenHelper)
+                {
+                    AvoidFullScreenHelper.StartAvoidFullScreen(this);
+                }
                if (Settings.Advanced.IsEnableEdgeGestureUtil) {
                    if (OSVersion.GetOperatingSystem() >= OperatingSystem.Windows10)
                        EdgeGestureUtil.DisableEdgeGestures(new WindowInteropHelper(this).Handle, true);
                }
-
-                ToggleSwitchIsEnableForceFullScreen.IsOn = Settings.Advanced.IsEnableForceFullScreen;
-
-                ToggleSwitchIsEnableDPIChangeDetection.IsOn = Settings.Advanced.IsEnableDPIChangeDetection;
-
-                ToggleSwitchIsEnableResolutionChangeDetection.IsOn =
-                    Settings.Advanced.IsEnableResolutionChangeDetection;
+                TouchMultiplierSlider.Visibility =
+                    ToggleSwitchIsSpecialScreen.IsOn ? Visibility.Visible : Visibility.Collapsed;
            } else {
                Settings.Advanced = new Advanced();
            }
@@ -558,16 +626,37 @@ namespace Ink_Canvas {
                ToggleCheckboxEnableInkToShapeRectangle.IsChecked = Settings.InkToShape.IsInkToShapeRectangle;

                ToggleCheckboxEnableInkToShapeRounded.IsChecked = Settings.InkToShape.IsInkToShapeRounded;
+                
+                // 直线拉直灵敏度在Canvas部分已经初始化，这里不再重复
            } else {
                Settings.InkToShape = new InkToShape();
            }

            // RandSettings
-            if (Settings.RandSettings != null) { } else {
+            if (Settings.RandSettings != null) {
+                ToggleSwitchDisplayRandWindowNamesInputBtn.IsOn = Settings.RandSettings.DisplayRandWindowNamesInputBtn;
+                RandWindowOnceCloseLatencySlider.Value = Settings.RandSettings.RandWindowOnceCloseLatency;
+                RandWindowOnceMaxStudentsSlider.Value = Settings.RandSettings.RandWindowOnceMaxStudents;
+                ToggleSwitchShowRandomAndSingleDraw.IsOn = Settings.RandSettings.ShowRandomAndSingleDraw;
+                ToggleSwitchDirectCallCiRand.IsOn = Settings.RandSettings.DirectCallCiRand;
+                RandomDrawPanel.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
+                SingleDrawPanel.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
+                
+                // 加载自定义点名背景
+                UpdatePickNameBackgroundsInComboBox();
+                
+                // 设置选择的背景索引
+                if (Settings.RandSettings.SelectedBackgroundIndex >= ComboBoxPickNameBackground.Items.Count)
+                {
+                    Settings.RandSettings.SelectedBackgroundIndex = 0;
+                }
+                ComboBoxPickNameBackground.SelectedIndex = Settings.RandSettings.SelectedBackgroundIndex;
+            } else {
                Settings.RandSettings = new RandSettings();
                ToggleSwitchDisplayRandWindowNamesInputBtn.IsOn = Settings.RandSettings.DisplayRandWindowNamesInputBtn;
                RandWindowOnceCloseLatencySlider.Value = Settings.RandSettings.RandWindowOnceCloseLatency;
                RandWindowOnceMaxStudentsSlider.Value = Settings.RandSettings.RandWindowOnceMaxStudents;
+                ToggleSwitchDirectCallCiRand.IsOn = Settings.RandSettings.DirectCallCiRand;
            }

            // Automation
@@ -613,9 +702,12 @@ namespace Ink_Canvas {
                    SettingsShowCanvasAtNewSlideShowStackPanel.Opacity = 0.5;
                    SettingsShowCanvasAtNewSlideShowStackPanel.IsHitTestVisible = false;
                }
+                

                ToggleSwitchAutoFoldInPPTSlideShow.IsOn = Settings.Automation.IsAutoFoldInPPTSlideShow;

+                ToggleSwitchAutoFoldAfterPPTSlideShow.IsOn = Settings.Automation.IsAutoFoldAfterPPTSlideShow;
+
                if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
                    Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
                    || Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT ||
@@ -648,6 +740,8 @@ namespace Ink_Canvas {
                ToggleSwitchSaveScreenshotsInDateFolders.IsOn = Settings.Automation.IsSaveScreenshotsInDateFolders;

                ToggleSwitchAutoSaveStrokesAtScreenshot.IsOn = Settings.Automation.IsAutoSaveStrokesAtScreenshot;
+                
+                ToggleSwitchSaveFullPageStrokes.IsOn = Settings.Automation.IsSaveFullPageStrokes;

                SideControlMinimumAutomationSlider.Value = Settings.Automation.MinimumAutomationStrokeNumber;

@@ -655,6 +749,9 @@ namespace Ink_Canvas {
                ToggleSwitchAutoDelSavedFiles.IsOn = Settings.Automation.AutoDelSavedFiles;
                ComboBoxAutoDelSavedFilesDaysThreshold.Text =
                    Settings.Automation.AutoDelSavedFilesDaysThreshold.ToString();
+                    
+                // 加载退出收纳模式自动切换至批注模式设置
+                ToggleSwitchAutoEnterAnnotationModeWhenExitFoldMode.IsOn = Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode;
            } else {
                Settings.Automation = new Automation();
            }
@@ -56,7 +56,7 @@ namespace Ink_Canvas {
        #endregion Floating Bar Control

        private int drawingShapeMode = 0;
-        private bool isLongPressSelected = false; // 用于存是否是“选中”状态，便于后期抬笔后不做切换到笔的处理
+        private bool isLongPressSelected = false; // 用于存是否是"选中"状态，便于后期抬笔后不做切换到笔的处理

        #region Buttons

@@ -103,17 +103,36 @@ namespace Ink_Canvas {
        }

        private void BtnPen_Click(object sender, RoutedEventArgs e) {
+            // 禁用高级橡皮擦系统
+            DisableAdvancedEraserSystem();
+            
+            // 如果当前已是批注模式，再次点击弹出批注子面板
+            if (penType == 0 && inkCanvas.EditingMode == InkCanvasEditingMode.Ink && !drawingAttributes.IsHighlighter) {
+                return;
+            }
+            // 否则只切换到批注模式，不弹出子面板
            forceEraser = false;
+            forcePointEraser = false;
            drawingShapeMode = 0;
+            penType = 0;
+            drawingAttributes.IsHighlighter = false;
+            drawingAttributes.StylusTip = StylusTip.Ellipse;
            inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
-            inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode();
-            isLongPressSelected = false;
+            SetCursorBasedOnEditingMode(inkCanvas);
        }

        private Task<bool> CheckIsDrawingShapesInMultiTouchMode() {
            if (isInMultiTouchMode) {
-                ToggleSwitchEnableMultiTouchMode.IsOn = false;
+                // 不关闭多指书写模式，而是保存状态，暂时禁用多指书写相关的事件处理
+                // 不再调用 ToggleSwitchEnableMultiTouchMode.IsOn = false;
+                
+                // 暂时禁用多指书写事件处理，以避免冲突
+                inkCanvas.StylusDown -= MainWindow_StylusDown;
+                inkCanvas.StylusMove -= MainWindow_StylusMove;
+                inkCanvas.StylusUp -= MainWindow_StylusUp;
+                inkCanvas.TouchDown -= MainWindow_TouchDown;
+                
+                // 记录已暂时禁用多指书写模式，但实际上多指书写开关仍然为打开状态
                lastIsInMultiTouchMode = true;
            }

@@ -122,320 +141,247 @@ namespace Ink_Canvas {

        private async void BtnDrawLine_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            if (lastMouseDownSender == sender) {
-                forceEraser = true;
-                drawingShapeMode = 1;
-                inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode();
-            }
-
+            EnterShapeDrawingMode(1);
+            CancelSingleFingerDragMode();
            lastMouseDownSender = null;
            if (isLongPressSelected) {
                if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
                var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
                ImageDrawLine.BeginAnimation(OpacityProperty, dA);
            }
-
            DrawShapePromptToPen();
        }

        private async void BtnDrawDashedLine_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            if (lastMouseDownSender == sender) {
-                forceEraser = true;
-                drawingShapeMode = 8;
-                inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode();
-            }
-
+            EnterShapeDrawingMode(8);
+            CancelSingleFingerDragMode();
            lastMouseDownSender = null;
            if (isLongPressSelected) {
                if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
                var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
                ImageDrawDashedLine.BeginAnimation(OpacityProperty, dA);
            }
-
            DrawShapePromptToPen();
        }

        private async void BtnDrawDotLine_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            if (lastMouseDownSender == sender) {
-                forceEraser = true;
-                drawingShapeMode = 18;
-                inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode();
-            }
-
+            EnterShapeDrawingMode(18);
+            CancelSingleFingerDragMode();
            lastMouseDownSender = null;
            if (isLongPressSelected) {
                if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
                var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
                ImageDrawDotLine.BeginAnimation(OpacityProperty, dA);
            }
-
            DrawShapePromptToPen();
        }

        private async void BtnDrawArrow_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            if (lastMouseDownSender == sender) {
-                forceEraser = true;
-                drawingShapeMode = 2;
-                inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode();
-            }
-
+            EnterShapeDrawingMode(2);
+            CancelSingleFingerDragMode();
            lastMouseDownSender = null;
            if (isLongPressSelected) {
                if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
                var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
                ImageDrawArrow.BeginAnimation(OpacityProperty, dA);
            }
-
            DrawShapePromptToPen();
        }

        private async void BtnDrawParallelLine_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            if (lastMouseDownSender == sender) {
-                forceEraser = true;
-                drawingShapeMode = 15;
-                inkCanvas.EditingMode = InkCanvasEditingMode.None;
-                inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode();
-            }
-
+            EnterShapeDrawingMode(15);
+            CancelSingleFingerDragMode();
            lastMouseDownSender = null;
            if (isLongPressSelected) {
                if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
                var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
                ImageDrawParallelLine.BeginAnimation(OpacityProperty, dA);
            }
-
            DrawShapePromptToPen();
        }

        private async void BtnDrawCoordinate1_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 11;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(11);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCoordinate2_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 12;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(12);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCoordinate3_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 13;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(13);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCoordinate4_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 14;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(14);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCoordinate5_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 17;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(17);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawRectangle_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 3;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(3);
            CancelSingleFingerDragMode();
+            isLongPressSelected = true; // 设置为选中状态，避免抬笔后切换回笔模式
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawRectangleCenter_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 19;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(19);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawEllipse_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 4;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(4);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCircle_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 5;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(5);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCenterEllipse_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 16;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(16);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCenterEllipseWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 23;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(23);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawDashedCircle_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 10;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(10);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawHyperbola_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 24;
+            EnterShapeDrawingMode(24);
            drawMultiStepShapeCurrentStep = 0;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawHyperbolaWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 25;
+            EnterShapeDrawingMode(25);
            drawMultiStepShapeCurrentStep = 0;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawParabola1_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 20;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(20);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawParabolaWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 22;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(22);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawParabola2_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 21;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(21);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCylinder_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 6;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(6);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCone_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 7;
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
+            EnterShapeDrawingMode(7);
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        private async void BtnDrawCuboid_Click(object sender, MouseButtonEventArgs e) {
            await CheckIsDrawingShapesInMultiTouchMode();
-            forceEraser = true;
-            drawingShapeMode = 9;
+            EnterShapeDrawingMode(9);
            isFirstTouchCuboid = true;
            CuboidFrontRectIniP = new Point();
            CuboidFrontRectEndP = new Point();
-            inkCanvas.EditingMode = InkCanvasEditingMode.None;
-            inkCanvas.IsManipulationEnabled = true;
            CancelSingleFingerDragMode();
+            lastMouseDownSender = null;
            DrawShapePromptToPen();
        }

        #endregion

        private void inkCanvas_TouchMove(object sender, TouchEventArgs e) {
-            if (isSingleFingerDragMode) return;
+            // 确保套索选择模式下触摸移动时光标保持可见
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.Select) {
+                SetCursorBasedOnEditingMode(inkCanvas);
+            }
+
+            // 处理几何绘制模式
            if (drawingShapeMode != 0) {
-                if (isLastTouchEraser) return;
-                //EraserContainer.Background = null;
-                //ImageEraser.Visibility = Visibility.Visible;
-                if (isWaitUntilNextTouchDown) return;
+                if (isWaitUntilNextTouchDown && dec.Count > 1) return;
                if (dec.Count > 1) {
-                    isWaitUntilNextTouchDown = true;
                    try {
                        inkCanvas.Strokes.Remove(lastTempStroke);
                        inkCanvas.Strokes.Remove(lastTempStrokeCollection);
@@ -443,15 +389,21 @@ namespace Ink_Canvas {
                    catch {
                        Trace.WriteLine("lastTempStrokeCollection failed.");
                    }
-
                    return;
                }
-
-                if (inkCanvas.EditingMode != InkCanvasEditingMode.None)
-                    inkCanvas.EditingMode = InkCanvasEditingMode.None;
+                // 在几何绘制模式下，确保处理单点触控的移动事件
+                Point touchPoint = e.GetTouchPoint(inkCanvas).Position;
+                MouseTouchMove(touchPoint);
+                return; // 处理完几何绘制后直接返回，不执行后面的代码
            }

-            MouseTouchMove(e.GetTouchPoint(inkCanvas).Position);
+            // 其它模式下，允许橡皮、套索、批注等正常工作，不覆盖EditingMode
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint ||
+                inkCanvas.EditingMode == InkCanvasEditingMode.Select ||
+                inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
+                // 允许正常橡皮、套索、批注
+                return;
+            }
        }

        private int drawMultiStepShapeCurrentStep = 0; //多笔完成的图形 当前所处在的笔画
@@ -465,6 +417,7 @@ namespace Ink_Canvas {
        #region 形状绘制主函数

        private void MouseTouchMove(Point endP) {
+            // 禁用原有的FitToCurve，使用新的高级贝塞尔曲线平滑
            if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = false;
            ViewboxFloatingBar.IsHitTestVisible = false;
            BlackboardUIGridForInkReplay.IsHitTestVisible = false;
@@ -1271,16 +1224,6 @@ namespace Ink_Canvas {
        private Point CuboidFrontRectIniP = new Point();
        private Point CuboidFrontRectEndP = new Point();

-        private void Main_Grid_TouchUp(object sender, TouchEventArgs e) {
-
-            inkCanvas.ReleaseAllTouchCaptures();
-            ViewboxFloatingBar.IsHitTestVisible = true;
-            BlackboardUIGridForInkReplay.IsHitTestVisible = true;
-
-            inkCanvas_MouseUp(sender, null);
-            if (dec.Count == 0) isWaitUntilNextTouchDown = false;
-        }
-
        private Stroke lastTempStroke = null;
        private StrokeCollection lastTempStrokeCollection = new StrokeCollection();

@@ -1468,17 +1411,37 @@ namespace Ink_Canvas {
                }

                if (lastIsInMultiTouchMode) {
-                    ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                    // 不再重新启用开关，而是恢复多指书写相关的事件处理
+                    // ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                    
+                    // 恢复多指书写事件处理
+                    inkCanvas.StylusDown += MainWindow_StylusDown;
+                    inkCanvas.StylusMove += MainWindow_StylusMove;
+                    inkCanvas.StylusUp += MainWindow_StylusUp;
+                    inkCanvas.TouchDown += MainWindow_TouchDown;
+                    
                    lastIsInMultiTouchMode = false;
                }
            }

+            // 修改此处逻辑，确保在正确的情况下才切换回笔模式
            if (drawingShapeMode != 9 && drawingShapeMode != 0 && drawingShapeMode != 24 && drawingShapeMode != 25) {
-                if (isLongPressSelected) { }
+                if (isLongPressSelected) { 
+                    // 如果是长按选中的情况，保持图形模式，不做任何切换
+                    isWaitUntilNextTouchDown = true; // 保持当前绘图模式直到下一次触摸
+                }
                else {
                    BtnPen_Click(null, null); //画完一次还原到笔模式
                    if (lastIsInMultiTouchMode) {
-                        ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                        // 不再重新启用开关，而是恢复多指书写相关的事件处理
+                        // ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                        
+                        // 恢复多指书写事件处理
+                        inkCanvas.StylusDown += MainWindow_StylusDown;
+                        inkCanvas.StylusMove += MainWindow_StylusMove;
+                        inkCanvas.StylusUp += MainWindow_StylusUp;
+                        inkCanvas.TouchDown += MainWindow_TouchDown;
+                        
                        lastIsInMultiTouchMode = false;
                    }
                }
@@ -1504,7 +1467,15 @@ namespace Ink_Canvas {
                else {
                    BtnPen_Click(null, null); //画完还原到笔模式
                    if (lastIsInMultiTouchMode) {
-                        ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                        // 不再重新启用开关，而是恢复多指书写相关的事件处理
+                        // ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                        
+                        // 恢复多指书写事件处理
+                        inkCanvas.StylusDown += MainWindow_StylusDown;
+                        inkCanvas.StylusMove += MainWindow_StylusMove;
+                        inkCanvas.StylusUp += MainWindow_StylusUp;
+                        inkCanvas.TouchDown += MainWindow_TouchDown;
+                        
                        lastIsInMultiTouchMode = false;
                    }

@@ -1550,7 +1521,15 @@ namespace Ink_Canvas {

                    BtnPen_Click(null, null); //画完还原到笔模式
                    if (lastIsInMultiTouchMode) {
-                        ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                        // 不再重新启用开关，而是恢复多指书写相关的事件处理
+                        // ToggleSwitchEnableMultiTouchMode.IsOn = true;
+                        
+                        // 恢复多指书写事件处理
+                        inkCanvas.StylusDown += MainWindow_StylusDown;
+                        inkCanvas.StylusMove += MainWindow_StylusMove;
+                        inkCanvas.StylusUp += MainWindow_StylusUp;
+                        inkCanvas.TouchDown += MainWindow_TouchDown;
+                        
                        lastIsInMultiTouchMode = false;
                    }
                }
@@ -1595,7 +1574,32 @@ namespace Ink_Canvas {
                }
            }

-            if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = true;
+            // 应用高级贝塞尔曲线平滑
+            if (Settings.Canvas.UseAdvancedBezierSmoothing)
+            {
+                try
+                {
+                    // 对临时笔画应用平滑
+                    if (lastTempStroke != null && _inkSmoothingManager != null)
+                    {
+                        var smoothedStroke = _inkSmoothingManager.SmoothStroke(lastTempStroke);
+                        if (smoothedStroke != lastTempStroke)
+                        {
+                            inkCanvas.Strokes.Remove(lastTempStroke);
+                            lastTempStroke = smoothedStroke;
+                            inkCanvas.Strokes.Add(smoothedStroke);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Debug.WriteLine($"形状绘制高级贝塞尔曲线平滑失败: {ex.Message}");
+                }
+            }
+            else if (Settings.Canvas.FitToCurve == true) 
+            {
+                drawingAttributes.FitToCurve = true;
+            }
        }

        private bool NeedUpdateIniP() {
@@ -1607,10 +1611,34 @@ namespace Ink_Canvas {

        private void MainWindow_OnMouseMove(object sender, MouseEventArgs e) {
            if (e.StylusDevice == null) {
+                // 鼠标移动时保持光标可见
                System.Windows.Forms.Cursor.Show();
+                
+                // 如果用户设置了显示光标，则确保光标显示正确
+                if (Settings.Canvas.IsShowCursor && inkCanvas != null) {
+                    inkCanvas.ForceCursor = true;
+                    inkCanvas.UseCustomCursor = true;
+                }
            } else {
-                System.Windows.Forms.Cursor.Hide();
+                // 只有当用户未设置显示光标时才隐藏
+                if (!Settings.Canvas.IsShowCursor) {
+                    System.Windows.Forms.Cursor.Hide();
+                } else if (inkCanvas != null) {
+                    // 如果用户设置了显示光标，则确保光标显示正确
+                    inkCanvas.ForceCursor = true;
+                    inkCanvas.UseCustomCursor = true;
+                    System.Windows.Forms.Cursor.Show();
+                }
            }
        }
+
+        // 在MainWindow类中添加：
+        private void EnterShapeDrawingMode(int mode) {
+            forceEraser = true;
+            forcePointEraser = false;
+            drawingShapeMode = mode;
+            inkCanvas.EditingMode = InkCanvasEditingMode.None;
+            SetCursorBasedOnEditingMode(inkCanvas);
+        }
    }
 }
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
@@ -13,12 +14,172 @@ namespace Ink_Canvas {
    public partial class MainWindow : Window {
        private StrokeCollection newStrokes = new StrokeCollection();
        private List<Circle> circles = new List<Circle>();
+        private const double LINE_STRAIGHTEN_THRESHOLD = 0.20; // 默认灵敏度阈值，与UI默认值对应

        private void inkCanvas_StrokeCollected(object sender, InkCanvasStrokeCollectedEventArgs e) {
+            // 标记是否进行了直线拉直
+            bool wasStraightened = false;
+            
+            // 禁用原有的FitToCurve，使用新的高级贝塞尔曲线平滑
            if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = false;

            try {
                inkCanvas.Opacity = 1;
+                
+                // 应用屏蔽压感功能 - 如果启用，所有笔画都使用统一粗细
+                if (Settings.Canvas.DisablePressure) {
+                    var uniformPoints = new StylusPointCollection();
+                    foreach (StylusPoint point in e.Stroke.StylusPoints) {
+                        StylusPoint newPoint = new StylusPoint(point.X, point.Y, 0.5f); // 统一压感值为0.5
+                        uniformPoints.Add(newPoint);
+                    }
+                    e.Stroke.StylusPoints = uniformPoints;
+                }
+                // 应用压感触屏模式 - 如果启用并且检测到触屏输入
+                else if (Settings.Canvas.EnablePressureTouchMode) {
+                    bool isTouchInput = true;
+                    foreach (StylusPoint point in e.Stroke.StylusPoints) {
+                        // 检测是否为压感笔输入（压感笔的PressureFactor不等于0.5或0）
+                        if ((point.PressureFactor > 0.501 || point.PressureFactor < 0.5) && point.PressureFactor != 0) {
+                            isTouchInput = false;
+                            break;
+                        }
+                    }
+
+                    // 如果是触屏输入，则应用模拟压感
+                    if (isTouchInput) {
+                        switch (Settings.Canvas.InkStyle) {
+                            case 1:
+                                if (penType == 0)
+                                    try {
+                                        var stylusPoints = new StylusPointCollection();
+                                        var n = e.Stroke.StylusPoints.Count - 1;
+
+                                        for (var i = 0; i <= n; i++) {
+                                            var speed = GetPointSpeed(e.Stroke.StylusPoints[Math.Max(i - 1, 0)].ToPoint(),
+                                                e.Stroke.StylusPoints[i].ToPoint(),
+                                                e.Stroke.StylusPoints[Math.Min(i + 1, n)].ToPoint());
+                                            var point = new StylusPoint();
+                                            if (speed >= 0.25)
+                                                point.PressureFactor = (float)(0.5 - 0.3 * (Math.Min(speed, 1.5) - 0.3) / 1.2);
+                                            else if (speed >= 0.05)
+                                                point.PressureFactor = (float)0.5;
+                                            else
+                                                point.PressureFactor = (float)(0.5 + 0.4 * (0.05 - speed) / 0.05);
+
+                                            point.X = e.Stroke.StylusPoints[i].X;
+                                            point.Y = e.Stroke.StylusPoints[i].Y;
+                                            stylusPoints.Add(point);
+                                        }
+
+                                        e.Stroke.StylusPoints = stylusPoints;
+                                    }
+                                    catch { }
+                                break;
+                            case 0:
+                                if (penType == 0)
+                                    try {
+                                        var stylusPoints = new StylusPointCollection();
+                                        var n = e.Stroke.StylusPoints.Count - 1;
+                                        var pressure = 0.1;
+                                        var x = 10;
+                                        if (n == 1) return;
+                                        if (n >= x) {
+                                            for (var i = 0; i < n - x; i++) {
+                                                var point = new StylusPoint();
+
+                                                point.PressureFactor = (float)0.5;
+                                                point.X = e.Stroke.StylusPoints[i].X;
+                                                point.Y = e.Stroke.StylusPoints[i].Y;
+                                                stylusPoints.Add(point);
+                                            }
+
+                                            for (var i = n - x; i <= n; i++) {
+                                                var point = new StylusPoint();
+
+                                                point.PressureFactor = (float)((0.5 - pressure) * (n - i) / x + pressure);
+                                                point.X = e.Stroke.StylusPoints[i].X;
+                                                point.Y = e.Stroke.StylusPoints[i].Y;
+                                                stylusPoints.Add(point);
+                                            }
+                                        }
+                                        else {
+                                            for (var i = 0; i <= n; i++) {
+                                                var point = new StylusPoint();
+
+                                                point.PressureFactor = (float)(0.4 * (n - i) / n + pressure);
+                                                point.X = e.Stroke.StylusPoints[i].X;
+                                                point.Y = e.Stroke.StylusPoints[i].Y;
+                                                stylusPoints.Add(point);
+                                            }
+                                        }
+
+                                        e.Stroke.StylusPoints = stylusPoints;
+                                    }
+                                    catch { }
+                                break;
+                        }
+                    }
+                }
+                
+                            // Apply line straightening and endpoint snapping if ink-to-shape is enabled
+            
+            if (Settings.InkToShape.IsInkToShapeEnabled) {
+                    // 检查是否启用了直线自动拉直功能
+                    if (Settings.Canvas.AutoStraightenLine && IsPotentialStraightLine(e.Stroke)) {
+                        // Get start and end points of the stroke
+                        Point startPoint = e.Stroke.StylusPoints[0].ToPoint();
+                        Point endPoint = e.Stroke.StylusPoints[e.Stroke.StylusPoints.Count - 1].ToPoint();
+                        
+                        // 先完成所有直线判定，再考虑端点吸附
+                        // 读取实际的灵敏度设置值
+                        double sensitivity = Settings.InkToShape.LineStraightenSensitivity;
+                        System.Diagnostics.Debug.WriteLine($"当前灵敏度值: {sensitivity}");
+                        
+                        // 判断是否应该拉直线条
+                        bool shouldStraighten = ShouldStraightenLine(e.Stroke);
+                        
+                        // 输出一些调试信息，帮助理解灵敏度设置的效果
+                        System.Diagnostics.Debug.WriteLine($"LineStraightenSensitivity: {Settings.InkToShape.LineStraightenSensitivity}, ShouldStraighten: {shouldStraighten}");
+                        
+                        // 只有当确定要拉直线条时，才检查端点吸附
+                        if (shouldStraighten && Settings.Canvas.LineEndpointSnapping) {
+                            // 只有在启用了形状识别（矩形或三角形）时才执行端点吸附
+                            if (Settings.InkToShape.IsInkToShapeRectangle || Settings.InkToShape.IsInkToShapeTriangle) {
+                                Point[] snappedPoints = GetSnappedEndpoints(startPoint, endPoint);
+                                if (snappedPoints != null) {
+                                    startPoint = snappedPoints[0];
+                                    endPoint = snappedPoints[1];
+                                }
+                            }
+                        }
+
+                        // 如果确定要拉直，则创建直线
+                        if (shouldStraighten) {
+                            StylusPointCollection straightLinePoints = CreateStraightLine(startPoint, endPoint);
+                            Stroke straightStroke = new Stroke(straightLinePoints) {
+                                DrawingAttributes = inkCanvas.DefaultDrawingAttributes.Clone()
+                            };
+                            
+                            // Replace the original stroke with the straightened one
+                            SetNewBackupOfStroke();
+                            _currentCommitType = CommitReason.ShapeRecognition;
+                            inkCanvas.Strokes.Remove(e.Stroke);
+                            inkCanvas.Strokes.Add(straightStroke);
+                            _currentCommitType = CommitReason.UserInput;
+                            
+                            // We can't modify e.Stroke directly, but we need to update newStrokes
+                            // to ensure proper shape recognition for the straightened line
+                            if (newStrokes.Contains(e.Stroke)) {
+                                newStrokes.Remove(e.Stroke);
+                                newStrokes.Add(straightStroke);
+                            }
+                            
+                            wasStraightened = true; // 标记已进行直线拉直
+                        }
+                    }
+                }
+
                if (Settings.InkToShape.IsInkToShapeEnabled && !Environment.Is64BitProcess) {
                    void InkToShapeProcess() {
                        try {
@@ -419,7 +580,513 @@ namespace Ink_Canvas {
            }
            catch { }

-            if (Settings.Canvas.FitToCurve == true) drawingAttributes.FitToCurve = true;
+            // 应用高级贝塞尔曲线平滑（仅在未进行直线拉直时）
+            if (Settings.Canvas.UseAdvancedBezierSmoothing && !wasStraightened)
+            {
+                try
+                {
+                    // 检查原始笔画是否仍然存在于画布中
+                    if (inkCanvas.Strokes.Contains(e.Stroke))
+                    {
+                        // 使用新的异步墨迹平滑管理器
+                        if (Settings.Canvas.UseAsyncInkSmoothing && _inkSmoothingManager != null)
+                        {
+                            // 异步处理
+                            _ = ProcessStrokeAsync(e.Stroke);
+                        }
+                        else
+                        {
+                            // 同步处理（向后兼容）
+                            var smoothedStroke = _inkSmoothingManager?.SmoothStroke(e.Stroke) ?? e.Stroke;
+
+                            if (smoothedStroke != e.Stroke)
+                            {
+                                // 替换原始笔画
+                                SetNewBackupOfStroke();
+                                _currentCommitType = CommitReason.ShapeRecognition;
+                                inkCanvas.Strokes.Remove(e.Stroke);
+                                inkCanvas.Strokes.Add(smoothedStroke);
+                                _currentCommitType = CommitReason.UserInput;
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // 如果高级平滑失败，回退到原始笔画
+                    System.Diagnostics.Debug.WriteLine($"高级贝塞尔曲线平滑失败: {ex.Message}");
+                }
+            }
+            else if (Settings.Canvas.FitToCurve == true && !wasStraightened) 
+            {
+                drawingAttributes.FitToCurve = true;
+            }
+        }
+
+        /// <summary>
+        /// 异步处理笔画平滑
+        /// </summary>
+        private async Task ProcessStrokeAsync(Stroke originalStroke)
+        {
+            try
+            {
+                await _inkSmoothingManager.SmoothStrokeAsync(originalStroke, (original, smoothed) =>
+                {
+                    // 在UI线程上执行笔画替换
+                    if (inkCanvas.Strokes.Contains(original) && smoothed != original)
+                    {
+                        SetNewBackupOfStroke();
+                        _currentCommitType = CommitReason.ShapeRecognition;
+                        inkCanvas.Strokes.Remove(original);
+                        inkCanvas.Strokes.Add(smoothed);
+                        _currentCommitType = CommitReason.UserInput;
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"异步墨迹平滑失败: {ex.Message}");
+            }
+        }
+
+        // New method: Checks if a stroke is potentially a straight line
+        private bool IsPotentialStraightLine(Stroke stroke) {
+            // 确保有足够的点来进行线条分析
+            if (stroke.StylusPoints.Count < 5) 
+                return false;
+                
+            Point start = stroke.StylusPoints.First().ToPoint();
+            Point end = stroke.StylusPoints.Last().ToPoint();
+            double lineLength = GetDistance(start, end);
+            // 分辨率自适应阈值
+            double adaptiveThreshold = Settings.Canvas.AutoStraightenLineThreshold * GetResolutionScale();
+            // 线条必须足够长才考虑拉直，使用自适应阈值
+            if (lineLength < adaptiveThreshold)
+                return false;
+                
+            // 获取用户设置的灵敏度值，确保使用正确的设置
+            double sensitivity = Settings.InkToShape.LineStraightenSensitivity;
+            
+            // 输出当前灵敏度值（调试用）
+            System.Diagnostics.Debug.WriteLine($"IsPotentialStraightLine - sensitivity: {sensitivity}, length: {lineLength}");
+            
+            // 根据灵敏度调整快速检查阈值
+            double quickThreshold;
+            
+            // 如果灵敏度超过1.0，使用更宽松的快速检查标准
+            if (sensitivity > 1.0) {
+                // 高灵敏度模式 - 使用更宽松的阈值
+                quickThreshold = Math.Min(0.2 + (sensitivity - 1.0) * 0.3, 0.5); // 映射到0.2-0.5范围
+            } else {
+                // 常规灵敏度模式
+                quickThreshold = Math.Min(sensitivity * 1.5, 0.20);
+            }
+            
+            System.Diagnostics.Debug.WriteLine($"使用快速检查阈值: {quickThreshold}");
+                
+            // 快速检查：计算几个关键点与直线的距离
+            if (stroke.StylusPoints.Count >= 10) {
+                // 取中点和1/4、3/4位置的点，快速检查偏差
+                int quarterIdx = stroke.StylusPoints.Count / 4;
+                int midIdx = stroke.StylusPoints.Count / 2;
+                int threeQuarterIdx = quarterIdx * 3;
+                
+                Point quarterPoint = stroke.StylusPoints[quarterIdx].ToPoint();
+                Point midPoint = stroke.StylusPoints[midIdx].ToPoint();
+                Point threeQuarterPoint = stroke.StylusPoints[threeQuarterIdx].ToPoint();
+                
+                double quarterDeviation = DistanceFromLineToPoint(start, end, quarterPoint);
+                double midDeviation = DistanceFromLineToPoint(start, end, midPoint);
+                double threeQuarterDeviation = DistanceFromLineToPoint(start, end, threeQuarterPoint);
+                
+                // 使用相对偏差：偏差与线长的比例，并使用灵敏度进行调整
+                double quickRelativeThreshold = lineLength * quickThreshold;
+                
+                // 记录检测到的偏差（调试用）
+                System.Diagnostics.Debug.WriteLine($"Deviations: q={quarterDeviation}, m={midDeviation}, tq={threeQuarterDeviation}, threshold={quickRelativeThreshold}");
+                
+                // 如果灵敏度超过1.5，则即使有一个点满足条件也认为可能是直线
+                if (sensitivity > 1.5) {
+                    // 超高灵敏度模式：只要有一个关键点偏差小，就认为可能是直线
+                    if (quarterDeviation <= quickRelativeThreshold || 
+                        midDeviation <= quickRelativeThreshold || 
+                        threeQuarterDeviation <= quickRelativeThreshold) {
+                        return true;
+                    }
+                } else {
+                    // 常规判断：如果任一点偏离太大，直接排除
+                    if (quarterDeviation > quickRelativeThreshold || 
+                        midDeviation > quickRelativeThreshold || 
+                        threeQuarterDeviation > quickRelativeThreshold) {
+                        return false;
+                    }
+                }
+            }
+            
+            return true;
+        }
+        
+        // New method: Determines if a stroke should be straightened into a line
+        private bool ShouldStraightenLine(Stroke stroke) {
+            Point start = stroke.StylusPoints.First().ToPoint();
+            Point end = stroke.StylusPoints.Last().ToPoint();
+            double maxDeviation = 0;
+            double lineLength = GetDistance(start, end);
+            // 分辨率自适应阈值
+            double adaptiveThreshold = Settings.Canvas.AutoStraightenLineThreshold * GetResolutionScale();
+            // 如果线条太短，不进行拉直处理，使用自适应阈值
+            if (lineLength < adaptiveThreshold) {
+                // 显示调试信息 - 线条长度不足
+                // MessageBox.Show($"线条太短: {lineLength} < {Settings.Canvas.AutoStraightenLineThreshold}", "调试信息");
+                return false;
+            }
+            
+            // 获取用户设置的灵敏度值，确保使用正确的值进行后续判断
+            double sensitivity = Settings.InkToShape.LineStraightenSensitivity;
+            
+            // 输出详细的调试信息
+            System.Diagnostics.Debug.WriteLine($"ShouldStraightenLine - sensitivity: {sensitivity}, length: {lineLength}");
+            
+            // 临时：显示调试消息框
+            // MessageBox.Show($"灵敏度值: {sensitivity}", "调试信息");
+            
+            // 计算点与直线的偏差
+            double totalDeviation = 0;
+            int pointCount = 0;
+            
+            // 检查是否启用了高精度直线拉直
+            bool useHighPrecision = Settings.Canvas.HighPrecisionLineStraighten;
+            
+            if (useHighPrecision) {
+                System.Diagnostics.Debug.WriteLine("使用高精度直线拉直模式");
+                
+                // 高精度模式：每隔10像素取一个计数点
+                double strokeLength = 0;
+                double sampleInterval = 10.0; // 10像素间隔
+                
+                // 计算笔画的总长度，用于后续采样
+                for (int i = 1; i < stroke.StylusPoints.Count; i++) {
+                    Point p1 = stroke.StylusPoints[i-1].ToPoint();
+                    Point p2 = stroke.StylusPoints[i].ToPoint();
+                    strokeLength += GetDistance(p1, p2);
+                }
+                
+                // 如果笔画太短，直接使用所有点
+                if (strokeLength < sampleInterval * 5) {
+                    foreach (StylusPoint sp in stroke.StylusPoints) {
+                        Point p = sp.ToPoint();
+                        double deviation = DistanceFromLineToPoint(start, end, p);
+                        maxDeviation = Math.Max(maxDeviation, deviation);
+                        totalDeviation += deviation;
+                        pointCount++;
+                    }
+                } else {
+                    // 使用等距采样点
+                    double currentLength = 0;
+                    double nextSampleAt = 0;
+                    
+                    // 总是包含起点
+                    Point lastPoint = start;
+                    double deviation = DistanceFromLineToPoint(start, end, lastPoint);
+                    maxDeviation = Math.Max(maxDeviation, deviation);
+                    totalDeviation += deviation;
+                    pointCount++;
+                    
+                    // 采样中间点
+                    for (int i = 1; i < stroke.StylusPoints.Count; i++) {
+                        Point currentPoint = stroke.StylusPoints[i].ToPoint();
+                        double segmentLength = GetDistance(lastPoint, currentPoint);
+                        
+                        // 如果这段线段跨越了下一个采样点
+                        while (currentLength + segmentLength >= nextSampleAt) {
+                            // 计算采样点在线段上的位置
+                            double t = (nextSampleAt - currentLength) / segmentLength;
+                            Point samplePoint = new Point(
+                                lastPoint.X + t * (currentPoint.X - lastPoint.X),
+                                lastPoint.Y + t * (currentPoint.Y - lastPoint.Y)
+                            );
+                            
+                            // 计算采样点的偏差
+                            deviation = DistanceFromLineToPoint(start, end, samplePoint);
+                            maxDeviation = Math.Max(maxDeviation, deviation);
+                            totalDeviation += deviation;
+                            pointCount++;
+                            
+                            // 设置下一个采样点位置
+                            nextSampleAt += sampleInterval;
+                            
+                            // 防止无限循环
+                            if (nextSampleAt > strokeLength) break;
+                        }
+                        
+                        currentLength += segmentLength;
+                        lastPoint = currentPoint;
+                    }
+                    
+                    // 总是包含终点
+                    deviation = DistanceFromLineToPoint(start, end, end);
+                    maxDeviation = Math.Max(maxDeviation, deviation);
+                    totalDeviation += deviation;
+                    pointCount++;
+                }
+            } else {
+                // 原始模式：使用所有点
+                foreach (StylusPoint sp in stroke.StylusPoints) {
+                    Point p = sp.ToPoint();
+                    double deviation = DistanceFromLineToPoint(start, end, p);
+                    maxDeviation = Math.Max(maxDeviation, deviation);
+                    totalDeviation += deviation;
+                    pointCount++;
+                }
+            }
+            
+            // 计算平均偏差
+            double avgDeviation = totalDeviation / pointCount;
+            
+            // 更详细的调试信息
+            System.Diagnostics.Debug.WriteLine($"Max deviation: {maxDeviation}, Avg: {avgDeviation}, Threshold: {sensitivity * lineLength}, Points: {pointCount}");
+            
+            // 支持更广泛的灵敏度范围 (0.05-2.0)
+            
+            // 如果灵敏度高于1.0，使用更宽松的判断标准
+            if (sensitivity > 1.0) {
+                // 高灵敏度模式 - 允许更大的偏差
+                double adjustedSensitivity = 0.5 + (sensitivity - 1.0) * 1.5; // 映射到0.5-2.0范围
+                
+                // 只判断平均偏差和相对偏差
+                if (maxDeviation / lineLength < adjustedSensitivity && avgDeviation < lineLength * 0.1 * adjustedSensitivity) {
+                    System.Diagnostics.Debug.WriteLine("接受拉直 (高灵敏度模式)");
+                    return true;
+                }
+                
+                System.Diagnostics.Debug.WriteLine("拒绝拉直 (高灵敏度模式)");
+                return false;
+            }
+            // 否则使用常规判断标准
+            else {
+                // 检查点分布的一致性 - 如果有些点偏离很大而其他点很接近直线，表明线条有明显弯曲
+                double deviationVariance = 0;
+                
+                // 使用相同的高精度/原始模式来计算方差
+                if (useHighPrecision) {
+                    // 高精度模式：重新采样计算方差
+                    double strokeLength = 0;
+                    double sampleInterval = 10.0; // 10像素间隔
+                    
+                    // 计算笔画的总长度，用于后续采样
+                    for (int i = 1; i < stroke.StylusPoints.Count; i++) {
+                        Point p1 = stroke.StylusPoints[i-1].ToPoint();
+                        Point p2 = stroke.StylusPoints[i].ToPoint();
+                        strokeLength += GetDistance(p1, p2);
+                    }
+                    
+                    // 如果笔画太短，直接使用所有点
+                    if (strokeLength < sampleInterval * 5) {
+                        foreach (StylusPoint sp in stroke.StylusPoints) {
+                            Point p = sp.ToPoint();
+                            double deviation = DistanceFromLineToPoint(start, end, p);
+                            deviationVariance += Math.Pow(deviation - avgDeviation, 2);
+                        }
+                    } else {
+                        // 使用等距采样点
+                        double currentLength = 0;
+                        double nextSampleAt = 0;
+                        Point lastPoint = start;
+                        
+                        // 起点方差
+                        double deviation = DistanceFromLineToPoint(start, end, lastPoint);
+                        deviationVariance += Math.Pow(deviation - avgDeviation, 2);
+                        
+                        // 采样中间点
+                        for (int i = 1; i < stroke.StylusPoints.Count; i++) {
+                            Point currentPoint = stroke.StylusPoints[i].ToPoint();
+                            double segmentLength = GetDistance(lastPoint, currentPoint);
+                            
+                            // 如果这段线段跨越了下一个采样点
+                            while (currentLength + segmentLength >= nextSampleAt) {
+                                // 计算采样点在线段上的位置
+                                double t = (nextSampleAt - currentLength) / segmentLength;
+                                Point samplePoint = new Point(
+                                    lastPoint.X + t * (currentPoint.X - lastPoint.X),
+                                    lastPoint.Y + t * (currentPoint.Y - lastPoint.Y)
+                                );
+                                
+                                // 计算采样点的方差
+                                deviation = DistanceFromLineToPoint(start, end, samplePoint);
+                                deviationVariance += Math.Pow(deviation - avgDeviation, 2);
+                                
+                                // 设置下一个采样点位置
+                                nextSampleAt += sampleInterval;
+                                
+                                // 防止无限循环
+                                if (nextSampleAt > strokeLength) break;
+                            }
+                            
+                            currentLength += segmentLength;
+                            lastPoint = currentPoint;
+                        }
+                        
+                        // 终点方差
+                        deviation = DistanceFromLineToPoint(start, end, end);
+                        deviationVariance += Math.Pow(deviation - avgDeviation, 2);
+                    }
+                } else {
+                    // 原始模式：使用所有点计算方差
+                    foreach (StylusPoint sp in stroke.StylusPoints) {
+                        Point p = sp.ToPoint();
+                        double deviation = DistanceFromLineToPoint(start, end, p);
+                        deviationVariance += Math.Pow(deviation - avgDeviation, 2);
+                    }
+                }
+                
+                deviationVariance /= pointCount;
+                
+                // 输出更多调试信息
+                System.Diagnostics.Debug.WriteLine($"Deviation variance: {deviationVariance}, Threshold: {sensitivity * lineLength * 0.05}");
+                
+                // 如果最大偏差超过线长的阈值比例，或者偏差方差较大（表示不均匀弯曲），则不拉直
+                // 灵敏度越大，容许的偏差越大，更容易将线条识别为直线
+                if ((maxDeviation / lineLength) > sensitivity) {
+                    System.Diagnostics.Debug.WriteLine("拒绝拉直：最大偏差过大");
+                    return false;
+                }
+                
+                // 如果偏差方差大，说明线条弯曲不均匀
+                // 灵敏度越大，容许的偏差方差越大
+                if (deviationVariance > (sensitivity * lineLength * 0.05)) {
+                    System.Diagnostics.Debug.WriteLine("拒绝拉直：偏差方差过大");
+                    return false;
+                }
+                
+                // 检查中点偏离情况 - 针对弧形线条特别有效
+                if (stroke.StylusPoints.Count > 10) {
+                    int midIndex = stroke.StylusPoints.Count / 2;
+                    Point midPoint = stroke.StylusPoints[midIndex].ToPoint();
+                    double midDeviation = DistanceFromLineToPoint(start, end, midPoint);
+                    
+                    // 输出中点偏差信息
+                    System.Diagnostics.Debug.WriteLine($"Mid deviation: {midDeviation}, Threshold: {lineLength * sensitivity * 0.8}");
+                    
+                    // 如果中点偏离过大，不拉直
+                    // 使用灵敏度作为判断基准，灵敏度越大，容许的中点偏离越大
+                    if (midDeviation > (lineLength * sensitivity * 0.8)) {
+                        System.Diagnostics.Debug.WriteLine("拒绝拉直：中点偏差过大");
+                        return false;
+                    }
+                }
+                
+                System.Diagnostics.Debug.WriteLine("接受拉直");
+                return true;
+            }
+        }
+        
+        // New method: Creates a straight line stroke between two points
+        private StylusPointCollection CreateStraightLine(Point start, Point end) {
+            StylusPointCollection points = new StylusPointCollection();
+            
+            // 根据是否启用压感触屏模式决定如何设置压感
+            // 如果未启用压感触屏模式，则使用均匀粗细
+            if (!Settings.Canvas.EnablePressureTouchMode || Settings.Canvas.DisablePressure || 
+                Settings.InkToShape.IsInkToShapeNoFakePressureRectangle == true || penType == 1) {
+                // 使用均匀粗细（所有点压感值都是0.5f）
+                points.Add(new StylusPoint(start.X, start.Y, 0.5f));
+                
+                // 可以添加一些额外的中间点使线条更平滑（均匀粗细）
+                double distance = GetDistance(start, end);
+                if (distance > 100) {
+                    // 对于较长的线条，添加几个中间点
+                    for (int i = 1; i < 3; i++) {
+                        double ratio = i / 3.0;
+                        Point midPoint = new Point(
+                            start.X + (end.X - start.X) * ratio,
+                            start.Y + (end.Y - start.Y) * ratio);
+                        points.Add(new StylusPoint(midPoint.X, midPoint.Y, 0.5f));
+                    }
+                }
+                
+                points.Add(new StylusPoint(end.X, end.Y, 0.5f));
+            } else {
+                // 启用了压感触屏模式，使用变化的粗细（原有行为）
+                points.Add(new StylusPoint(start.X, start.Y, 0.4f));
+                
+                // 添加中点，压感值较高，使线条中间较粗
+                Point midPoint = new Point((start.X + end.X) / 2, (start.Y + end.Y) / 2);
+                points.Add(new StylusPoint(midPoint.X, midPoint.Y, 0.8f));
+                
+                points.Add(new StylusPoint(end.X, end.Y, 0.4f));
+            }
+            
+            return points;
+        }
+        
+        // New method: Gets distance from point to a line defined by two points
+        private double DistanceFromLineToPoint(Point lineStart, Point lineEnd, Point point) {
+            // Calculate distance from point to line defined by lineStart and lineEnd
+            double lineLength = GetDistance(lineStart, lineEnd);
+            if (lineLength == 0) return GetDistance(point, lineStart);
+            
+            // Calculate the cross product to get the perpendicular distance
+            double distance = Math.Abs((lineEnd.Y - lineStart.Y) * point.X - 
+                                      (lineEnd.X - lineStart.X) * point.Y + 
+                                      lineEnd.X * lineStart.Y - lineEnd.Y * lineStart.X) / lineLength;
+            return distance;
+        }
+        
+        // New method: Attempts to snap endpoints to existing stroke endpoints
+        private Point[] GetSnappedEndpoints(Point start, Point end) {
+            // 如果端点吸附功能关闭，直接返回null
+            // 这里不再返回原始点，因为调用此方法的地方会判断返回值是否为null
+            if (!Settings.Canvas.LineEndpointSnapping)
+                return null;
+                
+            bool startSnapped = false;
+            bool endSnapped = false;
+            Point snappedStart = start;
+            Point snappedEnd = end;
+            
+            // 使用设置中的吸附距离阈值
+            double snapThreshold = Settings.Canvas.LineEndpointSnappingThreshold;
+            
+            // Check all strokes in canvas for potential snap points
+            foreach (Stroke stroke in inkCanvas.Strokes) {
+                if (stroke.StylusPoints.Count == 0) continue;
+                
+                // Get stroke endpoints
+                Point strokeStart = stroke.StylusPoints.First().ToPoint();
+                Point strokeEnd = stroke.StylusPoints.Last().ToPoint();
+                
+                // Check if start point should snap to an endpoint
+                if (!startSnapped) {
+                    if (GetDistance(start, strokeStart) < snapThreshold) {
+                        snappedStart = strokeStart;
+                        startSnapped = true;
+                    } else if (GetDistance(start, strokeEnd) < snapThreshold) {
+                        snappedStart = strokeEnd;
+                        startSnapped = true;
+                    }
+                }
+                
+                // Check if end point should snap to an endpoint
+                if (!endSnapped) {
+                    if (GetDistance(end, strokeStart) < snapThreshold) {
+                        snappedEnd = strokeStart;
+                        endSnapped = true;
+                    } else if (GetDistance(end, strokeEnd) < snapThreshold) {
+                        snappedEnd = strokeEnd;
+                        endSnapped = true;
+                    }
+                }
+                
+                // If both endpoints are snapped, we're done
+                if (startSnapped && endSnapped) break;
+            }
+            
+            // Return snapped points if any snapping occurred
+            if (startSnapped || endSnapped) {
+                return new Point[] { snappedStart, snappedEnd };
+            }
+            
+            return null;
        }

        private void SetNewBackupOfStroke() {
@@ -540,5 +1207,19 @@ namespace Ink_Canvas {
        public StylusPoint GetCenterPoint(StylusPoint point1, StylusPoint point2) {
            return new StylusPoint((point1.X + point2.X) / 2, (point1.Y + point2.Y) / 2);
        }
+
+        // 分辨率自适应：以1080P为基准，返回当前分辨率下的阈值倍数
+        private double GetResolutionScale()
+        {
+            // 以1920x1080为基准
+            double baseWidth = 1920.0;
+            double baseHeight = 1080.0;
+            double screenWidth = SystemParameters.PrimaryScreenWidth;
+            double screenHeight = SystemParameters.PrimaryScreenHeight;
+            // 取宽高平均缩放，防止极端比例
+            double scaleW = screenWidth / baseWidth;
+            double scaleH = screenHeight / baseHeight;
+            return (scaleW + scaleH) / 2.0;
+        }
    }
 }
@@ -7,7 +7,6 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Diagnostics;
-using System.Windows.Media.Imaging;

 namespace Ink_Canvas {
    public partial class MainWindow : Window {
@@ -130,6 +129,16 @@ namespace Ink_Canvas {
                            if (canvas.Strokes.Contains(currentStroke))
                                canvas.Strokes.Remove(currentStroke);
                }
+            } else if (item.CommitType == TimeMachineHistoryType.ElementInsert) {
+                if (!item.StrokeHasBeenCleared) {
+                    // Undo: 移除元素
+                    if (item.InsertedElement != null && inkCanvas.Children.Contains(item.InsertedElement))
+                        inkCanvas.Children.Remove(item.InsertedElement);
+                } else {
+                    // Redo: 添加元素
+                    if (item.InsertedElement != null && !inkCanvas.Children.Contains(item.InsertedElement))
+                        inkCanvas.Children.Add(item.InsertedElement);
+                }
            }

            _currentCommitType = CommitReason.UserInput;
@@ -5,7 +5,13 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Timers;
 using System.Windows;
-using MessageBox = System.Windows.MessageBox;
+using System.IO;
+using System.Reflection;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Net;
+using System.Net.Sockets;
+using System.Linq;

 namespace Ink_Canvas {
    public class TimeViewModel : INotifyPropertyChanged {
@@ -52,6 +58,35 @@ namespace Ink_Canvas {

        private TimeViewModel nowTimeVM = new TimeViewModel();

+        private async Task<DateTime> GetNetworkTimeAsync()
+        {
+            try
+            {
+                const string ntpServer = "ntp.ntsc.ac.cn";
+                var ntpData = new byte[48];
+                ntpData[0] = 0x1B;
+                var addresses = await Dns.GetHostAddressesAsync(ntpServer);
+                var ipEndPoint = new IPEndPoint(addresses[0], 123);
+                using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp))
+                {
+                    socket.ReceiveTimeout = 2000;
+                    socket.Connect(ipEndPoint);
+                    await Task.Factory.FromAsync(socket.BeginSend(ntpData, 0, ntpData.Length, SocketFlags.None, null, socket), socket.EndSend);
+                    await Task.Factory.FromAsync(socket.BeginReceive(ntpData, 0, ntpData.Length, SocketFlags.None, null, socket), socket.EndReceive);
+                }
+                const byte serverReplyTime = 40;
+                ulong intPart = BitConverter.ToUInt32(ntpData.Skip(serverReplyTime).Take(4).Reverse().ToArray(), 0);
+                ulong fractPart = BitConverter.ToUInt32(ntpData.Skip(serverReplyTime + 4).Take(4).Reverse().ToArray(), 0);
+                var milliseconds = (intPart * 1000) + ((fractPart * 1000) / 0x100000000L);
+                var networkDateTime = (new DateTime(1900, 1, 1)).AddMilliseconds((long)milliseconds);
+                return networkDateTime.ToLocalTime();
+            }
+            catch
+            {
+                return DateTime.Now;
+            }
+        }
+
        private void InitTimers() {
            timerCheckPPT.Elapsed += TimerCheckPPT_Elapsed;
            timerCheckPPT.Interval = 500;
@@ -63,23 +98,29 @@ namespace Ink_Canvas {
            timerCheckAutoUpdateWithSilence.Interval = 1000 * 60 * 10;
            WaterMarkTime.DataContext = nowTimeVM;
            WaterMarkDate.DataContext = nowTimeVM;
-            timerDisplayTime.Elapsed += TimerDisplayTime_Elapsed;
+            timerDisplayTime.Elapsed += async (s, e) => await TimerDisplayTime_ElapsedAsync();
            timerDisplayTime.Interval = 1000;
            timerDisplayTime.Start();
            timerDisplayDate.Elapsed += TimerDisplayDate_Elapsed;
            timerDisplayDate.Interval = 1000 * 60 * 60 * 1;
            timerDisplayDate.Start();
            timerKillProcess.Start();
-            nowTimeVM.nowDate = DateTime.Now.ToShortDateString().ToString();
-            nowTimeVM.nowTime = DateTime.Now.ToShortTimeString().ToString();
+            nowTimeVM.nowDate = DateTime.Now.ToString("yyyy/M/d");
+            nowTimeVM.nowTime = DateTime.Now.ToString("HH:mm");
        }

-        private void TimerDisplayTime_Elapsed(object sender, ElapsedEventArgs e) {
-            nowTimeVM.nowTime = DateTime.Now.ToShortTimeString().ToString();
+        private async Task TimerDisplayTime_ElapsedAsync()
+        {
+            DateTime now = await GetNetworkTimeAsync();
+            // 只更新时间，日期由原有逻辑定时更新即可
+            Dispatcher.Invoke(() =>
+            {
+                nowTimeVM.nowTime = now.ToString("HH:mm");
+            });
        }

        private void TimerDisplayDate_Elapsed(object sender, ElapsedEventArgs e) {
-            nowTimeVM.nowDate = DateTime.Now.ToShortDateString().ToString();
+            nowTimeVM.nowDate = DateTime.Now.ToString("yyyy/M/d");
        }

        private void TimerKillProcess_Elapsed(object sender, ElapsedEventArgs e) {
@@ -122,8 +163,8 @@ namespace Ink_Canvas {
                }

                if (Settings.Automation.IsAutoKillIDT) {
-                    var processes = Process.GetProcessesByName("智绘教");
-                    if (processes.Length > 0) arg += " /IM \"智绘教.exe\"";
+                    var processes = Process.GetProcessesByName("Inkeys");
+                    if (processes.Length > 0) arg += " /IM \"Inkeys.exe\"";
                }

                if (Settings.Automation.IsAutoKillSeewoLauncher2DesktopAnnotation) {
@@ -147,6 +188,10 @@ namespace Ink_Canvas {
                    if (arg.Contains("HiteAnnotation")) {
                        Dispatcher.Invoke(() => {
                            ShowNotification("“鸿合屏幕书写”已自动关闭");
+                            if (Settings.Automation.IsAutoKillHiteAnnotation && Settings.Automation.IsAutoEnterAnnotationAfterKillHite) {
+                                // 自动进入批注状态
+                                PenIcon_Click(null, null);
+                            }
                        });
                    }

@@ -162,9 +207,9 @@ namespace Ink_Canvas {
                        });
                    }

-                    if (arg.Contains("智绘教")) {
+                    if (arg.Contains("Inkeys")) {
                        Dispatcher.Invoke(() => {
-                            ShowNotification("“智绘教”已自动关闭");
+                            ShowNotification("“智绘教Inkeys”已自动关闭");
                        });
                    }

@@ -178,7 +223,7 @@ namespace Ink_Canvas {
                    if (arg.Contains("DesktopAnnotation"))
                    {
                        Dispatcher.Invoke(() => {
-                            ShowNotification("“DesktopAnnotation”已自动关闭");
+                            ShowNotification("“希沃桌面2.0 桌面批注”已自动关闭");
                        });
                    }
                }
@@ -302,24 +347,131 @@ namespace Ink_Canvas {
        }

        private void timerCheckAutoUpdateWithSilence_Elapsed(object sender, ElapsedEventArgs e) {
-            Dispatcher.Invoke(() => {
-                try {
-                    if (!Topmost || inkCanvas.Strokes.Count > 0) return;
-                }
-                catch (Exception ex) {
-                    LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                }
-            });
+            // 停止计时器，避免重复触发
+            timerCheckAutoUpdateWithSilence.Stop();
+            
            try {
-                if (AutoUpdateWithSilenceTimeComboBox.CheckIsInSilencePeriod(
-                        Settings.Startup.AutoUpdateWithSilenceStartTime,
-                        Settings.Startup.AutoUpdateWithSilenceEndTime)) {
+                // 检查是否有可用的更新
+                if (string.IsNullOrEmpty(AvailableLatestVersion)) {
+                    LogHelper.WriteLogToFile("AutoUpdate | No available update version found");
+                    return;
+                }
+                
+                // 检查是否启用了静默更新
+                if (!Settings.Startup.IsAutoUpdateWithSilence) {
+                    LogHelper.WriteLogToFile("AutoUpdate | Silent update is disabled");
+                    return;
+                }
+                
+                // 检查更新文件是否已下载
+                string updatesFolderPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "AutoUpdate");
+                string statusFilePath = Path.Combine(updatesFolderPath, $"DownloadV{AvailableLatestVersion}Status.txt");
+                
+                if (!File.Exists(statusFilePath) || File.ReadAllText(statusFilePath).Trim().ToLower() != "true") {
+                    LogHelper.WriteLogToFile("AutoUpdate | Update file not downloaded yet");
+                    
+                    // 尝试下载更新文件，使用多线路组下载功能
+                    Task.Run(async () => {
+                        bool isDownloadSuccessful = false;
+                        
+                        try
+                        {
+                            // 如果主要线路组可用，直接使用
+                            if (AvailableLatestLineGroup != null)
+                            {
+                                LogHelper.WriteLogToFile($"AutoUpdate | 使用主要线路组下载: {AvailableLatestLineGroup.GroupName}");
+                                isDownloadSuccessful = await AutoUpdateHelper.DownloadSetupFile(AvailableLatestVersion, AvailableLatestLineGroup);
+                            }
+                            
+                            // 如果主要线路组不可用或下载失败，获取所有可用线路组
+                            if (!isDownloadSuccessful)
+                            {
+                                LogHelper.WriteLogToFile("AutoUpdate | 主要线路组不可用或下载失败，获取所有可用线路组");
+                                var availableGroups = await AutoUpdateHelper.GetAvailableLineGroupsOrdered(Settings.Startup.UpdateChannel);
+                                if (availableGroups.Count > 0)
+                                {
+                                    LogHelper.WriteLogToFile($"AutoUpdate | 使用 {availableGroups.Count} 个可用线路组进行下载");
+                                    isDownloadSuccessful = await AutoUpdateHelper.DownloadSetupFileWithFallback(AvailableLatestVersion, availableGroups);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.WriteLogToFile($"AutoUpdate | 下载更新时出错: {ex.Message}", LogHelper.LogType.Error);
+                        }
+                        
+                        if (isDownloadSuccessful) {
+                            LogHelper.WriteLogToFile("AutoUpdate | Update downloaded successfully, will check again for installation");
+                            // 重新启动计时器，下次检查时安装
+                            timerCheckAutoUpdateWithSilence.Start();
+                        } else {
+                            LogHelper.WriteLogToFile("AutoUpdate | Failed to download update", LogHelper.LogType.Error);
+                        }
+                    });
+                    
+                    return;
+                }
+                
+                // 检查是否在静默更新时间段内
+                bool isInSilencePeriod = AutoUpdateWithSilenceTimeComboBox.CheckIsInSilencePeriod(
+                    Settings.Startup.AutoUpdateWithSilenceStartTime,
+                    Settings.Startup.AutoUpdateWithSilenceEndTime);
+                
+                if (!isInSilencePeriod) {
+                    LogHelper.WriteLogToFile("AutoUpdate | Not in silence update time period");
+                    // 重新启动计时器，稍后再检查
+                    timerCheckAutoUpdateWithSilence.Start();
+                    return;
+                }
+                
+                // 检查应用程序状态，确保可以安全更新 
+                // 空闲状态的判定为不处于批注模式和画板模式
+                bool canSafelyUpdate = false;
+                
+                Dispatcher.Invoke(() => {
+                    try {
+                        // 判断是否处于批注模式（inkCanvas.EditingMode == InkCanvasEditingMode.Ink）
+                        // 判断是否处于画板模式（!Topmost）
+                        if (inkCanvas.EditingMode != InkCanvasEditingMode.Ink && Topmost) {
+                            // 检查是否有未保存的内容或正在进行的操作
+                            if (!isHidingSubPanelsWhenInking) {
+                                canSafelyUpdate = true;
+                                LogHelper.WriteLogToFile("AutoUpdate | Application is in a safe state for update - not in ink or board mode");
+                            } else {
+                                LogHelper.WriteLogToFile("AutoUpdate | Application is currently performing operations");
+                            }
+                        } else {
+                            LogHelper.WriteLogToFile("AutoUpdate | Application is in ink or board mode, cannot update now");
+                        }
+                    }
+                    catch (Exception ex) {
+                        LogHelper.WriteLogToFile($"AutoUpdate | Error checking application state: {ex.Message}", LogHelper.LogType.Error);
+                    }
+                });
+                
+                if (canSafelyUpdate) {
+                    LogHelper.WriteLogToFile("AutoUpdate | Installing update now");
+                    
+                    // 设置为用户主动退出，避免被看门狗判定为崩溃
+                    App.IsAppExitByUser = true;
+                    
+                    // 执行更新安装
                    AutoUpdateHelper.InstallNewVersionApp(AvailableLatestVersion, true);
-                    timerCheckAutoUpdateWithSilence.Stop();
+                    
+                    // 关闭应用程序
+                    Dispatcher.Invoke(() => {
+                        Application.Current.Shutdown();
+                    });
+                } else {
+                    LogHelper.WriteLogToFile("AutoUpdate | Cannot safely update now, will try again later");
+                    // 重新启动计时器，稍后再检查
+                    timerCheckAutoUpdateWithSilence.Start();
                }
            }
            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"AutoUpdate | Error in silent update check: {ex.Message}", LogHelper.LogType.Error);
+                // 出错时重新启动计时器，稍后再检查
+                timerCheckAutoUpdateWithSilence.Start();
            }
        }
    }
@@ -1,4 +1,4 @@
-using Ink_Canvas.Helpers;
+using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,12 +9,17 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using Point = System.Windows.Point;
+using System.Diagnostics;

 namespace Ink_Canvas {
    public partial class MainWindow : Window {
        #region Multi-Touch

        private bool isInMultiTouchMode = false;
+        private List<int> dec = new List<int>();
+        private bool isSingleFingerDragMode = false;
+        private Point centerPoint = new Point(0, 0);
+        private InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;

        private void BorderMultiTouchMode_MouseUp(object sender, MouseButtonEventArgs e) {
            if (isInMultiTouchMode) {
@@ -23,17 +28,23 @@ namespace Ink_Canvas {
                inkCanvas.StylusUp -= MainWindow_StylusUp;
                inkCanvas.TouchDown -= MainWindow_TouchDown;
                inkCanvas.TouchDown += Main_Grid_TouchDown;
-                inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+                    inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                }
                inkCanvas.Children.Clear();
                isInMultiTouchMode = false;
+                
            }
            else {
+                
                inkCanvas.StylusDown += MainWindow_StylusDown;
                inkCanvas.StylusMove += MainWindow_StylusMove;
                inkCanvas.StylusUp += MainWindow_StylusUp;
                inkCanvas.TouchDown += MainWindow_TouchDown;
                inkCanvas.TouchDown -= Main_Grid_TouchDown;
-                inkCanvas.EditingMode = InkCanvasEditingMode.None;
+                if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+                    inkCanvas.EditingMode = InkCanvasEditingMode.None;
+                }
                inkCanvas.Children.Clear();
                isInMultiTouchMode = true;
            }
@@ -49,46 +60,39 @@ namespace Ink_Canvas {
                HideSubPanels(); // 书写时自动隐藏二级菜单
            }

-            double boundWidth = e.GetTouchPoint(null).Bounds.Width, eraserMultiplier = 1.0;
-            if (!Settings.Advanced.EraserBindTouchMultiplier && Settings.Advanced.IsSpecialScreen)
-                eraserMultiplier = 1 / Settings.Advanced.TouchMultiplier;
-
-            if ((Settings.Advanced.TouchMultiplier != 0 || !Settings.Advanced.IsSpecialScreen) //启用特殊屏幕且触摸倍数为 0 时禁用橡皮
-                && boundWidth > BoundsWidth * 2.5) {
-                if (drawingShapeMode == 0 && forceEraser) return;
-                double k = 1;
-                switch (Settings.Canvas.EraserSize) {
-                    case 0:
-                        k = 0.5;
-                        break;
-                    case 1:
-                        k = 0.8;
-                        break;
-                    case 3:
-                        k = 1.25;
-                        break;
-                    case 4:
-                        k = 1.8;
-                        break;
-                }
-
-                inkCanvas.EraserShape = new EllipseStylusShape(boundWidth * k * eraserMultiplier * 0.25,
-                    boundWidth * k * eraserMultiplier * 0.25);
-                TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.EraseByPoint;
-                inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
-            }
-            else {
-                TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
+            // 只保留普通橡皮逻辑
+            TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
+            inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
+            if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
                inkCanvas.EditingMode = InkCanvasEditingMode.None;
            }
        }

        private void MainWindow_StylusDown(object sender, StylusDownEventArgs e) {
+            SetCursorBasedOnEditingMode(inkCanvas);

            inkCanvas.CaptureStylus();
            ViewboxFloatingBar.IsHitTestVisible = false;
            BlackboardUIGridForInkReplay.IsHitTestVisible = false;

+            // 确保手写笔模式下显示光标
+            if (Settings.Canvas.IsShowCursor) {
+                inkCanvas.ForceCursor = true;
+                inkCanvas.UseCustomCursor = true;
+                
+                // 根据当前编辑模式设置不同的光标
+                if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                    inkCanvas.Cursor = Cursors.Cross;
+                } else if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
+                    var sri = Application.GetResourceStream(new Uri("Resources/Cursors/Pen.cur", UriKind.Relative));
+                    if (sri != null)
+                        inkCanvas.Cursor = new Cursor(sri.Stream);
+                }
+                
+                // 强制显示光标
+                System.Windows.Forms.Cursor.Show();
+            }
+
            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint
                || inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke
                || inkCanvas.EditingMode == InkCanvasEditingMode.Select) return;
@@ -135,6 +139,13 @@ namespace Ink_Canvas {
                }
                catch { }

+                // 确保手写笔移动时光标保持可见
+                if (Settings.Canvas.IsShowCursor) {
+                    inkCanvas.ForceCursor = true;
+                    inkCanvas.UseCustomCursor = true;
+                    System.Windows.Forms.Cursor.Show();
+                }
+
                var strokeVisual = GetStrokeVisual(e.StylusDevice.Id);
                var stylusPointCollection = e.GetStylusPoints(this);
                foreach (var stylusPoint in stylusPointCollection)
@@ -177,101 +188,78 @@ namespace Ink_Canvas {
        private int lastTouchDownTime = 0, lastTouchUpTime = 0;

        private Point iniP = new Point(0, 0);
-        private bool isLastTouchEraser = false;
-        private bool forcePointEraser = true;

        private void Main_Grid_TouchDown(object sender, TouchEventArgs e) {
-
+            SetCursorBasedOnEditingMode(inkCanvas);
            inkCanvas.CaptureTouch(e.TouchDevice);
-            ViewboxFloatingBar.IsHitTestVisible = false;
-            BlackboardUIGridForInkReplay.IsHitTestVisible = false;

-            if (!isHidingSubPanelsWhenInking) {
-                isHidingSubPanelsWhenInking = true;
-                HideSubPanels(); // 书写时自动隐藏二级菜单
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                // 橡皮状态下只return，保证橡皮状态可保持
+                return;
            }
-
-            if (NeedUpdateIniP()) iniP = e.GetTouchPoint(inkCanvas).Position;
-            if (drawingShapeMode == 9 && isFirstTouchCuboid == false) MouseTouchMove(iniP);
-            inkCanvas.Opacity = 1;
-            double boundsWidth = GetTouchBoundWidth(e), eraserMultiplier = 1.0;
-            if (!Settings.Advanced.EraserBindTouchMultiplier && Settings.Advanced.IsSpecialScreen)
-                eraserMultiplier = 1 / Settings.Advanced.TouchMultiplier;
-            if (boundsWidth > BoundsWidth) {
-                isLastTouchEraser = true;
-                if (drawingShapeMode == 0 && forceEraser) return;
-                if (boundsWidth > BoundsWidth * 2.5) {
-                    double k = 1;
-                    switch (Settings.Canvas.EraserSize) {
-                        case 0:
-                            k = 0.5;
-                            break;
-                        case 1:
-                            k = 0.8;
-                            break;
-                        case 3:
-                            k = 1.25;
-                            break;
-                        case 4:
-                            k = 1.8;
-                            break;
-                    }
-
-                    inkCanvas.EraserShape = new EllipseStylusShape(boundsWidth * k * eraserMultiplier,
-                        boundsWidth * k * eraserMultiplier);
-                    inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
-                }
-                else {
-                    if (StackPanelPPTControls.Visibility == Visibility.Visible && inkCanvas.Strokes.Count == 0 &&
-                        Settings.PowerPointSettings.IsEnableFingerGestureSlideShowControl) {
-                        isLastTouchEraser = false;
-                        inkCanvas.EditingMode = InkCanvasEditingMode.GestureOnly;
-                        inkCanvas.Opacity = 0.1;
-                    }
-                    else {
-                        inkCanvas.EraserShape = new EllipseStylusShape(5, 5);
-                        inkCanvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
-                    }
-                }
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.Select) {
+                // 套索选状态下只return，保证套索选可用
+                return;
            }
-            else {
-                isLastTouchEraser = false;
-                inkCanvas.EraserShape =
-                    forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
-                if (forceEraser) return;
+            if (drawingShapeMode == 9) {
+                if (isFirstTouchCuboid) {
+                    CuboidFrontRectIniP = e.GetTouchPoint(inkCanvas).Position;
+                }
+                // 允许MouseTouchMove在TouchMove时处理
+                return;
+            }
+            if (drawingShapeMode != 0) {
+                return;
+            }
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
+                return;
+            }
+            if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
                inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
            }
        }

-        private double GetTouchBoundWidth(TouchEventArgs e) {
-            var args = e.GetTouchPoint(null).Bounds;
-            double value;
-            if (!Settings.Advanced.IsQuadIR) value = args.Width;
-            else value = Math.Sqrt(args.Width * args.Height); //四边红外
-            if (Settings.Advanced.IsSpecialScreen) value *= Settings.Advanced.TouchMultiplier;
-            return value;
-        }
-
-        //记录触摸设备ID
-        private List<int> dec = new List<int>();
-
-        //中心点
-        private Point centerPoint;
-        private InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;
-        private bool isSingleFingerDragMode = false;
+        // 手掌擦相关变量
+        private bool isPalmEraserActive = false;
+        private InkCanvasEditingMode palmEraserLastEditingMode = InkCanvasEditingMode.Ink;
+        private bool palmEraserLastIsHighlighter = false;
+        private bool palmEraserWasEnabledBeforeMultiTouch = false;

        private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e) {
+            // 橡皮状态下不做任何切换，直接return，保证橡皮可持续
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                return;
+            }
+            SetCursorBasedOnEditingMode(inkCanvas);

            inkCanvas.CaptureTouch(e.TouchDevice);
            ViewboxFloatingBar.IsHitTestVisible = false;
            BlackboardUIGridForInkReplay.IsHitTestVisible = false;

            dec.Add(e.TouchDevice.Id);
+            // Palm Eraser 逻辑
+            if (Settings.Canvas.EnablePalmEraser && dec.Count >= 2 && !isPalmEraserActive) {
+                var bounds = e.GetTouchPoint(inkCanvas).Bounds;
+                double palmThreshold = 40; // 触摸面积阈值，可根据实际调整
+                if (bounds.Width >= palmThreshold || bounds.Height >= palmThreshold) {
+                    // 记录当前编辑模式和高光状态
+                    palmEraserLastEditingMode = inkCanvas.EditingMode;
+                    palmEraserLastIsHighlighter = drawingAttributes.IsHighlighter;
+                    // 切换为橡皮擦
+                    EraserIcon_Click(null, null);
+                    isPalmEraserActive = true;
+                }
+            }
            //设备1个的时候，记录中心点
            if (dec.Count == 1) {
                var touchPoint = e.GetTouchPoint(inkCanvas);
                centerPoint = touchPoint.Position;

+                // 新增：几何绘制模式下，记录初始点
+                if (drawingShapeMode != 0) {
+                    iniP = touchPoint.Position;
+                }
+
                //记录第一根手指点击时的 StrokeCollection
                lastTouchDownStrokeCollection = inkCanvas.Strokes.Clone();
            }
@@ -281,22 +269,56 @@ namespace Ink_Canvas {
                if (inkCanvas.EditingMode == InkCanvasEditingMode.None ||
                    inkCanvas.EditingMode == InkCanvasEditingMode.Select) return;
                lastInkCanvasEditingMode = inkCanvas.EditingMode;
-                inkCanvas.EditingMode = InkCanvasEditingMode.None;
+                if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+                    inkCanvas.EditingMode = InkCanvasEditingMode.None;
+                }
            }
        }

        private void inkCanvas_PreviewTouchUp(object sender, TouchEventArgs e) {
-
+            // 橡皮状态下不做任何切换，直接return，保证橡皮可持续
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint && !isPalmEraserActive) {
+                return;
+            }
            inkCanvas.ReleaseAllTouchCaptures();
            ViewboxFloatingBar.IsHitTestVisible = true;
            BlackboardUIGridForInkReplay.IsHitTestVisible = true;

+            // Palm Eraser 逻辑：所有点抬起后恢复原编辑模式
+            dec.Remove(e.TouchDevice.Id);
+            if (isPalmEraserActive && dec.Count == 0) {
+                // 恢复高光状态
+                drawingAttributes.IsHighlighter = palmEraserLastIsHighlighter;
+                // 恢复编辑模式
+                if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+                    if (palmEraserLastEditingMode == InkCanvasEditingMode.Ink) {
+                        PenIcon_Click(null, null);
+                    } else if (palmEraserLastEditingMode == InkCanvasEditingMode.Select) {
+                        SymbolIconSelect_MouseUp(null, null);
+                    } else {
+                        inkCanvas.EditingMode = palmEraserLastEditingMode;
+                    }
+                }
+                isPalmEraserActive = false;
+            }
+            // 新增：几何绘制模式下，触摸抬手时自动落笔
+            if (drawingShapeMode != 0) {
+                var mouseArgs = new MouseButtonEventArgs(Mouse.PrimaryDevice, 0, MouseButton.Left)
+                {
+                    RoutedEvent = UIElement.MouseLeftButtonUpEvent,
+                    Source = inkCanvas
+                };
+                inkCanvas_MouseUp(inkCanvas, mouseArgs);
+            }
+
            //手势完成后切回之前的状态
            if (dec.Count > 1)
                if (inkCanvas.EditingMode == InkCanvasEditingMode.None)
-                    inkCanvas.EditingMode = lastInkCanvasEditingMode;
-            dec.Remove(e.TouchDevice.Id);
+                    if (lastInkCanvasEditingMode != InkCanvasEditingMode.EraseByPoint) {
+                        inkCanvas.EditingMode = lastInkCanvasEditingMode;
+                    }
            inkCanvas.Opacity = 1;
+            
            if (dec.Count == 0)
                if (lastTouchDownStrokeCollection.Count() != inkCanvas.Strokes.Count() &&
                    !(drawingShapeMode == 9 && !isFirstTouchCuboid)) {
@@ -314,31 +336,17 @@ namespace Ink_Canvas {

        private void Main_Grid_ManipulationCompleted(object sender, ManipulationCompletedEventArgs e) {
            if (e.Manipulators.Count() != 0) return;
-            if (forceEraser) return;
-            inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+            if (drawingShapeMode == 0 && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+                inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+            }
        }

-        // -- removed --
-        //
-        //private void inkCanvas_ManipulationStarted(object sender, ManipulationStartedEventArgs e)
-        //{
-        //    if (isInMultiTouchMode || !Settings.Gesture.IsEnableTwoFingerGesture || inkCanvas.Strokes.Count == 0 || dec.Count() < 2) return;
-        //    _currentCommitType = CommitReason.Manipulation;
-        //    StrokeCollection strokes = inkCanvas.GetSelectedStrokes();
-        //    if (strokes.Count != 0)
-        //    {
-        //        inkCanvas.Strokes.Replace(strokes, strokes.Clone());
-        //    }
-        //    else
-        //    {
-        //        var originalStrokes = inkCanvas.Strokes;
-        //        var targetStrokes = originalStrokes.Clone();
-        //        originalStrokes.Replace(originalStrokes, targetStrokes);
-        //    }
-        //    _currentCommitType = CommitReason.UserInput;
-        //}
-
        private void Main_Grid_ManipulationDelta(object sender, ManipulationDeltaEventArgs e) {
+            // 手掌擦时禁止移动/缩放
+            if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint)
+                return;
+            // 三指及以上禁止缩放
+            bool disableScale = dec.Count >= 3;
            if (isInMultiTouchMode || !Settings.Gesture.IsEnableTwoFingerGesture) return;
            if ((dec.Count >= 2 && (Settings.PowerPointSettings.IsEnableTwoFingerGestureInPresentationMode ||
                                    StackPanelPPTControls.Visibility != Visibility.Visible ||
@@ -363,7 +371,7 @@ namespace Ink_Canvas {

                    if (Settings.Gesture.IsEnableTwoFingerRotation)
                        m.RotateAt(rotate, center.X, center.Y); // 旋转
-                    if (Settings.Gesture.IsEnableTwoFingerZoom)
+                    if (Settings.Gesture.IsEnableTwoFingerZoom && !disableScale)
                        m.ScaleAt(scale.X, scale.Y, center.X, center.Y); // 缩放
                }

@@ -423,5 +431,54 @@ namespace Ink_Canvas {
                }
            }
        }
+
+        // 退出多指书写模式，恢复InkCanvas的TouchDown事件绑定
+        private void ExitMultiTouchModeIfNeeded()
+        {
+            if (isInMultiTouchMode)
+            {
+                inkCanvas.StylusDown -= MainWindow_StylusDown;
+                inkCanvas.StylusMove -= MainWindow_StylusMove;
+                inkCanvas.StylusUp -= MainWindow_StylusUp;
+                inkCanvas.TouchDown -= MainWindow_TouchDown;
+                inkCanvas.TouchDown += Main_Grid_TouchDown;
+                if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint)
+                {
+                    inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                }
+                inkCanvas.Children.Clear();
+                isInMultiTouchMode = false;
+                // 关闭多指书写时，恢复手掌擦开关
+                if (palmEraserWasEnabledBeforeMultiTouch) {
+                    Settings.Canvas.EnablePalmEraser = true;
+                    if (ToggleSwitchEnablePalmEraser != null)
+                        ToggleSwitchEnablePalmEraser.IsOn = true;
+                }
+            }
+        }
+
+        // 进入多指书写模式，绑定Main_Grid_TouchDown
+        private void EnterMultiTouchModeIfNeeded()
+        {
+            if (!isInMultiTouchMode)
+            {
+                inkCanvas.StylusDown += MainWindow_StylusDown;
+                inkCanvas.StylusMove += MainWindow_StylusMove;
+                inkCanvas.StylusUp += MainWindow_StylusUp;
+                inkCanvas.TouchDown += MainWindow_TouchDown;
+                inkCanvas.TouchDown -= Main_Grid_TouchDown;
+                if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint)
+                {
+                    inkCanvas.EditingMode = InkCanvasEditingMode.None;
+                }
+                inkCanvas.Children.Clear();
+                isInMultiTouchMode = true;
+                // 启用多指书写时，自动禁用手掌擦
+                palmEraserWasEnabledBeforeMultiTouch = Settings.Canvas.EnablePalmEraser;
+                Settings.Canvas.EnablePalmEraser = false;
+                if (ToggleSwitchEnablePalmEraser != null)
+                    ToggleSwitchEnablePalmEraser.IsOn = false;
+            }
+        }
    }
-}
+}
@@ -1,17 +1,10 @@
 using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern.Controls;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Forms.VisualStyles;
 using System.Windows.Interop;
-using System.Windows.Media.Animation;
 using Hardcodet.Wpf.TaskbarNotification;

 namespace Ink_Canvas
@@ -54,12 +47,34 @@ namespace Ink_Canvas

        private void CloseAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
            var mainWin = (MainWindow)Application.Current.MainWindow;
-            if (mainWin.IsLoaded) mainWin.BtnExit_Click(null,null);
+            if (mainWin.IsLoaded) {
+                App.IsAppExitByUser = true;
+                Application.Current.Shutdown();
+                // mainWin.BtnExit_Click(null,null);
+            }
        }

        private void RestartAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
            var mainWin = (MainWindow)Application.Current.MainWindow;
-            if (mainWin.IsLoaded) mainWin.BtnRestart_Click(null,null);
+            if (mainWin.IsLoaded) {
+                App.IsAppExitByUser = true;
+                
+                try {
+                    // 启动新实例
+                    string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                    ProcessStartInfo startInfo = new ProcessStartInfo();
+                    startInfo.FileName = exePath;
+                    startInfo.UseShellExecute = true;
+                    
+                    // 启动进程但不等待
+                    Process.Start(startInfo);
+                } catch (Exception ex) {
+                    LogHelper.NewLog($"重启程序时出错: {ex.Message}");
+                }
+                
+                // 退出当前实例
+                Application.Current.Shutdown();
+            }
        }

        private void ForceFullScreenTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.5.1")]
-[assembly: AssemblyFileVersion("5.0.5.1")]
+[assembly: AssemblyVersion("1.7.4.0")]
+[assembly: AssemblyFileVersion("1.7.4.0")]
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Ink_Canvas
+namespace Ink_Canvas
 {
    public static class ChickenSoup {
        public static string[] OSUPlayerYuLu = new string[] {
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .0.1
 .7.4.0