[chore:] logging for ResultWindow.axaml.cs

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

AddressPatch.cs

@@ -1,118 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-
-public class AddressPatch
-{
-    public string refsid_is { get; set; } = "";
-    public string anrede_is { get; set; } = "";
-    public string titel_is { get; set; } = "";
-    public string vorname_is { get; set; } = "";
-    public string adel_is { get; set; } = "";
-    public string name_is { get; set; } = "";
-    public string namezus_is { get; set; } = "";
-    public string anredzus_is { get; set; } = "";
-    public string strasse_is { get; set; } = "";
-    public string strasse2_is { get; set; } = "";
-    public string plz_is { get; set; } = "";
-    public string ort_is { get; set; } = "";
-    public string land_is { get; set; } = "";
-    public string pplz_is { get; set; } = "";
-    public string postfach_is { get; set; } = "";
-    public string name1_is { get; set; } = "";
-    public string name2_is { get; set; } = "";
-    public string name3_is { get; set; } = "";
-    public string name4_is { get; set; } = "";
-    public string name5_is { get; set; } = "";
-    public string funktion_is { get; set; } = "";
-    public string funktion2_is { get; set; } = "";
-    public string abteilung_is { get; set; } = "";
-    public string funktionad_is { get; set; } = "";
-
-    public bool has_refsid { get; set; }
-    public bool has_anrede { get; set; }
-    public bool has_titel { get; set; }
-    public bool has_vorname { get; set; }
-    public bool has_adel { get; set; }
-    public bool has_name { get; set; }
-    public bool has_namezus { get; set; }
-    public bool has_anredzus { get; set; }
-    public bool has_strasse { get; set; }
-    public bool has_strasse2 { get; set; }
-    public bool has_plz { get; set; }
-    public bool has_ort { get; set; }
-    public bool has_land { get; set; }
-    public bool has_pplz { get; set; }
-    public bool has_postfach { get; set; }
-    public bool has_name1 { get; set; }
-    public bool has_name2 { get; set; }
-    public bool has_name3 { get; set; }
-    public bool has_name4 { get; set; }
-    public bool has_name5 { get; set; }
-    public bool has_funktion { get; set; }
-    public bool has_funktion2 { get; set; }
-    public bool has_abteilung { get; set; }
-    public bool has_funktionad { get; set; }
-
-    public static AddressPatch Import(Uri filename)
-    {
-        var patch = new AddressPatch();
-
-        // Alle Zeilen aus der Datei laden
-        var lines = File.ReadAllLines(filename.LocalPath);
-
-        // Alle Properties der Klasse (Strings und bools)
-        var properties = typeof(AddressPatch).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-
-        // Nur die Properties, die mit _is enden (also die String-Werte)
-        var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
-
-        foreach (var prop in stringProps)
-        {
-            // Beispiel: prop.Name = "name_is"
-            var baseName = prop.Name.Substring(0, prop.Name.Length - 3); // "name"
-
-            // In der Datei wird nach "name:" gesucht (ohne _is)
-            var line = lines.FirstOrDefault(l => l.StartsWith(baseName + ":"));
-            if (line != null)
-            {
-                // Wert extrahieren (alles nach dem Doppelpunkt)
-                var value = line.Substring(line.IndexOf(':') + 1).Trim();
-
-                // Wert im Patch-Objekt setzen
-                prop.SetValue(patch, value);
-
-                // Passendes has_ Feld aktivieren, z.B. "has_name"
-                var hasProp = properties.FirstOrDefault(p => p.Name == "has_" + baseName);
-                if (hasProp != null && hasProp.PropertyType == typeof(bool)) hasProp.SetValue(patch, true);
-            }
-        }
-
-        return patch;
-    }
-
-
-    public override string ToString()
-    {
-        var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
-        var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
-
-        var lines = new StringBuilder();
-
-        foreach (var prop in stringProps)
-        {
-            // passendes has_ Feld
-            var hasProp =
-                properties.FirstOrDefault(p => p.Name == "has_" + prop.Name.Substring(0, prop.Name.Length - 3));
-            if (hasProp != null && (bool)hasProp.GetValue(this))
-            {
-                var value = (string)prop.GetValue(this);
-                lines.AppendLine($"{prop.Name} => {value}");
-            }
-        }
-
-        return lines.ToString().TrimEnd();
-    }
-}

CsvBuilder.cs

@@ -1,60 +0,0 @@
-using System.Collections.Generic;
-using System.Text;
-
-namespace Logof_Client;
-
-public class CsvBuilder
-{
-    private readonly string Header;
-    private readonly List<object> Instances;
-    private readonly KasAddressList KasAddressList;
-
-    public CsvBuilder(string header, List<object> instances)
-    {
-        Header = header;
-        Instances = instances;
-    }
-
-    public CsvBuilder(string header, KasAddressList instances)
-    {
-        Header = header;
-        KasAddressList = instances;
-    }
-
-    public string? BuildKas()
-    {
-        var result = new StringBuilder();
-
-        result.AppendLine(Header);
-        foreach (var l in KasAddressList.KasPersons)
-
-            result.AppendLine(
-                l.refsid + "," +
-                l.anrede + "," +
-                l.titel + "," +
-                l.vorname + "," +
-                l.adel + "," +
-                l.name + "," +
-                l.namezus + "," +
-                l.anredzus + "," +
-                l.strasse + "," +
-                l.strasse2 + "," +
-                l.plz + "," +
-                l.ort + "," +
-                l.land + "," +
-                l.pplz + "," +
-                l.postfach + "," +
-                l.name1 + "," +
-                l.name2 + "," +
-                l.name3 + "," +
-                l.name4 + "," +
-                l.name5 + "," +
-                l.funktion + "," +
-                l.funktion2 + "," +
-                l.abteilung + "," +
-                l.funktionad);
-
-        // weitere Cases
-        return result.ToString();
-    }
-}

DataStore/DataStructures.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Logof_Client;
 
@@ -32,11 +33,16 @@ public class KasAddressList //Address-Set
         this.owner_id = owner_id;
     }
 
-    public static string GenerateName(string basic_type, bool? is_rest = false)
+    public static async Task<string> GenerateName(string basic_type, bool? is_rest = false)
     {
+        string pre = "";
+
         if (is_rest == true)
             return basic_type + " - " + DateTime.Now.ToShortDateString() + " - Rest";
-        return basic_type + " - " + DateTime.Now.ToShortDateString();
+        pre = basic_type + " - " + DateTime.Now.ToShortDateString();
+
+        var result = await NamingWindow.Show(MainWindow._instance, pre);
+        return string.IsNullOrWhiteSpace(result) ? pre : result;
     }
 
     // public void UpdateErrorList(List<KasPersonError> errorList)
@@ -54,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
@@ -169,13 +180,30 @@ public class KasPerson
 
     public static int GenerateNewID(int base_id)
     {
-        var newid = 100000 + base_id;
+        //var newid = 100000 + base_id;
+        int highest = 0;
         foreach (var set in Settings._instance.addressSets.addresses)
-        foreach (var add in set.KasPersons)
+        {
-            if (add.id >= newid)
+            foreach (var add in set.KasPersons)
-                newid = add.id + 1;
+            {
+                if(add.id >= highest) highest = add.id+1;
+            }
+        }
         
-        return newid;
+
+        return highest + base_id + 1;
+    }
+
+    public override string ToString()
+    {
+        if (refsid != null && refsid != 0)
+        {
+            return refsid + " - " + name;
+        }
+        else
+        {
+            return id + " - " + name;
+        }
     }
 }
 
@@ -201,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

@@ -10,6 +10,7 @@ public class Settings
     public static Settings _instance = new();
     public AddressSets addressSets = new();
     public Customers customers = new();
+    public PdfExportSettings pdfExport { get; set; } = new();
 
     public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
         "logofclient", "config.json");
@@ -44,14 +45,32 @@ public class Settings
         }
         catch (Exception ex)
         {
-            Console.WriteLine(ex.Message);
+            Logger.Log($"Error while reading settings. Generating new... {ex.Message}", Logger.LogType.Warning);
-            Console.WriteLine(ex.StackTrace);
+
-            Console.WriteLine("Error while reading settings. Generating new...");
             _instance = new Settings();
         }
     }
 }
 
+public class PdfExportSettings
+{
+    public double cellPaddingTopMm { get; set; } = 5;
+    public double cellPaddingBottomMm { get; set; } = 5;
+    public double cellPaddingLeftMm { get; set; } = 5;
+    public double cellPaddingRightMm { get; set; } = 5;
+
+    public double pageMarginTopMm { get; set; } = 0;
+    public double pageMarginBottomMm { get; set; } = 0;
+    public double pageMarginLeftMm { get; set; } = 0;
+    public double pageMarginRightMm { get; set; } = 0;
+
+    public int rowsPerPage { get; set; } = 7;
+    public int columnsPerPage { get; set; } = 3;
+
+    public double fontSize { get; set; } = 9;
+    public double smallFontSize { get; set; } = 6;
+}
+
 public class Global
 {
     public static Global _instance;
@@ -61,9 +80,18 @@ public class Global
         _instance = this;
     }
 
-    public string config_path { get; set; } = "";
+    public string config_path { get; set; } = Path.Combine(
-    public string wiki_storage_path { get; set; } = "";
+        Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+        "logofclient",
+        "config.json");
+
+    public string wiki_storage_path { get; set; } = Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+        "logofclient",
+        "wiki");
+
     public List<Country> countries { get; set; } = new();
+    public string font_path { get; set; } = Path.Combine(AppContext.BaseDirectory, "assets", "fonts");
 
     public static void Save()
     {
@@ -94,9 +122,7 @@ public class Global
         }
         catch (Exception ex)
         {
-            Console.WriteLine(ex.Message);
+            Logger.Log($"Error while reading global settings. Generating new... {ex.Message}", Logger.LogType.Warning);
-            Console.WriteLine(ex.StackTrace);
-            Console.WriteLine("Error while reading global settings. Generating new...");
             _instance = new Global();
             Save();
         }
@@ -106,7 +132,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
@@ -121,6 +147,11 @@ public class Customer
         ID = highestID + 1;
     }
     
+    public override string ToString()
+    {
+        return name;
+    }
+
     public string name { get; set; } = "";
     public string description { get; set; } = "";
     public string sender_address { get; set; } = "";
@@ -129,11 +160,11 @@ public class Customer
     public int ID { get; }
 
 
-    public static int GetIDByCustomerListItem(string item_content)
+    // public static int GetIDByCustomerListItem(string item_content)
-    {
+    // {
-        var id = item_content.Split(" - ")[0];
+    //     var id = item_content.Split(" - ")[0];
-        return int.Parse(id);
+    //     return int.Parse(id);
-    }
+    // }
 }
 
 public class AddressSets

Logger.cs

@@ -0,0 +1,40 @@
+using System;
+using System.IO;
+using Newtonsoft.Json;
+
+namespace Logof_Client;
+
+public static class Logger
+{
+    public static void Log(string text, LogType logType = LogType.Info)
+    {
+        try
+        {
+            string config_path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                "logofclient");
+            if (!Directory.Exists(config_path))
+                Directory.CreateDirectory(config_path);
+
+            string log_path = Path.Combine(config_path, $"log-{DateTime.Now:dd-MM-yy}.log");
+            if(!File.Exists(log_path))
+                File.Create(log_path).Close();
+
+            string line = $"[{DateTime.Now:dd.MM.yyyy - hh:mm:ss}]: ({logType.ToString()}) {text}";
+            Console.WriteLine(line);
+            
+            File.AppendAllLines(log_path, [line]);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex);
+        }
+        
+    }
+
+    public enum LogType
+    {
+        Error,
+        Warning,
+        Info
+    }
+}

Logof Client.csproj

@@ -9,25 +9,25 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.3.2" />
+        <PackageReference Include="Avalonia" Version="11.3.2"/>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2"/>
-        <PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.3.2"/>
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2"/>
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Include="Avalonia.Diagnostics" Version="11.3.2">
             <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
             <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="ISO3166" Version="1.0.4" />
