[fix:] window focus

NamingWindow.axaml

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

NamingWindow.axaml.cs

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

ProgressWindow.axaml

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

Tasks/CombineAddresses.cs

@@ -86,7 +86,9 @@ public class CombineAddresses
         for (var i = 1; i < address_lists.Count; i++)
             restUnion.AddRange(address_lists[i].KasPersons);
         var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true)
+            second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
 
         foreach (var person in address_lists[0].KasPersons)
         {
@@ -113,7 +115,9 @@ public class CombineAddresses
         Progress progress = null)
     {
         var result = new KasAddressList(await KasAddressList.GenerateName("union"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true)
+            second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -155,7 +159,8 @@ public class CombineAddresses
         bool? return_unused, Progress progress = null)
     {
         var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -202,7 +207,8 @@ public class CombineAddresses
         bool? return_unused, Progress progress = null)
     {
         var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
+        var second_result = new KasAddressList("none");
+        if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -255,65 +261,6 @@ public class CombineAddresses
         return (result, null);
     }
     
-
-    // private async Task<KasAddressList> Merge(KasAddressList first, KasAddressList second, int num, int total)
-    // {
-    //     foreach (var sec in second.KasPersons)
-    //     {
-    //         var is_new = true;
-    //         foreach (var fi in first.KasPersons)
-    //         {
-    //             if (fi.refsid == sec.refsid)
-    //             {
-    //                 is_new = false;
-    //                 break;
-    //             }
-    //
-    //             if (fi.name == sec.name &&
-    //                 fi.anrede == sec.anrede &&
-    //                 fi.anredzus == sec.anredzus &&
-    //                 fi.namezus == sec.namezus &&
-    //                 fi.titel == sec.titel &&
-    //                 fi.adel == sec.adel &&
-    //                 fi.strasse == sec.strasse &&
-    //                 fi.strasse2 == sec.strasse2 &&
-    //                 fi.vorname == sec.vorname &&
-    //                 fi.ort == sec.ort &&
-    //                 fi.land == sec.land &&
-    //                 fi.plz == sec.plz &&
-    //                 fi.pplz == sec.pplz &&
-    //                 fi.funktion == sec.funktion &&
-    //                 fi.funktion2 == sec.funktion2 &&
-    //                 fi.funktionad == sec.funktionad &&
-    //                 fi.abteilung == sec.abteilung &&
-    //                 fi.postfach == sec.postfach &&
-    //                 fi.name1 == sec.name1 &&
-    //                 fi.name2 == sec.name2 &&
-    //                 fi.name3 == sec.name3 &&
-    //                 fi.name4 == sec.name4 &&
-    //                 fi.name5 == sec.name5)
-    //             {
-    //                 is_new = false;
-    //                 break;
-    //             }
-    //         }
-    //
-    //         if (is_new) first.KasPersons.Add(sec);
-    //         var subperc = second.KasPersons.IndexOf(sec) / second.KasPersons.Count;
-    //         var percent = (num + (double)subperc) / total * 100;
-    //         await Dispatcher.UIThread.InvokeAsync(() =>
-    //         {
-    //             if (is_new)
-    //                 _progress.AddToLog($"Person mit refsid {sec.refsid} ergänzt");
-    //             else
-    //                 _progress.AddToLog($"Person mit refsid {sec.refsid} bereits vorhanden");
-    //
-    //             _progress.ChangePercentage(percent);
-    //         });
-    //     }
-    //
-    //     return first;
-    // }
 }
 
 public class Progress