diff --git a/XplorePlane/App.xaml b/XplorePlane/App.xaml
index 16a7172..f63cb55 100644
--- a/XplorePlane/App.xaml
+++ b/XplorePlane/App.xaml
@@ -5,14 +5,7 @@
-
-
-
-
-
-
-
-
+
diff --git a/XplorePlane/App.xaml.cs b/XplorePlane/App.xaml.cs
index ba2bc35..69a9b0a 100644
--- a/XplorePlane/App.xaml.cs
+++ b/XplorePlane/App.xaml.cs
@@ -3,6 +3,7 @@ using System.Globalization;
using System.IO;
using System.Threading;
using System.Windows;
+using Telerik.Windows.Controls;
using XplorePlane.Views;
using XplorePlane.ViewModels;
using XplorePlane.Services;
@@ -25,6 +26,9 @@ namespace XplorePlane
{
protected override void OnStartup(StartupEventArgs e)
{
+ // 设置 Telerik Fluent 主题
+ StyleManager.ApplicationTheme = new Windows11Theme();
+
// 强制使用中文 UI,确保 ImageProcessing 库显示中文
var zhCN = new CultureInfo("zh-CN");
Thread.CurrentThread.CurrentCulture = zhCN;
diff --git a/XplorePlane/Assets/Icons/open.png b/XplorePlane/Assets/Icons/open.png
new file mode 100644
index 0000000..f25cbf9
Binary files /dev/null and b/XplorePlane/Assets/Icons/open.png differ
diff --git a/XplorePlane/Assets/Icons/saveas.png b/XplorePlane/Assets/Icons/saveas.png
new file mode 100644
index 0000000..4d56c59
Binary files /dev/null and b/XplorePlane/Assets/Icons/saveas.png differ
diff --git a/XplorePlane/Libs/Hardware/XP.Common.dll b/XplorePlane/Libs/Hardware/XP.Common.dll
index d5b7a01..82750df 100644
Binary files a/XplorePlane/Libs/Hardware/XP.Common.dll and b/XplorePlane/Libs/Hardware/XP.Common.dll differ
diff --git a/XplorePlane/Libs/Hardware/XP.Hardware.RaySource.dll b/XplorePlane/Libs/Hardware/XP.Hardware.RaySource.dll
index 22384e1..a80858b 100644
Binary files a/XplorePlane/Libs/Hardware/XP.Hardware.RaySource.dll and b/XplorePlane/Libs/Hardware/XP.Hardware.RaySource.dll differ
diff --git a/XplorePlane/Views/Main/MainWindow.xaml b/XplorePlane/Views/Main/MainWindow.xaml
index 3defa1d..3c56214 100644
--- a/XplorePlane/Views/Main/MainWindow.xaml
+++ b/XplorePlane/Views/Main/MainWindow.xaml
@@ -8,6 +8,7 @@
xmlns:spreadsheetControls="clr-namespace:Telerik.Windows.Controls.Spreadsheet.Controls;assembly=Telerik.Windows.Controls.Spreadsheet"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
xmlns:views="clr-namespace:XplorePlane.Views"
+ xmlns:views1="clr-namespace:XP.Hardware.RaySource.Views;assembly=XP.Hardware.RaySource"
x:Name="ParentWindow"
Title="XplorePlane"
Width="1920"
@@ -45,7 +46,11 @@
ApplicationButtonVisibility="Collapsed"
ApplicationName="XplorePlane"
BackstageClippingElement="{Binding ElementName=LayoutRoot}"
- HeaderBackground="LightGray">
+ FontFamily="Microsoft YaHei"
+ FontSize="10"
+ HeaderBackground="LightGray"
+ TextOptions.TextFormattingMode="Display"
+ TextOptions.TextRenderingMode="ClearType">
@@ -66,22 +71,31 @@
+ SmallImage="/Assets/Icons/new-doc.png"
+ Text="新建CNC" />
-
-
+ SmallImage="/Assets/Icons/save.png"
+ Text="保存" />
+ SmallImage="/Assets/Icons/saveas.png"
+ Text="另存为" />
+
+
+
@@ -257,32 +271,12 @@
-
-
-
-
-
+ SmallImage="/Assets/Icons/finish.png"
+ Text="完成" />
+
+
+
+
+
+
+
-
-
-
+
@@ -382,7 +386,6 @@
Text="流水线编辑器" />
-
diff --git a/XplorePlane/XplorePlane.csproj b/XplorePlane/XplorePlane.csproj
index a13e43a..2ed9c9b 100644
--- a/XplorePlane/XplorePlane.csproj
+++ b/XplorePlane/XplorePlane.csproj
@@ -71,75 +71,67 @@
+
+
+ D:\Program Files (x86)\Progress\Telerik UI for WPF 2024 Q1\Binaries\NetCore
+
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.dll
+ $(TelerikDir)\Telerik.Windows.Controls.dll
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Chart.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.GridView.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.ImageEditor.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Input.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Docking.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Navigation.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.RibbonView.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.RichTextBox.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Spreadsheet.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Data.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Core.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Fixed.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Themes.Office2013.dll
-
-
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Themes.Crystal.dll
+ $(TelerikDir)\Telerik.Windows.Controls.Chart.dll
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Data.dll
+ $(TelerikDir)\Telerik.Windows.Controls.Data.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Controls.Docking.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Controls.GridView.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Controls.ImageEditor.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Controls.Input.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Controls.Navigation.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Controls.RibbonView.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Controls.RichTextBox.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Controls.Spreadsheet.dll
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.SpreadsheetUI.dll
+ $(TelerikDir)\Telerik.Windows.Controls.SpreadsheetUI.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Data.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Documents.Core.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Documents.Fixed.dll
+
+
+ $(TelerikDir)\Telerik.Windows.Documents.Spreadsheet.dll
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll
+ $(TelerikDir)\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf.dll
+ $(TelerikDir)\Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf.dll
- ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Zip.dll
+ $(TelerikDir)\Telerik.Windows.Zip.dll
diff --git a/XplorePlane/readme.txt b/XplorePlane/readme.txt
index d9d467b..c3b0ac8 100644
--- a/XplorePlane/readme.txt
+++ b/XplorePlane/readme.txt
@@ -43,7 +43,8 @@
2026.3.26
----------------------
-1、各窗体间数据流的传递,全局数据结构的设计
+1、各窗体间数据流的传递,全局数据结构的设计(包括一个基本的说明文档)√
+2、集成