From a660b797cf6584fe1580779de54cd0d80a517e5d Mon Sep 17 00:00:00 2001
From: Alexander Heidn <40741234+HerrKnarz@users.noreply.github.com>
Date: Tue, 29 Oct 2024 23:58:53 +0100
Subject: [PATCH] Fixed bug when closing add item dialog, fixed formatting of
 settings and changed link to prefixes help page.

---
 .../Models/MetadataObjects.cs                 |  5 +++
 .../Properties/AssemblyInfo.cs                |  4 +--
 .../ViewModels/SettingsViewModel.cs           |  2 +-
 .../MetadataUtilities/Views/SettingsView.xaml | 34 ++++++++++++-------
 Generic/MetadataUtilities/extension.yaml      |  2 +-
 Manifest/HerrKnarz_MetadataUtilities.yaml     |  8 +++++
 6 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/Generic/MetadataUtilities/Models/MetadataObjects.cs b/Generic/MetadataUtilities/Models/MetadataObjects.cs
index 6c10e992a..7d3b2cfb3 100644
--- a/Generic/MetadataUtilities/Models/MetadataObjects.cs
+++ b/Generic/MetadataUtilities/Models/MetadataObjects.cs
@@ -65,6 +65,11 @@ public MetadataObject AddNewItem(FieldType type, string prefix = "", bool enable
         {
             var newItem = ControlCenter.AddNewItem(type, prefix, enableTypeSelection, addToDb);
 
+            if (newItem == null)
+            {
+                return null;
+            }
+
             if (this.Any(x => x.TypeAndName == newItem.TypeAndName))
             {
                 return null;
diff --git a/Generic/MetadataUtilities/Properties/AssemblyInfo.cs b/Generic/MetadataUtilities/Properties/AssemblyInfo.cs
index dc3e5075a..f3baaf2eb 100644
--- a/Generic/MetadataUtilities/Properties/AssemblyInfo.cs
+++ b/Generic/MetadataUtilities/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers by using the '*'
 // as shown below: [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
\ No newline at end of file
diff --git a/Generic/MetadataUtilities/ViewModels/SettingsViewModel.cs b/Generic/MetadataUtilities/ViewModels/SettingsViewModel.cs
index 51bbb6048..baef4d093 100644
--- a/Generic/MetadataUtilities/ViewModels/SettingsViewModel.cs
+++ b/Generic/MetadataUtilities/ViewModels/SettingsViewModel.cs
@@ -201,7 +201,7 @@ public RelayCommand HelpMergingCommand
 
         public RelayCommand HelpPrefixesCommand
             => new RelayCommand(()
-                => Process.Start(new ProcessStartInfo("https://knarzwerk.de/en/playnite-extensions/metadata-utilities/other-functionality/#prefixes")));
+                => Process.Start(new ProcessStartInfo("https://knarzwerk.de/en/playnite-extensions/metadata-utilities/prefixes")));
 
         public RelayCommand HelpQuickAddCommand
             => new RelayCommand(()
diff --git a/Generic/MetadataUtilities/Views/SettingsView.xaml b/Generic/MetadataUtilities/Views/SettingsView.xaml
index 9b8acdad2..6b4b1f6d8 100644
--- a/Generic/MetadataUtilities/Views/SettingsView.xaml
+++ b/Generic/MetadataUtilities/Views/SettingsView.xaml
@@ -126,7 +126,7 @@
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <DockPanel Margin="0,0,5,0" VerticalAlignment="Stretch">
-                        <Label DockPanel.Dock="Top" Content="{DynamicResource LOCMetadataUtilitiesSettingsMergeRules}" />
+                        <Label DockPanel.Dock="Top" Content="{DynamicResource LOCMetadataUtilitiesSettingsMergeRules}" Margin="0,0,0,5" />
                         <DockPanel VerticalAlignment="Center" DockPanel.Dock="Top" Margin="0,10,0,0">
                             <Button Content="&#xef00;" FontFamily="{DynamicResource FontIcoFont}" Click="ClearSearchBox" DockPanel.Dock="Right"
                                     Margin="5,0,0,0" Padding="5,5,8,5" />
@@ -160,7 +160,7 @@
                     </StackPanel>
 
                     <DockPanel Grid.Column="1" Grid.Row="0" Margin="5,0,0,0" VerticalAlignment="Stretch">
-                        <Label DockPanel.Dock="Top" Content="{DynamicResource LOCMetadataUtilitiesSettingsValuesToMerge}" />
+                        <Label DockPanel.Dock="Top" Content="{DynamicResource LOCMetadataUtilitiesSettingsValuesToMerge}" Margin="0,0,0,5" />
                         <DataGrid Name="DgSources" ItemsSource="{Binding SourceObjectsViewSource.View}" AutoGenerateColumns="False"
                                 DockPanel.Dock="Top" Margin="0,10,0,0" CanUserAddRows="False" HeadersVisibility="Column"
                                 HorizontalContentAlignment="Stretch"  VerticalAlignment="Stretch" ColumnWidth="*">
@@ -354,18 +354,26 @@
                             CommandParameter="{Binding SelectedItems, ElementName=LvPrefixes}" />
                     <Button Content="&#xEFEE;" DockPanel.Dock="Left" FontFamily="{DynamicResource FontIcoFont}" 
                             Command="{Binding SortPrefixesCommand}" Margin="10,0,0,0" />
-                    <Button Content="&#xEFCA;" DockPanel.Dock="Right" FontFamily="{DynamicResource FontIcoFont}" ToolTip="{DynamicResource LOCMenuHelpTitle}"
-                            Command="{Binding HelpPrefixesCommand}" Margin="10,0,0,0" />
                 </DockPanel>
-                <CheckBox DockPanel.Dock="Top" IsChecked="{Binding Settings.PrefixControlDisplayAddButton}">
-                    <TextBlock Text="{DynamicResource LOCMetadataUtilitiesSettingsDisplayAddButton}" TextWrapping="Wrap" />
-                </CheckBox>
-                <CheckBox DockPanel.Dock="Top" IsChecked="{Binding Settings.PrefixControlDisplayDeleteButton}" Margin="0,10,0,0">
-                    <TextBlock Text="{DynamicResource LOCMetadataUtilitiesSettingsDisplayDeleteButton}" TextWrapping="Wrap" />
-                </CheckBox>
-                <CheckBox DockPanel.Dock="Top" IsChecked="{Binding Settings.PrefixControlConfirmDeletion}" Margin="0,10,0,0">
-                    <TextBlock Text="{DynamicResource LOCMetadataUtilitiesSettingsConfirmDeletion}" TextWrapping="Wrap" />
-                </CheckBox>
+                <Grid DockPanel.Dock="Top">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <StackPanel>
+                        <CheckBox IsChecked="{Binding Settings.PrefixControlDisplayAddButton}">
+                            <TextBlock Text="{DynamicResource LOCMetadataUtilitiesSettingsDisplayAddButton}" TextWrapping="Wrap" />
+                        </CheckBox>
+                        <CheckBox IsChecked="{Binding Settings.PrefixControlDisplayDeleteButton}" Margin="0,10,0,0">
+                            <TextBlock Text="{DynamicResource LOCMetadataUtilitiesSettingsDisplayDeleteButton}" TextWrapping="Wrap" />
+                        </CheckBox>
+                        <CheckBox IsChecked="{Binding Settings.PrefixControlConfirmDeletion}" Margin="0,10,0,0">
+                            <TextBlock Text="{DynamicResource LOCMetadataUtilitiesSettingsConfirmDeletion}" TextWrapping="Wrap" />
+                        </CheckBox>
+                    </StackPanel>
+                    <Button Content="&#xEFCA;" FontFamily="{DynamicResource FontIcoFont}" Grid.Column="1" VerticalAlignment="Top"
+                            Command="{Binding HelpPrefixesCommand}" Margin="10,0,0,0" ToolTip="{DynamicResource LOCMenuHelpTitle}" />
+                </Grid>
                 <ListView Name="LvPrefixes" SelectionMode="Extended" DockPanel.Dock="Top" Margin="0,10,0,0"
                           ItemsSource="{Binding Settings.PrefixItemTypes}" HorizontalContentAlignment="Stretch"
                           VerticalContentAlignment="Stretch" VerticalAlignment="Stretch">
diff --git a/Generic/MetadataUtilities/extension.yaml b/Generic/MetadataUtilities/extension.yaml
index 977c4bf51..ede6fb771 100644
--- a/Generic/MetadataUtilities/extension.yaml
+++ b/Generic/MetadataUtilities/extension.yaml
@@ -1,7 +1,7 @@
 Id: MetadataUtilities_485ab5f0-bfb1-4c17-93cc-20d8338673be
 Name: Metadata Utilities
 Author: HerrKnarz
-Version: 1.5.0
+Version: 1.5.1
 Module: MetadataUtilities.dll
 Type: GenericPlugin
 Icon: icon.png
diff --git a/Manifest/HerrKnarz_MetadataUtilities.yaml b/Manifest/HerrKnarz_MetadataUtilities.yaml
index cf57ce7e8..ea329e363 100644
--- a/Manifest/HerrKnarz_MetadataUtilities.yaml
+++ b/Manifest/HerrKnarz_MetadataUtilities.yaml
@@ -1,5 +1,13 @@
 AddonId: MetadataUtilities_485ab5f0-bfb1-4c17-93cc-20d8338673be
 Packages:
+  - Version: 1.5.1
+    RequiredApiVersion: 6.11.0
+    ReleaseDate: 2024-10-29
+    PackageUrl: https://github.com/HerrKnarz/Playnite-Extensions/releases/download/2024-10-29/MetadataUtilities_485ab5f0-bfb1-4c17-93cc-20d8338673be_1_5_1.pext
+    Changelog:
+      - Fixed error message when closing the "add new item" dialog in the metadata editor with cancel.
+      - Changed link to the help page for prefixes, after the documentation was updated for all the changes from the last weeks.
+      - Fixed formatting of some settings
   - Version: 1.5.0
     RequiredApiVersion: 6.11.0
     ReleaseDate: 2024-10-27