diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 5195ddb70..d3d3a418f 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -173,6 +173,9 @@ AiPromptbausteinActionResultView.xaml + + AiPromptbausteinComplexSelectionFavoritenView.xaml + AiPromptbausteinComplexSelectionView.xaml @@ -282,6 +285,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs index d9eecc28a..978aff5d1 100644 --- a/BeWo/Services/BeWoWindowService.cs +++ b/BeWo/Services/BeWoWindowService.cs @@ -177,9 +177,11 @@ namespace BeWo.Services { var window = _windowFactory.GetAnimatedBeWoWindow(title, control, options.Height, options.Width); - if(windowViewModel is DialogViewModel dialogViewModel) + window.ViewModel = windowViewModel; + + if (windowViewModel is DialogViewModel dialogViewModel) { - dialogViewModel.RequestClose += (s, e) => window.Close(); + dialogViewModel.RequestClose += (s, e) => window.Close(); } if (options.ShowAsDialog) diff --git a/BeWo/Styles/DataTemplates/DataTemplates.xaml b/BeWo/Styles/DataTemplates/DataTemplates.xaml index 508fbc4a5..71f5c2d98 100644 --- a/BeWo/Styles/DataTemplates/DataTemplates.xaml +++ b/BeWo/Styles/DataTemplates/DataTemplates.xaml @@ -10,7 +10,7 @@ x:Key="ai_promptbaustein_folder_itemtemplate" DataType="{x:Type vm:AiPromptbausteinFolderVM}" ItemsSource="{Binding Path=SubFolders.VMList}"> - + diff --git a/BeWo/View/Controls/AI/AiConversationButton.xaml.cs b/BeWo/View/Controls/AI/AiConversationButton.xaml.cs index 5ad874de0..9647b7482 100644 --- a/BeWo/View/Controls/AI/AiConversationButton.xaml.cs +++ b/BeWo/View/Controls/AI/AiConversationButton.xaml.cs @@ -179,8 +179,7 @@ namespace BeWo.View.Controls.AI var viewmodel2 = new AiPromptbausteinSelectionComplexViewModel(actionType, listvm, true); viewmodel2.PromptAccepted += PromptAccepted; popup_promptbaustein_favoriten.Closed += (s, e) => viewmodel2.ResetSelection(); - var view2 = new AiPromptbausteinComplexSelectionView(viewmodel2); - view2.ReduceSelection(); + var view2 = new AiPromptbausteinComplexSelectionFavoritenView(viewmodel2); viewmodel2.SelectedFolder = viewmodel2.Folders.VMList[0]; view2.Padding = new Thickness(3); view2.Background = FindResource("ObjectEditBackgroundBrush") as System.Windows.Media.Brush; diff --git a/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs b/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs index 07ac2d2b6..6a31bd22a 100644 --- a/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs +++ b/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs @@ -121,8 +121,7 @@ namespace BeWo.View.Controls.AI var viewmodel2 = new AiPromptbausteinSelectionComplexViewModel(actionType, listvm, true); viewmodel2.PromptAccepted += PromptAccepted; popup_promptbaustein_favoriten.Closed += (s, e) => viewmodel2.ResetSelection(); - var view2 = new AiPromptbausteinComplexSelectionView(viewmodel2); - view2.ReduceSelection(); + var view2 = new AiPromptbausteinComplexSelectionFavoritenView(viewmodel2); viewmodel2.SelectedFolder = viewmodel2.Folders.VMList[0]; view2.Padding = new Thickness(3); view2.Background = FindResource("ObjectEditBackgroundBrush") as System.Windows.Media.Brush; diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionFavoritenView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionFavoritenView.xaml new file mode 100644 index 000000000..2411c9640 --- /dev/null +++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionFavoritenView.xaml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (i) + + + + + + + + Bisher haben Sie noch keine Prompt-Favoriten festgelegt. + Bitte legen Sie in der Verwaltung Ihre gewünschten Prompt-Favoriten fest. + + + + + + + + + diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionFavoritenView.xaml.cs b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionFavoritenView.xaml.cs new file mode 100644 index 000000000..df733ef2a --- /dev/null +++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionFavoritenView.xaml.cs @@ -0,0 +1,62 @@ +using BeWo.ViewModel.View.AI; +using BeWo.ViewModel; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace BeWo.View.Detail.AI +{ + /// + /// Interaktionslogik für AiPromptbausteinComplexSelectionView.xaml + /// + public partial class AiPromptbausteinComplexSelectionFavoritenView : UserControl + { + public AiPromptbausteinSelectionComplexViewModel ViewModel { get; set; } + + public AiPromptbausteinComplexSelectionFavoritenView(AiPromptbausteinSelectionComplexViewModel viewModel) + { + InitializeComponent(); + + DataContext = ViewModel = viewModel; + + Loaded += (s, e) => + { + ViewModel.InitVMList(); + + listBoxEdit1.UnSelectAll(); + }; + } + + private void Grid_PreviewMouseDown_1(object sender, MouseButtonEventArgs e) + { + + } + + private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e) + { + Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri)); + e.Handled = true; + } + + private void Grid_MouseUp(object sender, MouseButtonEventArgs e) + { + if (!ViewModel.SendCommand.CanExecute(null)) + return; + + ViewModel.SendCommand.Execute(null); + e.Handled = true; + } + } +} diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml index 1fef54bc8..2f4f76926 100644 --- a/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml +++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml @@ -74,6 +74,8 @@ diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml.cs b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml.cs index be1ce02b5..2ec2382fa 100644 --- a/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml.cs +++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexSelectionView.xaml.cs @@ -46,15 +46,6 @@ namespace BeWo.View.Detail.AI }; } - public void ReduceSelection() - { - groupBox1.Visibility = Visibility.Collapsed; - splitter.Visibility = Visibility.Collapsed; - groupbox2.Header = "Favoriten"; - Grid.SetColumn(groupbox2, 0); - Grid.SetColumnSpan(groupbox2, 3); - } - private void treeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs e) { if (ViewModel is null) diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml index a562eec23..0810572db 100644 --- a/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml +++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml @@ -65,6 +65,8 @@ MinHeight="100" Padding="4,16,4,16" AllowDrop="True" + HorizontalContentAlignment="Stretch" + VerticalContentAlignment="Stretch" ContextMenuOpening="treeView_ContextMenuOpening" ItemContainerStyle="{DynamicResource igoal_treeitemstyle}" ItemTemplate="{StaticResource ai_promptbaustein_folder_itemtemplate}" @@ -136,6 +138,8 @@ x:Name="listBoxEdit1" Padding="4,16,4,16" AllowDrop="False" + HorizontalContentAlignment="Stretch" + VerticalContentAlignment="Stretch" ContextMenuOpening="ListBox_ContextMenuOpening" ItemContainerStyle="{StaticResource PromptListBoxItem}" ItemsSource="{Binding SelectedFolder.Prompts, UpdateSourceTrigger=PropertyChanged}" @@ -192,8 +196,7 @@ diff --git a/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml b/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml index 1515d92bf..2b1893ad3 100644 --- a/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml +++ b/BeWo/View/Detail/AI/AiPromptbausteinPromptView2.xaml @@ -1,5 +1,4 @@  @@ -19,9 +19,7 @@ - + @@ -42,8 +40,7 @@ + Text="{Binding PromptVM.Title, UpdateSourceTrigger=PropertyChanged, ElementName=root}" />