+        <PackageReference Include="ISO3166" Version="1.0.4"/>
-        <PackageReference Include="Lucide.Avalonia" Version="0.1.35" />
+        <PackageReference Include="Lucide.Avalonia" Version="0.1.35"/>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
-        <PackageReference Include="PdfSharp" Version="6.1.1" />
+        <PackageReference Include="PdfSharp" Version="6.1.1"/>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Markdig" Version="0.30.3" />
+        <PackageReference Include="Markdig" Version="0.30.3"/>
-        <PackageReference Include="AvaloniaEdit" Version="0.10.12" />
+        <PackageReference Include="AvaloniaEdit" Version="0.10.12"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -37,17 +37,25 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Remove="assets\icon.ico" />
+        <None Remove="assets\icon.ico"/>
         <AvaloniaResource Include="assets\icon.ico">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </AvaloniaResource>
-        <None Remove="assets\calc_man.png" />
+        <None Remove="assets\calc_man.png"/>
         <AvaloniaResource Include="assets\calc_man.png">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </AvaloniaResource>
-        <None Remove="assets\loading.mp4" />
+        <None Remove="assets\loading.mp4"/>
         <AvaloniaResource Include="assets\loading.mp4">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </AvaloniaResource>
     </ItemGroup>
+
+    <ItemGroup>
+        <Content Include="assets\fonts\**\*.*">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+
+        <Folder Include="assets\fonts\"/>
+    </ItemGroup>
 </Project>

MainWindow.axaml

@@ -28,7 +28,7 @@
                             <Label FontSize="20" Content="Addressverwaltung" VerticalContentAlignment="Center" />
                         </StackPanel>
                     </TabItem.Header>
-                    <Grid RowDefinitions="2*,*,*">
+                    <Grid RowDefinitions="3*,80,2*">
                         <Grid ColumnDefinitions="*,*" Grid.Row="0">
                             <!-- Kunden -->
                             <Grid Margin="30,30,10,30">
@@ -67,7 +67,28 @@
                                          SelectionChanged="LstCustomerAdressSets_OnSelectionChanged"
                                          Background="AliceBlue"
                                          Margin="0,5,0,5"
-                                         SelectionMode="Multiple,Toggle" />
+                                         SelectionMode="Multiple,Toggle">
+                                    <ListBox.ContextMenu>
+                                        <ContextMenu>
+                                            <MenuItem x:Name="MnIAdSetRename" Click="MnIAdSetRename_OnClick">
+                                                <MenuItem.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <LucideIcon Kind="Pencil" Width="12" Height="12" Size="12" />
+                                                        <Label Content="Umbenennen" VerticalContentAlignment="Center" />
+                                                    </StackPanel>
+                                                </MenuItem.Header>
+                                            </MenuItem>
+                                            <MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetRename_OnClick" IsEnabled="False">
+                                                <MenuItem.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
+                                                        <Label Content="Löschen" VerticalContentAlignment="Center" />
+                                                    </StackPanel>
+                                                </MenuItem.Header>
+                                            </MenuItem>
+                                        </ContextMenu>
+                                    </ListBox.ContextMenu>
+                                </ListBox>
 
                                 <Button Grid.Row="2" HorizontalAlignment="Stretch" x:Name="BtnCustomerAddressSetImport"
                                         Click="BtnCustomerAddressSetImport_OnClick">
@@ -78,23 +99,10 @@
                                 </Button>
                             </Grid>
                         </Grid>
-                        <!-- <Grid Grid.Row="0"> -->
+                        <!-- <Grid ColumnDefinitions="*,*,*" Grid.Row="1"> -->
-                        <!--     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" -->
+                            <StackPanel Grid.Row="1"  Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center"
-                        <!--                 HorizontalAlignment="Center"> -->
-                        <!--         <TextBox x:Name="TbFilename" Watermark="Dateipfad" Width="400" -->
-                        <!--                  VerticalContentAlignment="Center" /> -->
-                        <!--         <Button x:Name="BtnChooseFile" Margin="10,0,0,0" Click="BtnChooseFile_OnClick"> -->
-                        <!--             <StackPanel Orientation="Horizontal"> -->
-                        <!--                 <LucideIcon Kind="FolderOpen" Width="16" Height="16" Size="16" /> -->
-                        <!--                 <Label Content="Öffnen" VerticalContentAlignment="Center" /> -->
-                        <!--             </StackPanel> -->
-                        <!--         </Button> -->
-                        <!--     </StackPanel> -->
-                        <!-- </Grid> -->
-                        <Grid Grid.ColumnDefinitions="*,*" Grid.Row="1">
-                            <StackPanel Grid.Column="0" Width="250" Orientation="Vertical" HorizontalAlignment="Right"
                                         Margin="0,0,5,0">
-                                <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                                <Button  Width="250" HorizontalContentAlignment="Center"
                                         Margin="0,0,0,10" IsEnabled="False"
                                         x:Name="BtnCheck" Click="BtnCheck_OnClick">
                                     <StackPanel Orientation="Horizontal">
@@ -103,7 +111,7 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
-                                <Button HorizontalAlignment="Stretch" IsEnabled="False"
+                                <Button Width="250" IsEnabled="False"
                                         HorizontalContentAlignment="Center"
                                         Click="BtnCombine_OnClick" x:Name="BtnCombine"
                                         Margin="0,0,0,10">
@@ -113,19 +121,7 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
-                                <Button HorizontalAlignment="Stretch" IsEnabled="False"
+                                <Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
-                                        HorizontalContentAlignment="Center" x:Name="BtnRepair"
-                                        Margin="0,0,0,10">
-                                    <StackPanel Orientation="Horizontal">
-                                        <LucideIcon Kind="Hammer" Width="36" Height="36" />
-                                        <Label Content="Reparieren" VerticalContentAlignment="Center" FontSize="15"
-                                               FontWeight="Bold" />
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
-                            <StackPanel Grid.Column="1" Width="250" Orientation="Vertical" HorizontalAlignment="Left"
-                                        Margin="5,0,0,0">
-                                <Button HorizontalAlignment="Stretch" IsEnabled="False"
                                         HorizontalContentAlignment="Center" x:Name="BtnShorten"
                                         Margin="0,0,0,10">
                                     <StackPanel Orientation="Horizontal">
@@ -134,7 +130,7 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
-                                <Button HorizontalAlignment="Stretch" IsEnabled="False"
+                                <Button Width="250" IsEnabled="False"
                                         Click="BtnGenerateLabels_OnClick"
                                         HorizontalContentAlignment="Center" x:Name="BtnGenerateLabels"
                                         Margin="0,0,0,10">
@@ -145,8 +141,17 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
+                                <Button Width="250" IsEnabled="False"
+                                        HorizontalContentAlignment="Center" x:Name="BtnRepair"
+                                        Margin="0,0,0,10">
+                                    <StackPanel Orientation="Horizontal">
+                                        <LucideIcon Kind="Hammer" Width="36" Height="36" />
+                                        <Label Content="Reparieren" VerticalContentAlignment="Center" FontSize="15"
+                                               FontWeight="Bold" />
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Grid>
+                        <!-- </Grid> -->
                         <Grid Grid.Row="2" Margin="20" IsVisible="True" x:Name="GrdCalcMan">
                             <Image Source="assets/calc_man.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
                         </Grid>
@@ -215,10 +220,83 @@
                                             </StackPanel>
                                             <Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
                                         </StackPanel>
-
                                     </Button>
                                 </StackPanel>
-                                <CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="50">
+                                    <StackPanel Orientation="Vertical" >
+                                        <RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
+                                        <RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical">
+                                        <CheckBox HorizontalAlignment="Left" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
+                                        <CheckBox HorizontalAlignment="Left" x:Name="CbMergeDeleteOld" IsChecked="False">Lösche ursprüngliche Sets</CheckBox>
+                                    </StackPanel>
+                                </StackPanel>
+                            </StackPanel>
+                        </Grid>
+                        <Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
+                            <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="20">
+                                <Grid ColumnDefinitions="*,*,*" ColumnSpacing="20">
+                                    <StackPanel Orientation="Vertical" Spacing="10">
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Zellenrand oben (mm)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingTop" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Zellenrand unten (mm)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingBot" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Zellenrand links (mm)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingLeft" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
+                                        </Grid>
+                                    </StackPanel>
+                                    
+                                    <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zellenabstand oben"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginTop" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zellenabstand unten"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginBottom" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zellenabstand rechts"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginRight" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zellenabstand links"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
+                                        </Grid>
+                                    </StackPanel>
+                                    
+                                    <StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zeilen pro Seite"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargRowsPerPage" Minimum="1" Maximum="10" Value="7"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Spalten pro Seite"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargColumnsPerPage" Minimum="1" Maximum="8" Value="3"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Schriftgröße (groß)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargFontSize" Minimum="5" Maximum="30" Value="9"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
+                                        </Grid>
+                                    </StackPanel>
+                                </Grid>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <Button Content="Start" Click="BtnStartGenerateLabels_OnClick"></Button>
+                                </StackPanel>
                             </StackPanel>
                         </Grid>
                     </Grid>
@@ -257,9 +335,14 @@
                     <Grid ColumnDefinitions="300,*">
                         <Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
                             <StackPanel>
-                                <TextBlock Text="Wiki" FontSize="18" Margin="12" />
+                                <StackPanel Spacing="10" Orientation="Horizontal" Margin="10">
+                                    <Button Content="+ Datei" x:Name="BtnWikiAddFile"
+                                            Click="BtnWikiAddFile_OnClick" />
+                                    <Button Content="+ Ordner" x:Name="BtnWikiAddFolder"
+                                            Click="BtnWikiAddFolder_OnClick" />
+                                </StackPanel>
                                 <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-                                    <TreeView Name="NavTree" Margin="8" />
+                                    <TreeView Name="NavTree" Margin="10" />
                                 </ScrollViewer>
                             </StackPanel>
                         </Border>
@@ -307,7 +390,7 @@
                                         <StackPanel Orientation="Horizontal" Spacing="5">
                                             <TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
                                                      Watermark="/home/username/.config/logofclient/config.json" />
-                                            <Button IsEnabled="False">
+                                            <Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
                                                 <Button.Content>
                                                     <StackPanel Orientation="Horizontal">
                                                         <LucideIcon Kind="File" Width="16" Height="16" Size="16" />
@@ -324,7 +407,24 @@
                                         <StackPanel Orientation="Horizontal" Spacing="5">
                                             <TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch"
                                                      Watermark="/home/username/.config/logofclient/wiki" />
-                                            <Button IsEnabled="True" x:Name="BtnWikiPath">
+                                            <Button IsEnabled="True" x:Name="BtnWikiPath" HorizontalAlignment="Right">
+                                                <Button.Content>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
+                                                        <Label Content="Öffnen..." VerticalContentAlignment="Center" />
+                                                    </StackPanel>
+                                                </Button.Content>
+                                            </Button>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Grid>
+                                <Grid ColumnDefinitions="400,*">
+                                    <Label Grid.Column="0">Font-Pfad</Label>
+                                    <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
+                                        <StackPanel Orientation="Horizontal" Spacing="5">
+                                            <TextBox x:Name="TbFontPath" HorizontalAlignment="Stretch"
+                                                     Watermark="[App-Direcotry]/assets/fonts/" />
+                                            <Button IsEnabled="True" x:Name="BtnFontPath" HorizontalAlignment="Right">
                                                 <Button.Content>
                                                     <StackPanel Orientation="Horizontal">
                                                         <LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
@@ -385,12 +485,20 @@
                                                  TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
                                                  x:Name="TbSettingsCustomerSenderAddress" />
                                     </Grid>
-                                    <Grid ColumnDefinitions="150,*">
+                                    <Grid ColumnDefinitions="150,*,Auto">
                                         <Label Content="CSV-Trennzeichen" />
                                         <TextBox Grid.Column="1" Watermark=","
-                                                 HorizontalAlignment="Stretch"
+                                                 HorizontalAlignment="Stretch" Margin="0,0,5,0"
                                                  TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
                                                  x:Name="TbSettingsCustomerCsvSeparator" />
