Merge branch 'develop'

jamsoft · May 24, 2024 · dd31072 · dd31072
2 parents d5fc346 + cdb266f
commit dd31072
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -386,7 +386,8 @@ You can easily target elements of the dialogs via their names and types, such as
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="Margin" Value="10,0"/>
         </Style>
-
+
+        <!-- Override Wizard complete ellipse fill and stroke -->
         <Style Selector="controls|WizardStep:complete /template/ Ellipse#PART_SelectedPipe">
             <Setter Property="Fill" Value="DeepPink" />
             <Setter Property="StrokeThickness" Value="0" />

diff --git a/src/JamSoft.AvaloniaUI.Dialogs.Sample/ViewModels/MainWindowViewModel.cs b/src/JamSoft.AvaloniaUI.Dialogs.Sample/ViewModels/MainWindowViewModel.cs
@@ -16,6 +16,7 @@ public class MainWindowViewModel : ViewModelBase
 {
     private readonly IDialogService _dialogService;
     private ICommand? _openFileCommand;
+    private ICommand? _openFolderCommand;
     private ICommand? _openWordFileCommand;
     private ICommand? _saveFileCommand;
     private ICommand? _saveWordFileCommand;
@@ -39,6 +40,8 @@ public MainWindowViewModel(IDialogService dialogService)
 
         OpenFileCommand = new DelegateCommand(OpenFileCommandExecuted, () => true);
 
+        OpenFolderCommand = new DelegateCommand(OpenFolderCommandExecuted, () => true);
+
         OpenWordFileCommand = new DelegateCommand(OpenWordFileCommandExecuted, () => true);
 
         OpenFilesCommand = new DelegateCommand(OpenFilesCommandExecuted, () => true);
@@ -66,6 +69,12 @@ public MainWindowViewModel(IDialogService dialogService)
         WizardViewCommand = new DelegateCommand(WizardViewCommandExecuted, () => true);
     }
 
+    public ICommand? OpenFolderCommand    
+    {
+        get => _openFolderCommand;
+        set => this.RaiseAndSetIfChanged(ref _openFolderCommand, value);
+    }
+
     public ICommand? WizardViewCommand
     {
         get => _wizardViewCommand;
@@ -161,6 +170,11 @@ private async void OpenFileCommandExecuted()
         Message = await _dialogService.OpenFile("Open Any File");
     }
 
+    private async void OpenFolderCommandExecuted()
+    {
+        Message = await _dialogService.OpenFolder("Open Any Folder");
+    }
+
     private async void OpenWordFileCommandExecuted()
     {
         Message = await _dialogService.OpenFile("Open Word File", new List<FilePickerFileType>

diff --git a/src/JamSoft.AvaloniaUI.Dialogs.Sample/Views/MainWindow.axaml b/src/JamSoft.AvaloniaUI.Dialogs.Sample/Views/MainWindow.axaml
@@ -19,14 +19,16 @@
             <TextBlock Text="{Binding Message}" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap"/>
         </StackPanel>
 
-        <UniformGrid Grid.Row="1" Columns="3">
+        <UniformGrid Grid.Row="1" Columns="4">
 
             <Button Command="{Binding OpenFileCommand}" Classes="horizontalCenter">Open File</Button>
 
             <Button Command="{Binding OpenWordFileCommand}" Classes="horizontalCenter">Open Word File</Button>
 
             <Button Command="{Binding OpenFilesCommand}" Classes="horizontalCenter">Open Files</Button>
 
+            <Button Command="{Binding OpenFolderCommand}" Classes="horizontalCenter">Open Folder</Button>
+
             <Button Command="{Binding SaveFileCommand}" Classes="horizontalCenter">Save File</Button>
 
             <Button Command="{Binding SaveWordFileCommand}" Classes="horizontalCenter">Save Word File</Button>

diff --git a/src/JamSoft.AvaloniaUI.Dialogs/DialogService.cs b/src/JamSoft.AvaloniaUI.Dialogs/DialogService.cs
@@ -185,9 +185,10 @@ public void StartWizard<TViewModel>(TViewModel viewModel, Action<TViewModel>? ca
             Title = CreateTitle(title)
         });
 
-        //var path = await fd.ShowAsync(GetActiveWindowOrMainWindow());
+        if (path.Count < 1)
+            return null;
 
-        _lastDirectorySelected = path[0].Path.AbsolutePath;
+        _lastDirectorySelected = path[0].Path.LocalPath;
 
         return _lastDirectorySelected;
     }
@@ -211,7 +212,7 @@ public void StartWizard<TViewModel>(TViewModel viewModel, Action<TViewModel>? ca
             DefaultExtension = defaultExtension
         });
 
-        return fd?.Path.AbsolutePath;
+        return fd?.Path.LocalPath;
     }
 
     /// <summary>
@@ -260,7 +261,7 @@ public void StartWizard<TViewModel>(TViewModel viewModel, Action<TViewModel>? ca
             SuggestedStartLocation = folder
         });
 
-        return fd.Select(x => x.Path.AbsolutePath).ToArray();
+        return fd.Select(x => x.Path.LocalPath).ToArray();
     }
 
     private IStorageProvider GetStorageProvider()

diff --git a/src/JamSoft.AvaloniaUI.Dialogs/JamSoft.AvaloniaUI.Dialogs.csproj b/src/JamSoft.AvaloniaUI.Dialogs/JamSoft.AvaloniaUI.Dialogs.csproj
@@ -21,11 +21,11 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>JamSoft.AssemblyKeyFile.snk</AssemblyOriginatorKeyFile>
         <PublicSign>true</PublicSign>
-        <Version>1.2.0</Version>
-        <AssemblyVersion>1.2.0.0</AssemblyVersion>
-        <FileVersion>1.2.0.0</FileVersion>
+        <Version>1.2.1</Version>
+        <AssemblyVersion>1.2.1.0</AssemblyVersion>
+        <FileVersion>1.2.1.0</FileVersion>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <InformationalVersion>1.2.0.0-rel</InformationalVersion>
+        <InformationalVersion>1.2.1.0-rel</InformationalVersion>
         <EnablePackageValidation>true</EnablePackageValidation>
         <PackageReadmeFile>README.md</PackageReadmeFile>        
     </PropertyGroup>