Merge pull request #117 from atc-net/feature/DialogBox-Header

feat: Improve dialogBox's on HeaderContent
atc-net · Mar 22, 2024 · 3881f0e · 3881f0e
2 parents 0a607ef + 14d175c
commit 3881f0e
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 9 deletions.
diff --git a/src/Atc.Wpf.Controls/Dialogs/BasicApplicationSettingsDialogBox.xaml b/src/Atc.Wpf.Controls/Dialogs/BasicApplicationSettingsDialogBox.xaml
@@ -3,17 +3,16 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
-    xmlns:atcTranslation="https://github.com/atc-net/atc-wpf/tree/main/schemas/translations"
+    xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dialogs="clr-namespace:Atc.Wpf.Theming.Themes.Dialogs;assembly=Atc.Wpf.Theming"
     xmlns:local="clr-namespace:Atc.Wpf.Controls.Dialogs"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:settingsControls="clr-namespace:Atc.Wpf.Controls.SettingsControls"
     x:Name="DialogApplicationSettings"
-    Title="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
-                                Key=ApplicationSettings}"
+    Title="{Binding Path=TitleBarText}"
     Width="550"
-    Height="300"
+    Height="360"
     d:DataContext="{d:DesignInstance Type=local:BasicApplicationSettingsDialogBoxViewModel}"
     ShowCloseButton="False"
     ShowMaxRestoreButton="False"
@@ -22,9 +21,25 @@
     WindowStyle="SingleBorderWindow"
     mc:Ignorable="d">
 
+    <dialogs:NiceDialogBox.Resources>
+        <atcValueConverters:ObjectNotNullToVisibilityVisibleValueConverter x:Key="ObjectNotNullToVisibilityVisibleValueConverter" />
+    </dialogs:NiceDialogBox.Resources>
+
     <DockPanel>
 
         <Border
+            x:Name="ContentTop"
+            Height="50"
+            Background="{DynamicResource AtcApps.Brushes.ThemeBackground1}"
+            BorderBrush="{DynamicResource AtcApps.Brushes.Accent}"
+            BorderThickness="0,0,0,1"
+            DockPanel.Dock="Top"
+            Visibility="{Binding Path=HeaderControl, Converter={StaticResource ObjectNotNullToVisibilityVisibleValueConverter}}">
+            <ContentControl Content="{Binding Path=HeaderControl}" />
+        </Border>
+
+        <Border
+            x:Name="ContentButton"
             Height="50"
             Background="{DynamicResource AtcApps.Brushes.ThemeBackground1}"
             BorderBrush="{DynamicResource AtcApps.Brushes.Accent}"
@@ -55,7 +70,12 @@
             </atc:UniformSpacingPanel>
         </Border>
 
-        <settingsControls:BasicApplicationSettingsView Margin="20" DataContext="{Binding Path=ApplicationSettings}" />
+        <ScrollViewer x:Name="ContentCenter" Padding="20">
+            <settingsControls:BasicApplicationSettingsView
+                Margin="20"
+                VerticalAlignment="Center"
+                DataContext="{Binding Path=ApplicationSettings}" />
+        </ScrollViewer>
 
     </DockPanel>
 

diff --git a/src/Atc.Wpf.Controls/Dialogs/BasicApplicationSettingsDialogBoxViewModel.cs b/src/Atc.Wpf.Controls/Dialogs/BasicApplicationSettingsDialogBoxViewModel.cs
@@ -21,6 +21,8 @@ public BasicApplicationSettingsDialogBoxViewModel(
         ApplicationSettings = basicApplicationSettingsViewModel.Clone();
         applicationSettingsBackup = basicApplicationSettingsViewModel.Clone();
 
+        TitleBarText = Miscellaneous.ApplicationSettings;
+
         ThemeManager.Current.ThemeChanged += OnThemeChanged;
         CultureManager.UiCultureChanged += OnUiCultureChanged;
     }
@@ -34,8 +36,27 @@ public BasicApplicationSettingsDialogBoxViewModel(
         dataDirectory = applicationDataDirectory;
     }
 
