From 28fcfd9eefa9c6cab08478dd1e1f7aee88b38e71 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 27 Mar 2026 12:34:01 +0100 Subject: [PATCH] Alle Prompts -> wieder auf animated window + restyling --- .../Controls/AI/AiConversationButton.xaml | 4 +- .../Controls/AI/AiConversationButton.xaml.cs | 16 +- .../Controls/AI/AiPromptbausteinButton.xaml | 4 +- .../AI/AiPromptbausteinButton.xaml.cs | 25 +- .../AiPromptbausteinComplexSelectionView.xaml | 386 +++++++++--------- .../Zeiterfassung/ServiceRecordView2.xaml | 4 +- BeWo/View/Windows/AnimatedBeWoWindow.xaml | 2 +- ...PromptbausteinComplexSelectionViewModel.cs | 4 +- 8 files changed, 229 insertions(+), 216 deletions(-) diff --git a/BeWo/View/Controls/AI/AiConversationButton.xaml b/BeWo/View/Controls/AI/AiConversationButton.xaml index 5674e7775..e1e441bd1 100644 --- a/BeWo/View/Controls/AI/AiConversationButton.xaml +++ b/BeWo/View/Controls/AI/AiConversationButton.xaml @@ -61,7 +61,7 @@ - - + --> PromptAccepted; @@ -68,6 +68,8 @@ namespace BeWo.View.Controls.AI set { SetValue(ActionTypeProperty, value); } } + public AiPromptbausteinSelectionComplexViewModel AllPromptsViewModel { get; set; } + public ICommand AiPromptOpenAllCommand { get; set; } public ICommand AiPromptOpenFavoriteCommand { get; set; } @@ -80,7 +82,9 @@ namespace BeWo.View.Controls.AI public void AiPromptOpenAll() { - popup_promptbaustein_all.IsOpen = true; + //popup_promptbaustein_all.IsOpen = true; + //OpenAiPromptClick?.Invoke(this, e); + BeWoApp.MainControl.WindowService.Show(AllPromptsViewModel); } public void AiPromptOpenFavorite() { @@ -161,7 +165,6 @@ namespace BeWo.View.Controls.AI } private void btnOpenAi5_Click(object sender, RoutedEventArgs e) { - //OpenAiPromptClick?.Invoke(this, e); AiPromptOpenAll(); } private void btnOpenAi5_MouseRightButtonUp(object sender, MouseButtonEventArgs e) @@ -174,11 +177,8 @@ namespace BeWo.View.Controls.AI { var viewmodel = new AiPromptbausteinSelectionComplexViewModel(actionType, listvm); viewmodel.PromptAccepted += PromptAccepted; - popup_promptbaustein_all.Closed += (s, e) => viewmodel.ResetSelection(); - var view = new AiPromptbausteinComplexSelectionView(viewmodel); - view.Padding = new Thickness(3); - view.Background = FindResource("ObjectEditBackgroundBrush") as System.Windows.Media.Brush; - border_promptbaustein_al.Child = view; + viewmodel.RequestClose += (s, e) => viewmodel.ResetSelection(); + AllPromptsViewModel = viewmodel; var viewmodel2 = new AiPromptbausteinSelectionComplexViewModel(actionType, listvm, true); viewmodel2.PromptAccepted += PromptAccepted; diff --git a/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml b/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml index 6ff96ac74..8af2d6317 100644 --- a/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml +++ b/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml @@ -36,7 +36,7 @@ --> - - + --> PromptAccepted; + + public AiPromptbausteinSelectionComplexViewModel AllPromptsViewModel { get; set; } + + public AiPromptbausteinButton() + { + InitializeComponent(); + } + public AiPromptbausteinButtonState State { get { return (AiPromptbausteinButtonState)GetValue(StateProperty); } @@ -63,13 +72,6 @@ namespace BeWo.View.Controls.AI set { SetValue(CanExecuteProperty, value); } } - public event EventHandler PromptAccepted; - - public AiPromptbausteinButton() - { - InitializeComponent(); - } - private static void OnStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { var control = (AiPromptbausteinButton)d; @@ -91,7 +93,7 @@ namespace BeWo.View.Controls.AI public void AiPromptOpenAll() { - popup_promptbaustein_all.IsOpen = true; + BeWoApp.MainControl.WindowService.Show(AllPromptsViewModel); } public void AiPromptOpenFavorite() { @@ -113,11 +115,8 @@ namespace BeWo.View.Controls.AI { var viewmodel = new AiPromptbausteinSelectionComplexViewModel(actionType, listvm); viewmodel.PromptAccepted += PromptAccepted; - popup_promptbaustein_all.Closed += (s, e) => viewmodel.ResetSelection(); - var view = new AiPromptbausteinComplexSelectionView(viewmodel); - view.Padding = new Thickness(3); - view.Background = FindResource("ObjectEditBackgroundBrush") as System.Windows.Media.Brush; - border_promptbaustein_al.Child = view; + viewmodel.RequestClose += (s, e) => viewmodel.ResetSelection(); + AllPromptsViewModel = viewmodel; var viewmodel2 = new AiPromptbausteinSelectionComplexViewModel(actionType, listvm, true); viewmodel2.PromptAccepted += PromptAccepted; diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml index 18f2bb075..a11947ac0 100644 --- a/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml +++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml @@ -3,16 +3,17 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ai="clr-namespace:BeWo.ViewModel.View.AI" - xmlns:local1="clr-namespace:BeWo.View.Detail.AI" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:local="clr-namespace:BeWo.View.Detail.AI" + xmlns:local1="clr-namespace:BeWo.View.Detail.AI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:BeWo.ViewModel" d:DataContext="{d:DesignInstance Type=ai:AiPromptbausteinSelectionComplexViewModel, IsDesignTimeCreatable=True}" d:DesignHeight="450" d:DesignWidth="800" + Background="{StaticResource ObjectEditBackgroundBrush}" mc:Ignorable="d"> @@ -28,189 +29,199 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (i) - - - - - - - + + + + + + + + + + + - - + + diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml index 44314366a..95f3f000e 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml @@ -1779,11 +1779,11 @@ diff --git a/BeWo/View/Windows/AnimatedBeWoWindow.xaml b/BeWo/View/Windows/AnimatedBeWoWindow.xaml index 9dc5802cf..b3fcfe0c3 100644 --- a/BeWo/View/Windows/AnimatedBeWoWindow.xaml +++ b/BeWo/View/Windows/AnimatedBeWoWindow.xaml @@ -37,7 +37,7 @@ x:Name="rootGroupBox" MouseDoubleClick="RootGroupBox_OnMouseDoubleClick" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" - Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" /> + Style="{DynamicResource PopUpWindowStyle}" />