From 07f77f00774b4f58244e9077f27327549a8eed94 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 21 May 2025 21:30:47 +1000 Subject: [PATCH] move calls to viewmodel --- Flow.Launcher/SelectFileManagerWindow.xaml.cs | 10 +++++----- .../ViewModel/SelectFileManagerViewModel.cs | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml.cs b/Flow.Launcher/SelectFileManagerWindow.xaml.cs index 0809ccb30..d9c672aff 100644 --- a/Flow.Launcher/SelectFileManagerWindow.xaml.cs +++ b/Flow.Launcher/SelectFileManagerWindow.xaml.cs @@ -32,18 +32,18 @@ namespace Flow.Launcher private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) { - App.API.OpenUrl(e.Uri.AbsoluteUri); + _viewModel.OpenUrl(e.Uri.AbsoluteUri); e.Handled = true; } private void btnBrowseFile_Click(object sender, RoutedEventArgs e) { - var dlg = new Microsoft.Win32.OpenFileDialog(); - var result = dlg.ShowDialog(); - if (result == true) + var selectedFilePath = _viewModel.SelectFile(); + + if (!string.IsNullOrEmpty(selectedFilePath)) { var path = (TextBox)(((FrameworkElement)sender).Parent as FrameworkElement).FindName("PathTextBox"); - path.Text = dlg.FileName; + path.Text = selectedFilePath; path.Focus(); ((Button)sender).Focus(); } diff --git a/Flow.Launcher/ViewModel/SelectFileManagerViewModel.cs b/Flow.Launcher/ViewModel/SelectFileManagerViewModel.cs index 253f74b47..a72eff280 100644 --- a/Flow.Launcher/ViewModel/SelectFileManagerViewModel.cs +++ b/Flow.Launcher/ViewModel/SelectFileManagerViewModel.cs @@ -98,6 +98,23 @@ public partial class SelectFileManagerViewModel : BaseModel } } + internal void OpenUrl(string absoluteUri) + { + App.API.OpenUrl(absoluteUri); + } + + internal string SelectFile() + { + var dlg = new Microsoft.Win32.OpenFileDialog(); + var result = dlg.ShowDialog(); + if (result == true) + { + return dlg.FileName; + } + + return string.Empty; + } + [RelayCommand] private void Add() {