+    public string TitleBarText { get; set; }
+
+    public ContentControl? HeaderControl { get; set; }
+
     public BasicApplicationSettingsViewModel ApplicationSettings { get; set; }
 
+    public void SetHeaderControlInsteadOfTitleBarText()
+    {
+        TitleBarText = string.Empty;
+        HeaderControl = new ContentControl
+        {
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Content = new TextBlock
+            {
+                Text = Miscellaneous.ApplicationSettings,
+                FontSize = 24,
+            },
+        };
+    }
+
     public string ToJson()
     {
         var file = new FileInfo(

diff --git a/src/Atc.Wpf.Controls/Dialogs/InfoDialogBox.xaml b/src/Atc.Wpf.Controls/Dialogs/InfoDialogBox.xaml
@@ -22,16 +22,18 @@
     <DockPanel>
 
         <Border
+            x:Name="ContentTop"
             Height="50"
             Background="{DynamicResource AtcApps.Brushes.ThemeBackground1}"
             BorderBrush="{DynamicResource AtcApps.Brushes.Accent}"
             BorderThickness="0,0,0,1"
             DockPanel.Dock="Top"
             Visibility="{Binding Path=HeaderControl, Converter={StaticResource ObjectNotNullToVisibilityVisibleValueConverter}}">
-            <ContentControl Margin="30" Content="{Binding Path=HeaderControl}" />
+            <ContentControl Content="{Binding Path=HeaderControl}" />
         </Border>
 
         <Border
+            x:Name="ContentButton"
             Height="50"
             Background="{DynamicResource AtcApps.Brushes.ThemeBackground1}"
             BorderBrush="{DynamicResource AtcApps.Brushes.Accent}"

diff --git a/src/Atc.Wpf.Controls/Dialogs/InfoDialogBox.xaml.cs b/src/Atc.Wpf.Controls/Dialogs/InfoDialogBox.xaml.cs
@@ -27,6 +27,28 @@ public InfoDialogBox(
         Settings.TitleBarText = titleBarText;
     }
 
+    public InfoDialogBox(
+        Window owningWindow,
+        string titleBarText,
+        string headerText,
+        string contentText)
+        : this(
+            owningWindow,
+            titleBarText,
+            contentText)
+    {
+        HeaderControl = new ContentControl
+        {
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Content = new TextBlock
+            {
+                Text = headerText,
+                FontSize = 24,
+            },
+        };
+    }
+
     public InfoDialogBox(
         Window owningWindow,
         DialogBoxSettings settings,

diff --git a/src/Atc.Wpf.Controls/Dialogs/InputDialogBox.xaml b/src/Atc.Wpf.Controls/Dialogs/InputDialogBox.xaml
@@ -28,16 +28,18 @@
     <DockPanel>
 
         <Border
+            x:Name="ContentTop"
             Height="50"
             Background="{DynamicResource AtcApps.Brushes.ThemeBackground1}"
             BorderBrush="{DynamicResource AtcApps.Brushes.Accent}"
             BorderThickness="0,0,0,1"
             DockPanel.Dock="Top"
             Visibility="{Binding Path=HeaderControl, Converter={StaticResource ObjectNotNullToVisibilityVisibleValueConverter}}">
-            <ContentControl Margin="30" Content="{Binding Path=HeaderControl}" />
+            <ContentControl Content="{Binding Path=HeaderControl}" />
         </Border>
 
         <Border
+            x:Name="ContentButton"
             Height="50"
             Background="{DynamicResource AtcApps.Brushes.ThemeBackground1}"
             BorderBrush="{DynamicResource AtcApps.Brushes.Accent}"

diff --git a/src/Atc.Wpf.Controls/Dialogs/InputDialogBox.xaml.cs b/src/Atc.Wpf.Controls/Dialogs/InputDialogBox.xaml.cs
@@ -27,6 +27,28 @@ public InputDialogBox(
         Settings.TitleBarText = titleBarText;
     }
 
+    public InputDialogBox(
+        Window owningWindow,
+        string titleBarText,
+        string headerText,
+        ILabelControlBase labelControl)
+        : this(
+            owningWindow,
+            titleBarText,
+            labelControl)
+    {
+        HeaderControl = new ContentControl
+        {
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Content = new TextBlock
+            {
+                Text = headerText,
+                FontSize = 24,
+            },
+        };
+    }
+
     public InputDialogBox(
         Window owningWindow,
         DialogBoxSettings settings,

diff --git a/src/Atc.Wpf.Controls/Dialogs/InputFormDialogBox.xaml b/src/Atc.Wpf.Controls/Dialogs/InputFormDialogBox.xaml
@@ -35,7 +35,7 @@
             BorderThickness="0,0,0,1"
             DockPanel.Dock="Top"
             Visibility="{Binding Path=HeaderControl, Converter={StaticResource ObjectNotNullToVisibilityVisibleValueConverter}}">
-            <ContentControl Margin="30" Content="{Binding Path=HeaderControl}" />
+            <ContentControl Content="{Binding Path=HeaderControl}" />
         </Border>
 
         <Border

diff --git a/src/Atc.Wpf.Controls/Dialogs/InputFormDialogBox.xaml.cs b/src/Atc.Wpf.Controls/Dialogs/InputFormDialogBox.xaml.cs
@@ -30,6 +30,30 @@ public InputFormDialogBox(
         Settings.TitleBarText = titleBarText;
     }
 
+    public InputFormDialogBox(
+        Window owningWindow,
+        string titleBarText,
+        string headerText,
+        ILabelControlsForm labelControlsForm)
+        : this(
+            owningWindow,
+            titleBarText,
+            labelControlsForm)
+    {
+        HeaderControl = new ContentControl
+        {
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Content = new TextBlock
+            {
+                Text = headerText,
+                FontSize = 24,
+            },
+        };
+
+        UpdateWidthAndHeight();
+    }
+
     public InputFormDialogBox(
         Window owningWindow,
         LabelInputFormPanelSettings formPanelSettings,

diff --git a/src/Atc.Wpf.Controls/Dialogs/QuestionDialogBox.xaml b/src/Atc.Wpf.Controls/Dialogs/QuestionDialogBox.xaml
@@ -28,15 +28,18 @@
     <DockPanel>
 
         <Border
+            x:Name="ContentTop"
+            Height="50"
             Background="{DynamicResource AtcApps.Brushes.ThemeBackground1}"
             BorderBrush="{DynamicResource AtcApps.Brushes.Accent}"
             BorderThickness="0,0,0,1"
             DockPanel.Dock="Top"
             Visibility="{Binding Path=HeaderControl, Converter={StaticResource ObjectNotNullToVisibilityVisibleValueConverter}}">
-            <ContentControl Margin="30" Content="{Binding Path=HeaderControl}" />
+            <ContentControl Content="{Binding Path=HeaderControl}" />
         </Border>
 
         <Border
+            x:Name="ContentButton"
             Height="50"
             Background="{DynamicResource AtcApps.Brushes.ThemeBackground1}"
             BorderBrush="{DynamicResource AtcApps.Brushes.Accent}"

diff --git a/src/Atc.Wpf.Controls/Dialogs/QuestionDialogBox.xaml.cs b/src/Atc.Wpf.Controls/Dialogs/QuestionDialogBox.xaml.cs
@@ -27,6 +27,28 @@ public QuestionDialogBox(
         Settings.TitleBarText = titleBarText;
     }
 
+    public QuestionDialogBox(
+        Window owningWindow,
+        string titleBarText,
+        string headerText,
+        string contentText)
+        : this(
+            owningWindow,
+            titleBarText,
+            contentText)
+    {
+        HeaderControl = new ContentControl
+        {
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Content = new TextBlock
+            {
+                Text = headerText,
+                FontSize = 24,
+            },
+        };
+    }
+
     public QuestionDialogBox(
         Window owningWindow,
         DialogBoxSettings settings,