Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

12 months ago · 1a015ee729
10 changed files with 35 additions and 59 deletions
--- 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">
    <Application.Resources>
-         
+        <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml">
+            <ResourceDictionary.MergedDictionaries>
+                <ui:ThemesDictionary Theme="Dark" />
+                <ui:ControlsDictionary />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
    </Application.Resources>
 </Application>
--- a/LOGO/sunlight_logo.ico
+++ b/LOGO/sunlight_logo.ico
--- a/LOGO/sunlight_logo.jpg
+++ b/LOGO/sunlight_logo.jpg
--- a/LOGO/sunlightlogo.ico
+++ b/LOGO/sunlightlogo.ico
--- a/LOGO/sunlightlogo.jpg
+++ b/LOGO/sunlightlogo.jpg
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@ -1,4 +1,4 @@
-<Window x:Class="SunlightCentralizedControlManagement_SCCM_.MainWindow"
+<Fluent:RibbonWindow x:Class="SunlightCentralizedControlManagement_SCCM_.MainWindow"
        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"
@ -6,59 +6,13 @@
 		xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"		
 		xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel" 
        xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_"	
+        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+        xmlns:Fluent="urn:fluent-ribbon"
        d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
        mc:Ignorable="d"      
 		Title="SUNLIGHT SCCM b0.0.1 (2024/08/10)"      
-		Height="1080" Width="1920">
-	<Window.Resources>
-		<Style x:Key="RadioButtonStyle" TargetType="{x:Type RadioButton}">
-			<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}"/>
-			<Setter Property="HorizontalContentAlignment" Value="Left"/>
-			<Setter Property="OverridesDefaultStyle" Value="True"/>
-			<Setter Property="Padding" Value="6 0 0 0"/>
-			<Setter Property="SnapsToDevicePixels" Value="True"/>
-			<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False"/>
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="{x:Type RadioButton}">
-						<Grid>
-							<Border x:Name="border" Background="{TemplateBinding Background}">
-								<Grid>
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition>
-										</ColumnDefinition>
-									</Grid.ColumnDefinitions>
-									<TextBlock Grid.Row="0" Grid.Column="0"
-                                               Text="{TemplateBinding Tag}"
-                                               FontFamily="Fonts/#FontAwesome"
-                                               HorizontalAlignment="Left"
-                                               Width="30" FontSize="20" Margin="5,10,0,0"/>
-									<TextBlock Grid.Row="0" Grid.Column="1"
-                                               Text="{TemplateBinding Content}"
-                                               FontFamily="Fonts/#FontAwesome"
-                                               HorizontalAlignment="Left"
-                                               Width="NaN" FontSize="20" Margin="40,10,0,0"/>
-								</Grid>
-							</Border>
-						</Grid>
-						<ControlTemplate.Triggers>
-							<Trigger Property="IsMouseOver" Value="True">
-								<Setter Property="Background" Value="#FFA0A0A0" TargetName="border"/>
-							</Trigger>
-							<Trigger Property="IsChecked" Value="True">
-								<Setter Property="Background" Value="#FFF5F5F5" TargetName="border"/>
-							</Trigger>
-						</ControlTemplate.Triggers>
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style>
-	</Window.Resources>
-	
+		Height="1080" Width="1920" Background="#FF003640" >
    <Grid>
-        <Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Bottom" Height="40"/>
-        <RadioButton Content="{x:Static lang:Resources.WorkOrder}" x:Name="Work_Order" Tag="&#xF2d2;" Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0" VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="Work_Order_Checked"/>
-
-        <ContentControl x:Name="container" Margin="0,0,0,40"/>
+        <ContentControl x:Name="container" Margin="10,0,0,0"/>
    </Grid>
-</Window>
+</Fluent:RibbonWindow>
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@ -19,11 +19,11 @@ namespace SunlightCentralizedControlManagement_SCCM_
    /// <summary>
    /// MainWindow.xaml 的交互逻辑
    /// </summary>
-    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)
+        {
+
+        }
    }
 }
--- a/SUNLIGHT.ico
+++ b/SUNLIGHT.ico
--- a/SunlightCentralizedControlManagement(SCCM).csproj
+++ b/SunlightCentralizedControlManagement(SCCM).csproj
@ -38,7 +38,7 @@
    <StartupObject>SunlightCentralizedControlManagement_SCCM_.App</StartupObject>
  </PropertyGroup>
  <PropertyGroup>
-    <ApplicationIcon>sunlight_logo.ico</ApplicationIcon>
+    <ApplicationIcon>sunlightlogo.ico</ApplicationIcon>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -169,6 +169,9 @@
    <PackageReference Include="CommunityToolkit.Mvvm">
      <Version>8.3.2</Version>
    </PackageReference>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>10.1.0</Version>
+    </PackageReference>
    <PackageReference Include="LiveChartsCore">
      <Version>2.0.0-rc4.5</Version>
    </PackageReference>
@ -181,12 +184,18 @@
    <PackageReference Include="ScottPlot">
      <Version>5.0.41</Version>
    </PackageReference>
+    <PackageReference Include="System.Data.SQLite">
+      <Version>1.0.119</Version>
+    </PackageReference>
    <PackageReference Include="System.Management">
      <Version>8.0.0</Version>
    </PackageReference>
    <PackageReference Include="TouchSocket">
      <Version>2.1.10</Version>
    </PackageReference>
+    <PackageReference Include="WPF-UI">
+      <Version>3.0.5</Version>
+    </PackageReference>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="View\" />
@ -195,10 +204,12 @@
    <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
    <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
    <Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="sunlightlogo.ico" />
+    <Resource Include="LOGO\sunlightlogo.ico" />
+    <Resource Include="LOGO\sunlightlogo.jpg" />
+    <Resource Include="SUNLIGHT.ico" />
    <Resource Include="sunlight_logo.ico" />
    <Resource Include="LOGO\SUNLIGHT.ico" />
-    <Resource Include="LOGO\sunlight_logo.ico" />
-    <Resource Include="LOGO\sunlight_logo.jpg" />
    <Resource Include="LOGO\sunlight_logotext.jpg" />
    <Resource Include="LOGO\sunlight_sc.png" />
    <Resource Include="Fonts\font-awesome-4.7.0\HELP-US-OUT.txt" />
--- a/sunlightlogo.ico
+++ b/sunlightlogo.ico