[fix:] multiple little fixed for the combining methods

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

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,11 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Logof_Client;
 
 public class KasAddressList //Address-Set
 {
-    public List<KasPersonError> errors = new();
+    //public List<KasPersonError> errors = new();
     public List<KasPerson> KasPersons;
 
     public KasAddressList(string name)
@@ -13,12 +14,9 @@ public class KasAddressList //Address-Set
         KasPersons = new List<KasPerson>();
         Name = name;
         foreach (var set in Settings._instance.addressSets.addresses)
-        {
             if (Name == set.Name)
-            {
                 Name = name + "-new";
-            }
-        }
+
         var highest = 0;
         foreach (var k in Settings._instance.addressSets.addresses)
             if (highest <= k.ID)
@@ -35,19 +33,27 @@ 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)
     {
-        if(is_rest == true)
+        string pre = "";
+
+        if (is_rest == true)
             return basic_type + " - " + DateTime.Now.ToShortDateString() + " - Rest";
-        else
-            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<(int, List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>)> errorList)
-    {
-        errors.Clear();
-        foreach (var error in errorList) errors.Add(new KasPersonError(error));
-    }
+    // public void UpdateErrorList(List<KasPersonError> errorList)
+    // {
+    //     //errors.Clear();
+    //     // foreach (KasPersonError err in errorList)
+    //     // {
+    //     //     
+    //     // }
+    //     //foreach (var error in errorList) errors.Add(new KasPersonError(error));
+    // }
 
     public static int GetIDByAddressSetListItem(string listItemName)
     {
@@ -58,8 +64,11 @@ public class KasAddressList //Address-Set
 
 public class KasPerson
 {
+    public KasPersonError PersonError = null;
+
     public KasPerson()
     {
+        id = GenerateNewID(0);
         refsid = 0;
         anrede = "";
         titel = "";
@@ -86,7 +95,7 @@ public class KasPerson
         funktionad = "";
     }
 
-    public KasPerson(int refsid,
+    public KasPerson(int id, int refsid,
         string anrede,
         string titel,
         string vorname,
@@ -111,6 +120,7 @@ public class KasPerson
         string abteilung,
         string funktionad)
     {
+        this.id = id;
         this.refsid = refsid;
         this.anrede = anrede;
         this.titel = titel;
@@ -137,6 +147,7 @@ public class KasPerson
         this.funktionad = funktionad;
     }
 
+    public int id { get; set; }
     public int refsid { get; set; }
     public string anrede { get; set; }
     public string titel { get; set; }
@@ -161,41 +172,44 @@ public class KasPerson
     public string funktion2 { get; set; }
     public string abteilung { get; set; }
     public string funktionad { get; set; }
+
+    public static int GenerateNewID(int 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 >= highest) highest = add.id+1;
+            }
+        }
+        
+
+        return highest + base_id + 1;
+    }
 }
 
 public class KasPersonError
 {
-    public KasPersonError((int, List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>) single_result)
+    public KasPersonError((List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>) single_result)
     {
-        refsid = single_result.Item1;
-        errors = single_result.Item2;
-        warnings = single_result.Item3;
-        // try
-        // {
-        //     foreach (var err in single_result.Item2) errors += err + ", ";
-        //     errors = errors.Trim();
-        //     errors = errors.TrimEnd(',');
-        // }
-        // catch
-        // {
-        // }
-        //
-        // try
-        // {
-        //     if (single_result.Item3 != null)
-        //     {
-        //         foreach (var err in single_result.Item3) warnings += err + ", ";
-        //         warnings = warnings.Trim();
-        //         warnings = warnings.TrimEnd(',');
-        //     }
-        // }
-        // catch (Exception e)
-        // {
-        //     Console.WriteLine(e.Message);
-        // }
+        //refsid = single_result.Item1;
+        errors = single_result.Item1;
+        warnings = single_result.Item2;
     }
 
-    public int refsid { get; set; }
+    //public int refsid { get; set; }
     public List<AddressCheck.ErrorTypes> errors { get; set; } = new();
     public List<AddressCheck.WarningTypes> warnings { get; set; } = new();
+
+    public string GetString()
+    {
+        var output = "";
+        foreach (var error in errors) output += error + ", ";
+
+        foreach (var warning in warnings) output += warning + ", ";
+
+        return output;
+    }
 }

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");
@@ -52,6 +53,25 @@ public class 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,7 +81,18 @@ public class Global
         _instance = this;
     }
 
