[fix:] multiple little fixed for the combining methods

# Conflicts:
#	MainWindow.axaml
#	MainWindow.axaml.cs

MainWindow.axaml

@@ -223,6 +223,10 @@
 
                                     </Button>
                                 </StackPanel>
+                                <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
+                                    <RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
+                                    <RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
+                                </StackPanel>
                                 <CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
                             </StackPanel>
                         </Grid>
@@ -509,7 +513,7 @@
                                                    VerticalContentAlignment="Center" />
                                         </StackPanel>
                                     </Button>
-                                    <Button Background="#99963434" HorizontalAlignment="Stretch"
+                                    <Button Background="#99963434" HorizontalAlignment="Stretch" x:Name="BtnDeleteCustomer" Click="BtnDeleteCustomer_OnClick"
                                             HorizontalContentAlignment="Center">
                                         <StackPanel Orientation="Horizontal">
                                             <LucideIcon Kind="Trash" Width="16" Height="16" Size="16" />

MainWindow.axaml.cs

@@ -125,12 +125,34 @@ public partial class MainWindow : Window
 
     private void MnuAbout_OnClick(object? sender, RoutedEventArgs e)
     {
-        throw new NotImplementedException();
+        try
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = "https://mypapercloud.de/logof/",
+                UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
+            });
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
+        }
     }
 
     private void MnuHelp_OnClick(object? sender, RoutedEventArgs e)
     {
-        throw new NotImplementedException();
+        try
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = "https://mypapercloud.de/logof/wiki/",
+                UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
+            });
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
+        }
     }
 
     private void MnuGit_OnClick(object? sender, RoutedEventArgs e)
@@ -449,14 +471,14 @@ public partial class MainWindow : Window
         }
     }
 
-    private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type)
+    private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type, CombineAddresses.CombineType comb_type)
     {
         var progressWindow = new ProgressWindow();
 
         progressWindow.Show(_instance);
 
         var processor = new CombineAddresses(progressWindow);
-        var result = await processor.Perform(address_lists, type, CbMergeExportUnmerged.IsChecked);
+        var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked);
 
         if (result.Item1 != null)
             result.Item1.owner_id = owner_id;
@@ -747,7 +769,7 @@ public partial class MainWindow : Window
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
         try
         {
-            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference", GetCombiningTyp());
         }
         catch
         {
@@ -763,7 +785,7 @@ public partial class MainWindow : Window
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
         try
         {
-            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union", GetCombiningTyp());
         }
         catch
         {
@@ -780,7 +802,7 @@ public partial class MainWindow : Window
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
         try
         {
-            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
         }
         catch
         {
@@ -788,6 +810,19 @@ public partial class MainWindow : Window
         }
     }
 
+    public CombineAddresses.CombineType GetCombiningTyp()
+    {
+        if (RbComprefsid.IsChecked == true)
+        {
+            return CombineAddresses.CombineType.refsid;
+        } else if (RbCompfinAd.IsChecked == true)
+        {
+            return CombineAddresses.CombineType.final_adress;
+        }
+
+        return CombineAddresses.CombineType.none;
+    }
+
     private void BtnCombineSymmetricDifference_OnClick(object? sender, RoutedEventArgs e)
     {
         var list = new List<KasAddressList>();
@@ -795,7 +830,7 @@ public partial class MainWindow : Window
             list.Add(Settings._instance.addressSets.GetAddressSetByID(
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
 
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff");
+        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff", GetCombiningTyp());
     }
 
     private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
@@ -1128,4 +1163,21 @@ public partial class MainWindow : Window
                 MessageBox.Show(this, ex.StackTrace, "Fehler");
             }
     }
+
+    private void BtnDeleteCustomer_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
+        foreach (var customer in Settings._instance.customers.customers)
+            if (customer.ID == Settings._instance.customers.current)
+                try
+                {
+                    Settings._instance.customers.customers.Remove(customer);
+                    break;
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
+                }
+        RefreshCustomerItems();
+    }
 }

NamingWindow.axaml

@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" SizeToContent="WidthAndHeight"
+        mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen" Topmost="True"
         x:Class="Logof_Client.NamingWindow"
         Title="NamingWindow">
     <StackPanel Orientation="Vertical">

NamingWindow.axaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 
@@ -45,6 +46,7 @@ public partial class NamingWindow : Window
             if (parent != null)
                 wind.ShowDialog(parent);
             else wind.Show();
+            wind.Focus();
 
             return tcs.Task;
         }

ProgressWindow.axaml

@@ -3,7 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" Width="800" MinWidth="800" MaxWidth="800" d:DesignHeight="150"
-        Height="150" MinHeight="150" MaxHeight="150" Icon="assets/icon.ico"
+        Height="150" MinHeight="150" MaxHeight="150" Icon="assets/icon.ico" WindowStartupLocation="CenterScreen" Topmost="True"
         x:Class="Logof_Client.ProgressWindow" Title="Verarbeitung läuft...">
     <Grid>
         <!-- <ScrollViewer x:Name="ScvLog"> -->

Tasks/CombineAddresses.cs

@@ -16,13 +16,20 @@ public class CombineAddresses
         _progress = progressWindow;
     }
     
-    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
+    public enum CombineType
+    {
+        refsid,
+        final_adress,
+        none
+    }
+
+    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
         bool? exportUnused)
     {
-        if (type == "difference") return await Difference(address_lists, exportUnused);
+        if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
-        if (type == "union") return await Union(address_lists, exportUnused);
+        if (type == "union") return await Union(address_lists, comb_type, exportUnused);
-        if (type == "intersection") return await Intersection(address_lists, exportUnused);
+        if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
-        if (type == "symdiff") return await SymmetricDifference(address_lists, exportUnused);
+        if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
 
         return (null, null);
     }
