From d9517e7d2c9a90f66ba7a9169da1b2facc9e115d Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Fri, 26 Apr 2024 10:44:20 +0200 Subject: [PATCH 1/5] chore: Nuget updates --- Directory.Build.props | 4 ++-- sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj | 2 +- .../Atc.Wpf.Controls.Sample.csproj | 2 +- src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj | 7 ++++++- src/Atc.Wpf.Theming/Atc.Wpf.Theming.csproj | 2 +- src/Atc.Wpf/Atc.Wpf.csproj | 2 +- test/Atc.Wpf.Controls.Tests/Atc.Wpf.Controls.Tests.csproj | 8 ++++---- test/Atc.Wpf.Tests/Atc.Wpf.Tests.csproj | 8 ++++---- test/Atc.Wpf.Theming.Tests/Atc.Wpf.Theming.Tests.csproj | 8 ++++---- .../Atc.Wpf.Generator.FontIconResources.csproj | 2 +- 10 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5edca18..f7b7454 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -45,10 +45,10 @@ - + - + \ No newline at end of file diff --git a/sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj b/sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj index 94b1905..7f84724 100644 --- a/sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj +++ b/sample/Atc.Wpf.Sample/Atc.Wpf.Sample.csproj @@ -50,7 +50,7 @@ - + diff --git a/src/Atc.Wpf.Controls.Sample/Atc.Wpf.Controls.Sample.csproj b/src/Atc.Wpf.Controls.Sample/Atc.Wpf.Controls.Sample.csproj index c4e5d6c..075c388 100644 --- a/src/Atc.Wpf.Controls.Sample/Atc.Wpf.Controls.Sample.csproj +++ b/src/Atc.Wpf.Controls.Sample/Atc.Wpf.Controls.Sample.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj b/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj index b2c3d5f..6f1b8f5 100644 --- a/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj +++ b/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj @@ -12,6 +12,7 @@ + @@ -23,7 +24,11 @@ - + + + + + diff --git a/src/Atc.Wpf.Theming/Atc.Wpf.Theming.csproj b/src/Atc.Wpf.Theming/Atc.Wpf.Theming.csproj index ac2f844..910f828 100644 --- a/src/Atc.Wpf.Theming/Atc.Wpf.Theming.csproj +++ b/src/Atc.Wpf.Theming/Atc.Wpf.Theming.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Atc.Wpf/Atc.Wpf.csproj b/src/Atc.Wpf/Atc.Wpf.csproj index e8ce745..2bcc766 100644 --- a/src/Atc.Wpf/Atc.Wpf.csproj +++ b/src/Atc.Wpf/Atc.Wpf.csproj @@ -1007,7 +1007,7 @@ - + diff --git a/test/Atc.Wpf.Controls.Tests/Atc.Wpf.Controls.Tests.csproj b/test/Atc.Wpf.Controls.Tests/Atc.Wpf.Controls.Tests.csproj index df3a41b..44e6f31 100644 --- a/test/Atc.Wpf.Controls.Tests/Atc.Wpf.Controls.Tests.csproj +++ b/test/Atc.Wpf.Controls.Tests/Atc.Wpf.Controls.Tests.csproj @@ -7,11 +7,11 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Atc.Wpf.Tests/Atc.Wpf.Tests.csproj b/test/Atc.Wpf.Tests/Atc.Wpf.Tests.csproj index 0fa735d..c868a8c 100644 --- a/test/Atc.Wpf.Tests/Atc.Wpf.Tests.csproj +++ b/test/Atc.Wpf.Tests/Atc.Wpf.Tests.csproj @@ -7,11 +7,11 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Atc.Wpf.Theming.Tests/Atc.Wpf.Theming.Tests.csproj b/test/Atc.Wpf.Theming.Tests/Atc.Wpf.Theming.Tests.csproj index 471708c..151d3ed 100644 --- a/test/Atc.Wpf.Theming.Tests/Atc.Wpf.Theming.Tests.csproj +++ b/test/Atc.Wpf.Theming.Tests/Atc.Wpf.Theming.Tests.csproj @@ -7,11 +7,11 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tool/Atc.Wpf.Generator.FontIconResources/Atc.Wpf.Generator.FontIconResources.csproj b/tool/Atc.Wpf.Generator.FontIconResources/Atc.Wpf.Generator.FontIconResources.csproj index 88d5d1f..253e135 100644 --- a/tool/Atc.Wpf.Generator.FontIconResources/Atc.Wpf.Generator.FontIconResources.csproj +++ b/tool/Atc.Wpf.Generator.FontIconResources/Atc.Wpf.Generator.FontIconResources.csproj @@ -8,7 +8,7 @@ - + NU1701 From 8d9bee50e3d9fd97f3607422789addb662cdafed Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Fri, 26 Apr 2024 10:44:58 +0200 Subject: [PATCH 2/5] feat: Add Translations for: CollapseAll, ExpandAll and CopyToClipboard --- .../Resources/Miscellaneous.Designer.cs | 27 +++++++++++++++++++ .../Resources/Miscellaneous.da-DK.resx | 9 +++++++ .../Resources/Miscellaneous.de-DE.resx | 9 +++++++ .../Resources/Miscellaneous.resx | 9 +++++++ 4 files changed, 54 insertions(+) diff --git a/src/Atc.Wpf.Controls/Resources/Miscellaneous.Designer.cs b/src/Atc.Wpf.Controls/Resources/Miscellaneous.Designer.cs index 42d1d31..fb3f274 100644 --- a/src/Atc.Wpf.Controls/Resources/Miscellaneous.Designer.cs +++ b/src/Atc.Wpf.Controls/Resources/Miscellaneous.Designer.cs @@ -87,6 +87,15 @@ public static string Cancel { } } + /// + /// Looks up a localized string similar to Collapse All. + /// + public static string CollapseAll { + get { + return ResourceManager.GetString("CollapseAll", resourceCulture); + } + } + /// /// Looks up a localized string similar to Color. /// @@ -114,6 +123,15 @@ public static string ColorPicker { } } + /// + /// Looks up a localized string similar to Copy to Clipboard. + /// + public static string CopyToClipboard { + get { + return ResourceManager.GetString("CopyToClipboard", resourceCulture); + } + } + /// /// Looks up a localized string similar to Country. /// @@ -123,6 +141,15 @@ public static string Country { } } + /// + /// Looks up a localized string similar to Expand All. + /// + public static string ExpandAll { + get { + return ResourceManager.GetString("ExpandAll", resourceCulture); + } + } + /// /// Looks up a localized string similar to Field is required. /// diff --git a/src/Atc.Wpf.Controls/Resources/Miscellaneous.da-DK.resx b/src/Atc.Wpf.Controls/Resources/Miscellaneous.da-DK.resx index 1ef84f1..f4bf8bd 100644 --- a/src/Atc.Wpf.Controls/Resources/Miscellaneous.da-DK.resx +++ b/src/Atc.Wpf.Controls/Resources/Miscellaneous.da-DK.resx @@ -177,4 +177,13 @@ Applikationsindstillinger + + Skjul alle + + + Udvid alle + + + Kopier til udklipsholder + \ No newline at end of file diff --git a/src/Atc.Wpf.Controls/Resources/Miscellaneous.de-DE.resx b/src/Atc.Wpf.Controls/Resources/Miscellaneous.de-DE.resx index 90493f8..1552bc5 100644 --- a/src/Atc.Wpf.Controls/Resources/Miscellaneous.de-DE.resx +++ b/src/Atc.Wpf.Controls/Resources/Miscellaneous.de-DE.resx @@ -177,4 +177,13 @@ Anwendungseinstellungen + + Alles reduzieren + + + Alle erweitern + + + In die Zwischenablage kopieren + \ No newline at end of file diff --git a/src/Atc.Wpf.Controls/Resources/Miscellaneous.resx b/src/Atc.Wpf.Controls/Resources/Miscellaneous.resx index 93eebce..8317eb5 100644 --- a/src/Atc.Wpf.Controls/Resources/Miscellaneous.resx +++ b/src/Atc.Wpf.Controls/Resources/Miscellaneous.resx @@ -126,6 +126,9 @@ Cancel + + Collapse All + Color @@ -135,9 +138,15 @@ Color Picker + + Copy to Clipboard + Country + + Expand All + Field is required From 2818544303695e565bbd982aab8dcbf38c011595 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Fri, 26 Apr 2024 10:45:22 +0200 Subject: [PATCH 3/5] feat: Add Svg clipboard --- .../Resources/Icons/clipboard.svg | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/Atc.Wpf.Controls/Resources/Icons/clipboard.svg diff --git a/src/Atc.Wpf.Controls/Resources/Icons/clipboard.svg b/src/Atc.Wpf.Controls/Resources/Icons/clipboard.svg new file mode 100644 index 0000000..ee92abb --- /dev/null +++ b/src/Atc.Wpf.Controls/Resources/Icons/clipboard.svg @@ -0,0 +1,18 @@ + + + + \ No newline at end of file From 2ebb3232c40f71bdac7320c603fa1b4020e698f4 Mon Sep 17 00:00:00 2001 From: David Kallesen Date: Fri, 26 Apr 2024 10:45:52 +0200 Subject: [PATCH 4/5] feat: Add ContextMenu with CopyToClipboard on JsonViewer --- src/Atc.Wpf.Controls/Viewers/JsonViewer.xaml | 36 +++++++++++++++++-- .../Viewers/JsonViewer.xaml.cs | 8 +++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/Atc.Wpf.Controls/Viewers/JsonViewer.xaml b/src/Atc.Wpf.Controls/Viewers/JsonViewer.xaml index 7dbfe42..9c280a2 100644 --- a/src/Atc.Wpf.Controls/Viewers/JsonViewer.xaml +++ b/src/Atc.Wpf.Controls/Viewers/JsonViewer.xaml @@ -3,6 +3,7 @@ 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:controls="clr-namespace:Atc.Wpf.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" @@ -134,14 +135,14 @@ Orientation="Horizontal" Spacing="10" Visibility="{Binding Path=ShowActionAndInformationBar, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource BoolToVisibilityVisibleValueConverter}}"> - -