-    public string config_path { get; set; } = "";
+    public string config_path { get; set; } = Path.Combine(
+        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()
     {
@@ -121,10 +152,12 @@ public class Customer
 
     public string name { get; set; } = "";
     public string description { get; set; } = "";
+    public string sender_address { get; set; } = "";
     public AddressPatch patch { get; set; }
     public char separator { get; set; } = ',';
     public int ID { get; }
 
+
     public static int GetIDByCustomerListItem(string item_content)
     {
         var id = item_content.Split(" - ")[0];
@@ -145,3 +178,37 @@ public class AddressSets
         return null;
     }
 }
+
+public class Country
+{
+    public Country(string name, string translation, List<string> alternatives)
+    {
+        this.name = name;
+        this.translation = translation;
+        this.alternatives = alternatives;
+    }
+
+    public Country(string name)
+    {
+        this.name = name;
+        translation = "";
+        alternatives = new List<string>();
+    }
+
+    public Country()
+    {
+    }
+
+    public string? name { get; set; }
+    public string translation { get; set; }
+    public List<string> alternatives { get; set; }
+
+    public static Country GetByName(string name)
+    {
+        foreach (var country in Global._instance.countries)
+            if (country.name == name)
+                return country;
+
+        return null;
+    }
+}

Logof Client.csproj

@@ -19,8 +19,21 @@
             <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
             <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
         </PackageReference>
+        <PackageReference Include="ISO3166" Version="1.0.4"/>
         <PackageReference Include="Lucide.Avalonia" Version="0.1.35"/>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
+        <PackageReference Include="PdfSharp" Version="6.1.1"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Markdig" Version="0.30.3"/>
+        <PackageReference Include="AvaloniaEdit" Version="0.10.12"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="wiki\**\*.md">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
 
     <ItemGroup>
@@ -37,4 +50,12 @@
             <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"> -->
-                        <!--     <StackPanel Orientation="Horizontal" VerticalAlignment="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"
+                        <!-- <Grid ColumnDefinitions="*,*,*" Grid.Row="1"> -->
+                            <StackPanel Grid.Row="1"  Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center"
                                         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"
-                                        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"
+                                <Button Width="250" IsEnabled="False"
                                         HorizontalContentAlignment="Center" x:Name="BtnShorten"
                                         Margin="0,0,0,10">
                                     <StackPanel Orientation="Horizontal">
@@ -134,7 +130,8 @@
                                                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">
                                     <StackPanel Orientation="Horizontal">
@@ -144,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>
@@ -160,10 +166,12 @@
                                         <StackPanel Orientation="Vertical">
                                             <StackPanel Orientation="Horizontal">
                                                 <LucideIcon Kind="SquaresUnite" Width="36" Height="36" />
-                                                <Label Content="Vereinigung" VerticalContentAlignment="Center" FontSize="15"
+                                                <Label Content="Vereinigung" VerticalContentAlignment="Center"
+                                                       FontSize="15"
                                                        FontWeight="Bold" />
                                             </StackPanel>
-                                            <Label FontSize="9" Content="Fügt Elemente beider Mengen in eine Menge zusammen"></Label>
+                                            <Label FontSize="9"
+                                                   Content="Fügt Elemente beider Mengen in eine Menge zusammen" />
                                         </StackPanel>
                                     </Button>
                                     <Button HorizontalAlignment="Stretch" MinWidth="240"
@@ -177,7 +185,8 @@
                                                        FontSize="15"
                                                        FontWeight="Bold" />
                                             </StackPanel>
-                                            <Label FontSize="9" Content="Überträgt nur doppelte Elemente in die neue Menge"></Label>
+                                            <Label FontSize="9"
+                                                   Content="Überträgt nur doppelte Elemente in die neue Menge" />
                                         </StackPanel>
 
                                     </Button>
@@ -192,7 +201,8 @@
                                                        FontSize="15"
                                                        FontWeight="Bold" />
                                             </StackPanel>
-                                            <Label FontSize="9" Content="Elemente der ersten Menge ohne Elemente der zweiten Menge"></Label>
+                                            <Label FontSize="9"
+                                                   Content="Elemente der ersten Menge ohne Elemente der zweiten Menge" />
                                         </StackPanel>
 
                                     </Button>
@@ -203,18 +213,88 @@
                                         <StackPanel Orientation="Vertical">
                                             <StackPanel Orientation="Horizontal">
                                                 <LucideIcon Kind="SquaresExclude" Width="36" Height="36" />
-                                                <Label Content="Symmetrische Differenz" VerticalContentAlignment="Center"
+                                                <Label Content="Symmetrische Differenz"
+                                                       VerticalContentAlignment="Center"
                                                        FontSize="15"
                                                        FontWeight="Bold" />
                                             </StackPanel>
-                                            <Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind"></Label>
+                                            <Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
                                         </StackPanel>
 
                                     </Button>
                                 </StackPanel>
+                                <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
+                                    <RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
+                                    <RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
+                                </StackPanel>
                                 <CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
                             </StackPanel>
                         </Grid>
+                        <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>
                 </TabItem>
                 <TabItem IsEnabled="False">
@@ -241,6 +321,49 @@
                         </StackPanel>
                     </TabItem.Header>
                 </TabItem>
+                <TabItem IsEnabled="True">
+                    <TabItem.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <LucideIcon Kind="LibraryBig" Width="32" Height="32" Size="32" />
+                            <Label FontSize="20" Content="Wiki" VerticalContentAlignment="Center" />
+                        </StackPanel>
+                    </TabItem.Header>
+                    <Grid ColumnDefinitions="300,*">
+                        <Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
+                            <StackPanel>
+                                <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="10" />
+                                </ScrollViewer>
+                            </StackPanel>
+                        </Border>
+
+                        <Grid Grid.Column="1">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+
+                            <StackPanel Orientation="Horizontal" Margin="8" Grid.Row="0">
+                                <Button Name="EditButton" Content="Edit" HorizontalContentAlignment="Center"
+                                        IsEnabled="False" Width="80" Margin="0,0,8,0" />
+                                <Button Name="OpenFolderButton" HorizontalContentAlignment="Center"
+                                        Content="Open Folder" Width="100" />
+                            </StackPanel>
+
+                            <Border Grid.Row="1" Margin="8" BorderBrush="#DDD" BorderThickness="1" CornerRadius="4">
+                                <ScrollViewer>
+                                    <StackPanel Name="PreviewPanel" Margin="8" />
+                                </ScrollViewer>
+                            </Border>
+                        </Grid>
+                    </Grid>
+                </TabItem>
                 <TabItem IsEnabled="True">
                     <TabItem.Header>
                         <StackPanel Orientation="Horizontal">
@@ -256,20 +379,56 @@
                                     <Label FontSize="16" Content="Global" VerticalContentAlignment="Center" />
                                 </StackPanel>
                             </TabItem.Header>
-                            <StackPanel Orientation="Vertical">
+                            <StackPanel Orientation="Vertical" Spacing="10">
                                 <Grid ColumnDefinitions="400,*">
                                     <Label Grid.Column="0">config-Datei</Label>
-                                    <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="5">
-                                        <TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
-                                                 Watermark="/home/username/.config/logofclient/config.json" />
-                                        <Button>
-                                            <Button.Content>
-                                                <StackPanel Orientation="Horizontal">
-                                                    <LucideIcon Kind="File" Width="16" Height="16" Size="16" />
-                                                    <Label Content="Öffnen..." VerticalContentAlignment="Center" />
-                                                </StackPanel>
-                                            </Button.Content>
-                                        </Button>
+                                    <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
+                                        <StackPanel Orientation="Horizontal" Spacing="5">
+                                            <TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
+                                                     Watermark="/home/username/.config/logofclient/config.json" />
+                                            <Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
+                                                <Button.Content>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <LucideIcon Kind="File" 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">Wiki-Pfad</Label>
+                                    <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
+                                        <StackPanel Orientation="Horizontal" Spacing="5">
+                                            <TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch"
+                                                     Watermark="/home/username/.config/logofclient/wiki" />
+                                            <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" />
+                                                        <Label Content="Öffnen..." VerticalContentAlignment="Center" />
+                                                    </StackPanel>
+                                                </Button.Content>
+                                            </Button>
+                                        </StackPanel>
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>
@@ -315,6 +474,13 @@
                                                  TextChanged="TbSettingsCustomerDescription_OnTextChanged"
                                                  x:Name="TbSettingsCustomerDescription" />
                                     </Grid>
+                                    <Grid ColumnDefinitions="150,*">
+                                        <Label Content="Absenderadresse" />
+                                        <TextBox Grid.Column="1" Watermark="Absenderadresse"
+                                                 HorizontalAlignment="Stretch"
+                                                 TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
+                                                 x:Name="TbSettingsCustomerSenderAddress" />
+                                    </Grid>
                                     <Grid ColumnDefinitions="150,*">
                                         <Label Content="CSV-Trennzeichen" />
                                         <TextBox Grid.Column="1" Watermark=","
@@ -347,7 +513,7 @@
                                                    VerticalContentAlignment="Center" />
                                         </StackPanel>
                                     </Button>
-                                    <Button Background="#99963434" HorizontalAlignment="Stretch"
+                                    <Button Background="#99963434" HorizontalAlignment="Stretch" x:Name="BtnDeleteCustomer" Click="BtnDeleteCustomer_OnClick"
                                             HorizontalContentAlignment="Center">
                                         <StackPanel Orientation="Horizontal">
                                             <LucideIcon Kind="Trash" Width="16" Height="16" Size="16" />
@@ -357,6 +523,97 @@
                                 </StackPanel>
                             </Grid>
                         </TabItem>
+                        <TabItem>
+                            <TabItem.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <LucideIcon Kind="Globe" Width="16" Height="16" Size="16" />
+                                    <Label FontSize="16" Content="Länder" VerticalContentAlignment="Center" />
+                                </StackPanel>
+                            </TabItem.Header>
+                            <Grid ColumnDefinitions="*,*">
+                                <Grid Grid.Column="0" Margin="5">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="*" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <ListBox x:Name="CountryList" Grid.Row="0"
+                                             SelectionChanged="CountryList_OnSelectionChanged" />
+
+                                    <Grid Grid.Row="1" ColumnDefinitions="*,250" Margin="0,5,0,0">
+                                        <TextBox x:Name="TbSettingsNewCountry" />
+                                        <Button Grid.Column="1" x:Name="BtnSettingsNewCountry"
+                                                HorizontalAlignment="Stretch" Click="BtnSettingsNewCountry_OnClick"
+                                                HorizontalContentAlignment="Center" Content="+ Hinzufügen"
+                                                Margin="5,0,0,0" />
+                                    </Grid>
+                                </Grid>
+
+                                <Grid Grid.Column="1" Margin="5">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
+
+                                    <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,5"
+                                                HorizontalAlignment="Right">
+                                        <Button x:Name="BtnSettingsInsertDefaultCountries"
+                                                Content="Standard-Länder laden (Englisch)"
+                                                Click="BtnSettingsInsertDefaultCountries_OnClick" />
+
+                                    </StackPanel>
+
+                                    <Grid Grid.Row="1" ColumnDefinitions="300,*" Margin="0,0,0,5">
+                                        <TextBlock Text="Name:" VerticalAlignment="Center" />
+                                        <TextBox Grid.Column="1" x:Name="TbSettingsCountryName"
+                                                 TextChanged="TbSettingsCountryName_OnTextChanged" />
+                                    </Grid>
+
+                                    <Grid ColumnDefinitions="300,*" Margin="0,0,0,5" Grid.Row="2">
+                                        <TextBlock Text="Übersetzung:" VerticalAlignment="Center" />
+                                        <TextBox Grid.Column="1" x:Name="TbSettingsCountryTranslation"
+                                                 TextChanged="TbSettingsCountryTranslation_OnTextChanged" />
+                                    </Grid>
+
+                                    <Grid Grid.Row="3">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+
+
+                                        <ListBox Grid.Row="0" x:Name="LbSettingsAlternatives" SelectionMode="Multiple" />
+
+                                        <Grid Grid.Row="1" ColumnDefinitions="*,200" Margin="0,5,0,0">
+                                            <TextBox x:Name="TbSettingsNewCountryAlternative"
+                                                     Watermark="Kürzel/Alternative" />
+                                            <Button Grid.Column="1" x:Name="BtnSettingsNewCountryAlternative"
+                                                    Content="+ Hinzufügen" Margin="5 0 0 0"
+                                                    HorizontalContentAlignment="Center"
+                                                    Click="BtnSettingsNewCountryAlternative_OnClick"
+                                                    HorizontalAlignment="Stretch" />
+                                        </Grid>
+
+                                        <Button x:Name="BtnSettingsRemoveSelectedAlternatives" Grid.Row="2"
+                                                Content="Ausgewählte Entfernen" Background="#99963434"
+                                                HorizontalContentAlignment="Center"
+                                                HorizontalAlignment="Stretch"
+                                                Click="BtnSettingsRemoveSelectedAlternatives_OnClick"
+                                                Margin="0,5,0,0" />
+
+                                        <Button Grid.Row="3"
+                                                Content="Land Entfernen" Background="#99963434"
+                                                HorizontalContentAlignment="Center" x:Name="BtnSettingsRemoveCountry"
+                                                HorizontalAlignment="Stretch" Click="BtnSettingsRemoveCountry_OnClick"
+                                                Margin="0,5,0,0" />
+                                    </Grid>
+                                </Grid>
+                            </Grid>
+                        </TabItem>
                     </TabControl>
                 </TabItem>
             </TabControl>

MainWindow.axaml.cs

@@ -1,16 +1,25 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Controls.Primitives;
 using Avalonia.Platform.Storage;
+using Logof_Client.Wiki;
 
 namespace Logof_Client;
 
 public partial class MainWindow : Window
 {
     public static MainWindow _instance;
+
+    private Country _selectedCountry;
+    private string _selectedWikiFilePath;
+    private bool _suppressCountryRefresh;
+
+    private WikiService _wikiService;
     public Uri filePath;
 
     public MainWindow()
@@ -25,6 +34,43 @@ public partial class MainWindow : Window
         WindowState = WindowState.Maximized;
         Global.Load();
         Settings.Load();
+        LoadPdfExportOptions();
+        HookPdfExportOptionEvents();
+
+        RefreshCountryView();
+
+        // Initialize wiki integration
+        _wikiService = new WikiService();
+        try
+        {
+            PopulateNavTree();
+            NavTree.SelectionChanged += NavTree_SelectionChanged;
+            OpenFolderButton.Click += OpenFolderButton_Click;
+            EditButton.Click += EditButton_Click;
+
+            // populate wiki settings UI if present
+            try
+            {
+                if (!string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
+                    TbWikiPath.Text = Global._instance.wiki_storage_path;
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                BtnWikiPath.Click += BtnWikiPath_Click;
+                BtnFontPath.Click += BtnFontPath_Click;
+                BtnConfigPath.Click += BtnConfigPath_Click;
+            }
+            catch
+            {
+            }
+        }
+        catch
+        {
+        }
 
         //Thread.Sleep(3000);
         //Show();
@@ -54,23 +100,23 @@ public partial class MainWindow : Window
         //await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
     }
 
-    private async void StartAddressRepair(Uri path)
-    {
-        var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
-        var progressWindow = new ProgressWindow();
-
-        progressWindow.Show(_instance);
-
-        var processor = new AddressRepair(progressWindow);
-        //var result = await processor.Perform(addresses.Item2, errors);
-
-
-        progressWindow.Close();
-
-
-        //new ResultWindow(result, addresses.Item2).Show();
-        //await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
-    }
+    // private async void StartAddressRepair(Uri path)
+    // {
+    //     var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
+    //     var progressWindow = new ProgressWindow();
+    //
+    //     progressWindow.Show(_instance);
+    //
+    //     var processor = new AddressRepair(progressWindow);
+    //     //var result = await processor.Perform(addresses.Item2, errors);
+    //
+    //
+    //     progressWindow.Close();
+    //
+    //
+    //     //new ResultWindow(result, addresses.Item2).Show();
+    //     //await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
+    // }
 
     private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
     {
@@ -79,12 +125,34 @@ public partial class MainWindow : Window
 
     private void MnuAbout_OnClick(object? sender, RoutedEventArgs e)
     {
-        throw new NotImplementedException();
+        try
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = "https://mypapercloud.de/logof/",
+                UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
+            });
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
+        }
     }
 
     private void MnuHelp_OnClick(object? sender, RoutedEventArgs e)
     {
-        throw new NotImplementedException();
+        try
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = "https://mypapercloud.de/logof/wiki/",
+                UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
+            });
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
+        }
     }
 
     private void MnuGit_OnClick(object? sender, RoutedEventArgs e)
@@ -115,7 +183,6 @@ public partial class MainWindow : Window
                 new FilePickerFileType(".csv-Datei")
                 {
                     Patterns = new[] { "*.csv" }
-                    //Patterns = new[] { "*" }
                 }
             }
         });
@@ -134,41 +201,27 @@ public partial class MainWindow : Window
             return;
         }
 
-        //var set = new KasAddressList("");
-        //foreach (var adset in Settings._instance.addressSets.addresses)
-        //if (adset.ID == KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItem.ToString()))
         StartAddressCheck(KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItem.ToString()));