+                                        <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="5">
+                                            <Button Click="ChangeCSVDivider" Content=","></Button>
+                                            <Button Click="ChangeCSVDivider" Content=";"></Button>
+                                            <Button Click="ChangeCSVDivider" Content="TAB"></Button>
+                                            <Button Click="ChangeCSVDivider" Content="|"></Button>
+                                            <Button Click="ChangeCSVDivider" Content="SPACE"></Button>
+                                            <Button Click="ChangeCSVDivider" Content=":"></Button>
+                                        </StackPanel>
                                     </Grid>
                                     <Grid ColumnDefinitions="150,*">
                                         <Label Content="Address-Patch-Info" />
@@ -417,7 +525,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" />

NamingWindow.axaml

@@ -0,0 +1,19 @@
+<Window xmlns="https://github.com/avaloniaui"
+        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" WindowStartupLocation="CenterScreen" Topmost="True"
+        x:Class="Logof_Client.NamingWindow"
+        Title="NamingWindow">
+    <StackPanel Orientation="Vertical">
+        <TextBlock Name="Text" Margin="10" TextWrapping="Wrap" />
+        <TextBox Name="Input" Margin="10" />
+        <StackPanel HorizontalAlignment="Right" Margin="5" Orientation="Horizontal" Name="Buttons">
+            <StackPanel.Styles>
+                <Style Selector="Button">
+                    <Setter Property="Margin" Value="5" />
+                </Style>
+            </StackPanel.Styles>
+        </StackPanel>
+    </StackPanel>
+</Window>

NamingWindow.axaml.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+
+namespace Logof_Client;
+
+public partial class NamingWindow : Window
+{
+    public NamingWindow()
+    {
+        InitializeComponent();
+    }
+
+    public static Task<string> Show(Window parent, string input = "", string info = "Bitte geben Sie einen Namen ein:")
+    {
+        try
+        {
+            var wind = new NamingWindow
+            {
+                Title = "Name eingeben"
+            };
+            wind.FindControl<TextBlock>("Text").Text = info;
+            var buttonPanel = wind.FindControl<StackPanel>("Buttons");
+            var inputBox = wind.FindControl<TextBox>("Input");
+
+            inputBox.Text = input;
+            string res = null;
+
+            void AddButton(string caption)
+            {
+                var btn = new Button { Content = caption };
+                btn.Click += (_, __) =>
+                {
+                    res = inputBox.Text;
+                    wind.Close();
+                };
+                buttonPanel.Children.Add(btn);
+            }
+
+            AddButton("Ok");
+
+
+            var tcs = new TaskCompletionSource<string>();
+            wind.Closed += delegate { tcs.TrySetResult(res); };
+            if (parent != null)
+                wind.ShowDialog(parent);
+            else wind.Show();
+            wind.Focus();
+
+            return tcs.Task;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
+            return Task.FromResult<string>(null!);
+        }
+    }
+}

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();
     }
 }

README.md

@@ -0,0 +1,8 @@
+# Logofclient
+Free and open source software suite to manage customers, prices, employees, etc. 
+
+## Bugs
+Please report any bugs you find to fierke@mypapertown.de, thank you!
+
+## Contributing
+Feel free to contribute to this project using your MyPaperCloud-Account (request it via fierke@mypapertown.de) or a local git.mypapercloud.de-Account you are able to create.

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

@@ -28,12 +28,25 @@ public partial class ResultWindow : Window
 
     private void GenerateView(List<KasPerson> result)
     {
-        // Filter to only show persons with errors
+        try
-        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));
+            // Filter to only show persons with errors
+            var result_with_errors = result.Where(p => p.PersonError != null).ToList();
+            LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
+
+            // 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));
+        }
+        catch (Exception ex)
+        {
+            Logger.Log("Error while generating result view: " + ex.Message, Logger.LogType.Warning);
+        }
     }
 
     private Grid CreatePersonGrid(KasPerson person)
@@ -102,44 +115,52 @@ public partial class ResultWindow : Window
 
     private void Load(List<KasPerson> result)
     {
-        var knownErrors = new List<AddressCheck.ErrorTypes>();
+        try
-        var knownWarnings = new List<AddressCheck.WarningTypes>();
-
-        foreach (var person in result)
         {
-            if (person.PersonError == null) continue;
+            var knownErrors = new List<AddressCheck.ErrorTypes>();
+            var knownWarnings = new List<AddressCheck.WarningTypes>();
 
-            foreach (var errtyp in person.PersonError.errors)
+            foreach (var person in result)
-                if (!knownErrors.Contains(errtyp))
+            {
-                    knownErrors.Add(errtyp);
+                if (person.PersonError == null) continue;
 
-            foreach (var wartyp in person.PersonError.warnings)
+                foreach (var errtyp in person.PersonError.errors)
-                if (!knownWarnings.Contains(wartyp))
+                    if (!knownErrors.Contains(errtyp))
-                    knownWarnings.Add(wartyp);
+                        knownErrors.Add(errtyp);
+
+                foreach (var wartyp in person.PersonError.warnings)
+                    if (!knownWarnings.Contains(wartyp))
+                        knownWarnings.Add(wartyp);
+            }
+
+
+            foreach (var errtype in knownErrors)
+            {
+                var cb = new CheckBox();
+                cb.IsChecked = true;
+                cb.Content = errtype.ToString();
+                //cb.Click += (sender, e) => UpdateFilter();
+                errortypecheckboxes.Add(cb);
+                StpFilterOptions.Children.Add(cb);
+            }
+
+            foreach (var wartype in knownWarnings)
+            {
+                var cb = new CheckBox();
+                cb.IsChecked = true;
+                cb.Content = wartype.ToString();
+                //cb.Click += (sender, e) => UpdateFilter();
+                warningtypecheckboxes.Add(cb);
+                StpFilterOptions.Children.Add(cb);
+            }
+
+            GenerateView(result);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
         }
         
-
-        foreach (var errtype in knownErrors)
-        {
-            var cb = new CheckBox();
-            cb.IsChecked = true;
-            cb.Content = errtype.ToString();
-            //cb.Click += (sender, e) => UpdateFilter();
-            errortypecheckboxes.Add(cb);
-            StpFilterOptions.Children.Add(cb);
-        }
-
-        foreach (var wartype in knownWarnings)
-        {
-            var cb = new CheckBox();
-            cb.IsChecked = true;
-            cb.Content = wartype.ToString();
-            //cb.Click += (sender, e) => UpdateFilter();
-            warningtypecheckboxes.Add(cb);
-            StpFilterOptions.Children.Add(cb);
-        }
-
-        GenerateView(result);
     }
 
     private void BtnUpdateFilter_OnClick(object? sender, RoutedEventArgs e)
@@ -148,7 +169,9 @@ public partial class ResultWindow : Window
 
     private void UpdateFilter()
     {
-        var temp_result = new List<KasPerson>();
+        try
+        {
+            var temp_result = new List<KasPerson>();
 
         var checkedErrors = new HashSet<AddressCheck.ErrorTypes>();
         var checkedWarnings = new HashSet<AddressCheck.WarningTypes>();
@@ -201,8 +224,17 @@ public partial class ResultWindow : Window
 
         LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
 
-        StkResults.Children.Clear();
+        LbResults.Items.Clear();
-        foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
+        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));
+        } catch (Exception ex)
+        {
+            Logger.Log("Error while updating filter: " + ex.Message, Logger.LogType.Warning);
+        }
+        
     }
 
 

