From 168a36ebb5b39b9393b689d1a98fe39011ab6fce Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Tue, 2 Jun 2026 15:02:27 +0200
Subject: [PATCH] =?UTF-8?q?Esc=20schlie=C3=9Ft=20Popup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/Services/BeWoWindowService.cs                   |  3 +++
 BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml  |  4 ++++
 BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml  |  6 +++++-
 BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml | 10 +++++++---
 BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml | 11 +++++++----
 Host/Host.csproj.user                                |  2 +-
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs
index 6c460acea..97f93b753 100644
--- a/BeWo/Services/BeWoWindowService.cs
+++ b/BeWo/Services/BeWoWindowService.cs
@@ -181,6 +181,9 @@ namespace BeWo.Services
 
 		private void Show(string title, Control control, WindowViewModel windowViewModel, BeWoWindowOptions options)
 		{
+			if(control.Focusable)
+				control.Focus();
+
 			if (options.ShowAsModal)
 			{
 				var modal = _windowFactory.GetModalViewWindow(title, control, options.Height, options.Width);
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
index 8cd68c8cc..1ad6dd635 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
@@ -13,7 +13,11 @@
     Height="auto"
     d:DataContext="{d:DesignInstance Type=viewmodel:AiPromptbausteinFolderViewModel}"
     Background="{StaticResource ObjectEditBackgroundBrush}"
+    Focusable="True"
     mc:Ignorable="d">
+    <UserControl.InputBindings>
+        <KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
+    </UserControl.InputBindings>
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
index e1b47bce5..159715b4f 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
@@ -13,7 +13,11 @@
     Height="auto"
     d:DataContext="{d:DesignInstance Type=viewmodel:AiPromptbausteinPromptViewModel}"
     Background="{StaticResource ObjectEditBackgroundBrush}"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    Focusable="True">
+    <UserControl.InputBindings>
+        <KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
+    </UserControl.InputBindings>
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml b/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml
index e9ef398fb..2c8f87deb 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml
@@ -12,7 +12,11 @@
     x:Name="root"
     Width="500"
     Height="400"
-    Background="{StaticResource ObjectEditBackgroundBrush}">
+    Background="{StaticResource ObjectEditBackgroundBrush}"
+    Focusable="True">
+    <UserControl.InputBindings>
+        <KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
+    </UserControl.InputBindings>
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -78,13 +82,13 @@
                 IsEnabled="False"
                 SelectedCompactEmployeeDC="{Binding PromptVM.Creator, ElementName=root}" />
 
-            <Label Grid.Row="4" Grid.Column="0">Öffentlich</Label>
+            <!--<Label Grid.Row="4" Grid.Column="0">Öffentlich</Label>
             <dxe:CheckEdit
                 Grid.Row="4"
                 Grid.Column="2"
                 Margin="3"
                 IsChecked="{Binding PromptVM.IsPublic, ElementName=root}"
-                IsEnabled="{Binding PromptVM.CanShareEdit, UpdateSourceTrigger=PropertyChanged, ElementName=root}" />
+                IsEnabled="{Binding PromptVM.CanShareEdit, UpdateSourceTrigger=PropertyChanged, ElementName=root}" />-->
 
             <Label Grid.Row="5" Grid.Column="0">Favorit</Label>
             <dxe:CheckEdit
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml
index bfde88405..f20ca726d 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinRoutineView.xaml
@@ -12,7 +12,11 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     Background="{StaticResource ObjectEditBackgroundBrush}"
+    Focusable="True"
     mc:Ignorable="d">
+    <UserControl.InputBindings>
+        <KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
+    </UserControl.InputBindings>
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -199,12 +203,11 @@
                 Margin="0,19,0,0"
                 HorizontalAlignment="Right"
                 Orientation="Horizontal">
-                <!--<Button
+                <Button
                     Width="100"
-                    Command="{Binding CancelCommand}"
-                    Visibility="Collapsed">
+                    Command="{Binding CancelCommand}">
                     Abbrechen
-                </Button>-->
+                </Button>
                 <Button
                     Width="100"
                     Command="{Binding AcceptCommand}"
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index 16d56484a..8fd09928c 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>
     </Use64BitIISExpress>
     <IISExpressSSLPort />