-
-
-        // var result = DataImport.ImportKasAddressList(filePath);
-        // if (result.Item1)
-        // {
-        //     var check_result = new AddressCheck().Perform(result.Item2);
-        //     foreach (var item in check_result.Result)
-        //     {
-        //         Console.WriteLine();
-        //         Console.Write(item.Item1 + " ");
-        //         foreach (var error in item.Item2) Console.Write(error + ", ");
-        //     }
-        // }
     }
 
     private void BtnCombine_OnClick(object? sender, RoutedEventArgs e)
     {
         GrdCalcMan.IsVisible = false;
         GrdCombineTypes.IsVisible = true;
+        GrdExportMarginOptions.IsVisible = false;
     }
 
     private void MakeCalcManVisible()
     {
         GrdCalcMan.IsVisible = true;
         GrdCombineTypes.IsVisible = false;
+        GrdExportMarginOptions.IsVisible = false;
     }
 
     private async void StartCombine(Uri path)
     {
         MakeCalcManVisible();
-        var addresses = DataImport.ImportKasAddressList(path);
+        var addresses = await DataImport.ImportKasAddressList(path);
         var progressWindow = new ProgressWindow();
         var address_list = new List<KasAddressList> { addresses.Item2 };
 
@@ -190,8 +243,7 @@ public partial class MainWindow : Window
         if (file == null) return;
 
         //filePath = file[0].Path;
-        foreach (var f in file) address_list.Add(DataImport.ImportKasAddressList(f.Path).Item2);
-
+        foreach (var f in file) address_list.Add((await DataImport.ImportKasAddressList(f.Path)).Item2);
 
         progressWindow.Show(_instance);
 
@@ -200,10 +252,189 @@ public partial class MainWindow : Window
 
 
         progressWindow.Close();
-        //File.WriteAllText(OpenSettingsSaveAsDialog().Result,
-        //new CsvBuilder(
-        //"refsid,anrede,titel,vorname,adel,name,namezus,anredzus,strasse,strasse2,plz,ort,land,pplz,postfach,name1,name2,name3,name4,name5,funktion,funktion2,abteilung,funktionad,lastupdate",
-        //result).BuildKas());
+    }
+
+    private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
+        {
+            _selectedWikiFilePath = item.Path;
+            var text = await _wikiService.LoadFileContentAsync(item.Path);
+            try
+            {
+                PreviewPanel.Children.Clear();
+                var rendered = MarkdownRenderer.Render(text ?? string.Empty);
+                PreviewPanel.Children.Add(rendered);
+            }
+            catch
+            {
+                // fallback: plain text
+                PreviewPanel.Children.Clear();
+                PreviewPanel.Children.Add(new TextBlock { Text = text ?? string.Empty });
+            }
+
+            EditButton.IsEnabled = true;
+        }
+        else
+        {
+            _selectedWikiFilePath = null;
+            EditButton.IsEnabled = false;
+        }
+    }
+
+    public void PopulateNavTree(string? expandToPath = null, string? selectPath = null)
+    {
+        var roots = _wikiService.GetRootItems();
+        var nodes = new List<TreeViewItem>();
+        foreach (var r in roots) nodes.Add(BuildNode(r));
+        NavTree.ItemsSource = nodes;
+
+        if (!string.IsNullOrWhiteSpace(expandToPath))
+            ExpandAndFindNode(nodes, expandToPath, out _);
+
+        if (!string.IsNullOrWhiteSpace(selectPath) &&
+            ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
+            selectedNode != null)
+            NavTree.SelectedItem = selectedNode;
+    }
+
+    private TreeViewItem BuildNode(WikiItem item)
+    {
+        var node = new TreeViewItem { Header = item.Name, Tag = item };
+        if (item.IsFolder)
+            foreach (var c in item.Children)
+                node.Items.Add(BuildNode(c));
+
+        return node;
+    }
+
+    private string GetSelectedWikiTargetDirectory()
+    {
+        var wikiRoot = Global._instance.wiki_storage_path;
+        if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
+        {
+            if (selectedItem.IsFolder) return selectedItem.Path;
+
+            var parentDir = Path.GetDirectoryName(selectedItem.Path);
+            if (!string.IsNullOrWhiteSpace(parentDir)) return parentDir;
+        }
+
+        return wikiRoot;
+    }
+
+    private static bool PathsEqual(string left, string right)
+    {
+        var normalizedLeft = Path.GetFullPath(left)
+            .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        var normalizedRight = Path.GetFullPath(right)
+            .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+
+        var comparison = OperatingSystem.IsWindows()
+            ? StringComparison.OrdinalIgnoreCase
+            : StringComparison.Ordinal;
+        return string.Equals(normalizedLeft, normalizedRight, comparison);
+    }
+
+    private bool ExpandAndFindNode(IEnumerable<TreeViewItem> nodes, string targetPath, out TreeViewItem? foundNode)
+    {
+        foreach (var node in nodes)
+            if (TryExpandToPath(node, targetPath, out foundNode))
+                return true;
+
+        foundNode = null;
+        return false;
+    }
+
+    private bool TryExpandToPath(TreeViewItem node, string targetPath, out TreeViewItem? foundNode)
+    {
+        if (node.Tag is WikiItem item && PathsEqual(item.Path, targetPath))
+        {
+            foundNode = node;
+            return true;
+        }
+
+        foreach (var childRaw in node.Items)
+            if (childRaw is TreeViewItem childNode &&
+                TryExpandToPath(childNode, targetPath, out foundNode))
+            {
+                node.IsExpanded = true;
+                return true;
+            }
+
+        foundNode = null;
+        return false;
+    }
+
+    private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
+    {
+        var path = Global._instance.wiki_storage_path;
+        if (!Directory.Exists(path)) return;
+
+        try
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = path,
+                UseShellExecute = true
+            });
+        }
+        catch
+        {
+        }
+    }
+
+    private async void BtnWikiPath_Click(object? sender, RoutedEventArgs e)
+    {
+        var top = GetTopLevel(this);
+        var folder = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+        {
+            Title = "Wiki Pfad wählen",
+            AllowMultiple = false
+        });
+
+        if (folder == null || folder.Count == 0) return;
+        var chosen = folder[0].Path;
+        TbWikiPath.Text = chosen.ToString();
+        Global._instance.wiki_storage_path = chosen.ToString();
+        Global.Save();
+
+        // reinit wiki service and reload tree
+        _wikiService = new WikiService();
+        PopulateNavTree();
+    }
+
+    private async void BtnFontPath_Click(object? sender, RoutedEventArgs e)
+    {
+        var top = GetTopLevel(this);
+        var folder = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+        {
+            Title = "Font Pfad wählen",
+            AllowMultiple = false
+        });
+
+        if (folder == null || folder.Count == 0) return;
+        var chosen = folder[0].Path;
+        TbFontPath.Text = chosen.ToString();
+        Global._instance.font_path = chosen.ToString();
+        Global.Save();
+    }
+
+    private async void BtnConfigPath_Click(object? sender, RoutedEventArgs e)
+    {
+        var top = GetTopLevel(this);
+        var folder = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+        {
+            Title = "Config Pfad wählen",
+            AllowMultiple = false
+        });
+
+        if (folder == null || folder.Count == 0) return;
+        var chosen = folder[0].Path;
+        TbConfigPath.Text = chosen.ToString();
+        Global._instance.config_path = chosen.ToString();
+        Global.Save();
+
+        MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
     }
 
     private async Task<string> OpenSettingsSaveAsDialog()
@@ -240,22 +471,22 @@ public partial class MainWindow : Window
         }
     }
 
-    private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type)
+    private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type, CombineAddresses.CombineType comb_type)
     {
         var progressWindow = new ProgressWindow();
 
         progressWindow.Show(_instance);
 
         var processor = new CombineAddresses(progressWindow);
-        var result = await processor.Perform(address_lists, type, CbMergeExportUnmerged.IsChecked);
+        var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked);
 
-        if(result.Item1 != null)
+        if (result.Item1 != null)
             result.Item1.owner_id = owner_id;
-        if(result.Item2 != null)
+        if (result.Item2 != null)
             result.Item2.owner_id = owner_id;
-        if(result.Item1 != null)
+        if (result.Item1 != null)
             Settings._instance.addressSets.addresses.Add(result.Item1);
-        if(result.Item2 != null)
+        if (result.Item2 != null)
             Settings._instance.addressSets.addresses.Add(result.Item2);
         Settings.Save();
         progressWindow.Close();
@@ -303,6 +534,7 @@ public partial class MainWindow : Window
             {
                 TbSettingsCustomerDescription.Text = customer.description;
                 TbSettingsCustomerName.Text = customer.name;
+                TbSettingsCustomerSenderAddress.Text = customer.sender_address;
                 TbSettingsCustomerCsvSeparator.Text = customer.separator.ToString();
                 if (customer.patch != null)
                     TbSettingsCustomerPatchInfo.Text = customer.patch.ToString();
@@ -311,6 +543,20 @@ public partial class MainWindow : Window
             }
     }
 
