[fix:] wrong sorting of imported address sets

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

DataStore/Settings.cs

@@ -10,6 +10,7 @@ public class Settings
     public static Settings _instance = new();
     public AddressSets addressSets = new();
     public Customers customers = new();
+    public PdfExportSettings pdfExport { get; set; } = new();
 
     public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
         "logofclient", "config.json");
@@ -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,9 +81,18 @@ public class Global
         _instance = this;
     }
 
-    public string config_path { get; set; } = "";
+    public string config_path { get; set; } = Path.Combine(
-    public string wiki_storage_path { get; set; } = "";
+        Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+        "logofclient",
+        "config.json");
+
+    public string wiki_storage_path { get; set; } = Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+        "logofclient",
+        "wiki");
+
     public List<Country> countries { get; set; } = new();
+    public string font_path { get; set; } = Path.Combine(AppContext.BaseDirectory, "assets", "fonts");
 
     public static void Save()
     {
@@ -106,7 +135,7 @@ public class Global
 public class Customers
 {
     public List<Customer> customers = new();
-    public int current { get; set; } = 0;
+    public Customer current { get; set; } = null;
 }
 
 public class Customer
@@ -120,6 +149,11 @@ public class Customer
 
         ID = highestID + 1;
     }
+    
+    public override string ToString()
+    {
+        return name;
+    }
 
     public string name { get; set; } = "";
     public string description { get; set; } = "";
@@ -129,11 +163,11 @@ public class Customer
     public int ID { get; }
 
 
-    public static int GetIDByCustomerListItem(string item_content)
+    // public static int GetIDByCustomerListItem(string item_content)
-    {
+    // {
-        var id = item_content.Split(" - ")[0];
+    //     var id = item_content.Split(" - ")[0];
-        return int.Parse(id);
+    //     return int.Parse(id);
-    }
+    // }
 }
 
 public class AddressSets
@@ -182,4 +216,4 @@ public class Country
 
         return null;
     }
-}
+}

Logof Client.csproj

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

MainWindow.axaml

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

MainWindow.axaml.cs

@@ -5,6 +5,7 @@ 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;
 
@@ -15,6 +16,7 @@ public partial class MainWindow : Window
     public static MainWindow _instance;
 
     private Country _selectedCountry;
+    private string _selectedWikiFilePath;
     private bool _suppressCountryRefresh;
 
     private WikiService _wikiService;
@@ -32,6 +34,8 @@ public partial class MainWindow : Window
         WindowState = WindowState.Maximized;
         Global.Load();
         Settings.Load();
+        LoadPdfExportOptions();
+        HookPdfExportOptionEvents();
 
         RefreshCountryView();
 
@@ -57,6 +61,8 @@ public partial class MainWindow : Window
             try
             {
                 BtnWikiPath.Click += BtnWikiPath_Click;
+                BtnFontPath.Click += BtnFontPath_Click;
+                BtnConfigPath.Click += BtnConfigPath_Click;
             }
             catch
             {
@@ -90,28 +96,49 @@ public partial class MainWindow : Window
 
         new ResultWindow(result, addresSetID).Show();
 
-
+        Settings.Save();
+        
         //await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
     }
-
+    
-    private async void StartAddressRepair(Uri path)
+    private async void StartAddressShortener(KasAddressList set)
     {
-        var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
+        //var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
+
         var progressWindow = new ProgressWindow();
 
         progressWindow.Show(_instance);
 
-        var processor = new AddressRepair(progressWindow);
+        var processor = new AddressShortener(progressWindow);
-        //var result = await processor.Perform(addresses.Item2, errors);
+        await processor.Perform(set);
 
+        // foreach (var item in result)
+        // {
+        // }
 
         progressWindow.Close();
-
+        Settings.Save();
-
-        //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)
     {
         Environment.Exit(0);
@@ -119,12 +146,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)
@@ -143,27 +192,6 @@ public partial class MainWindow : Window
         }
     }
 
-    private async void BtnChooseFile_OnClick(object? sender, RoutedEventArgs e)
-    {
-        var topLevel = GetTopLevel(this);
-        var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-        {
-            Title = "KAS-CSV-Datei auswählen",
-            AllowMultiple = false,
-            FileTypeFilter = new[]
-            {
-                new FilePickerFileType(".csv-Datei")
-                {
-                    Patterns = new[] { "*.csv" }
-                }
-            }
-        });
-
-        if (file == null) return;
-        //TbFilename.Text = file[0].Path.ToString();
-        filePath = file[0].Path;
-    }
-
     private void BtnCheck_OnClick(object? sender, RoutedEventArgs e)
     {
         MakeCalcManVisible();
@@ -173,61 +201,30 @@ public partial class MainWindow : Window
             return;
         }
 
