Preparing Display Preferences Dialog

Taiizor · Oct 2, 2023 · 46f4b13 · 46f4b13
1 parent 522df67
commit 46f4b13
Show file tree

Hide file tree

Showing 12 changed files with 290 additions and 56 deletions.
diff --git a/src/Portal/Sucrose.Portal/Manage/Manager.cs b/src/Portal/Sucrose.Portal/Manage/Manager.cs
@@ -1,18 +1,18 @@
 using System.Net;
 using System.Windows.Media;
 using Wpf.Ui.Controls;
+using SEDST = Skylark.Enum.DuplicateScreenType;
+using SEEST = Skylark.Enum.ExpandScreenType;
 using SEST = Skylark.Enum.ScreenType;
 using SEWTT = Skylark.Enum.WindowsThemeType;
 using SHS = Skylark.Helper.Skymath;
 using SMC = Sucrose.Memory.Constant;
 using SMMI = Sucrose.Manager.Manage.Internal;
 using SMR = Sucrose.Memory.Readonly;
+using SSDEDT = Sucrose.Shared.Dependency.Enum.DisplayType;
 using SSDEPT = Sucrose.Shared.Dependency.Enum.PerformanceType;
 using SSDEST = Sucrose.Shared.Dependency.Enum.StretchType;
 using SWHWT = Skylark.Wing.Helper.WindowsTheme;
