[chore:] listbox item type is no string anymore (hopefully I tested everything?)

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

DataStore/DataStructures.cs

@@ -60,6 +60,11 @@ public class KasAddressList //Address-Set
         var id = listItemName.Split(" - ")[0];
         return int.Parse(id);
     }
+
+    public override string ToString()
+    {
+        return Name + " (" + KasPersons.Count + " Einträge)";
+    }
 }
 
 public class KasPerson
@@ -188,6 +193,18 @@ public class KasPerson
 
         return highest + base_id + 1;
     }
+
+    public override string ToString()
+    {
+        if (refsid != null && refsid != 0)
+        {
+            return refsid + " - " + name;
+        }
+        else
+        {
+            return id + " - " + name;
+        }
+    }
 }
 
 public class KasPersonError
@@ -212,4 +229,9 @@ public class KasPersonError
 
         return output;
     }
+
+    public string ToString(KasPerson person)
+    {
+        return "ID:"+person.id + "; Name: " +person.name +"; Errors: " + GetString();
+    }
 }

DataStore/Settings.cs

@@ -135,7 +135,7 @@ public class Global
 public class Customers
 {
     public List<Customer> customers = new();
-    public int current { get; set; } = 0;
+    public Customer current { get; set; } = null;
 }
 
 public class Customer
@@ -149,6 +149,11 @@ public class Customer
 
         ID = highestID + 1;
     }
+    
+    public override string ToString()
+    {
+        return name;
+    }
 
     public string name { get; set; } = "";
     public string description { get; set; } = "";
@@ -158,11 +163,11 @@ public class Customer
     public int ID { get; }
 
 
-    public static int GetIDByCustomerListItem(string item_content)
-    {
-        var id = item_content.Split(" - ")[0];
-        return int.Parse(id);
-    }
+    // public static int GetIDByCustomerListItem(string item_content)
+    // {
+    //     var id = item_content.Split(" - ")[0];
+    //     return int.Parse(id);
+    // }
 }
 
 public class AddressSets

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)
@@ -149,27 +171,6 @@ public partial class MainWindow : Window
         }
     }
 
-    private async void BtnChooseFile_OnClick(object? sender, RoutedEventArgs e)
-    {
-        var topLevel = GetTopLevel(this);
-        var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-        {
-            Title = "KAS-CSV-Datei auswählen",
-            AllowMultiple = false,
-            FileTypeFilter = new[]
-            {
-                new FilePickerFileType(".csv-Datei")
-                {
-                    Patterns = new[] { "*.csv" }
-                }
-            }
-        });
-
-        if (file == null) return;
-        //TbFilename.Text = file[0].Path.ToString();
-        filePath = file[0].Path;
-    }
-
     private void BtnCheck_OnClick(object? sender, RoutedEventArgs e)
     {
         MakeCalcManVisible();
@@ -179,7 +180,7 @@ public partial class MainWindow : Window
             return;
         }
 
-        StartAddressCheck(KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItem.ToString()));
+        StartAddressCheck(((KasAddressList)LstCustomerAdressSets.SelectedItem).ID);
     }
 
     private void BtnCombine_OnClick(object? sender, RoutedEventArgs e)
@@ -196,41 +197,7 @@ public partial class MainWindow : Window
         GrdExportMarginOptions.IsVisible = false;
     }
 
-    private async void StartCombine(Uri path)
-    {
-        MakeCalcManVisible();
-        var addresses = await DataImport.ImportKasAddressList(path);
-        var progressWindow = new ProgressWindow();
-        var address_list = new List<KasAddressList> { addresses.Item2 };
-
-        var topLevel = GetTopLevel(this);
-        var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-        {
-            Title = "Weitere KAS-CSV-Dateien auswählen",
-            AllowMultiple = true,
-            FileTypeFilter = new[]
-            {
-                new FilePickerFileType(".csv-Dateien")
-                {
-                    Patterns = new[] { "*.csv" }
-                    //Patterns = new[] { "*" }
-                }
-            }
-        });
-
-        if (file == null) return;
-
-        //filePath = file[0].Path;
-        foreach (var f in file) address_list.Add((await DataImport.ImportKasAddressList(f.Path)).Item2);
-
-        progressWindow.Show(_instance);
-
-        var processor = new CombineAddresses(progressWindow);
-        //var result = await processor.Perform(address_list);
-
-
-        progressWindow.Close();
-    }
+    
 
     private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
     {
@@ -415,48 +382,16 @@ public partial class MainWindow : Window
         MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
     }
 
