ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUI RootDriveInfo per type

Browse Source
This commit is contained in:
Ádám Kovács
2023-09-06 09:47:37 +02:00
parent 67484ba56b
commit ef88885d40
5 changed files with 139 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowViewModel.cs
View File

@@ -1,4 +1,5 @@
using System.Reactive.Linq;
using System.Collections.ObjectModel;
using System.Reactive.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
using Avalonia;
@@ -20,6 +21,7 @@ using FileTime.Providers.Local;
using FileTime.Providers.LocalAdmin;
using Microsoft.Extensions.Logging;
using MvvmGen;
using ObservableComputations;
namespace FileTime.GuiApp.App.ViewModels;
@@ -45,9 +47,10 @@ namespace FileTime.GuiApp.App.ViewModels;
[Inject(typeof(IPossibleCommandsViewModel), PropertyName = "PossibleCommands", PropertyAccessModifier = AccessModifier.Public)]
[Inject(typeof(IInstanceMessageHandler), PropertyName = "_instanceMessageHandler")]
[Inject(typeof(ICloudDriveService), PropertyAccessModifier = AccessModifier.Public)]
[Inject(typeof(IRootDriveInfoService), PropertyAccessModifier = AccessModifier.Public)]
[Inject(typeof(IRootDriveInfoService), PropertyName = "_rootDriveInfoService")]
public partial class MainWindowViewModel : IMainWindowViewModel
{
private readonly OcConsumer _rootDriveInfosConsumer = new();
public bool Loading => false;
public IObservable<string?> MainFont => _fontService.MainFont.Select(x => x ?? "");
public DeclarativeProperty<string> FatalError { get; } = new();
@@ -58,6 +61,9 @@ public partial class MainWindowViewModel : IMainWindowViewModel
public Action? FocusDefaultElement { get; set; }
public Action? ShowWindow { get; set; }
public ObservableCollection<RootDriveInfo> LocalDrives { get; set; }
public ObservableCollection<RootDriveInfo> NetworkDrives { get; set; }
partial void OnInitialize()
{
_logger.LogInformation($"Starting {nameof(MainWindowViewModel)} initialization...");
@@ -84,6 +90,15 @@ public partial class MainWindowViewModel : IMainWindowViewModel
#endif
Title.SetValueSafe(title);
var localDrives = _rootDriveInfoService.RootDriveInfos.Filtering(r => r.DriveType != DriveType.Network);
var networkDrives = _rootDriveInfoService.RootDriveInfos.Filtering(r => r.DriveType == DriveType.Network);
localDrives.For(_rootDriveInfosConsumer);
networkDrives.For(_rootDriveInfosConsumer);
LocalDrives = localDrives;
NetworkDrives = networkDrives;
_modalService.AllModalClosed += (_, _) => FocusDefaultElement?.Invoke();
_instanceMessageHandler.ShowWindow += () => ShowWindow?.Invoke();