+    private async void EditButton_Click(object? sender, RoutedEventArgs e)
+    {
+        if (string.IsNullOrWhiteSpace(_selectedWikiFilePath))
+        {
+            await MessageBox.Show(this, "Bitte wählen Sie zunächst eine Wiki-Datei aus.", "Keine Datei ausgewählt");
+            return;
+        }
+
+        EditorWindow ew = new(_selectedWikiFilePath);
+        ew.Show();
+
+        //await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
+    }
+
     public void RefreshCustomerItems(int index = 0)
     {
         if (LstCustomers.Items.Count > 0)
@@ -388,7 +634,7 @@ public partial class MainWindow : Window
             {
                 if (customer.patch == null)
                 {
-                    var got = DataImport.ImportKasAddressList(selected_path, null, customer.separator);
+                    var got = await DataImport.ImportKasAddressList(selected_path, null, customer.separator);
                     if (!got.Item1)
                     {
                         Console.WriteLine("Error while importing. Please try another file.");
@@ -404,7 +650,7 @@ public partial class MainWindow : Window
                 }
                 else
                 {
-                    var got = DataImport.ImportKasAddressList(selected_path, customer.patch, customer.separator);
+                    var got = await DataImport.ImportKasAddressList(selected_path, customer.patch, customer.separator);
                     if (!got.Item1)
                     {
                         Console.WriteLine("Error while importing. Please try another file.");
@@ -439,7 +685,7 @@ public partial class MainWindow : Window
         foreach (var k in Settings._instance.addressSets.addresses)
         foreach (var customer in Settings._instance.customers.customers)
             if (customer.ID == k.owner_id && customer.ID == customer_id)
-                LstCustomerAdressSets.Items.Add(k.ID + " - " + k.Name + "(" + k.KasPersons.Count + " Einträge)");
+                LstCustomerAdressSets.Items.Add(k.ID + " - " + k.Name + " (" + k.KasPersons.Count + " Einträge)");
     }
 
     private void LstCustomerAdressSets_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
@@ -457,8 +703,8 @@ public partial class MainWindow : Window
         {
             BtnCheck.IsEnabled = true;
             BtnCombine.IsEnabled = true;
+            BtnGenerateLabels.IsEnabled = true;
 
-            // BtnGenerateLabels.IsEnabled = true;
             // BtnRepair.IsEnabled = true;
             // BtnShorten.IsEnabled = true;
         }
@@ -521,8 +767,14 @@ public partial class MainWindow : Window
         foreach (var item in LstCustomerAdressSets.SelectedItems)
             list.Add(Settings._instance.addressSets.GetAddressSetByID(
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
+        try
+        {
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference", GetCombiningTyp());
+        }
+        catch
+        {
             
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
+        }
     }
 
     private void BtnCombineUnion_OnClick(object? sender, RoutedEventArgs e)
@@ -531,8 +783,15 @@ public partial class MainWindow : Window
         foreach (var item in LstCustomerAdressSets.SelectedItems)
             list.Add(Settings._instance.addressSets.GetAddressSetByID(
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
+        try
+        {
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union", GetCombiningTyp());
+        }
+        catch
+        {
+            
+        }
         
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
     }
 
     private void BtnCombineIntersection_OnClick(object? sender, RoutedEventArgs e)
@@ -541,8 +800,27 @@ public partial class MainWindow : Window
         foreach (var item in LstCustomerAdressSets.SelectedItems)
             list.Add(Settings._instance.addressSets.GetAddressSetByID(
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
+        try
+        {
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
+        }
+        catch
+        {
                 
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
+        }
+    }
+
+    public CombineAddresses.CombineType GetCombiningTyp()
+    {
+        if (RbComprefsid.IsChecked == true)
+        {
+            return CombineAddresses.CombineType.refsid;
+        } else if (RbCompfinAd.IsChecked == true)
+        {
+            return CombineAddresses.CombineType.final_adress;
+        }
+
+        return CombineAddresses.CombineType.none;
     }
 
     private void BtnCombineSymmetricDifference_OnClick(object? sender, RoutedEventArgs e)
@@ -552,6 +830,354 @@ public partial class MainWindow : Window
             list.Add(Settings._instance.addressSets.GetAddressSetByID(
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
 
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff");
+        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff", GetCombiningTyp());
+    }
+
+    private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
+    {
+        GrdCalcMan.IsVisible = false;
+        GrdCombineTypes.IsVisible = false;
+        GrdExportMarginOptions.IsVisible = true;
+        LoadPdfExportOptions();
+    }
+
+    private async void BtnStartGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
+    {
+        SavePdfExportOptions();
+
+        var saveDialog = new SaveFileDialog
+        {
+            DefaultExtension = "pdf",
+            Filters = { new FileDialogFilter { Name = "PDF-Dateien", Extensions = { "pdf" } } }
+        };
+        var filePath = await saveDialog.ShowAsync(this);
+
+        if (!string.IsNullOrEmpty(filePath))
+        {
+            var builder = new PdfBuilder(Settings._instance.pdfExport);
+
+            builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
+                Convert.ToInt32(LstCustomerAdressSets.SelectedItems[0].ToString().Split(" - ")[0]),
+                "Company Logo/Info",
+                filePath
+            );
+            //return true;
+        }
+    }
+
+    private void HookPdfExportOptionEvents()
+    {
+        var controls = GetPdfExportControls();
+        foreach (var control in controls) control.ValueChanged += PdfExportOption_OnValueChanged;
+    }
+
+    private void LoadPdfExportOptions()
+    {
+        var options = Settings._instance.pdfExport ?? new PdfExportSettings();
+
+        NudExpMargCellPaddingTop.Value = (decimal)options.cellPaddingTopMm;
+        NudExpMargCellPaddingBot.Value = (decimal)options.cellPaddingBottomMm;
+        NudExpMargCellPaddingLeft.Value = (decimal)options.cellPaddingLeftMm;
+        NudExpMargCellPaddingRight.Value = (decimal)options.cellPaddingRightMm;
+
+        TbExpMargMarginTop.Value = (decimal)options.pageMarginTopMm;
+        TbExpMargMarginBottom.Value = (decimal)options.pageMarginBottomMm;
+        TbExpMargMarginLeft.Value = (decimal)options.pageMarginLeftMm;
+        TbExpMargMarginRight.Value = (decimal)options.pageMarginRightMm;
+
+        TbExpMargRowsPerPage.Value = options.rowsPerPage;
+        NudExpMargColumnsPerPage.Value = options.columnsPerPage;
+        NudExpMargFontSize.Value = (decimal)options.fontSize;
+        NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
+    }
+
+    private void SavePdfExportOptions()
+    {
+        Settings._instance.pdfExport = new PdfExportSettings
+        {
+            cellPaddingTopMm = ReadDouble(NudExpMargCellPaddingTop),
+            cellPaddingBottomMm = ReadDouble(NudExpMargCellPaddingBot),
+            cellPaddingLeftMm = ReadDouble(NudExpMargCellPaddingLeft),
+            cellPaddingRightMm = ReadDouble(NudExpMargCellPaddingRight),
+            pageMarginTopMm = ReadDouble(TbExpMargMarginTop),
+            pageMarginBottomMm = ReadDouble(TbExpMargMarginBottom),
+            pageMarginLeftMm = ReadDouble(TbExpMargMarginLeft),
+            pageMarginRightMm = ReadDouble(TbExpMargMarginRight),
+            rowsPerPage = ReadInt(TbExpMargRowsPerPage, 7),
+            columnsPerPage = ReadInt(NudExpMargColumnsPerPage, 3),
+            fontSize = ReadDouble(NudExpMargFontSize),
+            smallFontSize = ReadDouble(NudExpMargSmallFontSize)
+        };
+
+        Settings.Save();
+    }
+
+    private void PdfExportOption_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
+    {
+        SavePdfExportOptions();
+    }
+
+    private double ReadDouble(NumericUpDown control)
+    {
+        return (double)(control.Value ?? 0);
+    }
+
+    private int ReadInt(NumericUpDown control, int fallback)
+    {
+        return (int)Math.Round(control.Value ?? fallback);
+    }
+
+    private NumericUpDown[] GetPdfExportControls()
+    {
+        return
+        [
+            NudExpMargCellPaddingTop,
+            NudExpMargCellPaddingBot,
+            NudExpMargCellPaddingLeft,
+            NudExpMargCellPaddingRight,
+            TbExpMargMarginTop,
+            TbExpMargMarginBottom,
+            TbExpMargMarginLeft,
+            TbExpMargMarginRight,
+            TbExpMargRowsPerPage,
+            NudExpMargColumnsPerPage,
+            NudExpMargFontSize,
+            NudExpMargSmallFontSize
+        ];
+    }
+
+    private void TbSettingsCustomerSenderAddress_OnTextChanged(object? sender, TextChangedEventArgs e)
+    {
+        if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
+        foreach (var customer in Settings._instance.customers.customers)
+            if (customer.ID == Settings._instance.customers.current)
+                customer.sender_address = TbSettingsCustomerSenderAddress.Text;
+    }
+
+
+    // Country Section
+    private void BtnSettingsRemoveCountry_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (_selectedCountry != null)
+        {
+            Global._instance.countries.Remove(_selectedCountry);
+            _selectedCountry = null;
+        }
+
+        RefreshCountryView();
+    }
+
+    public void RefreshCountryView()
+    {
+        if (_suppressCountryRefresh) return;
+        try
+        {
+            _suppressCountryRefresh = true;
+
+            Global.Save();
+            var alt_index = LbSettingsAlternatives.SelectedIndex;
+            var country_index = CountryList.SelectedIndex;
+
+            LbSettingsAlternatives.Items.Clear();
+            try
+            {
+                CountryList.Items.Clear();
+            }
+            catch
+            {
+            }
+
+            foreach (var c in Global._instance.countries) CountryList.Items.Add(c.name);
+            try
+            {
+                CountryList.SelectedIndex = country_index;
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                _selectedCountry = Country.GetByName(CountryList.SelectedItems[0].ToString());
+            }
+            catch
+            {
+                _selectedCountry = null;
+            }
+
+            if (_selectedCountry == null) return;
+            //Console.WriteLine("Refreshing alternatives...");
+            foreach (var a in _selectedCountry.alternatives) LbSettingsAlternatives.Items.Add(a);
+            //Console.WriteLine(a);
+            TbSettingsCountryName.Text = _selectedCountry.name;
+            TbSettingsCountryTranslation.Text = _selectedCountry.translation;
+
+            try
+            {
+                LbSettingsAlternatives.SelectedIndex = alt_index;
+            }
+            catch
+            {
+            }
+        }
+        finally
+        {
+            _suppressCountryRefresh = false;
+        }
+    }
+
+    private void BtnSettingsRemoveSelectedAlternatives_OnClick(object? sender, RoutedEventArgs e)
+    {
+        foreach (var selected in LbSettingsAlternatives.SelectedItems)
+            try
+            {
+                _selectedCountry.alternatives.Remove(selected.ToString());
+            }
+            catch
+            {
+                Console.WriteLine("Error while removing country alternative");
+            }
+
+        RefreshCountryView();
+    }
+
+    private void BtnSettingsNewCountryAlternative_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (string.IsNullOrWhiteSpace(TbSettingsNewCountryAlternative.Text)) return;
+        _selectedCountry.alternatives.Add(TbSettingsNewCountryAlternative.Text.Trim());
+        RefreshCountryView();
+    }
+
+    private void TbSettingsCountryTranslation_OnTextChanged(object? sender, TextChangedEventArgs e)
+    {
+        if (!string.IsNullOrWhiteSpace(TbSettingsCountryTranslation.Text))
+        {
+            _selectedCountry.translation = TbSettingsCountryTranslation.Text.Trim();
+            RefreshCountryView();
+        }
+    }
+
+    private void TbSettingsCountryName_OnTextChanged(object? sender, TextChangedEventArgs e)
+    {
+        if (!string.IsNullOrWhiteSpace(TbSettingsCountryName.Text))
+        {
+            _selectedCountry.name = TbSettingsCountryName.Text.Trim();
+            RefreshCountryView();
+        }
+    }
+
+    private void BtnSettingsNewCountry_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (string.IsNullOrWhiteSpace(TbSettingsNewCountry.Text)) return;
+        Global._instance.countries.Add(new Country(TbSettingsNewCountry.Text));
+        RefreshCountryView();
+    }
+
+    private void CountryList_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        _selectedCountry = Country.GetByName(CountryList.SelectedItems[0].ToString());
+        RefreshCountryView();
+    }
+
+    private void BtnSettingsInsertDefaultCountries_OnClick(object? sender, RoutedEventArgs e)
+    {
+        ISO3166.Country[] countries = ISO3166.Country.List;
+        foreach (var countryie in countries)
+            Global._instance.countries.Add(new Country(countryie.Name, countryie.Name,
+                new List<string> { countryie.ThreeLetterCode, countryie.TwoLetterCode }));
+        RefreshCountryView();
+    }
+
+    private async void BtnWikiAddFile_OnClick(object? sender, RoutedEventArgs e)
+    {
+        var result = await NamingWindow.Show(this);
+        if (string.IsNullOrWhiteSpace(result)) return;
+
+        result = result.Trim();
+        if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
+
+        if (!Directory.Exists(Global._instance.wiki_storage_path))
+            Directory.CreateDirectory(Global._instance.wiki_storage_path);
+
+        try
+        {
+            var targetDirectory = GetSelectedWikiTargetDirectory();
+            Directory.CreateDirectory(targetDirectory);
+            var newFilePath = Path.Combine(targetDirectory, result);
+            File.WriteAllText(newFilePath, "");
+            PopulateNavTree(targetDirectory, newFilePath);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(this, ex.StackTrace, "Fehler");
+        }
+    }
+    
+    private async void BtnWikiAddFolder_OnClick(object? sender, RoutedEventArgs e)
+    {
+        var result = await NamingWindow.Show(this);
+        if (string.IsNullOrWhiteSpace(result)) return;
+
+        result = result.Trim();
+        
+        if (!Directory.Exists(Global._instance.wiki_storage_path))
+            Directory.CreateDirectory(Global._instance.wiki_storage_path);
+
+        try
+        {
+            var targetDirectory = GetSelectedWikiTargetDirectory();
+            var newFolderPath = Path.Combine(targetDirectory, result);
+            Directory.CreateDirectory(newFolderPath);
+            PopulateNavTree(targetDirectory, newFolderPath);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(this, ex.StackTrace, "Fehler");
+        }
+    }
+
+
+    private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (LstCustomerAdressSets.SelectedItems.Count > 0)
+            try
+            {
+                var result = await NamingWindow.Show(this);
+                if (result != null)
+                {
+                    var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
+                        .ToString());
+                    var cus_id = Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString());
+                    foreach (var set in Settings._instance.addressSets.addresses)
+                        if (set.ID == id)
+                        {
+                            set.Name = result;
+                            Settings.Save();
+                            RefreshAddressSetListItems(cus_id);
+                            break;
+                        }
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(this, ex.StackTrace, "Fehler");
+            }
+    }
+
+    private void BtnDeleteCustomer_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
+        foreach (var customer in Settings._instance.customers.customers)
+            if (customer.ID == Settings._instance.customers.current)
+                try
+                {
+                    Settings._instance.customers.customers.Remove(customer);
+                    break;
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
+                }
+        RefreshCustomerItems();
     }
 }

NamingWindow.axaml