Tasks/AddressCheck.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -38,227 +39,240 @@ public class AddressCheck
 
     public async Task<List<KasPerson>> Perform(int id)
     {
-        // Find the index of the address set with the given id
+        try
-        var adset_index = -1;
-        for (var i = 0; i < Settings._instance.addressSets.addresses.Count; i++)
-            if (Settings._instance.addressSets.addresses[i].ID == id)
-            {
-                adset_index = i;
-                break;
-            }
-
-        if (adset_index == -1) return new List<KasPerson>();
-
-        var adset = Settings._instance.addressSets.addresses[adset_index];
-        var total = adset.KasPersons.Count;
-        var current = 0;
-
-        await Task.Run(async () =>
         {
-            foreach (var person in adset.KasPersons)
+            // Find the index of the address set with the given id
+            var adset_index = -1;
+            for (var i = 0; i < Settings._instance.addressSets.addresses.Count; i++)
+                if (Settings._instance.addressSets.addresses[i].ID == id)
+                {
+                    adset_index = i;
+                    break;
+                }
+
+            if (adset_index == -1) return new List<KasPerson>();
+
+            var adset = Settings._instance.addressSets.addresses[adset_index];
+            var total = adset.KasPersons.Count;
+            var current = 0;
+
+            await Task.Run(async () =>
             {
-                var errors = new List<ErrorTypes>();
+                foreach (var person in adset.KasPersons)
-                var warnings = new List<WarningTypes>();
-                var hasFaults = false;
-
-                var address_component_count = 2; // cause anrede and name are first
-
-                // PLZ-Prüfung
-                if (person.plz == "" || person.plz == null)
                 {
-                    hasFaults = true;
+                    var errors = new List<ErrorTypes>();
-                    warnings.Add(WarningTypes.NoPLZ);
+                    var warnings = new List<WarningTypes>();
-                }
+                    var hasFaults = false;
-                else
+
-                {
+                    var address_component_count = 2; // cause anrede and name are first
-                    if (!AddressCreator.CheckPLZ(person.plz, person.land))
+
+                    // PLZ-Prüfung
+                    if (person.plz == "" || person.plz == null)
                     {
                         hasFaults = true;
-                        errors.Add(ErrorTypes.PlzNotUsable);
+                        warnings.Add(WarningTypes.NoPLZ);
+                    }
+                    else
+                    {
+                        if (!AddressCreator.CheckPLZ(person.plz, person.land))
+                        {
+                            hasFaults = true;
+                            errors.Add(ErrorTypes.PlzNotUsable);
+                        }
+                        // if ((person.plz < 10000 && string.IsNullOrWhiteSpace(person.land)) ||
+                        //     (person.plz < 10000 && person.land == "GER") ||
+                        //     (person.plz < 10000 && person.land == "DE"))
+                        // {
+                        //     hasFaults = true;
+                        //     errors.Add(ErrorTypes.PlzTooShort);
+                        // }
+                        // else if ((person.plz > 99999 && string.IsNullOrWhiteSpace(person.land)) ||
+                        //          (person.plz > 99999 && person.land == "GER") ||
+                        //          (person.plz > 99999 && person.land == "DE"))
+                        // {
+                        //     hasFaults = true;
+                        //     errors.Add(ErrorTypes.PlzTooLong);
+                        // }
                     }
-                    // if ((person.plz < 10000 && string.IsNullOrWhiteSpace(person.land)) ||
-                    //     (person.plz < 10000 && person.land == "GER") ||
-                    //     (person.plz < 10000 && person.land == "DE"))
-                    // {
-                    //     hasFaults = true;
-                    //     errors.Add(ErrorTypes.PlzTooShort);
-                    // }
-                    // else if ((person.plz > 99999 && string.IsNullOrWhiteSpace(person.land)) ||
-                    //          (person.plz > 99999 && person.land == "GER") ||
-                    //          (person.plz > 99999 && person.land == "DE"))
-                    // {
-                    //     hasFaults = true;
-                    //     errors.Add(ErrorTypes.PlzTooLong);
-                    // }
-                }
 
 
-                // PPLZ-Prüfung
+                    // PPLZ-Prüfung
-                if (person.pplz == "" || person.pplz == null)
+                    if (person.pplz == "" || person.pplz == null)
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoPPLZ);
-                }
-                else
-                {
-                    if (!AddressCreator.CheckPLZ(person.pplz, person.land))
                     {
                         hasFaults = true;
-                        errors.Add(ErrorTypes.PPlzNotUsable);
+                        warnings.Add(WarningTypes.NoPPLZ);
+                    }
+                    else
+                    {
+                        if (!AddressCreator.CheckPLZ(person.pplz, person.land))
+                        {
+                            hasFaults = true;
+                            errors.Add(ErrorTypes.PPlzNotUsable);
+                        }
+
+                        // if ((person.pplz < 10000 && string.IsNullOrWhiteSpace(person.land)) ||
+                        //     (person.pplz < 10000 && person.land == "GER") ||
+                        //     (person.pplz < 10000 && person.land == "DE"))
+                        // {
+                        //     hasFaults = true;
+                        //     errors.Add(ErrorTypes.PPlzTooShort);
+                        // }
+                        // else if ((person.pplz > 99999 && string.IsNullOrWhiteSpace(person.land)) ||
+                        //          (person.pplz > 99999 && person.land == "GER") ||
+                        //          (person.pplz > 99999 && person.land == "DE"))
+                        // {
+                        //     hasFaults = true;
+                        //     errors.Add(ErrorTypes.PPlzTooLong);
+                        // }
                     }
 
-                    // if ((person.pplz < 10000 && string.IsNullOrWhiteSpace(person.land)) ||
+                    if (warnings.Contains(WarningTypes.NoPLZ) && warnings.Contains(WarningTypes.NoPPLZ))
-                    //     (person.pplz < 10000 && person.land == "GER") ||
-                    //     (person.pplz < 10000 && person.land == "DE"))
-                    // {
-                    //     hasFaults = true;
-                    //     errors.Add(ErrorTypes.PPlzTooShort);
-                    // }
-                    // else if ((person.pplz > 99999 && string.IsNullOrWhiteSpace(person.land)) ||
-                    //          (person.pplz > 99999 && person.land == "GER") ||
-                    //          (person.pplz > 99999 && person.land == "DE"))
-                    // {
-                    //     hasFaults = true;
-                    //     errors.Add(ErrorTypes.PPlzTooLong);
-                    // }
-                }
-
-                if (warnings.Contains(WarningTypes.NoPLZ) && warnings.Contains(WarningTypes.NoPPLZ))
-                {
-                    hasFaults = true;
-                    errors.Add(ErrorTypes.NoPLZorPPLZ);
-                }
-
-                // Ort-Prüfung
-                if (string.IsNullOrWhiteSpace(person.ort))
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoCity);
-                }
-                else
-                {
-                    address_component_count++;
-                }
-
-                // Street-Number
-                var street = person.strasse.ToCharArray();
-                var intcount = 0;
-                foreach (var c in street)
-                {
-                    int maybe;
-                    if (int.TryParse(c.ToString(), out maybe)) intcount++;
-                }
-
-                if (intcount == 0)
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoStreetNumber);
-                }
-
-                // Last-Name
-                if (string.IsNullOrWhiteSpace(person.name))
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoLastName);
-                }
-
-                // First-Name
-                if (string.IsNullOrWhiteSpace(person.vorname))
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoFirstName);
-                }
-
-                // Street-Check
-                if (string.IsNullOrWhiteSpace(person.strasse))
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoStreet);
-                }
-                else
-                {
-                    address_component_count++;
-                }
-
-                // Address-Component-Count
-                if (!string.IsNullOrWhiteSpace(person.strasse2)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.land)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name1)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name2)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name3)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name4)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name5)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.funktion)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.funktion2)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.funktionad)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.abteilung)) address_component_count++;
-
-                // Double-Refsid or DoubleAddresses
-                foreach (var person2 in adset.KasPersons)
-                {
-                    if (adset.KasPersons.IndexOf(person) == adset.KasPersons.IndexOf(person2)) continue;
-
-                    if (person.refsid == person2.refsid) // trifft auf Patch-Addressen nicht zu
                     {
                         hasFaults = true;
-                        warnings.Add(WarningTypes.DoubledRefsid);
+                        errors.Add(ErrorTypes.NoPLZorPPLZ);
                     }
 
-                    if (person.name == person2.name &&
+                    // Ort-Prüfung
-                        person.strasse == person2.strasse &&
+                    if (string.IsNullOrWhiteSpace(person.ort))
-                        person.vorname == person2.vorname &&
-                        person.ort == person2.ort &&
-                        person.funktion == person2.funktion &&
-                        person.funktion2 == person2.funktion2 &&
-                        person.funktionad == person2.funktionad &&
-                        person.abteilung == person2.abteilung &&
-                        person.name1 == person2.name1 &&
-                        person.name2 == person2.name2 &&
-                        person.name3 == person2.name3 &&
-                        person.name4 == person2.name4 &&
-                        person.name5 == person2.name5) // 
-
                     {
                         hasFaults = true;
-                        errors.Add(ErrorTypes.MayBeSameAddress);
+                        warnings.Add(WarningTypes.NoCity);
                     }
-                }
+                    else
-
-                // Adressen-Länge
-                if (address_component_count > 10)
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.FullAddressTooLong);
-                }
-
-                if (hasFaults)
-                    lock (Settings._instance.addressSets.addresses)
                     {
-                        // Directly set PersonError in the address set
+                        address_component_count++;
-                        var person_index = adset.KasPersons.IndexOf(person);
+                    }
-                        if (person_index >= 0)
+
-                            Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index].PersonError =
+                    // Street-Number
-                                new KasPersonError((errors, warnings));
+                    var street = person.strasse.ToCharArray();
+                    var intcount = 0;
+                    foreach (var c in street)
+                    {
+                        int maybe;
+                        if (int.TryParse(c.ToString(), out maybe)) intcount++;
+                    }
+
+                    if (intcount == 0)
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.NoStreetNumber);
+                    }
+
+                    // Last-Name
+                    if (string.IsNullOrWhiteSpace(person.name))
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.NoLastName);
+                    }
+
+                    // First-Name
+                    if (string.IsNullOrWhiteSpace(person.vorname))
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.NoFirstName);
+                    }
+
+                    // Street-Check
+                    if (string.IsNullOrWhiteSpace(person.strasse))
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.NoStreet);
+                    }
+                    else
+                    {
+                        address_component_count++;
+                    }
+
+                    // Address-Component-Count
+                    if (!string.IsNullOrWhiteSpace(person.strasse2)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.land)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name1)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name2)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name3)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name4)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name5)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.funktion)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.funktion2)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.funktionad)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.abteilung)) address_component_count++;
+
+                    // Double-Refsid or DoubleAddresses
+                    foreach (var person2 in adset.KasPersons)
+                    {
+                        if (adset.KasPersons.IndexOf(person) == adset.KasPersons.IndexOf(person2)) continue;
+
+                        if (person.refsid == person2.refsid) // trifft auf Patch-Addressen nicht zu
+                        {
+                            hasFaults = true;
+                            warnings.Add(WarningTypes.DoubledRefsid);
+                        }
+
+                        if (person.name == person2.name &&
+                            person.strasse == person2.strasse &&
+                            person.vorname == person2.vorname &&
+                            person.ort == person2.ort &&
+                            person.funktion == person2.funktion &&
+                            person.funktion2 == person2.funktion2 &&
+                            person.funktionad == person2.funktionad &&
+                            person.abteilung == person2.abteilung &&
+                            person.name1 == person2.name1 &&
+                            person.name2 == person2.name2 &&
+                            person.name3 == person2.name3 &&
+                            person.name4 == person2.name4 &&
+                            person.name5 == person2.name5) // 
+
+                        {
+                            hasFaults = true;
+                            errors.Add(ErrorTypes.MayBeSameAddress);
+                        }
+                    }
+
+                    // Adressen-Länge
+                    if (address_component_count > 10)
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.FullAddressTooLong);
                     }
 
-                // Fortschritt aktualisieren
-                Interlocked.Increment(ref current);
-                var percent = current / (double)total * 100;
-                await Dispatcher.UIThread.InvokeAsync(() =>
-                {
                     if (hasFaults)
-                        _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft");
+                        lock (Settings._instance.addressSets.addresses)
+                        {
+                            // Directly set PersonError in the address set
+                            var person_index = adset.KasPersons.IndexOf(person);
+                            if (person_index >= 0)
+                                Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index]
+                                        .PersonError =
+                                    new KasPersonError((errors, warnings));
+                        }
 
-                    _progress.ChangePercentage(percent);
+                    // Fortschritt aktualisieren
-                });
+                    Interlocked.Increment(ref current);
-            }
+                    var percent = current / (double)total * 100;
-        });
+                    await Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        if (hasFaults)
+                            _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft",
+                                Convert.ToInt32(percent).ToString());
 
-        Settings.Save();
+                        _progress.ChangePercentage(percent);
+                    });
+                }
+            });
 
-        // Return only the persons with errors from the address set
+            Settings.Save();
-        return Settings._instance.addressSets.addresses[adset_index].KasPersons
+
-            .Where(p => p.PersonError != null)
+            // Return only the persons with errors from the address set
-            .ToList();
+            return Settings._instance.addressSets.addresses[adset_index].KasPersons
+                .Where(p => p.PersonError != null)
+                .ToList();
+
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address check: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return null;
     }
+
 }

Tasks/AddressCreation.cs