-    private async Task<string> OpenSettingsSaveAsDialog()
-    {
-        var settingsFileName = "KAS-Adress-Liste";
+    
 
-        try
-        {
-            var filePicker = new SaveFileDialog
-            {
-                Title = "Datei speichern...",
-                InitialFileName = $"{settingsFileName}.csv",
-                DefaultExtension = ".csv",
-                Filters = new List<FileDialogFilter>
-                {
-                    new() { Name = "CSV-Datei", Extensions = { "csv" } }
-                }
-            };
-
-            var settingsSavePath = await filePicker.ShowAsync(this);
-            if (settingsSavePath == null)
-            {
-            }
-
-            return settingsSavePath;
-            //SettingsManager.Save(settingsSavePath);
-            //Logger.Log("Settings saved at " + settingsSavePath);
-        }
-        catch (Exception ex)
-        {
-            //Logger.Log("Saving file not successful: " + ex.Message, Logger.LogType.Error);
-            await MessageBox.Show(this, ex.Message, "Fehler beim Speichern der Datei");
-            return null;
-        }
-    }
-
-    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;
@@ -496,7 +431,7 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.name = TbSettingsCustomerName.Text;
         //Settings.Save();
         //RefreshCustomerItems();
@@ -506,19 +441,19 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex < 0) return;
         Settings._instance.customers.current =
-            Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString());
-        foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
-            {
-                TbSettingsCustomerDescription.Text = customer.description;
-                TbSettingsCustomerName.Text = customer.name;
-                TbSettingsCustomerSenderAddress.Text = customer.sender_address;
-                TbSettingsCustomerCsvSeparator.Text = customer.separator.ToString();
-                if (customer.patch != null)
-                    TbSettingsCustomerPatchInfo.Text = customer.patch.ToString();
+            ((Customer)LstSettingsCustomers.SelectedItems[0]);
+        //foreach (var customer in Settings._instance.customers.customers)
+            //if (customer.ID == Settings._instance.customers.current.ID)
+            //{
+                TbSettingsCustomerDescription.Text = Settings._instance.customers.current.description;
+                TbSettingsCustomerName.Text = Settings._instance.customers.current.name;
+                TbSettingsCustomerSenderAddress.Text = Settings._instance.customers.current.sender_address;
+                TbSettingsCustomerCsvSeparator.Text = Settings._instance.customers.current.separator.ToString();
+                if (Settings._instance.customers.current.patch != null)
+                    TbSettingsCustomerPatchInfo.Text = Settings._instance.customers.current.patch.ToString();
                 else
                     TbSettingsCustomerPatchInfo.Text = "";
-            }
+            //}
     }
 
     private async void EditButton_Click(object? sender, RoutedEventArgs e)
@@ -551,8 +486,8 @@ public partial class MainWindow : Window
         LstSettingsCustomers.Items.Clear();
         foreach (var customer in Settings._instance.customers.customers)
         {
-            LstCustomers.Items.Add(customer.ID + " - " + customer.name);
-            LstSettingsCustomers.Items.Add(customer.ID + " - " + customer.name);
+            LstCustomers.Items.Add(customer);
+            LstSettingsCustomers.Items.Add(customer);
         }
 
         try
@@ -568,7 +503,7 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.description = TbSettingsCustomerDescription.Text;
         //Settings.Save();
     }
@@ -583,7 +518,7 @@ public partial class MainWindow : Window
     {
         MakeCalcManVisible();
         if (LstCustomers.SelectedItems == null || LstCustomers.SelectedIndex == -1) return;
-        var customer_id = int.Parse(LstCustomers.SelectedItem.ToString().Split(" - ")[0]);
+        var customer_id = ((Customer)LstCustomers.SelectedItem).ID;
         RefreshAddressSetListItems(customer_id);
     }
 
@@ -608,7 +543,7 @@ public partial class MainWindow : Window
         var selected_path = paths[0].Path;
 
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString()))
+            if (customer.ID == ((Customer)LstSettingsCustomers.SelectedItems[0]).ID)
             {
                 if (customer.patch == null)
                 {
@@ -663,7 +598,7 @@ public partial class MainWindow : Window
         foreach (var k in Settings._instance.addressSets.addresses)
         foreach (var customer in Settings._instance.customers.customers)
             if (customer.ID == k.owner_id && customer.ID == customer_id)
-                LstCustomerAdressSets.Items.Add(k.ID + " - " + k.Name + " (" + k.KasPersons.Count + " Einträge)");
+                LstCustomerAdressSets.Items.Add(k);
     }
 
     private void LstCustomerAdressSets_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
@@ -710,7 +645,7 @@ public partial class MainWindow : Window
         var selected_path = paths[0].Path;
 
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString()))
+            if (customer.ID == ((Customer)LstSettingsCustomers.SelectedItems[0]).ID)
                 customer.patch = AddressPatch.Import(selected_path);
 
 