@@ -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)
+        {
+            Console.WriteLine("Error while showing naming window: " + ex.Message);
+            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"> -->

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

@@ -12,13 +12,16 @@
                    x:Name="LblResultCount" />
             <StackPanel x:Name="StpFilterOptions" Orientation="Vertical" HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch" Margin="10,80,10,0" />
-            <!-- <Button x:Name="BtnUpdateFilter" Content="Aktualisieren" HorizontalAlignment="Stretch" -->
-            <!--         VerticalAlignment="Bottom" Margin="10,0,10,10" Click="BtnUpdateFilter_OnClick" /> -->
+            <Button Content="Filter anwenden" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
+                    x:Name="BtnExecuteFilter" Click="BtnExecuteFilter_OnClick"
+                    Margin="10,10,10,50" />
             <Button Content="Ausgewählte Anzeigen" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
                     x:Name="BtnShowSelected" Click="BtnShowSelected_OnClick"
                     Margin="10,10,10,10" />
         </Grid>
-        <DataGrid x:Name="DgResult" Grid.Column="1" AutoGenerateColumns="True" />
+        <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+            <StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" />
+        </ScrollViewer>
 
     </Grid>
 </Window>

ResultWindow.axaml.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
+using Avalonia.Media;
 
 namespace Logof_Client;
 
@@ -11,10 +13,10 @@ public partial class ResultWindow : Window
 {
     public List<CheckBox> errortypecheckboxes = new();
     public KasAddressList ur_addresses = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
-    public List<KasPersonError> ur_result;
+    public List<KasPerson> ur_result;
     public List<CheckBox> warningtypecheckboxes = new();
 
-    public ResultWindow(List<KasPersonError> result,
+    public ResultWindow(List<KasPerson> result,
         int addressSetID)
     {
         InitializeComponent();
@@ -24,18 +26,54 @@ public partial class ResultWindow : Window
         //ViewSingle(200552426);
     }
 
-    private void GenerateView(List<KasPersonError> result)
+    private void GenerateView(List<KasPerson> result)
     {
-        // var errors = new List<KasPersonError>();
-        //foreach (var single_result in result) errors.Add(single_result);
-        LblResultCount.Content = $"{result.Count}/{ur_result.Count} Ergebnisse";
-        DgResult.ItemsSource = result;
+        // 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";
+
+        StkResults.Children.Clear();
+        foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
     }
 
-    private void ViewSingle(int refsid)
+    private Grid CreatePersonGrid(KasPerson person)
+    {
+        var grid = new Grid
+        {
+            ColumnDefinitions = ColumnDefinitions.Parse("100,*,100,*,100,*"),
+            RowDefinitions = RowDefinitions.Parse("Auto"),
+            Margin = new Thickness(0, 5, 0, 5),
+            Background = new SolidColorBrush(Color.Parse("#F0F0F0"))
+        };
+
+        // ID
+        grid.Children.Add(new TextBlock
+        {
+            Text = "id: ",
+            FontWeight = FontWeight.Bold, Margin = new Thickness(5)
+        });
+        grid.Children.Add(new TextBlock { Text = person.id.ToString(), Margin = new Thickness(5) });
+        Grid.SetColumn(grid.Children[1], 1);
+
+        // PLZ
+        grid.Children.Add(new TextBlock { Text = "plz:", FontWeight = FontWeight.Bold, Margin = new Thickness(5) });
+        Grid.SetColumn(grid.Children[2], 2);
+        grid.Children.Add(new TextBlock { Text = person.plz, Margin = new Thickness(5) });
+        Grid.SetColumn(grid.Children[3], 3);
+
+        // PPLZ
+        grid.Children.Add(new TextBlock { Text = "errors:", FontWeight = FontWeight.Bold, Margin = new Thickness(5) });
+        Grid.SetColumn(grid.Children[4], 4);
+        grid.Children.Add(new TextBlock { Text = person.PersonError.GetString(), Margin = new Thickness(5) });
+        Grid.SetColumn(grid.Children[5], 5);
+
+        return grid;
+    }
+
+    private void ViewSingle(int id)
     {
         foreach (var result in ur_addresses.KasPersons)
-            if (result.refsid == refsid)
+            if (result.id == id)
             {
                 var wind = new Window();
                 var stp = new StackPanel();
@@ -44,8 +82,8 @@ public partial class ResultWindow : Window
                 var tb = new TextBlock();
                 var tb2 = new TextBlock();
                 tb.Text =
-                    "refsid:\nanrede:\ntitel:\nvorname:\nadel:\nname:\nnamezus:\nanredzus:\nstrasse:\nstrasse2:\nplz:\nort:\nland:\npplz:\npostfach:\nname1:\nname2:\nname3:\nname4:\nname5:\nfunktion:\nfunktion2:\nabteilung:\nfunktionad:";
-                tb2.Text = result.refsid + "\n" + result.anrede + "\n" + result.titel + "\n" + result.vorname + "\n" +
+                    "id:\nanrede:\ntitel:\nvorname:\nadel:\nname:\nnamezus:\nanredzus:\nstrasse:\nstrasse2:\nplz:\nort:\nland:\npplz:\npostfach:\nname1:\nname2:\nname3:\nname4:\nname5:\nfunktion:\nfunktion2:\nabteilung:\nfunktionad:";
+                tb2.Text = result.id + "\n" + result.anrede + "\n" + result.titel + "\n" + result.vorname + "\n" +
                            result.adel + "\n" + result.name + "\n" + result.namezus + "\n" + result.anredzus + "\n" +
                            result.strasse + "\n" + result.strasse2 + "\n" + result.plz + "\n" + result.ort + "\n" +
                            result.land + "\n" + result.pplz + "\n" + result.postfach + "\n" + result.name1 + "\n" +
@@ -62,18 +100,20 @@ public partial class ResultWindow : Window
             }
     }
 
-    private void Load(List<KasPersonError> result)
+    private void Load(List<KasPerson> result)
     {
         var knownErrors = new List<AddressCheck.ErrorTypes>();
         var knownWarnings = new List<AddressCheck.WarningTypes>();
 
-        foreach (var single_result in result)
+        foreach (var person in result)
         {
-            foreach (var errtyp in single_result.errors)
+            if (person.PersonError == null) continue;
+
+            foreach (var errtyp in person.PersonError.errors)
                 if (!knownErrors.Contains(errtyp))
                     knownErrors.Add(errtyp);
 
-            foreach (var wartyp in single_result.warnings)
+            foreach (var wartyp in person.PersonError.warnings)
                 if (!knownWarnings.Contains(wartyp))
                     knownWarnings.Add(wartyp);
         }
@@ -84,7 +124,7 @@ public partial class ResultWindow : Window
             var cb = new CheckBox();
             cb.IsChecked = true;
             cb.Content = errtype.ToString();
-            cb.Click += (sender, e) => UpdateFilter();
+            //cb.Click += (sender, e) => UpdateFilter();
             errortypecheckboxes.Add(cb);
             StpFilterOptions.Children.Add(cb);
         }
@@ -94,7 +134,7 @@ public partial class ResultWindow : Window
             var cb = new CheckBox();
             cb.IsChecked = true;
             cb.Content = wartype.ToString();
-            cb.Click += (sender, e) => UpdateFilter();
+            //cb.Click += (sender, e) => UpdateFilter();
             warningtypecheckboxes.Add(cb);
             StpFilterOptions.Children.Add(cb);
         }
@@ -108,49 +148,81 @@ public partial class ResultWindow : Window
 
     private void UpdateFilter()
     {
-        var temp_result = new List<KasPersonError>();
-        var checked_types = new List<AddressCheck.ErrorTypes>();
-        var checked_types_war = new List<AddressCheck.WarningTypes>();
+        var temp_result = new List<KasPerson>();
+
+        var checkedErrors = new HashSet<AddressCheck.ErrorTypes>();
+        var checkedWarnings = new HashSet<AddressCheck.WarningTypes>();
+
+        // safer parsing: use TryParse and trim the Content string
         foreach (var cb in errortypecheckboxes)
             if (cb.IsChecked == true)
-                checked_types.Add(
-                    (AddressCheck.ErrorTypes)Enum.Parse(typeof(AddressCheck.ErrorTypes), cb.Content.ToString()));
+            {
+                var s = cb.Content?.ToString()?.Trim();
+                if (!string.IsNullOrEmpty(s) &&
+                    Enum.TryParse<AddressCheck.ErrorTypes>(s, true, out var et))
+                    checkedErrors.Add(et);
+            }
 
         foreach (var cb in warningtypecheckboxes)
             if (cb.IsChecked == true)
-                checked_types_war.Add(
-                    (AddressCheck.WarningTypes)Enum.Parse(typeof(AddressCheck.WarningTypes), cb.Content.ToString()));
+            {
+                var s = cb.Content?.ToString()?.Trim();
+                if (!string.IsNullOrEmpty(s) &&
+                    Enum.TryParse<AddressCheck.WarningTypes>(s, true, out var wt))
+                    checkedWarnings.Add(wt);
+            }
 
-        foreach (var sres in ur_result)
-        {
-            foreach (var err in sres.errors)
-                if (checked_types.Contains(err) && !temp_result.Contains(sres))
-                    temp_result.Add(sres);
+        // If no checkboxes are selected, show all persons with errors (default behavior)
+        if (checkedErrors.Count == 0 && checkedWarnings.Count == 0)
+            temp_result = ur_result.Where(p => p.PersonError != null).ToList();
+        else
+            foreach (var person in ur_result)
+            {
+                if (person.PersonError == null) continue;
 
-            foreach (var war in sres.warnings)
-                if (checked_types_war.Contains(war) && !temp_result.Contains(sres))
-                    temp_result.Add(sres);
-        }
+                var personErrors = person.PersonError.errors ?? Enumerable.Empty<AddressCheck.ErrorTypes>();
+                var personWarnings = person.PersonError.warnings ?? Enumerable.Empty<AddressCheck.WarningTypes>();
 
+                var matchesError = false;
+                var matchesWarning = false;
 
-        //var errors = new List<KasPersonError>();
-        //foreach (var single_result in temp_result) errors.Add(new KasPersonError(single_result));
+                // only test errors if the user selected error-types
+                if (checkedErrors.Count > 0)
+                    matchesError = personErrors.Any(err => checkedErrors.Contains(err));
+
+                // only test warnings if the user selected warning-types
+                if (checkedWarnings.Count > 0)
+                    matchesWarning = personWarnings.Any(war => checkedWarnings.Contains(war));
+
+                // If at least one category matches (OR across categories), include person
+                if ((matchesError || matchesWarning) && !temp_result.Contains(person))
+                    temp_result.Add(person);
+            }
 
         LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
-        DgResult.ItemsSource = temp_result;
+
+        StkResults.Children.Clear();
+        foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
     }
 
+
     private void BtnShowSelected_OnClick(object? sender, RoutedEventArgs e)
     {
-        foreach (var selected in DgResult.SelectedItems)
-            try
-            {
-                var _asKas = (KasPersonError)selected;
-                ViewSingle(_asKas.refsid);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
+        // foreach (var selected in DgResult.SelectedItems)
+        //     try
+        //     {
+        //         var _asKas = (KasPerson)selected;
+        //         ViewSingle(_asKas.id);
+        //     }
+        //     catch (Exception ex)
+        //     {
+        //         Console.WriteLine(ex.Message);
+        //     }
+    }
+
+    private void BtnExecuteFilter_OnClick(object? sender, RoutedEventArgs e)
+    {
+        Console.WriteLine("Updating filter...");
+        UpdateFilter();
     }
 }

Tasks/AddressCheck.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Threading;
@@ -35,217 +36,229 @@ public class AddressCheck
         _progress = progressWindow;
     }
 
-    public async Task<List<KasPersonError>> Perform(int id)
+    public async Task<List<KasPerson>> Perform(int id)
     {
-        foreach (var adset in Settings._instance.addressSets.addresses)
-            if (adset.ID == id)
+        // 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)
             {
-                var failed_refsids = new List<KasPersonError>();
-                var total = adset.KasPersons.Count;
-                var current = 0;
-
-                await Task.Run(async () =>
-                {
-                    foreach (var person in adset.KasPersons)
-                    {
-                        var errors = new List<ErrorTypes>();
-                        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;
-                            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);
-                            // }
-                        }
-
-
-                        // PPLZ-Prüfung
-                        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);
-                            }
-                            
-                            // 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 (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);
-                            }
-
-                            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);
-                        }
-
-                        if (hasFaults)
-                            lock (failed_refsids)
-                            {
-                                failed_refsids.Add(new KasPersonError((person.refsid, errors, warnings)));
-                            }
-
-                        // Fortschritt aktualisieren
-                        Interlocked.Increment(ref current);
-                        var percent = current / (double)total * 100;
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                        {
-                            if (hasFaults)
-                                _progress.AddToLog($"Person mit refsid {person.refsid} ist fehlerhaft");
-
-                            _progress.ChangePercentage(percent);
-                        });
-                    }
-                });
-                adset.errors = failed_refsids;
-                Settings.Save();
-                return failed_refsids;
+                adset_index = i;
+                break;
             }
 
-        return null;
+        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)
+            {
+                var errors = new List<ErrorTypes>();
+                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;
+                    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);
+                    // }
+                }
+
+
+                // PPLZ-Prüfung
+                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);
+                    }
+
+                    // 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 (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);
+                    }
+
+                    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);
+                }
+
+                if (hasFaults)
+                    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));
+                    }
+
+                // 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");
+
+                    _progress.ChangePercentage(percent);
+                });
+            }
+        });
+
+        Settings.Save();
+
+        // Return only the persons with errors from the address set
+        return Settings._instance.addressSets.addresses[adset_index].KasPersons
+            .Where(p => p.PersonError != null)
+            .ToList();
     }
 }