@@ -43,177 +43,195 @@ public static class AddressCreator
     public static string? CreateFinalMarkdownString(int id)
     {
         // Maximum seven lines of information
-
+        try
-        // find the address
-        KasPerson? address = null;
-        var string_address = "";
-        var address_line_count = 0;
-        foreach (var set in Settings._instance.addressSets.addresses)
         {
-            var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
+            // find the address
-            if (temp != null)
+                    KasPerson? address = null;
-            {
+                    var string_address = "";
-                address = temp;
+                    var address_line_count = 0;
-                break;
+                    foreach (var set in Settings._instance.addressSets.addresses)
-            }
+                    {
-        }
+                        var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
-
+                        if (temp != null)
-        // no address found
-        if (address == null) return null;
-
-        // let's get started: we start from the bottom
-        // if the country is not Germany, set it; try to map via Global countries alternatives -> translation
-        var trimmedLand = (address.land ?? "").Trim();
-        var trimmedLowerLand = trimmedLand.ToLower();
-        var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
-                        trimmedLowerLand == "" || trimmedLowerLand == "de" ||
-                        trimmedLowerLand == "deutschland";
-
-        if (!isGermany)
-        {
-            var countryToShow = trimmedLand; // default: use raw land value
-
-            if (!string.IsNullOrEmpty(trimmedLand))
-                // search for matching country via alternatives using for-loops
-                for (var ci = 0; ci < Global._instance.countries.Count; ci++)
-                {
-                    var country = Global._instance.countries[ci];
-                    for (var ai = 0; ai < country.alternatives.Count; ai++)
-                        try
                         {
-                            var alt = (country.alternatives[ai] ?? "").Trim();
+                            address = temp;
-                            if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
+                            break;
+                        }
+                    }
+            
+                    // no address found
+                    if (address == null) return null;
+            
+                    // let's get started: we start from the bottom
+                    // if the country is not Germany, set it; try to map via Global countries alternatives -> translation
+                    var trimmedLand = (address.land ?? "").Trim();
+                    var trimmedLowerLand = trimmedLand.ToLower();
+                    var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
+                                    trimmedLowerLand == "" || trimmedLowerLand == "de" ||
+                                    trimmedLowerLand == "deutschland";
+            
+                    if (!isGermany)
+                    {
+                        var countryToShow = trimmedLand; // default: use raw land value
+            
+                        if (!string.IsNullOrEmpty(trimmedLand))
+                            // search for matching country via alternatives using for-loops
+                            for (var ci = 0; ci < Global._instance.countries.Count; ci++)
                             {
-                                countryToShow = string.IsNullOrWhiteSpace(country.translation)
+                                var country = Global._instance.countries[ci];
-                                    ? country.name
+                                for (var ai = 0; ai < country.alternatives.Count; ai++)
-                                    : country.translation;
+                                    try
-                                goto CountryFound;
+                                    {
+                                        var alt = (country.alternatives[ai] ?? "").Trim();
+                                        if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
+                                        {
+                                            countryToShow = string.IsNullOrWhiteSpace(country.translation)
+                                                ? country.name
+                                                : country.translation;
+                                            goto CountryFound;
+                                        }
+                                    }
+                                    catch
+                                    {
+                                        // ignore malformed alternative
+                                    }
                             }
-                        }
-                        catch
-                        {
-                            // ignore malformed alternative
-                        }
-                }
             
-            CountryFound:
+                        CountryFound:
-            string_address = "**" + countryToShow + "**"; // Needs to be bold
+                        string_address = "**" + countryToShow + "**"; // Needs to be bold
-            address_line_count++;
+                        address_line_count++;
+                    }
+            
+                    // Alternative A: pplz valid and city existing
+                    if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
+                    {
+                        string_address = address.pplz + " " + address.ort + "\n" + string_address;
+                        address_line_count++;
+                        if (!string.IsNullOrWhiteSpace(address.postfach))
+                        {
+                            string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
+                            address_line_count++;
+                        }
+                        else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
+                        {
+                            string_address = address.strasse.Trim() + "\n" + string_address;
+                            address_line_count++;
+                        }
+            
+                        var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
+                            address.adel, address.name, address.namezus);
+            
+                        if (!string.IsNullOrWhiteSpace(nameline))
+                        {
+                            string_address = nameline + "\n" + string_address;
+                            address_line_count++;
+                        }
+            
+                        // REIHENFOLGE
+                        var nameattribs = new[]
+                            { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
+            
+                        var names = "";
+                        for (var i = 0; i < nameattribs.Length; i++)
+                            try
+                            {
+                                if (address_line_count >= 7) break;
+                                if (!string.IsNullOrWhiteSpace(nameattribs[i]))
+                                {
+                                    names += "\n" + nameattribs[i];
+                                    address_line_count++;
+                                }
+                            }
+                            catch
+                            {
+                                Console.WriteLine("ERROR 15821");
+                            }
+            
+                        string_address = names + "\n" + string_address;
+                    } // Alternative B: plz valid and city existing 
+                    else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
+                    {
+                        string_address = address.plz + " " + address.ort + "\n" + string_address;
+                        address_line_count++;
+                        if (!string.IsNullOrWhiteSpace(address.strasse))
+                        {
+                            string_address = address.strasse.Trim() + "\n" + string_address;
+                            address_line_count++;
+                        }
+                        else if (!string.IsNullOrWhiteSpace(address.postfach.Trim()))
+                        {
+                            string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
+                            address_line_count++;
+                        }
+            
+                        var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
+                            address.adel, address.name, address.namezus);
+            
+                        if (!string.IsNullOrWhiteSpace(nameline))
+                        {
+                            string_address = nameline + "\n" + string_address;
+                            address_line_count++;
+                        }
+            
+                        var nameattribs = new[]
+                            { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
+            
+                        var names = "";
+                        for (var i = 0; i < nameattribs.Length; i++)
+                            try
+                            {
+                                if (address_line_count >= 7) break;
+                                if (!string.IsNullOrWhiteSpace(nameattribs[i]))
+                                {
+                                    names += "\n" + nameattribs[i];
+                                    address_line_count++;
+                                }
+                            }
+                            catch
+                            {
+                                Console.WriteLine("ERROR 15821");
+                            }
+            
+                        string_address = names + "\n" + string_address;
+                    } // Error-Handling?
+            
+                    if (address_line_count > 1) return string_address;
+                    return null;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while creating markdown string: {ex.Message}", Logger.LogType.Error);
         }
 
-        // Alternative A: pplz valid and city existing
-        if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
-        {
-            string_address = address.pplz + " " + address.ort + "\n" + string_address;
-            address_line_count++;
-            if (!string.IsNullOrWhiteSpace(address.postfach))
-            {
-                string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
-                address_line_count++;
-            }
-            else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
-            {
-                string_address = address.strasse.Trim() + "\n" + string_address;
-                address_line_count++;
-            }
-
-            var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
-                address.adel, address.name, address.namezus);
-
-            if (!string.IsNullOrWhiteSpace(nameline))
-            {
-                string_address = nameline + "\n" + string_address;
-                address_line_count++;
-            }
-
-            // REIHENFOLGE
-            var nameattribs = new[]
-                { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
-
-            var names = "";
-            for (var i = 0; i < nameattribs.Length; i++)
-                try
-                {
-                    if (address_line_count >= 7) break;
-                    if (!string.IsNullOrWhiteSpace(nameattribs[i]))
-                    {
-                        names += "\n" + nameattribs[i];
-                        address_line_count++;
-                    }
-                }
-                catch
-                {
-                    Console.WriteLine("ERROR 15821");
-                }
-
-            string_address = names + "\n" + string_address;
-        } // Alternative B: plz valid and city existing 
-        else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
-        {
-            string_address = address.plz + " " + address.ort + "\n" + string_address;
-            address_line_count++;
-            if (!string.IsNullOrWhiteSpace(address.strasse))
-            {
-                string_address = address.strasse.Trim() + "\n" + string_address;
-                address_line_count++;
-            }
-            else if (!string.IsNullOrWhiteSpace(address.postfach.Trim()))
-            {
-                string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
-                address_line_count++;
-            }
-
-            var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
-                address.adel, address.name, address.namezus);
-
-            if (!string.IsNullOrWhiteSpace(nameline))
-            {
-                string_address = nameline + "\n" + string_address;
-                address_line_count++;
-            }
-
-            var nameattribs = new[]
-                { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
-
-            var names = "";
-            for (var i = 0; i < nameattribs.Length; i++)
-                try
-                {
-                    if (address_line_count >= 7) break;
-                    if (!string.IsNullOrWhiteSpace(nameattribs[i]))
-                    {
-                        names += "\n" + nameattribs[i];
-                        address_line_count++;
-                    }
-                }
-                catch
-                {
-                    Console.WriteLine("ERROR 15821");
-                }
-
-            string_address = names + "\n" + string_address;
-        } // Error-Handling?
-
-        if (address_line_count > 1) return string_address;
         return null;
     }
 
     public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
         string name, string namezus)
     {
-        if (!string.IsNullOrWhiteSpace(anredezus))
+        try
+        {
+            if (!string.IsNullOrWhiteSpace(anredezus))
+                    return string.Join(" ",
+                               new[] { anredezus, titel, vorname, adel, name }
+                                   .Where(s => !string.IsNullOrWhiteSpace(s))
+                           )
+                           + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
+        
+            // else 
             return string.Join(" ",
-                       new[] { anredezus, titel, vorname, adel, name }
+                       new[] { anrede, titel, vorname, adel, name }
                            .Where(s => !string.IsNullOrWhiteSpace(s))
                    )
                    + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address name line creation: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return null;
         
-        // else 
-        return string.Join(" ",
-                   new[] { anrede, titel, vorname, adel, name }
-                       .Where(s => !string.IsNullOrWhiteSpace(s))
-               )
-               + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
     }
 
     /// <summary>
@@ -224,29 +242,39 @@ public static class AddressCreator
     /// <returns>true or faslse, depending on result :+1:</returns>
     public static bool CheckPLZ(string plz, string land)
     {
-        if (string.IsNullOrWhiteSpace(plz)) return false;
+        try
+        {
+            if (string.IsNullOrWhiteSpace(plz)) return false;
             
-        var trimmedPlz = plz.Trim();
+            var trimmedPlz = plz.Trim();
-        var trimmedLand = land.ToLower().Trim();
+            var trimmedLand = land.ToLower().Trim();
     
-        // Check if it's a German country code
+            // Check if it's a German country code
-        var isGermany = trimmedLand == "germany" || trimmedLand == "ger" || trimmedLand == "de" ||
+            var isGermany = trimmedLand == "germany" || trimmedLand == "ger" || trimmedLand == "de" ||
-                        trimmedLand == "deutschland" || trimmedLand == "";
+                            trimmedLand == "deutschland" || trimmedLand == "";
     
-        if (isGermany)
+            if (isGermany)
-            // For Germany (including empty land), accept numeric postal codes with 5 digits
+                // For Germany (including empty land), accept numeric postal codes with 5 digits
-            try
+                try
-            {
+                {
-                var iplz = Convert.ToInt32(trimmedPlz);
+                    var iplz = Convert.ToInt32(trimmedPlz);
-                if (trimmedPlz.Length == 5) return true;
+                    if (trimmedPlz.Length == 5) return true;
-                return false;
+                    return false;
-            }
+                }
-            catch
+                catch
-            {
+                {
-                return false;
+                    return false;
-            }
+                }
+    
+            // For non-German countries, accept any non-empty postal code
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address plz check: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return false;
         
-        // For non-German countries, accept any non-empty postal code
-        return true;
     }
 }

Tasks/AddressPatch.cs

@@ -0,0 +1,140 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using Logof_Client;
+
+public class AddressPatch
+{
+    public string refsid_is { get; set; } = "";
+    public string anrede_is { get; set; } = "";
+    public string titel_is { get; set; } = "";
+    public string vorname_is { get; set; } = "";
+    public string adel_is { get; set; } = "";
+    public string name_is { get; set; } = "";
+    public string namezus_is { get; set; } = "";
+    public string anredzus_is { get; set; } = "";
+    public string strasse_is { get; set; } = "";
+    public string strasse2_is { get; set; } = "";
+    public string plz_is { get; set; } = "";
+    public string ort_is { get; set; } = "";
+    public string land_is { get; set; } = "";
+    public string pplz_is { get; set; } = "";
+    public string postfach_is { get; set; } = "";
+    public string name1_is { get; set; } = "";
+    public string name2_is { get; set; } = "";
+    public string name3_is { get; set; } = "";
+    public string name4_is { get; set; } = "";
+    public string name5_is { get; set; } = "";
+    public string funktion_is { get; set; } = "";
+    public string funktion2_is { get; set; } = "";
+    public string abteilung_is { get; set; } = "";
+    public string funktionad_is { get; set; } = "";
+
+    public bool has_refsid { get; set; }
+    public bool has_anrede { get; set; }
+    public bool has_titel { get; set; }
+    public bool has_vorname { get; set; }
+    public bool has_adel { get; set; }
+    public bool has_name { get; set; }
+    public bool has_namezus { get; set; }
+    public bool has_anredzus { get; set; }
+    public bool has_strasse { get; set; }
+    public bool has_strasse2 { get; set; }
+    public bool has_plz { get; set; }
+    public bool has_ort { get; set; }
+    public bool has_land { get; set; }
+    public bool has_pplz { get; set; }
+    public bool has_postfach { get; set; }
+    public bool has_name1 { get; set; }
+    public bool has_name2 { get; set; }
+    public bool has_name3 { get; set; }
+    public bool has_name4 { get; set; }
+    public bool has_name5 { get; set; }
+    public bool has_funktion { get; set; }
+    public bool has_funktion2 { get; set; }
+    public bool has_abteilung { get; set; }
+    public bool has_funktionad { get; set; }
+
+    public static AddressPatch Import(Uri filename)
+    {
+        try
+        {
+            var patch = new AddressPatch();
+            
+                    // Alle Zeilen aus der Datei laden
+                    var lines = File.ReadAllLines(filename.LocalPath);
+            
+                    // Alle Properties der Klasse (Strings und bools)
+                    var properties = typeof(AddressPatch).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            
+                    // Nur die Properties, die mit _is enden (also die String-Werte)
+                    var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
+            
+                    foreach (var prop in stringProps)
+                    {
+                        // Beispiel: prop.Name = "name_is"
+                        var baseName = prop.Name.Substring(0, prop.Name.Length - 3); // "name"
+            
+                        // In der Datei wird nach "name:" gesucht (ohne _is)
+                        var line = lines.FirstOrDefault(l => l.StartsWith(baseName + ":"));
+                        if (line != null)
+                        {
+                            // Wert extrahieren (alles nach dem Doppelpunkt)
+                            var value = line.Substring(line.IndexOf(':') + 1).Trim();
+            
+                            // Wert im Patch-Objekt setzen
+                            prop.SetValue(patch, value);
+            
+                            // Passendes has_ Feld aktivieren, z.B. "has_name"
+                            var hasProp = properties.FirstOrDefault(p => p.Name == "has_" + baseName);
+                            if (hasProp != null && hasProp.PropertyType == typeof(bool)) hasProp.SetValue(patch, true);
+                        }
+                    }
+            
+                    return patch;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while importing address patch: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return null;
+
+
+    }
+
+
+    public override string ToString()
+    {
+        try
+        {
+            var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
+                    var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
+            
+                    var lines = new StringBuilder();
+            
+                    foreach (var prop in stringProps)
+                    {
+                        // passendes has_ Feld
+                        var hasProp =
+                            properties.FirstOrDefault(p => p.Name == "has_" + prop.Name.Substring(0, prop.Name.Length - 3));
+                        if (hasProp != null && (bool)hasProp.GetValue(this))
+                        {
+                            var value = (string)prop.GetValue(this);
+                            lines.AppendLine($"{prop.Name} => {value}");
+                        }
+                    }
+            
+                    return lines.ToString().TrimEnd();
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while parsing: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return "Error while parsing";
+        
+    }
+}

Tasks/AddressRepair.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace Logof_Client;
@@ -9,15 +10,16 @@ public class AddressRepair(ProgressWindow progressWindow)
     public KasAddressList Perform(KasAddressList all_addresses,
         List<(int, List<AddressCheck.ErrorTypes>)> failed_addresses)
     {
-        // foreach (var k in all_addresses.KasPersons)
+        try
-        // foreach (var p in failed_addresses)
+        {
-        // {
+            
-        //     if (k.refsid != p.Item1) continue;
+        }
-        //
+        catch (Exception ex)
-        //     if (p.Item1.Contains(AddressCheck.WarningTypes.DoubledRefsid))
+        {
-        //     {
+            Logger.Log($"Error while performing address repair: {ex.Message}", Logger.LogType.Error);
-        //     }
+        }
-        // }
+
+        return null;
 
         return null;
     }

Tasks/AddressShortener.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Threading.Tasks.Dataflow;
+
+namespace Logof_Client;
+
+public class AddressShortener(ProgressWindow progressWindow)
+{
+    private readonly ProgressWindow _progress = progressWindow;
+
+    public async Task Perform(KasAddressList list)
+    {
+        try
+        {
+            List<int> doubled_ids = new List<int>();
+                    for (int i = 0; i < list.KasPersons.Count; i++)
+                    {
+                        var address =  list.KasPersons[i];
+                        for (int j = 0; j < list.KasPersons.Count; j++)
+                        {
+                            if (i == j) continue;
+                            var sec_address =  list.KasPersons[j];
+                            
+                            if (address.refsid == sec_address.refsid && !doubled_ids.Contains(address.refsid) && address.refsid != 0)
+                            {
+                                doubled_ids.Add(address.refsid);
+                            }
+                        }
+                    }
+                    
+                    
+                    // delete doubled addresses by refsid
+                    foreach (int id in doubled_ids)
+                    {
+                        // does this remove both of the doubled addresses?
+                        list.KasPersons.Remove(list.KasPersons.FirstOrDefault(x => x.refsid == id));
+                    }
+            
+                    List<int> toRemove = new List<int>();
+                    foreach (var address in list.KasPersons)
+                    {
+                        try
+                        {
+                            if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.NoPLZorPPLZ))
+                            {
+                                toRemove.Add(address.id);
+                            }
+                            else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PlzNotUsable) &&
+                                     address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PPlzNotUsable))
+                            {
+                                toRemove.Add(address.id);
+                            } else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PlzNotUsable) &&
+                                       address.PersonError.warnings.Contains(AddressCheck.WarningTypes.NoPPLZ))
+                            {
+                                toRemove.Add(address.id);
+                            }
+                            else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PPlzNotUsable) &&
+                                     address.PersonError.warnings.Contains(AddressCheck.WarningTypes.NoPLZ))
+                            {
+                                toRemove.Add(address.id);
+                            }
+                        }
+                        catch
+                        {
+                            Console.WriteLine("PersonError not accessible: " + address.id);
+                        }
+                    }
+                    
+                    // delete doubled addresses by refsid
+                    foreach (int id in toRemove)
+                    {
+                        // does this remove both of the doubled addresses?
+                        list.KasPersons.Remove(list.KasPersons.Find(x => x.id == id));
+                    }
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address shortener: {ex.Message}", Logger.LogType.Error);
+        }
+        
+    }
+}