-using SSDEDT = Sucrose.Shared.Dependency.Enum.DisplayType;
-using SEDST = Skylark.Enum.DuplicateScreenType;
-using SEEST = Skylark.Enum.ExpandScreenType;
 
 namespace Sucrose.Portal.Manage
 {

diff --git a/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj b/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj
@@ -118,6 +118,15 @@
         <Resource Include="Assets\**\*.*" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Update="Views\Controls\Display\Expand.xaml.cs">
+        <SubType>Code</SubType>
+      </Compile>
+      <Compile Update="Views\Controls\Display\Duplicate.xaml.cs">
+        <SubType>Code</SubType>
+      </Compile>
+    </ItemGroup>
+
     <PropertyGroup>
         <SourceDirectory>$(OutputPath)\$(TargetFramework)\win-$(Platform)</SourceDirectory>
         <DestinationDirectory>..\..\Sucrose\Package\$(TargetFramework)\$(Platform)\$(AssemblyName)\</DestinationDirectory>

diff --git a/src/Portal/Sucrose.Portal/ViewModels/Windows/MainWindowViewModel.cs b/src/Portal/Sucrose.Portal/ViewModels/Windows/MainWindowViewModel.cs
@@ -15,6 +15,7 @@
 using SPEIL = Sucrose.Portal.Extension.ImageLoader;
 using SPMI = Sucrose.Portal.Manage.Internal;
 using SPMM = Sucrose.Portal.Manage.Manager;
+using SPVCDP = Sucrose.Portal.Views.Controls.DisplayPreferences;
 using SSCHA = Sucrose.Shared.Core.Helper.Architecture;
 using SSCHF = Sucrose.Shared.Core.Helper.Framework;
 using SSCHM = Sucrose.Shared.Core.Helper.Memory;
@@ -23,7 +24,6 @@
 using SSRER = Sucrose.Shared.Resources.Extension.Resources;
 using WUAAT = Wpf.Ui.Appearance.ApplicationTheme;
 using WUAT = Wpf.Ui.Appearance.ApplicationThemeManager;
-using SPVCDP = Sucrose.Portal.Views.Controls.DisplayPreferences;
 
 namespace Sucrose.Portal.ViewModels.Windows
 {

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/Display/Duplicate.xaml b/src/Portal/Sucrose.Portal/Views/Controls/Display/Duplicate.xaml
@@ -0,0 +1,15 @@
+<UserControl
+    x:Class="Sucrose.Portal.Views.Controls.Display.Duplicate"
+    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" 
+    mc:Ignorable="d">
+
+    <Border x:Name="Border" BorderBrush="CornflowerBlue" Cursor="Hand" CornerRadius="5" BorderThickness="2" Margin="5">
+        <Grid>
+            <Rectangle x:Name="Rectangle" Fill="{DynamicResource ControlAltFillColorSecondaryBrush}" Width="200" Height="100" />
+            <TextBlock x:Name="Index" Text="1" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextFillColorSecondaryBrush}" FontSize="72" FontWeight="SemiBold" />
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/src/Portal/Sucrose.Portal/Views/Controls/Display/Duplicate.xaml.cs b/src/Portal/Sucrose.Portal/Views/Controls/Display/Duplicate.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace Sucrose.Portal.Views.Controls.Display
+{
+    /// <summary>
+    /// Duplicate.xaml etkileşim mantığı
+    /// </summary>
+    public partial class Duplicate : UserControl
+    {
+        public Duplicate()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Portal/Sucrose.Portal/Views/Controls/Display/Expand.xaml b/src/Portal/Sucrose.Portal/Views/Controls/Display/Expand.xaml
@@ -0,0 +1,15 @@
+<UserControl
+    x:Class="Sucrose.Portal.Views.Controls.Display.Expand"
+    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" 
+    mc:Ignorable="d">
+
+    <Border x:Name="Border" BorderBrush="CornflowerBlue" Cursor="Hand" CornerRadius="5" BorderThickness="2" Margin="5">
+        <Grid>
+            <Rectangle x:Name="Rectangle" Fill="{DynamicResource ControlAltFillColorSecondaryBrush}" Width="Auto" Height="100" />
+            <TextBlock x:Name="Content" Text="All Monitors" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextFillColorSecondaryBrush}" FontSize="72" FontWeight="SemiBold" Margin="5 0 5 0" />
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/src/Portal/Sucrose.Portal/Views/Controls/Display/Expand.xaml.cs b/src/Portal/Sucrose.Portal/Views/Controls/Display/Expand.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace Sucrose.Portal.Views.Controls.Display
+{
+    /// <summary>
+    /// Expand.xaml etkileşim mantığı
+    /// </summary>
+    public partial class Expand : UserControl
+    {
+        public Expand()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Portal/Sucrose.Portal/Views/Controls/Display/Screen.xaml b/src/Portal/Sucrose.Portal/Views/Controls/Display/Screen.xaml
@@ -2,7 +2,7 @@
     x:Class="Sucrose.Portal.Views.Controls.Display.Screen"
     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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
     mc:Ignorable="d">
 

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/DisplayPreferences.xaml b/src/Portal/Sucrose.Portal/Views/Controls/DisplayPreferences.xaml
@@ -2,7 +2,8 @@
     x:Class="Sucrose.Portal.Views.Controls.DisplayPreferences"
     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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vcontrols="clr-namespace:Sucrose.Portal.Views.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
     xmlns:local="clr-namespace:Sucrose.Portal.Views.Controls"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
@@ -16,18 +17,27 @@
         <Style BasedOn="{StaticResource {x:Type ui:ContentDialog}}" TargetType="{x:Type local:DisplayPreferences}" />
     </ui:ContentDialog.Resources>
 
-    <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinWidth="400">
+    <StackPanel x:Name="Panel" HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinWidth="400">
         <Border Background="{DynamicResource ControlFillColorDefaultBrush}" CornerRadius="5" Margin="0 10 0 10" MinHeight="150">
             <ScrollViewer VerticalScrollBarVisibility="Auto">
-                <WrapPanel x:Name="Contents" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10">
-                    <Border BorderBrush="CornflowerBlue" Cursor="Hand" CornerRadius="5" BorderThickness="2" Margin="5" Visibility="Collapsed">
-                        <Grid>
-                            <Rectangle Fill="{DynamicResource ControlAltFillColorSecondaryBrush}" Width="Auto" Height="100" />
-                            <TextBlock Text="All Monitors" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextFillColorSecondaryBrush}" FontSize="72" FontWeight="SemiBold" Margin="5 0 5 0" />
-                        </Grid>
-                    </Border>
-                </WrapPanel>
+                <WrapPanel x:Name="Contents" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" />
             </ScrollViewer>
         </Border>
+
+        <vcontrols:ExpanderCard x:Name="Expander" TitleText="Yerleştirme Modu" DescriptionText="Duvar kağıtlarının aktif ekranlara nasıl uygulanacağı." LeftIconSymbol="DualScreenSpan24" IsExpand="True" Expandable="True">
+            <vcontrols:ExpanderCard.FooterCard>
+                <StackPanel>
+                    <RadioButton />
+                    <RadioButton />
+                    <RadioButton />
+
+                    <ui:NavigationViewItemSeparator Margin="0 10 0 10" />
+
+                    <ui:TextBlock Margin="0 0 0 10" />
+
+                    <RadioButton />
+                </StackPanel>
+            </vcontrols:ExpanderCard.FooterCard>
+        </vcontrols:ExpanderCard>
     </StackPanel>
 </ui:ContentDialog>