Tasks/AddressCreation.cs

@@ -1,59 +1,10 @@
 using System;
 using System.Linq;
-using System.Runtime.InteropServices.JavaScript;
 
 namespace Logof_Client;
 
 public static class AddressCreator
 {
-    /// <summary>
-    /// Creates max-seven-lines-long markdown address-string. Analyzes the KasPerson-Instance to find the best result.
-    /// </summary>
-    /// <param name="refsid">KasPerson-ID</param>
-    /// <returns>A markdown string with the address that is maximum seven lines long</returns>
-    public static string? CreateFinalMarkdownString2(int refsid)
-    {
-        // Maximum seven lines of information
-        
-        // find the address
-        KasPerson address = new KasPerson();
-        string string_address = "";
-        int address_line_count = 0;
-        foreach (var set in Settings._instance.addressSets.addresses)
-        {
-            var temp = set.KasPersons.FirstOrDefault(obj => obj.refsid == refsid);
-            if (temp != null) break;
-        }
-
-        // no address found
-        if (address == null)
-        {
-            return null;
-        }
-        
-        // let's get started: the name (and anrede), block-line-count: 1
-        if (!string.IsNullOrEmpty(address.anrede))
-        {
-            if(address.anrede == "Herr") string_address += "Herrn";
-            else string_address += address.anrede;
-            address_line_count++;
-        }
-        if (!string.IsNullOrEmpty(address.name) && !string.IsNullOrEmpty(address.vorname))
-        {
-            string_address += " " + address.vorname + " " + address.name;
-        } else if (!string.IsNullOrEmpty(address.name))
-        {
-            
-        }
-        else // Anrede but no name? to the trash!
-        {
-            string_address = "";
-            address_line_count = 0;
-        }
-        
-        return "Hier könnte eine\nAdresse stehen";
-    }
-    
     //+++ Aufbau +++
     //  
     // Von unten anfangen, max. 7 Zeilen
@@ -85,36 +36,68 @@ public static class AddressCreator
     // Auswurf PDF mit PvSt.
 
     /// <summary>
-    /// Creates max-seven-lines-long markdown address-string. Analyzes the KasPerson-Instance to find the best result.
+    ///     Creates max-seven-lines-long Markdown address-string. Analyzes the KasPerson-Instance to find the best result.
     /// </summary>
     /// <param name="refsid">KasPerson-ID</param>
-    /// <returns>A markdown string with the address that is maximum seven lines long</returns>
-    public static string? CreateFinalMarkdownString(int refsid)
+    /// <returns>A Markdown string with the address that is maximum seven lines long</returns>
+    public static string? CreateFinalMarkdownString(int id)
     {
         // Maximum seven lines of information
 
         // find the address
-        KasPerson address = new KasPerson();
-        string string_address = "";
-        int address_line_count = 0;
+        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.refsid == refsid);
-            if (temp != null) break;
+            var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
+            if (temp != null)
+            {
+                address = temp;
+                break;
+            }
         }
 
         // no address found
-        if (address == null)
-        {
-            return null;
-        }
+        if (address == null) return null;
 
         // let's get started: we start from the bottom
-        // if the country is not germany, set it
-        // LAND: GER oder DE
-        if (address.land.ToLower().Trim() != "germany" && address.land.ToLower().Trim() != "ger" && address.land.ToLower().Trim() != "" && address.land.ToLower().Trim() != "de" && address.land.ToLower().Trim() != "deutschland")
+        // 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)
         {
-            string_address = "**" + address.land.Trim() + "**"; // Needs to be bold
+            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();
+                            if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
+                            {
+                                countryToShow = string.IsNullOrWhiteSpace(country.translation)
+                                    ? country.name
+                                    : country.translation;
+                                goto CountryFound;
+                            }
+                        }
+                        catch
+                        {
+                            // ignore malformed alternative
+                        }
+                }
+
+            CountryFound:
+            string_address = "**" + countryToShow + "**"; // Needs to be bold
             address_line_count++;
         }
 
@@ -125,84 +108,145 @@ public static class AddressCreator
             address_line_count++;
             if (!string.IsNullOrWhiteSpace(address.postfach))
             {
-                string_address = address.postfach.Trim() + "\n" + string_address;
+                string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
                 address_line_count++;
             }
-            else
+            else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
             {
                 string_address = address.strasse.Trim() + "\n" + string_address;
                 address_line_count++;
             }
 
-            if (!string.IsNullOrWhiteSpace(address.anredzus))
+            var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
+                address.adel, address.name, address.namezus);
+
+            if (!string.IsNullOrWhiteSpace(nameline))
             {
-                string_address = address.anredzus.Trim() + " " + address.titel.Trim()+ " " + address.vorname.Trim()+ " " + address.adel.Trim() + " " + address.name.Trim()+ " (" + address.namezus.Trim() + ")\n" + string_address;
-                address_line_count++;
-            }
-            else
-            {
-                string_address = address.anrede.Trim() + " " + address.titel.Trim()+ " " + address.vorname.Trim()+ " " + address.adel.Trim() + " " + address.name.Trim()+ " (" + address.namezus.Trim() + ")\n" + string_address;
+                string_address = nameline + "\n" + string_address;
                 address_line_count++;
             }
 
-            string[] nameattribs = new[] { address.name1, address.name2, address.name3, address.name4, address.name5 };
+            // REIHENFOLGE
+            var nameattribs = new[]
+                { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
 
-            for (int i = 0; i < nameattribs.Length-1; i++)
-            {
-                if (address_line_count < 7)
+            var names = "";
+            for (var i = 0; i < nameattribs.Length; i++)
+                try
                 {
+                    if (address_line_count >= 7) break;
                     if (!string.IsNullOrWhiteSpace(nameattribs[i]))
                     {
-                        string_address += nameattribs[i] + "\n" + string_address;
+                        names += "\n" + nameattribs[i];
                         address_line_count++;
                     }
                 }
-                else break;
-            }
+                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++;
+            }
 
-        }
-        else // Error-Handling?
-        {
+            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++;
+            }
 
-        return string_address;
-        return "Hier könnte eine\nAdresse stehen";
+            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))
+            return string.Join(" ",
+                       new[] { anredezus, titel, vorname, adel, name }
+                           .Where(s => !string.IsNullOrWhiteSpace(s))
+                   )
+                   + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
+
+        // else 
+        return string.Join(" ",
+                   new[] { anrede, titel, vorname, adel, name }
+                       .Where(s => !string.IsNullOrWhiteSpace(s))
+               )
+               + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
     }
 
     /// <summary>
-    /// Returns true if a plz (or pplz) is valid
+    ///     Returns true if a plz (or pplz) is valid
     /// </summary>
     /// <param name="plz">the plz itself</param>
     /// <param name="land">country, to check the plz</param>
     /// <returns>true or faslse, depending on result :+1:</returns>
     public static bool CheckPLZ(string plz, string land)
     {
-        if (plz == null) return false;
-        if (land.ToLower().Trim() != "germany" && land.ToLower().Trim() != "ger" && land.ToLower().Trim() != "" && land.ToLower().Trim() != "de" && land.ToLower().Trim() != "deutschland")
-        {
-            // if country is not germany... how should we check for a valid plz?
+        if (string.IsNullOrWhiteSpace(plz)) return false;
 
-            // temporarily accept all of them
-            return true;
-        }
+        var trimmedPlz = plz.Trim();
+        var trimmedLand = land.ToLower().Trim();
 
-        try
-        {
-            int iplz = Convert.ToInt32(plz);
-            if (iplz > 999999 || iplz < 10000)
+        // Check if it's a German country code
+        var isGermany = trimmedLand == "germany" || trimmedLand == "ger" || trimmedLand == "de" ||
+                        trimmedLand == "deutschland" || trimmedLand == "";
+
+        if (isGermany)
+            // For Germany (including empty land), accept numeric postal codes with 5 digits
+            try
+            {
+                var iplz = Convert.ToInt32(trimmedPlz);
+                if (trimmedPlz.Length == 5) return true;
+                return false;
+            }
+            catch
             {
                 return false;
             }
-            return true;
-            
-        } catch
-        {
-            return false;
-        }
 
+        // For non-German countries, accept any non-empty postal code
+        return true;
     }
 }

Tasks/CombineAddresses.cs

@@ -16,39 +16,22 @@ public class CombineAddresses
         _progress = progressWindow;
     }
     
-    public async Task<(KasAddressList,KasAddressList)> Perform(List<KasAddressList> address_lists, string type, bool? exportUnused)
+    public enum CombineType
     {
-        var res = await Task.Run(async () =>
-        {
-            if (type == "difference") return Difference(address_lists, exportUnused);
-            if (type == "union") return Union(address_lists, exportUnused);
-            if (type == "intersection") return Intersection(address_lists, exportUnused);
-            if (type == "symdiff") return SymmetricDifference(address_lists, exportUnused);
+        refsid,
+        final_adress,
+        none
+    }
 
-            return null;
-        });
+    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
+        bool? exportUnused)
+    {
+        if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
+        if (type == "union") return await Union(address_lists, comb_type, exportUnused);
+        if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
+        if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
 
-
-        return 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);
+        return (null, null);
     }
 
 
@@ -59,10 +42,12 @@ public class CombineAddresses
     /// <param name="second">Second address to compare</param>
     /// <param name="only_refsid">If true, only a refsid-check will be done</param>
     /// <returns></returns>
-    public bool CompareAddresses(KasPerson first, KasPerson second, bool only_refsid = false)
+    public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
     {
-        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 &&
@@ -91,11 +76,12 @@ public class CombineAddresses
         return false;
     }
 
-    public async Task<(KasAddressList,KasAddressList)> Difference(List<KasAddressList> address_lists, bool? return_unused,
+    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)
-            return (new KasAddressList(KasAddressList.GenerateName("difference")),null);
+            return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
 
         progress ??= new Progress
         {
@@ -107,12 +93,14 @@ public class CombineAddresses
         var restUnion = new List<KasPerson>();
         for (var i = 1; i < address_lists.Count; i++)
             restUnion.AddRange(address_lists[i].KasPersons);
-        var result = new KasAddressList(KasAddressList.GenerateName("difference"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("difference_rest"));
+        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));
+            var isDouble = restUnion.Any(p => CompareAddresses(person, p, comb_type));
             if (!isDouble)
                 result.KasPersons.Add(person);
             else
@@ -122,21 +110,25 @@ public class CombineAddresses
             progress.Increment();
             if (progress.LogAction == null) continue;
             var logMessage =
-                $"Person mit refsid {person.refsid} verglichen mit {restUnion.Count} Personen des Restes.";
+                $"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);
-        else return (result, null);
+
+        if (return_unused == true) return (result, second_result);
+        return (result, null);
     }
 
 
-    public async Task<(KasAddressList,KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
+    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"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("union_rest"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("union"));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true)
+            second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
-            return (result,null);
+            return (result, null);
 
         var total = address_lists.Sum(l => l.KasPersons.Count);
         var processed = 0;
@@ -144,7 +136,7 @@ public class CombineAddresses
         foreach (var list in address_lists)
         foreach (var person in list.KasPersons)
         {
-            if (!result.KasPersons.Any(existing => CompareAddresses(existing, person)))
+            if (!result.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)))
                 result.KasPersons.Add(person);
             else
                 second_result.KasPersons.Add(person);
@@ -152,7 +144,7 @@ public class CombineAddresses
             processed++;
             var percent = processed / (double)total * 100;
             var logMessage =
-                $"{percent:F1}%: Person mit {person.refsid} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
+                $"{percent:F1}%: Person mit {person.id} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
 
             if (progress == null) continue;
             if (Dispatcher.UIThread.CheckAccess())