Tasks/CombineAddresses.cs

@@ -16,40 +16,58 @@ 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, bool? deleteOld)
+    {
+        try
+        {
+            var result = await Execute(address_lists,type,comb_type,exportUnused);
+            
+                    if (deleteOld == true)
+                    {
+                        foreach (var list in address_lists)
+                        {
+                            Settings._instance.addressSets.addresses.Remove(list);
+                        }
+                    }
+            
+                    return result;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address combining: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return (null,null);
+        
+
+    }
+
+    private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
         bool? exportUnused)
     {
-        var res = await Task.Run(async () =>
+        try
         {
-            if (type == "difference") return Difference(address_lists, exportUnused);
+            if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
-            if (type == "union") return Union(address_lists, exportUnused);
+            if (type == "union") return await Union(address_lists, comb_type, exportUnused);
-            if (type == "intersection") return Intersection(address_lists, exportUnused);
+            if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
-            if (type == "symdiff") return SymmetricDifference(address_lists, exportUnused);
+            if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
+            return (null, null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while executing address combining: {ex.Message}", Logger.LogType.Error);
+        }
 
-            return null;
+        return (null,null);
-        });
         
-
-        return res.Result;
-
-
-        // KasAddressList result = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
-        // await Task.Run(async () =>
-        // {
-        //     for (var i = 0; i < address_lists.Count; i++)
-        //         if (i == 0)
-        //             lock (result)
-        //             {
-        //                 result = address_lists[i];
-        //             }
-        //         else
-        //             lock (result)
-        //             {
-        //                 result = Merge(result, address_lists[i], i + 1, address_lists.Count).Result;
-        //             }
-        // });
-        // return result;
-        return (null, null);
     }
 
 
@@ -60,10 +78,13 @@ 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)
     {
-        if (first.refsid == second.refsid) return true;
+        
-        if (!only_refsid)
+        // 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 (comb_type == CombineType.final_adress)
             if (first.name == second.name &&
                 first.anrede == second.anrede &&
                 first.anredzus == second.anredzus &&
@@ -92,81 +113,105 @@ 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)
     {
-        if (address_lists == null || address_lists.Count == 0)
+        try
-            return (new KasAddressList(KasAddressList.GenerateName("difference")), null);
-
-        progress ??= new Progress
         {
-            TotalPersons = address_lists.Sum(l => l.KasPersons.Count),
+            if (address_lists == null || address_lists.Count == 0)
-            ComparedPersons = 0
+                return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
-        };
     
-        // Vereinigung aller Listen außer der ersten
+            progress ??= new Progress
-        var restUnion = new List<KasPerson>();
+            {
-        for (var i = 1; i < address_lists.Count; i++)
+                TotalPersons = address_lists.Sum(l => l.KasPersons.Count),
-            restUnion.AddRange(address_lists[i].KasPersons);
+                ComparedPersons = 0
-        var result = new KasAddressList(KasAddressList.GenerateName("difference"));
+            };
-        var second_result = new KasAddressList(KasAddressList.GenerateName("difference_rest"));
     
-        foreach (var person in address_lists[0].KasPersons)
+            // Vereinigung aller Listen außer der ersten
+            var restUnion = new List<KasPerson>();
+            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("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, comb_type));
+                if (!isDouble)
+                    result.KasPersons.Add(person);
+                else
+                    second_result.KasPersons.Add(person);
+    
+    
+                progress.Increment();
+                if (progress.LogAction == null) continue;
+                var logMessage =
+                    $"Person mit id {person.id} verglichen mit {restUnion.Count} Personen des Restes.";
+                await Dispatcher.UIThread.InvokeAsync(() => progress.LogAction?.Invoke(logMessage));
+            }
+    
+            if (return_unused == true) return (result, second_result);
+            return (result, null);
+        }
+        catch (Exception ex)
         {
-            var isDouble = restUnion.Any(p => CompareAddresses(person, p));
+            Logger.Log($"Error while performing difference-combining: {ex.Message}", Logger.LogType.Error);
-            if (!isDouble)
-                result.KasPersons.Add(person);
-            else
-                second_result.KasPersons.Add(person);
-
-
-            progress.Increment();
-            if (progress.LogAction == null) continue;
-            var logMessage =
-                $"Person mit id {person.id} verglichen mit {restUnion.Count} Personen des Restes.";
-            await Dispatcher.UIThread.InvokeAsync(() => progress.LogAction?.Invoke(logMessage));
         }
 
-        if (return_unused == true) return (result, second_result);
+        return (null,null);
-        return (result, null);
+        
     }
 
 
-    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(KasAddressList.GenerateName("union"));
+        try
-        var second_result = new KasAddressList(KasAddressList.GenerateName("union_rest"));
-
-        if (address_lists == null || address_lists.Count == 0)
-            return (result, null);
-
-        var total = address_lists.Sum(l => l.KasPersons.Count);
-        var processed = 0;
-
-        foreach (var list in address_lists)
-        foreach (var person in list.KasPersons)
         {
-            if (!result.KasPersons.Any(existing => CompareAddresses(existing, person)))
+            var result = new KasAddressList(await KasAddressList.GenerateName("union"));
-                result.KasPersons.Add(person);
+            var second_result = new KasAddressList("none");
-            else
+            if(return_unused == true)
-                second_result.KasPersons.Add(person);
+                second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
     
-            processed++;
+            if (address_lists == null || address_lists.Count == 0)
-            var percent = processed / (double)total * 100;
+                return (result, null);
-            var logMessage =
-                $"{percent:F1}%: Person mit {person.id} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
     
-            if (progress == null) continue;
+            var total = address_lists.Sum(l => l.KasPersons.Count);
-            if (Dispatcher.UIThread.CheckAccess())
+            var processed = 0;
-                progress.LogAction?.Invoke(logMessage);
+    
-            else
+            foreach (var list in address_lists)
-                Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+            foreach (var person in list.KasPersons)
+            {
+                if (!result.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)))
+                    result.KasPersons.Add(person);
+                else
+                    second_result.KasPersons.Add(person);
+    
+                processed++;
+                var percent = processed / (double)total * 100;
+                var logMessage =
+                    $"{percent:F1}%: Person mit {person.id} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
+    
+                if (progress == null) continue;
+                if (Dispatcher.UIThread.CheckAccess())
+                    progress.LogAction?.Invoke(logMessage);
+                else
+                    Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+            }
+    
+            if (return_unused == true) return (result, second_result);
+            return (result, null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing union-combining: {ex.Message}", Logger.LogType.Error);
         }
 
-        if (return_unused == true) return (result, second_result);
+        return (null,null);
-        return (result, null);
+        
     }
 
 
