CommandPalette WIP
This commit is contained in:
@@ -0,0 +1,18 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<RootNamespace>FileTime.App.CommandPalette</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Avalonia" Version="11.0.0-preview8" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace FileTime.App.CommandPalette.Models;
|
||||||
|
|
||||||
|
public interface ICommandPaletteEntry
|
||||||
|
{
|
||||||
|
string Identifier { get; }
|
||||||
|
string Title { get; }
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
using FileTime.App.CommandPalette.Models;
|
||||||
|
using FileTime.App.CommandPalette.ViewModels;
|
||||||
|
|
||||||
|
namespace FileTime.App.CommandPalette.Services;
|
||||||
|
|
||||||
|
public interface ICommandPaletteService
|
||||||
|
{
|
||||||
|
IObservable<bool> ShowWindow { get; }
|
||||||
|
void OpenCommandPalette();
|
||||||
|
IReadOnlyList<ICommandPaletteEntry> GetCommands();
|
||||||
|
ICommandPaletteViewModel? CurrentModal { get; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace FileTime.App.CommandPalette.ViewModels;
|
||||||
|
|
||||||
|
public interface ICommandPaletteEntryViewModel
|
||||||
|
{
|
||||||
|
string Identifier { get; set; }
|
||||||
|
string Title { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using Avalonia.Input;
|
||||||
|
using FileTime.App.Core.ViewModels;
|
||||||
|
|
||||||
|
namespace FileTime.App.CommandPalette.ViewModels;
|
||||||
|
|
||||||
|
public interface ICommandPaletteViewModel : IModalViewModel
|
||||||
|
{
|
||||||
|
IObservable<bool> ShowWindow { get; }
|
||||||
|
List<ICommandPaletteEntryViewModel> FilteredMatches { get; }
|
||||||
|
string SearchText { get; set; }
|
||||||
|
ICommandPaletteEntryViewModel SelectedItem { get; set; }
|
||||||
|
void Close();
|
||||||
|
void HandleKeyDown(KeyEventArgs keyEventArgs);
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\FileTime.App.CommandPalette.Abstractions\FileTime.App.CommandPalette.Abstractions.csproj" />
|
||||||
|
<ProjectReference Include="..\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
|
||||||
|
<PackageReference Include="PropertyChanged.SourceGenerator" Version="1.0.8">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Reactive" Version="6.0.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
namespace FileTime.App.CommandPalette.Models;
|
||||||
|
|
||||||
|
public class CommandPaletteEntry : ICommandPaletteEntry
|
||||||
|
{
|
||||||
|
public string Identifier { get; }
|
||||||
|
public string Title { get; }
|
||||||
|
|
||||||
|
public CommandPaletteEntry(string identifier, string title)
|
||||||
|
{
|
||||||
|
Identifier = identifier;
|
||||||
|
Title = title;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using System.Reactive.Linq;
|
||||||
|
using System.Reactive.Subjects;
|
||||||
|
using FileTime.App.CommandPalette.Models;
|
||||||
|
using FileTime.App.CommandPalette.ViewModels;
|
||||||
|
using FileTime.App.Core.Services;
|
||||||
|
using PropertyChanged.SourceGenerator;
|
||||||
|
|
||||||
|
namespace FileTime.App.CommandPalette.Services;
|
||||||
|
|
||||||
|
public partial class CommandPaletteService : ICommandPaletteService
|
||||||
|
{
|
||||||
|
private readonly IModalService _modalService;
|
||||||
|
private readonly IIdentifiableUserCommandService _identifiableUserCommandService;
|
||||||
|
private readonly BehaviorSubject<bool> _showWindow = new(false);
|
||||||
|
IObservable<bool> ICommandPaletteService.ShowWindow => _showWindow.AsObservable();
|
||||||
|
[Notify] ICommandPaletteViewModel? _currentModal;
|
||||||
|
|
||||||
|
public CommandPaletteService(
|
||||||
|
IModalService modalService,
|
||||||
|
IIdentifiableUserCommandService identifiableUserCommandService)
|
||||||
|
{
|
||||||
|
_modalService = modalService;
|
||||||
|
_identifiableUserCommandService = identifiableUserCommandService;
|
||||||
|
}
|
||||||
|
public void OpenCommandPalette()
|
||||||
|
{
|
||||||
|
_showWindow.OnNext(true);
|
||||||
|
CurrentModal = _modalService.OpenModal<ICommandPaletteViewModel>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public IReadOnlyList<ICommandPaletteEntry> GetCommands() =>
|
||||||
|
_identifiableUserCommandService
|
||||||
|
.GetCommandIdentifiers()
|
||||||
|
.Select(c => new CommandPaletteEntry(c, c))
|
||||||
|
.ToList()
|
||||||
|
.AsReadOnly();
|
||||||
|
}
|
||||||
16
src/AppCommon/FileTime.App.CommandPalette/Startup.cs
Normal file
16
src/AppCommon/FileTime.App.CommandPalette/Startup.cs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
using FileTime.App.CommandPalette.Services;
|
||||||
|
using FileTime.App.CommandPalette.ViewModels;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.DependencyInjection.Extensions;
|
||||||
|
|
||||||
|
namespace FileTime.App.CommandPalette;
|
||||||
|
|
||||||
|
public static class Startup
|
||||||
|
{
|
||||||
|
public static IServiceCollection AddCommandPalette(this IServiceCollection services)
|
||||||
|
{
|
||||||
|
services.TryAddTransient<ICommandPaletteViewModel, CommandPaletteViewModel>();
|
||||||
|
services.TryAddSingleton<ICommandPaletteService, CommandPaletteService>();
|
||||||
|
return services;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using MvvmGen;
|
||||||
|
|
||||||
|
namespace FileTime.App.CommandPalette.ViewModels;
|
||||||
|
|
||||||
|
[ViewModel]
|
||||||
|
public partial class CommandPaletteEntryViewModel : ICommandPaletteEntryViewModel
|
||||||
|
{
|
||||||
|
[Property] private string _identifier;
|
||||||
|
[Property] private string _title;
|
||||||
|
|
||||||
|
public CommandPaletteEntryViewModel(string identifier, string title)
|
||||||
|
{
|
||||||
|
_identifier = identifier;
|
||||||
|
_title = title;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
using Avalonia.Input;
|
||||||
|
using FileTime.App.CommandPalette.Services;
|
||||||
|
using FileTime.App.Core.ViewModels;
|
||||||
|
using MvvmGen;
|
||||||
|
|
||||||
|
namespace FileTime.App.CommandPalette.ViewModels;
|
||||||
|
|
||||||
|
[ViewModel]
|
||||||
|
[Inject(typeof(ICommandPaletteService), "_commandPaletteService")]
|
||||||
|
public partial class CommandPaletteViewModel : ICommandPaletteViewModel
|
||||||
|
{
|
||||||
|
private string _searchText;
|
||||||
|
|
||||||
|
[Property] private IObservable<bool> _showWindow;
|
||||||
|
[Property] private List<ICommandPaletteEntryViewModel> _filteredMatches;
|
||||||
|
[Property] private ICommandPaletteEntryViewModel? _selectedItem;
|
||||||
|
string IModalViewModel.Name => "CommandPalette";
|
||||||
|
|
||||||
|
public string SearchText
|
||||||
|
{
|
||||||
|
get => _searchText;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (_searchText == value) return;
|
||||||
|
|
||||||
|
_searchText = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
|
||||||
|
UpdateFilteredMatches();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Close() => throw new NotImplementedException();
|
||||||
|
|
||||||
|
public void HandleKeyDown(KeyEventArgs keyEventArgs) => throw new NotImplementedException();
|
||||||
|
|
||||||
|
partial void OnInitialize()
|
||||||
|
{
|
||||||
|
ShowWindow = _commandPaletteService.ShowWindow;
|
||||||
|
UpdateFilteredMatches();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateFilteredMatches()
|
||||||
|
{
|
||||||
|
FilteredMatches = _commandPaletteService
|
||||||
|
.GetCommands()
|
||||||
|
.Select(c =>
|
||||||
|
(ICommandPaletteEntryViewModel) new CommandPaletteEntryViewModel(c.Identifier, c.Title))
|
||||||
|
.Take(30) // TODO remove magic number
|
||||||
|
.OrderBy(c => c.Title)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
if (SelectedItem != null && FilteredMatches.Contains(SelectedItem)) return;
|
||||||
|
|
||||||
|
SelectedItem = FilteredMatches.Count > 0
|
||||||
|
? FilteredMatches[0]
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
using System.Collections.ObjectModel;
|
|
||||||
|
|
||||||
namespace FileTime.App.Core.Extensions;
|
namespace FileTime.App.Core.Extensions;
|
||||||
|
|
||||||
public static class DisposableExtensions
|
public static class DisposableExtensions
|
||||||
|
|||||||
@@ -6,4 +6,5 @@ public interface IIdentifiableUserCommandService
|
|||||||
{
|
{
|
||||||
void AddIdentifiableUserCommandFactory(string identifier, Func<IIdentifiableUserCommand> commandFactory);
|
void AddIdentifiableUserCommandFactory(string identifier, Func<IIdentifiableUserCommand> commandFactory);
|
||||||
IIdentifiableUserCommand GetCommand(string identifier);
|
IIdentifiableUserCommand GetCommand(string identifier);
|
||||||
|
IReadOnlyCollection<string> GetCommandIdentifiers();
|
||||||
}
|
}
|
||||||
@@ -3,4 +3,5 @@ namespace FileTime.App.Core.UserCommand;
|
|||||||
public interface IIdentifiableUserCommand : IUserCommand
|
public interface IIdentifiableUserCommand : IUserCommand
|
||||||
{
|
{
|
||||||
string UserCommandID { get; }
|
string UserCommandID { get; }
|
||||||
|
//string Title { get; }
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
namespace FileTime.App.Core.UserCommand;
|
||||||
|
|
||||||
|
public class OpenCommandPaletteCommand : IIdentifiableUserCommand
|
||||||
|
{
|
||||||
|
public const string CommandName = "open_command_palette";
|
||||||
|
public static OpenCommandPaletteCommand Instance { get; } = new ();
|
||||||
|
|
||||||
|
private OpenCommandPaletteCommand()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public string UserCommandID => CommandName;
|
||||||
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
using DynamicData;
|
using DynamicData;
|
||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Services;
|
using FileTime.Core.Services;
|
||||||
using InitableService;
|
using InitableService;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Timeline;
|
|
||||||
|
|
||||||
namespace FileTime.App.Core.ViewModels.Timeline;
|
namespace FileTime.App.Core.ViewModels.Timeline;
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,8 @@
|
|||||||
<ProjectReference Include="..\..\Core\FileTime.Core.Models\FileTime.Core.Models.csproj" />
|
<ProjectReference Include="..\..\Core\FileTime.Core.Models\FileTime.Core.Models.csproj" />
|
||||||
<ProjectReference Include="..\..\Providers\FileTime.Providers.Local.Abstractions\FileTime.Providers.Local.Abstractions.csproj" />
|
<ProjectReference Include="..\..\Providers\FileTime.Providers.Local.Abstractions\FileTime.Providers.Local.Abstractions.csproj" />
|
||||||
<ProjectReference Include="..\..\Tools\FileTime.Tools\FileTime.Tools.csproj" />
|
<ProjectReference Include="..\..\Tools\FileTime.Tools\FileTime.Tools.csproj" />
|
||||||
|
<ProjectReference Include="..\FileTime.App.CommandPalette.Abstractions\FileTime.App.CommandPalette.Abstractions.csproj" />
|
||||||
|
<ProjectReference Include="..\FileTime.App.CommandPalette\FileTime.App.CommandPalette.csproj" />
|
||||||
<ProjectReference Include="..\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
|
<ProjectReference Include="..\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
|
||||||
<ProjectReference Include="..\..\Core\FileTime.Core.Command\FileTime.Core.Command.csproj" />
|
<ProjectReference Include="..\..\Core\FileTime.Core.Command\FileTime.Core.Command.csproj" />
|
||||||
<ProjectReference Include="..\FileTime.App.FrequencyNavigation.Abstractions\FileTime.App.FrequencyNavigation.Abstractions.csproj" />
|
<ProjectReference Include="..\FileTime.App.FrequencyNavigation.Abstractions\FileTime.App.FrequencyNavigation.Abstractions.csproj" />
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ using FileTime.App.Core.ViewModels;
|
|||||||
using FileTime.App.Core.ViewModels.ItemPreview;
|
using FileTime.App.Core.ViewModels.ItemPreview;
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using InitableService;
|
using InitableService;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
|
|
||||||
namespace FileTime.App.Core.Services;
|
namespace FileTime.App.Core.Services;
|
||||||
|
|
||||||
|
|||||||
@@ -16,4 +16,6 @@ public class IdentifiableUserCommandService : IIdentifiableUserCommandService
|
|||||||
|
|
||||||
return _identifiableUserCommands[identifier].Invoke();
|
return _identifiableUserCommands[identifier].Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IReadOnlyCollection<string> GetCommandIdentifiers() => _identifiableUserCommands.Keys.ToList();
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.App.Core.Models.Enums;
|
using FileTime.App.Core.Models.Enums;
|
||||||
using FileTime.App.Core.UserCommand;
|
using FileTime.App.Core.UserCommand;
|
||||||
using FileTime.App.Core.ViewModels;
|
using FileTime.App.Core.ViewModels;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using FileTime.App.CommandPalette.Services;
|
||||||
using FileTime.App.Core.Extensions;
|
using FileTime.App.Core.Extensions;
|
||||||
using FileTime.App.Core.Models.Enums;
|
using FileTime.App.Core.Models.Enums;
|
||||||
using FileTime.App.Core.UserCommand;
|
using FileTime.App.Core.UserCommand;
|
||||||
@@ -22,6 +23,7 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
|
|||||||
private readonly ITimelessContentProvider _timelessContentProvider;
|
private readonly ITimelessContentProvider _timelessContentProvider;
|
||||||
private readonly IUserCommunicationService _userCommunicationService;
|
private readonly IUserCommunicationService _userCommunicationService;
|
||||||
private readonly IFrequencyNavigationService _frequencyNavigationService;
|
private readonly IFrequencyNavigationService _frequencyNavigationService;
|
||||||
|
private readonly ICommandPaletteService _commandPaletteService;
|
||||||
private ITabViewModel? _selectedTab;
|
private ITabViewModel? _selectedTab;
|
||||||
private IContainer? _currentLocation;
|
private IContainer? _currentLocation;
|
||||||
private IItemViewModel? _currentSelectedItem;
|
private IItemViewModel? _currentSelectedItem;
|
||||||
@@ -35,7 +37,8 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
|
|||||||
IUserCommandHandlerService userCommandHandlerService,
|
IUserCommandHandlerService userCommandHandlerService,
|
||||||
ITimelessContentProvider timelessContentProvider,
|
ITimelessContentProvider timelessContentProvider,
|
||||||
IUserCommunicationService userCommunicationService,
|
IUserCommunicationService userCommunicationService,
|
||||||
IFrequencyNavigationService frequencyNavigationService) : base(appState)
|
IFrequencyNavigationService frequencyNavigationService,
|
||||||
|
ICommandPaletteService commandPaletteService) : base(appState)
|
||||||
{
|
{
|
||||||
_appState = appState;
|
_appState = appState;
|
||||||
_serviceProvider = serviceProvider;
|
_serviceProvider = serviceProvider;
|
||||||
@@ -44,6 +47,7 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
|
|||||||
_timelessContentProvider = timelessContentProvider;
|
_timelessContentProvider = timelessContentProvider;
|
||||||
_userCommunicationService = userCommunicationService;
|
_userCommunicationService = userCommunicationService;
|
||||||
_frequencyNavigationService = frequencyNavigationService;
|
_frequencyNavigationService = frequencyNavigationService;
|
||||||
|
_commandPaletteService = commandPaletteService;
|
||||||
|
|
||||||
SaveSelectedTab(t => _selectedTab = t);
|
SaveSelectedTab(t => _selectedTab = t);
|
||||||
SaveCurrentSelectedItem(i => _currentSelectedItem = i);
|
SaveCurrentSelectedItem(i => _currentSelectedItem = i);
|
||||||
@@ -69,6 +73,7 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
|
|||||||
new TypeUserCommandHandler<MoveCursorToLastCommand>(MoveCursorToLast),
|
new TypeUserCommandHandler<MoveCursorToLastCommand>(MoveCursorToLast),
|
||||||
new TypeUserCommandHandler<MoveCursorUpCommand>(MoveCursorUp),
|
new TypeUserCommandHandler<MoveCursorUpCommand>(MoveCursorUp),
|
||||||
new TypeUserCommandHandler<MoveCursorUpPageCommand>(MoveCursorUpPage),
|
new TypeUserCommandHandler<MoveCursorUpPageCommand>(MoveCursorUpPage),
|
||||||
|
new TypeUserCommandHandler<OpenCommandPaletteCommand>(OpenCommandPalette),
|
||||||
new TypeUserCommandHandler<OpenContainerCommand>(OpenContainer),
|
new TypeUserCommandHandler<OpenContainerCommand>(OpenContainer),
|
||||||
new TypeUserCommandHandler<OpenSelectedCommand>(OpenSelected),
|
new TypeUserCommandHandler<OpenSelectedCommand>(OpenSelected),
|
||||||
new TypeUserCommandHandler<RefreshCommand>(Refresh),
|
new TypeUserCommandHandler<RefreshCommand>(Refresh),
|
||||||
@@ -76,6 +81,12 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Task OpenCommandPalette()
|
||||||
|
{
|
||||||
|
_commandPaletteService.OpenCommandPalette();
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
private Task GoByFrequency()
|
private Task GoByFrequency()
|
||||||
{
|
{
|
||||||
_frequencyNavigationService.OpenNavigationWindow();
|
_frequencyNavigationService.OpenNavigationWindow();
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Security.Cryptography;
|
|
||||||
using System.Text;
|
|
||||||
using FileTime.App.Core.UserCommand;
|
using FileTime.App.Core.UserCommand;
|
||||||
using FileTime.App.Core.ViewModels;
|
using FileTime.App.Core.ViewModels;
|
||||||
using FileTime.App.Search;
|
using FileTime.App.Search;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using FileTime.App.CommandPalette.ViewModels;
|
||||||
using FileTime.App.Core.Services;
|
using FileTime.App.Core.Services;
|
||||||
using FileTime.App.Core.Services.UserCommandHandler;
|
using FileTime.App.Core.Services.UserCommandHandler;
|
||||||
using FileTime.App.Core.StartupServices;
|
using FileTime.App.Core.StartupServices;
|
||||||
@@ -25,6 +26,7 @@ public static class Startup
|
|||||||
serviceCollection.TryAddSingleton<IIdentifiableUserCommandService, IdentifiableUserCommandService>();
|
serviceCollection.TryAddSingleton<IIdentifiableUserCommandService, IdentifiableUserCommandService>();
|
||||||
serviceCollection.TryAddSingleton<IItemPreviewService, ItemPreviewService>();
|
serviceCollection.TryAddSingleton<IItemPreviewService, ItemPreviewService>();
|
||||||
serviceCollection.TryAddSingleton<ITimelineViewModel, TimelineViewModel>();
|
serviceCollection.TryAddSingleton<ITimelineViewModel, TimelineViewModel>();
|
||||||
|
serviceCollection.TryAddSingleton<ICommandPaletteViewModel, CommandPaletteViewModel>();
|
||||||
|
|
||||||
return serviceCollection
|
return serviceCollection
|
||||||
.AddCommandHandlers()
|
.AddCommandHandlers()
|
||||||
|
|||||||
@@ -5,11 +5,11 @@ namespace FileTime.App.Core.StartupServices;
|
|||||||
|
|
||||||
public class DefaultIdentifiableCommandHandlerRegister : IStartupHandler
|
public class DefaultIdentifiableCommandHandlerRegister : IStartupHandler
|
||||||
{
|
{
|
||||||
private readonly IIdentifiableUserCommandService _service;
|
private readonly IIdentifiableUserCommandService _userCommandHandlerService;
|
||||||
|
|
||||||
public DefaultIdentifiableCommandHandlerRegister(IIdentifiableUserCommandService service)
|
public DefaultIdentifiableCommandHandlerRegister(IIdentifiableUserCommandService userCommandHandlerService)
|
||||||
{
|
{
|
||||||
_service = service;
|
_userCommandHandlerService = userCommandHandlerService;
|
||||||
|
|
||||||
AddUserCommand(CloseTabCommand.Instance);
|
AddUserCommand(CloseTabCommand.Instance);
|
||||||
AddUserCommand(CopyCommand.Instance);
|
AddUserCommand(CopyCommand.Instance);
|
||||||
@@ -34,6 +34,7 @@ public class DefaultIdentifiableCommandHandlerRegister : IStartupHandler
|
|||||||
AddUserCommand(MoveCursorToLastCommand.Instance);
|
AddUserCommand(MoveCursorToLastCommand.Instance);
|
||||||
AddUserCommand(MoveCursorUpCommand.Instance);
|
AddUserCommand(MoveCursorUpCommand.Instance);
|
||||||
AddUserCommand(MoveCursorUpPageCommand.Instance);
|
AddUserCommand(MoveCursorUpPageCommand.Instance);
|
||||||
|
AddUserCommand(OpenCommandPaletteCommand.Instance);
|
||||||
AddUserCommand(OpenInDefaultFileExplorerCommand.Instance);
|
AddUserCommand(OpenInDefaultFileExplorerCommand.Instance);
|
||||||
AddUserCommand(OpenSelectedCommand.Instance);
|
AddUserCommand(OpenSelectedCommand.Instance);
|
||||||
AddUserCommand(PasteCommand.Merge);
|
AddUserCommand(PasteCommand.Merge);
|
||||||
@@ -58,5 +59,5 @@ public class DefaultIdentifiableCommandHandlerRegister : IStartupHandler
|
|||||||
public Task InitAsync() => Task.CompletedTask;
|
public Task InitAsync() => Task.CompletedTask;
|
||||||
|
|
||||||
private void AddUserCommand(IIdentifiableUserCommand command)
|
private void AddUserCommand(IIdentifiableUserCommand command)
|
||||||
=> _service.AddIdentifiableUserCommandFactory(command.UserCommandID, () => command);
|
=> _userCommandHandlerService.AddIdentifiableUserCommandFactory(command.UserCommandID, () => command);
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,6 @@ using System.Reactive.Linq;
|
|||||||
using DynamicData;
|
using DynamicData;
|
||||||
using DynamicData.Binding;
|
using DynamicData.Binding;
|
||||||
using FileTime.App.Core.Extensions;
|
using FileTime.App.Core.Extensions;
|
||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.App.Core.Models.Enums;
|
using FileTime.App.Core.Models.Enums;
|
||||||
using FileTime.App.Core.Services;
|
using FileTime.App.Core.Services;
|
||||||
using FileTime.Core.Enums;
|
using FileTime.Core.Enums;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ public partial class FrequencyNavigationViewModel : IFrequencyNavigationViewMode
|
|||||||
|
|
||||||
[Property] private IObservable<bool> _showWindow;
|
[Property] private IObservable<bool> _showWindow;
|
||||||
[Property] private List<string> _filteredMatches;
|
[Property] private List<string> _filteredMatches;
|
||||||
[Property] private string _selectedItem;
|
[Property] private string? _selectedItem;
|
||||||
|
|
||||||
public string SearchText
|
public string SearchText
|
||||||
{
|
{
|
||||||
@@ -68,12 +68,12 @@ public partial class FrequencyNavigationViewModel : IFrequencyNavigationViewMode
|
|||||||
}
|
}
|
||||||
|
|
||||||
partial void OnInitialize()
|
partial void OnInitialize()
|
||||||
=> _showWindow = _frequencyNavigationService.ShowWindow;
|
=> ShowWindow = _frequencyNavigationService.ShowWindow;
|
||||||
|
|
||||||
private void UpdateFilteredMatches()
|
private void UpdateFilteredMatches()
|
||||||
{
|
{
|
||||||
FilteredMatches = new List<string>(_frequencyNavigationService.GetMatchingContainers(_searchText));
|
FilteredMatches = new List<string>(_frequencyNavigationService.GetMatchingContainers(_searchText));
|
||||||
if (FilteredMatches.Contains(SelectedItem)) return;
|
if (SelectedItem != null && FilteredMatches.Contains(SelectedItem)) return;
|
||||||
|
|
||||||
SelectedItem = FilteredMatches.Count > 0
|
SelectedItem = FilteredMatches.Count > 0
|
||||||
? FilteredMatches[0]
|
? FilteredMatches[0]
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
using System.Reactive.Linq;
|
|
||||||
using DynamicData;
|
using DynamicData;
|
||||||
using FileTime.Core.ContentAccess;
|
using FileTime.Core.ContentAccess;
|
||||||
using FileTime.Core.Enums;
|
using FileTime.Core.Enums;
|
||||||
using FileTime.Core.Extensions;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Timeline;
|
using FileTime.Core.Timeline;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
using FileTime.Core.Timeline;
|
|
||||||
|
|
||||||
namespace FileTime.Core.Command;
|
namespace FileTime.Core.Command;
|
||||||
|
|
||||||
public interface ICommandRunner
|
public interface ICommandRunner
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
using FileTime.Core.Timeline;
|
|
||||||
|
|
||||||
namespace FileTime.Core.Command;
|
namespace FileTime.Core.Command;
|
||||||
|
|
||||||
public interface IExecutableCommand : ICommand
|
public interface IExecutableCommand : ICommand
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.Reactive.Linq;
|
|
||||||
using DynamicData;
|
using DynamicData;
|
||||||
using FileTime.Core.ContentAccess;
|
using FileTime.Core.ContentAccess;
|
||||||
using FileTime.Core.Enums;
|
using FileTime.Core.Enums;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Services;
|
|
||||||
|
|
||||||
namespace FileTime.Core.Timeline;
|
namespace FileTime.Core.Timeline;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using FileTime.Core.Enums;
|
using FileTime.Core.Enums;
|
||||||
using FileTime.Core.Extensions;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Timeline;
|
using FileTime.Core.Timeline;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using FileTime.Core.ContentAccess;
|
using FileTime.Core.ContentAccess;
|
||||||
using FileTime.Core.Enums;
|
using FileTime.Core.Enums;
|
||||||
using FileTime.Core.Extensions;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Timeline;
|
using FileTime.Core.Timeline;
|
||||||
using InitableService;
|
using InitableService;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using FileTime.Core.ContentAccess;
|
using FileTime.Core.ContentAccess;
|
||||||
using FileTime.Core.Extensions;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Timeline;
|
using FileTime.Core.Timeline;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using FileTime.Core.Extensions;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
|
|
||||||
namespace FileTime.Core.Command;
|
namespace FileTime.Core.Command;
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
using FileTime.Core.Command;
|
using FileTime.Core.Command;
|
||||||
using FileTime.Core.Command.Copy;
|
using FileTime.Core.Command.Copy;
|
||||||
using FileTime.Core.ContentAccess;
|
using FileTime.Core.ContentAccess;
|
||||||
using FileTime.Core.Extensions;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
|
|
||||||
namespace FileTime.Core.CommandHandlers;
|
namespace FileTime.Core.CommandHandlers;
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileTime.App.Search", "AppC
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileTime.App.Search.Abstractions", "AppCommon\FileTime.App.Search.Abstractions\FileTime.App.Search.Abstractions.csproj", "{D8D4A5C3-14B5-49E7-B029-D6E5D9574388}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileTime.App.Search.Abstractions", "AppCommon\FileTime.App.Search.Abstractions\FileTime.App.Search.Abstractions.csproj", "{D8D4A5C3-14B5-49E7-B029-D6E5D9574388}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileTime.App.CommandPalette", "AppCommon\FileTime.App.CommandPalette\FileTime.App.CommandPalette.csproj", "{D0CC03DA-4705-48BD-9C4F-B11545D8BC83}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileTime.App.CommandPalette.Abstractions", "AppCommon\FileTime.App.CommandPalette.Abstractions\FileTime.App.CommandPalette.Abstractions.csproj", "{5B3D2008-371F-485C-92C0-127F6CD64F64}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -181,6 +185,14 @@ Global
|
|||||||
{D8D4A5C3-14B5-49E7-B029-D6E5D9574388}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{D8D4A5C3-14B5-49E7-B029-D6E5D9574388}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{D8D4A5C3-14B5-49E7-B029-D6E5D9574388}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{D8D4A5C3-14B5-49E7-B029-D6E5D9574388}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{D8D4A5C3-14B5-49E7-B029-D6E5D9574388}.Release|Any CPU.Build.0 = Release|Any CPU
|
{D8D4A5C3-14B5-49E7-B029-D6E5D9574388}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{D0CC03DA-4705-48BD-9C4F-B11545D8BC83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{D0CC03DA-4705-48BD-9C4F-B11545D8BC83}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{D0CC03DA-4705-48BD-9C4F-B11545D8BC83}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{D0CC03DA-4705-48BD-9C4F-B11545D8BC83}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{5B3D2008-371F-485C-92C0-127F6CD64F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{5B3D2008-371F-485C-92C0-127F6CD64F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{5B3D2008-371F-485C-92C0-127F6CD64F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{5B3D2008-371F-485C-92C0-127F6CD64F64}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -213,6 +225,8 @@ Global
|
|||||||
{C1CA8B7E-F8E6-40AB-A45B-5EBEF6996290} = {A5291117-3001-498B-AC8B-E14F71F72570}
|
{C1CA8B7E-F8E6-40AB-A45B-5EBEF6996290} = {A5291117-3001-498B-AC8B-E14F71F72570}
|
||||||
{0D3C3584-242F-4DD6-A04A-2225A8AB6746} = {A5291117-3001-498B-AC8B-E14F71F72570}
|
{0D3C3584-242F-4DD6-A04A-2225A8AB6746} = {A5291117-3001-498B-AC8B-E14F71F72570}
|
||||||
{D8D4A5C3-14B5-49E7-B029-D6E5D9574388} = {A5291117-3001-498B-AC8B-E14F71F72570}
|
{D8D4A5C3-14B5-49E7-B029-D6E5D9574388} = {A5291117-3001-498B-AC8B-E14F71F72570}
|
||||||
|
{D0CC03DA-4705-48BD-9C4F-B11545D8BC83} = {A5291117-3001-498B-AC8B-E14F71F72570}
|
||||||
|
{5B3D2008-371F-485C-92C0-127F6CD64F64} = {A5291117-3001-498B-AC8B-E14F71F72570}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {859FB3DF-C60A-46B1-82E5-90274905D1EF}
|
SolutionGuid = {859FB3DF-C60A-46B1-82E5-90274905D1EF}
|
||||||
|
|||||||
@@ -71,6 +71,8 @@ public static class MainConfiguration
|
|||||||
new(MoveCursorToFirstCommand.CommandName, new[] {Key.G, Key.G}),
|
new(MoveCursorToFirstCommand.CommandName, new[] {Key.G, Key.G}),
|
||||||
//new CommandBindingConfiguration(ConfigCommand.NextTimelineBlock, Key.L ),
|
//new CommandBindingConfiguration(ConfigCommand.NextTimelineBlock, Key.L ),
|
||||||
//new CommandBindingConfiguration(ConfigCommand.NextTimelineCommand, Key.J ),
|
//new CommandBindingConfiguration(ConfigCommand.NextTimelineCommand, Key.J ),
|
||||||
|
new(OpenCommandPaletteCommand.CommandName, new[] {Key.F1}),
|
||||||
|
new(OpenCommandPaletteCommand.CommandName, new[] {new KeyConfig(Key.P, ctrl: true, shift: true)}),
|
||||||
new(OpenInDefaultFileExplorerCommand.CommandName, new[] {Key.O, Key.E}),
|
new(OpenInDefaultFileExplorerCommand.CommandName, new[] {Key.O, Key.E}),
|
||||||
new(PasteCommand.PasteMergeCommandName, new[] {Key.P, Key.P}),
|
new(PasteCommand.PasteMergeCommandName, new[] {Key.P, Key.P}),
|
||||||
new(PasteCommand.PasteOverwriteCommandName, new[] {Key.P, Key.O}),
|
new(PasteCommand.PasteOverwriteCommandName, new[] {Key.P, Key.O}),
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.Core.Interactions;
|
using FileTime.Core.Interactions;
|
||||||
using FileTime.GuiApp.ViewModels;
|
using FileTime.GuiApp.ViewModels;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.App.Core.ViewModels;
|
using FileTime.App.Core.ViewModels;
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.GuiApp.Configuration;
|
using FileTime.GuiApp.Configuration;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls.ApplicationLifetimes;
|
using Avalonia.Controls.ApplicationLifetimes;
|
||||||
using Avalonia.Markup.Xaml;
|
using Avalonia.Markup.Xaml;
|
||||||
|
using FileTime.App.CommandPalette;
|
||||||
using FileTime.App.DependencyInjection;
|
using FileTime.App.DependencyInjection;
|
||||||
using FileTime.App.FrequencyNavigation;
|
using FileTime.App.FrequencyNavigation;
|
||||||
using FileTime.App.Search;
|
using FileTime.App.Search;
|
||||||
@@ -20,6 +21,7 @@ public partial class App : Application
|
|||||||
DI.ServiceProvider = DependencyInjection
|
DI.ServiceProvider = DependencyInjection
|
||||||
.RegisterDefaultServices()
|
.RegisterDefaultServices()
|
||||||
.AddFrequencyNavigation()
|
.AddFrequencyNavigation()
|
||||||
|
.AddCommandPalette()
|
||||||
.AddSearch()
|
.AddSearch()
|
||||||
.AddConfiguration(configuration)
|
.AddConfiguration(configuration)
|
||||||
.ConfigureFont(configuration)
|
.ConfigureFont(configuration)
|
||||||
|
|||||||
@@ -38,6 +38,7 @@
|
|||||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
|
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.CommandPalette\FileTime.App.CommandPalette.csproj" />
|
||||||
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.Core\FileTime.App.Core.csproj" />
|
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.Core\FileTime.App.Core.csproj" />
|
||||||
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.DependencyInjection\FileTime.App.DependencyInjection.csproj" />
|
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.DependencyInjection\FileTime.App.DependencyInjection.csproj" />
|
||||||
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.FrequencyNavigation\FileTime.App.FrequencyNavigation.csproj" />
|
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.FrequencyNavigation\FileTime.App.FrequencyNavigation.csproj" />
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.CommandPalette.Abstractions\FileTime.App.CommandPalette.Abstractions.csproj" />
|
||||||
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
|
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
|
||||||
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.FrequencyNavigation.Abstractions\FileTime.App.FrequencyNavigation.Abstractions.csproj" />
|
<ProjectReference Include="..\..\..\AppCommon\FileTime.App.FrequencyNavigation.Abstractions\FileTime.App.FrequencyNavigation.Abstractions.csproj" />
|
||||||
<ProjectReference Include="..\..\..\Providers\FileTime.Providers.Local.Abstractions\FileTime.Providers.Local.Abstractions.csproj" />
|
<ProjectReference Include="..\..\..\Providers\FileTime.Providers.Local.Abstractions\FileTime.Providers.Local.Abstractions.csproj" />
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.Runtime.InteropServices;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.GuiApp.Models;
|
using FileTime.GuiApp.Models;
|
||||||
using FileTime.GuiApp.Services;
|
using FileTime.GuiApp.Services;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.App.Core.Services;
|
using FileTime.App.Core.Services;
|
||||||
using FileTime.App.Core.UserCommand;
|
using FileTime.App.Core.UserCommand;
|
||||||
using FileTime.App.Core.ViewModels;
|
using FileTime.App.Core.ViewModels;
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using Avalonia.Threading;
|
using Avalonia.Threading;
|
||||||
using DynamicData;
|
using DynamicData;
|
||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.App.Core.Services;
|
using FileTime.App.Core.Services;
|
||||||
using FileTime.Core.Interactions;
|
using FileTime.Core.Interactions;
|
||||||
using FileTime.GuiApp.ViewModels;
|
using FileTime.GuiApp.ViewModels;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.Collections.ObjectModel;
|
|
||||||
using FileTime.App.Core.UserCommand;
|
using FileTime.App.Core.UserCommand;
|
||||||
using FileTime.GuiApp.Configuration;
|
using FileTime.GuiApp.Configuration;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.App.Core.Services;
|
using FileTime.App.Core.Services;
|
||||||
using FileTime.App.Core.UserCommand;
|
using FileTime.App.Core.UserCommand;
|
||||||
using FileTime.App.Core.ViewModels;
|
using FileTime.App.Core.ViewModels;
|
||||||
|
|||||||
@@ -1,12 +1,9 @@
|
|||||||
using System.Reactive.Linq;
|
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using DynamicData;
|
using DynamicData;
|
||||||
using DynamicData.Binding;
|
using DynamicData.Binding;
|
||||||
using FileTime.App.Core.Models;
|
|
||||||
using FileTime.App.Core.Services;
|
using FileTime.App.Core.Services;
|
||||||
using FileTime.Core.Extensions;
|
using FileTime.Core.Extensions;
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Timeline;
|
|
||||||
using FileTime.GuiApp.ViewModels;
|
using FileTime.GuiApp.ViewModels;
|
||||||
using FileTime.Providers.Local;
|
using FileTime.Providers.Local;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using FileTime.App.Core.Services;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Timeline;
|
using FileTime.Core.Timeline;
|
||||||
using FileTime.GuiApp.IconProviders;
|
using FileTime.GuiApp.IconProviders;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
|
using FileTime.App.CommandPalette.Services;
|
||||||
using FileTime.App.Core.Services;
|
using FileTime.App.Core.Services;
|
||||||
using FileTime.App.Core.UserCommand;
|
using FileTime.App.Core.UserCommand;
|
||||||
using FileTime.App.FrequencyNavigation.Services;
|
using FileTime.App.FrequencyNavigation.Services;
|
||||||
using FileTime.App.FrequencyNavigation.ViewModels;
|
|
||||||
using FileTime.Core.Models;
|
using FileTime.Core.Models;
|
||||||
using FileTime.Core.Timeline;
|
using FileTime.Core.Timeline;
|
||||||
using FileTime.GuiApp.Services;
|
using FileTime.GuiApp.Services;
|
||||||
@@ -27,6 +27,7 @@ namespace FileTime.GuiApp.ViewModels;
|
|||||||
[Inject(typeof(ITimelessContentProvider), PropertyName = "_timelessContentProvider")]
|
[Inject(typeof(ITimelessContentProvider), PropertyName = "_timelessContentProvider")]
|
||||||
[Inject(typeof(IFontService), "_fontService")]
|
[Inject(typeof(IFontService), "_fontService")]
|
||||||
[Inject(typeof(IFrequencyNavigationService), PropertyAccessModifier = AccessModifier.Public)]
|
[Inject(typeof(IFrequencyNavigationService), PropertyAccessModifier = AccessModifier.Public)]
|
||||||
|
[Inject(typeof(ICommandPaletteService), PropertyAccessModifier = AccessModifier.Public)]
|
||||||
public partial class MainWindowViewModel : IMainWindowViewModelBase
|
public partial class MainWindowViewModel : IMainWindowViewModelBase
|
||||||
{
|
{
|
||||||
public bool Loading => false;
|
public bool Loading => false;
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<UserControl
|
||||||
|
d:DesignHeight="450"
|
||||||
|
d:DesignWidth="800"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
x:Class="FileTime.GuiApp.Views.CommandPalette"
|
||||||
|
xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
|
<UserControl.Styles>
|
||||||
|
<StyleInclude Source="avares://FileTime.GuiApp/Resources/Styles.axaml" />
|
||||||
|
</UserControl.Styles>
|
||||||
|
<Grid RowDefinitions="Auto,*">
|
||||||
|
<TextBox
|
||||||
|
Focusable="True"
|
||||||
|
KeyDown="Search_OnKeyDown"
|
||||||
|
Text="{Binding SearchText, Mode=TwoWay}" />
|
||||||
|
<ListBox
|
||||||
|
Classes="CommandPalette"
|
||||||
|
Grid.Row="1"
|
||||||
|
ItemsSource="{Binding FilteredMatches}"
|
||||||
|
SelectedItem="{Binding SelectedItem}">
|
||||||
|
<ListBox.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<Grid Margin="5">
|
||||||
|
<TextBlock Text="{Binding Identifier}" />
|
||||||
|
</Grid>
|
||||||
|
</DataTemplate>
|
||||||
|
</ListBox.ItemTemplate>
|
||||||
|
</ListBox>
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Input;
|
||||||
|
using Avalonia.Markup.Xaml;
|
||||||
|
using FileTime.App.FrequencyNavigation.ViewModels;
|
||||||
|
|
||||||
|
namespace FileTime.GuiApp.Views;
|
||||||
|
|
||||||
|
public partial class CommandPalette : UserControl
|
||||||
|
{
|
||||||
|
public CommandPalette()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
AvaloniaXamlLoader.Load(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Search_OnKeyDown(object? sender, KeyEventArgs e)
|
||||||
|
{
|
||||||
|
if (DataContext is not IFrequencyNavigationViewModel viewModel) return;
|
||||||
|
|
||||||
|
if (e.Key == Key.Escape)
|
||||||
|
{
|
||||||
|
viewModel.Close();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
viewModel.HandleKeyDown(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
using Avalonia;
|
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
using Avalonia.Markup.Xaml;
|
using Avalonia.Markup.Xaml;
|
||||||
|
|||||||
@@ -1,7 +1,23 @@
|
|||||||
<Window
|
<Window
|
||||||
|
Background="Transparent"
|
||||||
|
Closed="OnWindowClosed"
|
||||||
|
ExtendClientAreaToDecorationsHint="True"
|
||||||
|
FontFamily="{Binding MainFont^, Mode=OneWay}"
|
||||||
|
Icon="/Assets/filetime.ico"
|
||||||
|
KeyDown="OnKeyDown"
|
||||||
|
MinHeight="600"
|
||||||
|
MinWidth="800"
|
||||||
|
Opened="OnWindowOpened"
|
||||||
|
RequestedThemeVariant="Dark"
|
||||||
|
Title="FileTime"
|
||||||
|
TransparencyLevelHint="Blur"
|
||||||
|
d:DesignHeight="450"
|
||||||
|
d:DesignWidth="800"
|
||||||
|
mc:Ignorable="d"
|
||||||
x:Class="FileTime.GuiApp.Views.MainWindow"
|
x:Class="FileTime.GuiApp.Views.MainWindow"
|
||||||
|
x:CompileBindings="True"
|
||||||
|
x:DataType="vm:IMainWindowViewModelBase"
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:appCoreModels="using:FileTime.App.Core.Models"
|
xmlns:appCoreModels="using:FileTime.App.Core.Models"
|
||||||
xmlns:config="using:FileTime.GuiApp.Configuration"
|
xmlns:config="using:FileTime.GuiApp.Configuration"
|
||||||
xmlns:corevm="using:FileTime.App.Core.ViewModels"
|
xmlns:corevm="using:FileTime.App.Core.ViewModels"
|
||||||
@@ -10,23 +26,7 @@
|
|||||||
xmlns:local="using:FileTime.GuiApp.Views"
|
xmlns:local="using:FileTime.GuiApp.Views"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:vm="using:FileTime.GuiApp.ViewModels"
|
xmlns:vm="using:FileTime.GuiApp.ViewModels"
|
||||||
Title="FileTime"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
MinWidth="800"
|
|
||||||
MinHeight="600"
|
|
||||||
d:DesignHeight="450"
|
|
||||||
d:DesignWidth="800"
|
|
||||||
x:CompileBindings="True"
|
|
||||||
x:DataType="vm:IMainWindowViewModelBase"
|
|
||||||
Background="Transparent"
|
|
||||||
Closed="OnWindowClosed"
|
|
||||||
ExtendClientAreaToDecorationsHint="True"
|
|
||||||
FontFamily="{Binding MainFont^, Mode=OneWay}"
|
|
||||||
Icon="/Assets/filetime.ico"
|
|
||||||
KeyDown="OnKeyDown"
|
|
||||||
Opened="OnWindowOpened"
|
|
||||||
RequestedThemeVariant="Dark"
|
|
||||||
TransparencyLevelHint="Blur"
|
|
||||||
mc:Ignorable="d">
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
@@ -41,54 +41,36 @@
|
|||||||
</Window.Styles>
|
</Window.Styles>
|
||||||
|
|
||||||
<Grid Background="{DynamicResource AppBackgroundBrush}">
|
<Grid Background="{DynamicResource AppBackgroundBrush}">
|
||||||
<Grid
|
<Grid IsVisible="{Binding Loading, Converter={x:Static BoolConverters.Not}, FallbackValue=False}" x:DataType="vm:MainWindowViewModel">
|
||||||
x:DataType="vm:MainWindowViewModel"
|
|
||||||
IsVisible="{Binding Loading, Converter={x:Static BoolConverters.Not}, FallbackValue=False}">
|
|
||||||
|
|
||||||
<Grid
|
<Grid ColumnDefinitions="250,*" RowDefinitions="Auto,*">
|
||||||
ColumnDefinitions="250,*"
|
|
||||||
RowDefinitions="Auto,*">
|
|
||||||
|
|
||||||
<Grid PointerPressed="HeaderPointerPressed">
|
<Grid PointerPressed="HeaderPointerPressed">
|
||||||
<Rectangle Fill="#01000000" />
|
<Rectangle Fill="#01000000" />
|
||||||
<TextBlock
|
<TextBlock Margin="15,10" Text="{Binding Title}" />
|
||||||
Margin="15,10"
|
|
||||||
Text="{Binding Title}" />
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid
|
<Grid Grid.Column="1" PointerPressed="HeaderPointerPressed">
|
||||||
Grid.Column="1"
|
|
||||||
PointerPressed="HeaderPointerPressed">
|
|
||||||
<Rectangle Fill="#01000000" />
|
<Rectangle Fill="#01000000" />
|
||||||
|
|
||||||
<StackPanel
|
<StackPanel Margin="20,10" Orientation="Horizontal">
|
||||||
Margin="20,10"
|
|
||||||
Orientation="Horizontal">
|
|
||||||
<local:PathPresenter DataContext="{Binding AppState.SelectedTab^.CurrentLocation^.FullName.Path, Converter={StaticResource PathPreformatter}}" />
|
<local:PathPresenter DataContext="{Binding AppState.SelectedTab^.CurrentLocation^.FullName.Path, Converter={StaticResource PathPreformatter}}" />
|
||||||
<TextBlock
|
<TextBlock Foreground="{StaticResource AccentBrush}" Text="{Binding AppState.SelectedTab^.CurrentSelectedItem^.DisplayNameText}" />
|
||||||
Foreground="{StaticResource AccentBrush}"
|
|
||||||
Text="{Binding AppState.SelectedTab^.CurrentSelectedItem^.DisplayNameText}" />
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid
|
<Grid Grid.Row="1" RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
Grid.Row="1"
|
|
||||||
RowDefinitions="Auto,Auto,Auto,Auto">
|
|
||||||
|
|
||||||
<Border
|
<Border
|
||||||
Margin="10"
|
|
||||||
Padding="10"
|
|
||||||
Background="{DynamicResource ContainerBackgroundBrush}"
|
Background="{DynamicResource ContainerBackgroundBrush}"
|
||||||
CornerRadius="10">
|
CornerRadius="10"
|
||||||
|
Margin="10"
|
||||||
|
Padding="10">
|
||||||
<Grid RowDefinitions="Auto,Auto">
|
<Grid RowDefinitions="Auto,Auto">
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock Margin="0,0,0,10" Text="Drives" />
|
||||||
Margin="0,0,0,10"
|
|
||||||
Text="Drives" />
|
|
||||||
|
|
||||||
<ItemsRepeater
|
<ItemsRepeater Grid.Row="1" ItemsSource="{Binding AppState.RootDriveInfos.Collection}">
|
||||||
Grid.Row="1"
|
|
||||||
ItemsSource="{Binding AppState.RootDriveInfos.Collection}">
|
|
||||||
<ItemsRepeater.ItemTemplate>
|
<ItemsRepeater.ItemTemplate>
|
||||||
<DataTemplate x:DataType="vm:RootDriveInfo">
|
<DataTemplate x:DataType="vm:RootDriveInfo">
|
||||||
<Grid
|
<Grid
|
||||||
@@ -96,66 +78,66 @@
|
|||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
PointerPressed="OnHasContainerPointerPressed">
|
PointerPressed="OnHasContainerPointerPressed">
|
||||||
<Grid
|
<Grid
|
||||||
Margin="0,5"
|
|
||||||
ColumnDefinitions="Auto,*,Auto"
|
ColumnDefinitions="Auto,*,Auto"
|
||||||
|
Margin="0,5"
|
||||||
RowDefinitions="Auto,Auto">
|
RowDefinitions="Auto,Auto">
|
||||||
<Image
|
<Image
|
||||||
Grid.RowSpan="2"
|
Grid.RowSpan="2"
|
||||||
Width="20"
|
|
||||||
Height="20"
|
Height="20"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
|
Source="{SvgImage /Assets/material/folder.svg}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Source="{SvgImage /Assets/material/folder.svg}" />
|
Width="20" />
|
||||||
|
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Center"
|
Orientation="Horizontal"
|
||||||
Orientation="Horizontal">
|
VerticalAlignment="Center">
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="5,0,0,0"
|
Margin="5,0,0,0"
|
||||||
VerticalAlignment="Center"
|
Text="{Binding FullName}"
|
||||||
Text="{Binding FullName}" />
|
VerticalAlignment="Center" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="5,0,0,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Classes="ExtraSmallText"
|
Classes="ExtraSmallText"
|
||||||
IsVisible="{Binding Label, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
|
IsVisible="{Binding Label, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
|
||||||
Text="{Binding Label}" />
|
Margin="5,0,0,0"
|
||||||
|
Text="{Binding Label}"
|
||||||
|
VerticalAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
Orientation="Horizontal"
|
||||||
Orientation="Horizontal">
|
VerticalAlignment="Center">
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
VerticalAlignment="Center"
|
|
||||||
Classes="SmallText"
|
Classes="SmallText"
|
||||||
Text="{Binding Free, Converter={StaticResource FormatSizeConverter}, ConverterParameter=0}" />
|
Text="{Binding Free, Converter={StaticResource FormatSizeConverter}, ConverterParameter=0}"
|
||||||
|
VerticalAlignment="Center" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
VerticalAlignment="Center"
|
|
||||||
Classes="SmallText"
|
Classes="SmallText"
|
||||||
Text=" / " />
|
Text=" / "
|
||||||
|
VerticalAlignment="Center" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
VerticalAlignment="Center"
|
|
||||||
Classes="SmallText"
|
Classes="SmallText"
|
||||||
Text="{Binding Size, Converter={StaticResource FormatSizeConverter}, ConverterParameter=0}" />
|
Text="{Binding Size, Converter={StaticResource FormatSizeConverter}, ConverterParameter=0}"
|
||||||
|
VerticalAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
Grid.Row="1"
|
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
MinWidth="100"
|
Grid.Row="1"
|
||||||
Margin="5,0,0,0"
|
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
|
Margin="5,0,0,0"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
|
MinWidth="100"
|
||||||
Value="{Binding UsedPercentage}" />
|
Value="{Binding UsedPercentage}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -166,20 +148,16 @@
|
|||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<Border
|
<Border
|
||||||
|
Background="{DynamicResource ContainerBackgroundBrush}"
|
||||||
|
CornerRadius="10"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Margin="10"
|
Margin="10"
|
||||||
Padding="0,10"
|
Padding="0,10">
|
||||||
Background="{DynamicResource ContainerBackgroundBrush}"
|
|
||||||
CornerRadius="10">
|
|
||||||
<Grid RowDefinitions="Auto,Auto">
|
<Grid RowDefinitions="Auto,Auto">
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock Margin="10,0,10,10" Text="Places" />
|
||||||
Margin="10,0,10,10"
|
|
||||||
Text="Places" />
|
|
||||||
|
|
||||||
<ItemsRepeater
|
<ItemsRepeater Grid.Row="1" ItemsSource="{Binding AppState.Places}">
|
||||||
Grid.Row="1"
|
|
||||||
ItemsSource="{Binding AppState.Places}">
|
|
||||||
<ItemsRepeater.ItemTemplate>
|
<ItemsRepeater.ItemTemplate>
|
||||||
<DataTemplate x:DataType="vm:PlaceInfo">
|
<DataTemplate x:DataType="vm:PlaceInfo">
|
||||||
<Grid
|
<Grid
|
||||||
@@ -187,19 +165,19 @@
|
|||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
PointerPressed="OnHasContainerPointerPressed">
|
PointerPressed="OnHasContainerPointerPressed">
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Margin="10,5"
|
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
|
Margin="10,5"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<Image
|
<Image
|
||||||
Width="20"
|
|
||||||
Height="20"
|
Height="20"
|
||||||
|
Source="{Binding Container, Converter={StaticResource ItemToImageConverter}}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Source="{Binding Container, Converter={StaticResource ItemToImageConverter}}" />
|
Width="20" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="5,0,0,0"
|
Margin="5,0,0,0"
|
||||||
VerticalAlignment="Center"
|
Text="{Binding DisplayName}"
|
||||||
Text="{Binding DisplayName}" />
|
VerticalAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@@ -275,8 +253,8 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
Grid.Row="1"
|
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
|
Grid.Row="1"
|
||||||
RowDefinitions="Auto,40,*,Auto">
|
RowDefinitions="Auto,40,*,Auto">
|
||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -289,18 +267,16 @@
|
|||||||
<ItemsControl.ItemTemplate>
|
<ItemsControl.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Border
|
<Border
|
||||||
MaxHeight="200"
|
|
||||||
Margin="0,0,10,0"
|
|
||||||
Padding="5"
|
|
||||||
Background="{DynamicResource ContainerBackgroundColor}"
|
Background="{DynamicResource ContainerBackgroundColor}"
|
||||||
CornerRadius="10">
|
CornerRadius="10"
|
||||||
|
Margin="0,0,10,0"
|
||||||
|
MaxHeight="200"
|
||||||
|
Padding="5">
|
||||||
<ScrollViewer>
|
<ScrollViewer>
|
||||||
<ItemsControl ItemsSource="{Binding Commands.Collection}">
|
<ItemsControl ItemsSource="{Binding Commands.Collection}">
|
||||||
<ItemsControl.ItemTemplate>
|
<ItemsControl.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Border
|
<Border BorderThickness="1" Classes.SelectedTimelineCommand="{Binding IsSelected}">
|
||||||
BorderThickness="1"
|
|
||||||
Classes.SelectedTimelineCommand="{Binding IsSelected}">
|
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Text="{Binding DisplayLabel^}" />
|
<TextBlock Text="{Binding DisplayLabel^}" />
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
@@ -319,9 +295,7 @@
|
|||||||
</ItemsControl>
|
</ItemsControl>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<ItemsControl
|
<ItemsControl Grid.Row="1" ItemsSource="{Binding AppState.Tabs}">
|
||||||
Grid.Row="1"
|
|
||||||
ItemsSource="{Binding AppState.Tabs}">
|
|
||||||
<ItemsControl.ItemsPanel>
|
<ItemsControl.ItemsPanel>
|
||||||
<ItemsPanelTemplate>
|
<ItemsPanelTemplate>
|
||||||
<StackPanel Orientation="Horizontal" />
|
<StackPanel Orientation="Horizontal" />
|
||||||
@@ -330,42 +304,36 @@
|
|||||||
<ItemsControl.ItemTemplate>
|
<ItemsControl.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid RowDefinitions="Auto,1">
|
<Grid RowDefinitions="Auto,1">
|
||||||
<StackPanel
|
<StackPanel Margin="20,0,20,0" Orientation="Horizontal">
|
||||||
Margin="20,0,20,0"
|
|
||||||
Orientation="Horizontal">
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock Text="{Binding TabNumber, StringFormat=({0})}" VerticalAlignment="Center" />
|
||||||
VerticalAlignment="Center"
|
|
||||||
Text="{Binding TabNumber, StringFormat=({0})}" />
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="5,0,0,0"
|
Margin="5,0,0,0"
|
||||||
VerticalAlignment="Center"
|
Text="{Binding CurrentLocation^.Name, FallbackValue=Loading...}"
|
||||||
Text="{Binding CurrentLocation^.Name, FallbackValue=Loading...}" />
|
VerticalAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Grid.Row="1"
|
|
||||||
Fill="{DynamicResource ForegroundBrush}"
|
Fill="{DynamicResource ForegroundBrush}"
|
||||||
|
Grid.Row="1"
|
||||||
IsVisible="{Binding IsSelected^}" />
|
IsVisible="{Binding IsSelected^}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ItemsControl.ItemTemplate>
|
</ItemsControl.ItemTemplate>
|
||||||
</ItemsControl>
|
</ItemsControl>
|
||||||
|
|
||||||
<Grid
|
<Grid Grid.Row="2" Margin="20,0,0,0">
|
||||||
Grid.Row="2"
|
|
||||||
Margin="20,0,0,0">
|
|
||||||
<Grid ColumnDefinitions="15*,10,40*,10,45*">
|
<Grid ColumnDefinitions="15*,10,40*,10,45*">
|
||||||
|
|
||||||
<ListBox
|
<ListBox
|
||||||
x:CompileBindings="False"
|
|
||||||
AutoScrollToSelectedItem="True"
|
AutoScrollToSelectedItem="True"
|
||||||
Classes="ContentListView"
|
Classes="ContentListView"
|
||||||
IsTabStop="True"
|
IsTabStop="True"
|
||||||
ItemsSource="{Binding AppState.SelectedTab^.ParentsChildrenCollection.Collection}"
|
ItemsSource="{Binding AppState.SelectedTab^.ParentsChildrenCollection.Collection}"
|
||||||
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
|
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
|
||||||
ScrollViewer.VerticalScrollBarVisibility="Visible">
|
ScrollViewer.VerticalScrollBarVisibility="Visible"
|
||||||
|
x:CompileBindings="False">
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate x:DataType="corevm:IItemViewModel">
|
<DataTemplate x:DataType="corevm:IItemViewModel">
|
||||||
<local:ItemView
|
<local:ItemView
|
||||||
@@ -377,22 +345,20 @@
|
|||||||
</ListBox>
|
</ListBox>
|
||||||
|
|
||||||
<Rectangle
|
<Rectangle
|
||||||
|
Fill="{DynamicResource ContentSeparatorBrush}"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="1"
|
|
||||||
Margin="0,10,0,10"
|
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
|
Margin="0,10,0,10"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
Fill="{DynamicResource ContentSeparatorBrush}" />
|
Width="1" />
|
||||||
|
|
||||||
<Grid
|
<Grid Grid.Column="2" RowDefinitions="Auto,*">
|
||||||
Grid.Column="2"
|
|
||||||
RowDefinitions="Auto,*">
|
|
||||||
<Grid IsVisible="{Binding AppState.SelectedTab^.CurrentLocation^.IsLoading^, FallbackValue=False}">
|
<Grid IsVisible="{Binding AppState.SelectedTab^.CurrentLocation^.IsLoading^, FallbackValue=False}">
|
||||||
<Image
|
<Image
|
||||||
Width="40"
|
|
||||||
Height="40"
|
|
||||||
Classes="LoadingAnimation"
|
Classes="LoadingAnimation"
|
||||||
Source="{SvgImage /Assets/loading.svg}">
|
Height="40"
|
||||||
|
Source="{SvgImage /Assets/loading.svg}"
|
||||||
|
Width="40">
|
||||||
<!-- https://github.com/AvaloniaUI/Avalonia/issues/8791 -->
|
<!-- https://github.com/AvaloniaUI/Avalonia/issues/8791 -->
|
||||||
<!-- Has to explicitly set RotateTransform or animation does not work -->
|
<!-- Has to explicitly set RotateTransform or animation does not work -->
|
||||||
<Image.RenderTransform>
|
<Image.RenderTransform>
|
||||||
@@ -403,55 +369,53 @@
|
|||||||
</Image>
|
</Image>
|
||||||
</Grid>
|
</Grid>
|
||||||
<ListBox
|
<ListBox
|
||||||
x:Name="CurrentItems"
|
|
||||||
Grid.Row="1"
|
|
||||||
AutoScrollToSelectedItem="True"
|
AutoScrollToSelectedItem="True"
|
||||||
Classes="ContentListView"
|
Classes="ContentListView"
|
||||||
|
Grid.Row="1"
|
||||||
IsTabStop="True"
|
IsTabStop="True"
|
||||||
ItemsSource="{Binding AppState.SelectedTab^.CurrentItemsCollection.Collection}"
|
ItemsSource="{Binding AppState.SelectedTab^.CurrentItemsCollection.Collection}"
|
||||||
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
|
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
|
||||||
ScrollViewer.VerticalScrollBarVisibility="Visible"
|
ScrollViewer.VerticalScrollBarVisibility="Visible"
|
||||||
SelectedItem="{Binding AppState.SelectedTab^.CurrentSelectedItem^}">
|
SelectedItem="{Binding AppState.SelectedTab^.CurrentSelectedItem^}"
|
||||||
|
x:Name="CurrentItems">
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate x:DataType="corevm:IItemViewModel">
|
<DataTemplate x:DataType="corevm:IItemViewModel">
|
||||||
<local:ItemView
|
<local:ItemView HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" />
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
HorizontalContentAlignment="Stretch" />
|
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ListBox.ItemTemplate>
|
</ListBox.ItemTemplate>
|
||||||
</ListBox>
|
</ListBox>
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="CurrentEmpty"
|
|
||||||
Grid.Row="1"
|
|
||||||
Margin="10"
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
x:CompileBindings="False"
|
|
||||||
FontWeight="Bold"
|
FontWeight="Bold"
|
||||||
Foreground="{DynamicResource ErrorBrush}"
|
Foreground="{DynamicResource ErrorBrush}"
|
||||||
IsVisible="{Binding AppState.SelectedTab^.CurrentItemsCollection.Collection.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}">
|
Grid.Row="1"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
IsVisible="{Binding AppState.SelectedTab^.CurrentItemsCollection.Collection.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}"
|
||||||
|
Margin="10"
|
||||||
|
x:CompileBindings="False"
|
||||||
|
x:Name="CurrentEmpty">
|
||||||
Empty
|
Empty
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Rectangle
|
<Rectangle
|
||||||
|
Fill="{DynamicResource ContentSeparatorBrush}"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Width="1"
|
|
||||||
Margin="0,10,0,10"
|
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
|
Margin="0,10,0,10"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
Fill="{DynamicResource ContentSeparatorBrush}" />
|
Width="1" />
|
||||||
|
|
||||||
<Grid Grid.Column="4">
|
<Grid Grid.Column="4">
|
||||||
<Grid IsVisible="{Binding ItemPreviewService.ItemPreview^, Converter={x:Static ObjectConverters.IsNull}}">
|
<Grid IsVisible="{Binding ItemPreviewService.ItemPreview^, Converter={x:Static ObjectConverters.IsNull}}">
|
||||||
<Grid IsVisible="{Binding AppState.SelectedTab^.SelectedsChildrenCollection.Collection, Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}">
|
<Grid IsVisible="{Binding AppState.SelectedTab^.SelectedsChildrenCollection.Collection, Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}">
|
||||||
<ListBox
|
<ListBox
|
||||||
x:Name="ChildItems"
|
|
||||||
x:CompileBindings="False"
|
|
||||||
AutoScrollToSelectedItem="True"
|
AutoScrollToSelectedItem="True"
|
||||||
Classes="ContentListView"
|
Classes="ContentListView"
|
||||||
IsVisible="{Binding AppState.SelectedTab^.SelectedsChildrenCollection.Collection.Count, Converter={StaticResource NotEqualsConverter}, ConverterParameter=0}"
|
IsVisible="{Binding AppState.SelectedTab^.SelectedsChildrenCollection.Collection.Count, Converter={StaticResource NotEqualsConverter}, ConverterParameter=0}"
|
||||||
ItemsSource="{Binding AppState.SelectedTab^.SelectedsChildrenCollection.Collection}">
|
ItemsSource="{Binding AppState.SelectedTab^.SelectedsChildrenCollection.Collection}"
|
||||||
|
x:CompileBindings="False"
|
||||||
|
x:Name="ChildItems">
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate x:DataType="corevm:IItemViewModel">
|
<DataTemplate x:DataType="corevm:IItemViewModel">
|
||||||
<local:ItemView />
|
<local:ItemView />
|
||||||
@@ -460,35 +424,29 @@
|
|||||||
</ListBox>
|
</ListBox>
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="ChildEmpty"
|
|
||||||
Margin="10"
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
x:CompileBindings="False"
|
|
||||||
FontWeight="Bold"
|
FontWeight="Bold"
|
||||||
Foreground="{DynamicResource ErrorBrush}"
|
Foreground="{DynamicResource ErrorBrush}"
|
||||||
IsVisible="{Binding AppState.SelectedTab^.SelectedsChildrenCollection.Collection.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}">
|
HorizontalAlignment="Center"
|
||||||
|
IsVisible="{Binding AppState.SelectedTab^.SelectedsChildrenCollection.Collection.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}"
|
||||||
|
Margin="10"
|
||||||
|
x:CompileBindings="False"
|
||||||
|
x:Name="ChildEmpty">
|
||||||
Empty
|
Empty
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid
|
<Grid IsVisible="{Binding AppState.SelectedTab^.SelectedsChildrenCollection, Converter={x:Static ObjectConverters.IsNull}, ConverterParameter=0, FallbackValue=False}" RowDefinitions="Auto, Auto">
|
||||||
IsVisible="{Binding AppState.SelectedTab^.SelectedsChildrenCollection, Converter={x:Static ObjectConverters.IsNull}, ConverterParameter=0, FallbackValue=False}"
|
|
||||||
RowDefinitions="Auto, Auto">
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="0,0,0,10"
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
Foreground="{DynamicResource ErrorBrush}"
|
Foreground="{DynamicResource ErrorBrush}"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
Margin="0,0,0,10"
|
||||||
Text="There were some errors while opening container."
|
Text="There were some errors while opening container."
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
|
|
||||||
<ItemsRepeater
|
<ItemsRepeater Grid.Row="1" ItemsSource="{Binding AppState.SelectedTab^.CurrentSelectedItem^.BaseItem.Exceptions^}">
|
||||||
Grid.Row="1"
|
|
||||||
ItemsSource="{Binding AppState.SelectedTab^.CurrentSelectedItem^.BaseItem.Exceptions^}">
|
|
||||||
<ItemsRepeater.ItemTemplate>
|
<ItemsRepeater.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<TextBlock
|
<TextBlock Margin="5,0,5,10" Text="{Binding Converter={StaticResource ExceptionToStringConverter}}" />
|
||||||
Margin="5,0,5,10"
|
|
||||||
Text="{Binding Converter={StaticResource ExceptionToStringConverter}}" />
|
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ItemsRepeater.ItemTemplate>
|
</ItemsRepeater.ItemTemplate>
|
||||||
</ItemsRepeater>
|
</ItemsRepeater>
|
||||||
@@ -505,20 +463,20 @@
|
|||||||
Text="Empty" />
|
Text="Empty" />
|
||||||
<ScrollViewer IsVisible="{Binding ItemPreviewService.ItemPreview^.Mode, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static appCoreModels:ItemPreviewMode.Text}, FallbackValue={x:Static appCoreModels:ItemPreviewMode.Unknown}}">
|
<ScrollViewer IsVisible="{Binding ItemPreviewService.ItemPreview^.Mode, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static appCoreModels:ItemPreviewMode.Text}, FallbackValue={x:Static appCoreModels:ItemPreviewMode.Unknown}}">
|
||||||
<TextBox
|
<TextBox
|
||||||
x:CompileBindings="False"
|
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding ItemPreviewService.ItemPreview^.TextContent}" />
|
Text="{Binding ItemPreviewService.ItemPreview^.TextContent}"
|
||||||
|
x:CompileBindings="False" />
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<ItemsRepeater
|
<ItemsRepeater
|
||||||
Margin="0,0,0,20"
|
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Top"
|
|
||||||
IsVisible="{Binding AppState.PopupTexts.Count, Converter={StaticResource NotEqualsConverter}, ConverterParameter=0}"
|
IsVisible="{Binding AppState.PopupTexts.Count, Converter={StaticResource NotEqualsConverter}, ConverterParameter=0}"
|
||||||
ItemsSource="{Binding AppState.PopupTexts}">
|
ItemsSource="{Binding AppState.PopupTexts}"
|
||||||
|
Margin="0,0,0,20"
|
||||||
|
VerticalAlignment="Top">
|
||||||
<ItemsRepeater.Styles>
|
<ItemsRepeater.Styles>
|
||||||
<Style Selector="TextBlock">
|
<Style Selector="TextBlock">
|
||||||
<Style.Animations>
|
<Style.Animations>
|
||||||
@@ -536,12 +494,12 @@
|
|||||||
<ItemsRepeater.ItemTemplate>
|
<ItemsRepeater.ItemTemplate>
|
||||||
<DataTemplate x:DataType="x:String">
|
<DataTemplate x:DataType="x:String">
|
||||||
<Border
|
<Border
|
||||||
|
Background="{DynamicResource ContainerGradientBackgroundBrush}"
|
||||||
Margin="5"
|
Margin="5"
|
||||||
Padding="5"
|
Padding="5">
|
||||||
Background="{DynamicResource ContainerGradientBackgroundBrush}">
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
HorizontalAlignment="Center"
|
|
||||||
Foreground="{DynamicResource AccentComplementBrush}"
|
Foreground="{DynamicResource AccentComplementBrush}"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
Text="{Binding}" />
|
Text="{Binding}" />
|
||||||
</Border>
|
</Border>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@@ -550,25 +508,21 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid Grid.Row="3">
|
<Grid Grid.Row="3">
|
||||||
<Grid
|
<Grid IsVisible="{Binding AppState.ViewMode^, Converter={StaticResource EqualityConverter}, ConverterParameter=RapidTravel}" RowDefinitions="1,Auto">
|
||||||
IsVisible="{Binding AppState.ViewMode^, Converter={StaticResource EqualityConverter}, ConverterParameter=RapidTravel}"
|
|
||||||
RowDefinitions="1,Auto">
|
|
||||||
|
|
||||||
<Rectangle
|
<Rectangle
|
||||||
|
Fill="{DynamicResource ContentSeparatorBrush}"
|
||||||
Height="1"
|
Height="1"
|
||||||
Margin="10,0"
|
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Center"
|
Margin="10,0"
|
||||||
Fill="{DynamicResource ContentSeparatorBrush}" />
|
VerticalAlignment="Center" />
|
||||||
|
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Margin="30,10,10,10"
|
Margin="30,10,10,10"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock Margin="0,0,30,0" Text="Rapid travel mode" />
|
||||||
Margin="0,0,30,0"
|
|
||||||
Text="Rapid travel mode" />
|
|
||||||
|
|
||||||
<TextBlock Text="Filter " />
|
<TextBlock Text="Filter " />
|
||||||
|
|
||||||
@@ -583,15 +537,13 @@
|
|||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<Rectangle
|
<Rectangle
|
||||||
|
Fill="{DynamicResource ContentSeparatorBrush}"
|
||||||
Height="1"
|
Height="1"
|
||||||
Margin="10,0"
|
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Center"
|
Margin="10,0"
|
||||||
Fill="{DynamicResource ContentSeparatorBrush}" />
|
VerticalAlignment="Center" />
|
||||||
|
|
||||||
<ItemsRepeater
|
<ItemsRepeater Grid.Row="1" ItemsSource="{Binding AppState.PossibleCommands}">
|
||||||
Grid.Row="1"
|
|
||||||
ItemsSource="{Binding AppState.PossibleCommands}">
|
|
||||||
<ItemsRepeater.ItemTemplate>
|
<ItemsRepeater.ItemTemplate>
|
||||||
<DataTemplate x:DataType="config:CommandBindingConfiguration">
|
<DataTemplate x:DataType="config:CommandBindingConfiguration">
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -601,9 +553,7 @@
|
|||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<TextBlock Text="{Binding KeysDisplayText}" />
|
<TextBlock Text="{Binding KeysDisplayText}" />
|
||||||
<TextBlock
|
<TextBlock Grid.Column="1" Text="{Binding Command, Converter={StaticResource CommandToCommandNameConverter}}" />
|
||||||
Grid.Column="1"
|
|
||||||
Text="{Binding Command, Converter={StaticResource CommandToCommandNameConverter}}" />
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ItemsRepeater.ItemTemplate>
|
</ItemsRepeater.ItemTemplate>
|
||||||
@@ -614,49 +564,47 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Border
|
<Border
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
Background="{DynamicResource BarelyTransparentBackgroundColor}"
|
Background="{DynamicResource BarelyTransparentBackgroundColor}"
|
||||||
IsVisible="{Binding DialogService.ReadInput^, Converter={x:Static ObjectConverters.IsNotNull}}">
|
HorizontalAlignment="Stretch"
|
||||||
|
IsVisible="{Binding DialogService.ReadInput^, Converter={x:Static ObjectConverters.IsNotNull}}"
|
||||||
|
VerticalAlignment="Stretch">
|
||||||
<Border
|
<Border
|
||||||
Padding="20"
|
Background="{DynamicResource ContainerBackgroundBrush}"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
Padding="20"
|
||||||
Background="{DynamicResource ContainerBackgroundBrush}">
|
VerticalAlignment="Center">
|
||||||
<Grid RowDefinitions="Auto,Auto">
|
<Grid RowDefinitions="Auto,Auto">
|
||||||
|
|
||||||
<ItemsControl
|
<ItemsControl ItemsSource="{Binding DialogService.ReadInput^.Inputs}" x:Name="InputList">
|
||||||
x:Name="InputList"
|
|
||||||
ItemsSource="{Binding DialogService.ReadInput^.Inputs}">
|
|
||||||
<ItemsControl.ItemTemplate>
|
<ItemsControl.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="ItemRoot"
|
ColumnDefinitions="250,*"
|
||||||
MinWidth="500"
|
|
||||||
Margin="10,5"
|
Margin="10,5"
|
||||||
ColumnDefinitions="250,*">
|
MinWidth="500"
|
||||||
|
x:Name="ItemRoot">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Top"
|
Text="{Binding Label}"
|
||||||
Text="{Binding Label}" />
|
VerticalAlignment="Top" />
|
||||||
<Grid Grid.Column="1">
|
<Grid Grid.Column="1">
|
||||||
<TextBox
|
<TextBox
|
||||||
VerticalAlignment="Top"
|
|
||||||
x:DataType="interactions:TextInputElement"
|
|
||||||
IsVisible="{Binding Type, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static interactions:InputType.Text}}"
|
IsVisible="{Binding Type, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static interactions:InputType.Text}}"
|
||||||
Text="{Binding Value, Mode=TwoWay}" />
|
Text="{Binding Value, Mode=TwoWay}"
|
||||||
<TextBox
|
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
x:DataType="interactions:PasswordInputElement"
|
x:DataType="interactions:TextInputElement" />
|
||||||
|
<TextBox
|
||||||
IsVisible="{Binding Type, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static interactions:InputType.Password}}"
|
IsVisible="{Binding Type, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static interactions:InputType.Password}}"
|
||||||
PasswordChar="{Binding PasswordChar}"
|
PasswordChar="{Binding PasswordChar}"
|
||||||
Text="{Binding Value, Mode=TwoWay}" />
|
Text="{Binding Value, Mode=TwoWay}"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
x:DataType="interactions:PasswordInputElement" />
|
||||||
<ListBox
|
<ListBox
|
||||||
x:DataType="interactions:IOptionsInputElement"
|
|
||||||
Classes="RadioButtonListBox"
|
Classes="RadioButtonListBox"
|
||||||
IsVisible="{Binding Type, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static interactions:InputType.Options}}"
|
IsVisible="{Binding Type, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static interactions:InputType.Options}}"
|
||||||
ItemsSource="{Binding Options}"
|
ItemsSource="{Binding Options}"
|
||||||
SelectedItem="{Binding Value}" />
|
SelectedItem="{Binding Value}"
|
||||||
|
x:DataType="interactions:IOptionsInputElement" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@@ -668,32 +616,32 @@
|
|||||||
Margin="0,10,0,0"
|
Margin="0,10,0,0"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<Button
|
<Button
|
||||||
Width="80"
|
|
||||||
HorizontalContentAlignment="Center"
|
|
||||||
Command="{Binding ProcessCommand}"
|
Command="{Binding ProcessCommand}"
|
||||||
Content="Ok" />
|
Content="Ok"
|
||||||
<Button
|
|
||||||
Width="80"
|
|
||||||
Margin="10,0,0,0"
|
|
||||||
HorizontalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
|
Width="80" />
|
||||||
|
<Button
|
||||||
Command="{Binding CancelCommand}"
|
Command="{Binding CancelCommand}"
|
||||||
Content="Cancel" />
|
Content="Cancel"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="10,0,0,0"
|
||||||
|
Width="80" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<Border
|
<Border
|
||||||
|
Background="{DynamicResource BarelyTransparentBackgroundColor}"
|
||||||
DataContext="{Binding DialogService.LastMessageBox^}"
|
DataContext="{Binding DialogService.LastMessageBox^}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
IsVisible="{Binding Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}"
|
||||||
Background="{DynamicResource BarelyTransparentBackgroundColor}"
|
VerticalAlignment="Stretch">
|
||||||
IsVisible="{Binding Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}">
|
|
||||||
<Border
|
<Border
|
||||||
Padding="20"
|
Background="{DynamicResource ContainerBackgroundBrush}"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
Padding="20"
|
||||||
Background="{DynamicResource ContainerBackgroundBrush}">
|
VerticalAlignment="Center">
|
||||||
<Grid RowDefinitions="Auto,Auto">
|
<Grid RowDefinitions="Auto,Auto">
|
||||||
|
|
||||||
<TextBlock Text="{Binding Text}" />
|
<TextBlock Text="{Binding Text}" />
|
||||||
@@ -702,44 +650,53 @@
|
|||||||
Margin="0,10,0,0"
|
Margin="0,10,0,0"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<Button
|
<Button
|
||||||
Width="80"
|
|
||||||
HorizontalContentAlignment="Center"
|
|
||||||
Command="{Binding OkCommand}"
|
Command="{Binding OkCommand}"
|
||||||
Content="Yes" />
|
Content="Yes"
|
||||||
<Button
|
|
||||||
Width="80"
|
|
||||||
Margin="10,0,0,0"
|
|
||||||
HorizontalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
|
Width="80" />
|
||||||
|
<Button
|
||||||
Command="{Binding CancelCommand}"
|
Command="{Binding CancelCommand}"
|
||||||
Content="No" />
|
Content="No"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="10,0,0,0"
|
||||||
|
Width="80" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<Border
|
<Border
|
||||||
|
Background="{DynamicResource BarelyTransparentBackgroundColor}"
|
||||||
DataContext="{Binding FrequencyNavigationService.CurrentModal}"
|
DataContext="{Binding FrequencyNavigationService.CurrentModal}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
IsVisible="{Binding ShowWindow^, FallbackValue=False}"
|
||||||
Background="{DynamicResource BarelyTransparentBackgroundColor}"
|
VerticalAlignment="Stretch">
|
||||||
IsVisible="{Binding ShowWindow^, FallbackValue=False}">
|
|
||||||
<Grid Margin="100">
|
<Grid Margin="100">
|
||||||
<local:FrequencyNavigation />
|
<local:FrequencyNavigation />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
<Border
|
||||||
|
Background="{DynamicResource BarelyTransparentBackgroundColor}"
|
||||||
|
DataContext="{Binding CommandPaletteService.CurrentModal}"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
IsVisible="{Binding ShowWindow^, FallbackValue=False}"
|
||||||
|
VerticalAlignment="Stretch">
|
||||||
|
<Grid Margin="100">
|
||||||
|
<local:CommandPalette />
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid IsVisible="{Binding Loading}">
|
<Grid IsVisible="{Binding Loading}">
|
||||||
<StackPanel
|
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||||
HorizontalAlignment="Center"
|
|
||||||
VerticalAlignment="Center">
|
|
||||||
<Image
|
<Image
|
||||||
Width="128"
|
|
||||||
Height="128"
|
Height="128"
|
||||||
Source="/Assets/filetime.ico" />
|
Source="/Assets/filetime.ico"
|
||||||
|
Width="128" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="50"
|
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
|
Margin="50"
|
||||||
Text="Loading..." />
|
Text="Loading..." />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
using Avalonia;
|
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Markup.Xaml;
|
|
||||||
|
|
||||||
namespace FileTime.GuiApp.Views;
|
namespace FileTime.GuiApp.Views;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using FileTime.Core.ContentAccess;
|
using FileTime.Core.ContentAccess;
|
||||||
using FileTime.Core.Services;
|
|
||||||
|
|
||||||
namespace FileTime.Providers.Local;
|
namespace FileTime.Providers.Local;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.Reactive.Linq;
|
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using DynamicData;
|
using DynamicData;
|
||||||
using FileTime.Core.ContentAccess;
|
using FileTime.Core.ContentAccess;
|
||||||
|
|||||||
Reference in New Issue
Block a user