-        StartAddressCheck(KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItem.ToString()));
+        StartAddressCheck(((KasAddressList)LstCustomerAdressSets.SelectedItem).ID);
     }
 
     private void BtnCombine_OnClick(object? sender, RoutedEventArgs e)
     {
         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 progressWindow = new ProgressWindow();
-        var address_list = new List<KasAddressList> { addresses.Item2 };
-
-        var topLevel = GetTopLevel(this);
-        var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-        {
-            Title = "Weitere KAS-CSV-Dateien auswählen",
-            AllowMultiple = true,
-            FileTypeFilter = new[]
-            {
-                new FilePickerFileType(".csv-Dateien")
-                {
-                    Patterns = new[] { "*.csv" }
-                    //Patterns = new[] { "*" }
-                }
-            }
-        });
-
-        if (file == null) return;
-
-        //filePath = file[0].Path;
-        foreach (var f in file) address_list.Add(DataImport.ImportKasAddressList(f.Path).Item2);
-
-        progressWindow.Show(_instance);
-
-        var processor = new CombineAddresses(progressWindow);
-        //var result = await processor.Perform(address_list);
-
-
-        progressWindow.Close();
-    }
 
     private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
     {
         if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
         {
+            _selectedWikiFilePath = item.Path;
             var text = await _wikiService.LoadFileContentAsync(item.Path);
             try
             {
@@ -244,14 +241,27 @@ public partial class MainWindow : Window
 
             EditButton.IsEnabled = true;
         }
+        else
+        {
+            _selectedWikiFilePath = null;
+            EditButton.IsEnabled = false;
+        }
     }
 
-    private void PopulateNavTree()
+    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)
@@ -264,6 +274,63 @@ public partial class MainWindow : Window
         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;
@@ -302,48 +369,50 @@ public partial class MainWindow : Window
         PopulateNavTree();
     }
 
-    private async Task<string> OpenSettingsSaveAsDialog()
+    private async void BtnFontPath_Click(object? sender, RoutedEventArgs e)
     {
-        var settingsFileName = "KAS-Adress-Liste";
+        var top = GetTopLevel(this);
-
+        var folder = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-        try
         {
-            var filePicker = new SaveFileDialog
+            Title = "Font Pfad wählen",
-            {
+            AllowMultiple = false
-                Title = "Datei speichern...",
+        });
-                InitialFileName = $"{settingsFileName}.csv",
-                DefaultExtension = ".csv",
-                Filters = new List<FileDialogFilter>
-                {
-                    new() { Name = "CSV-Datei", Extensions = { "csv" } }
-                }
-            };
 
-            var settingsSavePath = await filePicker.ShowAsync(this);
+        if (folder == null || folder.Count == 0) return;
-            if (settingsSavePath == null)
+        var chosen = folder[0].Path;
-            {
+        TbFontPath.Text = chosen.ToString();
-            }
+        Global._instance.font_path = chosen.ToString();
-
+        Global.Save();
-            return settingsSavePath;
-            //SettingsManager.Save(settingsSavePath);
-            //Logger.Log("Settings saved at " + settingsSavePath);
-        }
-        catch (Exception ex)
-        {
-            //Logger.Log("Saving file not successful: " + ex.Message, Logger.LogType.Error);
-            await MessageBox.Show(this, ex.Message, "Fehler beim Speichern der Datei");
-            return null;
-        }
     }
 
-    private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type)
+    private async void 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 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, CbMergeDeleteOld.IsChecked);
 
         if (result.Item1 != null)
             result.Item1.owner_id = owner_id;
@@ -383,7 +452,7 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.name = TbSettingsCustomerName.Text;
         //Settings.Save();
         //RefreshCustomerItems();
@@ -393,24 +462,33 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex < 0) return;
         Settings._instance.customers.current =