@@ -175,169 +220,132 @@ 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(KasAddressList.GenerateName("intersection"));
+        try
-        var second_result = new KasAddressList(KasAddressList.GenerateName("intersection_rest"));
-
-        if (address_lists == null || address_lists.Count == 0)
-            return (result, null);
-
-        // Nur die erste Liste als Ausgangspunkt verwenden
-        var baseList = address_lists[0];
-        var otherLists = address_lists.Skip(1).ToList();
-
-        var total = baseList.KasPersons.Count;
-        var processed = 0;
-
-        foreach (var person in baseList.KasPersons)
         {
-            // Prüfen, ob Person in *allen* anderen Listen vorkommt
+            var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
-            var isInAll = otherLists.All(list =>
+            var second_result = new KasAddressList("none");
-                list.KasPersons.Any(existing => CompareAddresses(existing, person)));
+            if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
     
-            if (isInAll)
+            if (address_lists == null || address_lists.Count == 0)
-                result.KasPersons.Add(person);
+                return (result, null);
-            else
-                second_result.KasPersons.Add(person);
     
-            processed++;
+            // Nur die erste Liste als Ausgangspunkt verwenden
-            var percent = processed / (double)total * 100;
+            var baseList = address_lists[0];
-            var logMessage =
+            var otherLists = address_lists.Skip(1).ToList();
-                $"{percent:F1}%: Person mit {person.id} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
     
-            // Sicher und nicht blockierend loggen
+            var total = baseList.KasPersons.Count;
-            if (progress != null)
+            var processed = 0;
+    
+            foreach (var person in baseList.KasPersons)
             {
-                if (Dispatcher.UIThread.CheckAccess())
+                // Prüfen, ob Person in *allen* anderen Listen vorkommt
-                    progress.LogAction?.Invoke(logMessage);
+                var isInAll = otherLists.All(list =>
+                    list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
+    
+                if (isInAll)
+                    result.KasPersons.Add(person);
                 else
-                    Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+                    second_result.KasPersons.Add(person);
+    
+                processed++;
+                var percent = processed / (double)total * 100;
+                var logMessage =
+                    $"{percent:F1}%: Person mit {person.id} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
+    
+                // Sicher und nicht blockierend loggen
+                if (progress != null)
+                {
+                    if (Dispatcher.UIThread.CheckAccess())
+                        progress.LogAction?.Invoke(logMessage);
+                    else
+                        Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+                }
             }
+    
+            if (return_unused == true) return (result, second_result);
+            return (result, null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing intersection-combining: {ex.Message}", Logger.LogType.Error);
         }
 
-        if (return_unused == true) return (result, second_result);
+        return (null,null);
-        return (result, null);
+        
     }
 
 
-    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(KasAddressList.GenerateName("symmetric_difference"));
+        try
-        var second_result = new KasAddressList(KasAddressList.GenerateName("symmetric_rest"));
-
-        if (address_lists == null || address_lists.Count == 0)
-            return (result, null);
-
-        var total = address_lists.Sum(l => l.KasPersons.Count);
-        var processed = 0;
-
-        // Wir sammeln alle Personen + zählen, wie oft sie vorkommen
-        var allPersons = new List<(KasPerson person, int count)>();
-
-        foreach (var list in address_lists)
-        foreach (var person in list.KasPersons)
         {
-            // Prüfen, ob schon vorhanden
+            var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
-            var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person));
+            var second_result = new KasAddressList("none");
-            if (existing.person != null)
+            if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
-            {
-                // Falls schon drin → Vorkommen erhöhen
-                var index = allPersons.IndexOf(existing);
-                allPersons[index] = (existing.person, existing.count + 1);
-            }
-            else
-            {
-                // Neu hinzufügen
-                allPersons.Add((person, 1));
-            }
     
-            processed++;
+            if (address_lists == null || address_lists.Count == 0)
-            var percent = processed / (double)total * 100;
+                return (result, null);
-            var logMessage =
-                $"{percent:F1}%: Person mit {person.id} verarbeitet (Zwischengröße {allPersons.Count})";
     
-            if (progress != null)
+            var total = address_lists.Sum(l => l.KasPersons.Count);
+            var processed = 0;
+    
+            // Wir sammeln alle Personen + zählen, wie oft sie vorkommen
+            var allPersons = new List<(KasPerson person, int count)>();
+    
+            foreach (var list in address_lists)
+            foreach (var person in list.KasPersons)
             {
-                if (Dispatcher.UIThread.CheckAccess())
+                // Prüfen, ob schon vorhanden
-                    progress.LogAction?.Invoke(logMessage);
+                var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person, comb_type));
+                if (existing.person != null)
+                {
+                    // Falls schon drin → Vorkommen erhöhen
+                    var index = allPersons.IndexOf(existing);
+                    allPersons[index] = (existing.person, existing.count + 1);
+                }
                 else
-                    Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+                {
+                    // Neu hinzufügen
+                    allPersons.Add((person, 1));
+                }
+    
+                processed++;
+                var percent = processed / (double)total * 100;
+                var logMessage =
+                    $"{percent:F1}%: Person mit {person.id} verarbeitet (Zwischengröße {allPersons.Count})";
+    
+                if (progress != null)
+                {
+                    if (Dispatcher.UIThread.CheckAccess())
+                        progress.LogAction?.Invoke(logMessage);
+                    else
+                        Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+                }
             }
+    
+            // Nur diejenigen übernehmen, die *genau einmal* vorkamen
+            foreach (var (person, count) in allPersons)
+                if (count == 1)
+                    result.KasPersons.Add(person);
+                else
+                    second_result.KasPersons.Add(person);
+    
+            if (return_unused == true) return (result, second_result);
+            return (result, null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing symdiff-combining: {ex.Message}", Logger.LogType.Error);
         }
 
-        // Nur diejenigen übernehmen, die *genau einmal* vorkamen
+        return (null,null);
-        foreach (var (person, count) in allPersons)
-            if (count == 1)
-                result.KasPersons.Add(person);
-            else
-                second_result.KasPersons.Add(person);
         
-        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

Tasks/CsvBuilder.cs

@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Logof_Client;
+
+public class CsvBuilder
+{
+    private readonly string Header;
+    private readonly List<object> Instances;
+    private readonly KasAddressList KasAddressList;
+    private readonly char Separator;
+
+    public CsvBuilder(string header, List<object> instances, char separator = ',')
+    {
+        Header = header;
+        Instances = instances;
+        Separator = separator;
+    }
+
+    public CsvBuilder(string header, KasAddressList instances, char separator = ',')
+    {
+        Header = header;
+        KasAddressList = instances;
+        Separator = separator;
+    }
+
+    public string? BuildKas()
+    {
+        var result = new StringBuilder();
+
+        result.AppendLine(Header);
+        foreach (var l in KasAddressList.KasPersons)
+            result.AppendLine(string.Join(Separator, new[]
+            {
+                EscapeCsvField(l.refsid.ToString()),
+                EscapeCsvField(l.anrede),
+                EscapeCsvField(l.titel),
+                EscapeCsvField(l.vorname),
+                EscapeCsvField(l.adel),
+                EscapeCsvField(l.name),
+                EscapeCsvField(l.namezus),
+                EscapeCsvField(l.anredzus),
+                EscapeCsvField(l.strasse),
+                EscapeCsvField(l.strasse2),
+                EscapeCsvField(l.plz),
+                EscapeCsvField(l.ort),
+                EscapeCsvField(l.land),
+                EscapeCsvField(l.pplz),
+                EscapeCsvField(l.postfach),
+                EscapeCsvField(l.name1),
+                EscapeCsvField(l.name2),
+                EscapeCsvField(l.name3),
+                EscapeCsvField(l.name4),
+                EscapeCsvField(l.name5),
+                EscapeCsvField(l.funktion),
+                EscapeCsvField(l.funktion2),
+                EscapeCsvField(l.abteilung),
+                EscapeCsvField(l.funktionad)
+            }));
+
+        // weitere Cases
+        return result.ToString();
+    }
+
+    private string EscapeCsvField(string? value)
+    {
+        var field = value ?? string.Empty;
+        var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
+        if (!mustQuote)
+            return field;
+
+        return "\"" + field.Replace("\"", "\"\"") + "\"";
+    }
+}

Tasks/DataImport.cs

@@ -3,20 +3,22 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace Logof_Client;
 
 public class DataImport
 {
-    public static (bool, KasAddressList) ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
+    public static async Task<(bool, KasAddressList)> ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
         char separator = ',')
     {
         if (patch == null)
-            return ImportKasAddressListWithoutPatch(pathToCsv, separator);
+            return await ImportKasAddressListWithoutPatch(pathToCsv, separator);
-        return ImportKasAddressListWithPatch(pathToCsv, patch, separator);
+        return await ImportKasAddressListWithPatch(pathToCsv, patch, separator);
     }
 