@@ -724,7 +659,7 @@ public partial class MainWindow : Window
             ? TbSettingsCustomerCsvSeparator.Text
             : ",";
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 try
                 {
                     customer.separator = Convert.ToChar(sep);
@@ -743,11 +678,10 @@ public partial class MainWindow : Window
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+            list.Add((KasAddressList)item);
         try
         {
-            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
         }
         catch
         {
@@ -759,11 +693,10 @@ public partial class MainWindow : Window
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+            list.Add((KasAddressList)item);
         try
         {
-            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
+            StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "union", GetCombiningTyp());
         }
         catch
         {
@@ -776,11 +709,10 @@ public partial class MainWindow : Window
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+            list.Add((KasAddressList)item);
         try
         {
-            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
         }
         catch
         {
@@ -788,14 +720,26 @@ 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>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+            list.Add((KasAddressList)item);
 
-        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)
@@ -821,8 +765,8 @@ public partial class MainWindow : Window
         {
             var builder = new PdfBuilder(Settings._instance.pdfExport);
 
-            builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
-                Convert.ToInt32(LstCustomerAdressSets.SelectedItems[0].ToString().Split(" - ")[0]),
+            builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder((
+                    (KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
                 "Company Logo/Info",
                 filePath
             );
@@ -915,7 +859,7 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.sender_address = TbSettingsCustomerSenderAddress.Text;
     }
 
@@ -1112,7 +1056,7 @@ public partial class MainWindow : Window
                 {
                     var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
                         .ToString());
-                    var cus_id = Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString());
+                    var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
                     foreach (var set in Settings._instance.addressSets.addresses)
                         if (set.ID == id)
                         {
@@ -1128,4 +1072,18 @@ 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;
+        try
+        {
+            Settings._instance.customers.customers.Remove((Customer)LstSettingsCustomers.SelectedItem);
+        }
+        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"> -->

ProgressWindow.axaml.cs

@@ -16,9 +16,9 @@ public partial class ProgressWindow : Window
         PbProgress.Value = percentage;
     }
 
-    public void AddToLog(string message)
+    public void AddToLog(string message, string percent)
     {
-        TbLog.Text = message;
+        TbLog.Text = message + $"\n{percent}%";
         //ScvLog.ScrollToEnd();
     }
 }

ResultWindow.axaml

@@ -20,7 +20,9 @@
                     Margin="10,10,10,10" />
         </Grid>
         <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-            <StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" />
+            <!-- <TextBlock x:Name="TbResults"></TextBlock> -->
+            <ListBox x:Name="LbResults"></ListBox>
+            <!-- <StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" /> -->
         </ScrollViewer>
 
     </Grid>

ResultWindow.axaml.cs

@@ -32,8 +32,12 @@ public partial class ResultWindow : Window
         var result_with_errors = result.Where(p => p.PersonError != null).ToList();
         LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
 
-        StkResults.Children.Clear();
-        foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
+        // TbResults.Text = "";
+        // foreach (var person in result_with_errors) TbResults.Text += person.PersonError.GetString()+"\n";
+        LbResults.Items.Clear();
+        foreach (var person in result_with_errors) LbResults.Items.Add(person.PersonError.ToString(person));
+        // StkResults.Children.Clear();
+        // foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
     }
 
     private Grid CreatePersonGrid(KasPerson person)
@@ -201,8 +205,12 @@ public partial class ResultWindow : Window
 
         LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
 
-        StkResults.Children.Clear();
-        foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
+        LbResults.Items.Clear();
+        foreach (var person in temp_result) LbResults.Items.Add(person.PersonError.ToString(person));
+        // TbResults.Text = "";
+        // foreach (var person in temp_result) TbResults.Text += person.PersonError.GetString() +"\n";
+        // StkResults.Children.Clear();
+        // foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
     }
 
 

Tasks/AddressCheck.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -247,7 +248,7 @@ public class AddressCheck
                 await Dispatcher.UIThread.InvokeAsync(() =>
                 {
                     if (hasFaults)
-                        _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft");
+                        _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft", Convert.ToInt32(percent).ToString());
 
                     _progress.ChangePercentage(percent);
                 });

Tasks/CombineAddresses.cs

@@ -15,14 +15,21 @@ public class CombineAddresses
     {
         _progress = progressWindow;
     }
+    
+    public enum CombineType
+    {
+        refsid,
+        final_adress,
+        none
+    }
 
-    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
+    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 == "union") return await Union(address_lists, exportUnused);
-        if (type == "intersection") return await Intersection(address_lists, exportUnused);
-        if (type == "symdiff") return await SymmetricDifference(address_lists, exportUnused);
+        if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
+        if (type == "union") return await Union(address_lists, comb_type, exportUnused);
+        if (type == "intersection") return await Intersection(address_lists, comb_type, 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 (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
-        if (!only_refsid)
+        if(comb_type == CombineType.refsid)
+            if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
+        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
@@ -254,66 +268,7 @@ public class CombineAddresses
         if (return_unused == true) return (result, second_result);
         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

Wiki/EditorWindow.axaml

@@ -2,16 +2,16 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Logof_Client.Wiki.EditorWindow"
         Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
-    <Grid>
+    <Grid Margin="10,0,10,10">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Horizontal">
+        <StackPanel Grid.Row="0" Spacing="10" Orientation="Horizontal">
             <Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
             <Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
             <Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
         </StackPanel>
-        <TextBox Grid.Row="1" x:Name="TbContent" />
+        <TextBox AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
     </Grid>
 </Window>

Wiki/EditorWindow.axaml.cs

@@ -52,7 +52,11 @@ public partial class EditorWindow : Window
     {
         var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
         if (result == MessageBoxResult.No) return;
-        File.Delete(filename);
+        try
+        {
+            File.Delete(filename);
+        } catch {}
+        
         MainWindow._instance.PopulateNavTree();
         Close();
     }