-            Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString());
+            ((Customer)LstSettingsCustomers.SelectedItems[0]);
-        foreach (var customer in Settings._instance.customers.customers)
+        //foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            //if (customer.ID == Settings._instance.customers.current.ID)
-            {
+            //{
-                TbSettingsCustomerDescription.Text = customer.description;
+                TbSettingsCustomerDescription.Text = Settings._instance.customers.current.description;
-                TbSettingsCustomerName.Text = customer.name;
+                TbSettingsCustomerName.Text = Settings._instance.customers.current.name;
-                TbSettingsCustomerSenderAddress.Text = customer.sender_address;
+                TbSettingsCustomerSenderAddress.Text = Settings._instance.customers.current.sender_address;
-                TbSettingsCustomerCsvSeparator.Text = customer.separator.ToString();
+                TbSettingsCustomerCsvSeparator.Text = Settings._instance.customers.current.separator.ToString();
-                if (customer.patch != null)
+                if (Settings._instance.customers.current.patch != null)
-                    TbSettingsCustomerPatchInfo.Text = customer.patch.ToString();
+                    TbSettingsCustomerPatchInfo.Text = Settings._instance.customers.current.patch.ToString();
                 else
                     TbSettingsCustomerPatchInfo.Text = "";
-            }
+            //}
     }
 
     private async void EditButton_Click(object? sender, RoutedEventArgs e)
     {
-        await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
+        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)
@@ -429,8 +507,8 @@ public partial class MainWindow : Window
         LstSettingsCustomers.Items.Clear();
         foreach (var customer in Settings._instance.customers.customers)
         {
-            LstCustomers.Items.Add(customer.ID + " - " + customer.name);
+            LstCustomers.Items.Add(customer);
-            LstSettingsCustomers.Items.Add(customer.ID + " - " + customer.name);
+            LstSettingsCustomers.Items.Add(customer);
         }
 
         try
@@ -446,7 +524,7 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.description = TbSettingsCustomerDescription.Text;
         //Settings.Save();
     }
@@ -461,7 +539,7 @@ public partial class MainWindow : Window
     {
         MakeCalcManVisible();
         if (LstCustomers.SelectedItems == null || LstCustomers.SelectedIndex == -1) return;
-        var customer_id = int.Parse(LstCustomers.SelectedItem.ToString().Split(" - ")[0]);
+        var customer_id = ((Customer)LstCustomers.SelectedItem).ID;
         RefreshAddressSetListItems(customer_id);
     }
 
@@ -486,11 +564,11 @@ public partial class MainWindow : Window
         var selected_path = paths[0].Path;
 
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString()))
+            if (customer == ((Customer)LstCustomers.SelectedItems[0]))
             {
                 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.");
@@ -506,7 +584,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.");
@@ -541,7 +619,7 @@ public partial class MainWindow : Window
         foreach (var k in Settings._instance.addressSets.addresses)
         foreach (var customer in Settings._instance.customers.customers)
             if (customer.ID == k.owner_id && customer.ID == customer_id)
-                LstCustomerAdressSets.Items.Add(k.ID + " - " + k.Name + "(" + k.KasPersons.Count + " Einträge)");
+                LstCustomerAdressSets.Items.Add(k);
     }
 
     private void LstCustomerAdressSets_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
@@ -560,6 +638,7 @@ public partial class MainWindow : Window
             BtnCheck.IsEnabled = true;
             BtnCombine.IsEnabled = true;
             BtnGenerateLabels.IsEnabled = true;
+            BtnShorten.IsEnabled = true;
 
             // BtnRepair.IsEnabled = true;
             // BtnShorten.IsEnabled = true;
@@ -588,7 +667,7 @@ public partial class MainWindow : Window
         var selected_path = paths[0].Path;
 
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString()))
+            if (customer.ID == ((Customer)LstSettingsCustomers.SelectedItems[0]).ID)
                 customer.patch = AddressPatch.Import(selected_path);
 
 
@@ -602,7 +681,7 @@ public partial class MainWindow : Window
             ? TbSettingsCustomerCsvSeparator.Text
             : ",";
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 try
                 {
                     customer.separator = Convert.ToChar(sep);
@@ -621,44 +700,82 @@ public partial class MainWindow : Window
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
+            list.Add((KasAddressList)item);
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+        try
-
+        {
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
+        }
+        catch
+        {
+            
+        }
     }
 
     private void BtnCombineUnion_OnClick(object? sender, RoutedEventArgs e)
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
+            list.Add((KasAddressList)item);
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+        try
-
+        {
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
+            StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "union", GetCombiningTyp());
+        }
+        catch
+        {
+            
+        }
+        
     }
 
     private void BtnCombineIntersection_OnClick(object? sender, RoutedEventArgs e)
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
+            list.Add((KasAddressList)item);
-                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)
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
+            list.Add((KasAddressList)item);
-                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",
@@ -668,10 +785,10 @@ public partial class MainWindow : Window
 
         if (!string.IsNullOrEmpty(filePath))
         {
-            var builder = new PdfBuilder();
+            var builder = new PdfBuilder(Settings._instance.pdfExport);
 
-            builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
+            builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder((
-                Convert.ToInt32(LstCustomerAdressSets.SelectedItems[0].ToString().Split(" - ")[0]),
+                    (KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
                 "Company Logo/Info",
                 filePath
             );
@@ -679,11 +796,92 @@ public partial class MainWindow : Window
         }
     }
 
+    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)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.sender_address = TbSettingsCustomerSenderAddress.Text;
     }
 