-    private static (bool, KasAddressList) ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
+    private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
     {
         if (!File.Exists(pathToCsv.LocalPath))
         {
@@ -32,8 +34,8 @@ public class DataImport
             return (false, null);
         }
 
-        var imported =
+        var imported = new KasAddressList(
-            new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
+            await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
 
         while (!reader.EndOfStream)
         {
@@ -41,7 +43,7 @@ public class DataImport
             if (string.IsNullOrWhiteSpace(line))
                 continue;
 
-            var parts = line.Split(separator).Select(p => p.Trim()).ToArray();
+            var parts = ParseCsvLine(line, separator);
 
             if (parts.Length < 24)
             {
@@ -90,7 +92,7 @@ public class DataImport
         return (true, imported);
     }
 
-    private static (bool, KasAddressList) ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
+    private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
         char separator)
     {
         if (!File.Exists(pathToCsv.LocalPath))
@@ -107,10 +109,10 @@ public class DataImport
             return (false, null);
         }
 
-        var headers = headerLine.Split(separator).Select(h => h.Trim()).ToArray();
+        var headers = ParseCsvLine(headerLine, separator);
 
-        var imported =
+        var imported = new KasAddressList(
-            new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
+            await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
         var patchType = typeof(AddressPatch);
         var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
 
@@ -126,7 +128,7 @@ public class DataImport
             if (string.IsNullOrWhiteSpace(line))
                 continue;
 
-            var parts = line.Split(separator).Select(p => p.Trim()).ToArray();
+            var parts = ParseCsvLine(line, separator);
 
             var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
@@ -241,4 +243,41 @@ public class DataImport
     {
         return int.TryParse(input, out var result) ? result : 0;
     }
+
+    private static string[] ParseCsvLine(string line, char separator)
+    {
+        var fields = new List<string>();
+        var current = new StringBuilder();
+        var inQuotes = false;
+
+        for (var i = 0; i < line.Length; i++)
+        {
+            var c = line[i];
+
+            if (c == '"')
+            {
+                if (inQuotes && i + 1 < line.Length && line[i + 1] == '"')
+                {
+                    current.Append('"');
+                    i++;
+                    continue;
+                }
+
+                inQuotes = !inQuotes;
+                continue;
+            }
+
+            if (c == separator && !inQuotes)
+            {
+                fields.Add(current.ToString().Trim());
+                current.Clear();
+                continue;
+            }
+
+            current.Append(c);
+        }
+
+        fields.Add(current.ToString().Trim());
+        return fields.ToArray();
+    }
 }

Tasks/PdfBuilder.cs

@@ -1,39 +1,63 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using PdfSharp;
 using PdfSharp.Drawing;
+using PdfSharp.Fonts;
 using PdfSharp.Pdf;
 
 namespace Logof_Client;
 
 public class PdfBuilder
 {
-    // Table layout
+    private readonly PdfExportSettings _settings;
-    private const int CellsPerRow = 3;
+    private readonly XFont _boldFont;
-    private const int CellsPerPage = 21; // 3 columns × 7 rows
+    private readonly XFont _regularFont;
-    private readonly XFont _boldFont = new("Arial", 9, XFontStyleEx.Bold);
+    private readonly XFont _smallFont;
-    private readonly double _cellHeight = 42.43; // mm
-    private readonly double _cellPaddingBottom = 5; // mm
 
-    // Padding inside cells
+    public PdfBuilder(PdfExportSettings? settings = null)
-    private readonly double _cellPaddingLeft = 5; // mm
+    {
-    private readonly double _cellPaddingTop = 5; // mm
+        EnsureFontResolverRegistered();
+        _settings = settings ?? new PdfExportSettings();
 
-    // Cell dimensions (in mm)
+        // Select first font from build output fonts folder (AppContext.BaseDirectory/fonts)
-    private readonly double _cellWidth = 70; // mm
+        var chosenFamily = "Arial";
+        try
+        {
+            if (Directory.Exists(Global._instance.font_path))
+            {
+                var first = Directory.EnumerateFiles(Global._instance.font_path, "*.ttf").FirstOrDefault();
+                if (!string.IsNullOrEmpty(first))
+                    chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
+            }
+        }
+        catch
+        {
+            chosenFamily = "Arial";
+        }
 
-    // Font settings
+        _boldFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Bold);
-    private readonly double _fontSize = 9;
+        _regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
+        _smallFont = new XFont(chosenFamily, _settings.smallFontSize, XFontStyleEx.Regular);
+    }
 
-    private readonly double _marginBottom = 1; // mm
+    private static void EnsureFontResolverRegistered()
+    {
+        if (GlobalFontSettings.FontResolver != null) return;
+        //var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
+        GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
+    }
 
-    // Paper and layout settings
+    private static string StripStyleSuffix(string name)
-    private readonly double _marginLeft = 0; // mm
+    {
-    private readonly double _marginRight = 0; // mm
+        if (string.IsNullOrEmpty(name)) return name;
-    private readonly double _marginTop = 0; // mm
+        var idx = name.IndexOf('-');
-    private readonly XFont _regularFont = new("Arial", 9, XFontStyleEx.Regular);
+        if (idx < 0) idx = name.IndexOf('_');
-    private readonly XFont _smallFont = new("Arial", 6, XFontStyleEx.Regular);
+        if (idx > 0)
+            return name.Substring(0, idx);
+        return name;
+    }
 
 
     /// <summary>
@@ -115,20 +139,17 @@ public class PdfBuilder
 
     private void DrawPage(XGraphics gfx, List<string> addresses, ref int addressIndex)
     {
-        var cellCount = 0;
+        for (var row = 0; row < _settings.rowsPerPage; row++)
-
-        for (var row = 0; row < 7; row++)
         {
-            for (var col = 0; col < 3; col++)
+            for (var col = 0; col < _settings.columnsPerPage; col++)
             {
                 if (addressIndex >= addresses.Count) break;
 
-                var x = MmToPoints(_marginLeft + col * _cellWidth);
+                var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
-                var y = MmToPoints(_marginTop + row * _cellHeight);
+                var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
 
                 DrawCell(gfx, x, y, addresses[addressIndex]);
                 addressIndex++;
-                cellCount++;
             }
 
             if (addressIndex >= addresses.Count) break;
@@ -138,13 +159,11 @@ public class PdfBuilder
     private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
         ref bool isFirstCell, string placeholderText)
     {
-        var cellCount = 0;
+        for (var row = 0; row < _settings.rowsPerPage; row++)
-
+        for (var col = 0; col < _settings.columnsPerPage; col++)
-        for (var row = 0; row < 7; row++)
-        for (var col = 0; col < 3; col++)
         {
-            var x = MmToPoints(_marginLeft + col * _cellWidth);
+            var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
-            var y = MmToPoints(_marginTop + row * _cellHeight);
+            var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
 
             // First cell: placeholder
             if (isFirstCell)
@@ -161,15 +180,13 @@ public class PdfBuilder
             {
                 DrawEmptyCell(gfx, x, y);
             }
-
-            cellCount++;
         }
     }
 
     private void DrawCell(XGraphics gfx, double x, double y, string? address)
     {
-        var cellWidthPoints = MmToPoints(_cellWidth);
+        var cellWidthPoints = MmToPoints(GetCellWidthMm());
-        var cellHeightPoints = MmToPoints(_cellHeight);
+        var cellHeightPoints = MmToPoints(GetCellHeightMm());
 
         // Draw cell border
         var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
@@ -181,8 +198,8 @@ public class PdfBuilder
 
     private void DrawEmptyCell(XGraphics gfx, double x, double y)
     {
-        var cellWidthPoints = MmToPoints(_cellWidth);
+        var cellWidthPoints = MmToPoints(GetCellWidthMm());
-        var cellHeightPoints = MmToPoints(_cellHeight);
+        var cellHeightPoints = MmToPoints(GetCellHeightMm());
 
         var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
         gfx.DrawRectangle(XPens.Black, rect);
@@ -190,11 +207,12 @@ public class PdfBuilder
 
     private void DrawMarkdownText(XGraphics gfx, string text, double x, double y, double cellWidth, double cellHeight)
     {
-        var paddingLeftPoints = MmToPoints(_cellPaddingLeft);
+        var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
-        var paddingTopPoints = MmToPoints(_cellPaddingTop);
+        var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
-        var paddingBottomPoints = MmToPoints(_cellPaddingBottom);
+        var paddingTopPoints = MmToPoints(_settings.cellPaddingTopMm);
+        var paddingBottomPoints = MmToPoints(_settings.cellPaddingBottomMm);
 
-        var maxWidth = cellWidth - paddingLeftPoints * 2;
+        var maxWidth = Math.Max(0, cellWidth - paddingLeftPoints - paddingRightPoints);
 
         // Split text by newlines and remove empty trailing lines
         var rawLines = text.Split(new[] { "\n" }, StringSplitOptions.None);
@@ -338,6 +356,18 @@ public class PdfBuilder
         return mm * 2.834645669;
     }
 
+    private double GetCellWidthMm()
+    {
+        var availableWidthMm = 210d - _settings.pageMarginLeftMm - _settings.pageMarginRightMm;
+        return availableWidthMm / _settings.columnsPerPage;
+    }
+
+    private double GetCellHeightMm()
+    {
+        var availableHeightMm = 297d - _settings.pageMarginTopMm - _settings.pageMarginBottomMm;
+        return availableHeightMm / _settings.rowsPerPage;
+    }
+
     // Configuration methods to allow customization
 
     /// <summary>

Tasks/StableFontResolver.cs

@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using PdfSharp.Fonts;
+using System.Globalization;
+
+namespace Logof_Client;
+
+public class StableFontResolver : IFontResolver
+{
+    // family -> style -> bytes
+    private readonly Dictionary<string, Dictionary<string, byte[]>> _families = new(StringComparer.OrdinalIgnoreCase);
+    private readonly List<string> _orderedFamilies = new();
+
+    public StableFontResolver(string fontsDirectory)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(fontsDirectory)) return;
+            if (!Directory.Exists(fontsDirectory)) return;
+
+            var files = Directory.EnumerateFiles(fontsDirectory, "*.ttf");
+            foreach (var f in files)
+            {
+                try
+                {
+                    var baseName = Path.GetFileNameWithoutExtension(f);
+                    if (string.IsNullOrEmpty(baseName)) continue;
+
+                    // Try to split family and style by hyphen or underscore
+                    var family = baseName;
+                    var style = "Regular";
+
+                    var idx = baseName.IndexOf('-');
+                    if (idx < 0) idx = baseName.IndexOf('_');
+                    if (idx > 0)
+                    {
+                        family = baseName.Substring(0, idx);
+                        style = baseName.Substring(idx + 1);
+                    }
+
+                    // Normalize common style names
+                    style = NormalizeStyle(style);
+
+                    var data = File.ReadAllBytes(f);
+                    if (data == null || data.Length == 0) continue;
+
+                    if (!_families.TryGetValue(family, out var dict))
+                    {
+                        dict = new Dictionary<string, byte[]>(StringComparer.OrdinalIgnoreCase);
+                        _families[family] = dict;
+                        _orderedFamilies.Add(family);
+                    }
+
+                    if (!dict.ContainsKey(style))
+                        dict[style] = data;
+                }
+                catch
+                {
+                    // ignore individual font load errors
+                }
+            }
+        }
+        catch
+        {
+            // ignore resolver init errors
+        }
+    }
+
+    private static string NormalizeStyle(string s)
+    {
+        if (string.IsNullOrEmpty(s)) return "Regular";
+        s = s.ToLowerInvariant();
+        if (s.Contains("bold") && s.Contains("italic")) return "BoldItalic";
+        if (s.Contains("bold")) return "Bold";
+        if (s.Contains("italic") || s.Contains("oblique")) return "Italic";
+        if (s.Contains("regular") || s == "r") return "Regular";
+        return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(s);
+    }
+
+    public FontResolverInfo ResolveTypeface(string familyName, bool isBold, bool isItalic)
+    {
+        // If requested family exists, pick corresponding style if available
+        string familyToUse = null;
+        if (!string.IsNullOrEmpty(familyName) && _families.ContainsKey(familyName))
+            familyToUse = familyName;
+
+        if (familyToUse == null && _orderedFamilies.Count > 0)
+            familyToUse = _orderedFamilies[0];
+
+        if (familyToUse == null)
+            return new FontResolverInfo("Arial");
+
+        var style = "Regular";
+        if (isBold && isItalic) style = "BoldItalic";
+        else if (isBold) style = "Bold";
+        else if (isItalic) style = "Italic";
+
+        // Face name format: Family#Style
+        return new FontResolverInfo($"{familyToUse}#{style}");
+    }
+
+    public byte[] GetFont(string faceName)
+    {
+        if (string.IsNullOrEmpty(faceName)) return null;
+
+        // faceName expected as "Family#Style" or just "Family"
+        var family = faceName;
+        var style = "Regular";
+        var idx = faceName.IndexOf('#');
+        if (idx >= 0)
+        {
+            family = faceName.Substring(0, idx);
+            style = faceName.Substring(idx + 1);
+        }
+
+        style = NormalizeStyle(style);
+
+        if (_families.TryGetValue(family, out var dict))
+        {
+            // Try exact style
+            if (dict.TryGetValue(style, out var data)) return data;
+
+            // Fallback order
+            if (style != "Regular" && dict.TryGetValue("Regular", out data)) return data;
+            if (dict.TryGetValue("Bold", out data)) return data;
+            if (dict.TryGetValue("Italic", out data)) return data;
+
+            // Any available
+            foreach (var kv in dict) return kv.Value;
+        }
+
+        return null;
+    }
+}

Wiki/EditorWindow.axaml

@@ -1,8 +1,17 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Logof_Client.Wiki.EditorWindow"
-        Title="Wiki Editor (disabled)" Width="400" Height="150">
+        Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
-    <Grid>
+    <Grid Margin="10,0,10,10">
-        <TextBlock Margin="12" TextWrapping="Wrap">Coming soon.</TextBlock>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <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 AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
     </Grid>
 </Window>

Wiki/EditorWindow.axaml.cs

@@ -1,17 +1,63 @@
 using System;
+using System.IO;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 
 namespace Logof_Client.Wiki;
 
 public partial class EditorWindow : Window
 {
-	private void InitializeComponent()
+    public string filename = "";
-	{
-		Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
-	}
 
-	public EditorWindow()
+    public EditorWindow(string filename = "")
-	{
+    {
-		InitializeComponent();
+        InitializeComponent();
-	}
+        this.filename = filename;
+        if (!string.IsNullOrWhiteSpace(filename) && File.Exists(filename))
+        {
+            var content = TbContent;
+            if (content != null) content.Text = File.ReadAllText(this.filename);
+            Title = "Wiki Editor - " + filename;
+        }
+        else if (!string.IsNullOrWhiteSpace(filename))
+        {
+            MessageBox.Show(null, "Die Datei existiert nicht", "Fehler");
+            Close();
+        }
+    }
+
+    private void BtnSave_OnClick(object? sender, RoutedEventArgs e)
+    {
+        try
+        {
+            File.WriteAllText(filename, TbContent.Text);
+            MainWindow._instance.PopulateNavTree();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(null,
+                "Es ist ein Fehler aufgetreten. Bitte senden Sie ihn über git.mypapercloud.de/fierke/logofclient ein:\n" +
+                ex.StackTrace, "Fehler");
+        }
+    }
+
+    private void BtnSaveAs_OnClick(object? sender, RoutedEventArgs e)
+    {
+        MessageBox.Show(null,
+            "Feature noch nicht implemetiert.\nErstelle neue Dateien unter " + Global._instance.wiki_storage_path,
+            "Fehler");
+    }
+
+    private async void BtnDelete_OnClick(object? sender, RoutedEventArgs e)
+    {
+        var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
+        if (result == MessageBoxResult.No) return;
+        try
+        {
+            File.Delete(filename);
+        } catch {}
+        
+        MainWindow._instance.PopulateNavTree();
+        Close();
+    }
 }

Wiki/MarkdownRenderer.cs

@@ -115,6 +115,9 @@ public static class MarkdownRenderer
                 case LinkInline li:
                     sb.Append(GetInlineText(li));
                     break;
+                case LineBreakInline:
+                    sb.Append("\n");
+                    break;
                 default:
                     sb.Append(inline.ToString());
                     break;