@@ -161,8 +153,8 @@ public class CombineAddresses
                 Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
         }
 
-        if(return_unused == true) return (result,second_result);
-        else return (result, null);
+        if (return_unused == true) return (result, second_result);
+        return (result, null);
     }
 
 
@@ -171,13 +163,15 @@ public class CombineAddresses
         return null;
     }
 
-    public async Task<(KasAddressList,KasAddressList)> Intersection(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
+    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"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("intersection_rest"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
-            return (result,null);
+            return (result, null);
 
         // Nur die erste Liste als Ausgangspunkt verwenden
         var baseList = address_lists[0];
@@ -190,7 +184,7 @@ public class CombineAddresses
         {
             // Prüfen, ob Person in *allen* anderen Listen vorkommt
             var isInAll = otherLists.All(list =>
-                list.KasPersons.Any(existing => CompareAddresses(existing, person)));
+                list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
 
             if (isInAll)
                 result.KasPersons.Add(person);
@@ -200,7 +194,7 @@ public class CombineAddresses
             processed++;
             var percent = processed / (double)total * 100;
             var logMessage =
-                $"{percent:F1}%: Person mit {person.refsid} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
+                $"{percent:F1}%: Person mit {person.id} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
 
             // Sicher und nicht blockierend loggen
             if (progress != null)
@@ -212,15 +206,17 @@ public class CombineAddresses
             }
         }
 
-        if(return_unused == true) return (result,second_result);
-        else return (result, null);
+        if (return_unused == true) return (result, second_result);
+        return (result, null);
     }
 
 
-    public async Task<(KasAddressList,KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
+    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"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("symmetric_rest"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -235,7 +231,7 @@ public class CombineAddresses
         foreach (var person in list.KasPersons)
         {
             // Prüfen, ob schon vorhanden
-            var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person));
+            var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person, comb_type));
             if (existing.person != null)
             {
                 // Falls schon drin → Vorkommen erhöhen
@@ -251,7 +247,7 @@ public class CombineAddresses
             processed++;
             var percent = processed / (double)total * 100;
             var logMessage =
-                $"{percent:F1}%: Person mit {person.refsid} verarbeitet (Zwischengröße {allPersons.Count})";
+                $"{percent:F1}%: Person mit {person.id} verarbeitet (Zwischengröße {allPersons.Count})";
 
             if (progress != null)
             {
@@ -269,69 +265,10 @@ public class CombineAddresses
             else
                 second_result.KasPersons.Add(person);
 
-        if(return_unused == true) return (result,second_result);
-        else return (result, null);
+        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 ImportKasAddressListWithPatch(pathToCsv, patch, separator);
+            return await ImportKasAddressListWithoutPatch(pathToCsv, 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,7 +34,8 @@ public class DataImport
             return (false, null);
         }
 
-        var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
+        var imported = new KasAddressList(
+            await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
 
         while (!reader.EndOfStream)
         {
@@ -40,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)
             {
@@ -50,7 +53,7 @@ public class DataImport
 
             try
             {
-                var person = new KasPerson(
+                var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count),
                     ParseInt(parts[0]),
                     parts[1],
                     parts[2],
@@ -89,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))
@@ -106,9 +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 = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
+        var imported = new KasAddressList(
+            await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
         var patchType = typeof(AddressPatch);
         var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
 
@@ -116,7 +120,7 @@ public class DataImport
             .Where(p => p.PropertyType == typeof(bool) && p.Name.StartsWith("has_", StringComparison.OrdinalIgnoreCase))
             .ToArray();
 
-        var last_refsid = 1000000;
+        //var last_refsid = 1000000;
 
         while (!reader.EndOfStream)
         {
@@ -124,11 +128,11 @@ 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);
 
-            var refsid_existing = false;
+            //var refsid_existing = false;
 
             foreach (var hasProp in hasProperties)
             {
@@ -177,16 +181,13 @@ public class DataImport
                 return fieldValues.TryGetValue(name, out var v) ? v : "";
             }
 
-            var new_refsid = last_refsid;
-            if (!patch.has_refsid)
-                new_refsid = GenerateNewRefsid();
-            else
-                new_refsid = ParseInt(GetField("refsid"));
+            var refsid = 0;
+            if (patch.has_refsid)
+                refsid = ParseInt(GetField("refsid"));
 
             try
             {
-                var person = new KasPerson(
-                    new_refsid,
+                var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count), refsid,
                     GetField("anrede"),
                     GetField("titel"),
                     GetField("vorname"),
@@ -224,23 +225,17 @@ public class DataImport
 
         return (true, imported);
 
-        int GenerateNewRefsid()
-        {
-
-            int biggest = last_refsid;
-            foreach (var set in Settings._instance.addressSets.addresses)
-            {
-                foreach (var address in set.KasPersons)
-                {
-                    if (biggest < address.refsid)
-                    {
-                        biggest = address.refsid+1;
-                    }
-                }
-            }
-            last_refsid = biggest+1;
-            return last_refsid;
-        }
+        // int GenerateNewRefsid()
+        // {
+        //     var biggest = last_refsid;
+        //     foreach (var set in Settings._instance.addressSets.addresses)
+        //     foreach (var address in set.KasPersons)
+        //         if (biggest < address.id)
+        //             biggest = address.id + 1;
+        //
+        //     last_refsid = biggest + 1;
+        //     return last_refsid;
+        // }
     }
 
 
@@ -248,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

@@ -0,0 +1,390 @@
+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
+{
+    private readonly PdfExportSettings _settings;
+    private readonly XFont _boldFont;
+    private readonly XFont _regularFont;
+    private readonly XFont _smallFont;
+
+    public PdfBuilder(PdfExportSettings? settings = null)
+    {
+        EnsureFontResolverRegistered();
+        _settings = settings ?? new PdfExportSettings();
+
+        // Select first font from build output fonts folder (AppContext.BaseDirectory/fonts)
+        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";
+        }
+
+        _boldFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Bold);
+        _regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
+        _smallFont = new XFont(chosenFamily, _settings.smallFontSize, XFontStyleEx.Regular);
+    }
+
+    private static void EnsureFontResolverRegistered()
+    {
+        if (GlobalFontSettings.FontResolver != null) return;
+        //var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
+        GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
+    }
+
+    private static string StripStyleSuffix(string name)
+    {
+        if (string.IsNullOrEmpty(name)) return name;
+        var idx = name.IndexOf('-');
+        if (idx < 0) idx = name.IndexOf('_');
+        if (idx > 0)
+            return name.Substring(0, idx);
+        return name;
+    }
+
+
+    /// <summary>
+    ///     Creates a PDF document with address stickers from an AddressSet with a placeholder in the first cell.
+    /// </summary>
+    /// <param name="addressSetId">The ID of the AddressSet to use</param>
+    /// <param name="placeholderText">Text for the first cell (top-left)</param>
+    /// <param name="outputPath">Path where the PDF should be saved</param>
+    public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText,
+        string outputPath)
+    {
+        // Find the AddressSet by ID
+        var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
+        if (addressSet == null)
+            throw new ArgumentException($"AddressSet with ID {addressSetId} not found");
+
+        if (addressSet.KasPersons == null || addressSet.KasPersons.Count == 0)
+            throw new ArgumentException($"AddressSet with ID {addressSetId} contains no addresses");
+
+        // Generate markdown addresses from all KasPersons in the set
+        //var addresses = new string?[addressSet.KasPersons.Count];
+        var addresses = new List<string>();
+
+        // find customer (owner) to include sender_address
+        string senderLine = null;
+        try
+        {
+            var owner = Settings._instance.customers.customers.FirstOrDefault(c => c.ID == addressSet.owner_id);
+            if (owner != null && !string.IsNullOrWhiteSpace(owner.sender_address))
+                senderLine = "<font6>" + owner.sender_address.Replace("\n", " ").Trim() + "</font6>\n";
+        }
+        catch
+        {
+            senderLine = null;
+        }
+
+        for (var i = 0; i < addressSet.KasPersons.Count; i++)
+        {
+            var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
+            if (string.IsNullOrWhiteSpace(addr)) continue;
+            if (!string.IsNullOrEmpty(senderLine))
+                addresses.Add(senderLine + (addr ?? ""));
+            else
+                addresses.Add(addr);
+        }
+
+        CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
+    }
+
+    /// <summary>
+    ///     Creates a PDF document with a single placeholder cell for other information.
+    /// </summary>
+    /// <param name="addresses">Array of addresses</param>
+    /// <param name="placeholderText">Text for the first cell (top-left)</param>
+    /// <param name="outputPath">Path where the PDF should be saved</param>
+    public void CreateAddressLabelPdfWithPlaceholder(List<string> addresses, string placeholderText, string outputPath)
+    {
+        if (addresses == null || addresses.Count == 0)
+            throw new ArgumentException("Addresses array cannot be null or empty");
+
+        var document = new PdfDocument();
+
+        var addressIndex = 0;
+        var isFirstCell = true;
+
+        while (addressIndex < addresses.Count || isFirstCell)
+        {
+            var page = document.AddPage();
+            page.Size = PageSize.A4;
+
+            using (var gfx = XGraphics.FromPdfPage(page))
+            {
+                DrawPageWithPlaceholder(gfx, addresses, ref addressIndex, ref isFirstCell, placeholderText);
+            }
+        }
+
+        document.Save(outputPath);
+    }
+
+    private void DrawPage(XGraphics gfx, List<string> addresses, ref int addressIndex)
+    {
+        for (var row = 0; row < _settings.rowsPerPage; row++)
+        {
+            for (var col = 0; col < _settings.columnsPerPage; col++)
+            {
+                if (addressIndex >= addresses.Count) break;
+
+                var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
+                var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
+
+                DrawCell(gfx, x, y, addresses[addressIndex]);
+                addressIndex++;
+            }
+
+            if (addressIndex >= addresses.Count) break;
+        }
+    }
+
+    private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
+        ref bool isFirstCell, string placeholderText)
+    {
+        for (var row = 0; row < _settings.rowsPerPage; row++)
+        for (var col = 0; col < _settings.columnsPerPage; col++)
+        {
+            var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
+            var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
+
+            // First cell: placeholder
+            if (isFirstCell)
+            {
+                DrawCell(gfx, x, y, placeholderText);
+                isFirstCell = false;
+            }
+            else if (addressIndex < addresses.Count)
+            {
+                DrawCell(gfx, x, y, addresses[addressIndex]);
+                addressIndex++;
+            }
+            else
+            {
+                DrawEmptyCell(gfx, x, y);
+            }
+        }
+    }
+
+    private void DrawCell(XGraphics gfx, double x, double y, string? address)
+    {
+        var cellWidthPoints = MmToPoints(GetCellWidthMm());
+        var cellHeightPoints = MmToPoints(GetCellHeightMm());
+
+        // Draw cell border
+        var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
+        gfx.DrawRectangle(XPens.Black, rect);
+
+        // Draw address content if available
+        if (!string.IsNullOrEmpty(address)) DrawMarkdownText(gfx, address, x, y, cellWidthPoints, cellHeightPoints);
+    }
+
+    private void DrawEmptyCell(XGraphics gfx, double x, double y)
+    {
+        var cellWidthPoints = MmToPoints(GetCellWidthMm());
+        var cellHeightPoints = MmToPoints(GetCellHeightMm());
+
+        var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
+        gfx.DrawRectangle(XPens.Black, rect);
+    }
+
+    private void DrawMarkdownText(XGraphics gfx, string text, double x, double y, double cellWidth, double cellHeight)
+    {
+        var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
+        var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
+        var paddingTopPoints = MmToPoints(_settings.cellPaddingTopMm);
+        var paddingBottomPoints = MmToPoints(_settings.cellPaddingBottomMm);
+
+        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);
+        var lines = rawLines.Where(l => l != null).ToArray();
+
+        // Use a conservative line height in points
+        var lineHeight = _regularFont.Size * 1.2;
+
+        // Calculate total height of the text block
+        var totalHeight = lines.Length * lineHeight;
+
+        // Start drawing from the top of the cell (align addresses to top)
+        var startY = y + paddingTopPoints;
+
+        var currentY = startY;
+
+        foreach (var line in lines)
+        {
+            // Stop if we've reached the top boundary
+            if (currentY + lineHeight > y + cellHeight - paddingBottomPoints + 0.001)
+                break;
+
+            // Parse and draw the line with markdown support
+            DrawLineWithMarkdown(gfx, line, x + paddingLeftPoints, currentY, maxWidth);
+            currentY += lineHeight;
+        }
+    }
+
+    private void DrawLineWithMarkdown(XGraphics gfx, string line, double x, double y, double maxWidth)
+    {
+        if (string.IsNullOrWhiteSpace(line)) return;
+        var currentX = x;
+        var i = 0;
+
+        while (i < line.Length)
+        {
+            if (currentX - x >= maxWidth)
+                break;
+
+            var remainingWidth = maxWidth - (currentX - x);
+
+            // Check for small-font tag <font6> ... </font6>
+            if (i <= line.Length - 7 && line.Substring(i, 7) == "<font6>")
+            {
+                var endTag = line.IndexOf("</font6>", i + 7, StringComparison.Ordinal);
+                if (endTag != -1)
+                {
+                    var inner = line.Substring(i + 7, endTag - (i + 7));
+                    if (!string.IsNullOrEmpty(inner))
+                    {
+                        var measuredSmall = gfx.MeasureString(inner, _smallFont);
+
+                        if (measuredSmall.Width > remainingWidth)
+                        {
+                            inner = TruncateTextToWidth(gfx, inner, _smallFont, remainingWidth);
+                            measuredSmall = gfx.MeasureString(inner, _smallFont);
+                        }
+
+                        gfx.DrawString(inner, _smallFont, XBrushes.Black,
+                            new XRect(currentX, y, remainingWidth, _smallFont.Size * 1.2),
+                            XStringFormats.TopLeft);
+                        currentX += measuredSmall.Width;
+                    }
+
+                    i = endTag + 8; // move past </font6>
+                    continue;
+                }
+            }
+
+            // Check for bold marker (**)
+            if (i < line.Length - 1 && line[i] == '*' && line[i + 1] == '*')
+            {
+                // Find closing **
+                var endIndex = line.IndexOf("**", i + 2, StringComparison.Ordinal);
+                if (endIndex != -1)
+                {
+                    var boldText = line.Substring(i + 2, endIndex - (i + 2));
+                    var measured = gfx.MeasureString(boldText, _boldFont);
+
+                    if (measured.Width > remainingWidth)
+                    {
+                        boldText = TruncateTextToWidth(gfx, boldText, _boldFont, remainingWidth);
+                        measured = gfx.MeasureString(boldText, _boldFont);
+                    }
+
+                    // Draw bold text and measure width accurately
+                    gfx.DrawString(boldText, _boldFont, XBrushes.Black,
+                        new XRect(currentX, y, remainingWidth, _boldFont.Size * 1.2),
+                        XStringFormats.TopLeft);
+                    currentX += measured.Width;
+                    i = endIndex + 2;
+                    continue;
+                }
+            }
+
+            // Regular text until next ** or end of line
+            var nextBoldIndex = line.IndexOf("**", i, StringComparison.Ordinal);
+            var textEnd = nextBoldIndex == -1 ? line.Length : nextBoldIndex;
+            var regularText = line.Substring(i, textEnd - i);
+
+            if (!string.IsNullOrEmpty(regularText))
+            {
+                var measured = gfx.MeasureString(regularText, _regularFont);
+
+                if (measured.Width > remainingWidth)
+                {
+                    regularText = TruncateTextToWidth(gfx, regularText, _regularFont, remainingWidth);
+                    measured = gfx.MeasureString(regularText, _regularFont);
+                }
+
+                gfx.DrawString(regularText, _regularFont, XBrushes.Black,
+                    new XRect(currentX, y, remainingWidth, _regularFont.Size * 1.2), XStringFormats.TopLeft);
+                currentX += measured.Width;
+            }
+
+            i = textEnd;
+        }
+    }
+
+    private string TruncateTextToWidth(XGraphics gfx, string text, XFont font, double maxWidth)
+    {
+        if (string.IsNullOrEmpty(text))
+            return text;
+
+        for (var len = text.Length; len > 0; len--)
+        {
+            var truncated = text.Substring(0, len);
+            var measured = gfx.MeasureString(truncated, font);
+            if (measured.Width <= maxWidth)
+                return truncated;
+        }
+
+        return string.Empty;
+    }
+
+    /// <summary>
+    ///     Converts millimeters to points (1 mm = 2.834645669 points)
+    /// </summary>
+    private double MmToPoints(double mm)
+    {
+        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>
+    ///     Sets the cell dimensions in millimeters
+    /// </summary>
+    public void SetCellDimensions(double width, double height)
+    {
+        if (width <= 0 || height <= 0)
+            throw new ArgumentException("Cell dimensions must be positive");
+    }
+
+    /// <summary>
+    ///     Sets the page margins in millimeters
+    /// </summary>
+    public void SetMargins(double left, double top, double right, double bottom)
+    {
+        if (left < 0 || top < 0 || right < 0 || bottom < 0)
+            throw new ArgumentException("Margins cannot be negative");
+    }
+}

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