@@ -820,4 +1018,106 @@ public partial class MainWindow : Window
                 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)LstCustomers.SelectedItems[0]).ID;
+                    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;
+        try
+        {
+            Settings._instance.customers.customers.Remove((Customer)LstSettingsCustomers.SelectedItem);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
+        }
+        RefreshCustomerItems();
+    }
+
+    private void BtnShorten_OnClick(object? sender, RoutedEventArgs e)
+    {
+        MakeCalcManVisible();
+        if (LstCustomerAdressSets.SelectedIndex == -1)
+        {
+            MessageBox.Show(null, "Bitte zunächst ein Adress-Set auswählen", "Kein Adress-Set ausgewählt");
+            return;
+        }
+
+        StartAddressShortener((KasAddressList)LstCustomerAdressSets.SelectedItem);
+    }
+}

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"> -->

ProgressWindow.axaml.cs

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

README.md

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

ResultWindow.axaml

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

ResultWindow.axaml.cs

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

Tasks/AddressCheck.cs

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

Tasks/AddressShortener.cs

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

Tasks/CombineAddresses.cs

@@ -15,40 +15,38 @@ public class CombineAddresses
     {
         _progress = progressWindow;
     }
+    
+    public enum CombineType
+    {
+        refsid,
+        final_adress,
+        none
+    }
 
-    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
+    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
+        bool? exportUnused, bool? deleteOld)
+    {
+        var result = await Execute(address_lists,type,comb_type,exportUnused);
+
+        if (deleteOld == true)
+        {
+            foreach (var list in address_lists)
+            {
+                Settings._instance.addressSets.addresses.Remove(list);
+            }
+        }
+
+        return result;
+
+    }
+
+    private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
         bool? exportUnused)
     {
-        var res = await Task.Run(async () =>
+        if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
-        {
+        if (type == "union") return await Union(address_lists, comb_type, exportUnused);
-            if (type == "difference") return Difference(address_lists, exportUnused);
+        if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
-            if (type == "union") return Union(address_lists, exportUnused);
+        if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
-            if (type == "intersection") return Intersection(address_lists, exportUnused);
-            if (type == "symdiff") return SymmetricDifference(address_lists, exportUnused);
-
-            return null;
-        });
-
-
-        return res.Result;
-
-
-        // KasAddressList result = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
-        // await Task.Run(async () =>
-        // {
-        //     for (var i = 0; i < address_lists.Count; i++)
-        //         if (i == 0)
-        //             lock (result)
-        //             {
-        //                 result = address_lists[i];
-        //             }
-        //         else
-        //             lock (result)
-        //             {
-        //                 result = Merge(result, address_lists[i], i + 1, address_lists.Count).Result;
-        //             }
-        // });
-        // return result;
         return (null, null);
     }
 
@@ -60,10 +58,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;
+        // A refsid of 0 means "missing", so it must not collapse unrelated entries.
-        if (!only_refsid)
+        if(comb_type == CombineType.refsid)
+            if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
+        if (comb_type == CombineType.final_adress)
             if (first.name == second.name &&
                 first.anrede == second.anrede &&
                 first.anredzus == second.anredzus &&
@@ -92,12 +92,12 @@ public class CombineAddresses
         return false;
     }
 
