Merge pull request #116 from atc-net/feature/Improve-LabelContent

Feature/improve label content

Author: davidkallesen

sample/Atc.Wpf.Sample/SamplesWpfControls/DialogBoxes/StandardDialogBoxViewModel.cs

@@ -642,8 +642,8 @@ private void ShowBasicApplicationSettingsDialogBoxCommandHandler()
     }
 
     private static List<ILabelControlBase> CreateLabelControlsColumn1()
-        => new()
-        {
+        =>
+        [
             new LabelTextBox
             {
                 LabelText = "FirstName",
@@ -656,11 +656,11 @@ private static List<ILabelControlBase> CreateLabelControlsColumn1()
                 IsMandatory = true,
                 MinLength = 2,
             },
-        };
+        ];
 
     private static List<ILabelControlBase> CreateLabelControlsColumn2()
-        => new()
-        {
+        =>
+        [
             new LabelIntegerBox
             {
                 LabelText = "Age",
@@ -670,11 +670,11 @@ private static List<ILabelControlBase> CreateLabelControlsColumn2()
             {
                 LabelText = "Note",
             },
-        };
+        ];
 
     private static List<ILabelControlBase> CreateLabelControlsColumn3()
-        => new()
-        {
+        =>
+        [
             new LabelCheckBox
             {
                 LabelText = "Use Foo",
@@ -691,7 +691,7 @@ private static List<ILabelControlBase> CreateLabelControlsColumn3()
                     { "Item5", "Item 5" },
                 },
             },
-        };
+        ];
 
     private string CreateJson(
         string value)

src/Atc.Wpf.Controls/Dialogs/BasicApplicationSettingsDialogBox.xaml

@@ -3,13 +3,15 @@
     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: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="?Application Settings"
+    Title="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                                Key=ApplicationSettings}"
     Width="550"
     Height="300"
     d:DataContext="{d:DesignInstance Type=local:BasicApplicationSettingsDialogBoxViewModel}"

src/Atc.Wpf.Controls/Dialogs/BasicApplicationSettingsDialogBox.xaml.cs

@@ -10,6 +10,14 @@ public BasicApplicationSettingsDialogBox()
         InitializeComponent();
     }
 
+    public BasicApplicationSettingsDialogBox(
+        IBasicApplicationSettingsDialogBoxViewModel viewModel)
+    {
+        InitializeComponent();
+
+        DataContext = viewModel;
+    }
+
     public string GetDataAsJson()
         => DataContext is BasicApplicationSettingsDialogBoxViewModel vm
             ? vm.ToJson()

src/Atc.Wpf.Controls/Dialogs/IBasicApplicationSettingsDialogBoxViewModel.cs

@@ -0,0 +1,5 @@
+namespace Atc.Wpf.Controls.Dialogs;
+
+public interface IBasicApplicationSettingsDialogBoxViewModel : IViewModelBase
+{
+}

src/Atc.Wpf.Controls/LabelControls/Extensions/LabelContentExtensions.cs

@@ -0,0 +1,16 @@
+// ReSharper disable CheckNamespace
+namespace Atc.Wpf.Controls.LabelControls;
+
+public static class LabelContentExtensions
+{
+    public static T? GetViewModel<T>(
+        this LabelContent labelContent)
+        where T : ViewModelBase
+    {
+        ArgumentNullException.ThrowIfNull(labelContent);
+
+        return labelContent.Content is FrameworkElement frameworkElement
+            ? frameworkElement.DataContext as T
+            : null;
+    }
+}

src/Atc.Wpf.Controls/LabelControls/Extensions/LabelControlBaseExtensions.cs

@@ -15,6 +15,20 @@ public static bool IsValid(
         ArgumentNullException.ThrowIfNull(labelControls);
         ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-        return labelControls.Find(x => x.Identifier == identifier) as T;
+        if (labelControls.Find(x => x.Identifier == identifier || x.GetFullIdentifier() == identifier) is T labelControl)
+        {
+            return labelControl;
+        }
+
+        foreach (var lc in labelControls)
+        {
+            if (lc is FrameworkElement { Tag: not null } frameworkElement &&
+                frameworkElement.Tag.ToString() == identifier)
+            {
+                return lc as T;
+            }
+        }
+
+        return null;
     }
 }

src/Atc.Wpf.Controls/LabelControls/LabelControlsFormColumn.cs

@@ -173,6 +173,17 @@ public Dictionary<string, object> GetKeyValues()
                         result.Add(control.GetFullIdentifier(), (Color)color);
                     }
 
+                    break;
+                case LabelContent labelContent:
+                    if (labelContent.Content is FrameworkElement { DataContext: ViewModelBase } labelContentFrameworkElement)
+                    {
+                        var tag = labelContent.Tag?.ToString();
+                        if (!string.IsNullOrEmpty(tag))
+                        {
+                            result.Add(tag, labelContentFrameworkElement.DataContext);
+                        }
+                    }
+
                     break;
             }
         }

src/Atc.Wpf.Controls/Resources/Miscellaneous.Designer.cs

@@ -174,4 +174,7 @@
   <data name="OpenRecentFileOnStartup" xml:space="preserve">
     <value>Åbn den seneste fil ved opstart</value>
   </data>
+  <data name="ApplicationSettings" xml:space="preserve">
+    <value>Applikationsindstillinger</value>
+  </data>
 </root>

src/Atc.Wpf.Controls/Resources/Miscellaneous.da-DK.resx

@@ -174,4 +174,7 @@
   <data name="OpenRecentFileOnStartup" xml:space="preserve">
     <value>Öffnen Sie die zuletzt verwendete Datei beim Start</value>
   </data>
+  <data name="ApplicationSettings" xml:space="preserve">
+    <value>Anwendungseinstellungen</value>
+  </data>
 </root>

src/Atc.Wpf.Controls/Resources/Miscellaneous.de-DE.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ApplicationSettings" xml:space="preserve">
+    <value>Application Settings</value>
+  </data>
   <data name="AvailableColors" xml:space="preserve">
     <value>Available Colors</value>
   </data>