@@ -0,0 +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" MinWidth="600" MinHeight="350" WindowState="Maximized">
+    <Grid Margin="10,0,10,10">
+        <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

@@ -0,0 +1,63 @@
+using System;
+using System.IO;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace Logof_Client.Wiki;
+
+public partial class EditorWindow : Window
+{
+    public string filename = "";
+
+    public EditorWindow(string filename = "")
+    {
+        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

@@ -0,0 +1,129 @@
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Markdig;
+using Markdig.Syntax;
+using Markdig.Syntax.Inlines;
+using System.Text;
+
+namespace Logof_Client.Wiki;
+
+public static class MarkdownRenderer
+{
+    public static Control Render(string markdown)
+    {
+        var panel = new StackPanel { Spacing = 6 };
+        if (string.IsNullOrWhiteSpace(markdown)) return panel;
+
+        var doc = Markdown.Parse(markdown);
+
+        foreach (var block in doc)
+        {
+            switch (block)
+            {
+                case HeadingBlock hb:
+                {
+                    var text = GetInlineText(hb.Inline);
+                    var tb = new TextBlock
+                    {
+                        Text = text,
+                        FontWeight = FontWeight.Bold,
+                        Margin = new Avalonia.Thickness(0, hb.Level == 1 ? 6 : 2, 0, 2)
+                    };
+                    tb.FontSize = hb.Level switch { 1 => 22, 2 => 18, 3 => 16, _ => 14 };
+                    panel.Children.Add(tb);
+                    break;
+                }
+
+                case ParagraphBlock pb:
+                {
+                    var text = GetInlineText(pb.Inline);
+                    var tb = new TextBlock { Text = text, TextWrapping = Avalonia.Media.TextWrapping.Wrap };
+                    panel.Children.Add(tb);
+                    break;
+                }
+
+                case FencedCodeBlock cb:
+                {
+                    var sb = new StringBuilder();
+                    foreach (var line in cb.Lines.Lines)
+                    {
+                        sb.Append(line.ToString());
+                    }
+                    var codeBox = new TextBox
+                    {
+                        Text = sb.ToString(),
+                        FontFamily = "Consolas, monospace",
+                        IsReadOnly = true,
+                        AcceptsReturn = true
+                    };
+                    panel.Children.Add(codeBox);
+                    break;
+                }
+
+                case ListBlock lb:
+                {
+                    var sp = new StackPanel { Spacing = 2 };
+                    var number = 1;
+                    foreach (var item in lb)
+                    {
+                        if (item is ListItemBlock lib)
+                        {
+                            var itemText = new StringBuilder();
+                            foreach (var sub in lib)
+                            {
+                                if (sub is ParagraphBlock pp)
+                                    itemText.Append(GetInlineText(pp.Inline));
+                            }
+                            var tb = new TextBlock { Text = (lb.IsOrdered ? (number++ + ". ") : "• ") + itemText.ToString() };
+                            sp.Children.Add(tb);
+                        }
+                    }
+                    panel.Children.Add(sp);
+                    break;
+                }
+
+                default:
+                {
+                    // fallback: raw text
+                    panel.Children.Add(new TextBlock { Text = block.ToString() });
+                    break;
+                }
+            }
+        }
+
+        return panel;
+    }
+
+    private static string GetInlineText(ContainerInline? container)
+    {
+        if (container == null) return string.Empty;
+        var sb = new StringBuilder();
+        foreach (var inline in container)
+        {
+            switch (inline)
+            {
+                case LiteralInline li:
+                    sb.Append(li.Content.ToString());
+                    break;
+                case EmphasisInline ei:
+                    sb.Append(GetInlineText(ei));
+                    break;
+                case CodeInline ci:
+                    sb.Append(ci.Content);
+                    break;
+                case LinkInline li:
+                    sb.Append(GetInlineText(li));
+                    break;
+                case LineBreakInline:
+                    sb.Append("\n");
+                    break;
+                default:
+                    sb.Append(inline.ToString());
+                    break;
+            }
+        }
+
+        return sb.ToString();
+    }
+}

Wiki/WikiItem.cs

@@ -0,0 +1,13 @@
+using System.Collections.ObjectModel;
+
+namespace Logof_Client.Wiki;
+
+public class WikiItem
+{
+    public string Name { get; set; }
+    public string Path { get; set; }
+    public bool IsFolder { get; set; }
+    public ObservableCollection<WikiItem> Children { get; } = new();
+
+    public override string ToString() => Name;
+}

Wiki/WikiService.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Logof_Client.Wiki;
+
+public class WikiService
+{
+    public WikiService(string wikiRoot = null)
+    {
+        // prefer global wiki storage path if configured
+        if (Global._instance != null && !string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
+        {
+            var cfg = Global._instance.wiki_storage_path;
+            WikiRootFullPath = Path.IsPathRooted(cfg)
+                ? cfg
+                : Path.Combine(Directory.GetCurrentDirectory(), cfg);
+            WikiRoot = WikiRootFullPath;
+        }
+        else
+        {
+            if (wikiRoot == null)
+                wikiRoot = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                    "logofclient",
+                    "wiki");
+            WikiRoot = wikiRoot;
+            WikiRootFullPath = Path.Combine(Directory.GetCurrentDirectory(), wikiRoot);
+        }
+    }
+
+    public string WikiRoot { get; }
+    public string WikiRootFullPath { get; }
+
+    public List<WikiItem> GetRootItems()
+    {
+        var list = new List<WikiItem>();
+
+        if (!Directory.Exists(WikiRootFullPath)) return list;
+
+        var dirInfo = new DirectoryInfo(WikiRootFullPath);
+
+        // Add folders
+        foreach (var dir in dirInfo.GetDirectories()) list.Add(BuildFolderItem(dir));
+
+        // Add files in root
+        foreach (var file in dirInfo.GetFiles("*.md"))
+            list.Add(new WikiItem { Name = file.Name, Path = file.FullName, IsFolder = false });
+
+        return list.OrderBy(i => i.IsFolder ? 0 : 1).ToList();
+    }
+
+    private WikiItem BuildFolderItem(DirectoryInfo dir)
+    {
+        var node = new WikiItem { Name = dir.Name, Path = dir.FullName, IsFolder = true };
+
+        foreach (var subdir in dir.GetDirectories()) node.Children.Add(BuildFolderItem(subdir));
+
+        foreach (var file in dir.GetFiles("*.md"))
+            node.Children.Add(new WikiItem { Name = file.Name, Path = file.FullName, IsFolder = false });
+
+        return node;
+    }
+
+    public Task<string?> LoadFileContentAsync(string path)
+    {
+        if (!File.Exists(path)) return Task.FromResult<string?>(null);
+        return File.ReadAllTextAsync(path);
+    }
+}