-    public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused,
         Progress? progress = null)
     {
         if (address_lists == null || address_lists.Count == 0)
-            return (new KasAddressList(KasAddressList.GenerateName("difference")), null);
+            return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
 
         progress ??= new Progress
         {
@@ -109,12 +109,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 result = new KasAddressList(await KasAddressList.GenerateName("difference"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("difference_rest"));
+        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
@@ -133,11 +135,13 @@ public class CombineAddresses
     }
 
 
-    public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused,
+    public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, CombineType comb_type, bool? return_unused,
         Progress progress = null)
     {
-        var result = new KasAddressList(KasAddressList.GenerateName("union"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("union"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("union_rest"));
+        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);
@@ -148,7 +152,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);
@@ -175,11 +179,12 @@ public class CombineAddresses
         return null;
     }
 
-    public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused, Progress progress = null)
     {
-        var result = new KasAddressList(KasAddressList.GenerateName("intersection"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("intersection_rest"));
+        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);
@@ -195,7 +200,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);
@@ -222,11 +227,12 @@ public class CombineAddresses
     }
 
 
-    public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused, Progress progress = null)
     {
-        var result = new KasAddressList(KasAddressList.GenerateName("symmetric_difference"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("symmetric_rest"));
+        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);
@@ -241,7 +247,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
@@ -278,66 +284,7 @@ public class CombineAddresses
         if (return_unused == true) return (result, second_result);
         return (result, null);
     }
-
+    
-
-    // private async Task<KasAddressList> Merge(KasAddressList first, KasAddressList second, int num, int total)
-    // {
-    //     foreach (var sec in second.KasPersons)
-    //     {
-    //         var is_new = true;
-    //         foreach (var fi in first.KasPersons)
-    //         {
-    //             if (fi.refsid == sec.refsid)
-    //             {
-    //                 is_new = false;
-    //                 break;
-    //             }
-    //
-    //             if (fi.name == sec.name &&
-    //                 fi.anrede == sec.anrede &&
-    //                 fi.anredzus == sec.anredzus &&
-    //                 fi.namezus == sec.namezus &&
-    //                 fi.titel == sec.titel &&
-    //                 fi.adel == sec.adel &&
-    //                 fi.strasse == sec.strasse &&
-    //                 fi.strasse2 == sec.strasse2 &&
-    //                 fi.vorname == sec.vorname &&
-    //                 fi.ort == sec.ort &&
-    //                 fi.land == sec.land &&
-    //                 fi.plz == sec.plz &&
-    //                 fi.pplz == sec.pplz &&
-    //                 fi.funktion == sec.funktion &&
-    //                 fi.funktion2 == sec.funktion2 &&
-    //                 fi.funktionad == sec.funktionad &&
-    //                 fi.abteilung == sec.abteilung &&
-    //                 fi.postfach == sec.postfach &&
-    //                 fi.name1 == sec.name1 &&
-    //                 fi.name2 == sec.name2 &&
-    //                 fi.name3 == sec.name3 &&
-    //                 fi.name4 == sec.name4 &&
-    //                 fi.name5 == sec.name5)
-    //             {
-    //                 is_new = false;
-    //                 break;
-    //             }
-    //         }
-    //
-    //         if (is_new) first.KasPersons.Add(sec);
-    //         var subperc = second.KasPersons.IndexOf(sec) / second.KasPersons.Count;
-    //         var percent = (num + (double)subperc) / total * 100;
-    //         await Dispatcher.UIThread.InvokeAsync(() =>
-    //         {
-    //             if (is_new)
-    //                 _progress.AddToLog($"Person mit refsid {sec.refsid} ergänzt");
-    //             else
-    //                 _progress.AddToLog($"Person mit refsid {sec.refsid} bereits vorhanden");
-    //
-    //             _progress.ChangePercentage(percent);
-    //         });
-    //     }
-    //
-    //     return first;
-    // }
 }
 
 public class Progress
@@ -354,4 +301,4 @@ public class Progress
         var comparedPersons = ComparedPersons;
         Interlocked.Increment(ref comparedPersons);
     }
-}
+}

Tasks/CsvBuilder.cs

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

Tasks/DataImport.cs

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

Tasks/PdfBuilder.cs

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

@@ -1,8 +1,17 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Logof_Client.Wiki.EditorWindow"
-        Title="Wiki Editor (disabled)" Width="400" Height="150">
+        Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
-    <Grid>
+    <Grid Margin="10,0,10,10">
-        <TextBlock Margin="12" TextWrapping="Wrap">Coming soon.</TextBlock>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Spacing="10" Orientation="Horizontal">
+            <Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
+            <Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
+            <Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
+        </StackPanel>
+        <TextBox AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
     </Grid>
 </Window>

Wiki/EditorWindow.axaml.cs

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

Wiki/MarkdownRenderer.cs

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