diff --git a/App.xaml b/App.xaml
index 6de78f6..a109df4 100644
--- a/App.xaml
+++ b/App.xaml
@@ -2,8 +2,14 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_"
+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
StartupUri="MainWindow.xaml">
-
+
+
+
+
+
+
diff --git a/LOGO/sunlight_logo.ico b/LOGO/sunlight_logo.ico
deleted file mode 100644
index 2fe6131..0000000
Binary files a/LOGO/sunlight_logo.ico and /dev/null differ
diff --git a/LOGO/sunlight_logo.jpg b/LOGO/sunlight_logo.jpg
deleted file mode 100644
index 1b98457..0000000
Binary files a/LOGO/sunlight_logo.jpg and /dev/null differ
diff --git a/LOGO/sunlightlogo.ico b/LOGO/sunlightlogo.ico
new file mode 100644
index 0000000..a604f74
Binary files /dev/null and b/LOGO/sunlightlogo.ico differ
diff --git a/LOGO/sunlightlogo.jpg b/LOGO/sunlightlogo.jpg
new file mode 100644
index 0000000..dcaea1d
Binary files /dev/null and b/LOGO/sunlightlogo.jpg differ
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 417046a..e755baf 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -1,64 +1,18 @@
-
-
-
-
-
+ Height="1080" Width="1920" Background="#FF003640" >
-
-
-
-
+
-
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 0374692..673a8b7 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -19,11 +19,11 @@ namespace SunlightCentralizedControlManagement_SCCM_
///
/// MainWindow.xaml 的交互逻辑
///
- public partial class MainWindow : Window
+ public partial class MainWindow : Fluent.RibbonWindow
{
public MainWindow()
{
- DataContext = new MainWindowViewModel();
+ // DataContext = new MainWindowViewModel();
InitializeComponent();
}
@@ -31,5 +31,10 @@ namespace SunlightCentralizedControlManagement_SCCM_
{
}
+
+ private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+
+ }
}
}
diff --git a/SUNLIGHT.ico b/SUNLIGHT.ico
new file mode 100644
index 0000000..2e138f4
Binary files /dev/null and b/SUNLIGHT.ico differ
diff --git a/SunlightCentralizedControlManagement(SCCM).csproj b/SunlightCentralizedControlManagement(SCCM).csproj
index dfba47e..0e32e57 100644
--- a/SunlightCentralizedControlManagement(SCCM).csproj
+++ b/SunlightCentralizedControlManagement(SCCM).csproj
@@ -38,7 +38,7 @@
SunlightCentralizedControlManagement_SCCM_.App
- sunlight_logo.ico
+ sunlightlogo.ico
@@ -169,6 +169,9 @@
8.3.2
+
+ 10.1.0
+
2.0.0-rc4.5
@@ -181,12 +184,18 @@
5.0.41
+
+ 1.0.119
+
8.0.0
2.1.10
+
+ 3.0.5
+
@@ -195,10 +204,12 @@
+
+
+
+
-
-
diff --git a/sunlightlogo.ico b/sunlightlogo.ico
new file mode 100644
index 0000000..a604f74
Binary files /dev/null and b/sunlightlogo.ico differ