diff --git a/App.xaml b/App.xaml
index 037d853..92d050d 100644
--- a/App.xaml
+++ b/App.xaml
@@ -2,17 +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/MainWindow.xaml b/MainWindow.xaml
index 1761106..65ecd31 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -1,52 +1,275 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Height="1080" Width="1920" Background="#FF003640">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 40fe551..191d9fd 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
-using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using SunlightCentralizedControlManagement_SCCM_.UserClass;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -13,26 +14,51 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.Tab;
namespace SunlightCentralizedControlManagement_SCCM_
{
///
/// MainWindow.xaml 的交互逻辑
///
- public partial class MainWindow : Fluent.RibbonWindow
+ public partial class MainWindow : Window
{
public MainWindow()
{
DataContext = new MainWindowViewModel();
InitializeComponent();
+
+ }
+
+ private void ButtonPopUpLogout_Click(object sender, RoutedEventArgs e)
+ {
+ Application.Current.Shutdown();
+ }
+
+ private void ButtonOpenMenu_Click(object sender, RoutedEventArgs e)
+ {
+ ButtonOpenMenu.Visibility = Visibility.Collapsed;
+ ButtonCloseMenu.Visibility = Visibility.Visible;
+ }
+
+ private void ButtonCloseMenu_Click(object sender, RoutedEventArgs e)
+ {
+ ButtonOpenMenu.Visibility = Visibility.Visible;
+ ButtonCloseMenu.Visibility = Visibility.Collapsed;
}
- private void Work_Order_Checked(object sender, RoutedEventArgs e)
+ private void GridTitle_MouseDown(object sender, MouseButtonEventArgs e)
{
+ if (e.ChangedButton == MouseButton.Left)
+ DragMove();
+ }
+ private void GridMenu_SizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ gdMian.Margin = new Thickness(e.NewSize.Width, 50, 0, 0);
}
- private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ private void ListViewItem_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
}
diff --git a/SunlightCentralizedControlManagement(SCCM).csproj b/SunlightCentralizedControlManagement(SCCM).csproj
index c356936..baf2986 100644
--- a/SunlightCentralizedControlManagement(SCCM).csproj
+++ b/SunlightCentralizedControlManagement(SCCM).csproj
@@ -77,6 +77,8 @@
+
+
@@ -169,9 +171,6 @@
8.3.2
-
- 10.1.0
-
2.0.0-rc4.5
@@ -196,9 +195,6 @@
2.1.10
-
- 3.0.5
-
diff --git a/UserClass/SubItem.cs b/UserClass/SubItem.cs
new file mode 100644
index 0000000..2c59bfb
--- /dev/null
+++ b/UserClass/SubItem.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace SunlightCentralizedControlManagement_SCCM_.UserClass
+{
+ public class SubItem
+ {
+ public SubItem(string name, UserControl screen = null)
+ {
+ Name = name;
+ Screen = screen;
+ }
+ public string Name { get; private set; }
+ public UserControl Screen { get; private set; }
+ }
+}
diff --git a/UserClass/UserControlMenuItem.cs b/UserClass/UserControlMenuItem.cs
new file mode 100644
index 0000000..788fc08
--- /dev/null
+++ b/UserClass/UserControlMenuItem.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SunlightCentralizedControlManagement_SCCM_.UserClass
+{
+ internal class UserControlMenuItem
+ {
+ }
+}
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index b9e88d2..12660d0 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -1,12 +1,11 @@
-using DyeingComputer.UserClass;
-using SunlightCentralizedControlManagement_SCCM_.Properties;
+using SunlightCentralizedControlManagement_SCCM_.Properties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using System.Web.Util;
+using System.Windows.Controls;
using System.Windows.Threading;
namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
@@ -79,5 +78,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
{
CountDown();
}
- }
+
+}
}