@@ -35,11 +42,12 @@ public class CombineAddresses
     /// <param name="second">Second address to compare</param>
     /// <param name="only_refsid">If true, only a refsid-check will be done</param>
     /// <returns></returns>
-    public bool CompareAddresses(KasPerson first, KasPerson second, bool only_refsid = false)
+    public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
     {
         // A refsid of 0 means "missing", so it must not collapse unrelated entries.
+        if(comb_type == CombineType.refsid)
             if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
-        if (!only_refsid)
+        if (comb_type == CombineType.final_adress)
             if (first.name == second.name &&
                 first.anrede == second.anrede &&
                 first.anredzus == second.anredzus &&
@@ -68,7 +76,7 @@ public class CombineAddresses
         return false;
     }
 
-    public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused,
         Progress? progress = null)
     {
@@ -86,11 +94,13 @@ public class CombineAddresses
         for (var i = 1; i < address_lists.Count; i++)
             restUnion.AddRange(address_lists[i].KasPersons);
         var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true)
+            second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
 
         foreach (var person in address_lists[0].KasPersons)
         {
-            var isDouble = restUnion.Any(p => CompareAddresses(person, p));
+            var isDouble = restUnion.Any(p => CompareAddresses(person, p, comb_type));
             if (!isDouble)
                 result.KasPersons.Add(person);
             else
@@ -109,11 +119,13 @@ public class CombineAddresses
     }
 
 
-    public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused,
+    public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, CombineType comb_type, bool? return_unused,
         Progress progress = null)
     {
         var result = new KasAddressList(await KasAddressList.GenerateName("union"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true)
+            second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -124,7 +136,7 @@ public class CombineAddresses
         foreach (var list in address_lists)
         foreach (var person in list.KasPersons)
         {
-            if (!result.KasPersons.Any(existing => CompareAddresses(existing, person)))
+            if (!result.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)))
                 result.KasPersons.Add(person);
             else
                 second_result.KasPersons.Add(person);
@@ -151,11 +163,12 @@ public class CombineAddresses
         return null;
     }
 
-    public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused, Progress progress = null)
     {
         var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -171,7 +184,7 @@ public class CombineAddresses
         {
             // Prüfen, ob Person in *allen* anderen Listen vorkommt
             var isInAll = otherLists.All(list =>
-                list.KasPersons.Any(existing => CompareAddresses(existing, person)));
+                list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
 
             if (isInAll)
                 result.KasPersons.Add(person);
@@ -198,11 +211,12 @@ public class CombineAddresses
     }
 
 
-    public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused, Progress progress = null)
     {
         var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -217,7 +231,7 @@ public class CombineAddresses
         foreach (var person in list.KasPersons)
         {
             // Prüfen, ob schon vorhanden
-            var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person));
+            var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person, comb_type));
             if (existing.person != null)
             {
                 // Falls schon drin → Vorkommen erhöhen
@@ -255,65 +269,6 @@ public class CombineAddresses
         return (result, null);
     }
     
-
-    // private async Task<KasAddressList> Merge(KasAddressList first, KasAddressList second, int num, int total)
-    // {
-    //     foreach (var sec in second.KasPersons)
-    //     {
-    //         var is_new = true;
-    //         foreach (var fi in first.KasPersons)
-    //         {
-    //             if (fi.refsid == sec.refsid)
-    //             {
-    //                 is_new = false;
-    //                 break;
-    //             }
-    //
-    //             if (fi.name == sec.name &&
-    //                 fi.anrede == sec.anrede &&
-    //                 fi.anredzus == sec.anredzus &&
-    //                 fi.namezus == sec.namezus &&
-    //                 fi.titel == sec.titel &&
-    //                 fi.adel == sec.adel &&
-    //                 fi.strasse == sec.strasse &&
-    //                 fi.strasse2 == sec.strasse2 &&
-    //                 fi.vorname == sec.vorname &&
-    //                 fi.ort == sec.ort &&
-    //                 fi.land == sec.land &&
-    //                 fi.plz == sec.plz &&
-    //                 fi.pplz == sec.pplz &&
-    //                 fi.funktion == sec.funktion &&
-    //                 fi.funktion2 == sec.funktion2 &&
-    //                 fi.funktionad == sec.funktionad &&
-    //                 fi.abteilung == sec.abteilung &&
-    //                 fi.postfach == sec.postfach &&
-    //                 fi.name1 == sec.name1 &&
-    //                 fi.name2 == sec.name2 &&
-    //                 fi.name3 == sec.name3 &&
-    //                 fi.name4 == sec.name4 &&
-    //                 fi.name5 == sec.name5)
-    //             {
-    //                 is_new = false;
-    //                 break;
-    //             }
-    //         }
-    //
-    //         if (is_new) first.KasPersons.Add(sec);
-    //         var subperc = second.KasPersons.IndexOf(sec) / second.KasPersons.Count;
-    //         var percent = (num + (double)subperc) / total * 100;
-    //         await Dispatcher.UIThread.InvokeAsync(() =>
-    //         {
-    //             if (is_new)
-    //                 _progress.AddToLog($"Person mit refsid {sec.refsid} ergänzt");
-    //             else
-    //                 _progress.AddToLog($"Person mit refsid {sec.refsid} bereits vorhanden");
-    //
-    //             _progress.ChangePercentage(percent);
-    //         });
-    //     }
-    //
-    //     return first;
-    // }
 }
 
 public class Progress